From f83f5e35899ac767c4f87eaa61b6388b6494931b Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 31 Dec 2021 14:46:14 +0800
Subject: [PATCH 1/3] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 2 +-
 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index 7f1faad02..408e2fc85 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -421,7 +421,7 @@
               </div>
             </div>
           </div>
-          <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
+          <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
             <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
               <el-input
                       v-model="plForm.technicalRequir"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index b064974c3..cb9ddd400 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -291,7 +291,7 @@
                 :wrapperClosable="false"
                 size="800px">
             <div class="demo-drawer-content">
-                <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
+                <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150  style="width: 100%;">
                     <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
                         <el-input
                                 v-model="plForm.technicalRequir"

From f0c9163df161e9f88fd23f120c767b591f5af22b Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 31 Dec 2021 15:44:33 +0800
Subject: [PATCH 2/3] commit

---
 .../CustomFormComponents/InputForAllStandards2.vue        | 2 +-
 .../processCenter/pages/creatProcess/bzzqyj/step3.vue     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue
index a69bd111f..a9f6f123d 100644
--- a/src/components/CustomFormComponents/InputForAllStandards2.vue
+++ b/src/components/CustomFormComponents/InputForAllStandards2.vue
@@ -335,7 +335,7 @@
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
                     total: 0,
-                    standType: 'ALL',
+                    standType: 'INLAND',
                     quoteIdList: '',
                     validFlag: '0'
                 }
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 893a085af..4807528be 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -562,6 +562,7 @@
                 let _formData = new FormData();
                 let json = this.form
                 json.data = this.data
+                json.onlyKey = this.onlyKey
                 _formData.append("id", this.bpnId || "");
                 _formData.append("prcType", "3");
                 _formData.append("taskIds", this.taskIds);
@@ -635,10 +636,11 @@
                     else {
                         this.isSubmit = true
                         var json = this.json
-                        json.commentText = this.commentText
+                        json.commentText = this.commentText3
                         json.info = this.data
                         json.form = this.form
                         json.department = this.$store.getters.userInfo.orgName
+                        json.onlyKey = this.onlyKey
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -662,7 +664,6 @@
                 }, {}, res => {
                     if (res.ok) {
                         this.options = res.data.list
-                        console.log(res);
                     }
                 }, e => {
                 })
@@ -696,10 +697,9 @@
                         this.form.endTime = data.endTime || data.form.endTime
                         this.todoId = res.id
                         this.json = data
+                        this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
                         this.getItemList(data.standId,data.textType)
                         this.data = data.info || data.data || data.form.data || []
-                        this.onlyKey = data.onlyKey
-                        console.log(data);
                     }).catch(e => {
                     })
                 })

From 40dee75a660fbe74a0d69abab4162fed8357ef0e Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 31 Dec 2021 15:56:01 +0800
Subject: [PATCH 3/3] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 6 +++++-
 src/pages/processCenter/pages/creatProcess/bzjd/step4.vue | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index cb9ddd400..f60530f31 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -464,6 +464,7 @@
         name: "bzjdStep3",
         data() {
             return {
+                AOLIGEI: '',
                 commentText3: '',
                 BDtext: false,
                 itemsNum: '',
@@ -746,7 +747,8 @@
                     roleForm: this.roleForm,
                     commentText3: this.commentText3,
                     itemList: this.itemList,
-                    standInData: this.sarType
+                    standInData: this.sarType,
+                    AOLIGEI: this.AOLIGEI
                 }))
                 saveTaskForPub(_formData).then(res => {
                     this.saveLoading = false
@@ -826,6 +828,7 @@
                             var json = this.json
                             json.commentText = this.commentText3
                             json.itemList = this.itemList
+                            json.AOLIGEI = this.AOLIGEI
                             this.$http.post('lawss/activiti/completeTask', {
                                 json: JSON.stringify(json),
                                 taskId: this.taskIds,
@@ -858,6 +861,7 @@
                             this.acceptShow = false
                             this.submitShow = true
                         }
+                        this.AOLIGEI = data.AOLIGEI
                         this.commentText3 = data.commentText3 || ''
                         this.todoId = res.id
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index ae7cf116b..1095dfb25 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -441,7 +441,6 @@
                 var json = this.json
                 json.resolveFlag = 1
                 json.commentText = this.commentText4
-                json.AOLIGEI = this.AOLIGEI
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,