From 292c91acf69bde647abf24381dc3e969861624a6 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 10:45:02 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=20-?=
 =?UTF-8?q?=20=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=AD=97=E6=AE=B5=20-=20?=
 =?UTF-8?q?=E6=88=91=E5=8F=B8=E5=8F=82=E4=B8=8E=E5=88=B6=E6=A0=87=E6=8E=92?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue              | 14 ++++++++++++++
 .../pages/creatProcess/bzrk/step4.vue              | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 27e97489d..98d416e6a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -745,6 +745,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>
@@ -1511,6 +1522,7 @@
                     qcdw: [], // 起草单位
                     wssmr: [], // 我司署名人
                     cysd: '', // 我司参与深度
+                    cyzbpm:[],// 我司参与制标排名
                     cllx: [], // 适用车型
                     nylx: [],// 能源类型
                     sycpx: [],// 适用产品线
@@ -1616,6 +1628,7 @@
                   options:[]
                 }, // 适用认证
                 cysdOptions: [], // 我司参与深度
+                cyzbpmOptions:[], // 我司参与制标排名
                 cbcdOptions: [], // 采标程度
                 wssmrOptions: [], // 我司署名人
                 sycpxOptions: {
@@ -2978,6 +2991,7 @@
                 this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
                 this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证
                 this.cysdOptions = res.data.WSCYSD // 我司参与深度
+                this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
                 this.wssmrOptions = res.data.WSSMR // 我司署名人
                 this.sycpxOptions.options = res.data.SYCPXCLASS // 适用产品线
                 this.zrbmOptions.options = res.data.ZRBMCLASS // 责任部门
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 43fcc191e..01984b937 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -946,6 +946,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>
@@ -1574,6 +1585,7 @@ export default {
         qcdw: '', // 起草单位
         wssmr: '', // 我司署名人
         cysd: '', // 我司参与深度
+        cyzbpm:[],// 我司参与制标排名
         cllx: '', // 适用车型
         nylx: '',// 能源类型
         sycpx: '',// 适用产品线
@@ -1623,6 +1635,7 @@ export default {
         options:[]
       }, // 适用认证
       cysdOptions: [], // 我司参与深度
+      cyzbpmOptions:[], // 我司参与制标排名
       wssmrOptions: [], // 我司署名人
       qcdwOptions: [], // 起草单位
       sycpxOptions: {
@@ -2579,6 +2592,7 @@ export default {
       this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
       this.applyAuthOptions.options = 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.options = res.data.SYCPXCLASS // 适用产品线

From 95badff27bc02e9d61d3651f5bb327074f8568ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 27 Dec 2021 10:52:42 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       | 12 +++++-
 .../pages/creatProcess/bzqdfb/step3.vue       |  8 ++++
 .../pages/addEdit.vue                         |  1 +
 .../pages/details.vue                         | 38 ++++++++++++-------
 src/sysConfig/index.js                        | 23 +++++------
 5 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index f29da4ab8..61f2e77f2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1057,7 +1057,7 @@ export default {
         this.listForm.commentText = this.commentText
         this.listForm.fileName = this.fileInfoList
         this.listForm.dataList = this.dataList
-        var json = Object.assign(this.listForm, this.roleForm);
+        let json = Object.assign(this.listForm, this.roleForm);
         this.$refs["qdfbForm"].validate((valid) => {
           if (valid) {
             this.$refs["Form"].validate((valid) => {
@@ -1237,7 +1237,7 @@ export default {
         this.standList.map(item => {
           let newStand = false;
           for (let itemKey of this.dataList) {
-            if (item.id == itemKey.id) {
+            if (item.id === itemKey.id) {
               newStand = true;
               break;
             }
@@ -1246,6 +1246,14 @@ export default {
             this.$message.warning("请勿重复添加数据");
           } else {
             this.dataList.push(item);
+            this.dataList.forEach(item => {
+              if(item.XCXSSRQ === null){
+                item.XCXSSRQ = ''
+              }
+              if(item.ZCCSSRQ === null){
+                item.ZCCSSRQ = ''
+              }
+            })
             exits.push(item.id);
           }
         });
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 6e7bdb10f..9fd6c6eb4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -616,6 +616,14 @@ export default {
             _this.$message.warning("请勿重复添加数据");
           } else {
             _this.dataList.push(item);
+            _this.dataList.forEach(item => {
+              if(item.XCXSSRQ === null){
+                item.XCXSSRQ = ''
+              }
+              if(item.ZCCSSRQ === null){
+                item.ZCCSSRQ = ''
+              }
+            })
           }
         });
         this.standardData = []
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 68685d1fc..195afb22c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -445,6 +445,7 @@
         </el-form-item>
         <el-form-item label="标准实施日期" prop="putTime">
           <el-date-picker
+              clearable
               v-model.trim="editRowData.ssrq"
               type="dates"
               value-format="yyyy-MM-dd"
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index e7dc5fc86..a1ba62a88 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -172,12 +172,6 @@
             align="center"
             width="210px"
             label="标准实施日期">
-            <template slot-scope="scope">
-              <span v-if="scope.row.ssrq === null">
-                {{ scope.row.ssrq }}
-              </span>
-              <span v-else>{{ scope.row.ssrq.slice(0, 10) }}</span>
-            </template>
           </el-table-column>
           <el-table-column
             show-overflow-tooltip
@@ -610,18 +604,34 @@ export default {
     // 导出确定功能
     //确认导出
     exportTestItem() {
-      if (this.saveExportType === "apart") {
-        if (this.selectedList != null && this.selectedList != "") {
+      if(this.sarAccessEO.sortKey === '1'){
+        if (this.saveExportType === "apart") {
+          if (this.selectedList != null && this.selectedList != "") {
+            const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
+              "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+            window.open(exportURL);
+            this.$message.success("导出信息成功");
+          }
+        } else if (this.saveExportType === "all") {
+          const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
+            "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
+          window.open(exportURL);
+          this.$message.success("导出信息成功");
+        }
+      }else{
+        if (this.saveExportType === "apart") {
+          if (this.selectedList != null && this.selectedList != "") {
+            const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
+              "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+            window.open(exportURL);
+            this.$message.success("导出信息成功");
+          }
+        } else if (this.saveExportType === "all") {
           const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
-            "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+            "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
           window.open(exportURL);
           this.$message.success("导出信息成功");
         }
-      } else if (this.saveExportType === "all") {
-        const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" +
-          "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
-        window.open(exportURL);
-        this.$message.success("导出信息成功");
       }
       this.exportModelFlag = false;
       this.selectedList = [];
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 1ba8b30d7..8c83dc101 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,22 +7,20 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
+// const devInterfacePORT = '9999'
+const devIp = '192.168.10.70'
+const devInterfacePORT = '4202'
 // const devIp = '62.234.136.153'
-// const devInterfacePORT = '8033'
-const devIp = '10.19.11.243'
-const devInterfacePORT = '4304'
+// const devInterfacePORT = '8038'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
 // 配置 前端服务
-const devWebUrl = 'https://srms.foton.com.cn/#/'
+const devWebUrl = 'http://62.234.136.153:8038/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
 const webLoginType = 'dev'
 
 // 配置onlyOffice 前端服务
-const onlyOfficeUrl = 'http://10.100.5.116:8088'
-
-// 配置 kkFileView 前端服务
-const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
+const onlyOfficeUrl = 'http://127.0.0.1:8080'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -46,10 +44,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-// const prodIp = '62.234.136.153'
-// const prodInterfacePORT = '8033'
-const prodIp = 'srms.foton.com.cn'
-const prodInterfacePORT = ''
+const prodIp = '62.234.136.153'
+const prodInterfacePORT = '8033'
+// const prodIp = 'slrs.foton.com.cn'
+// const prodInterfacePORT = ''
 
 // 判断环境
 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -62,7 +60,6 @@ module.exports = {
     ssoLoginUrlDev: ssoLogin + devWebUrl,
     ssoLoginUrl: ssoLogin,
     onlyOfficeUrl: onlyOfficeUrl,
-    kkFileViewUrl: kkFileViewUrl,
     devWebUrl: devWebUrl,
     serverUrl: 'http://' + serverIP, // 服务器IP地址
     interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,

From f589cd8000b501f37af70e04d940b7845e9aa64d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 27 Dec 2021 10:56:01 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qbzxdjhgk/component/establish.vue         | 146 ++++++++++++++----
 .../pages/details.vue                         |   4 +-
 2 files changed, 121 insertions(+), 29 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
index 8981da546..6bed46d34 100644
--- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
@@ -24,20 +24,60 @@
           <el-option label="完成" value="完成"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-        <el-select  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
+      <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
           <el-option label="制定完成" value="制定完成"></el-option>
           <el-option label="制定中" value="制定中"></el-option>
           <el-option label="未制定" value="未制定"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+      <el-form-item prop="standScope" label="标准范围" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select v-model="qbfsForm.standScope" placeholder="请选择标准范围">
+          <el-option label="N1" value="N1"></el-option>
+          <el-option label="N2" value="N2"></el-option>
+          <el-option label="N3" value="N3"></el-option>
+          <el-option label="M1" value="M1"></el-option>
+          <el-option label="M2" value="M2"></el-option>
+          <el-option label="M3" value="M3"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="useStand" label="是否采用标准" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-select @change="useStandChange"  v-model="qbfsForm.useStand" placeholder="请选择是否采用标准">
+          <el-option label="是" value="yes"></el-option>
+          <el-option label="否" value="no"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="!useShow" prop="indexBasis" label="简述指标依据" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
+        <el-input
+          type="textarea"
+          v-model="qbfsForm.indexBasis"
+          placeholder="请输入指标依据"
+          :maxlength="500"/>
+      </el-form-item>
+<!--      <el-form-item prop="useStand" label="采用何种标准" style="width: 100%; margin-right:10px"-->
+<!--                    class="add-form-item form-item-disabled">-->
+<!--        <el-select v-model="qbfsForm.useStand" placeholder="请选择采用何种标准">-->
+<!--          <el-option-->
+<!--            v-for="item in useOptions"-->
+<!--            :key="item.value"-->
+<!--            :label="item.label"-->
+<!--            :value="item.value">-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
         <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人" readonly
                   @click.native="choiceZRRS('1')">
         </el-input>
       </el-form-item>
-      <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px"
+                    class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>
         <el-input v-model="qbfsForm.resPersonName" placeholder="请选择评审责任人"
                   @click.native="choiceZRRS('2')">
@@ -109,7 +149,7 @@
 
 <script>
 import ProcessTitle from "process/components/ProcessTitle";
-import MechanismTree from '@/components/mechanismTree'
+import MechanismTree from "@/components/mechanismTree";
 
 export default {
   name: "establish",
@@ -120,6 +160,7 @@ export default {
   props: ['message'],
   data(){
     return {
+      useShow: false,
       modalshowflagZRBM: false,
       nodeListZRBM: [],
       drawerTitle2: '',
@@ -131,44 +172,92 @@ export default {
       nodeList: [],
       qcdwOptions: [],
       qbfsForm: {
-        type: '5',
-        unit: '', // 单位
-        unitName: '',
-        esName: '', // 企标名称
-        planStatus: '', // 计划状态
-        reviseStatus: '', // 制修订状态
-        resPerson: '', // 评审责任人
-        resPersonName: '',
-        wgLeader: '', // 工作组组长
-        wgLeaderName: '',
-        draftTime: '', // 计划标准初稿完成时间
-        releaseTime: '', // 计划标准发布时间
-        drafter: '', // 起草人
-        drafterName: '',
-        newReason: '', //新增原因
+        type: "5",
+        unit: "", // 单位
+        unitName: "",
+        esName: "", // 企标名称
+        planStatus: "", // 计划状态
+        reviseStatus: "", // 制修订状态
+        standScope: "", //标准范围
+        useStand: "", //采用何种标准
+        indexBasis: '',  //指标依据
+        resPerson: "", // 评审责任人
+        resPersonName: "",
+        wgLeader: "", // 工作组组长
+        wgLeaderName: "",
+        draftTime: "", // 计划标准初稿完成时间
+        releaseTime: "", // 计划标准发布时间
+        drafter: "", // 起草人
+        drafterName: "",
+        newReason: "" //新增原因
         // remarks: '', // 备注
       },
+      useOptions: [
+        {
+          value: "ISO",
+          label: "ISO"
+        }, {
+          value: "ESE",
+          label: "ESE"
+        }, {
+          value: "EC/EEC",
+          label: "EC/EEC"
+        }, {
+          value: "IEC",
+          label: "IEC"
+        }, {
+          value: "GB",
+          label: "GB"
+        }, {
+          value: "GB/T",
+          label: "GB/T"
+        }, {
+          value: "QC/T",
+          label: "QC/T"
+        }, {
+          value: "JT/T",
+          label: "JT/T"
+        }, {
+          value: "HJ",
+          label: "HJ"
+        }, {
+          value: "TB",
+          label: "团标"
+        },{
+          value: "QT",
+          label: "其他"
+        },
+        ],
       qbfsFormRules: {
         unit: [
-          {required: true, message: '请选择起草单位', trigger: 'change'},
+          { required: true, message: "请选择起草单位", trigger: "change" }
         ],
         esName: [
-          {required: true, message: '请输入企标名称', trigger: 'blur'},
+          { required: true, message: "请输入企标名称", trigger: "blur" }
         ],
         planStatus: [
-          {required: true, message: '请选择计划状态', trigger: 'blur'},
+          { required: true, message: "请选择计划状态", trigger: "blur" }
         ],
         reviseStatus: [
-          {required: true, message: '请选择制修订状态', trigger: 'blur'},
+          { required: true, message: "请选择制修订状态", trigger: "blur" }
+        ],
+        standScope: [
+          { required: true, message: "请选择标准范围", trigger: "blur" }
+        ],
+        useStand: [
+          { required: true, message: "请选择采用何种标准", trigger: "blur" }
+        ],
+        indexBasis: [
+          { required: true, message: "请输入指标依据", trigger: "blur" }
         ],
         resPersonName: [
-          {required: true, message: '请输入评审责任人', trigger: 'blur'},
+          { required: true, message: "请输入评审责任人", trigger: "blur" }
         ],
         wgLeaderName: [
-          {required: true, message: '请输入工作组组长', trigger: 'blur'},
+          { required: true, message: "请输入工作组组长", trigger: "blur" }
         ],
         draftTime: [
-          {required: true, message: '请输入计划标准初稿完成时间', trigger: 'blur'},
+          { required: true, message: "请输入计划标准初稿完成时间", trigger: "blur" }
         ],
         releaseTime: [
           {required: true, message: '请输入计划标准发布时间', trigger: 'blur'},
@@ -205,6 +294,9 @@ export default {
      })
   },
   methods: {
+    useStandChange(){
+       this.useShow = !this.useShow
+    },
     choiceZRBM(type, title, id) {
       this.nodeListZRBM = []
       this.nodeListZRBM.push(id)
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index a1ba62a88..ffd3b9d75 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -608,13 +608,13 @@ export default {
         if (this.saveExportType === "apart") {
           if (this.selectedList != null && this.selectedList != "") {
             const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
-              "exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
+              "&exportType" + this.saveExportType + "&ids=" + this.selectedList.join(",") + "&exportName=" + this.exportName;
             window.open(exportURL);
             this.$message.success("导出信息成功");
           }
         } else if (this.saveExportType === "all") {
           const exportURL = interfaceUrl + "sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?" + "type=" + 1 +
-            "exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
+            "&exportType" + this.saveExportType + "&id=" + this.pageId + "&exportName=" + this.exportName;
           window.open(exportURL);
           this.$message.success("导出信息成功");
         }

From b9dd1aa1cd38b9dc579edf104c710b6bb9d2782f Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 10:59:07 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E6=B5=B7=E5=A4=96=20-=20=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20-=20=E5=8A=A0=E4=BA=86=E4=B8=AA=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index f5d615690..8fd05fba9 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -57,6 +57,7 @@
                       <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                     </p>
                     <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
+                    <!--发布稿（必读）-->
                     <template v-for="(child, childIndex) in item.child1">
                       <p class="files-title">
                         <label style=" margin-right: 164px;">{{ child.attrName }}</label>

From 1ed9a7dbaeb0c07f6cb37323528e28419e1a387d Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 27 Dec 2021 13:55:40 +0800
Subject: [PATCH 05/11] commit

---
 src/assets/styles/newStyle.less               | 14 ++++++++
 .../pages/creatProcess/bzdy/step1.vue         | 34 ++++++++++++++-----
 .../pages/creatProcess/bzjd/step1-1.vue       |  2 +-
 .../pages/creatProcess/bzjd/step1-6.vue       |  2 +-
 .../pages/creatProcess/bzjd/step1.vue         |  2 +-
 .../pages/creatProcess/bzjd/step2.vue         |  2 +-
 .../pages/creatProcess/bzjd/step3.vue         |  2 +-
 .../pages/creatProcess/bzjd/step4.vue         |  2 +-
 .../pages/creatProcess/bzjd/step5.vue         |  2 +-
 .../pages/creatProcess/bzjd/step6.vue         |  2 +-
 .../domesticStandardsAndRegulations/index.vue |  1 -
 .../components/EnterpriseStandardDatabase.vue |  1 -
 12 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less
index d5e16a9ed..0f2f85177 100644
--- a/src/assets/styles/newStyle.less
+++ b/src/assets/styles/newStyle.less
@@ -1,4 +1,18 @@
 // 设置查询区域
+.itemsTextBox {
+  min-height: 300px;
+  max-height: 500px;
+  overflow: auto;
+  line-height: 20px;
+  td {
+    border: 1px solid #606266;
+    text-align: center;
+  }
+  /deep/ td {
+    border: 1px solid #606266;
+    text-align: center;
+  }
+}
 .search-area{
   display: flex;
   justify-content: space-between;
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index d0bb9d7a5..09f159301 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -144,7 +144,7 @@
                   <h4>责任部门对接人</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任人" readonly="readonly" @click.native="choiceZRRS">
+                    <el-input v-model="roleForm.dockUserName" :title="roleForm.dockUserName" placeholder="选择责任部门对接人" readonly="readonly" @click.native="choiceZRRS('1')">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -167,7 +167,8 @@
                   <h4>技术管理中心主任</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+<!--                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>-->
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" readonly="readonly"  @click.native="choiceZRRS('2')"></el-input>
                   </div>
                 </el-form-item>
               </el-card>
@@ -197,7 +198,7 @@
     >
     </ProcessFooter>
     <Role-tree
-            is-title="选择责任部门对接人"
+            :is-title="drawerTitle2"
             :is-visible.sync="modalshowflag2"
             @checkedRole="checkedRole2"
             :nodeList="nodeList2"
@@ -262,6 +263,8 @@ export default {
   name: "bzdyStep1",
   data() {
     return {
+      drawerTitle2: '',
+      type2: '',
       bpnId: '',
       foldFormFlag: false,
       fileMadel2: false,
@@ -362,8 +365,14 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.roleForm.dockUserList = idList
-      this.roleForm.dockUserName = nameList
+      if (this.type2 === '1') {
+        this.roleForm.dockUserList = idList
+        this.roleForm.dockUserName = nameList
+      } else {
+        this.roleForm.directorUser = idList
+        this.roleForm.directorUserName = nameList
+      }
+
     },
     checkedRole (data) {
       if (this.type === 'dockUser') {
@@ -380,10 +389,19 @@ export default {
         this.roleForm.presidentUserName = data[0].name
       }
     },
-    choiceZRRS () {
+    choiceZRRS (type) {
+      this.type2 = type
       this.nodeList2 = []
-      if ( this.roleForm.dockUserList.length > 0) {
-        this.nodeList2 = this.roleForm.dockUserList.split(',')
+      if (type === '1') {
+        this.drawerTitle2 = '选择责任部门对接人'
+        if ( this.roleForm.dockUserList.length > 0) {
+          this.nodeList2 = this.roleForm.dockUserList.split(',')
+        }
+      } else {
+        this.drawerTitle2 = '选择技术管理中心主任'
+        if ( this.roleForm.directorUser.length > 0) {
+          this.nodeList2 = this.roleForm.directorUser.split(',')
+        }
       }
       this.modalshowflag2 = true
     },
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
index a22438391..734a2b504 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
@@ -420,7 +420,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
index b6e667a05..63914643d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue
@@ -323,7 +323,7 @@
       title="查看条款内容"
       :visible.sync="itermsConditionsFlag"
       size="800px">
-      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
       <div slot="footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
       </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
index fe95f97af..57a19019e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
@@ -424,7 +424,7 @@
       title="查看条款内容"
       :visible.sync="itermsConditionsFlag"
       size="800px">
-      <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+      <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
       <div slot="footer">
         <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭
         </el-button>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
index 05b0560ca..227a57450 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
@@ -260,7 +260,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
index 7dcd95813..f3b763caf 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
@@ -417,7 +417,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
index 1715d4c56..14234cacd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
@@ -272,7 +272,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
index 2c5abc2da..465385560 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
@@ -277,7 +277,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
index 06c2d27d1..f95bc408c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
@@ -276,7 +276,7 @@
                 title="查看条款内容"
                 :visible.sync="itermsConditionsFlag"
                 size="800px">
-            <div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
+            <div class="itemsTextBox" v-html="itermsConditionsTitle"></div>
             <div slot="footer">
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
             </div>
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index a4f5b087e..22f470a00 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -4324,7 +4324,6 @@ export default {
       formData.startIssueTime = formData.issueTime?formData.issueTime[0]:null
       formData.endIssueTime = formData.issueTime?formData.issueTime[1]:null
       formData.issueTime = null
-
       this.loading = true
       this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
         _this: this, loading: 'loading'
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index e1053c5d7..4de7326ed 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -271,7 +271,6 @@
       </div>
         <!--表格-->
       <div class="content">
-
         <el-table
           ref="selection"
           :data="standinfoList"

From 75b99eabaeacf636d30d112aed56f411c438fdf8 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Mon, 27 Dec 2021 13:59:35 +0800
Subject: [PATCH 06/11] commit

---
 .../pages/creatProcess/bzdy/step1-1.vue       | 30 ++++++++++++++-----
 .../pages/creatProcess/bzdy/step1.vue         |  1 -
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
index 714e09912..97fad8e2b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
@@ -144,7 +144,7 @@
                                     <h4>责任部门对接人</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.dockUserList" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS">
+                                        <el-input v-model="roleForm.dockUserName" placeholder="选择责任人" @click.native="choiceZRRS('1')">
                                         </el-input>
                                     </div>
                                 </el-form-item>
@@ -167,7 +167,7 @@
                                     <h4>技术管理中心主任</h4>
                                     <div style="margin-top: 10px;width: 300px;">
                                         <el-input v-model="roleForm.directorUser" style="display: none;"></el-input>
-                                        <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" @click.native="choiceZRR('directorUser', '选择技术管理中心主任', roleForm.directorUser)"></el-input>
+                                        <el-input v-model="roleForm.directorUserName" placeholder="选择技术管理中心主任" @click.native="choiceZRRS('2')"></el-input>
                                     </div>
                                 </el-form-item>
                             </el-card>
@@ -196,7 +196,7 @@
         >
         </ProcessFooter>
         <Role-tree
-                is-title="选择责任部门对接人"
+                :is-title="drawerTitle2"
                 :is-visible.sync="modalshowflag2"
                 @checkedRole="checkedRole2"
                 :nodeList="nodeList2"
@@ -261,6 +261,8 @@
         name: "bzdyStep1-1",
         data() {
             return {
+                drawerTitle2: '',
+                type2: '',
                 foldFormFlag: false,
                 fileMadel2: false,
                 nodeList: [],
@@ -370,8 +372,13 @@
                     idList += item.id
                     nameList += item.name
                 })
-                this.roleForm.dockUserList = idList
-                this.roleForm.dockUserName = nameList
+                if (this.type2 === '1') {
+                    this.roleForm.dockUserList = idList
+                    this.roleForm.dockUserName = nameList
+                } else {
+                    this.roleForm.directorUser = idList
+                    this.roleForm.directorUserName = nameList
+                }
             },
             checkedRole (data) {
                 if (this.type === 'dockUser') {
@@ -389,9 +396,18 @@
                 }
             },
             choiceZRRS () {
+                this.type2 = type
                 this.nodeList2 = []
-                if ( this.roleForm.dockUserList.length > 0) {
-                    this.nodeList2 = this.roleForm.dockUserList.split(',')
+                if (type === '1') {
+                    this.drawerTitle2 = '选择责任部门对接人'
+                    if ( this.roleForm.dockUserList.length > 0) {
+                        this.nodeList2 = this.roleForm.dockUserList.split(',')
+                    }
+                } else {
+                    this.drawerTitle2 = '选择技术管理中心主任'
+                    if ( this.roleForm.directorUser.length > 0) {
+                        this.nodeList2 = this.roleForm.directorUser.split(',')
+                    }
                 }
                 this.modalshowflag2 = true
             },
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
index 09f159301..2ae9cd88d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
@@ -372,7 +372,6 @@ export default {
         this.roleForm.directorUser = idList
         this.roleForm.directorUserName = nameList
       }
-
     },
     checkedRole (data) {
       if (this.type === 'dockUser') {

From 3a082e4593b6a0b6bb85b42f8ccaf02f89343a44 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 14:04:12 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E6=B5=B7=E5=A4=96=20-=20=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20-=20=E6=A0=87=E5=87=86=E5=8F=B7=E3=80=81=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=E5=90=8D=E7=A7=B0=E3=80=81=E8=8B=B1=E6=96=87=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E3=80=81=E5=8F=91=E5=B8=83=E7=A8=BF=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=9C=AC=EF=BC=8C=E5=8B=98=E8=AF=AF=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E8=A1=A5=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../details/otherStandardDetails/index.vue    | 197 +++++++++++++++++-
 1 file changed, 191 insertions(+), 6 deletions(-)

diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 8fd05fba9..6d73b5859 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -57,6 +57,12 @@
                       <span v-else>{{ sarStandardsInfoEO.standSort + ' ' + sarStandardsInfoEO.standNumber }}</span>
                     </p>
                     <!--                <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>-->
+                    <p><label style=" margin-right: 150px;">中文名称</label><span>{{
+                        sarStandardsInfoEO.standName || '-'
+                      }}</span></p>
+                    <p v-if="activeState"><label style=" margin-right: 150px;">英文名称</label><span>{{
+                        sarStandardsInfoEO.standEnName || '-'
+                      }}</span></p>
                     <!--发布稿（必读）-->
                     <template v-for="(child, childIndex) in item.child1">
                       <p class="files-title">
@@ -100,12 +106,135 @@
                         <template v-if="child.value === null">-</template>
                       </p>
                     </template>
-                    <p><label style=" margin-right: 150px;">中文名称</label><span>{{
-                        sarStandardsInfoEO.standName || '-'
-                      }}</span></p>
-                    <p v-if="activeState"><label style=" margin-right: 150px;">英文名称</label><span>{{
-                        sarStandardsInfoEO.standEnName || '-'
-                      }}</span></p>
+                    <!--修订本-->
+                    <template v-for="(child, childIndex) in item.child5">
+                      <p class="files-title">
+                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0"
+                                  v-for="(file, fileIndex) in child5Func(child.value)">
+                          <span>
+                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                          <i
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                          />
+                          <i
+                              title="下载带水印"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                          />
+                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
+                          <el-button
+                              v-if="child.attrField === itemNam "
+                              v-for="(itemNam,index) in itemExistList"
+                              :key="index"
+                              @click="showItemsModel(child.attrField)"
+                              class="decomposition-btn"
+                              style="right:62px"
+                              icon="icon-separate"
+                          >标准分解单
+                          </el-button>
+                          <el-button v-if="child.value && child.value.length > 1"
+                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+                            更多
+                          </el-button>
+                        </template>
+                        <template v-if="child.value === null">-</template>
+                      </p>
+                    </template>
+                    <!--勘误件-->
+                    <template v-for="(child, childIndex) in item.child4">
+                      <p class="files-title">
+                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0"
+                                  v-for="(file, fileIndex) in child4Func(child.value)">
+                          <span>
+                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                          <i
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                          />
+                          <i
+                              title="下载带水印"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                          />
+                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
+                          <el-button
+                              v-if="child.attrField === itemNam "
+                              v-for="(itemNam,index) in itemExistList"
+                              :key="index"
+                              @click="showItemsModel(child.attrField)"
+                              class="decomposition-btn"
+                              style="right:62px"
+                              icon="icon-separate"
+                          >标准分解单
+                          </el-button>
+                          <el-button v-if="child.value && child.value.length > 1"
+                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+                            更多
+                          </el-button>
+                        </template>
+                        <template v-if="child.value === null">-</template>
+                      </p>
+                    </template>
+                    <!--增补件（必读）-->
+                    <template v-for="(child, childIndex) in item.child3">
+                      <p class="files-title">
+                        <label style=" margin-right: 164px;">{{ child.attrName }}</label>
+                        <template v-if="child.value && child.value.length > 0"
+                                  v-for="(file, fileIndex) in child3Func(child.value)">
+                          <span>
+                          <a style="font-size: 16px;color: #409EFF;cursor: pointer"
+                             @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
+                             :title="file.oldFileName">{{ file.oldFileName }}</a>
+                          <i
+                              title="下载"
+                              @click="downloadFile(file.id)"
+                              class="icon-download"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : 'a772afab2a6708883335500f3f86e771'"
+                          />
+                          <i
+                              title="下载带水印"
+                              @click="downloadFileByWater(file.id, file.fileSuffix)"
+                              class="icon-download2"
+                              v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
+                          />
+                            <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
+                          </span>
+                          <el-button
+                              v-if="child.attrField === itemNam "
+                              v-for="(itemNam,index) in itemExistList"
+                              :key="index"
+                              @click="showItemsModel(child.attrField)"
+                              class="decomposition-btn"
+                              style="right:62px"
+                              icon="icon-separate"
+                          >标准分解单
+                          </el-button>
+                          <el-button v-if="child.value && child.value.length > 1"
+                                     style="color:#409EFF;border: 1px solid #409EFF;background: rgba(64, 158, 255, 0.1);"
+                                     class="decomposition-btn" icon="icon-relation" @click="relateEvent1(child.value)">
+                            更多
+                          </el-button>
+                        </template>
+                        <template v-if="child.value === null">-</template>
+                      </p>
+                    </template>
                     <p class="half">
                       <label style=" margin-right: 150px;"
                              title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
@@ -377,7 +506,9 @@
                   v-for="(child, childIndex) in item.one"
                   v-if="child.isShowImp === '0' && item.label == '过程稿件'"
               >
+<!--                增补件（必读）和勘误件不放在过程稿件里了-->
                 <div
+                    v-show="child.attrField !== 'ZBJBD' && child.attrField !== 'KWJ'"
                     :key="child.id"
                     :class="'modular-item half'"
                 >
@@ -1940,6 +2071,7 @@ export default {
   watch: {},
   methods: {
     child1Func(child1) {
+      console.log('1943',child1)
       const list = []
       if (child1 && child1.length > 1) {
         list.push(child1[0])
@@ -1947,6 +2079,33 @@ export default {
       }
       return child1
     },
+    child3Func(child3) {
+      console.log('1943',child3)
+      const list = []
+      if (child3 && child3.length > 1) {
+        list.push(child3[0])
+        return list
+      }
+      return child3
+    },
+    child4Func(child4) {
+      console.log('1943',child4)
+      const list = []
+      if (child4 && child4.length > 1) {
+        list.push(child4[0])
+        return list
+      }
+      return child4
+    },
+    child5Func(child5) {
+      console.log('1943',child5)
+      const list = []
+      if (child5 && child5.length > 1) {
+        list.push(child5[0])
+        return list
+      }
+      return child5
+    },
     handleChange(val) {
       console.log('1724', val)
     },
@@ -3479,7 +3638,9 @@ export default {
       displayLocation.forEach(location => {
         // 动态属性字段-FBGBJBD 单独添加至基础信息
         const list = displayLocation.filter(item => item.label === '过程稿件');
+        console.log('3535',list)
         if (location.label === '基础信息' && list && list.length > 0) {
+          //发布稿必读
           if (!list[0].child) {
             location['child1'] = []
           } else {
@@ -3487,6 +3648,30 @@ export default {
             location['child1'] = childList
 
           }
+          //增补件必读
+          if (!list[0].child) {
+            location['child3'] = []
+          } else {
+            const childList = list[0].child.filter(item => item.attrField === 'ZBJBD');
+            location['child3'] = childList
+
+          }
+          //勘误件
+          if (!list[0].child) {
+            location['child4'] = []
+          } else {
+            const childList = list[0].child.filter(item => item.attrField === 'KWJ');
+            location['child4'] = childList
+
+          }
+          //修订本
+          if (!list[0].child) {
+            location['child5'] = []
+          } else {
+            const childList = list[0].child.filter(item => item.attrField === 'XDB');
+            location['child5'] = childList
+
+          }
         }
         // 动态属性字段-SYRZ 单独添加至基础信息
         const list2 = displayLocation.filter(item => item.label === '适用范围');

From 030fef30fc69c4a6ab69e28ca858e27e1d6abc8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 27 Dec 2021 14:05:13 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1-1.vue     | 10 +++
 .../pages/creatProcess/bzqdfb/step1.vue       |  2 +
 .../pages/creatProcess/bzqdfb/step3.vue       |  2 +-
 .../pages/addEdit.vue                         | 69 +++++++++----------
 4 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
index 75225cd91..3d6f1cccd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
@@ -1315,6 +1315,14 @@ export default {
             this.$message.warning("请勿重复添加数据");
           } else {
             this.dataList.push(item);
+            this.dataList.forEach(item => {
+              if(item.XCXSSRQ === null){
+                item.XCXSSRQ = ''
+              }
+              if(item.ZCCSSRQ === null){
+                item.ZCCSSRQ = ''
+              }
+            })
             exits.push(item.id);
           }
         });
@@ -1368,11 +1376,13 @@ export default {
             this.dataList.forEach(item => {
               if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
                 item.xcxssrqgj = ''
+                this.$set(item, "XCXSSRQ", item.xcxssrqgj)
               }else{
                 this.$set(item, "XCXSSRQ", item.xcxssrqgj)
               }
               if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
                 item.zccssrqgj = ''
+                this.$set(item, "ZCCSSRQ", item.zccssrqgj)
               }else{
                 this.$set(item, "ZCCSSRQ", item.zccssrqgj)
               }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index 61f2e77f2..412e435de 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -1308,11 +1308,13 @@ export default {
               this.dataList.forEach(item => {
                 if(item.xcxssrqgj === 'undefined' ||item.xcxssrqgj === '-' ||  item.xcxssrqgj === 'null'){
                   item.xcxssrqgj = ''
+                  this.$set(item, "XCXSSRQ", item.xcxssrqgj)
                 }else{
                   this.$set(item, "XCXSSRQ", item.xcxssrqgj)
                 }
                 if(item.zccssrqgj === 'undefined' || item.zccssrqgj === '-'|| item.zccssrqgj === 'null'){
                   item.zccssrqgj = ''
+                  this.$set(item, "ZCCSSRQ", item.zccssrqgj)
                 }else{
                   this.$set(item, "ZCCSSRQ", item.zccssrqgj)
                 }
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 9fd6c6eb4..8dfd0b84c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -815,7 +815,7 @@ export default {
       this.listForm.commentText = this.commentText
       this.listForm.dataList = this.dataList
       const json = JSON.stringify(this.listForm);
-      this.isSubmit = true
+      // this.isSubmit = true
       this.$http.post('lawss/activiti/completeTask', {
         taskIds: this.taskIds,
         userId: this.userId,
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index 195afb22c..f5a470933 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -454,18 +454,20 @@
         </el-form-item>
         <el-form-item label="在产车实施日期" prop="zccssrqgj">
           <el-date-picker
-              v-model.trim="editRowData.zccssrqgj"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
+            clearable
+            v-model.trim="editRowData.zccssrqgj"
+            type="dates"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="新车型实施日期" prop="xcxssrqgj">
           <el-date-picker
-              v-model.trim="editRowData.xcxssrqgj"
-              type="dates"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期">
+            clearable
+            v-model.trim="editRowData.xcxssrqgj"
+            type="dates"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="责任部门" prop="zrbm">
@@ -1162,46 +1164,25 @@ export default {
     addSarAccess() {
       //判断是否是清单类型
       if (this.selectedAccInfoSearchList.length > 0) {
-
-        //为空转换
-        for (let i = 0; i < this.selectedAccInfoSearchList.length; i++) {
-          //适用车型为空
-          if (this.selectedAccInfoSearchList[i].typeApplicable === "[]"){
-            this.selectedAccInfoSearchList[i].typeApplicable = null
-          }
-          //能源类型为空
-          if (this.selectedAccInfoSearchList[i].nylx === "[]"){
-            this.selectedAccInfoSearchList[i].nylx = null
-          }
-          //责任部门为空
-          if (this.selectedAccInfoSearchList[i].zrbm === "[]"){
-            this.selectedAccInfoSearchList[i].zrbm = null
-          }
-          //试用产品线为空
-          if (this.selectedAccInfoSearchList[i].sycpx === "[]"){
-            this.selectedAccInfoSearchList[i].sycpx = null
-          }
-        }
-
         // 追加字段
         this.selectedAccInfoSearchList.map(item => {
           let addList;
           addList = this.sarAccessInfoList.findIndex(items => {
-            return items.id === item.id
-          })
+            return items.id === item.id;
+          });
           if (addList > -1) {
             // this.$refs.accessTypeSelect.clearSelection()
-            this.$refs.entryTable.clearSelection()
+            this.$refs.entryTable.clearSelection();
             this.$refs.searchTable.clearSelection()
             this.$message.warning('请勿添加重复数据')
           } else {
             this.sarAccessInfoList.push(item)
             this.sarAccessInfoList.forEach(item => {
-              this.$set(item, 'xcxssrqgj', item.xcxssrq)
-              this.$set(item, 'zccssrqgj', item.zccssrq)
-              if(item.attrInfoCaseMap !== undefined){
-                this.$set(item, 'typeApplicable', item.attrInfoCaseMap.cllx)
-                this.$set(item, 'nylx', item.attrInfoCaseMap.nylx)
+              this.$set(item, "xcxssrqgj", item.xcxssrq);
+              this.$set(item, "zccssrqgj", item.zccssrq);
+              if (item.attrInfoCaseMap !== undefined) {
+                this.$set(item, "typeApplicable", item.attrInfoCaseMap.cllx);
+                this.$set(item, "nylx", item.attrInfoCaseMap.nylx);
               }
               // 能源类型转换
               if (item.nylx !== null) {
@@ -1231,6 +1212,20 @@ export default {
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
+            this.sarAccessInfoList.forEach(item => {
+              if(item.nylx === '[]'){
+                item.nylx = ''
+              }
+              if(item.typeApplicable === '[]'){
+                item.typeApplicable = ''
+              }
+              if(item.zrbm === '[]'){
+                item.zrbm = ''
+              }
+              if(item.sycpx === '[]'){
+                item.sycpx = ''
+              }
+            })
           }
         })
       } else {

From 60378fe6a10811f5419a82660a30ce7608f17278 Mon Sep 17 00:00:00 2001
From: yanyizhou <2311759275@qq.com>
Date: Mon, 27 Dec 2021 14:56:41 +0800
Subject: [PATCH 09/11] =?UTF-8?q?=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=20-=201.=E6=96=87=E6=9C=AC=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?-=E5=A2=9E=E5=8A=A0=E2=80=9C=E4=BF=AE=E8=AE=A2=E6=9C=AC?=
 =?UTF-8?q?=E2=80=9D=202.=E5=9F=BA=E7=A1=80=E4=BF=A1=E6=81=AF-=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E8=A6=81=E4=BC=9A=E7=AD=BE=EF=BC=8C=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E2=80=9C=E5=90=A6=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 25 +++++++++++-
 .../pages/creatProcess/bzrk/step4.vue         | 38 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 5db2f67a3..09d2cf8f8 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -418,6 +418,29 @@
                                       </div>
                                   </div>
                                 </el-form-item>
+                              <el-form-item v-show="form.standInData === '1'" label="修订本" prop="xdb" class="add-form-item form-item-disabled">
+                                <el-input
+                                    disabled
+                                    style="display: none;"
+                                    v-model="form.xdbName"
+                                    clearable
+                                ></el-input>
+                                <div style="display: flex;justify-content: space-between">
+                                  <div style="width: 80%;">
+                                    <div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                                  </div>
+                                  <div style="width: 20%;">
+                                    <el-button
+                                        type="primary"
+                                        class="common-button-primary"
+                                        size="mini"
+                                        style="margin-left: 10px; margin-top: 11px; float: right;"
+                                        @click="fileUpload('xdb')">
+                                      <i class="el-icon-upload el-icon--right"></i>
+                                    </el-button>
+                                  </div>
+                                </div>
+                              </el-form-item>
 <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                               <el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
  <!--         ************************************** 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
@@ -1692,7 +1715,7 @@
                         standNature: '', // 标准性质
                         standEnName: '', // 英文名称
                         standName: '', // 中文名称
-                        signFlag: '1', // 是否需要会签
+                        signFlag: '2', // 是否需要会签
                         issueTime: '', // 发布时间
                         isRelateAccess: '', // 是否纳入认证清单
                         standSystem: '',// 标准体系
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index f46799a0a..53882e2c9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -624,6 +624,29 @@
                     </div>
                   </div>
                 </el-form-item>
+                <el-form-item v-show="form.standInData === '1'" label="修订本" prop="xdb" class="add-form-item form-item-disabled">
+                  <el-input
+                      disabled
+                      style="display: none;"
+                      v-model="form.xdbName"
+                      clearable
+                  ></el-input>
+                  <div style="display: flex;justify-content: space-between">
+                    <div style="width: 80%;">
+                      <div v-for="(item,index) in xdbFileList" :key="index" @click="filePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+                    </div>
+                    <div style="width: 20%;">
+                      <el-button
+                          type="primary"
+                          class="common-button-primary"
+                          size="mini"
+                          style="margin-left: 10px; margin-top: 11px; float: right;"
+                          @click="fileUpload('xdb')">
+                        <i class="el-icon-upload el-icon--right"></i>
+                      </el-button>
+                    </div>
+                  </div>
+                </el-form-item>
                 <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
                 <el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
                   <!--          ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
@@ -1415,6 +1438,7 @@ export default {
       jdwjFileList: [],
       zbjbdFileList: [],
       kwjFileList: [],
+      xdbFileList: [],
       glwjFileList: [],
       textStatus:'',//文本状态
       textStatusMap: {}, // 文本状态id与name对应
@@ -2133,6 +2157,9 @@ export default {
           case 'kwj':
             this.kwjFileList=fileList;
             break;
+          case 'xdb':
+            this.xdbFileList=fileList;
+            break;
           case 'ca':
             this.caFileList=fileList;
             break;
@@ -2170,6 +2197,9 @@ export default {
         case 'kwj':
           this.kwjFileList=fileList;
           break;
+        case 'xdb':
+          this.xdbFileList=fileList;
+          break;
         case 'ca':
           this.caFileList=fileList;
           break;
@@ -2201,6 +2231,8 @@ export default {
         this.fileList=this.zbjbdFileList;
       }else if (type==='kwj'){
         this.fileList=this.kwjFileList;
+      }else if (type==='xdb'){
+        this.fileList=this.xdbFileList;
       }else if (type==='glwj'){
         this.fileList=this.glwjFileList;
       }
@@ -2401,6 +2433,9 @@ export default {
           case 'kwj':
             this.getFileList(value,this.kwjFileList);
             break;
+          case 'xdb':
+            this.getFileList(value,this.xdbFileList);
+            break;
           case 'jdwj':
             this.getFileList(value,this.jdwjFileList);
             break;
@@ -2504,6 +2539,9 @@ export default {
       this.form.kwj=this.kwjFileList.map(item => item.response.data.id).join(",")
       this.form.kwjName=this.kwjFileList.map(item => item.name).join(",")
 
+      this.form.kwj=this.xdbFileList.map(item => item.response.data.id).join(",")
+      this.form.kwjName=this.xdbFileList.map(item => item.name).join(",")
+
       this.form.ca=this.caFileList.map(item => item.response.data.id).join(",")
       this.form.caName=this.caFileList.map(item => item.name).join(",")
 

From 05936aee1b44d77d14508b160bc9cd4fb308197a Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 27 Dec 2021 15:02:50 +0800
Subject: [PATCH 10/11] feat: There is no way the,buss hh process

---
 src/api/process.js                            |   2 +-
 .../creatProcess/qbrk/common/formEditList.vue |  68 +-
 .../creatProcess/qbrk/common/formList.vue     |  27 +
 .../pages/creatProcess/qbrk/step10.vue        | 264 +-----
 .../pages/creatProcess/qbrk/step11.vue        | 264 +-----
 .../pages/creatProcess/qbrk/step12.vue        | 270 +-----
 .../pages/creatProcess/qbrk/step2.vue         |   5 +-
 .../pages/creatProcess/qbrk/step3.vue         |  15 +-
 .../pages/creatProcess/qbrk/step4.vue         | 262 +-----
 .../pages/creatProcess/qbrk/step5.vue         | 262 +-----
 .../pages/creatProcess/qbrk/step6.vue         | 805 +++++++-----------
 .../pages/creatProcess/qbrk/step7.vue         | 266 +-----
 .../pages/creatProcess/qbrk/step8.vue         | 266 +-----
 .../pages/creatProcess/qbrk/step9.vue         | 266 +-----
 .../pages/creatProcess/qbrk/stepC3.vue        | 790 +++++++++--------
 .../pages/creatProcess/qbrk/stepC6.vue        | 780 ++++++++---------
 .../tabComponents/processCenter/index.vue     |   6 +-
 17 files changed, 1265 insertions(+), 3353 deletions(-)

diff --git a/src/api/process.js b/src/api/process.js
index d0084423b..10bc76630 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -79,7 +79,7 @@ export function processCreateStand (data) {
 
 export function processCreateBuss (data) {
   return axios({
-    url: '/api/lawss/actSarItemsLaws/processCreateBuss',
+    url: '/api/lawss/actSarItemsBuss/processCreateBuss',
     method: 'post',
     data
   })
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
index 96bc0ab91..051c89510 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
@@ -112,7 +112,12 @@
           ></el-input>
           <div style="display: flex;justify-content: space-between">
             <div style="width: 80%;">
-              <div v-for="(item,index) in FBGBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+              <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 20%;margin-left: 15px;">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              </div>
             </div>
             <div style="width: 20%;">
               <el-button
@@ -135,7 +140,12 @@
           ></el-input>
           <div style="display: flex;justify-content: space-between">
             <div style="width: 80%;">
-              <div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+              <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 20%;margin-left: 15px;">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              </div>
             </div>
             <div style="width: 20%;">
               <el-button
@@ -160,7 +170,12 @@
           ></el-input>
           <div style="display: flex;justify-content: space-between">
             <div style="width: 80%;">
-              <div v-for="(item,index) in BZSMBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+              <div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 20%;margin-left: 15px;">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              </div>
             </div>
             <div style="width: 20%;">
               <el-button
@@ -183,7 +198,12 @@
           ></el-input>
           <div style="display: flex;justify-content: space-between">
             <div style="width: 80%;">
-              <div v-for="(item,index) in QTWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+              <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 20%;margin-left: 15px;">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              </div>
             </div>
             <div style="width: 20%;">
               <el-button
@@ -307,7 +327,12 @@
           ></el-input>
           <div style="display: flex;justify-content: space-between">
             <div style="width: 80%;">
-              <div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item.GLWJBUSS)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+              <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 20%;margin-left: 15px;">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+              </div>
             </div>
             <div style="width: 20%;">
               <el-button
@@ -398,9 +423,15 @@ export default {
       type: Boolean,
       default: false
     },
+    fbgDown: {
+      type: Boolean,
+      default: false
+    },
   },
   data () {
     return {
+      fileId:'',
+      dialogVisible: false,
       config: {
         attrName : '',
       },
@@ -505,7 +536,7 @@ export default {
       this.replaceLawsNumModel = true
       this.replaceLawType = ''
       this.replaceLawType = type
-      this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.replaceLawsNumModel,this.replaceLawType);
+      this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType);
     },
     fileUpload (type) {
       // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
@@ -531,26 +562,33 @@ export default {
         default : ;
       }
       this.fileMadel = true;
-      console.log(this.fileList)
       this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType);
     },
+    filePreview(){
+        this.$preview(this.fileId)
+        this.dialogVisible = false
+    },
+    down(){
+        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + this.fileId
+        this.dialogVisible = false
+    },
     // 文件预览及下载
-    handleFilePreview(file) {
+    handleFilePreview(file,type) {
       let attId = ""
       if(file && file.id){
         attId = file.id
       }else {
         attId = file.response.data.id
       }
-      if (this.preview) {
-        if (attId) {
-          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        if (type === 'down') {
+            if (attId) {
+                window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+            } else {
+                this.$message.warning('文件不存在,下载失败')
+            }
         } else {
-          this.$message.warning('文件不存在,下载失败')
+            this.$preview(attId)
         }
-      } else {
-        this.$preview(attId)
-      }
     },
     downloadFile (data) {
       //文件id中出现了','字符,去除掉
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
index 216c24567..96436cb40 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
@@ -235,6 +235,25 @@
       </el-col>
     </el-row>
   </div>
+    <ProcessTitle v-show="opinionsShow">
+        <template slot="title">意见信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border" v-show="opinionsShow">
+        <el-row :gutter="24">
+            <el-col :span="12">
+                <el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
+                    <el-select v-model="form.opinionsAdopted" filterable clearable :disabled="disabledState">
+                        <el-option
+                                v-for="item in opinionsAdoptedOptions"
+                                :key="item.value"
+                                :value="item.value"
+                                :label="item.label"
+                        ></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-col>
+        </el-row>
+    </div>
 </form>
 </template>
 
@@ -281,9 +300,17 @@ export default {
       type: Boolean,
       default: false
     },
+    opinionsShow: {
+      type: Boolean,
+      default: false
+    },
   },
   data () {
     return {
+      opinionsAdoptedOptions:[
+            {value: '1',label: '采纳'},
+            {value: '2',label: '不采纳'},
+      ],
       countryOptions:[],//国家地区
       standSortOptions: [], // 标准类别
       standNatureOptions: [], // 标准性质
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
index 21b88d8df..9e20fee47 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">专委会副主任/起草单位中心主任审定</template>
+        <template slot="proNode">起草单位中心主任审定</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -18,255 +18,17 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
-                <ProcessTitle>
-                    <template slot="title">基础信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
+                <formList
+                        :form = "form"
+                        :FBGBUSSFileList = "FBGBUSSFileList"
+                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                ></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -812,6 +574,7 @@
 </template>
 
 <script>
+    import formList from './common/formList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -823,6 +586,7 @@
     export default {
         name: "bussLibrary10",
         components: {
+            formList,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
index d671f19d5..c0cde6008 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">专委会主任/总院院长或主管副院长批准</template>
+        <template slot="proNode">总院院长或总院主管副院长批准</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -18,255 +18,17 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
-                <ProcessTitle>
-                    <template slot="title">基础信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
+                <formList
+                        :form = "form"
+                        :FBGBUSSFileList = "FBGBUSSFileList"
+                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                ></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -812,6 +574,7 @@
 </template>
 
 <script>
+    import formList from './common/formList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -823,6 +586,7 @@
     export default {
         name: "bussLibrary11",
         components: {
+            formList,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
index 2fb55e6a8..3f616d7c9 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
@@ -18,257 +18,17 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
-                <ProcessTitle>
-                    <template slot="title">基础信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               value-format="yyyy-MM-dd"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               value-format="yyyy-MM-dd"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
+                <formList
+                        :form = "form"
+                        :FBGBUSSFileList = "FBGBUSSFileList"
+                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                ></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -455,11 +215,8 @@
     <!--        保存||提交-->
     <ProcessFooter
             v-show="verifySarStandard"
-            show-save
             show-submit
-            :saveLoading="saveLoading"
             :submitLoading="isSubmit"
-            @save="handleSave"
             @submit="handleSubmit"
     >
     </ProcessFooter>
@@ -803,6 +560,7 @@
 </template>
 
 <script>
+    import formList from './common/formList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -814,6 +572,7 @@
     export default {
         name: "bussLibrary12",
         components: {
+            formList,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
@@ -2409,7 +2168,6 @@
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                         this.form.topId = this.pId
                         const json = JSON.stringify(this.form);
-                        this.processCreateBuss(json)
                         this.$http.post('lawss/activiti/completeTask', {
                             taskIds: this.taskIds,
                             userId : this.userId,
@@ -2421,7 +2179,7 @@
                                 this.$message.success(res.message)
                                 // 流程提交之后，应该流转至待办任务页面
                                 this.isSubmit = false
-                                this.processCreateLaws(json)
+                                this.processCreateBuss(json)
                                 // if(this.formTongGuo.approvalOpinion === '1'){
                                 //     this.$message.warning("驳回成功")
                                 //     this.isSubmit = false
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
index 87062603d..e8f514c27 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
@@ -213,15 +213,12 @@
     <!--        保存||提交-->
     <ProcessFooter
             v-show="verifySarStandard"
-            show-save
             show-submit
             :uploadFile="uploadFileStatus"
             :uploadedFile="!uploadFileStatus"
             :submitLoading="isSubmit"
-            :saveLoading="saveLoading"
             @uploadFile="handleUploadFile"
             @uploadedFile="handleUploadedFile"
-            @save="handleSave"
             @submit="handleSubmit"
     >
     </ProcessFooter>
@@ -1798,7 +1795,7 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if(this.FBGBUSSFileList && this.FBGBUSSFileList.length > 1){
+                if(this.footFileList && this.footFileList.length === 1){
                     this.$message.error('文件限制只可上传一个')
                     return false
                 }
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
index 6a0c53bbf..a1868bfcd 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">企标汇总修订</template>
+        <template slot="proNode">企标编写汇总修订</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -29,7 +29,9 @@
                     :disabledState = "disabledState"
                     :verifySarStandard = "verifySarStandard"
                     :fileMadelSub = "fileMadel"
+                    :fbgDown = "false"
                     @formCancel="formCancel"
+                    @formSelectLawsCancel = "formSelectLawsCancel"
                     @formChoiceZRRListCancel = "formChoiceZRRListCancel"
                     @formChoiceQCDW = "formChoiceQCDW"
             />
@@ -1121,7 +1123,12 @@
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
-            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,replaceLawsNumModel,replaceLawType) {
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+                this.replaceLawsNumModel = replaceLawsNumModel
+                this.replaceLawType = replaceLawType
+                this.getReplaceLawsNumRow()
+            },
+            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) {
                 this.form = form
                 this.FBGBUSSFileList = list1
                 this.LSBBBUSSFileList = list2
@@ -1131,10 +1138,6 @@
                 if(fileMadel){
                     this.fileType = fileType
                     this.fileUpload(fileType)
-                }else if(replaceLawsNumModel){
-                    this.replaceLawsNumModel = replaceLawsNumModel
-                    this.replaceLawType = replaceLawType
-                    this.getReplaceLawsNumRow()
                 }
             },
             modelProp(row,index){
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
index cad4e545f..97462ffd6 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">标准化员审批</template>
+        <template slot="proNode">总院各中心兼职标准化员/各事业部标准化员初审</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -18,255 +18,15 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
-                <ProcessTitle>
-                    <template slot="title">基础信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
+                <formList
+                        :form = "form"
+                        :FBGBUSSFileList = "FBGBUSSFileList"
+                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -812,6 +572,7 @@
 </template>
 
 <script>
+    import formList from './common/formList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -823,6 +584,7 @@
     export default {
         name: "bussLibrary4",
         components: {
+            formList,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
index 9b8792ce3..ade6e47c2 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
@@ -39,7 +39,7 @@
                                 </el-table-column>
                             </el-table-column>
                             <el-table-column
-                                    :label="form.standCode"
+                                    :label="form.standSort"
                                 >
                                 <el-table-column
                                         prop="twoIndexTitle"
@@ -147,255 +147,15 @@
                 </div>
             </div>
             <div style="flex: auto;" v-show="active === '2'">
-                <ProcessTitle>
-                    <template slot="title">基础信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
+                <formList
+                        :form = "form"
+                        :FBGBUSSFileList = "FBGBUSSFileList"
+                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"></formList>
             </div>
 <!--            <div class="block" id="active2" v-show="active === '2'">-->
 <!--                <ProcessTitle>-->
@@ -898,6 +658,7 @@
 </template>
 
 <script>
+    import formList from './common/formList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -910,6 +671,7 @@
     export default {
         name: "bussLibrary5",
         components: {
+            formList,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
index b1feb6b2d..8d33d911f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
@@ -2,11 +2,10 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">主起草人修订并组织评审</template>
+        <template slot="proNode">技术委员会评审/评审意见修改评审</template>
     </ProcessHeader>
     <div class="headerTabs">
-        <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">意见列表</div>
-        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">基础信息</div>
+        <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
         <!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
         <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
@@ -18,7 +17,24 @@
                 class="label-input-form"
                 label-width="210px"
         >
-            <div class="block" id="active2" v-show="active === '1'">
+            <div style="flex: auto;" v-show="active === '1'">
+                <formEditList
+                        :key = "formKey"
+                        :formSub = "form"
+                        :FBGBUSSFileListSub = "FBGBUSSFileList"
+                        :LSBBBUSSFileListSub = "LSBBBUSSFileList"
+                        :BZSMBUSSFileListSub = "BZSMBUSSFileList"
+                        :QTWJBUSSFileListSub = "QTWJBUSSFileList"
+                        :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"
+                        :fileMadelSub = "fileMadel"
+                        :fbgDown = "true"
+                        @formCancel="formCancel"
+                        @formSelectLawsCancel = "formSelectLawsCancel"
+                        @formChoiceZRRListCancel = "formChoiceZRRListCancel"
+                        @formChoiceQCDW = "formChoiceQCDW"
+                />
                 <ProcessTitle>
                     <template slot="title">意见信息</template>
                 </ProcessTitle>
@@ -39,23 +55,37 @@
                                     label="序号"
                                     min-width="15%"
                                     align="center">
-                                    <template slot-scope="scope">
-                                        {{scope.$index + 1}}
-                                    </template>
+                                <template slot-scope="scope">
+                                    {{scope.$index + 1}}
+                                </template>
                             </el-table-column>
                             <el-table-column
                                     prop="userName"
                                     label="会签人"
                                     align="center"
-                                    min-width="30%">
+                                    min-width="15%">
                             </el-table-column>
                             <el-table-column
                                     prop="commentText"
                                     label="会签意见"
-                                    min-width="15%"
+                                    min-width="70%"
                                     align="center">
                             </el-table-column>
                         </el-table>
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.opinionsAdopted" filterable clearable>
+                                        <el-option
+                                                v-for="item in opinionsAdoptedOptions"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
                     </div>
                 </template>
                 <div>
@@ -91,336 +121,85 @@
                     </el-collapse>
                 </div>
             </div>
-            <div style="flex: auto;" v-show="active === '2'">
-                <ProcessTitle>
-                    <template slot="title">基础信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-            </div>
-<!--            <div class="block" id="active2" v-show="active === '2'">-->
-<!--                <ProcessTitle>-->
-<!--                    <template slot="title">模块信息</template>-->
-<!--                </ProcessTitle>-->
-<!--                <template>-->
-<!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
-<!--                        <div class="action-bar">-->
-<!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
-<!--                                批量编辑-->
-<!--                            </el-button>-->
-<!--                            <el-button-->
-<!--                                    type="primary"-->
-<!--                                    size="mini"-->
-<!--                                    class="common-button-primary add-button"-->
-<!--                                    @click="createRow"-->
-<!--                            >创建模块</el-button>-->
-<!--                        </div>-->
-<!--                        <el-table-->
-<!--                                ref="selection"-->
-<!--                                tooltip-effect="dark"-->
-<!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
-<!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
-<!--                                        fontWeight: 'bold', height: '48px'}"-->
-<!--                                @selection-change="handleSelectionChange"-->
-<!--                                row-key="id"-->
-<!--                                :data="form.modelData"-->
-<!--                                border-->
-<!--                                default-expand-all-->
-<!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-<!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
-<!--                            <el-table-column-->
-<!--                                    prop="modelNum"-->
-<!--                                    label="序号"-->
-<!--                                    min-width="15%"-->
-<!--                                    align="center"-->
-<!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column-->
-<!--                                    label="名称"-->
-<!--                                    align="center"-->
-<!--                                    min-width="30%">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <el-form-item-->
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
-<!--                                    >-->
-<!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
-<!--                                    </el-form-item>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column-->
-<!--                                    label="责任人"-->
-<!--                                    min-width="15%"-->
-<!--                                    align="center">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <el-form-item-->
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
-<!--                                    >-->
-<!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
-<!--                                    </el-form-item>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <div @click.stop style="display: inline-block">-->
-<!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
-<!--                                            <i class="iconfont">&#xe61e;</i>-->
-<!--                                            <el-dropdown-menu slot="dropdown">-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
-<!--                                            </el-dropdown-menu>-->
-<!--                                        </el-dropdown>-->
-<!--                                    </div>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                        </el-table>-->
-<!--                    </div>-->
-<!--                </template>-->
-<!--            </div>-->
+            <!--            <div class="block" id="active2" v-show="active === '2'">-->
+            <!--                <ProcessTitle>-->
+            <!--                    <template slot="title">模块信息</template>-->
+            <!--                </ProcessTitle>-->
+            <!--                <template>-->
+            <!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
+            <!--                        <div class="action-bar">-->
+            <!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
+            <!--                                批量编辑-->
+            <!--                            </el-button>-->
+            <!--                            <el-button-->
+            <!--                                    type="primary"-->
+            <!--                                    size="mini"-->
+            <!--                                    class="common-button-primary add-button"-->
+            <!--                                    @click="createRow"-->
+            <!--                            >创建模块</el-button>-->
+            <!--                        </div>-->
+            <!--                        <el-table-->
+            <!--                                ref="selection"-->
+            <!--                                tooltip-effect="dark"-->
+            <!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
+            <!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
+            <!--                                        fontWeight: 'bold', height: '48px'}"-->
+            <!--                                @selection-change="handleSelectionChange"-->
+            <!--                                row-key="id"-->
+            <!--                                :data="form.modelData"-->
+            <!--                                border-->
+            <!--                                default-expand-all-->
+            <!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+            <!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
+            <!--                            <el-table-column-->
+            <!--                                    prop="modelNum"-->
+            <!--                                    label="序号"-->
+            <!--                                    min-width="15%"-->
+            <!--                                    align="center"-->
+            <!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column-->
+            <!--                                    label="名称"-->
+            <!--                                    align="center"-->
+            <!--                                    min-width="30%">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <el-form-item-->
+            <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+            <!--                                    >-->
+            <!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
+            <!--                                    </el-form-item>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column-->
+            <!--                                    label="责任人"-->
+            <!--                                    min-width="15%"-->
+            <!--                                    align="center">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <el-form-item-->
+            <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+            <!--                                    >-->
+            <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
+            <!--                                    </el-form-item>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <div @click.stop style="display: inline-block">-->
+            <!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
+            <!--                                            <i class="iconfont">&#xe61e;</i>-->
+            <!--                                            <el-dropdown-menu slot="dropdown">-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
+            <!--                                            </el-dropdown-menu>-->
+            <!--                                        </el-dropdown>-->
+            <!--                                    </div>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                        </el-table>-->
+            <!--                    </div>-->
+            <!--                </template>-->
+            <!--            </div>-->
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
@@ -497,10 +276,8 @@
             v-show="verifySarStandard"
             show-save
             show-submit
-            show-edit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
-            @onLineEdit="handleOnLineEdit"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -641,6 +418,12 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <Mechanism-tree
+            is-title="选择部门信息"
+            :is-visible.sync="modalShowFlagZRBM"
+            :nodeList="nodeListZRBM"
+            @checkedRole="drawerCheckZRBM"
+    />
     <!--        <el-drawer-->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -710,7 +493,6 @@
                             <el-select v-model="standardSearchForm.lawsTextState" placeholder="" filterable clearable>
                                 <el-option
                                         v-for="item in standStateOptions"
-                                        placeholder="请选择"
                                         :key="item.value"
                                         :value="item.value"
                                         :label="item.label"
@@ -847,6 +629,7 @@
 
 <script>
     import { onlyOfficeUrl } from '@/sysConfig'
+    import formEditList from './common/formEditList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -862,7 +645,8 @@
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
+            formEditList
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -918,9 +702,9 @@
                         }
                     }]
                 },
+                taskInfo:'',
                 loading: false,
-                disabledState: true,
-                taskInfo:'主起草人修订并组织评审',
+                disabledState: false,
                 userId:this.$store.getters.userInfo.userId,
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -929,6 +713,7 @@
                 prcName: this.$route.query.prcName,
                 detailData: [],
                 fileList: [],
+                footFileList: [],
                 FBGBUSSFileList: [],
                 BZSMBUSSFileList: [],
                 LSBBBUSSFileList: [],
@@ -1013,6 +798,7 @@
                 ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
                 isSubmit: false,
+                uploadFileStatus: true,
                 saveLoading: false,
                 defaultProps: {
                     children: 'children',
@@ -1026,6 +812,8 @@
                     children: 'children',
                     label: 'model'
                 },
+                modalShowFlagZRBM: false,
+                nodeListZRBM: [],
                 nodeList: [],
                 nodeList2: [],
                 zrType: '',
@@ -1036,6 +824,7 @@
                     children: 'children',
                     label: 'name'
                 },
+                formKey:1,
                 key:1,
                 key1:2,
                 key2:3,
@@ -1069,71 +858,11 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    opinionsAdopted:'',  // 汇总意见是否采纳
+                    footFile:'',
+                    footFileName:'',
                     // 基础信息
                     country:[],
-                    textStatus: '', // 文本状态
-                    standInData: '0', // 标准类型
-                    standNumber: '', // 标准编号
-                    standNature: '', // 标准性质
-                    signFlag: '1', // 是否需要会签
-                    standSystem: '',// 标准体系
-                    standSystemName: '',// 标准体系名称
-                    gxhbq: '', // 标签
-                    // 实施日期
-                    ssrq: '', // 实施日期(标准文本)
-                    xcxssrq: '', // 新车型实施日期(标准文本)
-                    zccssrq: '', // 在产车实施日期(标准文本)
-                    ssrqgj: '', // 实施日期(国际)
-                    xcxssrqgj: '', // 新车型实施日期(国际)
-                    zccssrqgj: '', // 在产车实施日期(国际)
-                    // 文本信息
-                    ca: '', // 草案
-                    FBGBJBD: '', // 发布稿
-                    xgd: '', // 修改单
-                    bpg: '', // 报批稿
-                    ssg: '', // 送审稿
-                    zqyjg: '', // 征求意见稿
-                    jdwj: '', // 解读文件
-                    zbjbd: '', // 增补件
-                    kwj: '', // 勘 误件
-                    caName: '', // 草案
-                    fbgbjbdName: '', // 发布稿
-                    xgdName: '', // 修改单
-                    bpgName: '', // 报批稿
-                    ssgName: '', // 送审稿
-                    zqyjgName: '', // 征求意见稿
-                    jdwjName: '', // 解读文件
-                    zbjbdName: '', // 增补件
-                    kwjName: '', // 勘误件
-                    glwjName: '', // 关联文件
-                    // 适用范围
-                    txlb: '', // 体系类别
-                    gkdw: '', // 归口管理部门
-                    qcdw: [], // 起草单位
-                    wssmr: [], // 我司署名人
-                    cysd: '', // 我司参与深度
-                    cllx: [], // 适用车型
-                    nylx: [],// 能源类型
-                    sycpx: [],// 适用产品线
-                    syrz: [], // 适用认证
-                    zrbm: [], // 责任部门
-                    zrgcs: [], // 责任工程师
-                    cycvppsbm: '', // 关联模块--乘用车VPPS编码
-                    cycvppscn: '', // 关联模块--乘用车vpps中文名称
-                    kccvppsbm: '', // 关联模块--卡车VPPS编码
-                    kccvppscn: '', // 关联模块--卡车vpps中文名称
-                    dybxh: '', // 模块结构单元变型号
-                    dymc: '', // 模块结构单元名称
-                    // 关联信息
-                    dtbjh: '', // 代替标准号
-                    cbbh: '', // 采标编号
-                    cbcd: '', // 采标程度
-                    yybj: '', // 引用标准
-                    bfbdtbzh: '', // 部分代替标准号
-                    byybj: '', // 被引用标准
-                    glwj: '', // 关联文件
-                    xglc: '', // 相关流程
-                    chjl: '', // 参会记录
                     // 基础信息
                     standSort: '',
                     standCode: '',
@@ -1252,6 +981,9 @@
                     standSort: [
                         { required: true, message: '请选择企标类别', trigger: 'change' }
                     ],
+                    opinionsAdopted: [
+                        { required: true, message: '请选择汇总意见是否采纳', trigger: 'change' }
+                    ],
                     standNumber: [
                         { required: true, message: '请输入企标编号', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1291,6 +1023,10 @@
                 },
                 zrUserIds: [], // 选择多个会签责任人
                 userType:'', // 选择用户ID判断
+                opinionsAdoptedOptions:[
+                    {value: '1',label: '采纳'},
+                    {value: '2',label: '不采纳'},
+                ],
                 countryOptions:[],//国家地区
                 standSortOptions: [], // 标准类别
                 standNatureOptions: [], // 标准性质
@@ -1371,6 +1107,52 @@
             },
         },
         methods: {
+            drawerCheckZRBM(data) {
+                let idList = ''
+                let nameList = ''
+                data.forEach(item => {
+                    // if (item.hasChild === '0') {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                    // }
+                })
+                this.form.QCDW = nameList
+                this.form.QCDWID = idList
+                this.formKey++
+            },
+            choiceQCDW(type, title, id) {
+                this.nodeListZRBM = []
+                this.nodeListZRBM.push(id)
+                this.drawerTitle = title
+                this.modalShowFlagZRBM = true
+            },
+            formChoiceQCDW(type, title, id){
+                this.choiceQCDW(type, title, id)
+            },
+            formChoiceZRRListCancel(type, title, id){
+                this.choiceZRRList(type, title, id)
+            },
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+                this.replaceLawsNumModel = replaceLawsNumModel
+                this.replaceLawType = replaceLawType
+                this.getReplaceLawsNumRow()
+            },
+            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) {
+                this.form = form
+                this.FBGBUSSFileList = list1
+                this.LSBBBUSSFileList = list2
+                this.BZSMBUSSFileList = list3
+                this.QTWJBUSSFileList = list4
+                this.GLWJBUSSFileList = list5
+                if(fileMadel){
+                    this.fileType = fileType
+                    this.fileUpload(fileType)
+                }
+            },
             modelProp(row,index){
                 console.log(row)
                 console.log(index)
@@ -1519,6 +1301,10 @@
                 }else if(this.userType === 'hqUserId'){
                     this.roleForm.hqUserId=idList;
                     this.roleForm.hqUserName=nameList;
+                }else if(this.userType === 'QCRBUSS'){
+                    this.form.QCRBUSSID=idList;
+                    this.form.QCRBUSS=nameList;
+                    this.formKey++
                 }
             },
             checkedRole (data) {
@@ -1573,6 +1359,7 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -1580,6 +1367,7 @@
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
+                        this.formKey++
                     })
                 }else {
                     this.form.XCSJBUSS = this.dateFormatter()
@@ -2054,8 +1842,8 @@
                 })
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
-                if(this.replaceLawType === 'dtbjh'){
-                    this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
+                if(this.replaceLawType === 'DTQBBHBUSS'){
+                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
@@ -2067,6 +1855,7 @@
                 }
                 // this.$emit('input', textArr.join(','))
                 this.$refs.selections.clearSelection()
+                this.formKey++
             },
             // 点击查看
             handlePreview (item) {
@@ -2134,6 +1923,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
+                this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                    this.$message.error('文件限制只可上传一个')
+                    return false
+                }
                 if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
@@ -2166,9 +1960,26 @@
                     })
                 })
             },
+            filePreview(file,type) {
+                const attId = file.footFile
+                if (type === 'down') {
+                    if (attId) {
+                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    } else {
+                        this.$message.warning('文件不存在,下载失败')
+                    }
+                } else {
+                    this.$preview(attId)
+                }
+            },
             // 文件预览及下载
             handleFilePreview(file) {
-                const attId = file.response.data.id
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 if (this.preview) {
                     if (attId) {
                         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
@@ -2176,50 +1987,43 @@
                         this.$message.warning('文件不存在,下载失败')
                     }
                 } else {
-                    this.getBusStandFileByAttId(attId)
-                        .then(res => {
-                            if(res){
-                                const editFileInfo = res
-                                if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-                                    window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-                                }else {
-                                    const nowTime = new Date().getTime()
-                                    // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-                                    window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                                }
-                            }
-                        }).catch(e => {
-                        console.log(e)
-                        this.$message.warning('文件不存在,预览失败')
-                    })
+                    this.$preview(attId)
                 }
             },
             // 导入标准数据成功后执行
             importFileSuccess (response, file,fileList) {
                 // 上传成功后判断是否是两条数据是的话替换掉旧数据
                 // if (fileList.length > 1) {
-                //   this.fileList = fileList.splice(0, 1)
+                //     fileList = fileList.splice(0, 1)
                 // }
                 if (response.ok) {
-
+                    const fileObj = {}
+                    fileObj.id = file.response.data.id
+                    fileObj.name = file.response.data.name
                     switch (this.fileType){
                         case 'FBGBUSS':
-                            this.FBGBUSSFileList = fileList
+                            this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+                            this.FBGBUSSFileList.push(fileObj)
                             break;
                         case 'BZSMBUSS' :
-                            this.BZSMBUSSFileList = fileList
+                            this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+                            this.BZSMBUSSFileList.push(fileObj)
                             break;
                         case 'LSBBBUSS':
-                            this.LSBBBUSSFileList = fileList
+                            this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+                            this.LSBBBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJLAWS':
-                            this.QTWJBUSSFileList = fileList
+                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.GLWJLAWSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
-                            this.GLWJBUSSFileList = fileList
+                            this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+                            this.GLWJBUSSFileList.push(fileObj)
                             break;
                         default : ;
                     }
+                    this.formKey++
                     this.$message({
                         showClose: true,
                         message: response.message,
@@ -2263,6 +2067,7 @@
                 switch (this.fileType){
                     case 'FBGBUSS':
                         this.FBGBUSSFileList = fileList
+                        console.log(this.FBGBUSSFileList)
                         break;
                     case 'BZSMBUSS' :
                         this.BZSMBUSSFileList = fileList
@@ -2278,6 +2083,7 @@
                         break;
                     default : ;
                 }
+                this.formKey++
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
@@ -2408,6 +2214,17 @@
                     // this.$message.warning('文件不存在,预览失败')
                 })
             },
+            handleUploadFile(){
+                this.fileType = '';
+                this.fileType = 'footFile';
+
+                this.fileList=this.footFileList
+
+                this.fileMadel = true;
+            },
+            handleUploadedFile(){
+                this.fileMadel = true
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
@@ -2439,19 +2256,20 @@
             fileInfoHandle(){
 
                 //拼接文件名和id 提交到流程Activity
-                this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
+                console.log(this.FBGBUSSFileList)
+                this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
                 this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
 
-                this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
                 this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
 
-                this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
                 this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
 
-                this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
                 this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
 
-                this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
                 this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
             },
@@ -2540,53 +2358,58 @@
                 // } else if (val === '') {
                 //     this.form.country = []
                 // }
-                this.$refs['formTongGuo'].validate((valid) => {
+                this.fileInfoHandle()
+                this.$refs['form'].validate((valid) => {
                     if (valid) {
-                        this.processModelHisOneCount(this.pId)
-                            .then(res => {
-                                if(res){
-                                    const editFileInfo = res
-                                    if(editFileInfo && editFileInfo.editStatus === '1'){
-                                        this.isSubmit = true
-                                        this.saveLoading = true
-                                        this.form.commentText = this.formTongGuo.commentText
-                                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                                        const json = JSON.stringify(this.form);
-                                        this.$http.post('lawss/activiti/completeTask', {
-                                            taskIds: this.taskIds,
-                                            userId : this.userId,
-                                            json: json
-                                        }, {
-                                            _this: this
-                                        }, res => {
-                                            if (res.success) {
-                                                this.$message.success(res.message)
-                                                // 流程提交之后，应该流转至待办任务页面
-                                                this.isSubmit = false
-                                                this.saveLoading = false
-                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                                // if(this.formTongGuo.approvalOpinion === '1'){
-                                                //     this.$message.warning("驳回成功")
-                                                //     this.isSubmit = false
-                                                //     // 流程提交之后，应该流转至待办任务页面
-                                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                                // }else{
-                                                //     this.processCreateLaws(json)
-                                                // }
-                                            }else {
-                                                this.$message.success(res.message)
-                                            }
-                                        })
+                        this.$refs['formTongGuo'].validate((valid) => {
+                            if (valid) {
+                                this.isSubmit = true
+                                this.saveLoading = true
+                                this.form.commentText = this.formTongGuo.commentText
+                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                const json = JSON.stringify(this.form);
+                                this.$http.post('lawss/activiti/completeTask', {
+                                    taskIds: this.taskIds,
+                                    userId : this.userId,
+                                    json: json
+                                }, {
+                                    _this: this
+                                }, res => {
+                                    if (res.success) {
+                                        this.$message.success(res.message)
+                                        // 流程提交之后，应该流转至待办任务页面
+                                        this.isSubmit = false
+                                        this.saveLoading = false
+                                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        // if(this.formTongGuo.approvalOpinion === '1'){
+                                        //     this.$message.warning("驳回成功")
+                                        //     this.isSubmit = false
+                                        //     // 流程提交之后，应该流转至待办任务页面
+                                        //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        // }else{
+                                        //     this.processCreateLaws(json)
+                                        // }
                                     }else {
-                                        this.$message.warning('请先在线编辑,再提交流程')
+                                        this.$message.success(res.message)
                                     }
-
-                                }
-                            }).catch(e => {
-                            console.log(e)
-                            // this.$message.warning('文件不存在,预览失败')
-                        })
-              }})
+                                })
+                                // this.processModelHisOneCount(this.pId)
+                                //     .then(res => {
+                                //         if(res){
+                                //             const editFileInfo = res
+                                //             if(editFileInfo && editFileInfo.editStatus === '1'){
+                                //             }else {
+                                //                 this.$message.warning('请先在线编辑,再提交流程')
+                                //             }
+                                //
+                                //         }
+                                //     }).catch(e => {
+                                //     console.log(e)
+                                //     // this.$message.warning('文件不存在,预览失败')
+                                // })
+                            }})
+                    }
+                })
             },
             busVsFunc(){
                 this.$http.get('sarVppsTree/list', '', {
@@ -2621,16 +2444,18 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.formKey++
                 })
             },
             assemble(ids,names){
                 let list= new Array();
-                let idArray=ids.split(',');
-                let nameArray=names.split(',');
-                for(let i=0; i<idArray.length; i++){
-                    list.push({id:idArray[i],name:nameArray[i]});
+                if(ids && ids !== '' && names && names !== ''){
+                    let idArray=ids.split(',');
+                    let nameArray=names.split(',');
+                    for(let i=0; i<idArray.length; i++){
+                        list.push({id:idArray[i],name:nameArray[i]});
+                    }
                 }
-
                 return list;
             },
             getData() {
@@ -2641,6 +2466,7 @@
                             pId: this.pId
                         }).then(res => {
                             if (res) {
+                                this.taskInfo = '企标汇总修订'
                                 const processForm = JSON.parse(res.mesg)
                                 const dateArr = []
                                 if(processForm.commentCycleStart && processForm.commentCycleEnd){
@@ -2650,11 +2476,14 @@
                                 }
 
                                 this.getFormFieldList(processForm)
+                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
+                                console.log(this.LSBBBUSSFileList)
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.formKey++
                             }
                         }).catch(e => {
                         })
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
index a4be33241..f47c37e1f 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">标准法规工程师复审</template>
+        <template slot="proNode">标准法规部标准化工程师复审</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">复审评分</div>
@@ -39,7 +39,7 @@
                                 </el-table-column>
                             </el-table-column>
                             <el-table-column
-                                    :label="form.standCode"
+                                    :label="form.standSort"
                             >
                                 <el-table-column
                                         prop="twoIndexTitle"
@@ -147,255 +147,17 @@
                 </div>
             </div>
             <div style="flex: auto;" v-show="active === '2'">
-                <ProcessTitle>
-                    <template slot="title">基础信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
+                <formList
+                        :form = "form"
+                        :FBGBUSSFileList = "FBGBUSSFileList"
+                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                        ></formList>
             </div>
 <!--            <div class="block" id="active2" v-show="active === '2'">-->
 <!--                <ProcessTitle>-->
@@ -898,6 +660,7 @@
 </template>
 
 <script>
+    import formList from './common/formList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -910,6 +673,7 @@
     export default {
         name: "bussLibrary7",
         components: {
+            formList,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
index 9a3628c51..39ecd996a 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">技术委员会负责人/起草中心主任审核</template>
+        <template slot="proNode">起草单位高级经理审核</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">评审评分</div>
@@ -39,7 +39,7 @@
                                 </el-table-column>
                             </el-table-column>
                             <el-table-column
-                                    :label="form.standCode"
+                                    :label="form.standSort"
                             >
                                 <el-table-column
                                         prop="twoIndexTitle"
@@ -147,255 +147,17 @@
                 </div>
             </div>
             <div style="flex: auto;" v-show="active === '2'">
-                <ProcessTitle>
-                    <template slot="title">基础信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
+                <formList
+                        :form = "form"
+                        :FBGBUSSFileList = "FBGBUSSFileList"
+                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                ></formList>
             </div>
 <!--            <div class="block" id="active2" v-show="active === '2'">-->
 <!--                <ProcessTitle>-->
@@ -910,6 +672,7 @@
 </template>
 
 <script>
+    import formList from './common/formList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -922,6 +685,7 @@
     export default {
         name: "bussLibrary8",
         components: {
+            formList,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
index c09b859e7..e49ee0626 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">标准法规部部长审核</template>
+        <template slot="proNode">标准法规部高级经理审核</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">审核评分</div>
@@ -39,7 +39,7 @@
                                 </el-table-column>
                             </el-table-column>
                             <el-table-column
-                                    :label="form.standCode"
+                                    :label="form.standSort"
                             >
                                 <el-table-column
                                         prop="twoIndexTitle"
@@ -147,255 +147,17 @@
                 </div>
             </div>
             <div style="flex: auto;" v-show="active === '2'">
-                <ProcessTitle>
-                    <template slot="title">基础信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
+                <formList
+                        :form = "form"
+                        :FBGBUSSFileList = "FBGBUSSFileList"
+                        :LSBBBUSSFileList = "LSBBBUSSFileList"
+                        :BZSMBUSSFileList = "BZSMBUSSFileList"
+                        :QTWJBUSSFileList = "QTWJBUSSFileList"
+                        :GLWJBUSSFileList = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"
+                        :opinionsShow = "true"
+                ></formList>
             </div>
 <!--            <div class="block" id="active2" v-show="active === '2'">-->
 <!--                <ProcessTitle>-->
@@ -910,6 +672,7 @@
 </template>
 
 <script>
+    import formList from './common/formList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -922,6 +685,7 @@
     export default {
         name: "bussLibrary9",
         components: {
+            formList,
             ProcessHeader,
             ProcessFooter,
             ProcessTitle,
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
index 89cdc342b..a4c907eba 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
@@ -2,11 +2,11 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">重新企标汇总修订</template>
+        <template slot="proNode">重新企标编写汇总修订</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-<!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
+        <!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
         <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content">
@@ -18,255 +18,70 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
+                <formEditList
+                        :key = "formKey"
+                        :formSub = "form"
+                        :FBGBUSSFileListSub = "FBGBUSSFileList"
+                        :LSBBBUSSFileListSub = "LSBBBUSSFileList"
+                        :BZSMBUSSFileListSub = "BZSMBUSSFileList"
+                        :QTWJBUSSFileListSub = "QTWJBUSSFileList"
+                        :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"
+                        :fileMadelSub = "fileMadel"
+                        @formCancel="formCancel"
+                        @formSelectLawsCancel = "formSelectLawsCancel"
+                        @formChoiceZRRListCancel = "formChoiceZRRListCancel"
+                        @formChoiceQCDW = "formChoiceQCDW"
+                />
                 <ProcessTitle>
-                    <template slot="title">基础信息</template>
+                    <template slot="title">文件汇总</template>
                 </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
+                <template>
+                    <div class="prc-content-border" style="height: 66vh;position: relative;">
+                        <el-table
+                                ref="selection"
+                                tooltip-effect="dark"
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                                        fontWeight: 'bold', height: '48px'}"
+                                :data="form.fileModelList"
+                                border
+                                default-expand-all>
+                            <!--                            <el-table-column-->
+                            <!--                                    label="序号"-->
+                            <!--                                    min-width="15%"-->
+                            <!--                                    align="center">-->
+                            <!--                                <template slot-scope="scope">-->
+                            <!--                                    {{scope.$index + 1}}-->
+                            <!--                                </template>-->
+                            <!--                            </el-table-column>-->
+                            <el-table-column
+                                    prop="footFileName"
+                                    label="编写文件名称"
+                                    align="center"
+                                    min-width="30%">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="userName"
+                                    label="起草人"
+                                    min-width="15%"
+                                    align="center">
+                            </el-table-column>
+                            <el-table-column label="操作" align="center"  min-width="5%">-->
+                                <template slot-scope="scope">
+                                    <div @click="filePreview(scope.row,'onLine')" style="display: inline-block;cursor: pointer;color: #409EFF;">
+                                        预览
+                                    </div>
+                                    &nbsp;&nbsp;
+                                    <div @click="filePreview(scope.row,'down')" style="display: inline-block;cursor: pointer;color: #409EFF;">
+                                        下载
+                                    </div>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -300,85 +115,85 @@
                     </el-collapse>
                 </div>
             </div>
-<!--            <div class="block" id="active2" v-show="active === '2'">-->
-<!--                <ProcessTitle>-->
-<!--                    <template slot="title">模块信息</template>-->
-<!--                </ProcessTitle>-->
-<!--                <template>-->
-<!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
-<!--                        <div class="action-bar">-->
-<!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
-<!--                                批量编辑-->
-<!--                            </el-button>-->
-<!--                            <el-button-->
-<!--                                    type="primary"-->
-<!--                                    size="mini"-->
-<!--                                    class="common-button-primary add-button"-->
-<!--                                    @click="createRow"-->
-<!--                            >创建模块</el-button>-->
-<!--                        </div>-->
-<!--                        <el-table-->
-<!--                                ref="selection"-->
-<!--                                tooltip-effect="dark"-->
-<!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
-<!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
-<!--                                        fontWeight: 'bold', height: '48px'}"-->
-<!--                                @selection-change="handleSelectionChange"-->
-<!--                                row-key="id"-->
-<!--                                :data="form.modelData"-->
-<!--                                border-->
-<!--                                default-expand-all-->
-<!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-<!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
-<!--                            <el-table-column-->
-<!--                                    prop="modelNum"-->
-<!--                                    label="序号"-->
-<!--                                    min-width="15%"-->
-<!--                                    align="center"-->
-<!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column-->
-<!--                                    label="名称"-->
-<!--                                    align="center"-->
-<!--                                    min-width="30%">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <el-form-item-->
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
-<!--                                    >-->
-<!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
-<!--                                    </el-form-item>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column-->
-<!--                                    label="责任人"-->
-<!--                                    min-width="15%"-->
-<!--                                    align="center">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <el-form-item-->
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
-<!--                                    >-->
-<!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
-<!--                                    </el-form-item>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <div @click.stop style="display: inline-block">-->
-<!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
-<!--                                            <i class="iconfont">&#xe61e;</i>-->
-<!--                                            <el-dropdown-menu slot="dropdown">-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
-<!--                                            </el-dropdown-menu>-->
-<!--                                        </el-dropdown>-->
-<!--                                    </div>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                        </el-table>-->
-<!--                    </div>-->
-<!--                </template>-->
-<!--            </div>-->
+            <!--            <div class="block" id="active2" v-show="active === '2'">-->
+            <!--                <ProcessTitle>-->
+            <!--                    <template slot="title">模块信息</template>-->
+            <!--                </ProcessTitle>-->
+            <!--                <template>-->
+            <!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
+            <!--                        <div class="action-bar">-->
+            <!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
+            <!--                                批量编辑-->
+            <!--                            </el-button>-->
+            <!--                            <el-button-->
+            <!--                                    type="primary"-->
+            <!--                                    size="mini"-->
+            <!--                                    class="common-button-primary add-button"-->
+            <!--                                    @click="createRow"-->
+            <!--                            >创建模块</el-button>-->
+            <!--                        </div>-->
+            <!--                        <el-table-->
+            <!--                                ref="selection"-->
+            <!--                                tooltip-effect="dark"-->
+            <!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
+            <!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
+            <!--                                        fontWeight: 'bold', height: '48px'}"-->
+            <!--                                @selection-change="handleSelectionChange"-->
+            <!--                                row-key="id"-->
+            <!--                                :data="form.modelData"-->
+            <!--                                border-->
+            <!--                                default-expand-all-->
+            <!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+            <!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
+            <!--                            <el-table-column-->
+            <!--                                    prop="modelNum"-->
+            <!--                                    label="序号"-->
+            <!--                                    min-width="15%"-->
+            <!--                                    align="center"-->
+            <!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column-->
+            <!--                                    label="名称"-->
+            <!--                                    align="center"-->
+            <!--                                    min-width="30%">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <el-form-item-->
+            <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+            <!--                                    >-->
+            <!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
+            <!--                                    </el-form-item>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column-->
+            <!--                                    label="责任人"-->
+            <!--                                    min-width="15%"-->
+            <!--                                    align="center">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <el-form-item-->
+            <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+            <!--                                    >-->
+            <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
+            <!--                                    </el-form-item>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <div @click.stop style="display: inline-block">-->
+            <!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
+            <!--                                            <i class="iconfont">&#xe61e;</i>-->
+            <!--                                            <el-dropdown-menu slot="dropdown">-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
+            <!--                                            </el-dropdown-menu>-->
+            <!--                                        </el-dropdown>-->
+            <!--                                    </div>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                        </el-table>-->
+            <!--                    </div>-->
+            <!--                </template>-->
+            <!--            </div>-->
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
@@ -456,6 +271,7 @@
             show-save
             show-submit
             :saveLoading="saveLoading"
+            :submitLoading="isSubmit"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -596,6 +412,12 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <Mechanism-tree
+            is-title="选择部门信息"
+            :is-visible.sync="modalShowFlagZRBM"
+            :nodeList="nodeListZRBM"
+            @checkedRole="drawerCheckZRBM"
+    />
     <!--        <el-drawer-->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -800,10 +622,12 @@
 </template>
 
 <script>
+    import { onlyOfficeUrl } from '@/sysConfig'
+    import formEditList from './common/formEditList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     let Base64 = require('js-base64').Base64;
@@ -815,7 +639,8 @@
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
+            formEditList
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -871,8 +696,9 @@
                         }
                     }]
                 },
+                taskInfo:'',
                 loading: false,
-                disabledState: true,
+                disabledState: false,
                 userId:this.$store.getters.userInfo.userId,
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -881,6 +707,7 @@
                 prcName: this.$route.query.prcName,
                 detailData: [],
                 fileList: [],
+                footFileList: [],
                 FBGBUSSFileList: [],
                 BZSMBUSSFileList: [],
                 LSBBBUSSFileList: [],
@@ -965,6 +792,7 @@
                 ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
                 isSubmit: false,
+                uploadFileStatus: true,
                 saveLoading: false,
                 defaultProps: {
                     children: 'children',
@@ -978,6 +806,8 @@
                     children: 'children',
                     label: 'model'
                 },
+                modalShowFlagZRBM: false,
+                nodeListZRBM: [],
                 nodeList: [],
                 nodeList2: [],
                 zrType: '',
@@ -988,6 +818,7 @@
                     children: 'children',
                     label: 'name'
                 },
+                formKey:1,
                 key:1,
                 key1:2,
                 key2:3,
@@ -1021,6 +852,8 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    footFile:'',
+                    footFileName:'',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1260,6 +1093,52 @@
             },
         },
         methods: {
+            drawerCheckZRBM(data) {
+                let idList = ''
+                let nameList = ''
+                data.forEach(item => {
+                    // if (item.hasChild === '0') {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                    // }
+                })
+                this.form.QCDW = nameList
+                this.form.QCDWID = idList
+                this.formKey++
+            },
+            choiceQCDW(type, title, id) {
+                this.nodeListZRBM = []
+                this.nodeListZRBM.push(id)
+                this.drawerTitle = title
+                this.modalShowFlagZRBM = true
+            },
+            formChoiceQCDW(type, title, id){
+                this.choiceQCDW(type, title, id)
+            },
+            formChoiceZRRListCancel(type, title, id){
+                this.choiceZRRList(type, title, id)
+            },
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+                this.replaceLawsNumModel = replaceLawsNumModel
+                this.replaceLawType = replaceLawType
+                this.getReplaceLawsNumRow()
+            },
+            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) {
+                this.form = form
+                this.FBGBUSSFileList = list1
+                this.LSBBBUSSFileList = list2
+                this.BZSMBUSSFileList = list3
+                this.QTWJBUSSFileList = list4
+                this.GLWJBUSSFileList = list5
+                if(fileMadel){
+                    this.fileType = fileType
+                    this.fileUpload(fileType)
+                }
+            },
             modelProp(row,index){
                 console.log(row)
                 console.log(index)
@@ -1408,6 +1287,10 @@
                 }else if(this.userType === 'hqUserId'){
                     this.roleForm.hqUserId=idList;
                     this.roleForm.hqUserName=nameList;
+                }else if(this.userType === 'QCRBUSS'){
+                    this.form.QCRBUSSID=idList;
+                    this.form.QCRBUSS=nameList;
+                    this.formKey++
                 }
             },
             checkedRole (data) {
@@ -1462,8 +1345,15 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
+                        this.formKey++
                     })
                 }else {
                     this.form.XCSJBUSS = this.dateFormatter()
@@ -1938,8 +1828,8 @@
                 })
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
-                if(this.replaceLawType === 'dtbjh'){
-                    this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
+                if(this.replaceLawType === 'DTQBBHBUSS'){
+                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
@@ -1951,6 +1841,7 @@
                 }
                 // this.$emit('input', textArr.join(','))
                 this.$refs.selections.clearSelection()
+                this.formKey++
             },
             // 点击查看
             handlePreview (item) {
@@ -2018,6 +1909,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
+                this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                    this.$message.error('文件限制只可上传一个')
+                    return false
+                }
                 if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
@@ -2050,9 +1946,26 @@
                     })
                 })
             },
+            filePreview(file,type) {
+                const attId = file.footFile
+                if (type === 'down') {
+                    if (attId) {
+                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    } else {
+                        this.$message.warning('文件不存在,下载失败')
+                    }
+                } else {
+                    this.$preview(attId)
+                }
+            },
             // 文件预览及下载
             handleFilePreview(file) {
-                const attId = file.response.data.id
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 if (this.preview) {
                     if (attId) {
                         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
@@ -2060,50 +1973,43 @@
                         this.$message.warning('文件不存在,下载失败')
                     }
                 } else {
-                    this.getBusStandFileByAttId(attId)
-                        .then(res => {
-                            if(res){
-                                const editFileInfo = res
-                                if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-                                    window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-                                }else {
-                                    const nowTime = new Date().getTime()
-                                    // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-                                    window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                                }
-                            }
-                        }).catch(e => {
-                        console.log(e)
-                        this.$message.warning('文件不存在,预览失败')
-                    })
+                    this.$preview(attId)
                 }
             },
             // 导入标准数据成功后执行
             importFileSuccess (response, file,fileList) {
                 // 上传成功后判断是否是两条数据是的话替换掉旧数据
                 // if (fileList.length > 1) {
-                //   this.fileList = fileList.splice(0, 1)
+                //     fileList = fileList.splice(0, 1)
                 // }
                 if (response.ok) {
-
+                    const fileObj = {}
+                    fileObj.id = file.response.data.id
+                    fileObj.name = file.response.data.name
                     switch (this.fileType){
                         case 'FBGBUSS':
-                            this.FBGBUSSFileList = fileList
+                            this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+                            this.FBGBUSSFileList.push(fileObj)
                             break;
                         case 'BZSMBUSS' :
-                            this.BZSMBUSSFileList = fileList
+                            this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+                            this.BZSMBUSSFileList.push(fileObj)
                             break;
                         case 'LSBBBUSS':
-                            this.LSBBBUSSFileList = fileList
+                            this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+                            this.LSBBBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJLAWS':
-                            this.QTWJBUSSFileList = fileList
+                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.GLWJLAWSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
-                            this.GLWJBUSSFileList = fileList
+                            this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+                            this.GLWJBUSSFileList.push(fileObj)
                             break;
                         default : ;
                     }
+                    this.formKey++
                     this.$message({
                         showClose: true,
                         message: response.message,
@@ -2147,6 +2053,7 @@
                 switch (this.fileType){
                     case 'FBGBUSS':
                         this.FBGBUSSFileList = fileList
+                        console.log(this.FBGBUSSFileList)
                         break;
                     case 'BZSMBUSS' :
                         this.BZSMBUSSFileList = fileList
@@ -2162,6 +2069,7 @@
                         break;
                     default : ;
                 }
+                this.formKey++
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
@@ -2255,6 +2163,54 @@
             handleTabs(name) {
                 this.active = name
             },
+            processModelHisOneCount(pId) {
+                return new Promise((resolve, reject) => {
+                    processModelHisOneCount({
+                        pid: pId
+                    }).then(res => {
+                        if (res) {
+                            resolve(res)
+                        } else {
+                            reject()
+                        }
+                    }).catch(e => {
+                        reject(e)
+                    })
+                })
+            },
+            // 在线编辑
+            handleOnLineEdit(){
+                this.isSubmit = true
+                this.processModelHisOneCount(this.pId,this.taskIds)
+                    .then(res => {
+                        console.log(res)
+                        if(res){
+                            const editFileInfo = res
+                            const showName = this.$store.getters.userInfo.userName + editFileInfo.taskInfo
+                            const editFilePath = editFileInfo.editFilePath.split("/")
+                            editFileInfo.filePath = editFilePath[0]+'/'+editFilePath[1]+'/'
+                            editFileInfo.fileName = editFilePath[2]
+                            editFileInfo.userName = this.$store.getters.userInfo.userName
+                            const nowTime = new Date().getTime()
+                            window.open(onlyOfficeUrl+'/editor?pid='+this.pId+'&taskIds='+this.taskIds+'&editType='+editFileInfo.editType+'&oldFileName=' + showName + '&fileType=' + 'docx' + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName+'&userId='+editFileInfo.userId+'&userName='+editFileInfo.userName)
+                            this.isSubmit = false
+                        }
+                    }).catch(e => {
+                    console.log(e)
+                    // this.$message.warning('文件不存在,预览失败')
+                })
+            },
+            handleUploadFile(){
+                this.fileType = '';
+                this.fileType = 'footFile';
+
+                this.fileList=this.footFileList
+
+                this.fileMadel = true;
+            },
+            handleUploadedFile(){
+                this.fileMadel = true
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
@@ -2267,16 +2223,10 @@
                 // _formData.append('id', this.bpnId)
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
-                _formData.append('prcType', 'laws1')
-                _formData.append('prcName', '政策入库流程')
+                _formData.append('prcType', 'buss1')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
-                    // prcForm: this.prcForm,
-                    // sarAccessInfoList: this.sarAccessInfoList,
-                    // sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
-                    // bzqdForm: this.bzqdForm,
-                    // listInfo: this.listInfo,
-                    // id: this.id
-                    taskInfo: '申请人发起',
+                    taskInfo: this.taskInfo,
                     form: this.form,
                     roleForm: this.roleForm,
                     commentText: this.commentText
@@ -2292,19 +2242,20 @@
             fileInfoHandle(){
 
                 //拼接文件名和id 提交到流程Activity
-                this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
+                console.log(this.FBGBUSSFileList)
+                this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
                 this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
 
-                this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
                 this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
 
-                this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
                 this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
 
-                this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
                 this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
 
-                this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
                 this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
             },
@@ -2393,36 +2344,58 @@
                 // } else if (val === '') {
                 //     this.form.country = []
                 // }
-                this.$refs['formTongGuo'].validate((valid) => {
+                this.fileInfoHandle()
+                this.$refs['form'].validate((valid) => {
                     if (valid) {
-                        this.isSubmit = true
-                        this.form.commentText = this.formTongGuo.commentText
-                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                        const json = JSON.stringify(this.form);
-                        this.$http.post('lawss/activiti/completeTask', {
-                            taskIds: this.taskIds,
-                            userId : this.userId,
-                            json: json
-                        }, {
-                            _this: this
-                        }, res => {
-                            if (res.success) {
-                                this.$message.success(res.message)
-                                // 流程提交之后，应该流转至待办任务页面
-                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                // if(this.formTongGuo.approvalOpinion === '1'){
-                                //     this.$message.warning("驳回成功")
-                                //     this.isSubmit = false
-                                //     // 流程提交之后，应该流转至待办任务页面
-                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                // }else{
-                                //     this.processCreateLaws(json)
-                                // }
-                            }else {
-                                this.$message.success(res.message)
-                            }
-                        })
-              }})
+                        this.$refs['formTongGuo'].validate((valid) => {
+                            if (valid) {
+                                this.isSubmit = true
+                                this.saveLoading = true
+                                this.form.commentText = this.formTongGuo.commentText
+                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                const json = JSON.stringify(this.form);
+                                this.$http.post('lawss/activiti/completeTask', {
+                                    taskIds: this.taskIds,
+                                    userId : this.userId,
+                                    json: json
+                                }, {
+                                    _this: this
+                                }, res => {
+                                    if (res.success) {
+                                        this.$message.success(res.message)
+                                        // 流程提交之后，应该流转至待办任务页面
+                                        this.isSubmit = false
+                                        this.saveLoading = false
+                                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        // if(this.formTongGuo.approvalOpinion === '1'){
+                                        //     this.$message.warning("驳回成功")
+                                        //     this.isSubmit = false
+                                        //     // 流程提交之后，应该流转至待办任务页面
+                                        //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        // }else{
+                                        //     this.processCreateLaws(json)
+                                        // }
+                                    }else {
+                                        this.$message.success(res.message)
+                                    }
+                                })
+                                // this.processModelHisOneCount(this.pId)
+                                //     .then(res => {
+                                //         if(res){
+                                //             const editFileInfo = res
+                                //             if(editFileInfo && editFileInfo.editStatus === '1'){
+                                //             }else {
+                                //                 this.$message.warning('请先在线编辑,再提交流程')
+                                //             }
+                                //
+                                //         }
+                                //     }).catch(e => {
+                                //     console.log(e)
+                                //     // this.$message.warning('文件不存在,预览失败')
+                                // })
+                            }})
+                    }
+                })
             },
             busVsFunc(){
                 this.$http.get('sarVppsTree/list', '', {
@@ -2457,16 +2430,18 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.formKey++
                 })
             },
             assemble(ids,names){
                 let list= new Array();
-                let idArray=ids.split(',');
-                let nameArray=names.split(',');
-                for(let i=0; i<idArray.length; i++){
-                    list.push({id:idArray[i],name:nameArray[i]});
+                if(ids && ids !== '' && names && names !== ''){
+                    let idArray=ids.split(',');
+                    let nameArray=names.split(',');
+                    for(let i=0; i<idArray.length; i++){
+                        list.push({id:idArray[i],name:nameArray[i]});
+                    }
                 }
-
                 return list;
             },
             getData() {
@@ -2477,6 +2452,7 @@
                             pId: this.pId
                         }).then(res => {
                             if (res) {
+                                this.taskInfo = '企标汇总修订'
                                 const processForm = JSON.parse(res.mesg)
                                 const dateArr = []
                                 if(processForm.commentCycleStart && processForm.commentCycleEnd){
@@ -2486,11 +2462,14 @@
                                 }
 
                                 this.getFormFieldList(processForm)
+                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
+                                console.log(this.LSBBBUSSFileList)
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2529,6 +2508,7 @@
             },
         },
         mounted () {
+            this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
index e64b43193..e1947d077 100644
--- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
@@ -2,11 +2,11 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">重新修订并组织评审</template>
+        <template slot="proNode">重新技术委员会评审/评审意见修改评审</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-<!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
+        <!--        <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
         <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content">
@@ -18,255 +18,76 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
+                <formEditList
+                        :key = "formKey"
+                        :formSub = "form"
+                        :FBGBUSSFileListSub = "FBGBUSSFileList"
+                        :LSBBBUSSFileListSub = "LSBBBUSSFileList"
+                        :BZSMBUSSFileListSub = "BZSMBUSSFileList"
+                        :QTWJBUSSFileListSub = "QTWJBUSSFileList"
+                        :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+                        :disabledState = "disabledState"
+                        :verifySarStandard = "verifySarStandard"
+                        :fileMadelSub = "fileMadel"
+                        :fbgDown = "true"
+                        @formCancel="formCancel"
+                        @formSelectLawsCancel = "formSelectLawsCancel"
+                        @formChoiceZRRListCancel = "formChoiceZRRListCancel"
+                        @formChoiceQCDW = "formChoiceQCDW"
+                />
                 <ProcessTitle>
-                    <template slot="title">基础信息</template>
+                    <template slot="title">意见信息</template>
                 </ProcessTitle>
-                <div class="prc-content-border">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
-                                    <el-option
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <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="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
+                <template>
+                    <div class="prc-content-border" style="height: 66vh;position: relative;">
+                        <el-table
+                                ref="selection"
+                                tooltip-effect="dark"
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                                        fontWeight: 'bold', height: '48px'}"
+                                @selection-change="handleSelectionChange"
+                                row-key="id"
+                                :data="form.infoList"
+                                border
+                                default-expand-all>
+                            <el-table-column
+                                    label="序号"
+                                    min-width="15%"
+                                    align="center">
+                                <template slot-scope="scope">
+                                    {{scope.$index + 1}}
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    prop="userName"
+                                    label="会签人"
+                                    align="center"
+                                    min-width="15%">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="commentText"
+                                    label="会签意见"
+                                    min-width="70%"
+                                    align="center">
+                            </el-table-column>
+                        </el-table>
+                        <el-row :gutter="24">
+                            <el-col :span="12">
+                                <el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
+                                    <el-select v-model="form.opinionsAdopted" filterable clearable>
+                                        <el-option
+                                                v-for="item in opinionsAdoptedOptions"
+                                                :key="item.value"
+                                                :value="item.value"
+                                                :label="item.label"
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </div>
+                </template>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -300,85 +121,85 @@
                     </el-collapse>
                 </div>
             </div>
-<!--            <div class="block" id="active2" v-show="active === '2'">-->
-<!--                <ProcessTitle>-->
-<!--                    <template slot="title">模块信息</template>-->
-<!--                </ProcessTitle>-->
-<!--                <template>-->
-<!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
-<!--                        <div class="action-bar">-->
-<!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
-<!--                                批量编辑-->
-<!--                            </el-button>-->
-<!--                            <el-button-->
-<!--                                    type="primary"-->
-<!--                                    size="mini"-->
-<!--                                    class="common-button-primary add-button"-->
-<!--                                    @click="createRow"-->
-<!--                            >创建模块</el-button>-->
-<!--                        </div>-->
-<!--                        <el-table-->
-<!--                                ref="selection"-->
-<!--                                tooltip-effect="dark"-->
-<!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
-<!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
-<!--                                        fontWeight: 'bold', height: '48px'}"-->
-<!--                                @selection-change="handleSelectionChange"-->
-<!--                                row-key="id"-->
-<!--                                :data="form.modelData"-->
-<!--                                border-->
-<!--                                default-expand-all-->
-<!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-<!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
-<!--                            <el-table-column-->
-<!--                                    prop="modelNum"-->
-<!--                                    label="序号"-->
-<!--                                    min-width="15%"-->
-<!--                                    align="center"-->
-<!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column-->
-<!--                                    label="名称"-->
-<!--                                    align="center"-->
-<!--                                    min-width="30%">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <el-form-item-->
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
-<!--                                    >-->
-<!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
-<!--                                    </el-form-item>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column-->
-<!--                                    label="责任人"-->
-<!--                                    min-width="15%"-->
-<!--                                    align="center">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <el-form-item-->
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
-<!--                                    >-->
-<!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
-<!--                                    </el-form-item>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
-<!--                                <template slot-scope="scope">-->
-<!--                                    <div @click.stop style="display: inline-block">-->
-<!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
-<!--                                            <i class="iconfont">&#xe61e;</i>-->
-<!--                                            <el-dropdown-menu slot="dropdown">-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
-<!--                                            </el-dropdown-menu>-->
-<!--                                        </el-dropdown>-->
-<!--                                    </div>-->
-<!--                                </template>-->
-<!--                            </el-table-column>-->
-<!--                        </el-table>-->
-<!--                    </div>-->
-<!--                </template>-->
-<!--            </div>-->
+            <!--            <div class="block" id="active2" v-show="active === '2'">-->
+            <!--                <ProcessTitle>-->
+            <!--                    <template slot="title">模块信息</template>-->
+            <!--                </ProcessTitle>-->
+            <!--                <template>-->
+            <!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
+            <!--                        <div class="action-bar">-->
+            <!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
+            <!--                                批量编辑-->
+            <!--                            </el-button>-->
+            <!--                            <el-button-->
+            <!--                                    type="primary"-->
+            <!--                                    size="mini"-->
+            <!--                                    class="common-button-primary add-button"-->
+            <!--                                    @click="createRow"-->
+            <!--                            >创建模块</el-button>-->
+            <!--                        </div>-->
+            <!--                        <el-table-->
+            <!--                                ref="selection"-->
+            <!--                                tooltip-effect="dark"-->
+            <!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
+            <!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
+            <!--                                        fontWeight: 'bold', height: '48px'}"-->
+            <!--                                @selection-change="handleSelectionChange"-->
+            <!--                                row-key="id"-->
+            <!--                                :data="form.modelData"-->
+            <!--                                border-->
+            <!--                                default-expand-all-->
+            <!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+            <!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
+            <!--                            <el-table-column-->
+            <!--                                    prop="modelNum"-->
+            <!--                                    label="序号"-->
+            <!--                                    min-width="15%"-->
+            <!--                                    align="center"-->
+            <!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column-->
+            <!--                                    label="名称"-->
+            <!--                                    align="center"-->
+            <!--                                    min-width="30%">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <el-form-item-->
+            <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+            <!--                                    >-->
+            <!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
+            <!--                                    </el-form-item>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column-->
+            <!--                                    label="责任人"-->
+            <!--                                    min-width="15%"-->
+            <!--                                    align="center">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <el-form-item-->
+            <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+            <!--                                    >-->
+            <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
+            <!--                                    </el-form-item>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
+            <!--                                <template slot-scope="scope">-->
+            <!--                                    <div @click.stop style="display: inline-block">-->
+            <!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
+            <!--                                            <i class="iconfont">&#xe61e;</i>-->
+            <!--                                            <el-dropdown-menu slot="dropdown">-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
+            <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
+            <!--                                            </el-dropdown-menu>-->
+            <!--                                        </el-dropdown>-->
+            <!--                                    </div>-->
+            <!--                                </template>-->
+            <!--                            </el-table-column>-->
+            <!--                        </el-table>-->
+            <!--                    </div>-->
+            <!--                </template>-->
+            <!--            </div>-->
             <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                 <div class="flow-list">
                     <el-table
@@ -455,9 +276,8 @@
             v-show="verifySarStandard"
             show-save
             show-submit
-            show-edit
             :saveLoading="saveLoading"
-            @onLineEdit="handleOnLineEdit"
+            :submitLoading="isSubmit"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -598,6 +418,12 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <Mechanism-tree
+            is-title="选择部门信息"
+            :is-visible.sync="modalShowFlagZRBM"
+            :nodeList="nodeListZRBM"
+            @checkedRole="drawerCheckZRBM"
+    />
     <!--        <el-drawer-->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -667,7 +493,6 @@
                             <el-select v-model="standardSearchForm.lawsTextState" placeholder="" filterable clearable>
                                 <el-option
                                         v-for="item in standStateOptions"
-                                        placeholder="请选择"
                                         :key="item.value"
                                         :value="item.value"
                                         :label="item.label"
@@ -804,6 +629,7 @@
 
 <script>
     import { onlyOfficeUrl } from '@/sysConfig'
+    import formEditList from './common/formEditList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -819,7 +645,8 @@
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
+            formEditList
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -875,8 +702,9 @@
                         }
                     }]
                 },
+                taskInfo:'',
                 loading: false,
-                disabledState: true,
+                disabledState: false,
                 userId:this.$store.getters.userInfo.userId,
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -885,6 +713,7 @@
                 prcName: this.$route.query.prcName,
                 detailData: [],
                 fileList: [],
+                footFileList: [],
                 FBGBUSSFileList: [],
                 BZSMBUSSFileList: [],
                 LSBBBUSSFileList: [],
@@ -969,6 +798,7 @@
                 ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
                 isSubmit: false,
+                uploadFileStatus: true,
                 saveLoading: false,
                 defaultProps: {
                     children: 'children',
@@ -982,6 +812,8 @@
                     children: 'children',
                     label: 'model'
                 },
+                modalShowFlagZRBM: false,
+                nodeListZRBM: [],
                 nodeList: [],
                 nodeList2: [],
                 zrType: '',
@@ -992,6 +824,7 @@
                     children: 'children',
                     label: 'name'
                 },
+                formKey:1,
                 key:1,
                 key1:2,
                 key2:3,
@@ -1025,6 +858,9 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    opinionsAdopted:'',  // 汇总意见是否采纳
+                    footFile:'',
+                    footFileName:'',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1145,6 +981,9 @@
                     standSort: [
                         { required: true, message: '请选择企标类别', trigger: 'change' }
                     ],
+                    opinionsAdopted: [
+                        { required: true, message: '请选择汇总意见是否采纳', trigger: 'change' }
+                    ],
                     standNumber: [
                         { required: true, message: '请输入企标编号', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
@@ -1184,6 +1023,10 @@
                 },
                 zrUserIds: [], // 选择多个会签责任人
                 userType:'', // 选择用户ID判断
+                opinionsAdoptedOptions:[
+                    {value: '1',label: '采纳'},
+                    {value: '2',label: '不采纳'},
+                ],
                 countryOptions:[],//国家地区
                 standSortOptions: [], // 标准类别
                 standNatureOptions: [], // 标准性质
@@ -1264,6 +1107,52 @@
             },
         },
         methods: {
+            drawerCheckZRBM(data) {
+                let idList = ''
+                let nameList = ''
+                data.forEach(item => {
+                    // if (item.hasChild === '0') {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                    // }
+                })
+                this.form.QCDW = nameList
+                this.form.QCDWID = idList
+                this.formKey++
+            },
+            choiceQCDW(type, title, id) {
+                this.nodeListZRBM = []
+                this.nodeListZRBM.push(id)
+                this.drawerTitle = title
+                this.modalShowFlagZRBM = true
+            },
+            formChoiceQCDW(type, title, id){
+                this.choiceQCDW(type, title, id)
+            },
+            formChoiceZRRListCancel(type, title, id){
+                this.choiceZRRList(type, title, id)
+            },
+            formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+                this.replaceLawsNumModel = replaceLawsNumModel
+                this.replaceLawType = replaceLawType
+                this.getReplaceLawsNumRow()
+            },
+            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType) {
+                this.form = form
+                this.FBGBUSSFileList = list1
+                this.LSBBBUSSFileList = list2
+                this.BZSMBUSSFileList = list3
+                this.QTWJBUSSFileList = list4
+                this.GLWJBUSSFileList = list5
+                if(fileMadel){
+                    this.fileType = fileType
+                    this.fileUpload(fileType)
+                }
+            },
             modelProp(row,index){
                 console.log(row)
                 console.log(index)
@@ -1412,6 +1301,10 @@
                 }else if(this.userType === 'hqUserId'){
                     this.roleForm.hqUserId=idList;
                     this.roleForm.hqUserName=nameList;
+                }else if(this.userType === 'QCRBUSS'){
+                    this.form.QCRBUSSID=idList;
+                    this.form.QCRBUSS=nameList;
+                    this.formKey++
                 }
             },
             checkedRole (data) {
@@ -1466,8 +1359,15 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+                        this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+                        this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+                        this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+                        this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+                        this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
+                        this.formKey++
                     })
                 }else {
                     this.form.XCSJBUSS = this.dateFormatter()
@@ -1942,8 +1842,8 @@
                 })
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
-                if(this.replaceLawType === 'dtbjh'){
-                    this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
+                if(this.replaceLawType === 'DTQBBHBUSS'){
+                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
@@ -1955,6 +1855,7 @@
                 }
                 // this.$emit('input', textArr.join(','))
                 this.$refs.selections.clearSelection()
+                this.formKey++
             },
             // 点击查看
             handlePreview (item) {
@@ -2022,6 +1923,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
+                this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                    this.$message.error('文件限制只可上传一个')
+                    return false
+                }
                 if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
@@ -2054,9 +1960,26 @@
                     })
                 })
             },
+            filePreview(file,type) {
+                const attId = file.footFile
+                if (type === 'down') {
+                    if (attId) {
+                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    } else {
+                        this.$message.warning('文件不存在,下载失败')
+                    }
+                } else {
+                    this.$preview(attId)
+                }
+            },
             // 文件预览及下载
             handleFilePreview(file) {
-                const attId = file.response.data.id
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 if (this.preview) {
                     if (attId) {
                         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
@@ -2064,50 +1987,43 @@
                         this.$message.warning('文件不存在,下载失败')
                     }
                 } else {
-                    this.getBusStandFileByAttId(attId)
-                        .then(res => {
-                            if(res){
-                                const editFileInfo = res
-                                if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-                                    window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-                                }else {
-                                    const nowTime = new Date().getTime()
-                                    // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-                                    window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                                }
-                            }
-                        }).catch(e => {
-                        console.log(e)
-                        this.$message.warning('文件不存在,预览失败')
-                    })
+                    this.$preview(attId)
                 }
             },
             // 导入标准数据成功后执行
             importFileSuccess (response, file,fileList) {
                 // 上传成功后判断是否是两条数据是的话替换掉旧数据
                 // if (fileList.length > 1) {
-                //   this.fileList = fileList.splice(0, 1)
+                //     fileList = fileList.splice(0, 1)
                 // }
                 if (response.ok) {
-
+                    const fileObj = {}
+                    fileObj.id = file.response.data.id
+                    fileObj.name = file.response.data.name
                     switch (this.fileType){
                         case 'FBGBUSS':
-                            this.FBGBUSSFileList = fileList
+                            this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+                            this.FBGBUSSFileList.push(fileObj)
                             break;
                         case 'BZSMBUSS' :
-                            this.BZSMBUSSFileList = fileList
+                            this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+                            this.BZSMBUSSFileList.push(fileObj)
                             break;
                         case 'LSBBBUSS':
-                            this.LSBBBUSSFileList = fileList
+                            this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+                            this.LSBBBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJLAWS':
-                            this.QTWJBUSSFileList = fileList
+                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.GLWJLAWSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
-                            this.GLWJBUSSFileList = fileList
+                            this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+                            this.GLWJBUSSFileList.push(fileObj)
                             break;
                         default : ;
                     }
+                    this.formKey++
                     this.$message({
                         showClose: true,
                         message: response.message,
@@ -2151,6 +2067,7 @@
                 switch (this.fileType){
                     case 'FBGBUSS':
                         this.FBGBUSSFileList = fileList
+                        console.log(this.FBGBUSSFileList)
                         break;
                     case 'BZSMBUSS' :
                         this.BZSMBUSSFileList = fileList
@@ -2166,6 +2083,7 @@
                         break;
                     default : ;
                 }
+                this.formKey++
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
@@ -2296,6 +2214,17 @@
                     // this.$message.warning('文件不存在,预览失败')
                 })
             },
+            handleUploadFile(){
+                this.fileType = '';
+                this.fileType = 'footFile';
+
+                this.fileList=this.footFileList
+
+                this.fileMadel = true;
+            },
+            handleUploadedFile(){
+                this.fileMadel = true
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
@@ -2308,16 +2237,10 @@
                 // _formData.append('id', this.bpnId)
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
-                _formData.append('prcType', 'laws1')
-                _formData.append('prcName', '政策入库流程')
+                _formData.append('prcType', 'buss1')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
-                    // prcForm: this.prcForm,
-                    // sarAccessInfoList: this.sarAccessInfoList,
-                    // sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
-                    // bzqdForm: this.bzqdForm,
-                    // listInfo: this.listInfo,
-                    // id: this.id
-                    taskInfo: '申请人发起',
+                    taskInfo: this.taskInfo,
                     form: this.form,
                     roleForm: this.roleForm,
                     commentText: this.commentText
@@ -2333,19 +2256,20 @@
             fileInfoHandle(){
 
                 //拼接文件名和id 提交到流程Activity
-                this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
+                console.log(this.FBGBUSSFileList)
+                this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
                 this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
 
-                this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
                 this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
 
-                this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
                 this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
 
-                this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
                 this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
 
-                this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
                 this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
             },
@@ -2434,53 +2358,58 @@
                 // } else if (val === '') {
                 //     this.form.country = []
                 // }
-                this.$refs['formTongGuo'].validate((valid) => {
+                this.fileInfoHandle()
+                this.$refs['form'].validate((valid) => {
                     if (valid) {
-                        this.processModelHisOneCount(this.pId)
-                            .then(res => {
-                                if(res){
-                                    const editFileInfo = res
-                                    if(editFileInfo && editFileInfo.editStatus === '1'){
-                                        this.isSubmit = true
-                                        this.saveLoading = true
-                                        this.form.commentText = this.formTongGuo.commentText
-                                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                                        const json = JSON.stringify(this.form);
-                                        this.$http.post('lawss/activiti/completeTask', {
-                                            taskIds: this.taskIds,
-                                            userId : this.userId,
-                                            json: json
-                                        }, {
-                                            _this: this
-                                        }, res => {
-                                            if (res.success) {
-                                                this.$message.success(res.message)
-                                                // 流程提交之后，应该流转至待办任务页面
-                                                this.isSubmit = false
-                                                this.saveLoading = false
-                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                                // if(this.formTongGuo.approvalOpinion === '1'){
-                                                //     this.$message.warning("驳回成功")
-                                                //     this.isSubmit = false
-                                                //     // 流程提交之后，应该流转至待办任务页面
-                                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                                // }else{
-                                                //     this.processCreateLaws(json)
-                                                // }
-                                            }else {
-                                                this.$message.success(res.message)
-                                            }
-                                        })
+                        this.$refs['formTongGuo'].validate((valid) => {
+                            if (valid) {
+                                this.isSubmit = true
+                                this.saveLoading = true
+                                this.form.commentText = this.formTongGuo.commentText
+                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                const json = JSON.stringify(this.form);
+                                this.$http.post('lawss/activiti/completeTask', {
+                                    taskIds: this.taskIds,
+                                    userId : this.userId,
+                                    json: json
+                                }, {
+                                    _this: this
+                                }, res => {
+                                    if (res.success) {
+                                        this.$message.success(res.message)
+                                        // 流程提交之后，应该流转至待办任务页面
+                                        this.isSubmit = false
+                                        this.saveLoading = false
+                                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        // if(this.formTongGuo.approvalOpinion === '1'){
+                                        //     this.$message.warning("驳回成功")
+                                        //     this.isSubmit = false
+                                        //     // 流程提交之后，应该流转至待办任务页面
+                                        //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                        // }else{
+                                        //     this.processCreateLaws(json)
+                                        // }
                                     }else {
-                                        this.$message.warning('请先在线编辑,再提交流程')
+                                        this.$message.success(res.message)
                                     }
-
-                                }
-                            }).catch(e => {
-                            console.log(e)
-                            // this.$message.warning('文件不存在,预览失败')
-                        })
-              }})
+                                })
+                                // this.processModelHisOneCount(this.pId)
+                                //     .then(res => {
+                                //         if(res){
+                                //             const editFileInfo = res
+                                //             if(editFileInfo && editFileInfo.editStatus === '1'){
+                                //             }else {
+                                //                 this.$message.warning('请先在线编辑,再提交流程')
+                                //             }
+                                //
+                                //         }
+                                //     }).catch(e => {
+                                //     console.log(e)
+                                //     // this.$message.warning('文件不存在,预览失败')
+                                // })
+                            }})
+                    }
+                })
             },
             busVsFunc(){
                 this.$http.get('sarVppsTree/list', '', {
@@ -2515,16 +2444,18 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.formKey++
                 })
             },
             assemble(ids,names){
                 let list= new Array();
-                let idArray=ids.split(',');
-                let nameArray=names.split(',');
-                for(let i=0; i<idArray.length; i++){
-                    list.push({id:idArray[i],name:nameArray[i]});
+                if(ids && ids !== '' && names && names !== ''){
+                    let idArray=ids.split(',');
+                    let nameArray=names.split(',');
+                    for(let i=0; i<idArray.length; i++){
+                        list.push({id:idArray[i],name:nameArray[i]});
+                    }
                 }
-
                 return list;
             },
             getData() {
@@ -2535,6 +2466,7 @@
                             pId: this.pId
                         }).then(res => {
                             if (res) {
+                                this.taskInfo = '企标汇总修订'
                                 const processForm = JSON.parse(res.mesg)
                                 const dateArr = []
                                 if(processForm.commentCycleStart && processForm.commentCycleEnd){
@@ -2544,11 +2476,14 @@
                                 }
 
                                 this.getFormFieldList(processForm)
+                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
+                                console.log(this.LSBBBUSSFileList)
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.formKey++
                             }
                         }).catch(e => {
                         })
@@ -2587,6 +2522,7 @@
             },
         },
         mounted () {
+            this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index 6cc6539c6..f25d348ec 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -429,7 +429,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '专委会副主任/起草单位中心主任审定'){
+          }else if (row.taskInfo === '起草单位中心主任审定'){
             this.$router.push({
               name: 'bussLibrary10',
               query: {
@@ -440,7 +440,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '起草单位中心主任审定'){
+          }else if (row.taskInfo === '总院院长或总院主管副院长批准'){
             this.$router.push({
               name: 'bussLibrary11',
               query: {
@@ -451,7 +451,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '主起草人培训'){
+          }else if (row.taskInfo === '标准法规部标准化工程师发布'){
             this.$router.push({
               name: 'bussLibrary12',
               query: {

From 0444c693c8fca269570c7156660a08f900ed7826 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 27 Dec 2021 15:05:40 +0800
Subject: [PATCH 11/11] =?UTF-8?q?feat:new=20=E5=89=81=E6=89=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sysConfig/index.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 8c83dc101..1ba8b30d7 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,20 +7,22 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-// const devInterfacePORT = '9999'
-const devIp = '192.168.10.70'
-const devInterfacePORT = '4202'
 // const devIp = '62.234.136.153'
-// const devInterfacePORT = '8038'
+// const devInterfacePORT = '8033'
+const devIp = '10.19.11.243'
+const devInterfacePORT = '4304'
 // 配置 idm 认证
 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
 // 配置 前端服务
-const devWebUrl = 'http://62.234.136.153:8038/#/'
+const devWebUrl = 'https://srms.foton.com.cn/#/'
 // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
 const webLoginType = 'dev'
 
 // 配置onlyOffice 前端服务
-const onlyOfficeUrl = 'http://127.0.0.1:8080'
+const onlyOfficeUrl = 'http://10.100.5.116:8088'
+
+// 配置 kkFileView 前端服务
+const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
 
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -44,10 +46,10 @@ const processPort = '17210'
 
  *****************************************************************/
 // 生产环境配置
-const prodIp = '62.234.136.153'
-const prodInterfacePORT = '8033'
-// const prodIp = 'slrs.foton.com.cn'
-// const prodInterfacePORT = ''
+// const prodIp = '62.234.136.153'
+// const prodInterfacePORT = '8033'
+const prodIp = 'srms.foton.com.cn'
+const prodInterfacePORT = ''
 
 // 判断环境
 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -60,6 +62,7 @@ module.exports = {
     ssoLoginUrlDev: ssoLogin + devWebUrl,
     ssoLoginUrl: ssoLogin,
     onlyOfficeUrl: onlyOfficeUrl,
+    kkFileViewUrl: kkFileViewUrl,
     devWebUrl: devWebUrl,
     serverUrl: 'http://' + serverIP, // 服务器IP地址
     interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,