Merge remote-tracking branch 'origin/master'

src/views/check/checkstandard/CheckStandard.vue

@@ -86,8 +86,8 @@
           <a-icon type="upload"/>
           修改导入
         </a-button> -->
-        <a-button v-if="($auth('check-spot-standards-export') || $auth('check-polling-standards-export'))" type="primary"
-          icon="download" @click="doExport">导出
+        <a-button v-if="($auth('check-spot-standards-export') || $auth('check-polling-standards-export'))"
+          type="primary" icon="download" @click="doExport">导出
         </a-button>
         <a-button :confirmLoading="confirmLoading" type="primary" @click="doUpdateNo">
           <a-icon type="upload" />
@@ -391,8 +391,11 @@ export default {
       })
     },
     handleEdit(record) {
-      const modal = this.$refs.baseModal
-      modal.base(record)
+      fetchCheckStandard({ id: record.id }).then((res) => {
+        const modal = this.$refs.baseModal
+        res.data.sbNo = record.sbNo
+        modal.base(res.data)
+      })
     },
     handleView(record) {
       fetchCheckStandard({ id: record.id }).then((res) => {

src/views/check/checkstandard/modules/BaseForm.vue

@@ -494,6 +494,8 @@ export default {
         this.modalTitle = '添加'
         this.data = []
         this.cacheData = []
+        this.sbType = null
+        this.requirementList = []
         this.currentCheckUserType = null
         if (sbId != null) {
           this.sbId = sbId
@@ -518,23 +520,21 @@ export default {
         this.loadDeptTree()
       }
       // 查询列表
-      fetchCheckStandard({ id: record.id }).then((res) => {
-        this.data = res.data.detailList
-        const requirementList = res.data.requirementList || []
-        this.sbType = requirementList.length > 0 ? requirementList[0].sbType : null
-        if (this.sbType != null) {
-          this.$nextTick(() => {
-            setFieldsValue({
-              sbType: this.sbType,
-            })
+      this.data = record.detailList
+      const requirementList = record.requirementList || []
+      this.sbType = requirementList.length > 0 ? requirementList[0].sbType : null
+      if (this.sbType != null) {
+        this.$nextTick(() => {
+          setFieldsValue({
+            sbType: this.sbType,
           })
-        }
-        this.state.selectedRowKeys = requirementList.map((item) => item.id)
-        this.state.selectedRows = requirementList
+        })
+      }
+      this.state.selectedRowKeys = requirementList.map((item) => item.id)
+      this.state.selectedRows = requirementList
 
-        // 保养项字典未加载完成时，先回显已选保养项，避免列表空白
-        this.requirementList = (this.checkDetailList || {})[this.sbType] || requirementList
-      })
+      // 保养项字典未加载完成时，先回显已选保养项，避免列表空白
+      this.requirementList = (this.checkDetailList || {})[this.sbType] || requirementList
 
       this.checkImgList = record.checkImgList
       this.checkFileList = record.checkFileList