Преглед изворни кода

bug4402风险评估编制部门带出错误

wangxiaoyi пре 11 месеци
родитељ
комит
3afe066d89

+ 6 - 1
src/business/platform/form/formrender/dynamic-form/dynamic-form-table.vue

@@ -781,9 +781,14 @@ export default {
                 // 后置事件
                 this.afterScript(this.actionCode, this.actionPosition)
                 if (this.$refs.elTable) {
+                    this.$refs.elTable.clearSelection()
                     this.$refs.elTable.doLayout()
                 }
-            }).catch(() => {})
+            }).catch((e) => {
+                if (this.$refs.elTable) {
+                    this.$refs.elTable.clearSelection()
+                }
+            })
         },
         /**
          * 获取选择的记录

+ 1 - 1
src/views/component/reagent/reagentChange.vue

@@ -344,7 +344,7 @@ export default {
             this.requestPage.pageNo = 1
         },
         showAndHide (data) {
-            if (data.includes('平行试验') || data.includes('留样再测') || data.includes('比方案')) {
+            if (data.includes('平行试验') || data.includes('留样再测') || data.includes('比方案')) {
                 this.show = true
             } else {
                 this.show = false

+ 4 - 1
src/views/platform/risk/riskV2.vue

@@ -908,11 +908,14 @@ export default {
                 }
                 await this.showAlert()
             } else {
+                const { positions } = this.$store.getters.userInfo
+                // 默认编制部门是主部门,没有主部门默认第一个部门
+                const mainPost = positions.find(item => item.isMainPost === 'Y')?.id || positions[0].id
                 this.readonly = false
                 this.infoFxssbData.di_dian_ = this.level
                 this.infoFxssbData.ji_hua_bian_hao_ = await this.getNextAlias('fxjhlsh')
                 this.infoFxssbData.nian_du_ = dayjs().format('YYYY')
-                this.infoFxssbData.bian_zhi_bu_men_ = this.position
+                this.infoFxssbData.bian_zhi_bu_men_ = mainPost
                 this.infoFxssbData.bian_zhi_ren_ = this.userId
                 this.infoFxssbData.bian_zhi_shi_jian = dayjs().format('YYYY-MM-DD HH:mm:ss')
                 this.infoFxssbData.zu_chang_id_ = this.userId