0106版本补充

src/views/merger/mergeredConfig/productClassify/index.vue

@@ -60,7 +60,7 @@
               </w-col>
             </template>
             <w-col :xl="4" :lg="5" :md="8" :sm="24">
-              <div class="table-page-search-submitButtons">
+              <div class="table-page-search-submit-buttons">
                 <w-button @click="searchQuery" type="primary" icon="search"> 搜索 </w-button>
                 <w-button @click="searchReset" type="primary" style="margin-left: 8px"> 重置 </w-button>
                 <j-super-query ref="superQueryModal" :field-list="refColumns" @handleSuperQuery="handleSuperQuery" />
@@ -70,10 +70,10 @@
                 </a>
               </div>
             </w-col>
-            <div @click="exportModel()" class="leftArea" v-has="authObj.export">
+            <div @click="exportModel()" class="right-export-area" v-has="authObj.export">
               <!-- <w-button type="primary" icon="download" @click="exportModel('bill_head')"
                 v-has="'bill:bill:export' + ieFlag + isBonded + emsCategory + menuType">导出</w-button> -->
-              <div class="filterBox">
+              <div class="filter-box">
                 <span class="iconfont icon-download-2"></span>
               </div>
             </div>
@@ -198,7 +198,7 @@
             :scroll="getTableScroll(1200)"
             :columns="refColumns"
             :data-source="dataSource"
-            :pagination="ipagination"
+            :pagination="pageParams"
             :loading="loading"
             size="middle"
             :custom-header-row="customHeaderRow"
@@ -215,8 +215,7 @@
                 <a
                   v-if="!['010', '070', '030', '071', '072'].includes(row.classifyStatus) || row.globalLock === 'Y'"
                   @click="handleDetail(row)"
-                  >{{ text }}</a
+                  >{{ text }}</a>
-                >
                 <a v-else @click="handleEdit(row)">{{ text }}</a>
               </div>
               <a v-else-if="flag === 'reviewClassify'" @click="handleEdit(row)">{{ text }}</a>
@@ -230,8 +229,7 @@
                 <span
                   v-if="!['010', '070', '030', '071', '072'].includes(row.classifyStatus) || row.globalLock === 'Y'"
                   v-has="'productClassify:edit'"
-                  >编辑</span
+                  >编辑</span>
-                >
                 <a v-else @click="handleEdit(row)" v-has="'productClassify:edit'">编辑</a>
                 <w-divider type="vertical" v-has="'productClassify:edit'" />
                 <a v-has="'productClassify:submit'" @click="submitFlow(row)" type="primary"> 提交审核 </a>
@@ -417,7 +415,7 @@ import { getAction, postAction } from '@/api/manage';
 import lodash from 'lodash';
 
 export default {
-  name: 'productClassify',
+  name: 'ProductClassify',
   mixins: [JeecgListMixin, mixinDevice, WGridResizeByCssMixin],
   components: {
     batchAuditPassDialog,
@@ -742,7 +740,7 @@ export default {
         regulationValid: '/interfaces/hscode/desc/regulationExpand',
         exportXlsEleUrl: 'merger/mergerReqsRdElem/exportXls',
         batchAuditPass: '/flow/common/batch-approve-pass',
-        batchAuditSubmit: '/flow/common/batch-submit'
+        batchAuditSubmit: '/flow/common/batch-submit',
       },
       flowStatusCode: '',
       dictOptions: {},
@@ -756,7 +754,7 @@ export default {
       hiddenColumns: false,
       handlersData: [],
       batchAuditSubmitLoading: false,
-      batchAuditPassLoading: false
+      batchAuditPassLoading: false,
     };
   },
   created() {
@@ -937,7 +935,7 @@ export default {
                       flowId: record.flowId,
                       type: 'submit',
                       title: `【${record.countryName}】 ${record.partNo} 商品归类`,
-                    }
+                    };
                     that.showApprovalDialog(that.fdTemplateCode , data);
                   },
                 });
@@ -947,6 +945,7 @@ export default {
             }
           } else {
             this.$refs.ApprovalProgressTemplate.show({
+              fdTemplateCode: 'mergerApply',
               id: record.id,
               defaultverifyBy: record.verifyBy,
               flowId: record.flowId,
@@ -984,6 +983,7 @@ export default {
         return;
       }
       this.$refs.ApprovalProgressTemplate.show({
+        fdTemplateCode: 'mergerApply',
         id: this.selectedRowKeys[0],
         flowId: this.selectionRows[0].flowId,
         type: 'audit',
@@ -1079,7 +1079,9 @@ export default {
       }
       this.recordObj = this.selectionRows[0];
       this.classifierForm.classifierBy = this.selectionRows[0].classifierBy;
+      this.classifierForm.classifierName = this.selectionRows[0].classifier;
       this.classifierForm.verifyBy = this.selectionRows[0].verifyBy;
+      this.classifierForm.verifyByName = this.selectionRows[0].verifyByName;
       this.classifyShow = true;
     },
     async classifyOK() {
@@ -1307,11 +1309,13 @@ export default {
         auditNote: data.remark,
         handlers: [],
         fdTemplateCode: 'mergerApply',
-      }).then(res => {
+      })
+        .then((res) => {
           if (res && res.success) {
             that.batchNoticeHandle(res, 'pass');
           }
-      }).finally(() => {
+        })
+        .finally(() => {
           that.batchAuditPassLoading = false;
         });
     },
@@ -1323,26 +1327,30 @@ export default {
         auditNote: data.remark,
         handlers: this.handlersData,
         fdTemplateCode: 'mergerApply',
-      }).then(res => {
+      })
+        .then((res) => {
           if (res && res.success) {
             that.batchNoticeHandle(res);
           }
-      }).finally(() => {
+        })
+        .finally(() => {
           that.batchAuditSubmitLoading = false;
         });
     },
     userHandleOk(data) {
-      this.handlersData = lodash.isEmpty(data) ? [] : [
+      this.handlersData = lodash.isEmpty(data)
+        ? []
+        : [
             {
               unmodifiable: true,
               name: data.operatorName,
               id: data.operator,
-          type: 'USER'
+              type: 'USER',
-        }
+            },
           ];
       this.$refs.batchAuditPassDialogRef.show({
         title: '批量提交审核',
-        type: 'submit'
+        type: 'submit',
       });
     },
     batchAuditPassHandle() {
@@ -1351,7 +1359,7 @@ export default {
       }
       this.$refs.batchAuditPassDialogRef.show({
         title: '批量审核通过',
-        type: 'pass'
+        type: 'pass',
       });
     },
     batchAuditSubmitHandle() {
@@ -1359,7 +1367,7 @@ export default {
       if (!this.selectionRowsVerify(50)) {
         return;
       }
-      if (this.selectionRows.some(i => i.classifyStatus === '090')) {
+      if (this.selectionRows.some((i) => i.classifyStatus === '090')) {
         this.$message.warning('不能勾选状态为090-归类驳回的数据进行操作！');
         return;
       }
@@ -1374,13 +1382,13 @@ export default {
           that.handlersData = [];
           that.$refs.batchAuditPassDialogRef.show({
             title: '批量提交审核',
-            type: 'submit'
+            type: 'submit',
           });
-        }
+        },
       });
     },
     batchNoticeHandle(res, type = 'submit') {
-      let msg = ''
+      let msg = '';
       if (res.result && res.result.fail > 0) {
         if (type === 'pass') {
           msg = '(' + res.result.approveFailMsg + ')';
@@ -1391,15 +1399,17 @@ export default {
       this.$MdAlert(
         `<div style="word-break: break-all;">成功:${res.result.success}条<br>` +
           `失败:${res.result.fail}条 ${msg} </div>`,
-        '处理结果', {
+        '处理结果',
+        {
           showClose: false,
           confirmButtonText: '确定',
           dangerouslyUseHTMLString: true,
           callback: () => {
             this.loadData();
           },
-      });
         }
+      );
+    },
   },
 };
 </script>