From cc5265b4582fb1f937163538918ae9f62214b3de Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 21 Dec 2021 09:53:50 +0800
Subject: [PATCH 1/7] commit

---
 .../pages/creatProcess/bzjd/step2.vue         | 24 ++++++++++++------
 .../pages/creatProcess/bzjd/step3.vue         | 25 ++++++++++---------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 6628a95d4..6283b88ff 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -140,7 +140,6 @@
                         label="在产车型实施日期"
                         align="center">
                 </el-table-column>
-
                 <el-table-column
                         label="执行人"
                         width="170"
@@ -387,15 +386,23 @@
                 if (this.type === 1) {
                     this.itemList[this.zxIndex].zxUserId = data[0].id
                     this.itemList[this.zxIndex].zxUserIdName = data[0].name
+                    let row = JSON.parse(JSON.stringify(this.itemList[this.zxIndex]))
+                    row.zxUserId = data[0].id
+                    row.zxUserIdName = data[0].name
+                    this.$set(this.itemList, this.zxIndex, row)
                 } else {
-                    this.itemList.forEach( item => {
-                        this.zxIdList.forEach( items => {
-                            if (item.id === items) {
-                                item.zxUserId = data[0].id
-                                item.zxUserIdName = data[0].name
+                    for (let a = 0; a < this.itemList.length; a++) {
+                        for (let b = 0; b < this.zxIdList.length; b++) {
+                            if (this.itemList[a].id === this.zxIdList[b]) {
+                                this.itemList[a].zxUserId = data[0].id
+                                this.itemList[a].zxUserIdName = data[0].name
+                                let row = JSON.parse(JSON.stringify(this.itemList[a]))
+                                row.zxUserId = data[0].id
+                                row.zxUserIdName = data[0].name
+                                this.$set(this.itemList, a, row)
                             }
-                        })
-                    })
+                        }
+                    }
                 }
                 this.modalshowflag = false
             },
@@ -488,6 +495,7 @@
                             item.zxUserIdName = item.zxUserIdName || ''
                         })
                         this.itemList = arr
+                        console.log(this.itemList);
                         this.loading = false
                     }).catch(e => {
                     })
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 49986e59d..b12aa421e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -836,18 +836,19 @@
                         } else {
                             itemList = data.itemList
                         }
-                        itemList.forEach(item => {
-                            item.unitDeptName = this.$store.getters.userInfo.institutionName
-                            item.onlineData = item.onlineData || ''
-                            item.newData = item.newData || ''
-                            item.complianceState = item.complianceState || ''
-                            item.oldNumber = item.oldNumber || ''
-                            item.complianceRequir = item.complianceRequir || '1'
-                            item.changePoint = item.changePoint || ''
-                            item.technicalRequir = item.technicalRequir || ''
-                            item.itemsTitle = item.itermsConditions
-                            item.applyArctic = item.applyArctic || []
-                        })
+                        console.log(itemList);
+                        // itemList.forEach(item => {
+                        //     item.unitDeptName = this.$store.getters.userInfo.institutionName
+                        //     item.onlineData = item.onlineData || ''
+                        //     item.newData = item.newData || ''
+                        //     item.complianceState = item.complianceState || ''
+                        //     item.oldNumber = item.oldNumber || ''
+                        //     item.complianceRequir = item.complianceRequir || '1'
+                        //     item.changePoint = item.changePoint || ''
+                        //     item.technicalRequir = item.technicalRequir || ''
+                        //     item.itemsTitle = item.itermsConditions
+                        //     item.applyArctic = item.applyArctic || []
+                        // })
                         this.getBDList()
                         this.itemList = itemList
                         this.loading = false

From dba6c6dbaed6941faae3126369c812e5f1f49fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Tue, 21 Dec 2021 10:39:32 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step3.vue         | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 6b91e8d2f..cb4584e91 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -10,13 +10,13 @@
       <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content" v-show="active === '1'">
-      <div style="flex: auto; overflow: auto">
+      <div style=" overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>
         </process-title>
         <el-collapse-transition>
-        <el-form
-            v-if="foldFormFlag === false"
+          <div class="prc-content-border" v-if="foldFormFlag === false">
+         <el-form
           :model="listForm"
           class="label-input-form prc-content-border"
           label-width="150px"
@@ -72,6 +72,7 @@
             </el-col>
           </el-row>
         </el-form>
+          </div>
         </el-collapse-transition>
         <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
         <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
@@ -147,7 +148,7 @@
         </div>
         <el-table
           ref="multipleTable"
-          :data="breakdownList.slice((currentPage - 1) * pageSize, currentPage * pageSize ) "
+          :data="breakdownList"
           style="width: 100%; border: 1px solid #cccccc;height: 400px"
           height="48%"
           border
@@ -225,14 +226,14 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-pagination
-          layout="total,sizes, prev, pager, next"
-          background
-          :page-sizes="[20, 40, 60]"
-          :total="total"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-        />
+<!--        <el-pagination-->
+<!--          layout="total,sizes, prev, pager, next"-->
+<!--          background-->
+<!--          :page-sizes="[20, 40, 60]"-->
+<!--          :total="total"-->
+<!--          @size-change="handleSizeChange"-->
+<!--          @current-change="handleCurrentChange"-->
+<!--        />-->
         <!--    选择责任人-->
         <Role-tree
           is-title="选择落实人"
@@ -657,6 +658,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.projectJson = JSON.parse(JSON.stringify(item));
       this.listForm = JSON.parse(JSON.stringify(item));
       if (item.form === undefined) {
@@ -665,9 +667,11 @@ export default {
         this.listForm["id"] = item.id;
         this.listForm = JSON.parse(JSON.stringify(item.pepdtos[0]));
         let projectLineList = item.pepdtos[0].dataList;
+        let ids = []
         projectLineList.forEach(item => {
-          this.projectLineId = item.productLine;
+           ids.push(item.productLine);
         });
+        this.projectLineId = ids.join(',')
         this.getProject();
       } else {
         this.listForm = item.form;
@@ -679,7 +683,7 @@ export default {
       this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", {
         productLine: this.projectLineId,
         current: this.pageNo,
-        pageSize: this.pageSizeNo,
+        PageSize: this.pageSizeNo,
         projectName: this.standardSearch.projectName,
         projectNumber: this.standardSearch.projectNumber
       }, {

From 6877bdd749b00ad91a4defd8e5ea2c23bcb26d84 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 21 Dec 2021 11:09:44 +0800
Subject: [PATCH 3/7] commit

---
 .../pages/creatProcess/bzjd/step2.vue         |  11 +-
 .../pages/creatProcess/bzjd/step3.vue         | 216 +++++++++---------
 .../pages/creatProcess/bzjd/step4.vue         |   2 +-
 .../pages/creatProcess/bzjd/step5.vue         |   2 +-
 .../pages/creatProcess/bzjd/step6.vue         |   2 +-
 5 files changed, 123 insertions(+), 110 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 6283b88ff..3cfe97df7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -140,6 +140,16 @@
                         label="在产车型实施日期"
                         align="center">
                 </el-table-column>
+                <el-table-column
+                        prop="applyArctic"
+                        width="200"
+                        label="适用车型"
+                        show-overflow-tooltip
+                        align="center">
+                    <template slot-scope="scope">
+                        {{ scope.row.applyArctic.toString() }}
+                    </template>
+                </el-table-column>
                 <el-table-column
                         label="执行人"
                         width="170"
@@ -495,7 +505,6 @@
                             item.zxUserIdName = item.zxUserIdName || ''
                         })
                         this.itemList = arr
-                        console.log(this.itemList);
                         this.loading = false
                     }).catch(e => {
                     })
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index b12aa421e..42c8cae67 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -178,7 +178,7 @@
                 <el-table-column
                         label="责任人"
                         width="170"
-                        prop="zrUserIdName"
+                        prop="zrUserName"
                         show-overflow-tooltip
                         align="center">
                 </el-table-column>
@@ -292,27 +292,27 @@
                 size="800px">
             <div class="demo-drawer-content">
                 <el-form :model="plForm" 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="plForm.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="plForm.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="plForm.changePoint"
-                                placeholder="请输入上一版本差异点"
-                                maxlength="500"
-                        ></el-input>
-                    </el-form-item>
+<!--                    <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">-->
+<!--                        <el-input-->
+<!--                                v-model="plForm.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="plForm.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="plForm.changePoint"-->
+<!--                                placeholder="请输入上一版本差异点"-->
+<!--                                maxlength="500"-->
+<!--                        ></el-input>-->
+<!--                    </el-form-item>-->
                     <el-form-item label="符合性要求" prop="complianceRequir" class="add-form-item" >
                         <el-select
                                 v-model="plForm.complianceRequir"
@@ -328,21 +328,21 @@
                                 maxlength="500"
                         ></el-input>
                     </el-form-item>
-                    <custom-date-pick-group
-                            class="myDataPick"
-                            :config="{attrName: '新车型实施日期'}"
-                            v-model="plForm.newData"
-                    ></custom-date-pick-group>
-                    <custom-date-pick-group
-                            class="myDataPick"
-                            :config="{attrName: '在产车实施日期'}"
-                            v-model="plForm.onlineData"
-                    ></custom-date-pick-group>
-                    <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
-                        <el-select multiple  v-model="plForm.applyArctic">
-                            <el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
-                        </el-select>
-                    </el-form-item>
+<!--                    <custom-date-pick-group-->
+<!--                            class="myDataPick"-->
+<!--                            :config="{attrName: '新车型实施日期'}"-->
+<!--                            v-model="plForm.newData"-->
+<!--                    ></custom-date-pick-group>-->
+<!--                    <custom-date-pick-group-->
+<!--                            class="myDataPick"-->
+<!--                            :config="{attrName: '在产车实施日期'}"-->
+<!--                            v-model="plForm.onlineData"-->
+<!--                    ></custom-date-pick-group>-->
+<!--                    <el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >-->
+<!--                        <el-select multiple  v-model="plForm.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="roleFormButton2" class="demo-drawer-footer">
@@ -358,27 +358,27 @@
             <div class="demo-drawer-content">
                 <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
                     <el-button style="margin: 10px 0 0 10px;" class="common-button-primary" size="mini" type="primary" @click="checkBD(editForm.itemsId, editForm.itemsId2)">查看比对</el-button>
-                    <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="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"
@@ -394,21 +394,21 @@
                                 maxlength="500"
                         ></el-input>
                     </el-form-item>
-                    <custom-date-pick-group
-                            class="myDataPick"
-                            :config="{attrName: '新车型实施日期'}"
-                            v-model="editForm.newData"
-                    ></custom-date-pick-group>
-                    <custom-date-pick-group
-                            class="myDataPick"
-                            :config="{attrName: '在产车实施日期'}"
-                            v-model="editForm.onlineData"
-                    ></custom-date-pick-group>
-                    <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>
+<!--                    <custom-date-pick-group-->
+<!--                            class="myDataPick"-->
+<!--                            :config="{attrName: '新车型实施日期'}"-->
+<!--                            v-model="editForm.newData"-->
+<!--                    ></custom-date-pick-group>-->
+<!--                    <custom-date-pick-group-->
+<!--                            class="myDataPick"-->
+<!--                            :config="{attrName: '在产车实施日期'}"-->
+<!--                            v-model="editForm.onlineData"-->
+<!--                    ></custom-date-pick-group>-->
+<!--                    <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">
@@ -485,13 +485,13 @@
                     applyArctic: '', // 适用车型
                 },
                 editForm: {
-                    technicalRequir: '', // 核心技术要求
-                    changePoint: '', // 国内标准的差异点
+                    // technicalRequir: '', // 核心技术要求
+                    // changePoint: '', // 国内标准的差异点
                     complianceRequir: '1', // 符合性要求
                     complianceState: '', // 合规性分析
-                    newData: '', // 新车型实施日期
-                    onlineData: '', // 在产车实施日期
-                    applyArctic: '', // 适用车型
+                    // newData: '', // 新车型实施日期
+                    // onlineData: '', // 在产车实施日期
+                    // applyArctic: '', // 适用车型
                     itemsId: '',
                 },
                 modalshowflag: false,
@@ -580,13 +580,13 @@
                 this.itemId = row.id
                 this.modalshowflag2 = true
                 this.editForm = {
-                    technicalRequir: row.technicalRequir, // 核心技术要求
-                    changePoint: row.changePoint, // 国内标准的差异点
+                    // technicalRequir: row.technicalRequir, // 核心技术要求
+                    // changePoint: row.changePoint, // 国内标准的差异点
                     complianceRequir: row.complianceRequir || '1', // 符合性要求
                     complianceState: row.complianceState, // 合规性分析
-                    newData: row.newData, // 新车型实施日期
-                    onlineData: row.onlineData, // 在产车实施日期
-                    applyArctic: row.applyArctic, // 适用车型
+                    // newData: row.newData, // 新车型实施日期
+                    // onlineData: row.onlineData, // 在产车实施日期
+                    // applyArctic: row.applyArctic, // 适用车型
                     itemsId: row.itemsId,
                     itemsId2: row.itemsId2
                 }
@@ -594,13 +594,13 @@
             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].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.itemList[a].newData = this.editForm.newData
+                        // this.itemList[a].onlineData = this.editForm.onlineData
+                        // this.itemList[a].applyArctic = this.editForm.applyArctic
                     }
                 }
                 this.modalshowflag2 = false
@@ -663,13 +663,13 @@
                 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]) {
-                            this.itemList[a].technicalRequir = this.plForm.technicalRequir
-                            this.itemList[a].changePoint = this.plForm.changePoint
+                            // this.itemList[a].technicalRequir = this.plForm.technicalRequir
+                            // this.itemList[a].changePoint = this.plForm.changePoint
                             this.itemList[a].complianceRequir = this.plForm.complianceRequir
                             this.itemList[a].complianceState = this.plForm.complianceState
-                            this.itemList[a].newData = this.plForm.newData
-                            this.itemList[a].onlineData = this.plForm.onlineData
-                            this.itemList[a].applyArctic = this.plForm.applyArctic
+                            // this.itemList[a].newData = this.plForm.newData
+                            // this.itemList[a].onlineData = this.plForm.onlineData
+                            // this.itemList[a].applyArctic = this.plForm.applyArctic
                         }
                     }
                 }
@@ -686,7 +686,7 @@
                     this.plForm.complianceState = ''
                     this.plForm.newData = ''
                     this.plForm.onlineData = ''
-                    this.plForm.applyArctic = ''
+                    this.plForm.applyArctic = []
                     this.modalshowflag = true
                 } else {
                     this.$message.warning('请选择要编辑的数据')
@@ -837,18 +837,22 @@
                             itemList = data.itemList
                         }
                         console.log(itemList);
-                        // itemList.forEach(item => {
-                        //     item.unitDeptName = this.$store.getters.userInfo.institutionName
-                        //     item.onlineData = item.onlineData || ''
-                        //     item.newData = item.newData || ''
-                        //     item.complianceState = item.complianceState || ''
-                        //     item.oldNumber = item.oldNumber || ''
-                        //     item.complianceRequir = item.complianceRequir || '1'
-                        //     item.changePoint = item.changePoint || ''
-                        //     item.technicalRequir = item.technicalRequir || ''
-                        //     item.itemsTitle = item.itermsConditions
-                        //     item.applyArctic = item.applyArctic || []
-                        // })
+                        itemList.forEach(item => {
+                            item.unitDeptName = this.$store.getters.userInfo.institutionName
+                            item.onlineData = item.onlineData || ''
+                            item.newData = item.newData || ''
+                            item.complianceState = item.complianceState || ''
+                            item.oldNumber = item.oldNumber || ''
+                            item.complianceRequir = item.complianceRequir || '1'
+                            item.changePoint = item.changePoint || ''
+                            item.technicalRequir = item.technicalRequir || ''
+                            item.itemsTitle = item.itermsConditions
+                            if (typeof (item.applyArctic) === 'string') {
+                                item.applyArctic = JSON.parse(item.applyArctic) || []
+                            } else {
+                                item.applyArctic = item.applyArctic || []
+                            }
+                        })
                         this.getBDList()
                         this.itemList = itemList
                         this.loading = false
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index db1f1ecbc..ff0d941b1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -171,7 +171,7 @@
                 <el-table-column
                         label="责任人"
                         width="170"
-                        prop="zrUserIdName"
+                        prop="zrUserName"
                         align="center">
                 </el-table-column>
                 <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 8115f2dfa..9a265f4a4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -171,7 +171,7 @@
                 <el-table-column
                         label="责任人"
                         width="170"
-                        prop="zrUserIdName"
+                        prop="zrUserName"
                         align="center">
                 </el-table-column>
                 <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index c86370516..498665898 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -172,7 +172,7 @@
                 <el-table-column
                         label="责任人"
                         width="170"
-                        prop="zrUserIdName"
+                        prop="zrUserName"
                         align="center">
                 </el-table-column>
                 <el-table-column

From fa508162059a2f6ceb05601cbd652a7a821c7b87 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 21 Dec 2021 11:11:01 +0800
Subject: [PATCH 4/7] commit

---
 .../pages/creatProcess/bzjd/step3.vue         | 39 +------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 42c8cae67..707111fcd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -735,51 +735,14 @@
             handleSubmit() {
                 this.$refs['bzzqyjForm'].validate((valid) => {
                     if (valid) {
-                        let num1 = 0, num2 = 0, num3 = 0, num4 = 0, num5 = 0, num6 = 0
+                        let num3 = 0
                         for (let a = 0; a < this.itemList.length; a++) {
-                            if (!this.itemList[a].technicalRequir) {
-                                num1++
-                            }
-                            if (!this.itemList[a].changePoint) {
-                                num2++
-                            }
                             if (!this.itemList[a].complianceRequir) {
                                 num3++
                             }
-                            if (!this.itemList[a].newData) {
-                                num4++
-                            }
-                            if (!this.itemList[a].onlineData) {
-                                num5++
-                            }
-                            if (!this.itemList[a].applyArctic) {
-                                num6++
-                            }
-                        }
-                        if (!this.form.itemsNum1) {
-                            if (num1 > 0) {
-                                this.$message.warning('请输入核心技术要求')
-                                return
-                            }
-                        } else {
-                            if (num2 > 0) {
-                                if (this.sarType === 'INLAND') {
-                                    this.$message.warning('请输入国内标准的差异点')
-                                    return
-                                } else {
-                                    this.$message.warning('请输入基于上一版本差异')
-                                    return
-                                }
-                            }
                         }
                         if (num3 > 0) {
                             this.$message.warning('请输入符合性要求')
-                        } else if (num4 > 0) {
-                            this.$message.warning('请输入新车型实施日期')
-                        } else if (num5 > 0) {
-                            this.$message.warning('请输入在产车实施日期')
-                        } else if (num6 > 0) {
-                            this.$message.warning('请选择适用车型')
                         } else {
                             this.isSubmit = true
                             var json = this.json

From d8b39e684e3e04499e4c831e15dc9cf8328e3172 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 21 Dec 2021 11:22:17 +0800
Subject: [PATCH 5/7] commit

---
 .../pages/creatProcess/bzdy/step1.vue              | 12 ++++++++++--
 .../pages/creatProcess/bzjd/step1.vue              | 14 ++++++++++++--
 .../pages/creatProcess/bzzqyj/step1.vue            | 10 +++++++++-
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index a759791e9..df4797b8a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -559,8 +559,16 @@ export default {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              this.$http.get('lawss/activiti/startProcess', {
-                type: '2'
+              this.$http.get('lawss/activiti/startProcessRollBack', {
+                id: this.bpnId || '',
+                createUser: this.$store.getters.userInfo.userId,
+                createUserName: this.$store.getters.userInfo.userName,
+                type: '2',
+                json: JSON.stringify({
+                  form: this.form,
+                  roleForm: this.roleForm,
+                  commentText: this.commentText
+                })
               }, {}, res => {
                 if (res.ok) {
                   var json = Object.assign(this.form, this.roleForm)
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index f7f47e2ea..5efe18811 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -1185,8 +1185,18 @@ export default {
                 this.$message.warning('请选择责任人')
               } else {
                 this.isSubmit = true
-                this.$http.get('lawss/activiti/startProcess', {
-                  type: '9'
+                this.$http.post('lawss/activiti/startProcessRollBack', {
+                  id: this.bpnId || '',
+                  createUser: this.$store.getters.userInfo.userId,
+                  createUserName: this.$store.getters.userInfo.userName,
+                  type: '9',
+                  json: JSON.stringify({
+                    form: this.form,
+                    roleForm: this.roleForm,
+                    commentText: this.commentText,
+                    itemList: this.itemList,
+                    sarType: this.sarType
+                  })
                 }, {}, res => {
                   if (res.ok) {
                     var json = Object.assign(this.form, this.roleForm)
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index debd07c90..e9d5f61d0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -830,7 +830,15 @@ export default {
             if (valid) {
               this.isSubmit = true
               this.$http.get('lawss/activiti/startProcess', {
-                type: '3'
+                id: this.bpnId || '',
+                createUser: this.$store.getters.userInfo.userId,
+                createUserName: this.$store.getters.userInfo.userName,
+                type: '3',
+                json: JSON.stringify({
+                  form: this.form,
+                  roleForm: this.roleForm,
+                  commentText: this.commentText
+                })
               }, {}, res => {
                 if (res.ok) {
                   var json = Object.assign(this.form, this.roleForm)

From dd278e3c53770495f644fdf60adaa0af838e6349 Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Tue, 21 Dec 2021 13:45:12 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzhHd-rh/step1.vue     |  2 +
 .../pages/creatProcess/bzhHd-rh/step2.vue     | 37 +++++++++++++++++--
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
index 3ff87198d..42041d108 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
@@ -462,6 +462,8 @@ export default {
         comityOptionsOne: [],
         comityOptionsTwo: [],
         comityOptionsTree: [],
+        comityOpRole: '',
+        comityOpRoleId: '',
       },
       comityRoleOptions: [
         {value: '0', label: '委员'},
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
index 11615fc3c..b3d7f0df8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
@@ -113,8 +113,9 @@
             </ProcessTitle>
             <el-form-item class="add-form-item" label="入会人员:">
               <el-input
-                :disabled="true"
-                style="width: 30%"
+                placeholder="请选择入会成员"
+                style="width: 50%"
+                @click.native="choiceRole"
                 v-model="rh_pageData.comityOpRole"
               />
             </el-form-item>
@@ -212,6 +213,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+
+    <Role-tree
+      is-title="选择入会人员"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -257,7 +265,7 @@ export default {
         workPath: '',
         comityTel: [],
         comityOpRole: '',
-        comityInRoleId: '',
+        comityOpRoleId: '',
       },
       roleForm: {},
       commentText: '',
@@ -317,7 +325,6 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.rh_pageData = JSON.parse(JSON.stringify(item)).rh_pageData
-        this.rh_pageData.comityOpRole = this.$store.getters.userInfo.userName
         this.roleForm = JSON.parse(JSON.stringify(item)).roleList
         this.infoSourcesLength = this.rh_pageData.infoSources.length
         // this.rh_pageData.comityFileNum = this.fileTextList
@@ -371,6 +378,28 @@ export default {
         window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
       }
     },
+
+    /** 选择入会人员 */
+    choiceRole(id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.roleShowflag = true
+    },
+    drawerCheck(data) {
+      var idList = ''
+      var nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id;
+        nameList += item.name;
+      })
+      this.rh_pageData.comityOpRole = nameList
+      this.rh_pageData.comityOpRoleId = idList
+      this.roleShowflag = false
+    },
     // 退回按钮
     handleSubmitNo() {
       if (this.commentText === '') {

From d322144e8567dcb8ad5feb4c8f6b0f9e069add04 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Tue, 21 Dec 2021 13:47:46 +0800
Subject: [PATCH 7/7] commit

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

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
index e9d5f61d0..a31b13053 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
@@ -617,7 +617,7 @@ export default {
       window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
     },
     addfjList() {
-      this.$http.get('lawss/sarStandFile/queryFileInfo', {
+      this.$http.get('lawss/sarStandFile/querySourceFileInfo', {
         standId: this.form.standId
       }, {
         _this: this