From f056983a9cd83f39e41ce5869958ede410fb79e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 9 Dec 2021 15:20:55 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/xmqdqr/step3.vue    | 3 +++
 .../processCenter/pages/creatProcess/xmqdqr/step4.vue    | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index 13754d111..83ea9f6df 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -971,6 +971,9 @@ export default {
       if(comFlag > 0){
         this.$message.warning('请填写不涉及的备注信息')
       }else{
+        this.dataList.forEach(item => {
+          this.$set(item, 'standId', item.id)
+        })
         this.isSubmit = true;
         this.qdform.currentPerson = this.$store.getters.userInfo.userName;
         this.qdform.commentText = this.commentText;
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
index 4fa29cf5e..b3f30e9e3 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
@@ -965,6 +965,9 @@ export default {
       if(comFlag > 0){
         this.$message.warning('请填写不涉及的备注信息')
       }else{
+        this.dataList.forEach(item => {
+          this.$set(item, 'standId', item.id)
+        })
         this.isSubmit = true;
         this.qdform.commentText = this.commentText;
         this.qdform.dataList = this.dataList
@@ -1151,6 +1154,8 @@ export default {
           }
         })
         this.handleSelectTableList.map(item => {
+          this.$set(item, 'involve', '涉及')
+          this.$set(item, 'remarks', '')
           let addIndex
           addIndex = this.dataList.findIndex(items =>{
             return items.id === item.id
@@ -1161,10 +1166,6 @@ export default {
             this.dataList.push(item)
           }
         })
-        this.dataList.forEach(item => {
-          this.$set(item, 'involve', 'involve')
-          this.$set(item, 'remarks', '')
-        })
         this.standModel = false
       }
     },

From ae63963e18aa548f369170c8376b5b072313e650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 9 Dec 2021 15:23:50 +0800
Subject: [PATCH 2/9] commit

---
 .../pages/creatProcess/xmqdqr/step3.vue            |  7 -------
 .../pages/creatProcess/xmqdqr/step5.vue            | 14 --------------
 2 files changed, 21 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
index 83ea9f6df..7c7cd75bd 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
@@ -953,13 +953,6 @@ export default {
         this.saveLoading = false;
       });
     },
-    handleRemark(){
-      this.dataList.map(item => {
-        if(item.involve === 'noInvolve'){
-          comFlag
-        }
-      })
-    },
     //提交事件
     handleSubmit() {
       let comFlag = 0
diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
index 5957262a2..46192be92 100644
--- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
@@ -442,13 +442,6 @@ export default {
           this.qdform.prcName = this.prcName;
           this.qdform["id"] = item.id;
           this.dataList = item.dataList
-          this.dataList.forEach(item => {
-            if(item.involve === 'involve'){
-              item.involve = '涉及'
-            }else if(item.involve === 'noInvolve'){
-              item.involve = '不涉及'
-            }
-          })
           // this.projectId = item.projectId;
           // //获取清单id 查询对应清单下的标准
           // this.detailedId = item.detailedListId;
@@ -520,13 +513,6 @@ export default {
         this.saveLoading = false;
       });
     },
-    handleRemark(){
-      this.dataList.map(item => {
-        if(item.involve === 'noInvolve'){
-          comFlag
-        }
-      })
-    },
     //驳回事件
     beforeBack() {
       if (this.commentText === null || this.commentText === undefined || this.commentText === "") {

From ef31c1b885c09d1e137c372ff220374cfbb1271e Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 9 Dec 2021 16:04:48 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzhHd-rh/step2.vue          | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index b00874457..0154e6ff5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -467,20 +467,6 @@ export default {
     /deep/ .el-table th {
       padding: 0px;
     }
-
-    .hover_container{
-      width: 50%;
-      color: #fff;
-      background-color: #8b8c89;
-      border: 1px solid #ccc;
-      border-radius: 8px;
-      text-align: center;
-      line-height: 20px;
-      position: absolute;
-      left: 50px;
-      z-index: 99;
-      transform: translateY(-88%);
-    }
   }
 }
 </style>

From f439c51594ab28a6f70e1e35059f5ae14551d7a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 9 Dec 2021 16:10:03 +0800
Subject: [PATCH 4/9] commit

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

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 454ec21e2..d420e291a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -1052,7 +1052,7 @@ export default {
       this.getStandData();
     },
     getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
         standType: this.standardSearch.standType,
         standNumber: this.standardSearch.standNumber,
         page: this.pageNo,
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 99f5c7d9d..e5b594fca 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -984,7 +984,7 @@ export default {
     },
     //查询项目下的标准
     getStandData() {
-      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
         standType: this.standardSearch.standType,
         standNumber: this.standardSearch.standNumber,
         page: this.pageNo,

From 139c221cdca432e10f31a8415aa75a6e59d1aa1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 9 Dec 2021 16:20:02 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1-1.vue     | 18 +++-------------
 .../pages/creatProcess/bzqdfb/step1.vue       | 21 ++-----------------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index d420e291a..1f4c883f5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -134,18 +134,12 @@
             prop="XCXSSRQ"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -645,18 +639,12 @@
                 prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
@@ -1062,9 +1050,9 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-          this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-        });
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
+        })
         this.totalNo = res.data.count;
       }, e => {
       });
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index e5b594fca..03321c95d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -134,18 +134,12 @@
             prop="XCXSSRQ"
             align="center"
             label="新车型实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
             prop="ZCCSSRQ"
             align="center"
             label="在产车实施日期">
-            <template slot-scope="scope">
-              <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -615,18 +609,12 @@
                 prop="XCXSSRQ"
                 align="center"
                 label="新车型实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
                 prop="ZCCSSRQ"
                 align="center"
                 label="在产车实施日期">
-                <template slot-scope="scope">
-                  <span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
@@ -994,13 +982,8 @@ export default {
       }, res => {
         this.standardData = res.data.list;
         this.standardData.forEach(item => {
-          if (item.attrInfoMap === null) {
-            this.$set(item, "ZCCSSRQ", '');
-            this.$set(item, "XCXSSRQ", '');
-          } else {
-            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
-            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
-          }
+            this.$set(item, "ZCCSSRQ", item.zccssrq);
+            this.$set(item, "XCXSSRQ", item.xcxssrq);
         })
         this.totalNo = res.data.count;
       }, e => {

From 16981a3bffa34597786b0f65563c39f49648cd0e Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 9 Dec 2021 16:29:47 +0800
Subject: [PATCH 6/9] commit

---
 .../pages/creatProcess/bzjd/step3.vue         | 232 ++++++++++++++----
 1 file changed, 179 insertions(+), 53 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 438205f66..62df8a028 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -172,11 +172,11 @@
                         width="200"
                         label="核心技术要求"
                         align="center">
-                    <template slot-scope="scope">
-                        <div class="el-input">
-                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求" maxlength="500">
-                        </div>
-                    </template>
+<!--                    <template slot-scope="scope">-->
+<!--                        <div class="el-input">-->
+<!--                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求" maxlength="500">-->
+<!--                        </div>-->
+<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         :disabled="acceptShow"
@@ -185,11 +185,11 @@
                         v-if="form.itemsNum1"
                         label="基于上一版本差异"
                         align="center">
-                    <template slot-scope="scope">
-                        <div class="el-input">
-                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">
-                        </div>
-                    </template>
+<!--                    <template slot-scope="scope">-->
+<!--                        <div class="el-input">-->
+<!--                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">-->
+<!--                        </div>-->
+<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         v-if="sarType === 'FOREIGN' && form.itemsNum1"
@@ -197,11 +197,11 @@
                         width="150"
                         label="相对于国行标差异点"
                         align="center">
-                    <template slot-scope="scope">
-                        <div class="el-input">
-                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >
-                        </div>
-                    </template>
+<!--                    <template slot-scope="scope">-->
+<!--                        <div class="el-input">-->
+<!--                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >-->
+<!--                        </div>-->
+<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
@@ -209,7 +209,8 @@
                         label="符合项状态"
                         align="center">
                     <template slot-scope="scope">
-                        <My-select :disabled="acceptShow" v-model="scope.row.complianceRequir" :options="fhList"></My-select>
+                        {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
+<!--                        <My-select :disabled="acceptShow" v-model="scope.row.complianceRequir" :options="fhList"></My-select>-->
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -217,51 +218,51 @@
                         width="200"
                         label="合规性分析"
                         align="center">
-                    <template slot-scope="scope">
-                        <div class="el-input">
-                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">
-                        </div>
-                    </template>
+<!--                    <template slot-scope="scope">-->
+<!--                        <div class="el-input">-->
+<!--                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">-->
+<!--                        </div>-->
+<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
                         label="新车型实施日期"
                         align="center">
-                    <template slot-scope="scope">
-                        <el-date-picker
-                                :disabled="acceptShow"
-                                v-model.lazy="scope.row.newData"
-                                type="date"
-                                placeholder="选择新车型实施日期">
-                        </el-date-picker>
-                    </template>
+<!--                    <template slot-scope="scope">-->
+<!--                        <el-date-picker-->
+<!--                                :disabled="acceptShow"-->
+<!--                                v-model.lazy="scope.row.newData"-->
+<!--                                type="date"-->
+<!--                                placeholder="选择新车型实施日期">-->
+<!--                        </el-date-picker>-->
+<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
                         width="180"
                         label="在产车型实施日期"
                         align="center">
-                    <template slot-scope="scope">
-                        <el-date-picker
-                                :disabled="acceptShow"
-                                v-model.lazy="scope.row.onlineData"
-                                type="date"
-                                placeholder="选择新车型实施日期">
-                        </el-date-picker>
-                    </template>
+<!--                    <template slot-scope="scope">-->
+<!--                        <el-date-picker-->
+<!--                                :disabled="acceptShow"-->
+<!--                                v-model.lazy="scope.row.onlineData"-->
+<!--                                type="date"-->
+<!--                                placeholder="选择新车型实施日期">-->
+<!--                        </el-date-picker>-->
+<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         prop="applyArctic"
                         width="200"
                         label="适用车型"
                         align="center">
-                    <template slot-scope="scope">
-                        <el-select multiple v-model.lazy="scope.row.applyArctic">
-                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
-                        </el-select>
-<!--                        <My-select :disabled="acceptShow" v-model="scope.row.applyArctic" :options="cxList"></My-select>-->
-                    </template>
+<!--                    <template slot-scope="scope">-->
+<!--                        <el-select multiple v-model.lazy="scope.row.applyArctic">-->
+<!--                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>-->
+<!--                        </el-select>-->
+<!--&lt;!&ndash;                        <My-select :disabled="acceptShow" v-model="scope.row.applyArctic" :options="cxList"></My-select>&ndash;&gt;-->
+<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         prop="unitDeptName"
@@ -275,6 +276,14 @@
                         prop="zrUserIdName"
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        label="操作"
+                        width="150"
+                        align="center">
+                    <template slot-scope="scope">
+                        <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>
+                    </template>
+                </el-table-column>
             </el-table>
             <el-collapse accordion>
                 <el-collapse-item title="回执说明">
@@ -413,18 +422,26 @@
                         ></el-input>
                     </el-form-item>
                     <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
-                        <el-date-picker
+<!--                        <el-date-picker-->
+<!--                                v-model="plForm.newData"-->
+<!--                                type="date"-->
+<!--                                placeholder="选择新车型实施日期">-->
+<!--                        </el-date-picker>-->
+                        <custom-date-pick-group
+                                :config="plForm"
                                 v-model="plForm.newData"
-                                type="date"
-                                placeholder="选择新车型实施日期">
-                        </el-date-picker>
+                        ></custom-date-pick-group>
                     </el-form-item>
                     <el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
-                        <el-date-picker
+<!--                        <el-date-picker-->
+<!--                                v-model="plForm.onlineData"-->
+<!--                                type="date"-->
+<!--                                placeholder="选择在产车实施日期">-->
+<!--                        </el-date-picker>-->
+                        <custom-date-pick-group
+                                :config="plForm"
                                 v-model="plForm.onlineData"
-                                type="date"
-                                placeholder="选择在产车实施日期">
-                        </el-date-picker>
+                        ></custom-date-pick-group>
                     </el-form-item>
                     <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
                         <el-select multiple  v-model="plForm.applyArctic">
@@ -438,6 +455,73 @@
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
             </div>
         </el-drawer>
+        <el-drawer
+                title="编辑"
+                :visible.sync="modalshowflag2"
+                :wrapperClosable="false"
+                size="800px">
+            <div class="demo-drawer-content">
+                <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
+                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
+                        <el-input
+                                v-model="editForm.technicalRequir"
+                                placeholder="请输入核心技术要求"
+                                maxlength="500"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
+                        <el-input
+                                v-model="editForm.changePoint"
+                                placeholder="请输入国内标准的差异点"
+                                maxlength="500"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
+                        <el-input
+                                v-model="editForm.changePoint"
+                                placeholder="请输入上一版本差异点"
+                                maxlength="500"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
+                        <el-select
+                                v-model="editForm.complianceRequir"
+                                placeholder="请选择符合性要求">
+                            <el-option value="1" label="符合"></el-option>
+                            <el-option value="2" label="不符合"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="合规性分析" prop="complianceState" class="add-form-item" >
+                        <el-input
+                                v-model="editForm.complianceState"
+                                placeholder="请输入合规性分析"
+                                maxlength="500"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="新车型实施日期" prop="newData" class="add-form-item" >
+                        <custom-date-pick-group
+                                :config="editForm"
+                                v-model="editForm.newData"
+                        ></custom-date-pick-group>
+                    </el-form-item>
+                    <el-form-item label="在产车实施日期" prop="onlineData" class="add-form-item" >
+                        <custom-date-pick-group
+                                :config="editForm"
+                                v-model="editForm.onlineData"
+                        ></custom-date-pick-group>
+                    </el-form-item>
+                    <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
+                        <el-select multiple  v-model="editForm.applyArctic">
+                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div id="roleFormButton3" class="demo-drawer-footer">
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo2">确定</el-button>
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消</el-button>
+            </div>
+        </el-drawer>
         <el-dialog
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
@@ -452,6 +536,7 @@
 </template>
 
 <script>
+    import CustomDatePickGroup from '@/components/CustomFormComponents/DatePickerGroup'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -462,6 +547,8 @@
         name: "bzjdStep3",
         data() {
             return {
+                modalshowflag2: false,
+                itemId: '',
                 drawerModal: false,
                 //折叠的标志，true为折叠，false为不折叠
                 foldFormFlag: false,
@@ -488,6 +575,15 @@
                     onlineData: '', // 在产车实施日期
                     applyArctic: '', // 适用车型
                 },
+                editForm: {
+                    technicalRequir: '', // 核心技术要求
+                    changePoint: '', // 国内标准的差异点
+                    complianceRequir: '1', // 符合性要求
+                    complianceState: '', // 合规性分析
+                    newData: '', // 新车型实施日期
+                    onlineData: '', // 在产车实施日期
+                    applyArctic: '', // 适用车型
+                },
                 modalshowflag: false,
                 sarType: '',
                 itemList: [],
@@ -513,11 +609,42 @@
             }
         },
         components: {
+            CustomDatePickGroup,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle
         },
         methods: {
+            itemEdit (row) {
+                this.itemId = row.id
+                this.modalshowflag2 = true
+                this.editForm = {
+                    technicalRequir: row.technicalRequir, // 核心技术要求
+                    changePoint: row.changePoint, // 国内标准的差异点
+                    complianceRequir: row.complianceRequir || '1', // 符合性要求
+                    complianceState: row.complianceState, // 合规性分析
+                    newData: row.newData, // 新车型实施日期
+                    onlineData: row.onlineData, // 在产车实施日期
+                    applyArctic: row.applyArctic, // 适用车型
+                }
+            },
+            saveUserInfo2 () {
+                for( let a = 0; a < this.itemList.length; a++) {
+                    if (this.itemList[a].id === this.itemId) {
+                        this.itemList[a].technicalRequir = this.editForm.technicalRequir
+                        this.itemList[a].changePoint = this.editForm.changePoint
+                        this.itemList[a].complianceRequir = this.editForm.complianceRequir
+                        this.itemList[a].complianceState = this.editForm.complianceState
+                        this.itemList[a].newData = this.editForm.newData
+                        this.itemList[a].onlineData = this.editForm.onlineData
+                        this.itemList[a].applyArctic = this.editForm.applyArctic
+                    }
+                }
+                this.modalshowflag2 = false
+            },
+            cancleUserInfo2 () {
+                this.modalshowflag2 = false
+            },
             handleTransfer() {
                 this.drawerModal = true
             },
@@ -570,7 +697,6 @@
                 }, e => {})
             },
             saveUserInfo () {
-                console.log(this.plForm.applyArctic);
                 for( let a = 0; a < this.itemList.length; a++) {
                     for ( let b = 0; b < this.idList.length; b++) {
                         if (this.itemList[a].id === this.idList[b]) {
@@ -755,7 +881,7 @@
                             item.changePoint = item.changePoint || ''
                             item.technicalRequir = item.technicalRequir || ''
                             item.itemsTitle = item.itermsConditions
-                            item.applyArctic = item.applyArctic || ''
+                            item.applyArctic = item.applyArctic || []
                         })
                         this.itemList = itemList
                         this.loading = false

From bbecb00bbf22c9ba2f8829018ccaca830098bf3c Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 9 Dec 2021 16:44:06 +0800
Subject: [PATCH 7/9] commit

---
 .../pages/creatProcess/bzjd/step3.vue         | 56 +++++--------------
 1 file changed, 13 insertions(+), 43 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 62df8a028..bbb1ca9fe 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -171,12 +171,8 @@
                         prop="technicalRequir"
                         width="200"
                         label="核心技术要求"
+                        show-overflow-tooltip
                         align="center">
-<!--                    <template slot-scope="scope">-->
-<!--                        <div class="el-input">-->
-<!--                            <input class="el-input__inner" type="text" v-model.lazy="scope.row.technicalRequir" placeholder="请输入核心技术要求" maxlength="500">-->
-<!--                        </div>-->
-<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         :disabled="acceptShow"
@@ -184,96 +180,70 @@
                         width="150"
                         v-if="form.itemsNum1"
                         label="基于上一版本差异"
+                        show-overflow-tooltip
                         align="center">
-<!--                    <template slot-scope="scope">-->
-<!--                        <div class="el-input">-->
-<!--                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入基于上一版本差异" maxlength="500">-->
-<!--                        </div>-->
-<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         v-if="sarType === 'FOREIGN' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="相对于国行标差异点"
+                        show-overflow-tooltip
                         align="center">
-<!--                    <template slot-scope="scope">-->
-<!--                        <div class="el-input">-->
-<!--                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.changePoint" placeholder="请输入相对于国行标差异点" maxlength="500" >-->
-<!--                        </div>-->
-<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         prop="complianceRequir"
                         width="150"
                         label="符合项状态"
+                        show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
                         {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
-<!--                        <My-select :disabled="acceptShow" v-model="scope.row.complianceRequir" :options="fhList"></My-select>-->
                     </template>
                 </el-table-column>
                 <el-table-column
                         prop="complianceState"
                         width="200"
                         label="合规性分析"
+                        show-overflow-tooltip
                         align="center">
-<!--                    <template slot-scope="scope">-->
-<!--                        <div class="el-input">-->
-<!--                            <input :disabled="acceptShow" class="el-input__inner" type="text" v-model.lazy="scope.row.complianceState" placeholder="请输入合规性分析" maxlength="500">-->
-<!--                        </div>-->
-<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         prop="newData"
                         width="180"
+                        show-overflow-tooltip
                         label="新车型实施日期"
                         align="center">
-<!--                    <template slot-scope="scope">-->
-<!--                        <el-date-picker-->
-<!--                                :disabled="acceptShow"-->
-<!--                                v-model.lazy="scope.row.newData"-->
-<!--                                type="date"-->
-<!--                                placeholder="选择新车型实施日期">-->
-<!--                        </el-date-picker>-->
-<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
                         width="180"
+                        show-overflow-tooltip
                         label="在产车型实施日期"
                         align="center">
-<!--                    <template slot-scope="scope">-->
-<!--                        <el-date-picker-->
-<!--                                :disabled="acceptShow"-->
-<!--                                v-model.lazy="scope.row.onlineData"-->
-<!--                                type="date"-->
-<!--                                placeholder="选择新车型实施日期">-->
-<!--                        </el-date-picker>-->
-<!--                    </template>-->
                 </el-table-column>
                 <el-table-column
                         prop="applyArctic"
                         width="200"
                         label="适用车型"
+                        show-overflow-tooltip
                         align="center">
-<!--                    <template slot-scope="scope">-->
-<!--                        <el-select multiple v-model.lazy="scope.row.applyArctic">-->
-<!--                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>-->
-<!--                        </el-select>-->
-<!--&lt;!&ndash;                        <My-select :disabled="acceptShow" v-model="scope.row.applyArctic" :options="cxList"></My-select>&ndash;&gt;-->
-<!--                    </template>-->
+                    <template slot-scope="scope">
+                        {{ scope.row.applyArctic.toString() }}
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="unitDeptName"
                         label="责任部门"
                         width="200"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column
                         label="责任人"
                         width="170"
                         prop="zrUserIdName"
+                        show-overflow-tooltip
                         align="center">
                 </el-table-column>
                 <el-table-column

From 5fb06ef6d415ec2969b36b31435b3be5fbc485e0 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 9 Dec 2021 16:44:56 +0800
Subject: [PATCH 8/9] commit

---
 src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index bbb1ca9fe..603982bb9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -248,7 +248,7 @@
                 </el-table-column>
                 <el-table-column
                         label="操作"
-                        width="150"
+                        width="100"
                         align="center">
                     <template slot-scope="scope">
                         <el-button class="common-button-primary" size="mini" type="primary" @click="itemEdit(scope.row)">编辑</el-button>

From 5f27865914d6ea3aad2c5158984ab8ec406a29d6 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 9 Dec 2021 16:47:56 +0800
Subject: [PATCH 9/9] commit

---
 .../processCenter/pages/creatProcess/bzjd/step4.vue  | 12 ++++++------
 .../processCenter/pages/creatProcess/bzjd/step5.vue  | 12 ++++++------
 .../processCenter/pages/creatProcess/bzjd/step6.vue  | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index fca2bdbc0..a2a4410af 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -203,27 +203,27 @@
                 </el-table-column>
                 <el-table-column
                         prop="newData"
+                        show-overflow-tooltip
                         width="150"
                         label="新车型实施日期"
                         align="center">
-                    <template slot-scope="scope">
-                        <div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD')  : scope.row.newData }}</div>
-                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
+                        show-overflow-tooltip
                         width="150"
                         label="在产车型实施日期"
                         align="center">
-                    <template slot-scope="scope">
-                        <div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD')  : scope.row.onlineData }}</div>
-                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="applyArctic"
                         width="150"
                         label="适用车型"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.applyArctic.toString() }}
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="unitDeptName"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 5968f545f..ea0f944be 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -202,28 +202,28 @@
                         align="center">
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="newData"
                         width="150"
                         label="新车型实施日期"
                         align="center">
-                    <template slot-scope="scope">
-                        <div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD')  : scope.row.newData }}</div>
-                    </template>
                 </el-table-column>
                 <el-table-column
+                        show-overflow-tooltip
                         prop="onlineData"
                         width="150"
                         label="在产车型实施日期"
                         align="center">
-                    <template slot-scope="scope">
-                        <div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD')  : scope.row.onlineData }}</div>
-                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="applyArctic"
                         width="150"
                         label="适用车型"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.applyArctic.toString() }}
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="unitDeptName"
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 883d60454..20668edd6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -205,26 +205,26 @@
                 <el-table-column
                         prop="newData"
                         width="150"
+                        show-overflow-tooltip
                         label="新车型实施日期"
                         align="center">
-                    <template slot-scope="scope">
-                        <div>{{ scope.row.newData ? $moment(scope.row.newData).format('YYYY-MM-DD')  : scope.row.newData }}</div>
-                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="onlineData"
                         width="150"
+                        show-overflow-tooltip
                         label="在产车型实施日期"
                         align="center">
-                    <template slot-scope="scope">
-                        <div>{{ scope.row.onlineData ? $moment(scope.row.onlineData).format('YYYY-MM-DD')  : scope.row.onlineData }}</div>
-                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="applyArctic"
                         width="150"
                         label="适用车型"
+                        show-overflow-tooltip
                         align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.applyArctic.toString() }}
+                    </template>
                 </el-table-column>
                 <el-table-column
                         prop="unitDeptName"