diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue
index d33c1a176..9e3ef0db1 100644
--- a/src/components/CustomFormComponents/InputForAllStandards.vue
+++ b/src/components/CustomFormComponents/InputForAllStandards.vue
@@ -21,6 +21,7 @@
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws"
+ :disabled="disabled"
v-if="(processModel && !disabled) || !processModel"
>{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}
diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue
index 48ffe0938..a69bd111f 100644
--- a/src/components/CustomFormComponents/InputForAllStandards2.vue
+++ b/src/components/CustomFormComponents/InputForAllStandards2.vue
@@ -21,6 +21,7 @@
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws"
+ :disabled="disabled"
v-if="(processModel && !disabled) || !processModel"
>{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
index 4ef4b219b..0a73ae122 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
@@ -137,8 +137,8 @@
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
- row-key="id"
>
+
@@ -1740,6 +1742,7 @@ import {interfaceUrl} from "@/sysConfig"; import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import store from "@/store"; +import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import ProcessTitle from '@/pages/processCenter/pages/components/ProcessTitle' @@ -1765,6 +1768,7 @@ export default { CustomDatePickWithText2, TreeSelect, TreeSelectNew, + treeSelectModule, ProcessTitle }, data() { @@ -2281,11 +2285,11 @@ export default { {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'} ], standName: [ - {required: true, message: '中文名称不能为空', trigger: 'change'}, + {required: false, message: '中文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'} ], standEnName: [ - {required: true, message: '英文名称不能为空', trigger: 'change'}, + {required: false, message: '英文名称不能为空', trigger: 'change'}, {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'} // {validator: this.verify.valiateEnName, trigger: 'blur'} ], @@ -2587,7 +2591,8 @@ export default { this.modalShowFlag3 = false }, popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) { - if (checkedData) { + console.log(checkedData) + if (checkedData && checkedData.length != 0) { if (checkedData.length > 0) { this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",") this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",") @@ -2595,8 +2600,8 @@ export default { this.sarStandardsInfoEO.DYBXH = checkedData.model this.sarStandardsInfoEO.DYMC = checkedData.name } + this.modalShowFlag4 = false } - this.modalShowFlag4 = false this.$forceUpdate() }, popoverHideModelCancel() { this.modalShowFlag4 = false