From dda8a553730027c292c1f41cdb54cc754c56d884 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 11 May 2022 11:30:15 +0800
Subject: [PATCH 1/9] =?UTF-8?q?52744=20=E6=A0=87=E5=87=86=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=20=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=EF=BC=8C=E4=BF=9D=E5=AD=98=E8=8D=89=E7=A8=BF=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=EF=BC=8C=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=E9=A9=B3?=
 =?UTF-8?q?=E5=9B=9E=20=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B120220511095157535?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         |  59 +-
 .../pages/creatProcess/bzrk/step2.vue         |  10 +-
 .../pages/creatProcess/bzrk/step3.vue         |   8 +-
 .../pages/creatProcess/bzrk/step4.vue         |   4 +-
 .../pages/creatProcess/bzrk/step5.vue         | 722 +++++++++++++-----
 5 files changed, 555 insertions(+), 248 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 65ac10fdb..b5da1d706 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -72,6 +72,31 @@
                     value-format="yyyy-MM-dd">
                   </el-date-picker>
                 </el-form-item>
+                <el-form-item v-if="verifySarStandard" label="归档位置" prop="treeListName" class="add-form-item form-item-disabled">
+                  <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
+                    <el-input
+                      v-show="false"
+                      v-model="form.treeListId"
+                    ></el-input>
+                    <el-input
+                      v-model="form.treeListName"
+                      clearable
+                      placeholder="选择归档位置"
+                      @click.native="choiceTree('treeListName', '归档位置', form.treeListName)">
+                    </el-input>
+                  </el-tooltip>
+                  <tree-select-stand
+                    :key="key"
+                    :multiple=true
+                    :lazy=false
+                    :checkStrictly=true
+                    :modalShowFlag="modalShowTree"
+                    :drawerTitle="drawerTitle"
+                    width="800"
+                    :data="treeListOptions"
+                    :defaultProps="defaultProps" :checkedKeys="treeCheckedKeys"
+                    :nodeKey="nodeKey" @popoverHide="treeHide" @popoverHideCancel="treeHideCancel"></tree-select-stand>
+                </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item v-show="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
@@ -153,31 +178,6 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item v-if="verifySarStandard" label="归档位置" prop="treeListName" class="add-form-item form-item-disabled">
-                  <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
-                    <el-input
-                      v-show="false"
-                      v-model="form.treeListId"
-                    ></el-input>
-                    <el-input
-                      v-model="form.treeListName"
-                      clearable
-                      placeholder="选择归档位置"
-                      @click.native="choiceTree('treeListName', '归档位置', form.treeListName)">
-                    </el-input>
-                  </el-tooltip>
-                  <tree-select-stand
-                    :key="key"
-                    :multiple=true
-                    :lazy=false
-                    :checkStrictly=true
-                    :modalShowFlag="modalShowTree"
-                    :drawerTitle="drawerTitle"
-                    width="800"
-                    :data="treeListOptions"
-                    :defaultProps="defaultProps" :checkedKeys="treeCheckedKeys"
-                    :nodeKey="nodeKey" @popoverHide="treeHide" @popoverHideCancel="treeHideCancel"></tree-select-stand>
-                </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -2111,21 +2111,25 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
         this.defaultCheckedKeys3 = [this.form.dybxh]
-        this.treeCheckedKeys = this.form.treeListId.split(',')
+        if (this.form.treeListId) {
+          this.treeCheckedKeys = this.form.treeListId.split(',')
+        }
         this.form.standType = this.form.standInData === "0" ? 'INLAND' : 'FOREIGN'
         this.form.standYear = this.form.standYear ? this.form.standYear : ''
-        if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+        if (this.form.country) {
           this.form.country = this.form.country.split(",");
         }
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        console.log(this.form);
 
         // 遍历对象初始化文件信息
         for (const p in this.form) {
@@ -3224,6 +3228,7 @@ export default {
         this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
+        this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
       }).catch(e => {
         this.saveLoading = false
       })
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 4b8627a66..97acce26f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -1180,17 +1180,17 @@ export default {
         this.form = JSON.parse(JSON.stringify(item))
         let wssmrName = this.form.wssmrname || this.form.wssmr
         this.form.wssmr = wssmrName
-        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx.split(',') : ''
-        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx.split(',') : ''
-        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx.split(',') : ''
-        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz.split(',') : ''
+        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
+        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
+        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
+        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : ''
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
         this.defaultCheckedKeys3 = [this.form.dybxh]
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
         this.form.standYear = this.form.standYear ? this.form.standYear : ''
-        if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+        if (this.form.country) {
           this.form.country = this.form.country.split(",");
         }
         this.form.prcNum = this.prcNum
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 49d53b1e9..31ac891dd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -1136,10 +1136,10 @@ export default {
         this.form = JSON.parse(JSON.stringify(item))
         let wssmrName = this.form.wssmrname || this.form.wssmr
         this.form.wssmr = wssmrName
-        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx.split(',') : ''
-        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx.split(',') : ''
-        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx.split(',') : ''
-        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz.split(',') : ''
+        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
+        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
+        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
+        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz: ''
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 33b9bbc47..965909809 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -2648,7 +2648,9 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
-        this.form.country = item.country.split(',')
+        if (this.form.country) {
+          this.form.country = this.form.country.split(",");
+        }
         this.$forceUpdate()
       })
     },
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 80881c2e8..b05a9f745 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -24,13 +24,26 @@
           <div class="prc-content-border">
             <el-row :gutter="24">
               <el-col :span="12">
-                <el-form-item label="类型" prop="standInData" class="add-form-item form-item-disabled">
+                <el-form-item label="标准来源" prop="standInData" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.standInData" disabled>
                     <el-radio label="0">国内标准入库</el-radio>
                     <el-radio label="1">海外标准入库</el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
+
+
+                <el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
+                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
+                    <el-option
+                      v-for="item in countryOptions"
+                      placeholder="请选择"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准类别"  prop="standSort" class="add-form-item form-item-disabled">
                   <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
                     <el-option
                       v-for="item in standSortOptions"
@@ -43,26 +56,27 @@
                 </el-form-item>
                 <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
                   <el-input
+                    disabled
                     v-model.number="form.standYear"
                     placeholder="请输入标准标准年份"
-                    disabled
+                    clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
                     <el-input
-                            v-model="form.standName"
-                            disabled
-                            placeholder="请输入标准中文名称"
-                            clearable
+                      v-model="form.standName"
+                      disabled
+                      placeholder="请输入标准中文名称"
+                      clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
-                          v-else
-                          disabled
-                          v-model="form.standName"
-                          placeholder="请输入标准中文名称"
-                          clearable
+                    v-else
+                    disabled
+                    v-model="form.standName"
+                    placeholder="请输入标准中文名称"
+                    clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
@@ -108,7 +122,8 @@
                     disabled
                     v-model="form.issueTime"
                     type="date"
-                    placeholder="请选择标准发布日期">
+                    placeholder="请选择标准发布日期"
+                    value-format="yyyy-MM-dd">
                   </el-date-picker>
                 </el-form-item>
                 <el-form-item style="display: none" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
@@ -117,17 +132,8 @@
                     <el-radio label="2">否</el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.standSystem"
-                    placeholder="请选择标准体系"
-                    clearable
-                  ></el-input>
-                  <!--                                    <tree-select-->
-                  <!--                                            :data="standSystemOptions"-->
-                  <!--                                            :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"-->
-                  <!--                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select>-->
+                <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                  <el-input v-model="form.standSystem" disabled></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                   <el-input
@@ -137,7 +143,7 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item  label="归档位置" class="add-form-item form-item-disabled">
+                <el-form-item label="归档位置" class="add-form-item form-item-disabled">
                   <el-input
                     style="display: none"
                     v-model="form.treeListId"
@@ -197,43 +203,123 @@
             <template slot="title">文本信息</template>
           </ProcessTitle>
           <div class="prc-content-border">
+            <!--                        <el-row :gutter="24">-->
+            <!--                            <el-col :span="12">-->
+            <!--                                <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">-->
+            <!--                                    <div style="cursor: pointer;color: #00b7ee"  v-if="form.xgdName" @click="downloadFile('xgd')">-->
+            <!--                                        {{ form.xgdName }}-->
+            <!--                                    </div>-->
+            <!--                                    <div v-else>-->
+            <!--                                        - - -->
+            <!--                                    </div>-->
+            <!--                                </el-form-item>-->
+            <!--                                <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">-->
+            <!--                                    <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">-->
+            <!--                                        {{ form.fbgbjbdName }}-->
+            <!--                                    </div>-->
+            <!--                                    <div v-else>-->
+            <!--                                        - - -->
+            <!--                                    </div>-->
+            <!--                                </el-form-item>-->
+            <!--                                <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">-->
+            <!--                                    <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">-->
+            <!--                                        {{ form.zbjbdName }}-->
+            <!--                                    </div>-->
+            <!--                                    <div v-else>-->
+            <!--                                        - - -->
+            <!--                                    </div>-->
+            <!--                                </el-form-item>-->
+            <!--                                <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">-->
+            <!--                                    <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">-->
+            <!--                                        {{ form.ssgName }}-->
+            <!--                                    </div>-->
+            <!--                                    <div v-else>-->
+            <!--                                        - - -->
+            <!--                                    </div>-->
+            <!--                                </el-form-item>-->
+            <!--                                <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">-->
+            <!--                                    <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">-->
+            <!--                                        {{ form.caName }}-->
+            <!--                                    </div>-->
+            <!--                                    <div v-else>-->
+            <!--                                        - - -->
+            <!--                                    </div>-->
+            <!--                                </el-form-item>-->
+            <!--                            </el-col>-->
+            <!--                            <el-col :span="12">-->
+            <!--                                <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">-->
+            <!--                                    <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">-->
+            <!--                                        {{ form.kwjName }}-->
+            <!--                                    </div>-->
+            <!--                                    <div v-else>-->
+            <!--                                        - - -->
+            <!--                                    </div>-->
+            <!--                                </el-form-item>-->
+            <!--                                <el-form-item v-if="form.standInData === '0'" label="解读文件" prop="jdwjName" class="add-form-item form-item-disabled">-->
+            <!--                                    <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">-->
+            <!--                                        {{ form.jdwjName }}-->
+            <!--                                    </div>-->
+            <!--                                    <div v-else>-->
+            <!--                                        - - -->
+            <!--                                    </div>-->
+            <!--                                </el-form-item>-->
+            <!--                                <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">-->
+            <!--                                    <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">-->
+            <!--                                        {{ form.bpgName }}-->
+            <!--                                    </div>-->
+            <!--                                    <div v-else>-->
+            <!--                                        - - -->
+            <!--                                    </div>-->
+            <!--                                </el-form-item>-->
+            <!--                                <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">-->
+            <!--                                    <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">-->
+            <!--                                        {{ form.zqyjgName }}-->
+            <!--                                    </div>-->
+            <!--                                    <div v-else>-->
+            <!--                                        - - -->
+            <!--                                    </div>-->
+            <!--                                </el-form-item>-->
+            <!--                            </el-col>-->
+            <!--                        </el-row>-->
+
             <el-row :gutter="24">
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '0'" label="修改单" prop="xgdName" class="add-form-item form-item-disabled">
-                  <div style="cursor: pointer;color: #00b7ee" v-if="form.xgdName" @click="downloadFile('xgd')">
-                    {{ form.xgdName }}
+                  <div v-if="xgdFileMap.length>0" v-for="(value,index)  in this.xgdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xgd',value.id)">
+                    <!-- {{ value.name }} -->
+                    {{ value.name }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
-                  <div style="cursor: pointer;color: #00b7ee" v-if="form.fbgbjbdName" @click="downloadFile('fbgbjbd')">
-                    {{ form.fbgbjbdName }}
+                  <div v-if="fbgbjbdFileMap.length>0" v-for="(value,index)  in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('fbgbjbd',value.id)">
+                    {{ value.name }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="增补件" prop="zbjbdName" class="add-form-item form-item-disabled">
-                  <div v-if="form.zbjbdName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd')">
-                    {{ form.zbjbdName }}
+                  <div v-if="zbjbdFileMap.length>0" v-for="(value,index)  in this.zbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zbjbd',value.id)">
+                    {{ value.name }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="送审稿" prop="ssgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.ssgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg')">
-                    {{ form.ssgName }}
+                  <div v-if="ssgFileMap.length>0" v-for="(value,index)  in this.ssgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ssg',value.id)">
+                    {{ value.name }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item label="草案" prop="caName" class="add-form-item form-item-disabled">
-                  <div v-if="form.caName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca')">
-                    {{ form.caName }}
+                  <div v-if="caFileMap.length>0" v-for="(value,index)  in this.caFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('ca',value.id)">
+                    {{ value.name }}
                   </div>
                   <div v-else>
                     - -
@@ -242,8 +328,16 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item v-if="form.standInData === '1'" label="勘误件" prop="kwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.kwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj')">
-                    {{ form.kwjName }}
+                  <div v-if="kwjFileMap.length>0" v-for="(value,index)  in this.kwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('kwj',value.id)">
+                    {{ value.name }}
+                  </div>
+                  <div v-else>
+                    - -
+                  </div>
+                </el-form-item>
+                <el-form-item v-if="form.standInData === '1'" label="修订本" prop="xdbName" class="add-form-item form-item-disabled">
+                  <div v-if="xdbFileMap.length>0" v-for="(value,index)  in this.xdbFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('xdb',value.id)">
+                    {{ value.name }}
                   </div>
                   <div v-else>
                     - -
@@ -252,24 +346,24 @@
                 <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                 <el-form-item v-if="form.standInData === '0'" label="相关文件" prop="jdwjName" class="add-form-item form-item-disabled">
                   <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
-                  <div v-if="form.jdwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj')">
-                    {{ form.jdwjName }}
+                  <div v-if="jdwjFileMap.length>0" v-for="(value,index)  in this.jdwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('jdwj',value.id)">
+                    {{ value.name }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="报批稿" prop="bpgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.bpgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg')">
-                    {{ form.bpgName }}
+                  <div v-if="bpgFileMap.length>0" v-for="(value,index)  in this.bpgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('bpg',value.id)">
+                    {{ value.name }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="征求意见稿" prop="zqyjgName" class="add-form-item form-item-disabled">
-                  <div v-if="form.zqyjgName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg')">
-                    {{ form.zqyjgName }}
+                  <div v-if="zqyjgFileMap.length>0" v-for="(value,index)  in this.zqyjgFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('zqyjg',value.id)">
+                    {{ value.name }}
                   </div>
                   <div v-else>
                     - -
@@ -307,7 +401,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.nylx" placeholder="请选择适用车型" multiple disabled>
+                  <el-select v-model="form.nylx" placeholder="请选择能源类型" multiple disabled>
                     <el-option
                       v-for="item in categoryOptions"
                       placeholder="请选择"
@@ -318,46 +412,26 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model.number="form.cycvppsbm"
-                    placeholder="请选择关联模块--乘用车VPPS编码"
-                    clearable
-                  ></el-input>
+                  <el-input v-model="form.cycvppsbm" disabled></el-input>
                 </el-form-item>
                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model.number="form.kccvppsbm"
-                    placeholder="关联模块--卡车VPPS编码"
-                    clearable
-                  ></el-input>
+                  <el-input v-model="form.kccvppsbm" disabled></el-input>
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号(卡车)" prop="dybxh" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model.number="form.dybxh"
-                    placeholder="请选择模块结构单元变型号"
-                    clearable
-                  ></el-input>
+                  <el-input v-model="form.dybxh" disabled></el-input>
                 </el-form-item>
                 <el-form-item label="模块结构单元变型号(乘用车)" prop="dybxhcar" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model.number="form.dybxhcar"
-                    placeholder="请选择模块结构单元变型号"
-                    clearable
-                  ></el-input>
+                  <el-input v-model="form.dybxhcar" disabled></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
-                  <el-select disabled :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门">
+                  <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
                     <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
-                  <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
+                  <el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple disabled>
                     <el-option
-                      v-for="item in qcdwOption"
+                      v-for="item in qcdwOptions"
                       placeholder="请选择"
                       :key="item.value"
                       :value="item.value"
@@ -366,20 +440,20 @@
                   </el-select>
                 </el-form-item>
                 <!--<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
-                    <el-option
-                      v-for="item in txlbOptions"
-                      placeholder="请选择"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-                    ></el-option>
-                  </el-select>
+                    <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
+                        <el-option
+                                v-for="item in txlbOptions"
+                                placeholder="请选择"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                    </el-select>
                 </el-form-item>-->
               </el-col>
               <el-col :span="12">
                 <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-                  <el-select v-model="form.sycpx" placeholder="请选择适用车型" multiple disabled>
+                  <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
                     <el-option
                       v-for="item in sycpxOptions"
                       placeholder="请选择"
@@ -440,11 +514,15 @@
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
-                  <el-input v-model="form.wssmr">
-                  </el-input>
+                  <span>{{ form.wssmr }}</span>
                   <!--                                    <el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>-->
-                  <!--                                        <el-option label="署名人1" value="1"></el-option>-->
-                  <!--                                        <el-option label="署名人2" value="2"></el-option>-->
+                  <!--                                        <el-option-->
+                  <!--                                                v-for="item in wssmrOptions"-->
+                  <!--                                                placeholder="请选择"-->
+                  <!--                                                :key="item.value"-->
+                  <!--                                                :value="item.value"-->
+                  <!--                                                :label="item.label"-->
+                  <!--                                        ></el-option>-->
                   <!--                                    </el-select>-->
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
@@ -458,6 +536,17 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
+                  <el-select :popper-append-to-body="false" v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
+                    <el-option
+                      v-for="item in cyzbpmOptions"
+                      placeholder="请选择"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -470,18 +559,18 @@
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
-                            v-model="form.dtbjh"
-                            disabled
-                            placeholder="请输入代替标准号"
-                            clearable
+                      disabled
+                      v-model="form.dtbjh"
+                      placeholder="请输入代替标准号"
+                      clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
-                          v-else
-                          disabled
-                          v-model="form.dtbjh"
-                          placeholder="请输入代替标准号"
-                          clearable
+                    v-else
+                    disabled
+                    v-model="form.dtbjh"
+                    placeholder="请输入代替标准号"
+                    clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
@@ -489,75 +578,50 @@
                     <el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
                   </el-select>
                 </el-form-item>
-                <!--                                <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
-                <!--                                    <el-input-->
-                <!--                                            disabled-->
-                <!--                                            v-model="form.xglc"-->
-                <!--                                            placeholder="请输入相关流程"-->
-                <!--                                            clearable-->
-                <!--                                    ></el-input>-->
-                <!--                                </el-form-item>-->
                 <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
-                  <div v-if="form.glwjName" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj')">
-                    {{ form.glwjName }}
+                  <div v-if="glwjFileMap.length>0" v-for="(value,index)  in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
+                    {{ value.name }}
                   </div>
                   <div v-else>
                     - -
                   </div>
                 </el-form-item>
-
               </el-col>
               <el-col :span="12">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
-                            v-model="form.bfbdtbzh"
-                            disabled
-                            placeholder="请输入部分代替标准号"
-                            clearable
+                      disabled
+                      v-model="form.bfbdtbzh"
+                      placeholder="请输入部分代替标准号"
+                      clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
-                          v-else
-                          disabled
-                          v-model="form.bfbdtbzh"
-                          placeholder="请输入部分代替标准号"
-                          clearable
+                    v-else
+                    disabled
+                    v-model="form.bfbdtbzh"
+                    placeholder="请输入部分代替标准号"
+                    clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
                     <el-input
-                            v-model="form.cbbh"
-                            disabled
-                            placeholder="请输入采标编号"
-                            clearable
+                      v-model="form.cbbh"
+                      disabled
+                      placeholder="请输入采标编号"
+                      clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
-                          v-else
-                          v-model="form.cbbh"
-                          disabled
-                          placeholder="请输入采标编号"
-                          clearable
+                    v-else
+                    disabled
+                    v-model="form.cbbh"
+                    placeholder="请输入采标编号"
+                    clearable
                   ></el-input>
                 </el-form-item>
-                <!--                                <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
-                <!--                                    <el-input-->
-                <!--                                            disabled-->
-                <!--                                            v-model="form.byybj"-->
-                <!--                                            placeholder="请输入被引用标准"-->
-                <!--                                            clearable-->
-                <!--                                    ></el-input>-->
-                <!--                                </el-form-item>-->
-                <!--                                <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
-                <!--                                    <el-input-->
-                <!--                                            disabled-->
-                <!--                                            v-model="form.chjl"-->
-                <!--                                            placeholder="请输入参会记录"-->
-                <!--                                            clearable-->
-                <!--                                    ></el-input>-->
-                <!--                                </el-form-item>-->
               </el-col>
               <el-col :span="24">
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
@@ -571,8 +635,8 @@
                   </el-tooltip>
                   <el-input
                     v-else
-                    v-model="form.yybj"
                     disabled
+                    v-model="form.yybj"
                     placeholder="请输入引用标准"
                     clearable
                   ></el-input>
@@ -582,25 +646,6 @@
           </div>
         </el-form>
       </div>
-      <div>
-        <!--                <el-collapse accordion>-->
-        <!--                    <el-collapse-item title="意见填写">-->
-        <!--                        <div style="margin: 10px 0;">-->
-        <!--                            <el-select v-model="approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
-        <!--                                <el-option label="驳回" value="1"></el-option>-->
-        <!--                                <el-option label="通过" value="0"></el-option>-->
-        <!--                            </el-select>-->
-        <!--                            <el-input-->
-        <!--                                    type="textarea"-->
-        <!--                                    :rows="3"-->
-        <!--                                    resize="none"-->
-        <!--                                    placeholder="请输入意见"-->
-        <!--                                    v-model="commentText">-->
-        <!--                            </el-input>-->
-        <!--                        </div>-->
-        <!--                    </el-collapse-item>-->
-        <!--                </el-collapse>-->
-      </div>
     </div>
     <div class="content" v-if="active === '2'">
       <div class="block" style="padding-top: 20px;">
@@ -650,7 +695,7 @@
       </div>
     </div>
     <div class="content" v-if="active === '3'">
-      <div class="flow-list">
+      <div >
         <el-table
           height="100%"
           ref="selection"
@@ -692,7 +737,7 @@
           </el-table-column>
           <el-table-column
             prop="comment"
-            label="审批意见"
+            label="流程信息"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.commentText }}</span>
@@ -710,48 +755,75 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
-    <!--        <ProcessFooter-->
-    <!--                show-save-->
-    <!--                show-submit-->
-    <!--                :submitLoading="isSubmit"-->
-    <!--                :saveLoading="saveLoading"-->
-    <!--                @save="handleSave"-->
-    <!--                @submit="handleSubmit"-->
-    <!--        >-->
-    <!--        </ProcessFooter>-->
+
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+      check-box
+      :is-title="drawerTitle"
+      :is-visible.sync="drawerModal"
+      @checkedRole="checkedRole"
+      :nodeList="nodeList"
+    ></Role-tree>
   </div>
 </template>
 
 <script>
-import ProcessHeader from '../../components/ProcessHeader'
-import ProcessFooter from '../../components/ProcessFooter'
-import ProcessTitle from '../../components/ProcessTitle'
-import {inboundLiaisonDetail, processCreateStand} from 'api/process'
-import TreeSelect from '@/components/treeSelect/treeSelect.vue';
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { changeAssigneeNew, inboundLiaisonDetail, processCreateStand } from "api/process";
+import TreeSelect from "@/components/treeSelect/treeSelect.vue";
 import CusTomDataPickerGroup
   from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
+
 export default {
   name: "bzrkStep5",
   data() {
     return {
-      xgdFileId: '',
-      fbgbjbdFileId: '',
-      bpgFileId: '',
-      ssgFileId: '',
-      zqyjgFileId: '',
-      jdwjFileId: '',
-      kwjFileId: '',
-      glwjFileId: '',
-      caFileId: '',
-      zbjbdFileId: '',
+      xgdFileMap: [],
+      fbgbjbdFileMap: [],
+      bpgFileMap: [],
+      ssgFileMap: [],
+      zqyjgFileMap: [],
+      jdwjFileMap: [],
+      kwjFileMap: [],
+      xdbFileMap: [],
+      glwjFileMap: [],
+      caFileMap: [],
+      zbjbdFileMap: [],
+
+
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      drawerTitle: '',
+      nodeList: [],
+      selectPeople: "",
+      xgdFileId: "",
+      fbgbjbdFileId: "",
+      bpgFileId: "",
+      ssgFileId: "",
+      zqyjgFileId: "",
+      jdwjFileId: "",
+      kwjFileId: "",
+      glwjFileId: "",
+      caFileId: "",
+      commentText: "",
+      zbjbdFileId: "",
+      rules: {
+        commentText: [{ required: true, message: "请输入意见", trigger: "blur" }],
+        approvalOpinion: [{ required: true, message: "请选择审批意见", trigger: "change" }]
+      },
+      activeName: "1",
       // 当前流程类型(1待办/2已办)
       processType: 1,
       detailData: [],
       userId: this.$store.getters.userInfo.userId,
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
-      approvalOpinion: '', // 通过/驳回
-      commentText: '', // 意见
+      formTongGuo: {
+        approvalOpinion: '', // 通过/驳回
+        commentText: '', // 意见
+      },
       title: '', // 新增编辑抽屉标题
       ListModel: false, // 新增编辑抽屉开关
       active: '1', // 默认显示
@@ -777,7 +849,10 @@ export default {
         issueTime: '', // 发布时间
         isRelateAccess: '', // 是否纳入认证清单
         standSystem: '',// 标准体系
+        standSystemName: '',// 标准体系
         gxhbq: '', // 标签
+        treeListId: '',
+        treeListName: '',
         // 实施日期
         ssrq: '', // 实施日期(标准文本)
         xcxssrq: '', // 新车型实施日期(标准文本)
@@ -794,13 +869,26 @@ export default {
         zqyjg: '', // 征求意见稿
         jdwj: '', // 解读文件
         zbjbd: '', // 增补件
+        bfbdtbzh: '', // 增补件
+        bfdtbz: '',
         kwj: '', // 勘误件
+        caName: '', // 草案
+        fbgbjbdName: '', // 发布稿
+        xgdName: '', // 修改单
+        bpgName: '', // 报批稿
+        ssgName: '', // 送审稿
+        zqyjgName: '', // 征求意见稿
+        jdwjName: '', // 解读文件
+        zbjbdName: '', // 增补件
+        kwjName: '', // 勘误件
+        glwjName: '', // 关联文件
         // 适用范围
         txlb: '', // 体系类别
         gkdw: '', // 归口管理部门
-        fbjg: '', // 起草单位
+        qcdw: '', // 起草单位
         wssmr: '', // 我司署名人
         cysd: '', // 我司参与深度
+        cyzbpm: [],// 我司参与制标排名
         cllx: '', // 适用车型
         nylx: '',// 能源类型
         sycpx: '',// 适用产品线
@@ -828,21 +916,43 @@ export default {
         prcName: '',
         standType: '',
       }, // 标准信息
+      nodeKeyCode: 'code',
+      nodeKeyModel: 'model',
+      key: 1,
+      key1: 2,
+      key2: 3,
+      key3: 4,
+      defaultCheckedKeys1: [],
+      defaultCheckedKeys2: [],
+      defaultCheckedKeys3: [],
+      defaultCodeProps: {
+        children: 'children',
+        label: 'code'
+      },
+      defaultModelProps: {
+        children: 'children',
+        label: 'model'
+      },
+      countryOptions: [],//国家地区
+      busVppsOptions: [], // 车系体系架构
+      modelOptions: [], // 模块体系架构
       standSortOptions: [], // 标准类别
       standNatureOptions: [], // 标准性质
       standStateOptions: [], // 文本状态
       standSystemOptions: [], // 标准体系
       applyArcticOptions: [], // 适用车型
-      categoryOptions: [], // 能源类型
       gkglbmOptions: [], // 归口管理部门
       cbcdOptions: [], // 采标程度
+      categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
+      cyzbpmOptions: [], // 我司参与制标排名
+      wssmrOptions: [], // 我司署名人
+      qcdwOptions: [], // 起草单位
       sycpxOptions: [], // 适用产品线
       zrbmOptions: [], // 责任部门
       zrgcsOptions: [], // 责任工程师
       txlbOptions: [], // 体系类别
-      qcdwOption: [], // 起草单位
       data: [], // 标准列表数据
       ListForm: {}, // 新增数据
       user1: '',
@@ -868,11 +978,29 @@ export default {
     },
   },
   methods: {
+    checkedRole(data) {
+      this.assigneeNewLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        userId: this.$store.getters.userInfo.userId, // 委托人
+        assignee: data[0].id, // 被委托人
+        pId: this.$route.query.prcId, // 流程实例
+      }).then(res => {
+        this.assigneeNewLoading = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push("/processCenter");
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
     downloadFile(fileType) {
+      //文件id中出现了','字符,去除掉
       if (fileType === 'fbgbjbd') {
         if (this.fbgbjbdFileId.search(',')) {
           this.fbgbjbdFileId = this.fbgbjbdFileId.replace(",", "");
-          console.log(this.fbgbjbdFileId);
         }
         window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.fbgbjbdFileId
       } else if (fileType === 'xgd') {
@@ -895,11 +1023,54 @@ export default {
         window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + this.zbjbdFileId
       }
     },
+    getRule() {
+      if (this.formTongGuo.approvalOpinion === 0) {
+        this.rules.commentText[0].required = false;
+        this.$refs.formTongGuo.clearValidate('commentText')
+      } else {
+        this.rules.commentText[0].required = true;
+      }
+    },
     popoverHide(checkedIds, checkedData) {
-      console.log(checkedIds);
-      console.log(checkedData);
-      this.form.standSystem = checkedData.id
-      console.log(this.sarStandardsInfoEO.standSystem);
+      if (checkedData) {
+        this.form.standSystem = checkedData.id
+        this.form.standSystemName = checkedData.menuName
+      }
+    },
+    popoverHideBusVs(checkedIds, checkedData) {
+      if (checkedData) {
+        this.form.cycvppsbm = checkedData.code
+        this.form.cycvppscn = checkedData.chineseName
+      }
+    },
+    popoverHideCarVs(checkedIds, checkedData) {
+      if (checkedData) {
+        this.form.kccvppsbm = checkedData.code
+        this.form.kccvppscn = checkedData.chineseName
+      }
+    },
+    popoverHideModel(checkedIds, checkedData) {
+      if (checkedData) {
+        this.form.dybxh = checkedData.model
+        this.form.dymc = checkedData.name
+      }
+    },
+    busVsFunc() {
+      this.$http.get('sarVppsTree/list', '', {
+        _this: this
+      }, res => {
+        this.busVppsOptions = res.data
+        this.key1++
+        this.key2++
+      })
+    },
+    modelFunc() {
+      this.$http.get('sarModelTree/list', '', {
+        _this: this
+      }, res => {
+        this.modelOptions = res.data
+        this.key3++
+      })
     },
     processTable() {
       this.$http.get('lawss/activiti/get_list_by_instance', {
@@ -914,6 +1085,16 @@ export default {
       }, e => {
       })
     },
+    assemble(ids, names) {
+      let list = new Array();
+      let idArray = ids.split(',');
+      let nameArray = names.split(',');
+      for (var i = 0; i < idArray.length; i++) {
+        list.push({id: idArray[i], name: nameArray[i]});
+      }
+
+      return list;
+    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
@@ -921,6 +1102,7 @@ export default {
           pId: this.pId
         }).then(res => {
           if (res) {
+            console.log(res);
             const processForm = JSON.parse(res.mesg)
             this.xgdFileId = processForm.xgd
             this.fbgbjbdFileId = processForm.fbgbjbd
@@ -932,12 +1114,31 @@ export default {
             this.glwjFileId = processForm.glwj
             this.caFileId = processForm.ca
             this.zbjbdFileId = processForm.zbjbd
-            this.form.standYear = processForm.standYear
-            this.form.standSystem = processForm.standSystem
-            this.form.kccvppsbm = processForm.kccvppsbm
-            this.form.cycvppsbm = processForm.cycvppsbm
-            this.form.dybxh = processForm.dybxh
             this.getFormFieldList(processForm)
+
+            this.xgdFileMap = this.assemble(processForm.xgd, processForm.xgdName);
+
+            this.fbgbjbdFileMap = this.assemble(processForm.fbgbjbd, processForm.fbgbjbdName);
+            // fbgbjbdFileMap: {},
+            this.bpgFileMap = this.assemble(processForm.bpg, processForm.bpgName);
+            // bpgFileMap: {},
+            this.ssgFileMap = this.assemble(processForm.ssg, processForm.ssgName);
+            // ssgFileMap: {},
+            this.zqyjgFileMap = this.assemble(processForm.zqyjg, processForm.zqyjgName);
+            // zqyjgFileMap: {},
+            this.jdwjFileMap = this.assemble(processForm.jdwj, processForm.jdwjName);
+            // jdwjFileMap: {},
+            this.kwjFileMap = this.assemble(processForm.kwj, processForm.kwjName);
+            // kwjFileMap: {},
+            this.xdbFileMap = this.assemble(processForm.xdb, processForm.xdbName);
+            // xdbFileMap: {},
+            this.glwjFileMap = this.assemble(processForm.glwj, processForm.glwjName);
+            // glwjFileMap: {},
+            this.caFileMap = this.assemble(processForm.ca, processForm.caName);
+            // caFileMap: {},
+            this.zbjbdFileMap = this.assemble(processForm.zbjbd, processForm.zbjbdName);
+            // zbjbdFileMap: {},
+
           }
         }).catch(e => {
         })
@@ -949,8 +1150,21 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
-        this.defaultCheckedKeys = [this.form.standSystem];
+        let wssmrName = this.form.wssmrname || this.form.wssmr
+        this.form.wssmr = wssmrName
+        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
+        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
+        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
+        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : ''
+        this.defaultCheckedKeys = [this.form.standSystem]
+        this.defaultCheckedKeys1 = [this.form.cycvppsbm]
+        this.defaultCheckedKeys2 = [this.form.kccvppsbm]
+        this.defaultCheckedKeys3 = [this.form.dybxh]
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+        this.form.standYear = this.form.standYear ? this.form.standYear : ''
+        if (this.form.country) {
+          this.form.country = this.form.country.split(",");
+        }
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
@@ -973,27 +1187,96 @@ export default {
     handleTabs(name) {
       this.active = name
     },
+    handleTransfer() {
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+    },
     handleSave() {
     },
+    //流程驳回按钮
+    handle1() {
+      if (this.commentText) {
+        this.formTongGuo.approvalOpinion = 1;
+        this.handleSubmit();
+      } else {
+        this.$message.warning("请填写审批意见");
+      }
+    },
+    //流程提交按钮
+    handle2() {
+      this.formTongGuo.approvalOpinion = 0;
+      this.handleSubmit();
+    },
     handleSubmit() {
-      this.form.commentText = this.commentText
-      this.form.approvalOpinion = this.approvalOpinion
+      const val = this.form.country;
+      if (val !== "" && val !== null && typeof (val) !== "undefined") {
+        if (val instanceof Array) {
+          this.form.country = val.join(",");
+        } else {
+          this.form.country = val;
+        }
+      } else if (val === "") {
+        this.form.country = [];
+      }
+      this.isSubmit = true;
+      this.form.commentText = this.commentText;
+      this.form.approvalOpinion = this.formTongGuo.approvalOpinion;
+      if (this.form.syrz.length === 0) {
+        this.form.syrz = "";
+      }
+      if (this.form.nylx.length === 0) {
+        this.form.nylx = "";
+      }
+      if (this.form.zrbm.length === 0) {
+        this.form.zrbm = "";
+      }
+      if (this.form.qcdw.length === 0) {
+        this.form.qcdw = "";
+      }
+      if (this.form.cllx.length === 0) {
+        this.form.cllx = "";
+      }
+      if (this.form.sycpx.length === 0) {
+        this.form.sycpx = "";
+      }
+      if (this.form.zrgcs.length === 0) {
+        this.form.zrgcs = "";
+      }
+      let qcdwName = []
+      if(this.form.qcdw && this.form.qcdw.length > 0){
+        this.form.qcdw.map(item => {
+          this.qcdwOptions.forEach(items => {
+            if(item === items.value){
+              qcdwName.push(items.label)
+            }
+          })
+        })
+      }
+      this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
+      this.form.menuIds = this.form.treeListId;
+      this.form.BBFDTBZ = this.form.bfbdtbzh
+      this.form.qcdw =  qcdwName
+      this.form.qcdw =  qcdwName.splice(',')
       const json = JSON.stringify(this.form);
-      console.log(json)
-      this.$http.post('lawss/activiti/completeTask', {
+      this.$http.post("lawss/activiti/completeTask", {
         taskIds: this.taskIds,
         userId: this.userId,
         json: json
       }, {
         _this: this
       }, res => {
-        console.log(res);
         if (res.success) {
-          this.processCreateStand(json)
-          // 流程提交之后，应该流转至待办任务页面
-          this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
+          if (this.formTongGuo.approvalOpinion == "1") {
+            this.$message.warning("驳回成功");
+            this.isSubmit = false;
+            this.formTongGuo.commentText = "";
+            // 流程提交之后，应该流转至待办任务页面
+            this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
+          } else {
+            this.processCreateStand(json);
+          }
         }
-      })
+      });
     },
 
     /**
@@ -1007,23 +1290,35 @@ export default {
       processCreateStand(_formData).then(res => {
         if (res.result === '操作成功' || res.data === '入库成功') {
           this.$message.success(res.data)
+          /*this.$http.postData('sarStandardsInfo/sar-standards-info/saveStandardsMenuForFlow', menuList, {
+            _this: this,
+          }, resMenu => {
+            if (resMenu.ok) {
+              console.log(resMenu)
+            }
+          })*/
           setTimeout(() => {
             this.$router.push({
               name: 'ProcessCenter'
             })
           }, 100)
+          this.isSubmit = false
         } else {
           this.$message.warning(res.message)
+          this.isSubmit = false
         }
       })
     },
   },
+  created() {
+  },
   mounted() {
     this.getData()
     this.processTable()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
+      this.countryOptions = res.data.COUNTRY//国家地区
       this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
       this.standNatureOptions = res.data.SARPROPERTY // 标准性质
       this.standStateOptions = res.data.WBZTCLASS // 文本状态
@@ -1032,14 +1327,19 @@ export default {
       this.categoryOptions = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
       this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
+      this.wssmrOptions = res.data.WSSMR // 我司署名人
+      this.qcdwOptions = res.data.QCDW // 起草单位
       this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
       this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
       this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
       this.txlbOptions = res.data.TXLBCLASS // 体系类别
-      this.qcdwOption = res.data.QCDW // 体系类别
       this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
       this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+      this.key++
     })
+    this.busVsFunc()
+    this.modelFunc()
   }
 }
 </script>

From 83c17a46955b6faa4cea2685b58977251a27bf8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 11 May 2022 14:31:32 +0800
Subject: [PATCH 2/9] =?UTF-8?q?52715=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=E8=B0=83=E7=A0=94=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B-=E6=89=8B=E6=9C=BA=E8=BD=AC=E5=8A=9E=E9=99=88?=
 =?UTF-8?q?=E6=98=A5=E6=A2=85=E5=90=8EPC=E7=AB=AF=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=20=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=20=E6=89=8B=E6=9C=BA=E7=AB=AF=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E6=B5=81=E7=A8=8B=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/phone/bzdy/step2.vue  | 40 ++++++++++---------
 .../processCenter/pages/phone/bzdy/step4.vue  |  3 +-
 .../processCenter/pages/phone/bzdy/step6.vue  |  2 +
 .../processCenter/pages/phone/bzdy/step7.vue  |  2 +
 .../processCenter/pages/phone/bzdy/step8.vue  |  2 +
 .../processCenter/pages/phone/bzdy/step9.vue  |  2 +
 6 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzdy/step2.vue b/src/pages/processCenter/pages/phone/bzdy/step2.vue
index 96be90b23..ab9b04792 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step2.vue
@@ -24,6 +24,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                              <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -265,25 +266,26 @@
                     }
                 })
             },
-            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
-                        this.form.modelList = data.modelList || data.form.modelList
-                        this.form.title = data.title || data.form.title
-                        this.form.date = data.date || data.form.date
-                        this.json = data || data.form
-                        this.form.responUserList = data.form?  data.form.responUserList : ''
-                        this.form.responUserListName = data.form?  data.form.responUserListName : ''
-                        this.commentText2 = data.commentText2 || ''
-                    }).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.fjList = data.fjList || data.form.fjList
+                this.form.modelList = data.modelList || data.form.modelList
+                this.form.title = data.title || data.form.title
+                this.form.processName = data.processName || data.form.processName
+                this.form.date = data.date || data.form.date
+                this.json = data || data.form
+                this.form.responUserList = data.form?  data.form.responUserList : ''
+                this.form.responUserListName = data.form?  data.form.responUserListName : ''
+                this.commentText2 = data.commentText2 || ''
+              }).catch(e => {
+              })
+            })
+          },
         },
         mounted () {
             this.getData()
diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue
index 262f1f350..26990a8cf 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step4.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue
@@ -24,6 +24,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                                <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -94,7 +95,6 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
-                @save="handleSave"
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
@@ -268,6 +268,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.processName = data.form ? data.form.processName : data.processName
                         this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
diff --git a/src/pages/processCenter/pages/phone/bzdy/step6.vue b/src/pages/processCenter/pages/phone/bzdy/step6.vue
index 8d06711e7..90d7ae54a 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step6.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step6.vue
@@ -24,6 +24,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                                <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -324,6 +325,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.processName = data.form ? data.form.processName : data.processName
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
diff --git a/src/pages/processCenter/pages/phone/bzdy/step7.vue b/src/pages/processCenter/pages/phone/bzdy/step7.vue
index fd0c0504a..d31948e15 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step7.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step7.vue
@@ -23,6 +23,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                                <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -286,6 +287,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.processName = data.form ? data.form.processName : data.processName
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
diff --git a/src/pages/processCenter/pages/phone/bzdy/step8.vue b/src/pages/processCenter/pages/phone/bzdy/step8.vue
index a7546b022..d384fa013 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step8.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step8.vue
@@ -23,6 +23,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                                <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -286,6 +287,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        this.form.processName = data.form ? data.form.processName : data.processName
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
diff --git a/src/pages/processCenter/pages/phone/bzdy/step9.vue b/src/pages/processCenter/pages/phone/bzdy/step9.vue
index 2b5e8548e..284c9978a 100644
--- a/src/pages/processCenter/pages/phone/bzdy/step9.vue
+++ b/src/pages/processCenter/pages/phone/bzdy/step9.vue
@@ -23,6 +23,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <van-cell-group>
+                                <van-field label="流程名称" v-model="form.processName" readonly />
                                 <van-field label="调研标题" v-model="form.title" readonly />
                                 <van-field label="完成时间" v-model="$moment(form.date).format('YYYY-MM-DD')" readonly />
                             </van-cell-group>
@@ -288,6 +289,7 @@
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
                         this.commentText9 = data.commentText9 || ''
+                        this.form.processName = data.form ? data.form.processName : data.processName
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

From c0053f23228203dff97e33d54fca25fde993a3ad 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, 12 May 2022 10:25:33 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=97=E6=AE=B5=E5=A4=A7=E5=B0=8F=20?=
 =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=9C=B0=E5=8C=BA=E4=BF=9D=E5=AD=98=E6=B6=88?=
 =?UTF-8?q?=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/creatProcess/bzrk/step1.vue  | 12 ++++++++----
 .../processCenter/pages/creatProcess/bzrk/step2.vue  | 12 ++----------
 .../processCenter/pages/creatProcess/bzrk/step3.vue  |  7 +++----
 .../processCenter/pages/creatProcess/bzrk/step4.vue  | 10 ++++++----
 .../processCenter/pages/creatProcess/bzrk/step5.vue  |  2 ++
 5 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index b5da1d706..d50a59ecd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -958,6 +958,7 @@
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
+                      type="textarea"
                       v-model="form.yybj"
                       placeholder="请输入引用标准"
                       clearable
@@ -965,6 +966,7 @@
                   </el-tooltip>
                   <el-input
                     v-else
+                    type="textarea"
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
                     clearable
@@ -3200,7 +3202,7 @@ export default {
     handleSave() {
       //文件处理
       this.fileInfoHandle();
-      this.form.country = this.countryArr;
+      // this.form.country = this.countryArr;
       // if(item.country !== undefined && item.country !== null){
       //   this.sarStandardsInfoEO.country = item.country.split(",");
       // }
@@ -3228,7 +3230,6 @@ export default {
         this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
-        this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
       }).catch(e => {
         this.saveLoading = false
       })
@@ -3295,7 +3296,7 @@ export default {
                   if (res.ok) {
                     this.fileInfoHandle()
                     this.isSubmit = true
-                    this.form.country = this.countryArr;
+                    // this.form.country = this.countryArr;
                     var json = Object.assign(this.form, this.roleForm)
                     json.zrUserId = this.form.zrUserId
                     json.jlUserId = this.form.jlUserId
@@ -3354,7 +3355,7 @@ export default {
               } else {
                 this.fileInfoHandle()
                 this.isSubmit = true
-                this.form.country = this.countryArr;
+                // this.form.country = this.countryArr;
                 var json = Object.assign(this.form, this.roleForm)
                 json.zrUserId = this.form.zrUserId
                 json.jlUserId = this.form.jlUserId
@@ -3487,6 +3488,9 @@ export default {
   /deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner {
     width: 100%;
   }
+  /deep/.el-form-item__content .el-textarea .el-textarea__inner {
+    width: 94%;
+  }
 
   /deep/ .search-area {
     display: contents;
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 97acce26f..1ab306f45 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -627,6 +627,7 @@
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
+                      type="textarea"
                       v-model="form.yybj"
                       disabled
                       placeholder="请输入引用标准"
@@ -635,6 +636,7 @@
                   </el-tooltip>
                   <el-input
                     v-else
+                    type="textarea"
                     disabled
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
@@ -1236,16 +1238,6 @@ export default {
       this.handleSubmit();
     },
     handleSubmit() {
-      const val = this.form.country;
-      if (val !== "" && val !== null && typeof (val) !== "undefined") {
-        if (val instanceof Array) {
-          this.form.country = val.join(",");
-        } else {
-          this.form.country = val;
-        }
-      } else if (val === "") {
-        this.form.country = [];
-      }
       this.isSubmit = true;
       this.form.commentText = this.commentText;
       this.form.approvalOpinion = this.formTongGuo.approvalOpinion;
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 31ac891dd..bb0a491bc 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -604,6 +604,7 @@
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
+                      type="textarea"
                       v-model="form.yybj"
                       disabled
                       placeholder="请输入引用标准"
@@ -612,6 +613,7 @@
                   </el-tooltip>
                   <el-input
                     v-else
+                    type="textarea"
                     disabled
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
@@ -1140,6 +1142,7 @@ export default {
         this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
         this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
         this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz: ''
+        this.form.country = this.form.country && this.form.country !== [] ? this.form.country: ''
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
@@ -1148,10 +1151,6 @@ export default {
         this.form.standYear = this.form.standYear ? this.form.standYear : ''
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
-        if( this.form.country !== undefined &&   this.form.country !== null &&   this.form.country !== ''){
-          this.form.country=this.form.country.split(",");
-        }
-
         this.form['id'] = item.id
         this.$forceUpdate()
       })
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 965909809..24391a59c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1212,6 +1212,7 @@
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
+                      type="textarea"
                       v-model="form.yybj"
                       placeholder="请输入引用标准"
                       clearable
@@ -1219,6 +1220,7 @@
                   </el-tooltip>
                   <el-input
                     v-else
+                    type="textarea"
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
                     clearable
@@ -2648,7 +2650,7 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
-        if (this.form.country) {
+        if (typeof this.form.country === "string") {
           this.form.country = this.form.country.split(",");
         }
         this.$forceUpdate()
@@ -2764,7 +2766,6 @@ export default {
     handleSave() {
       //表单文件处理
       this.fileInfoHandle();
-      this.form.country = this.countryArr;
       this.form.commentText = this.commentText;
       this.saveLoading = true
       let _formData = new FormData()
@@ -2826,7 +2827,6 @@ export default {
       this.form.glwjName = this.glwjFileList.map(item => item.name).join(",")
     },
     handleSubmit() {
-      this.form.country = this.countryArr;
       this.$refs['form'].validate((valid) => {
         if (valid) {
           if (this.submitType === 1) {
@@ -3001,7 +3001,9 @@ export default {
   /deep/ .prc-content-border .form-item-disabled .el-form-item__content .el-input .el-input__inner {
     width: 70%;
   }
-
+  /deep/.el-form-item__content .el-textarea .el-textarea__inner {
+    width: 94%;
+  }
   /deep/ .el-upload-list__item-name {
     white-space: inherit;
   }
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index b05a9f745..09e84563c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -627,6 +627,7 @@
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
+                      type="textarea"
                       v-model="form.yybj"
                       disabled
                       placeholder="请输入引用标准"
@@ -636,6 +637,7 @@
                   <el-input
                     v-else
                     disabled
+                    type="textarea"
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
                     clearable

From 9e7526264d54a7bbb08bd485cb666ec97c05cf51 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, 12 May 2022 10:55:31 +0800
Subject: [PATCH 4/9] =?UTF-8?q?52749=20=E6=A0=87=E5=87=86=E8=B0=83?=
 =?UTF-8?q?=E7=A0=94=E6=B5=81=E7=A8=8B=20=E6=B5=81=E7=A8=8B=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=20=E5=9C=A8=E9=80=89=E4=BA=BA=E7=9A=84=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=20=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE=20=E6=9C=AA?=
 =?UTF-8?q?=E8=B7=B3=E5=87=BA=E9=A1=B5=E9=9D=A2=20=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=20=E6=B5=81=E7=A8=8B=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzdy/step1.vue         | 39 ++++++++++++-------
 .../tabComponents/taskDraft/index.vue         |  2 +-
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index c0847bffe..91c7fef8b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -269,7 +269,7 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { saveTaskFirst } from 'api/process'
+import { queryTaskFirst, saveTaskFirst } from "api/process";
 import { taskDel } from 'api/process'
 export default {
   name: "bzdyStep1",
@@ -559,14 +559,13 @@ export default {
         this.saveLoading = false
       })
     },
-    handleSubmit(username) {
+    handleSubmit() {
       this.$refs['qbkwForm'].validate((valid) => {
         if (valid) {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
               this.$http.post('lawss/activiti/startProcessRollBack', {
-                id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,
                 type: '2',
@@ -586,14 +585,12 @@ export default {
                   }, {}, res => {
                     if (res.success) {
                       this.$message.success('流程发起成功')
-                      if (this.bpnId !== '') {
-                        let taskId = {
-                          id: this.bpnId
-                        }
-                        taskDel(taskId).then(res=>{
-                          return res
-                        })
+                      let taskId = {
+                        id: this.$route.query.bpnId
                       }
+                      taskDel(taskId).then(res=>{
+                        return res
+                      })
                       this.$router.push('/processCenter')
                     }
                     this.isSubmit = false
@@ -612,12 +609,28 @@ export default {
         }
       })
     },
-    aa () {
-      return 11111
-    }
+    getData () {
+      queryTaskFirst({
+        bpnId: this.bpnId
+      }).then(res => {
+        this.bpnId = this.$route.query.bpnId
+        let mes = JSON.parse(res.mes)
+        if (mes.form.date) {
+          mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+        } else {
+          mes.form.date = ''
+        }
+        this.form = mes.form
+        this.roleForm = mes.roleForm
+        this.commentText1 = mes.commentText1 || ''
+      })
+    },
   },
   mounted () {
     this.bpnId = this.$route.query.bpnId
+    if (this.bpnId !== undefined) {
+      this.getData()
+    }
   },
 }
 </script>
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 2388596ef..e6aed9d79 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -621,7 +621,7 @@ export default {
               // 法规入库及评估流程
         case '2':
           this.$router.push({
-            name: 'bzdyStep1-1',
+            name: 'bzdyStep1',
             query: {
               type: '2',
               processName: '标准调研流程',

From d5c544c238ab36a4fd1be9a5901f6e8f08a29f59 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, 12 May 2022 13:19:15 +0800
Subject: [PATCH 5/9] =?UTF-8?q?52765=20=E3=80=90WELINK-=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=20=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=20=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E7=BC=BA=E5=B0=91=20=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E7=B1=BB=E5=88=AB=E3=80=81=E6=A0=87=E7=AD=BE=E3=80=81=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3=E4=BD=8D=E7=BD=AE=E3=80=81=E6=A0=87=E5=87=86=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/phone/bzrk/step2.vue  | 70 ++++++++++++-------
 1 file changed, 46 insertions(+), 24 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index ba636badf..909ba77fa 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -39,7 +39,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准类别" v-show="form.standInData === '0'" prop="standSort" class="add-form-item form-item-disabled">
+            <el-form-item label="标准类别"  prop="standSort" class="add-form-item form-item-disabled">
               <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
                 <el-option
                   v-for="item in standSortOptions"
@@ -109,9 +109,31 @@
                 <el-radio label="2">否</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+            <el-form-item  label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
               <el-input v-model="form.standSystem" disabled></el-input>
             </el-form-item>
+            <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="form.gxhbq"
+                placeholder="请输入标签"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="归档位置" class="add-form-item form-item-disabled">
+              <el-input
+                style="display: none"
+                v-model="form.treeListId"
+              ></el-input>
+              <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
+                <el-input
+                  v-model="form.treeListName"
+                  clearable
+                  placeholder="选择归档位置"
+                  readonly>
+                </el-input>
+              </el-tooltip>
+            </el-form-item>
           </div>
           <ProcessTitle>
             <template slot="title">实施日期</template>
@@ -252,6 +274,17 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
+              <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
+                <el-option
+                  v-for="item in sycpxOptions"
+                  placeholder="请选择"
+                  :key="item.value"
+                  :value="item.value"
+                  :label="item.label"
+                ></el-option>
+              </el-select>
+            </el-form-item>
             <van-field label="关联模块--乘用车VPPS编码" v-model="form.cycvppsbm" readonly   placeholder="请输入乘用车VPPS编码"/>
             <van-field label="关联模块--卡车VPPS编码" v-model="form.kccvppsbm" readonly placeholder="请输入卡车VPPS编码"/>
             <van-field label="关联模块--乘用车vpps中文名称" v-model="form.cycvppscn" readonly placeholder="请输入乘用车vpps中文名称" />
@@ -274,28 +307,17 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
-              <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>
-                <el-option
-                  v-for="item in txlbOptions"
-                  placeholder="请选择"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
-              <el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple disabled>
-                <el-option
-                  v-for="item in sycpxOptions"
-                  placeholder="请选择"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
+<!--            <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">-->
+<!--              <el-select v-model="form.txlb" placeholder="请选择体系类别" multiple disabled>-->
+<!--                <el-option-->
+<!--                  v-for="item in txlbOptions"-->
+<!--                  placeholder="请选择"-->
+<!--                  :key="item.value"-->
+<!--                  :value="item.value"-->
+<!--                  :label="item.label"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <el-form-item style="display: none" label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
               <el-select v-model="form.syrz" placeholder="请选择适用认证" multiple disabled>
                 <el-option

From 782dcda8ec8930c7d0eb5c2e1c181930a7a2aaa5 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, 12 May 2022 13:56:36 +0800
Subject: [PATCH 6/9] =?UTF-8?q?52769=20=E3=80=90=E7=BA=BF=E4=B8=8A?=
 =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=20=E5=85=B3=E8=81=94=E4=BF=A1=E6=81=AF=20=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E5=A1=AB=E5=A4=9A=E4=BA=86=20=E8=87=AA=E5=8A=A8=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 74 ++++++++++---------
 .../pages/creatProcess/bzrk/step2.vue         | 10 ++-
 .../pages/creatProcess/bzrk/step3.vue         | 10 ++-
 .../pages/creatProcess/bzrk/step4.vue         | 11 ++-
 .../pages/creatProcess/bzrk/step5.vue         | 10 ++-
 5 files changed, 72 insertions(+), 43 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index d50a59ecd..a27652d21 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -816,17 +816,18 @@
           </ProcessTitle>
           <div class="prc-content-border" v-show="verifySarStandard">
             <el-row :gutter="24">
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
-                  <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
-                    <el-input
-                            v-model="form.dtbjh"
-                            placeholder="请输入代替标准号"
-                            clearable
-                    ></el-input>
-                  </el-tooltip>
+<!--                  <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">-->
+<!--                    <el-input-->
+<!--                            v-model="form.dtbjh"-->
+<!--                            placeholder="请输入代替标准号"-->
+<!--                            clearable-->
+<!--                    ></el-input>-->
+<!--                  </el-tooltip>-->
                   <el-input
-                          v-else
+                    type="textarea"
+                    :title="form.dtbjh"
                     v-model="form.dtbjh"
                     placeholder="请输入代替标准号"
                     clearable
@@ -879,22 +880,24 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-input
+                    type="textarea"
                     style="display:none;"
                     v-model="form.bfdtbzh"
                     placeholder="请输入部分代替标准号"
                   ></el-input>
-                  <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
-                    <el-input
-                            v-model="form.bfbdtbzh"
-                            placeholder="请输入部分代替标准号"
-                            clearable
-                    ></el-input>
-                  </el-tooltip>
+<!--                  <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">-->
+<!--                    <el-input-->
+<!--                            v-model="form.bfbdtbzh"-->
+<!--                            placeholder="请输入部分代替标准号"-->
+<!--                            clearable-->
+<!--                    ></el-input>-->
+<!--                  </el-tooltip>-->
                   <el-input
-                          v-else
+                    type="textarea"
+                    :title="form.bfbdtbzh"
                     v-model="form.bfbdtbzh"
                     placeholder="请输入部分代替标准号"
                     clearable
@@ -909,15 +912,16 @@
                   </el-button>
                 </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
-                  <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
-                    <el-input
-                            v-model="form.cbbh"
-                            placeholder="请输入采标编号"
-                            clearable
-                    ></el-input>
-                  </el-tooltip>
+<!--                  <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">-->
+<!--                    <el-input-->
+<!--                            v-model="form.cbbh"-->
+<!--                            placeholder="请输入采标编号"-->
+<!--                            clearable-->
+<!--                    ></el-input>-->
+<!--                  </el-tooltip>-->
                   <el-input
-                          v-else
+                    type="textarea"
+                    :title="form.cbbh"
                     v-model="form.cbbh"
                     placeholder="请输入采标编号"
                     clearable
@@ -956,16 +960,16 @@
               </el-col>
               <el-col :span="24">
                 <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
-                  <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
-                    <el-input
-                      type="textarea"
-                      v-model="form.yybj"
-                      placeholder="请输入引用标准"
-                      clearable
-                    ></el-input>
-                  </el-tooltip>
+<!--                  <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">-->
+<!--                    <el-input-->
+<!--                      type="textarea"-->
+<!--                      v-model="form.yybj"-->
+<!--                      placeholder="请输入引用标准"-->
+<!--                      clearable-->
+<!--                    ></el-input>-->
+<!--                  </el-tooltip>-->
                   <el-input
-                    v-else
+                    :title="form.yybj"
                     type="textarea"
                     v-model="form.yybj"
                     placeholder="请输入引用标准"
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 1ab306f45..683a81a5a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -555,10 +555,11 @@
           </ProcessTitle>
           <div class="prc-content-border">
             <el-row :gutter="24">
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
+                            type="textarea"
                             disabled
                             v-model="form.dtbjh"
                             placeholder="请输入代替标准号"
@@ -568,6 +569,7 @@
                   <el-input
                           v-else
                           disabled
+                          type="textarea"
                           v-model="form.dtbjh"
                           placeholder="请输入代替标准号"
                           clearable
@@ -587,11 +589,12 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
                             disabled
+                            type="textarea"
                             v-model="form.bfbdtbzh"
                             placeholder="请输入部分代替标准号"
                             clearable
@@ -600,6 +603,7 @@
                   <el-input
                           v-else
                           disabled
+                          type="textarea"
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -610,6 +614,7 @@
                     <el-input
                             v-model="form.cbbh"
                             disabled
+                            type="textarea"
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
@@ -617,6 +622,7 @@
                   <el-input
                           v-else
                           disabled
+                          type="textarea"
                           v-model="form.cbbh"
                           placeholder="请输入采标编号"
                           clearable
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index bb0a491bc..70d86378e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -508,12 +508,13 @@
           </ProcessTitle>
           <div class="prc-content-border">
             <el-row :gutter="24">
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
                             v-model="form.dtbjh"
                             disabled
+                            type="textarea"
                             placeholder="请输入代替标准号"
                             clearable
                     ></el-input>
@@ -522,6 +523,7 @@
                           v-else
                           v-model="form.dtbjh"
                           disabled
+                          type="textarea"
                           placeholder="请输入代替标准号"
                           clearable
                   ></el-input>
@@ -548,11 +550,12 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
                             disabled
+                            type="textarea"
                             v-model="form.bfbdtbzh"
                             placeholder="请输入部分代替标准号"
                             clearable
@@ -561,6 +564,7 @@
                   <el-input
                           v-else
                           disabled
+                          type="textarea"
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -571,6 +575,7 @@
                     <el-input
                             v-model="form.cbbh"
                             disabled
+                            type="textarea"
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
@@ -579,6 +584,7 @@
                           v-else
                           v-model="form.cbbh"
                           disabled
+                          type="textarea"
                           placeholder="请输入采标编号"
                           clearable
                   ></el-input>
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 24391a59c..fc611d8e3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -1072,10 +1072,11 @@
           </ProcessTitle>
           <div class="prc-content-border">
             <el-row :gutter="24">
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
+                            type="textarea"
                             v-model="form.dtbjh"
                             placeholder="请输入代替标准号"
                             clearable
@@ -1083,6 +1084,7 @@
                   </el-tooltip>
                   <el-input
                           v-else
+                          type="textarea"
                           v-model="form.dtbjh"
                           placeholder="请输入代替标准号"
                           clearable
@@ -1134,22 +1136,25 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-input
                           style="display:none;"
                           v-model="form.bfdtbzh"
+                          type="textarea"
                           placeholder="请输入部分代替标准号"
                   ></el-input>
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
                             v-model="form.bfbdtbzh"
+                            type="textarea"
                             placeholder="请输入部分代替标准号"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
+                          type="textarea"
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -1167,12 +1172,14 @@
                   <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
                     <el-input
                             v-model="form.cbbh"
+                            type="textarea"
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
+                          type="textarea"
                           v-model="form.cbbh"
                           placeholder="请输入采标编号"
                           clearable
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
index 09e84563c..56ea88033 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
@@ -555,11 +555,12 @@
           </ProcessTitle>
           <div class="prc-content-border">
             <el-row :gutter="24">
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
                       disabled
+                      type="textarea"
                       v-model="form.dtbjh"
                       placeholder="请输入代替标准号"
                       clearable
@@ -568,6 +569,7 @@
                   <el-input
                     v-else
                     disabled
+                    type="textarea"
                     v-model="form.dtbjh"
                     placeholder="请输入代替标准号"
                     clearable
@@ -587,11 +589,12 @@
                   </div>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="24">
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
                       disabled
+                      type="textarea"
                       v-model="form.bfbdtbzh"
                       placeholder="请输入部分代替标准号"
                       clearable
@@ -600,6 +603,7 @@
                   <el-input
                     v-else
                     disabled
+                    type="textarea"
                     v-model="form.bfbdtbzh"
                     placeholder="请输入部分代替标准号"
                     clearable
@@ -610,6 +614,7 @@
                     <el-input
                       v-model="form.cbbh"
                       disabled
+                      type="textarea"
                       placeholder="请输入采标编号"
                       clearable
                     ></el-input>
@@ -617,6 +622,7 @@
                   <el-input
                     v-else
                     disabled
+                    type="textarea"
                     v-model="form.cbbh"
                     placeholder="请输入采标编号"
                     clearable

From 220e2f545f059377886a10e52ca008f1cb83b6ef 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, 12 May 2022 14:14:21 +0800
Subject: [PATCH 7/9] =?UTF-8?q?52767=20=E3=80=90WELINK-=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=20=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/phone/bzrk/step2.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index 909ba77fa..78aef7434 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -289,8 +289,10 @@
             <van-field label="关联模块--卡车VPPS编码" v-model="form.kccvppsbm" readonly placeholder="请输入卡车VPPS编码"/>
             <van-field label="关联模块--乘用车vpps中文名称" v-model="form.cycvppscn" readonly placeholder="请输入乘用车vpps中文名称" />
             <van-field label="关联模块--卡车vpps中文名称" v-model="form.kccvppscn" placeholder="请输入卡车vpps中文名称" readonly />
-            <van-field label="模块结构单元变型号" v-model="form.dybxh" readonly  placeholder="请输入模块结构单元变型号"/>
-            <van-field label="模块结构单元名称" v-model="form.dymc" readonly placeholder="请输入模块结构单元名称" />
+            <van-field label="模块结构单元变型号(卡车)" v-model="form.dybxh" readonly  placeholder="请输入模块结构单元变型号"/>
+            <van-field label="模块结构单元名称(卡车)" v-model="form.dymc" readonly placeholder="请输入模块结构单元名称" />
+            <van-field label="模块结构单元变型号(乘用车)" v-model="form.dybxhcar" readonly  placeholder="请输入模块结构单元变型号"/>
+            <van-field label="模块结构单元名称(乘用车)" v-model="form.dymccar" readonly placeholder="请输入模块结构单元名称" />
             <el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
               <el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
                 <el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>

From 9547d88b600c6bfbc32537fec4b81e496219bd8a 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, 12 May 2022 15:24:30 +0800
Subject: [PATCH 8/9] =?UTF-8?q?52772=20=E6=A0=87=E5=87=86=E5=8C=96?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=A5=E5=8E=86=E4=BD=8D=E7=BD=AE=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/navMenu/index.vue              | 10 ++++----
 .../processCenter/pages/phone/bzrk/step2.vue  | 25 ++++++++-----------
 .../workingGroup/index.vue                    | 10 ++++++--
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 07fafe8e4..8f723900c 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -286,11 +286,11 @@
                 path: '/standContrast',
                 menuId: '1d83a6278f781419f628e9f5560f5c86'
               },
-              {
-                title: '标准化活动日历',
-                path: '/standCalendar',
-                menuId: '5e834b3fca90619e593ad0ee83263885'
-              },
+              // {
+              //   title: '标准化活动日历',
+              //   path: '/standCalendar',
+              //   menuId: '5e834b3fca90619e593ad0ee83263885'
+              // },
               // {
               //   title: '标准比对库',
               //   path: '/standardComparisonLibrary',
diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index 78aef7434..b27252a72 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -812,6 +812,8 @@ export default {
             // jdwjFileMap: {},
             this.kwjFileMap = this.assemble(processForm.kwj, processForm.kwjName);
             // kwjFileMap: {},
+            this.xdbFileMap = this.assemble(processForm.xdb, processForm.xdbName);
+            // xdbFileMap: {},
             this.glwjFileMap = this.assemble(processForm.glwj, processForm.glwjName);
             // glwjFileMap: {},
             this.caFileMap = this.assemble(processForm.ca, processForm.caName);
@@ -830,14 +832,19 @@ export default {
     getFormFieldList(item) {
       this.$nextTick(() => {
         this.form = JSON.parse(JSON.stringify(item))
-/*        console.log(this.form)
+        let wssmrName = this.form.wssmrname || this.form.wssmr
+        this.form.wssmr = wssmrName
+        this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
+        this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
+        this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
+        this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : ''
         this.defaultCheckedKeys = [this.form.standSystem]
         this.defaultCheckedKeys1 = [this.form.cycvppsbm]
         this.defaultCheckedKeys2 = [this.form.kccvppsbm]
-        this.defaultCheckedKeys3 = [this.form.dybxh]*/
+        this.defaultCheckedKeys3 = [this.form.dybxh]
         this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
-        this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : ''
-        if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') {
+        this.form.standYear = this.form.standYear ? this.form.standYear : ''
+        if (this.form.country) {
           this.form.country = this.form.country.split(",");
         }
         this.form.prcNum = this.prcNum
@@ -881,16 +888,6 @@ export default {
       this.handleSubmit()
     },
     handleSubmit() {
-      const val = this.form.country;
-      if (val !== "" && val !== null && typeof (val) !== "undefined") {
-        if (val instanceof Array) {
-          this.form.country = val.join(",");
-        } else {
-          this.form.country = val;
-        }
-      } else if (val === "") {
-        this.form.country = [];
-      }
       this.isSubmit = true;
       this.form.commentText = this.commentText;
       this.form.approvalOpinion = this.formTongGuo.approvalOpinion;
diff --git a/src/pages/regulatoryRepository/workingGroup/index.vue b/src/pages/regulatoryRepository/workingGroup/index.vue
index e99e5b298..cb22f3ab5 100644
--- a/src/pages/regulatoryRepository/workingGroup/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/index.vue
@@ -14,7 +14,10 @@
 <!--                <workingGroup2 v-if="activeName === 'workingGroup2'"></workingGroup2>-->
 <!--            </el-tab-pane>-->
         </el-tabs>
-      <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'" class="statistics">工作组统计</el-button>
+      <div class="statistics">
+        <el-button size="mini" type="primary" @click="calendarBtn" v-btn-permission="'5e834b3fca90619e593ad0ee83263885'" >标准化活动日历</el-button>
+        <el-button size="mini" type="primary" @click="statisticsBtn" v-btn-permission="'2331baafd7d298b87ab3c0b5430d608d'">工作组统计</el-button>
+      </div>
     </div>
 </template>
 <script>
@@ -36,7 +39,10 @@
             this.$router.push({
               name: 'dataStatisComments'
             })
-          }
+          },
+          calendarBtn(){
+           this.$router.push('/standCalendar')
+          },
         },
         mounted() {},
         beforeDestroy() {}

From 887c69c44b73630c534490ec764c759ef10d450d 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, 12 May 2022 16:26:34 +0800
Subject: [PATCH 9/9] =?UTF-8?q?52763=20=E3=80=90WELINK-=E5=9B=BD=E5=86=85?=
 =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=20=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=20=E9=80=9A=E8=BF=87=20?=
 =?UTF-8?q?=E5=90=8E=E6=B5=81=E7=A8=8B=E7=9B=91=E6=8E=A7=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=A1=AB?=
 =?UTF-8?q?=E5=86=99=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processCenter/pages/phone/bzrk/step2.vue  | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue
index b27252a72..c6de1f965 100644
--- a/src/pages/processCenter/pages/phone/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue
@@ -380,25 +380,16 @@
         </el-form>
       </div>
       <div>
-        <el-collapse accordion v-model="activeName">
-          <el-collapse-item title="审批意见" name="1">
+        <el-collapse accordion>
+          <el-collapse-item title="审批意见">
             <div style="margin: 10px 0;">
-              <el-form
-                ref="formTongGuo"
-                :model="formTongGuo"
-                :rules="rules">
-                <el-form-item
-                  prop="commentText"
-                >
-                  <el-input
-                    type="textarea"
-                    :rows="3"
-                    resize="none"
-                    placeholder="请输入意见"
-                    v-model="formTongGuo.commentText">
-                  </el-input>
-                </el-form-item>
-              </el-form>
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
             </div>
           </el-collapse-item>
         </el-collapse>
@@ -450,6 +441,7 @@ export default {
   name: "phoneBzrkStep2",
   data() {
     return {
+      commentText: '',
       textStatusMap: {}, // 文本状态id与name对应
       xgdFileMap: [],
       fbgbjbdFileMap: [],
@@ -876,7 +868,7 @@ export default {
     handleSave() {
     },
     handle1() {
-      if(this.formTongGuo.commentText){
+      if(this.commentText){
         this.formTongGuo.approvalOpinion = 1
         this.handleSubmit()
       }else{