'123'

ruoyi-admin/pom.xml

@@ -126,6 +126,25 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <targetPath>BOOT-INF</targetPath>
+                <includes>
+                    <include>**/*.jar</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources/META-INF</directory>
+                <includes>
+                    <include>spring.factories</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -133,7 +152,9 @@
                 <version>2.5.15</version>
                 <configuration>
                     <fork>true</fork> <!-- 如果没有该配置，devtools不会生效 -->
+<!--
                     <includeSystemScope>true</includeSystemScope>
+-->
                 </configuration>
                 <executions>
                     <execution>

ruoyi-ui/src/views/components/Tools/CustomerSelect/index.vue

@@ -124,6 +124,9 @@
           },
           // 取消按钮
           cancel() {
+            this.customerList = [];
+            this.total = 0;
+            this.resetForm("queryForm");
             this.$emit('cancel');
           },
           // 确定按钮

ruoyi-ui/src/views/customer/customer/index.vue

@@ -42,7 +42,6 @@
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
-            v-if="(!cusApprovalStatusHidden && (dict.value == '1' || dict.value == '2')) || cusApprovalStatusHidden "
           />
         </el-select>
       </el-form-item>
@@ -607,8 +606,6 @@ export default {
   dicts: ['cus_currency','cus_group','cus_approval_status', 'cus_type', 'common_state'],
   data() {
     return {
-      //提交状态下拉框数据设置
-      cusApprovalStatusHidden: true,
       //选项卡默认
       activeName: 'customerInfo',
 
@@ -773,8 +770,7 @@ export default {
   },
   created() {
     const roles = this.$store.state.user.roles;
-    if(roles && roles.indexOf('ITZX_SJZ') !== -1 && roles.indexOf('admin') == -1 ){//数据组默认查看审批中 单据
+    if(roles && roles.indexOf('ITZX_SJZ') !== -1 ){//数据组默认查看待审核 单据
-      this.cusApprovalStatusHidden = false;
       this.queryParams.cusApprovalStatus = '1';
     }
     this.getList();

ruoyi-ui/src/views/quot/quot/index.vue

@@ -32,7 +32,6 @@
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
-            v-if="!quotApprovalStatusHidden && (dict.value == '1' || dict.value == '2') "
           />
         </el-select>
       </el-form-item>
@@ -790,8 +789,6 @@ export default {
   dicts: ['quot_approval_status','quot_jsxz_group','quot_jsxz_chapter','quot_jsxz_approval_status','quot_jsxz_standard','quot_hj_approval_status'],
   data() {
     return {
-      //提交状态下拉框数据设置
-      quotApprovalStatusHidden: true,
       //选项卡默认
       activeName: 'quotInfo',
 
@@ -898,9 +895,8 @@ export default {
   },
   created() {
     const roles = this.$store.state.user.roles;
-    if(roles && roles.indexOf('QUOT') !== -1 && roles.indexOf('admin') == -1 ){//报价组默认查看待审核 单据
+    if(roles && roles.indexOf('QUOT') !== -1 ){//报价组默认查看待审核 单据
-      this.quotApprovalStatusHidden = false;
+        this.queryParams.quotApprovalStatus = '1';
-      this.queryParams.quotApprovalStatus = '1';
     }
     this.getList();
   },

ruoyi-ui/src/views/redBook/quots.vue

@@ -27,7 +27,6 @@
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
-            v-if="!quotApprovalStatusHidden && (dict.value == '1' || dict.value == '2') "
           />
         </el-select>
       </el-form-item>
@@ -176,9 +175,6 @@
       dicts:['rb_quot_approval_status'],
       data() {
         return {
-          //提交状态下拉框数据设置
-          quotApprovalStatusHidden: true,
-
           // 遮罩层
           loading: true,
           // 显示搜索条件
@@ -229,11 +225,9 @@
       },
       created() {
         const roles = this.$store.state.user.roles;
-        if(roles && roles.indexOf('QUOT') !== -1 && roles.indexOf('admin') == -1 ){//报价组默认查看待审核 单据
+        if(roles && roles.indexOf('QUOT') !== -1 ){//报价组默认查看待审核 单据
-          this.quotApprovalStatusHidden = false;
           this.queryParams.quotApprovalStatus = '1';
         }
-
         this.getList();
         this.getVersionList();
       },