From cf6c031956617baa26d38081095ff1b5ad8a8f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 10:11:41 +0800
Subject: [PATCH 01/13] =?UTF-8?q?52463=20=E6=9C=AA=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E9=A1=B9=E6=B5=81=E7=A8=8B=20=E4=BB=8E=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=BF=9B=E5=85=A5=EF=BC=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81=EF=BC=8C=E6=94=BE?=
 =?UTF-8?q?=E5=88=B0=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzzqyj/step4-1.vue           |  4 ++--
 .../pages/creatProcess/wfhxzg/step5-1.vue           | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index ee6c9d4e7..76c0f7e02 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -463,8 +463,8 @@
                         this.form.textType = data.textType || data.form.textType
                         this.form.modelList = data.modelList || data.form.modelList
                         this.commentText41 = data.commentText41 || ''
-                        this.form.bzfgId = data.startUser
-                        this.form.bzfgName = data.startUserName
+                        this.form.bzfgId = data.startUser  || data.form.startUser
+                        this.form.bzfgName = data.startUserName || data.form.startUserName
                         this.json = data
                         this.data = data.info || data.data
                     }).catch(e => {
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
index 210b87d1f..67b82b874 100644
--- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
@@ -49,19 +49,6 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-collapse accordion>
-        <el-collapse-item title="审批意见">
-          <div style="margin: 10px 0;">
-            <el-input
-              type="textarea"
-              :rows="3"
-              resize="none"
-              placeholder="请输入意见"
-              v-model="commentText">
-            </el-input>
-          </div>
-        </el-collapse-item>
-      </el-collapse>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">

From b286fc64e1230a775ba6daeb0a5aa8d7b895e7ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 10:13:37 +0800
Subject: [PATCH 02/13] =?UTF-8?q?52440=20=E9=A1=B9=E7=9B=AE=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B:=E5=B8=A6?=
 =?UTF-8?q?=E5=85=A5=E4=B9=8B=E5=89=8D=E8=B7=91=E8=BF=87=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=20=E4=B8=80=E4=BA=9B=E6=95=B0=E6=8D=AE=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=20=E5=A6=82=E7=8A=B6=E6=80=81=20=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/xmqdqr/step1.vue     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
index bb37f80bd..8138cfef5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
@@ -512,7 +512,7 @@
               width="150"
               label="新车型实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.xcxssrq ? scope.row.xcxssrq.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.xcxssrq }}</span>
               </template>
             </el-table-column>
@@ -521,7 +521,7 @@
               width="150"
               label="在产车实施日期">
               <template slot-scope="scope">
-                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                <span v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'" style="color: #F56C6C">{{ scope.row.zccssrq ? scope.row.zccssrq.substring(0, 10) : '-' }}</span>
                 <span v-else>{{ scope.row.zccssrq }}</span>
               </template>
             </el-table-column>
@@ -1262,8 +1262,8 @@ export default {
           if(item.zrbm === '[]'){
             item.zrbm = ''
           }
-          this.$set(item, 'zccssrq', item.zccssrqgj)
-          this.$set(item, 'xcxssrq', item.xcxssrqgj)
+          this.$set(item, 'zccssrq', item.zccssrqgj || item.zccssrq)
+          this.$set(item, 'xcxssrq', item.xcxssrqgj || item.xcxssrq)
         })
       });
     },

From c5e75302fb4bf9350d5fa105a0d25c30bc9ff8c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 10:42:35 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
index e75101f69..b940e3705 100644
--- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
@@ -1256,6 +1256,7 @@ export default {
     },
     standSelectChange (data) {
       this.selectedList = []
+      this.selectedList1 = []
       this.selectedAllList = data
       for (let i = 0; i < data.length; i++) {
         this.selectedList.push(data[i].id)
@@ -1431,6 +1432,7 @@ export default {
             this.parentNode = cur[i]
           }
           this.zNodes = str
+          console.log(this.zNodes);
         }
         // 查完左侧目录后，如果没有选中的，设置最外层选中
         if (JSON.stringify(this.selectSarMenu) === '{}') {

From 5918983f4ebfef45088ae66bc05dca445ce23eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 10:55:50 +0800
Subject: [PATCH 04/13] =?UTF-8?q?52437=20=E6=A0=87=E5=87=86=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B--=E6=92=A4?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E8=8D=89=E7=A8=BF=EF=BC=8C=E5=86=8D=E4=BB=8E?=
 =?UTF-8?q?=E8=8D=89=E7=A8=BF=E7=82=B9=E4=BF=9D=E5=AD=98=EF=BC=8C=E8=8D=89?=
 =?UTF-8?q?=E7=A8=BF=E4=BC=9A=E5=A4=9A=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzpg/step1.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
index 0ae38b787..2e5b490eb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue
@@ -910,6 +910,7 @@ export default {
         this.saveLoading = true;
         this.listForm.dataList = this.dataList
         let _formData = new FormData();
+        _formData.append("id", this.bpnId || "");
         _formData.append("createUser", this.$store.getters.userInfo.userId);
         _formData.append("createUserName", this.$store.getters.userInfo.uName);
         _formData.append("prcType", "5");

From 0c99036ed557e6b918b04c3f009a000004c4fcd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 11:25:45 +0800
Subject: [PATCH 05/13] =?UTF-8?q?52397=20=E6=A0=87=E5=87=86=E8=B0=83?=
 =?UTF-8?q?=E7=A0=94=E6=B5=81=E7=A8=8B=EF=BC=9A=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E7=95=8C=E9=9D=A2=20=E6=92=A4=E5=9B=9E=E4=B8=A4?=
 =?UTF-8?q?=E6=AC=A1=E5=90=8E=20=E8=8D=89=E7=A8=BF=E5=90=8E=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=B2=A1=E6=9C=89=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=2014=EF=BC=9A31=E7=9A=84=E9=82=A3=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
index 02df7e9a0..fea768a4a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
@@ -575,7 +575,6 @@
                             if (valid) {
                                 this.isSubmit = true
                                 this.$http.post('lawss/activiti/startProcessRollBack', {
-                                  id:  '',
                                   createUser: this.$store.getters.userInfo.userId,
                                   createUserName: this.$store.getters.userInfo.userName,
                                   type: '2',

From 59b321300081ccab93ebecf549e76d7e7cda308f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 13:46:51 +0800
Subject: [PATCH 06/13] =?UTF-8?q?52471=20=E9=A1=B9=E7=9B=AE=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B:=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E7=BB=93=E6=9D=9F=E5=90=8E=EF=BC=8C=E7=9B=91=E6=8E=A7?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E8=BF=9B=E5=85=A5=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=20=E6=9F=A5=E7=9C=8B=E6=95=B0=E6=8D=AE=E8=AF=A6=E6=83=85=20?=
 =?UTF-8?q?=E5=B0=86=E5=9B=9E=E6=89=A7=E8=AF=B4=E6=98=8E=E5=88=A0=E6=8E=89?=
 =?UTF-8?q?=E5=90=A7=20=E5=9C=A8=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E9=87=8C=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmqdqr/step1-4.vue        | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
index c09761aaa..cdc5a06fb 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
@@ -126,22 +126,6 @@
           label="在产车实施日期">
         </el-table-column>
       </el-table>
-      <div>
-        <el-collapse accordion>
-          <el-collapse-item title="回执说明">
-            <div style="margin: 10px 0;">
-              <el-input
-                :disabled="this.$route.query.unShowReceipt"
-                type="textarea"
-                :rows="3"
-                resize="none"
-                placeholder="请输入意见"
-                v-model="commentText">
-              </el-input>
-            </div>
-          </el-collapse-item>
-        </el-collapse>
-      </div>
     </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list" style="height: 100%">

From 7e515cace49918a318f9dd844fb0476141871a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 14:15:12 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=94=E6=AD=A5=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzzqyj/step1-1.vue     |  1 -
 .../pages/creatProcess/bzzqyj/step1.vue       |  2 --
 .../pages/creatProcess/bzzqyj/step2.vue       |  1 -
 .../pages/creatProcess/bzzqyj/step3.vue       |  1 -
 .../pages/creatProcess/bzzqyj/step4-1.vue     |  4 ++--
 .../pages/creatProcess/bzzqyj/step4-2.vue     |  4 ++--
 .../pages/creatProcess/bzzqyj/step4.vue       |  4 ++--
 .../pages/creatProcess/bzzqyj/step5.vue       | 20 +++++++++----------
 8 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
index 91b471bb3..ede994365 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
@@ -39,7 +39,6 @@
                   <el-date-picker
                           v-model="form.endTime"
                           type="date"
-                          value-format="yyyy-MM-dd"
                           :picker-options="pickerOptions"
                           placeholder="请选择结束日期">
                   </el-date-picker>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index f477a26c5..18460cb17 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -38,9 +38,7 @@
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     v-model="form.endTime"
-                    :picker-options="pickerOptions"
                     type="date"
-                    value-format="yyyy-MM-dd"
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index eb6f21c9e..84ca37fc6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -37,7 +37,6 @@
                     disabled
                     v-model="form.endTime"
                     type="date"
-                    value-format="yyyy-MM-dd"
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 6e876e8b2..7289b73bc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -35,7 +35,6 @@
                                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             disabled
-                                            value-format="yyyy-MM-dd"
                                             v-model="form.endTime"
                                             type="date"
                                             placeholder="请选择结束日期">
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index 76c0f7e02..2ced168e3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -34,7 +34,6 @@
                                 </el-form-item>
                                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                                     <el-date-picker
-                                      value-format="yyyy-MM-dd"
                                             disabled
                                             v-model="form.endTime"
                                             type="date"
@@ -407,7 +406,8 @@
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
                         this.isSubmit = true
-                        var json = this.json
+                        let json = this.json
+                        json.info = this.data
                         json.commentText = this.commentText41
                         json.bzfgId = this.form.bzfgId
                         json.bzfgName = this.form.bzfgName
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
index f305809b4..dfe399d15 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
@@ -37,7 +37,6 @@
                                             disabled
                                             v-model="form.endTime"
                                             type="date"
-                                            value-format="yyyy-MM-dd"
                                             placeholder="请选择结束日期">
                                     </el-date-picker>
                                 </el-form-item>
@@ -397,7 +396,8 @@
             },
             handleSubmit() {
                 this.isSubmit = true
-                var json = this.json
+                let json = this.json
+                json.info = this.data
                 json.commentText = this.commentText42
                 json.bzFlag = '0'
                 this.$http.post('lawss/activiti/completeTask', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 12a5a2ebe..fe5399ae3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -35,7 +35,6 @@
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
-                    value-format="yyyy-MM-dd"
                     v-model="form.endTime"
                     type="date"
                     placeholder="请选择结束日期">
@@ -645,10 +644,11 @@ export default {
       this.$refs['bzzqyjForm'].validate((valid) => {
         if (valid) {
           this.isSubmit = true
-          var json = this.json
+          let json = this.json
           json.actionFlag = 0
           json.commentText = this.commentText4
           json.spId = this.form.spId
+          json.info = this.data
           json.spName = this.form.spName
           this.$http.post('lawss/activiti/completeTask', {
             json: JSON.stringify(json),
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 2caa67e8c..a9f199be1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -626,6 +626,16 @@
             this.form.textType = data.form ? data.form.textType : data.textType
             this.form.cid = data.form ? data.form.cid : data.cid
             this.form.endTime = data.form ? data.form.endTime : data.endTime
+            this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
+              endTime: this.form.endTime
+            }, {}, res => {
+              //返回0 流程未到截止日期 不能进行操作
+              if (res.message === '0') {
+                this.clickFlag = false
+              } else {
+                this.clickFlag = true
+              }
+            })
             let newArr = data.info ? data.info : data.form.data
             newArr.forEach(item => {
               if (!item.source) {
@@ -639,16 +649,6 @@
             this.json = data;
             this.getItemList(data.standId,this.form.textValue)
             this.data = newArr
-            this.$http.get('slrs/sar-public-idea-all/checkIsShow', {
-              endTime: this.form.endTime
-            }, {}, res => {
-              //返回0 流程未到截止日期 不能进行操作
-              if (res.message === '0') {
-                this.clickFlag = false
-              } else {
-                this.clickFlag = true
-              }
-            })
             if (data.introduce) {
             } else {
               this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {

From 3bad17dfbc520485c10393daffce7f0bef14b57e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 14:27:59 +0800
Subject: [PATCH 08/13] =?UTF-8?q?52488=20=E6=A0=87=E5=87=86=E8=A7=A3?=
 =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B=EF=BC=9A=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=20=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98=E5=90=8E?=
 =?UTF-8?q?=E5=9C=A8=E8=8D=89=E7=A8=BF=E7=95=8C=E9=9D=A2=E4=B8=AD=20?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=B8=A2=E5=A4=B1=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E6=95=B0=E6=8D=AEUI=E4=B9=9F=E9=94=99=E4=B9=B1?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzjd/step1-1.vue       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index dad1a6582..1619e062f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -14,6 +14,7 @@
                 <el-form
                         ref="bzzqyjForm"
                         :model="form"
+                        :rules="formRules"
                         class="label-input-form"
                         label-width="210px"
                 >
@@ -568,14 +569,17 @@
                     itemsName1: '',
                     oldNumber: ''
                 },
-                formRules: {
-                    itemsNum: [
-                        { required: true, message: '请输入标准号/政策号', trigger: 'change' },
-                    ],
-                    itemsName: [
-                        { required: true, message: '请输入标准名称/政策名称', trigger: 'change' },
-                    ],
-                },
+              formRules: {
+                itemsNum: [
+                  {required: true, message: '请输入标准号/政策号', trigger: 'change'},
+                ],
+                itemsName: [
+                  {required: true, message: '请输入标准名称/政策名称', trigger: 'change'},
+                ],
+                endTime: [
+                  {required: true, message: '请输入截止时间', trigger: 'change'},
+                ],
+              },
                 // 标准征求意见数据可库
                 standCommonlySearch: {
                     numOrName: '',

From 0b276f1bfced32300a73aebec97fb60aa28ed60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 16:03:13 +0800
Subject: [PATCH 09/13] =?UTF-8?q?52503=20=20=E6=A0=87=E5=87=86=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzpg/step5.vue         | 23 ++++++++++++-------
 .../pages/creatProcess/xmpg/step3.vue         |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index e784e848d..cb1835263 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -807,13 +807,22 @@ export default {
         this.isSubmit = false
       })
     },
-    handlePrice(){
-      for (let i = 0; i < this.dataList.length; i++) {
-        if (this.dataList[i].complianceReasons|| (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
-        }else {
-          this.comFlag ++
+    handlePrice() {
+      this.dataList.forEach(item =>{
+        if(item.complianceReasons){
+          this.comFlag = 0;
+          return
+        }else{
+          for (let i = 0; i < this.dataList.length; i++) {
+            if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
+              this.comFlag = 0;
+              return;
+            } else {
+              this.comFlag++;
+            }
+          }
         }
-      }
+      })
     },
     //提交事件
     handleSubmit() {
@@ -842,8 +851,6 @@ export default {
             this.listForm.dataList = this.dataList;
             const json = JSON.stringify(this.listForm);
             this.isSubmit = true
-            console.log('可以提交');
-            return
             this.$http.post("lawss/activiti/completeTask", {
               taskIds: this.taskIds,
               userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index f0a787ece..ef7a2600f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -860,7 +860,7 @@ export default {
           return
         }else{
           for (let i = 0; i < this.dataList.length; i++) {
-            if (this.dataList[i].complianceReasons || this.dataList[i].remarks || (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
+            if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
               this.comFlag = 0;
               return;
             } else {

From 7ddb8cf4ad33e968ee4ec55476546406ca7c637f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 16:57:11 +0800
Subject: [PATCH 10/13] =?UTF-8?q?52456=20=E3=80=90=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=89=80=E6=9C=89=E6=B5=81=E7=A8=8B=E6=8A=8A?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8E=86=E5=8F=B2=E7=9A=84=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=EF=BC=8C=EF=BC=8C=E4=B8=94=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=B6=E5=88=86=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/phoneHistortTable/index.vue    | 12 ++--
 .../pages/phone/bzzqyj/step2.vue              | 58 +------------------
 .../pages/phone/bzzqyj/step4-1.vue            | 58 +------------------
 .../pages/phone/bzzqyj/step4-2.vue            | 58 +------------------
 4 files changed, 10 insertions(+), 176 deletions(-)

diff --git a/src/components/phoneHistortTable/index.vue b/src/components/phoneHistortTable/index.vue
index 798ac4b3a..cbbf258a9 100644
--- a/src/components/phoneHistortTable/index.vue
+++ b/src/components/phoneHistortTable/index.vue
@@ -11,38 +11,40 @@
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
             <el-table-column
                     prop="name"
+                    min-width="100"
                     label="任务步骤"
                     align="center"
-                    sortable="custom"
             >
             </el-table-column>
             <el-table-column
                     prop="assignee"
+                    min-width="100"
                     label="任务受理人"
                     align="center"
-                    sortable="custom"
             >
             </el-table-column>
             <el-table-column
                     prop="createTime"
                     label="创建时间"
-                    sortable="custom"
+                    min-width="100"
                     align="center">
                 <template slot-scope="scope">
-                    <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+                    <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="endTime"
                     label="完成时间"
+                    min-width="100"
                     align="center">
                 <template slot-scope="scope">
-                    <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
+                    <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
                 </template>
             </el-table-column>
             <el-table-column
                     prop="comment"
                     label="流程信息"
+                    min-width="100"
                     align="center">
                 <template slot-scope="scope">
                     <span>{{ scope.row.commentText }}</span>
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
index 9af50f9d4..422b249dd 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue
@@ -74,63 +74,7 @@
             </el-collapse>
         </div>
         <div class="content" v-show="active === '2'">
-            <el-table
-                    height="100%"
-                    ref="selection"
-                    :data="histortData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                    border
-                    row-key="id"
-                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-                <el-table-column
-                        prop="name"
-                        label="任务步骤"
-                        align="center"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="assignee"
-                        label="任务受理人"
-                        align="center"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        sortable="custom"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="endTime"
-                        label="完成时间"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="comment"
-                        label="流程信息"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.commentText }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="completeFlag"
-                        label="状态"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
-                    </template>
-                </el-table-column>
-            </el-table>
+          <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
         </div>
         <ProcessFooter
                 show-submit
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
index 51e09cd22..4042712c4 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
@@ -143,63 +143,7 @@
             </el-collapse>
         </div>
         <div class="content" v-show="active === '2'">
-            <el-table
-                    height="100%"
-                    ref="selection"
-                    :data="histortData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                    border
-                    row-key="id"
-                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-                <el-table-column
-                        prop="name"
-                        label="任务步骤"
-                        align="center"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="assignee"
-                        label="任务受理人"
-                        align="center"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        sortable="custom"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="endTime"
-                        label="完成时间"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="comment"
-                        label="流程信息"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.commentText }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="completeFlag"
-                        label="状态"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
-                    </template>
-                </el-table-column>
-            </el-table>
+          <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
         </div>
         <ProcessFooter
                 show-submit
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
index d571d1a9e..dcb19a793 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
@@ -130,63 +130,7 @@
             </el-collapse>
         </div>
         <div class="content" v-show="active === '2'">
-            <el-table
-                    height="100%"
-                    ref="selection"
-                    :data="histortData"
-                    tooltip-effect="dark"
-                    style="width: 100%"
-                    border
-                    row-key="id"
-                    :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
-                <el-table-column
-                        prop="name"
-                        label="任务步骤"
-                        align="center"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="assignee"
-                        label="任务受理人"
-                        align="center"
-                        sortable="custom"
-                >
-                </el-table-column>
-                <el-table-column
-                        prop="createTime"
-                        label="创建时间"
-                        sortable="custom"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="endTime"
-                        label="完成时间"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="comment"
-                        label="流程信息"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.commentText }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                        prop="completeFlag"
-                        label="状态"
-                        align="center">
-                    <template slot-scope="scope">
-                        <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
-                    </template>
-                </el-table-column>
-            </el-table>
+          <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
         </div>
         <ProcessFooter
                 show-submit

From fd411472a1fb4fa9e8cca95075f31bf58b03efe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 17:11:49 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E5=90=8D=E7=A7=B0=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzpg/step6.vue   | 2 +-
 src/pages/processCenter/pages/phone/bzqdfb/step4.vue | 6 +++---
 src/pages/processCenter/pages/phone/bzzqyj/step6.vue | 2 +-
 src/pages/processCenter/pages/phone/bzzqyj/step7.vue | 2 +-
 src/pages/processCenter/pages/phone/xmpg/step4.vue   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue
index 88d2b3f31..bf3fb6576 100644
--- a/src/pages/processCenter/pages/phone/bzpg/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue
@@ -2,7 +2,7 @@
   <div class="phoneXmpgStep6 phoneBox">
     <ProcessHeaderPhone toggle>
       <template slot="proName">标准合规评估流程</template>
-      <template slot="proNode">产品线责任人审批</template>
+      <template slot="proNode">审核2</template>
     </ProcessHeaderPhone>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
index 235eacfce..b00a935c0 100644
--- a/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzqdfb/step4.vue
@@ -3,7 +3,7 @@
   <div class="phoneBzqdfbStep4 phoneBox">
     <ProcessHeaderPhone toggle>
       <template slot="proName">标准清单发布/更新流程</template>
-      <template slot="proNode">业务经理审批</template>
+      <template slot="proNode">批准</template>
     </ProcessHeaderPhone>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -447,8 +447,8 @@ export default {
         _this: this
       }, res => {
         if (res.success) {
-          this.$message.success(res.message);
-          window.history.back()
+          this.$message.success(res.message)
+          this.$router.push('/processCenter')
         }
         this.isSubmit = false
       });
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
index 46f86870f..c59234c08 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue
@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准征求意见流程</template>
-            <template slot="proNode">责任人会签</template>
+            <template slot="proNode">会签</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
index f8884928b..e49f79f2b 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step7.vue
@@ -3,7 +3,7 @@
         <!--    标准调研流程-->
         <ProcessHeaderPhone toggle>
             <template slot="proName">标准征求意见流程</template>
-            <template slot="proNode">部长及对接人审核</template>
+            <template slot="proNode">审核</template>
         </ProcessHeaderPhone>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
diff --git a/src/pages/processCenter/pages/phone/xmpg/step4.vue b/src/pages/processCenter/pages/phone/xmpg/step4.vue
index 4ac9b67ab..5c84f67b2 100644
--- a/src/pages/processCenter/pages/phone/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/phone/xmpg/step4.vue
@@ -2,7 +2,7 @@
   <div class="phoneXmpg2Step12 phoneBox">
     <ProcessHeaderPhone toggle>
       <template slot="proName">项目合规评估流程</template>
-      <template slot="proNode">产品工程经理审核</template>
+      <template slot="proNode">审核</template>
     </ProcessHeaderPhone>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

From a243b3dc0b4822601610b12bd41de787648df8e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 17:26:10 +0800
Subject: [PATCH 12/13] =?UTF-8?q?52474=20=E3=80=90=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E3=80=91=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F?=
 =?UTF-8?q?=E8=A7=81=E6=B5=81=E7=A8=8B=20=E6=84=8F=E8=A7=81=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E8=8A=82=E7=82=B9=E7=9A=84=E5=85=B6=E4=BB=96=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E6=B2=A1=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/phone/bzzqyj/step4-1.vue            | 51 +++++++++----------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
index 4042712c4..30fdcc7fd 100644
--- a/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
@@ -362,34 +362,29 @@
             }
 
           },
-            getData() {
-                return new Promise((resolve, reject) => {
-                    inboundLiaisonDetail({
-                        taskIds: this.taskIds,
-                        pId: this.pId
-                    }).then(res => {
-                        let data = JSON.parse(res.mesg)
-                        this.form.fjList = data.fjList || data.form.fjList
-                        if (data.fjListId === '') {
-                            this.form.fjListId = ''
-                        } else {
-                            this.form.fjListId =  data.form.fjListId || data.fjListId
-                        }
-                        this.commentText41 = data.commentText41 || ''
-                        this.form.bzfgId = data.startUser
-                        this.form.bzfgName = data.startUserName
-                        this.form.cid = data.cid || data.form.cid
-                        this.form.endTime = data.endTime || data.form.endTime
-                        this.form.cname = data.cname || data.form.cname
-                        this.form.textType = data.textType || data.form.textType
-                        this.form.modelList = data.modelList || data.form.modelList
-                        this.form.modelNameList = data.modelNameList || data.form.modelNameList
-                        this.json = data
-                        this.data = data.info || data.data
-                    }).catch(e => {
-                    })
-                })
-            },
+          getData() {
+            return new Promise((resolve, reject) => {
+              inboundLiaisonDetail({
+                taskIds: this.taskIds,
+                pId: this.pId
+              }).then(res => {
+                let data = JSON.parse(res.mesg)
+                this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
+                this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
+                this.form.fjList = data.fjList || data.form.fjList
+                this.form.cid = data.cid || data.form.cid
+                this.form.endTime = data.endTime || data.form.endTime
+                this.form.textType = data.textType || data.form.textType
+                this.form.modelList = data.modelList || data.form.modelList
+                this.commentText41 = data.commentText41 || ''
+                this.form.bzfgId = data.startUser  || data.form.startUser
+                this.form.bzfgName = data.startUserName || data.form.startUserName
+                this.json = data
+                this.data = data.info || data.data
+              }).catch(e => {
+              })
+            })
+          },
         },
         mounted() {
             this.getHistoryData()

From 20f3472714fbf494a81f05818ed0f53beaf7222d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 17:47:47 +0800
Subject: [PATCH 13/13] =?UTF-8?q?52070=20=E6=9D=83=E9=99=90=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/details/otherBussStandardDetails/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue
index 473bb475f..8dc89e209 100644
--- a/src/pages/details/otherBussStandardDetails/index.vue
+++ b/src/pages/details/otherBussStandardDetails/index.vue
@@ -2295,7 +2295,7 @@ export default {
           _this: this
         }, res => {
           this.sarStandardsInfoEO = res.data || {}
-          if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/FT P') !== -1) {
+          if (this.sarStandardsInfoEO.standCode && this.sarStandardsInfoEO.standCode.indexOf('Q/QCBFC') !== -1) {
             this.QFTP = true
           }
           // this.textOptions.forEach(item => {