diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index e64ea2464..60bd786bf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -2760,6 +2760,7 @@
},
popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData && checkedData.length != 0) {
+ console.log(checkedData)
if(checkedData.length > 0){
this.form.dybxh = checkedData.map(item => item.model).join(",")
this.form.dymc = checkedData.map(item => item.name).join(",")
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 6323a4b0f..470c43081 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1111,7 +1111,6 @@
if (res) {
const processForm = JSON.parse(res.mesg)
- console.log("processFrom",processForm)
this.xgdFileId = processForm.xgd
this.fbgbjbdFileId = processForm.fbgbjbd
this.bpgFileId = processForm.bpg
@@ -1217,6 +1216,28 @@
this.isSubmit = true
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+ console.log(this.form)
+ if (this.form.syrz.length === 0) {
+ this.form.syrz = ''
+ }
+ if (this.form.nylx.length === 0) {
+ this.form.nylx = ''
+ }
+ if (this.form.zrbm.length === 0) {
+ this.form.zrbm = ''
+ }
+ if (this.form.qcdw.length === 0) {
+ this.form.qcdw = ''
+ }
+ if (this.form.cllx.length === 0) {
+ this.form.cllx = ''
+ }
+ if (this.form.sycpx.length === 0) {
+ this.form.sycpx = ''
+ }
+ if (this.form.zrgcs.length === 0) {
+ this.form.zrgcs = ''
+ }
const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index d7726bbd4..e1053c5d7 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -1173,9 +1173,9 @@
-
+
-->
-
+
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index b9c174ee1..b84453434 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -317,6 +317,7 @@
:show-checkBox="showCheckBox"
:url="url"
:urlChild="urlChild"
+ @popoverHideCancel = "modalShowFlag2 = false"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs">
@@ -342,6 +343,7 @@
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
:url="url"
+ @popoverHideCancel = "modalShowFlag3 = false"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs">