Merge branch 'develop' into FOTON

src/pages/home2/components/todoList/index.vue

@@ -398,7 +398,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '总院标准法规部产品标准工程师/各事业部标准化员发布'){
+          }else if (row.taskInfo === '总院标准法规部产品标准工程师发布'){
             this.$router.push({
               name: 'bussLibraryProduct13',
               query: {

src/pages/localTool/standardWarning.vue

@@ -162,9 +162,9 @@
                     <a @click="handlePreview(scope.row)">{{ scope.row.itemsName }}</a>
                   </template>
                 </el-table-column>
-                <el-table-column prop="putTime" label="发布日期" width="120" align="center">
+                <el-table-column prop="issueTime" label="发布日期" width="120" align="center">
                   <template slot-scope="scope">
-                    <span>{{ scope.row.putTime ? scope.row.putTime.substring(0, 10) : '' }}</span>
+                    <span>{{ scope.row.issueTime ? scope.row.issueTime.substring(0, 10) : '' }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="ssrq" label="实施日期" width="120" align="center">
@@ -473,8 +473,8 @@ export default {
         //标准名称
         standName: this.dynamic.standName,
         //发布日期
-        startPutTime: this.dynamic.putTime[0],
+        startIssueTime: this.dynamic.putTime[0],
-        endPutTime: this.dynamic.putTime[1],
+        endIssueTime: this.dynamic.putTime[1],
         //实施日期
         startSSRQ: this.dynamic.SSRQ[0],
         endSSRQ: this.dynamic.SSRQ[1],

src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue

@@ -266,7 +266,7 @@
                 @checkedRole="checkedRole"
         ></Role-tree>
         <el-drawer
-                title="编辑"
+                :title="modaltitle2"
                 :visible.sync="modalshowflag2"
                 :wrapperClosable="false"
                 size="800px">
@@ -336,6 +336,8 @@
         name: "bzzqyjStep3",
         data() {
             return {
+                modaltitle2: '',
+                addType: '',
                 onlyKey: '',
                 commentText3: '',
                 itermsConditionsFlag: false,
@@ -349,6 +351,10 @@
                     oldText: '',
                     newText: '',
                     reason: '',
+                    id: '',
+                    department: this.$store.getters.userInfo.upDeptName,
+                    responUserName: this.$store.getters.userInfo.userName,
+                    responUser: this.$store.getters.userInfo.userId
                 },
                 drawerModal: false,
                 todoId: '',
@@ -426,7 +432,11 @@
                     }
                 }
             },
+
             saveUserInfo2 () {
+                if (this.addType === 'add') {
+                    this.data.push(this.editForm)
+                }
                 for( let a = 0; a < this.data.length; a++) {
                     if (this.data[a].id === this.itemId) {
                         this.data[a].chapterNumber = this.editForm.chapterNumber
@@ -438,10 +448,27 @@
                 }
                 this.modalshowflag2 = false
             },
-            cancleUserInfo2 () {
+            addModal() {
-                this.modalshowflag2 = false
+                var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+                this.itemId = id
+                this.editForm = {
+                    chapterNumber: '',
+                    chapterName: '',
+                    oldText: '',
+                    newText: '',
+                    reason: '',
+                    id: id,
+                    department: this.$store.getters.userInfo.upDeptName,
+                    responUserName: this.$store.getters.userInfo.userName,
+                    responUser: this.$store.getters.userInfo.userId
+                }
+                this.addType = 'add'
+                this.modaltitle2 = '新增'
+                this.modalshowflag2 = true
             },
             itemEdit (row) {
+                this.addType = 'edit'
+                this.modaltitle2 = '编辑'
                 this.itemId = row.id
                 this.modalshowflag2 = true
                 this.editForm = {
@@ -452,6 +479,10 @@
                     reason: row.reason,
                 }
             },
+
+            cancleUserInfo2 () {
+                this.modalshowflag2 = false
+            },
             downloadFile (attId) {
                 window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
             },
@@ -529,31 +560,6 @@
                     this.$message.warning('请选择要删除的数据')
                 }
             },
-            addModal() {
-                var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
-                var json = {
-                    chapterNumber: '',
-                    chapterName: '',
-                    commentText: '',
-                    oldText: '',
-                    newText: '',
-                    reason: '',
-                    id: id,
-                    department: this.$store.getters.userInfo.upDeptName,
-                    responUserName: this.$store.getters.userInfo.userName,
-                    responUser: this.$store.getters.userInfo.userId
-                }
-                this.data.push(json)
-                this.itemId = id
-                this.editForm = {
-                    chapterNumber: '',
-                    chapterName: '',
-                    oldText: '',
-                    newText: '',
-                    reason: '',
-                }
-                this.modalshowflag2 = true
-            },
             handleTabs(name) {
                 this.active = name
             },

src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue

@@ -285,7 +285,7 @@
             :nodeList="nodeList"
     ></Role-tree>
     <el-drawer
-            title="编辑"
+            :title="modaltitle2"
             :visible.sync="modalshowflag2"
             :wrapperClosable="false"
             size="800px">
@@ -346,6 +346,8 @@ export default {
   name: "bzzqyjStep4",
   data() {
     return {
+      modaltitle2: '',
+      addType: '',
       commentText4: '',
       acceptShow: false,
       idList: [],
@@ -450,31 +452,6 @@ export default {
         this.$message.warning('请选择要删除的数据')
       }
     },
-    addModal() {
-      var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
-      var json = {
-        chapterNumber: '',
-        chapterName: '',
-        commentText: '',
-        oldText: '',
-        newText: '',
-        reason: '',
-        id: id,
-        department: this.$store.getters.userInfo.institutionName,
-        responUserName: this.$store.getters.userInfo.userName,
-        responUser: this.$store.getters.userInfo.userId
-      }
-      this.data.push(json)
-      this.itemId = id
-      this.editForm = {
-        chapterNumber: '',
-        chapterName: '',
-        oldText: '',
-        newText: '',
-        reason: '',
-      }
-      this.modalshowflag2 = true
-    },
     getItemList (standId, fileType) { // 查询分解单条款数据
       this.$http.get('SarStandItems/sar-stand-items/querySarItemAndInterpretation', {
         standId: standId,
@@ -497,6 +474,9 @@ export default {
       }
     },
     saveUserInfo2 () {
+      if (this.addType === 'add') {
+        this.data.push(this.editForm)
+      }
       for( let a = 0; a < this.data.length; a++) {
         if (this.data[a].id === this.itemId) {
           this.data[a].chapterNumber = this.editForm.chapterNumber
@@ -508,10 +488,27 @@ export default {
       }
       this.modalshowflag2 = false
     },
-    cancleUserInfo2 () {
+    addModal() {
-      this.modalshowflag2 = false
+      var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
+      this.itemId = id
+      this.editForm = {
+        chapterNumber: '',
+        chapterName: '',
+        oldText: '',
+        newText: '',
+        reason: '',
+        id: id,
+        department: this.$store.getters.userInfo.upDeptName,
+        responUserName: this.$store.getters.userInfo.userName,
+        responUser: this.$store.getters.userInfo.userId
+      }
+      this.addType = 'add'
+      this.modaltitle2 = '新增'
+      this.modalshowflag2 = true
     },
     itemEdit (row) {
+      this.addType = 'edit'
+      this.modaltitle2 = '编辑'
       this.itemId = row.id
       this.modalshowflag2 = true
       this.editForm = {
@@ -522,6 +519,9 @@ export default {
         reason: row.reason,
       }
     },
+    cancleUserInfo2 () {
+      this.modalshowflag2 = false
+    },
     checkedRole2(data) {
       this.form.spId = data[0].id
       this.form.spName = data[0].name

src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue

@@ -598,7 +598,8 @@
             this.form.textType = data.form ? data.form.textType : data.textType
             this.form.cid = data.form ? data.form.cid : data.cid
             this.form.endTime = data.form ? data.form.endTime : data.endTime
-            data.info.forEach(item => {
+            let newArr = data.info ? data.info : data.form.data
+            newArr.forEach(item => {
               if (!item.source) {
                 item.source = '1'
               }
@@ -609,7 +610,7 @@
             });
             this.json = data;
             this.getItemList(data.standId,this.form.textValue)
-            this.data = data.info
+            this.data = newArr
             if (data.introduce) {
             } else {
               this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {

src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue

@@ -340,8 +340,8 @@
           user7Name: ''
         },
         formRules: {
-          responUserList: [
+          user7: [
-            {required: true, message: "请选择责任人", trigger: "change"}
+            {required: true, message: "请选择审批领导", trigger: "change"}
           ]
         },
         json: {}
@@ -474,23 +474,29 @@
         this.active = name;
       },
       handleSubmit() {
-        this.isSubmit = true;
+        this.$refs['bzzqyjForm'].validate((valid) => {
-        var json = this.json;
+          if (valid) {
-        json.hqFlag = '0';
+            this.isSubmit = true;
-        json.commentText = this.commentText6;
+            var json = this.json;
-        json.user7 = this.form.user7;
+            json.hqFlag = '0';
-        json.user7Name = this.form.user7Name;
+            json.commentText = this.commentText6;
-        this.$http.post("lawss/activiti/completeTask", {
+            json.user7 = this.form.user7;
-          json: JSON.stringify(json),
+            json.user7Name = this.form.user7Name;
-          taskId: this.taskIds,
+            this.$http.post("lawss/activiti/completeTask", {
-          userId: this.$store.getters.userInfo.userId
+              json: JSON.stringify(json),
-        }, {}, res => {
+              taskId: this.taskIds,
-          if (res.success) {
+              userId: this.$store.getters.userInfo.userId
-            this.$message.success("提交成功");
+            }, {}, res => {
-            this.$router.push("/processCenter");
+              if (res.success) {
+                this.$message.success("提交成功");
+                this.$router.push("/processCenter");
+              }
+              this.isSubmit = false;
+            });
+          } else {
+            this.$message.warning('请选择审批领导')
           }
-          this.isSubmit = false;
+        })
-        });
       },
       handleSubmitNo() {
         if (this.commentText6) {
@@ -520,6 +526,7 @@
             pId: this.pId
           }).then(res => {
             let data = JSON.parse(res.mesg);
+            console.log(data);
             this.commentText6 = data.commentText6 || ''
             this.form.fjList = data.fjList || data.form.fjList
             this.form.cid = data.cid || data.form.cid;
@@ -528,9 +535,10 @@
             this.form.modelList = data.modelList || data.form.modelList
             this.form.user7 = data.form ? data.form.user7 : (data.user7 ? data.user7 :  '')
             this.form.user7Name = data.form ? data.form.user7Name : (data.user7Name ? data.user7Name :  '')
-            this.oldData = JSON.parse(JSON.stringify(data.info))
+            let newArr = data.info ? data.info : data.form.data
-            var arr = []
+            this.oldData = JSON.parse(JSON.stringify(newArr))
-            data.info.forEach(item => {
+            let arr = []
+            newArr.forEach(item => {
               if (item.state != '3') {
                 arr.push(item)
               }

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue

@@ -493,9 +493,10 @@ export default {
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.textType = data.textType || data.form.textType
           this.form.modelList = data.modelList || data.form.modelList
-          this.oldData = JSON.parse(JSON.stringify(data.info))
+          let newArr = data.info ? data.info : data.form.data
-          var arr = []
+          this.oldData = JSON.parse(JSON.stringify(newArr))
-          data.info.forEach(item => {
+          let arr = []
+          newArr.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }

src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue

@@ -249,7 +249,6 @@
       show-submit
       :submitLoading="isSubmit"
       :saveLoading="saveLoading"
-      @save="handleSave"
       @submit="handleSubmit"
       show-back
       @back="handleSubmitNo"
@@ -497,9 +496,10 @@ export default {
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.textType = data.textType || data.form.textType
           this.form.modelList = data.modelList || data.form.modelList
-          this.oldData = JSON.parse(JSON.stringify(data.info))
+          let newArr = data.info ? data.info : data.form.data
-          var arr = []
+          this.oldData = JSON.parse(JSON.stringify(newArr))
-          data.info.forEach(item => {
+          let arr = []
+          newArr.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }

src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue

@@ -496,9 +496,10 @@ export default {
           this.form.endTime = data.endTime || data.form.endTime;
           this.form.textType = data.textType || data.form.textType
           this.form.modelList = data.modelList || data.form.modelList
-          this.oldData = JSON.parse(JSON.stringify(data.info))
+          let newArr = data.info ? data.info : data.form.data
-          var arr = []
+          this.oldData = JSON.parse(JSON.stringify(newArr))
-          data.info.forEach(item => {
+          let arr = []
+          newArr.forEach(item => {
             if (item.state != '3') {
               arr.push(item)
             }

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue

@@ -17,6 +17,11 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item v-show="fbNode" 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 label="中文名称" prop="standName" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.standName"
@@ -68,10 +73,9 @@
           <!--                                            clearable-->
           <!--                                    ></el-input>-->
           <!--                                </el-form-item>-->
-          <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+          <el-form-item v-show="fbNode" label="企业标准号" prop="standCode" class="add-form-item form-item-disabled">
             <el-input
-                    v-model="form.standEnName"
+                    v-model="form.standCode" :disabled="disabledState"
-                    placeholder="请输入英文名称"
                     clearable
             ></el-input>
           </el-form-item>
@@ -82,6 +86,13 @@
                            value-format="yyyy-MM-dd"
             ></el-datePicker>
           </el-form-item>
+          <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standEnName"
+                    placeholder="请输入英文名称"
+                    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"-->
           <!--                         :editable="false"-->
@@ -114,7 +125,7 @@
               <div style="width: 80%;">
                 <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;">
+                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
                 </div>
@@ -142,7 +153,7 @@
               <div style="width: 80%;">
                 <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;">
+                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
                 </div>
@@ -172,7 +183,7 @@
               <div style="width: 80%;">
                 <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;">
+                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
                 </div>
@@ -200,7 +211,7 @@
               <div style="width: 80%;">
                 <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;">
+                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
                 </div>
@@ -254,15 +265,15 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="关联模块&#45;&#45;乘用车VPPS中文名称" title="关联模块&#45;&#45;乘用车VPPS中文名称" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
+<!--            <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" title="关联模块&#45;&#45;卡车VPPS编码" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
+<!--            <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>
+<!--            <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
           </el-form-item>
@@ -298,15 +309,15 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="关联模块&#45;&#45;乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+<!--            <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable :disabled="true"></el-input>
+<!--            <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块&#45;&#45;卡车VPPS编码" clearable :disabled="true"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>
+<!--            <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
         </el-col>
       </el-row>
     </div>
@@ -330,33 +341,33 @@
                     @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
             >{{'手动查找'}}</el-button>
           </el-form-item>
-          <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+          <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
             <el-input
-                    disabled
+                    v-model="form.CYBZ"
-                    style="display: none;"
+                    placeholder="请输入采用标准"
-                    v-model="form.GLWJBUSSName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <el-button
-              <div style="width: 80%;">
+                    type="primary"
-                <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                    class="common-button-primary"
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                    size="mini"
-                  <span style="width: 20%;margin-left: 15px;">
+                    style="position:absolute;top: 10px;right: 0;"
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    @click="selectLaws('CYBZ'),config.attrName = '采用标准'"
-                  </span>
+            >{{'手动查找'}}</el-button>
-                </div>
+          </el-form-item>
-              </div>
+          <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
-              <div style="width: 20%;">
+            <el-input
-                <el-button
+                    v-model="form.YYBZ"
-                        type="primary"
+                    placeholder="请输入引用标准"
-                        class="common-button-primary"
+                    clearable
-                        size="mini"
+            ></el-input>
-                        style="margin-left: 10px; margin-top: 11px; float: right;"
+            <el-button
-                        @click="fileUpload('GLWJBUSS')">
+                    type="primary"
-                  <i class="el-icon-upload"></i>
+                    class="common-button-primary"
-                </el-button>
+                    size="mini"
-              </div>
+                    style="position:absolute;top: 10px;right: 0;"
-            </div>
+                    @click="selectLaws('YYBZ'),config.attrName = '引用标准'"
+            >{{'手动查找'}}</el-button>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -382,9 +393,178 @@
                     :disabled="true"
             ></el-input>
           </el-form-item>
+          <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+            <el-select v-model="form.CBCD" filterable clearable
+                       placeholder="请先选择采标程度"
+            >
+              <el-option
+                      v-for="item in cbcdOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+            <el-input
+                    disabled
+                    style="display: none;"
+                    v-model="form.GLWJBUSSName"
+                    clearable
+            ></el-input>
+            <div style="display: flex;justify-content: space-between">
+              <div style="width: 80%;">
+                <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;" v-if="item.id !== ''">
+                        <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
+                        type="primary"
+                        class="common-button-primary"
+                        size="mini"
+                        style="margin-left: 10px; margin-top: 11px; float: right;"
+                        @click="fileUpload('GLWJBUSS')">
+                  <i class="el-icon-upload"></i>
+                </el-button>
+              </div>
+            </div>
+          </el-form-item>
         </el-col>
       </el-row>
     </div>
+    <ProcessTitle v-show="opinionsShow">
+      <template slot="title">意见信息</template>
+    </ProcessTitle>
+    <div class="prc-content-border" v-show="opinionsShow">
+      <el-table
+              ref="selection"
+              tooltip-effect="dark"
+              style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;border-bottom: 1px solid #EBEEF5;"
+              :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+                                        fontWeight: 'bold', height: '48px'}"
+              row-key="id"
+              :data="form.infoList"
+              border
+              default-expand-all>
+        <el-table-column
+                label="序号"
+                min-width="5%"
+                align="center">
+          <template slot-scope="scope">
+            {{scope.$index + 1}}
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="modelNum"
+                label="条款号"
+                min-width="8%"
+                align="center"
+        >
+        </el-table-column>
+        <el-table-column
+                prop="modelUpdBefore"
+                label="修改前"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="modelUpdAfter"
+                label="修改后"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled"  placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="modelContent"
+                label="修改理由"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled"  placeholder="请填写修改理由"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="zrDeptIdName"
+                label="提出部门"
+                align="center"
+                min-width="15%">
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrDeptIdName" disabled  placeholder="请选择提出人自动带入部门"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="zrUserIdName"
+                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="请选择责任人" disabled />-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+        </el-table-column>
+        <el-table-column
+                label="意见是否采纳"
+                min-width="15%"
+                align="center">
+          <template slot-scope="scope">
+            {{filterOp(scope.row.opinionsAdopted)}}
+            <!--            <el-form-item-->
+            <!--                    style="margin-left: 0;margin-bottom:0;"-->
+            <!--            >-->
+            <!--              <el-select style="margin-left: -223px;" v-model="scope.row.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>-->
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="opinionsAdoptedCont"
+                label="采纳理由"
+                align="center"
+                min-width="15%">
+          <!--                  <template slot-scope="scope">-->
+          <!--                      <el-form-item-->
+          <!--                              style="margin-left: 0;margin-bottom:0;"-->
+          <!--                      >-->
+          <!--                          <el-input v-model="scope.row.opinionsAdoptedCont" clearable  placeholder="请选择提出人自动带入部门"/>-->
+          <!--                      </el-form-item>-->
+          <!--                  </template>-->
+        </el-table-column>
+      </el-table>
+    </div>
   </form>
 </template>
 
@@ -423,6 +603,14 @@
         type: Array,
         required: true
       },
+      summaryFileListSub: {
+        type: Array,
+        required: false
+      },
+      madelSubListSub: {
+        type: Array,
+        required: false
+      },
       disabledState: {
         type: Boolean,
         default: false
@@ -431,10 +619,18 @@
         type: Boolean,
         default: false
       },
+      fbNode: {
+        type: Boolean,
+        default: false
+      },
       fileMadelSub: {
         type: Boolean,
         default: false
       },
+      opinionsShow: {
+        type: Boolean,
+        default: false
+      },
       fbgDown: {
         type: Boolean,
         default: false
@@ -476,6 +672,8 @@
         LSBBBUSSFileList: [],
         QTWJBUSSFileList: [],
         GLWJBUSSFileList: [],
+        summaryFileList: [],
+        madelSubList: [],
         countryOptions:[],//国家地区
         standSortOptions: [], // 标准类别
         standNatureOptions: [], // 标准性质
@@ -514,6 +712,16 @@
       ...mapGetters(['userInfo'])
     },
     methods: {
+      filterOp(data){
+        if(!data){
+          return  ""
+        }
+        const map = new Map();
+        map.set("1","采纳");
+        map.set("2","部分采纳");
+        map.set("3","不采纳");
+        return map.get(data)
+      },
       choiceZRR1(type, title, id) {
         this.$emit('formChoiceZRR1',type,title,id)
       },
@@ -587,10 +795,14 @@
           case 'GLWJBUSS':
             this.fileList=this.GLWJBUSSFileList
             break;
+          case 'madelSub':
+            this.fileList=this.madelSubList
+            break;
           default : ;
         }
         this.fileMadel = true;
-        this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType);
+        console.log(this.madelSubList)
+        this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList);
       },
       filePreview(){
         this.$preview(this.fileId)
@@ -647,11 +859,14 @@
     },
     mounted () {
       this.form = this.formSub,
-              this.FBGBUSSFileList= this.FBGBUSSFileListSub,
+              console.log(this.form)
+      this.FBGBUSSFileList= this.FBGBUSSFileListSub,
               this.BZSMBUSSFileList= this.BZSMBUSSFileListSub,
               this.LSBBBUSSFileList= this.LSBBBUSSFileListSub,
               this.QTWJBUSSFileList= this.QTWJBUSSFileListSub,
               this.GLWJBUSSFileList= this.GLWJBUSSFileListSub,
+              this.summaryFileList= this.summaryFileListSub,
+              this.madelSubList= this.madelSubListSub,
               this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this
               }, res => {
@@ -680,6 +895,7 @@
                 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
                 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
                 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+                this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
                 this.setMap(this.standStateOptions)
               })
       this.busVsFunc()
@@ -689,7 +905,7 @@
       form: {
         handler: function (val) {
           if(val){
-            this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel);
+            this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.madelSubList);
           }
         },
         deep: true //对象的深度验证

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue

@@ -32,6 +32,7 @@
           <!--                                    ></el-option>-->
           <!--                                </el-select>-->
           <!--                            </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"-->
@@ -58,16 +59,16 @@
           <!--                                        clearable-->
           <!--                                ></el-input>-->
           <!--                            </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 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="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="standYear" class="add-form-item form-item-disabled">-->
           <!--                                <el-input v-model="form.standYear" :disabled="disabledState"-->
           <!--                                          clearable></el-input>-->
@@ -93,42 +94,54 @@
       <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)">
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <!-- {{ value.name }} -->
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-              {{value.name}}
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-            </div>
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-            <div v-else>
+                  </span>
-              - -
             </div>
+            <!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </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)">
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <!-- {{ value.name }} -->
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-              {{value.name}}
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-            </div>
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-            <div v-else>
+                  </span>
-              - -
             </div>
+            <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </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)">
+            <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <!-- {{ value.name }} -->
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-              {{value.name}}
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-            </div>
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-            <div v-else>
+                  </span>
-              - -
             </div>
+            <!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </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)">
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-              <!-- {{ value.name }} -->
+              <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
-              {{value.name}}
+              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
-            </div>
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
-            <div v-else>
+                  </span>
-              - -
             </div>
+            <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
           </el-form-item>
         </el-col>
       </el-row>
@@ -159,22 +172,22 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="关联模块&#45;&#45;乘用车VPPS中文名称" title="关联模块&#45;&#45;乘用车VPPS中文名称" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.CYCVPPSBMBUSS"  :disabled="disabledState"></el-input>
+<!--            <el-input v-model="form.CYCVPPSBMBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" title="关联模块&#45;&#45;卡车VPPS编码" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
+<!--            <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+<!--            <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>-->
-          </el-form-item>
+<!--          </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-col>
         <el-col :span="12">
           <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-            <el-input v-model="form.QCRBUSS"  :disabled="disabledState" clearable></el-input>
+            <el-input v-model="form.QCRBUSS"  :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
           </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>
@@ -196,15 +209,15 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="关联模块&#45;&#45;乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.CYCVPPSCNBUSS" clearable :disabled="true"></el-input>
+<!--            <el-input v-model="form.CYCVPPSCNBUSS" clearable :disabled="true"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
+<!--            <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
-          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-            <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
+<!--            <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>-->
-          </el-form-item>
+<!--          </el-form-item>-->
         </el-col>
       </el-row>
     </div>
@@ -220,14 +233,17 @@
                     clearable
             ></el-input>
           </el-form-item>
-          <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+          <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
-            <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <el-input
-              <!-- {{ value.name }} -->
+                    v-model="form.CYBZ" :disabled="disabledState"
-              {{value.name}}
+                    clearable
-            </div>
+            ></el-input>
-            <div v-else>
+          </el-form-item>
-              - -
+          <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
-            </div>
+            <el-input
+                    v-model="form.YYBZ" :disabled="disabledState"
+                    clearable
+            ></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -244,6 +260,28 @@
                     :disabled="true"
             ></el-input>
           </el-form-item>
+          <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+            <el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState"  multiple>
+              <el-option
+                      v-for="item in cbcdOptions"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+            <div v-if="GLWJBUSSFileList.length > 0" 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;" v-if="item.id !== ''">
+                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                  </span>
+            </div>
+            <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+            <!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+            <!--            {{value.name}}-->
+            <!--          </div>-->
+          </el-form-item>
         </el-col>
       </el-row>
     </div>
@@ -263,76 +301,118 @@
               default-expand-all>
         <el-table-column
                 label="序号"
-                min-width="15%"
+                min-width="5%"
                 align="center">
           <template slot-scope="scope">
             {{scope.$index + 1}}
           </template>
         </el-table-column>
         <el-table-column
-                prop="userName"
+                prop="modelNum"
-                label="会签人"
+                label="条款号"
+                min-width="8%"
+                align="center"
+        >
+        </el-table-column>
+        <el-table-column
+                prop="modelUpdBefore"
+                label="修改前"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="modelUpdAfter"
+                label="修改后"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled"  placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="modelContent"
+                label="修改理由"
+                align="center"
+                min-width="20%">
+          <!--              <template slot-scope="scope">-->
+          <!--                  <el-form-item-->
+          <!--                          style="margin-left: 0;margin-bottom:0;"-->
+          <!--                  >-->
+          <!--                      <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled"  placeholder="请填写修改理由"/>-->
+          <!--                  </el-form-item>-->
+          <!--              </template>-->
+        </el-table-column>
+        <el-table-column
+                prop="zrDeptIdName"
+                label="提出部门"
                 align="center"
                 min-width="15%">
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrDeptIdName" disabled  placeholder="请选择提出人自动带入部门"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
         </el-table-column>
         <el-table-column
-                prop="commentText"
+                prop="zrUserIdName"
-                label="会签意见"
+                label="责任人"
-                min-width="35%"
+                min-width="15%"
                 align="center">
-        </el-table-column>
+          <!--                                <template slot-scope="scope">-->
-        <el-table-column
+          <!--                                    <el-form-item-->
-                prop="commentText"
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
-                label="会签意见文件"
+          <!--                                    >-->
-                min-width="35%"
+          <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
-                align="left">
+          <!--                                    </el-form-item>-->
-          <template slot-scope="scope">
+          <!--                                </template>-->
-            <el-form-item
-                    style="margin-left: 0;margin-bottom:0;"
-            >
-              <div  v-if="scope.row.summaryList.length>0" v-for="(value,index)  in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                <!-- {{ value.name }} -->
-                {{value.name | ellipsis}}
-              </div>
-              <div v-else>
-                - -
-              </div>
-            </el-form-item>
-          </template>
         </el-table-column>
         <el-table-column
                 label="意见是否采纳"
                 min-width="15%"
                 align="center">
           <template slot-scope="scope">
-            <el-form-item
+            {{filterOp(scope.row.opinionsAdopted)}}
-                    style="margin-left: 0;margin-bottom:0;"
+            <!--            <el-form-item-->
-            >
+            <!--                    style="margin-left: 0;margin-bottom:0;"-->
-              <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
+            <!--            >-->
-                <el-option
+            <!--              <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">-->
-                        v-for="item in opinionsAdoptedOptions"
+            <!--                <el-option-->
-                        :key="item.value"
+            <!--                        v-for="item in opinionsAdoptedOptions"-->
-                        :value="item.value"
+            <!--                        :key="item.value"-->
-                        :label="item.label"
+            <!--                        :value="item.value"-->
-                ></el-option>
+            <!--                        :label="item.label"-->
-              </el-select>
+            <!--                ></el-option>-->
-            </el-form-item>
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
           </template>
         </el-table-column>
+        <el-table-column
+                prop="opinionsAdoptedCont"
+                label="采纳理由"
+                align="center"
+                min-width="15%">
+          <!--                  <template slot-scope="scope">-->
+          <!--                      <el-form-item-->
+          <!--                              style="margin-left: 0;margin-bottom:0;"-->
+          <!--                      >-->
+          <!--                          <el-input v-model="scope.row.opinionsAdoptedCont" clearable  placeholder="请选择提出人自动带入部门"/>-->
+          <!--                      </el-form-item>-->
+          <!--                  </template>-->
+        </el-table-column>
       </el-table>
-<!--      <el-row :gutter="24">-->
-<!--        <el-col :span="12">-->
-<!--          <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">-->
-<!--            <div  v-if="summaryFileList.length>0" v-for="(value,index)  in this.summaryFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
-<!--              &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
-<!--              {{value.name}}-->
-<!--            </div>-->
-<!--            <div v-else>-->
-<!--              - - -->
-<!--            </div>-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-<!--      </el-row>-->
     </div>
   </form>
 </template>
@@ -388,6 +468,10 @@
         type: Boolean,
         default: false
       },
+      fileShow: {
+        type: Boolean,
+        default: false
+      },
     },
     filters: {
       ellipsis (value) {
@@ -402,7 +486,8 @@
       return {
         opinionsAdoptedOptions:[
           {value: '1',label: '采纳'},
-          {value: '2',label: '不采纳'},
+          {value: '2',label: '部分采纳'},
+          {value: '3',label: '不采纳'},
         ],
         countryOptions:[],//国家地区
         standSortOptions: [], // 标准类别
@@ -442,6 +527,34 @@
       ...mapGetters(['userInfo'])
     },
     methods: {
+      filterOp(data){
+        if(!data){
+          return  ""
+        }
+        const map = new Map();
+        map.set("1","采纳");
+        map.set("2","部分采纳");
+        map.set("3","不采纳");
+        return map.get(data)
+      },
+      // 文件预览及下载
+      handleFilePreview(file,type) {
+        let attId = ""
+        if(file && file.id){
+          attId = file.id
+        }else {
+          attId = file.response.data.id
+        }
+        if (type === 'down') {
+          if (attId) {
+            window.open('/api/att/attFile/downloadFileForSar?fileId=' + attId)
+          } else {
+            this.$message.warning('文件不存在,下载失败')
+          }
+        } else {
+          this.$preview(attId)
+        }
+      },
       downloadFile (data) {
         //文件id中出现了','字符,去除掉
         window.open('/api/att/attFile/downloadFileForSar?fileId=' + data.id)
@@ -470,6 +583,8 @@
       },
     },
     mounted () {
+      console.log(this.form.infoList)
+      console.log(this.form)
       this.$http.get('sys/dictype/getDicTypeListCode', '', {
         _this: this
       }, res => {
@@ -498,6 +613,7 @@
         this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
         this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
         this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+        this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
         this.setMap(this.standStateOptions)
       })
       this.busVsFunc()

src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue

@@ -179,7 +179,7 @@
                               </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
+                                <el-form-item label="修改单" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
                                     <el-input
                                             disabled
                                             style="display: none;"
@@ -262,15 +262,15 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="关联模块&#45;&#45;乘用车VPPS中文名称" title="关联模块&#45;&#45;乘用车VPPS中文名称" class="add-form-item form-item-disabled">-->
-                                    <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
+<!--                                    <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" title="关联模块&#45;&#45;卡车VPPS编码" class="add-form-item form-item-disabled">-->
-                                    <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
+<!--                                    <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">-->
-                                    <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>
+<!--                                    <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
                                     <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
                                 </el-form-item>
@@ -306,15 +306,15 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="关联模块&#45;&#45;乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
-                                    <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+<!--                                    <el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="关联模块&#45;&#45;卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">-->
-                                    <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable :disabled="true"></el-input>
+<!--                                    <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块&#45;&#45;卡车VPPS编码" clearable :disabled="true"></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
-                                <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
-                                    <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>
+<!--                                    <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                             </el-col>
                         </el-row>
                     </div>
@@ -598,23 +598,23 @@
                             <el-timeline-item timestamp="发布" prop="bussUser13Name" placement="top" :color="roleForm.bussUser13Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser13Name" style="margin-bottom: 0">
-                                        <h4>总院标准法规部产品标准工程师/各事业部标准化员</h4>
+                                        <h4>总院标准法规部产品标准工程师</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser13Name" readonly="readonly" placeholder="选择总院标准法规部产品标准工程师/各事业部标准化员" @click.native="choiceZRR('bussUser13', '选择总院标准法规部产品标准工程师/各事业部标准化员', roleForm.bussUser13)"></el-input>
+                                            <el-input v-model="roleForm.bussUser13Name" readonly="readonly" placeholder="选择总院标准法规部产品标准工程师" @click.native="choiceZRR('bussUser13', '选择总院标准法规部产品标准工程师', roleForm.bussUser13)"></el-input>
-                                        </div>
-                                    </el-form-item>
-                                </el-card>
-                            </el-timeline-item>
-                            <el-timeline-item timestamp="抄送" prop="bussUser14Name" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">
-                                <el-card>
-                                    <el-form-item prop="bussUser14Name" style="margin-bottom: 0">
-                                        <h4>抄送人员</h4>
-                                        <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.bussUser14Name" readonly="readonly" placeholder="选择抄送人员" @click.native="choiceZRR('bussUser14', '选择标抄送人员', roleForm.bussUser14)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
+<!--                            <el-timeline-item timestamp="抄送" prop="bussUser14Name" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">-->
+<!--                                <el-card>-->
+<!--                                    <el-form-item prop="bussUser14Name" style="margin-bottom: 0">-->
+<!--                                        <h4>抄送人员</h4>-->
+<!--                                        <div style="margin-top: 10px;width: 300px;">-->
+<!--                                            <el-input v-model="roleForm.bussUser14Name" readonly="readonly" placeholder="选择抄送人员" @click.native="choiceZRR('bussUser14', '选择标抄送人员', roleForm.bussUser14)"></el-input>-->
+<!--                                        </div>-->
+<!--                                    </el-form-item>-->
+<!--                                </el-card>-->
+<!--                            </el-timeline-item>-->
                         </el-form>
                     </el-timeline>
                 </div>
@@ -968,6 +968,7 @@
         />
         <!-- 组件树-->
         <tree-select-new
+                :key="key"
                 :multiple=false
                 :lazy=false
                 :modalShowFlag="modalShowFlag1"
@@ -1670,6 +1671,10 @@
             //     }
             //     this.modalshowflag2 = true
             // },
+            unique(newArr) {
+                const res = new Map();
+                return newArr.filter((newArr) => !res.has(newArr) && res.set(newArr, 1));
+            },
             checkedRole2 (data) {
                 let idList = ''
                 let nameList = ''
@@ -1691,6 +1696,13 @@
                     this.form.QCRBUSSID=idList;
                     this.form.QCRBUSS=nameList;
                 }
+
+                if(data && data.length > 0){
+                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    this.form.QCDWID = institutionIdList
+                    this.form.QCDW = institutionNameList
+                }
             },
             checkedRole (data) {
                 if (this.type === 0) {
@@ -2643,7 +2655,6 @@
                                 this.isSubmit = true
                                 this.saveLoading = true
                                 this.form.country=this.countryArr;
-                                this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) +' X'
                                 var json = Object.assign(this.form, this.roleForm)
                                 json.zrUserId = this.form.zrUserId
                                 json.jlUserId = this.form.jlUserId

src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue

@@ -600,6 +600,7 @@
     </el-drawer>
     <!-- 组件树-->
     <tree-select-new
+            :key="key"
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
@@ -1293,6 +1294,13 @@
                     this.form.QCRBUSS=nameList;
                     this.formKey++
                 }
+
+                if(data && data.length > 0){
+                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    this.form.QCDWID = institutionIdList
+                    this.form.QCDW = institutionNameList
+                }
             },
             checkedRole (data) {
                 if (this.type === 0) {
@@ -1922,11 +1930,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);
+                // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
-                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
-                    this.$message.error('文件限制只可上传一个')
+                //     this.$message.error('文件限制只可上传一个')
-                    return false
+                //     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 {

src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue

@@ -7,7 +7,7 @@
     <div class="headerTabs">
 <!--        <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">会签评分</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 === '2' ? 'active' : ''" @click="handleTabs('2')">会签意见</div>
         <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
     </div>
     <div class="content">
@@ -30,7 +30,7 @@
                         :verifySarStandard = "verifySarStandard"></formList>
                 <div>
                     <el-collapse accordion v-model="activeName">
-                        <el-collapse-item title="会签意见" name = "1">
+                        <el-collapse-item title="审批意见" name = "1">
                             <div style="margin: 0;">
                                 <el-form
                                         ref="formTongGuo"
@@ -44,34 +44,34 @@
                                     <!--                        <el-option label="通过" value="0"></el-option>-->
                                     <!--                      </el-select>-->
                                     <!--                    </el-form-item>-->
-                                    <el-form-item label="会签意见文件" prop="summaryName" class="add-form-item form-item-disabled">
+                                    <!--                                    <el-form-item label="会签意见文件" prop="summaryName" class="add-form-item form-item-disabled">-->
-                                        <el-input
+                                    <!--                                        <el-input-->
-                                                disabled
+                                    <!--                                                disabled-->
-                                                style="display: none;"
+                                    <!--                                                style="display: none;"-->
-                                                v-model="form.summaryName"
+                                    <!--                                                v-model="form.summaryName"-->
-                                                clearable
+                                    <!--                                                clearable-->
-                                        ></el-input>
+                                    <!--                                        ></el-input>-->
-                                        <div style="display: flex;justify-content: left;margin-top: 5px;padding-left: 20px;">
+                                    <!--                                        <div style="display: flex;justify-content: left;margin-top: 5px;padding-left: 20px;">-->
-                                            <div style="width: 30%;">
+                                    <!--                                            <div style="width: 30%;">-->
-                                                <div v-for="(item,index) in summaryList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                                    <!--                                                <div v-for="(item,index) in summaryList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">-->
-                                                    <span style="width: 80%;" @click="handleFilePreview2(item,'preview')">{{ item.name }}</span>
+                                    <!--                                                    <span style="width: 80%;" @click="handleFilePreview2(item,'preview')">{{ item.name }}</span>-->
-                                                    <span style="width: 20%;margin-left: 15px;">
+                                    <!--                                                    <span style="width: 20%;margin-left: 15px;">-->
-                                                    <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview2(item,'down')"></el-button>
+                                    <!--                                                    <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview2(item,'down')"></el-button>-->
-                                                </span>
+                                    <!--                                                </span>-->
-                                                </div>
+                                    <!--                                                </div>-->
-                                            </div>
+                                    <!--                                            </div>-->
-                                            <div style="width: 20%;">
+                                    <!--                                            <div style="width: 20%;">-->
-                                                <el-button
+                                    <!--                                                <el-button-->
-                                                        type="primary"
+                                    <!--                                                        type="primary"-->
-                                                        class="common-button-primary"
+                                    <!--                                                        class="common-button-primary"-->
-                                                        size="mini"
+                                    <!--                                                        size="mini"-->
-                                                        style="margin-top: 6px; float: left;"
+                                    <!--                                                        style="margin-top: 6px; float: left;"-->
-                                                        @click="fileUpload('summary')">
+                                    <!--                                                        @click="fileUpload('summary')">-->
-                                                    <i class="el-icon-upload"></i>
+                                    <!--                                                    <i class="el-icon-upload"></i>-->
-                                                </el-button>
+                                    <!--                                                </el-button>-->
-                                            </div>
+                                    <!--                                            </div>-->
-                                        </div>
+                                    <!--                                        </div>-->
-                                    </el-form-item>
+                                    <!--                                    </el-form-item>-->
                                     <el-form-item
                                             prop="commentText"
                                     >
@@ -89,85 +89,133 @@
                     </el-collapse>
                 </div>
             </div>
-<!--            <div class="block" id="active2" v-show="active === '2'">-->
+            <div class="block" id="active3" v-show="active === '2'">
-<!--                <ProcessTitle>-->
+                <ProcessTitle>
-<!--                    <template slot="title">模块信息</template>-->
+                    <template slot="title">条款信息</template>
-<!--                </ProcessTitle>-->
+                </ProcessTitle>
-<!--                <template>-->
+                <template>
-<!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
+                    <div class="prc-content-border" style="height: 66vh;position: relative;">
-<!--                        <div class="action-bar">-->
+                        <div class="action-bar">
-<!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
+                            <!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
-<!--                                批量编辑-->
+                            <!--                                批量编辑-->
-<!--                            </el-button>-->
+                            <!--                            </el-button>-->
-<!--                            <el-button-->
+                            <el-button
-<!--                                    type="primary"-->
+                                    type="primary"
-<!--                                    size="mini"-->
+                                    size="mini"
-<!--                                    class="common-button-primary add-button"-->
+                                    class="common-button-primary add-button"
-<!--                                    @click="createRow"-->
+                                    @click="createRow"
-<!--                            >创建模块</el-button>-->
+                            >创建条款</el-button>
-<!--                        </div>-->
+                        </div>
-<!--                        <el-table-->
+                        <el-table
-<!--                                ref="selection"-->
+                                ref="selection"
-<!--                                tooltip-effect="dark"-->
+                                tooltip-effect="dark"
-<!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
+                                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',-->
+                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-<!--                                        fontWeight: 'bold', height: '48px'}"-->
+                                        fontWeight: 'bold', height: '48px'}"
-<!--                                @selection-change="handleSelectionChange"-->
+                                @selection-change="handleSelectionChange"
-<!--                                row-key="id"-->
+                                row-key="id"
-<!--                                :data="form.modelData"-->
+                                :data="form.modelData"
-<!--                                border-->
+                                border
-<!--                                default-expand-all-->
+                                default-expand-all>
-<!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+                            <!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
-<!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
+                            <el-table-column
-<!--                            <el-table-column-->
+                                    label="序号"
-<!--                                    prop="modelNum"-->
+                                    min-width="5%"
-<!--                                    label="序号"-->
+                                    align="center">
-<!--                                    min-width="15%"-->
+                                <template slot-scope="scope">
-<!--                                    align="center"-->
+                                    {{scope.$index + 1}}
-<!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+                                </template>
-<!--                            </el-table-column>-->
+                            </el-table-column>
-<!--                            <el-table-column-->
+                            <el-table-column
-<!--                                    label="名称"-->
+                                    prop="modelNum"
-<!--                                    align="center"-->
+                                    label="条款号"
-<!--                                    min-width="30%">-->
+                                    min-width="12%"
-<!--                                <template slot-scope="scope">-->
+                                    align="center"
-<!--                                    <el-form-item-->
+                            >
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
+                                <template slot-scope="scope">
-<!--                                    >-->
+                                    <el-input v-model="scope.row.modelNum" :title="scope.row.modelNum" placeholder="请填写条款号"/>
-<!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
+                                </template>
-<!--                                    </el-form-item>-->
+                            </el-table-column>
-<!--                                </template>-->
+                            <el-table-column
-<!--                            </el-table-column>-->
+                                    label="修改前"
-<!--                            <el-table-column-->
+                                    align="center"
-<!--                                    label="责任人"-->
+                                    min-width="20%">
-<!--                                    min-width="15%"-->
+                                <template slot-scope="scope">
-<!--                                    align="center">-->
+                                    <el-form-item
-<!--                                <template slot-scope="scope">-->
+                                            style="margin-left: 0;margin-bottom:0;"
-<!--                                    <el-form-item-->
+                                    >
-<!--                                            style="margin-left: 0;margin-bottom:0;"-->
+                                        <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请填写章节修改前内容"/>
-<!--                                    >-->
+                                    </el-form-item>
-<!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
+                                </template>
-<!--                                    </el-form-item>-->
+                            </el-table-column>
-<!--                                </template>-->
+                            <el-table-column
-<!--                            </el-table-column>-->
+                                    label="修改后"
-<!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
+                                    align="center"
-<!--                                <template slot-scope="scope">-->
+                                    min-width="20%">
-<!--                                    <div @click.stop style="display: inline-block">-->
+                                <template slot-scope="scope">
-<!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
+                                    <el-form-item
-<!--                                            <i class="iconfont">&#xe61e;</i>-->
+                                            style="margin-left: 0;margin-bottom:0;"
-<!--                                            <el-dropdown-menu slot="dropdown">-->
+                                    >
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
+                                        <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled"  placeholder="请填写章节修改后内容"/>
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
+                                    </el-form-item>
-<!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
+                                </template>
-<!--                                            </el-dropdown-menu>-->
+                            </el-table-column>
-<!--                                        </el-dropdown>-->
+                            <el-table-column
-<!--                                    </div>-->
+                                    label="修改理由"
-<!--                                </template>-->
+                                    align="center"
-<!--                            </el-table-column>-->
+                                    min-width="20%">
-<!--                        </el-table>-->
+                                <template slot-scope="scope">
-<!--                    </div>-->
+                                    <el-form-item
-<!--                </template>-->
+                                            style="margin-left: 0;margin-bottom:0;"
-<!--            </div>-->
+                                    >
+                                        <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled"  placeholder="请填写修改理由"/>
+                                    </el-form-item>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    prop="zrDeptIdName"
+                                    label="提出部门"
+                                    align="center"
+                                    min-width="15%">
+                                <!--                                <template slot-scope="scope">-->
+                                <!--                                    <el-form-item-->
+                                <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+                                <!--                                    >-->
+                                <!--                                        <el-input v-model="scope.row.zrDeptIdName" disabled  placeholder="请选择提出人自动带入部门"/>-->
+                                <!--                                    </el-form-item>-->
+                                <!--                                </template>-->
+                            </el-table-column>
+                            <el-table-column
+                                    prop="zrUserIdName"
+                                    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="请选择责任人" disabled />-->
+                                <!--                                    </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
@@ -694,6 +742,8 @@
                 prcNum: this.$route.query.prcNum,
                 prcName: this.$route.query.prcName,
                 detailData: [],
+                summary:'',
+                summaryName:'',
                 fileList: [],
                 summaryList: [],
                 FBGBUSSFileList: [],
@@ -833,6 +883,9 @@
                 countryArr:'',
                 commentCycleDate:'',
                 form: {
+                    planId:'',
+                    planStatus:'',
+                    reviseStatus:'',
                     evaluationData:[],
                     modelData:[],
                     modelDataNameVerify:[],
@@ -870,6 +923,12 @@
                     TXLBBUSS: '',
                     VPPSBMBUSS: '',
                     VPPSCNBUSS: '',
+                    KCVPPSBMBUSS: '',
+                    KCVPPSCNBUSS: '',
+                    CYCVPPSBMBUSS: '',
+                    CYCVPPSCNBUSS: '',
+                    DYBXHBUSS: '',
+                    DYMCBUSS: '',
                     // 关联信息
                     DTQBBHBUSS: '',
                     BDTQBBHBUSS: '',
@@ -878,6 +937,10 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
+                    CBCD:'',
+                    CYBZ:'',
+                    YYBZ:'',
+                    standNum:'',
                 }, // 标准信息
                 roleForm:{
                     hzUserId: this.$store.getters.userInfo.userId,
@@ -886,6 +949,8 @@
                     xdUserName: this.$store.getters.userInfo.userName,
                     pxUserId: this.$store.getters.userInfo.userId,
                     pxUserName: this.$store.getters.userInfo.userName,
+                    fbUserId: '',
+                    fbUserName: '',
                     qcUserId: '', // 多实例
                     qcUserName:'', // 多实例
                     bzhUserId:'',
@@ -990,6 +1055,9 @@
                     issueTime: [
                         { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
+                    putTime: [
+                        { required: true, message: '请选择企标实施日期', trigger: 'change' }
+                    ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
                     ],
@@ -1190,6 +1258,16 @@
                     row.disabled = true
                 }
             },
+            modelNameFunc1(row){
+                if(row.modelUpdateBefore && row.modelUpdateBefore !== ''){
+                    row.disabled1 = true
+                }
+            },
+            modelNameFunc2(row){
+                if(row.modelUpdateAfter && row.modelUpdateAfter !== ''){
+                    row.disabled2 = true
+                }
+            },
             //判断是否可选
             checkSelect (row,index) {
                 let isChecked = true;
@@ -1201,8 +1279,6 @@
                 return isChecked
             },
             handleDelete(val, row) {
-                console.log(row)
-                console.log(this.form.modelData)
                 // 模态框删除按钮
                 this.$confirm("是否确认删除本条数据?", "提示", {
                     confirmButtonText: "确定",
@@ -1210,10 +1286,10 @@
                     type: "info"
                 }).then(() => {
                     // 此为假删除，只是删除了模态框中当前行的数据，并没有真正删除表格数据
-                    const ids = []
+                    // const ids = []
-                    ids.push(row.id)
+                    // ids.push(row.id)
-                    this.form.modelData = this.changeRestTree(this.deletedId(this.form.modelData,ids))
+                    // this.form.modelData = this.changeRestTree(this.deletedId(this.form.modelData,ids))
-                    console.log(this.form.modelData)
+                    this.form.modelData.splice(val,1)
                     this.$message({
                         message: "删除成功",
                         type: "success",
@@ -1240,19 +1316,54 @@
                 // }
                 const list = {
                     id: this.form.modelData.length + 1,
-                    modelNum: this.form.modelData.length + 1+'',
+                    modelNum: '',
                     orderNum: this.form.modelData.length + 1, // orderNum为新创建行的索引
                     pid: '0',
                     modelIndex: this.form.modelData.length,
-                    disabled: false,
+                    disabled1: false,
+                    disabled2: false,
                     modelName: "",
+                    modelUpdBefore: "",
+                    modelUpdAfter: "",
                     modelContent: "",
-                    zrUserId:"",
+                    zrUserId:this.$store.getters.userInfo.userId,
-                    zrUserIdName:"",
+                    zrUserIdName:this.$store.getters.userInfo.userName,
+                    zrDeptId:this.$store.getters.userInfo.institutionId,
+                    zrDeptIdName:this.$store.getters.userInfo.institutionName,
                     children:[],
                 };
                 this.form.modelData.push(list);
             },
+            // createRow() {
+            //     // 创建行
+            //     // if (this.diaTable.length >= 6) { // 判断当前表格是否可继续创建
+            //     //     this.$message({
+            //     //         message: "超出数量，无法创建",
+            //     //         type: "info",
+            //     //         duration: 2000
+            //     //     });
+            //     //     return false;
+            //     // }
+            //     const list = {
+            //         id: this.form.modelData.length + 1,
+            //         modelNum: this.form.modelData.length + 1+'',
+            //         orderNum: this.form.modelData.length + 1, // orderNum为新创建行的索引
+            //         pid: '0',
+            //         modelIndex: this.form.modelData.length,
+            //         disabled1: false,
+            //         disabled2: false,
+            //         modelName: "",
+            //         modelUpdBefore: "",
+            //         modelUpdAfter: "",
+            //         modelContent: "",
+            //         zrUserId:this.$store.getters.userInfo.userId,
+            //         zrUserIdName:this.$store.getters.userInfo.userName,
+            //         zrDeptId:this.$store.getters.userInfo.institutionId,
+            //         zrDeptIdName:this.$store.getters.userInfo.institutionName,
+            //         children:[],
+            //     };
+            //     this.form.modelData.push(list);
+            // },
             createChildRow(index,row) {
                 // 创建行
                 // if (this.diaTable.length >= 6) { // 判断当前表格是否可继续创建
@@ -1269,14 +1380,20 @@
                     orderNum: row.children.length + 1, // orderNum为新创建行的索引
                     pid: row.modelNum,
                     modelIndex: row.children.length,
-                    disabled: false,
+                    disabled1: false,
+                    disabled2: false,
                     modelName: "",
+                    modelUpdBefore: "",
+                    modelUpdAfter: "",
                     modelContent: "",
-                    zrUserId:"",
+                    zrUserId:this.$store.getters.userInfo.userId,
-                    zrUserIdName:"",
+                    zrUserIdName:this.$store.getters.userInfo.userName,
+                    zrDeptId:this.$store.getters.userInfo.institutionId,
+                    zrDeptIdName:this.$store.getters.userInfo.institutionName,
                     children:[],
                 };
-                row.children.push(list)
+                // row.children.push(list)
+                row.push(list)
             },
             dateFormatter () {
                 //默认返回yyyy-MM-dd HH-mm-ss
@@ -1374,7 +1491,7 @@
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                         this.summaryList=this.assemble(mes.summary,mes.summaryName);
                         this.roleForm = mes.roleForm
-                        this.commentText = mes.commentText
+                        this.formTongGuo.commentText = mes.commentText
                     })
                 }else {
                     this.form.XCSJBUSS = this.dateFormatter()
@@ -1961,6 +2078,23 @@
                     })
                 })
             },
+            handleFilePreview2(file,type) {
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
+                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
@@ -1993,7 +2127,7 @@
             importFileSuccess (response, file,fileList) {
                 // 上传成功后判断是否是两条数据是的话替换掉旧数据
                 // if (fileList.length > 1) {
-                //   this.fileList = fileList.splice(0, 1)
+                //     fileList = fileList.splice(0, 1)
                 // }
                 if (response.ok) {
                     const fileObj = {}
@@ -2189,6 +2323,7 @@
                 // if(item.country !== undefined && item.country !== null){
                 //   this.sarStandardsInfoEO.country = item.country.split(",");
                 // }
+
                 this.summary=this.summaryList.map(item => item.id).join(",")
                 this.summaryName=this.summaryList.map(item => item.name).join(",")
 
@@ -2198,12 +2333,15 @@
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
                 _formData.append('prcType', 'buss2')
-                _formData.append('prcName', '企标制修订-产品标准')
+                _formData.append('prcName', '企标制修订-技术标准')
                 _formData.append('json', JSON.stringify({
+                    prcNum:this.prcNum,
+                    summary: this.summary,
+                    summaryName: this.summaryName,
                     taskInfo: this.taskInfo,
                     form: this.form,
                     roleForm: this.roleForm,
-                    commentText: this.commentText
+                    commentText: this.formTongGuo.commentText
                 }))
                 saveTaskFirst(_formData).then(res => {
                     this.saveLoading = false
@@ -2306,7 +2444,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
@@ -2318,57 +2456,46 @@
                 //     this.form.country = []
                 // }
                 this.$refs['form'].validate((valid) => {
-                        if (valid) {
+                    if (valid) {
-                            this.$refs['formTongGuo'].validate((valid) => {
+                        this.$refs['formTongGuo'].validate((valid) => {
-                                if (valid) {
+                            if (valid) {
-                                    this.isSubmit = true
+                                this.isSubmit = true
-                                    this.saveLoading = true
+                                this.saveLoading = true
 
-                                    this.summary=this.summaryList.map(item => item.id).join(",")
+                                this.summary=this.summaryList.map(item => item.id).join(",")
-                                    this.summaryName=this.summaryList.map(item => item.name).join(",")
+                                this.summaryName=this.summaryList.map(item => item.name).join(",")
 
-                                    this.form.commentText = this.formTongGuo.commentText
+                                this.form.commentText = this.formTongGuo.commentText
-                                    this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                                    // 会签意见存储
+                                // 会签意见存储
-                                    const infoList = []
+                                const json = JSON.stringify(this.form);
-                                    const maryList=this.assemble(this.summary,this.summaryName);
+                                this.$http.post('lawss/activiti/completeTask', {
-                                    const info = {}
+                                    taskIds: this.taskIds,
-                                    info.userId = this.userId
+                                    userId : this.userId,
-                                    info.userName = this.userName
+                                    json: json
-                                    info.commentText = this.formTongGuo.commentText
+                                }, {
-                                    info.summary = this.summary
+                                    _this: this
-                                    info.summaryName = this.summaryName
+                                }, res => {
-                                    info.summaryList = maryList
+                                    if (res.success) {
-                                    infoList.push(info)
+                                        this.$message.success(res.message)
-                                    this.form.infoList = infoList
+                                        // 流程提交之后，应该流转至待办任务页面
-                                    const json = JSON.stringify(this.form);
+                                        this.isSubmit = false
-                                    this.$http.post('lawss/activiti/completeTask', {
+                                        this.saveLoading = false
-                                        taskIds: this.taskIds,
+                                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                        userId : this.userId,
+                                        // if(this.formTongGuo.approvalOpinion === '1'){
-                                        json: json
+                                        //     this.$message.warning("驳回成功")
-                                    }, {
+                                        //     this.isSubmit = false
-                                        _this: this
+                                        //     // 流程提交之后，应该流转至待办任务页面
-                                    }, res => {
+                                        //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                        if (res.success) {
+                                        // }else{
-                                            this.$message.success(res.message)
+                                        //     this.processCreateLaws(json)
-                                            // 流程提交之后，应该流转至待办任务页面
+                                        // }
-                                            this.isSubmit = false
+                                    }else {
-                                            this.saveLoading = false
+                                        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)
-                                        }
-                                    })
-                                }})
-                        }
                 })
             },
             busVsFunc(){
@@ -2401,7 +2528,7 @@
             getFormFieldList (item) {
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
-                    // this.getEvaluation()
+                    this.getEvaluation()
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
@@ -2409,12 +2536,13 @@
             },
             assemble(ids,names){
                 let list= new Array();
-                let idArray=ids.split(',');
+                if(ids && ids !== '' && names && names !== ''){
-                let nameArray=names.split(',');
+                    let idArray=ids.split(',');
-                for(let i=0; i<idArray.length; i++){
+                    let nameArray=names.split(',');
-                    list.push({id:idArray[i],name:nameArray[i]});
+                    for(let i=0; i<idArray.length; i++){
+                        list.push({id:idArray[i],name:nameArray[i]});
+                    }
                 }
-
                 return list;
             },
             getEvaluation() {
@@ -2463,7 +2591,6 @@
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
                                 this.summaryList=this.assemble(processForm.summary,processForm.summaryName);
-
                             }
                         }).catch(e => {
                         })
@@ -2502,6 +2629,7 @@
             },
         },
         mounted () {
+            console.log(this.$store.getters.userInfo)
             this.getTaskId()
             this.getData()
             this.processTable()
@@ -2556,6 +2684,10 @@
     /deep/ #active2 .el-form-item__content{
         margin-left: 0px !important;
     }
+
+    /deep/ #active3 .el-form-item__content{
+        margin-left: 0px !important;
+    }
     .bzrkStep1 {
         /deep/.el-drawer__container {
             .prc-content-border {

src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue

@@ -34,6 +34,10 @@
                         @formSelectLawsCancel = "formSelectLawsCancel"
                         @formChoiceZRRListCancel = "formChoiceZRRListCancel"
                         @formChoiceQCDW = "formChoiceQCDW"
+                        @formChoiceZRR1 = "formChoiceZRR1"
+                        @formChoiceZRR2 = "formChoiceZRR2"
+                        @formChoiceZRR3 = "formChoiceZRR3"
+                        @formChoiceZRR4 = "formChoiceZRR4"
                 />
                 <ProcessTitle>
                     <template slot="title">意见信息</template>
@@ -46,67 +50,112 @@
                                 style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:auto;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%"
+                                    min-width="5%"
                                     align="center">
                                 <template slot-scope="scope">
                                     {{scope.$index + 1}}
                                 </template>
                             </el-table-column>
                             <el-table-column
-                                    prop="userName"
+                                    prop="modelNum"
-                                    label="会签人"
+                                    label="条款号"
+                                    min-width="8%"
+                                    align="center"
+                            >
+                            </el-table-column>
+                            <el-table-column
+                                    prop="modelUpdBefore"
+                                    label="修改前"
+                                    align="center"
+                                    min-width="20%">
+                                <!--              <template slot-scope="scope">-->
+                                <!--                  <el-form-item-->
+                                <!--                          style="margin-left: 0;margin-bottom:0;"-->
+                                <!--                  >-->
+                                <!--                      <el-input v-model="scope.row.modelUpdBefore" :title="scope.row.modelUpdBefore" :disabled="scope.row.disabled"  placeholder="请维护章节修改前内容" @blur="modelNameFunc1(scope.row)"/>-->
+                                <!--                  </el-form-item>-->
+                                <!--              </template>-->
+                            </el-table-column>
+                            <el-table-column
+                                    prop="modelUpdAfter"
+                                    label="修改后"
+                                    align="center"
+                                    min-width="20%">
+                                <!--              <template slot-scope="scope">-->
+                                <!--                  <el-form-item-->
+                                <!--                          style="margin-left: 0;margin-bottom:0;"-->
+                                <!--                  >-->
+                                <!--                      <el-input v-model="scope.row.modelUpdAfter" :title="scope.row.modelUpdAfter" :disabled="scope.row.disabled"  placeholder="请维护章节修改后内容" @blur="modelNameFunc2(scope.row)"/>-->
+                                <!--                  </el-form-item>-->
+                                <!--              </template>-->
+                            </el-table-column>
+                            <el-table-column
+                                    prop="modelContent"
+                                    label="修改理由"
+                                    align="center"
+                                    min-width="20%">
+                                <!--              <template slot-scope="scope">-->
+                                <!--                  <el-form-item-->
+                                <!--                          style="margin-left: 0;margin-bottom:0;"-->
+                                <!--                  >-->
+                                <!--                      <el-input v-model="scope.row.modelContent" :disabled="scope.row.disabled"  placeholder="请填写修改理由"/>-->
+                                <!--                  </el-form-item>-->
+                                <!--              </template>-->
+                            </el-table-column>
+                            <el-table-column
+                                    prop="zrDeptIdName"
+                                    label="提出部门"
                                     align="center"
                                     min-width="15%">
+                                <!--                                <template slot-scope="scope">-->
+                                <!--                                    <el-form-item-->
+                                <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+                                <!--                                    >-->
+                                <!--                                        <el-input v-model="scope.row.zrDeptIdName" disabled  placeholder="请选择提出人自动带入部门"/>-->
+                                <!--                                    </el-form-item>-->
+                                <!--                                </template>-->
                             </el-table-column>
                             <el-table-column
-                                    prop="commentText"
+                                    prop="zrUserIdName"
-                                    label="会签意见"
+                                    label="责任人"
-                                    min-width="35%"
+                                    min-width="15%"
                                     align="center">
-                            </el-table-column>
+                                <!--                                <template slot-scope="scope">-->
-                            <el-table-column
+                                <!--                                    <el-form-item-->
-                                    prop="commentText"
+                                <!--                                            style="margin-left: 0;margin-bottom:0;"-->
-                                    label="会签意见文件"
+                                <!--                                    >-->
-                                    min-width="35%"
+                                <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" disabled />-->
-                                    align="left">
+                                <!--                                    </el-form-item>-->
-                                <template slot-scope="scope">
+                                <!--                                </template>-->
-                                    <el-form-item
-                                            style="margin-left: 0;margin-bottom:0;"
-                                    >
-                                        <div  v-if="scope.row.summaryList.length>0" v-for="(value,index)  in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                            <!-- {{ value.name }} -->
-                                            {{value.name | ellipsis}}
-                                        </div>
-                                        <div v-else>
-                                            - -
-                                        </div>
-                                    </el-form-item>
-                                </template>
                             </el-table-column>
                             <el-table-column
                                     label="意见是否采纳"
                                     min-width="15%"
                                     align="center">
                                 <template slot-scope="scope">
-                                    <el-form-item
+                                    <el-select v-model="scope.row.opinionsAdopted" filterable clearable :disabled="disabledState">
-                                            style="margin-left: 0;margin-bottom:0;"
+                                        <el-option
-                                    >
+                                                v-for="item in opinionsAdoptedOptions"
-                                        <el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable>
+                                                :key="item.value"
-                                            <el-option
+                                                :value="item.value"
-                                                    v-for="item in opinionsAdoptedOptions"
+                                                :label="item.label"
-                                                    :key="item.value"
+                                        ></el-option>
-                                                    :value="item.value"
+                                    </el-select>
-                                                    :label="item.label"
+                                </template>
-                                            ></el-option>
+                            </el-table-column>
-                                        </el-select>
+                            <el-table-column
-                                    </el-form-item>
+                                    prop="opinionsAdoptedCont"
+                                    label="采纳理由"
+                                    align="center"
+                                    min-width="15%">
+                                <template slot-scope="scope">
+                                    <el-input v-model="scope.row.opinionsAdoptedCont" clearable  placeholder="请填写采纳理由"/>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -621,6 +670,7 @@
     </el-drawer>
     <!-- 组件树-->
     <tree-select-new
+            :key="key"
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
@@ -1149,6 +1199,18 @@
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
+            formChoiceZRR1(type, title, id){
+                this.choiceZRR1(type, title, id)
+            },
+            formChoiceZRR2(type,title,id,flag){
+                this.choiceZRR2(type,title,id,flag)
+            },
+            formChoiceZRR3(type, title, id){
+                this.choiceZRR3(type, title, id)
+            },
+            formChoiceZRR4(type, title, id){
+                this.choiceZRR4(type, title, id)
+            },
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
@@ -1322,6 +1384,13 @@
                     this.form.QCRBUSS=nameList;
                     this.formKey++
                 }
+
+                if(data && data.length > 0){
+                    const institutionIdList = this.unique(data.map(item => item.institutionId)).join(",")
+                    const institutionNameList = this.unique(data.map(item => item.institutionName)).join(",")
+                    this.form.QCDWID = institutionIdList
+                    this.form.QCDW = institutionNameList
+                }
             },
             checkedRole (data) {
                 if (this.type === 0) {
@@ -1951,11 +2020,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);
+                // this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
-                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                // if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
-                    this.$message.error('文件限制只可上传一个')
+                //     this.$message.error('文件限制只可上传一个')
-                    return false
+                //     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 {
@@ -2508,7 +2577,6 @@
                                 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++

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -590,7 +590,7 @@
     let Base64 = require('js-base64').Base64;
 
     export default {
-        name: "bussLibrary12",
+        name: "bussLibrary13",
         components: {
             formEditList,
             ProcessHeader,
@@ -2502,7 +2502,7 @@
                         _this: this
                     }, res => {
                         const obj = res.data
-                        let standSn = (obj === null ||  obj.newStandSn === null) ? '2280' : obj.newStandSn
+                        let standSn = (obj === null ||  obj.newStandSn === null) ? '001' : obj.newStandSn
                         this.form.standSn = standSn
                         this.form.standNumber = standSn
                         this.form.standYear = year // 待带入立项标准

src/pages/processCenter/pages/creatProcess/qbrk/step5.vue

@@ -225,7 +225,7 @@
                             <el-table-column
                                     prop="modelNum"
                                     label="条款号"
-                                    min-width="8%"
+                                    min-width="12%"
                                     align="center"
                                     >
                                     <template slot-scope="scope">

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -281,6 +281,7 @@
             v-if="TXJGmodal"
             ref="TXJGTree"
             :data="standSystemOptions"
+            @check-change="handleClick"
             show-checkbox
             node-key="id"
             check-strictly
@@ -452,6 +453,12 @@ export default {
      })
   },
   methods: {
+    //体系结构单选
+    handleClick(data,checked, node){
+      if(checked){
+        this.$refs.TXJGTree.setCheckedNodes([data]);
+      }
+    },
     TXJGcloseDrawer () {
       this.TXJGmodal = false
     },

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -444,6 +444,7 @@
           <el-tree
             v-if="TXJGmodal"
             ref="TXJGTree"
+            @check-change="handleClick"
             :data="standSystemOptions"
             show-checkbox
             node-key="id"
@@ -648,6 +649,12 @@ export default {
     }
   },
   methods: {
+    //体系结构单选
+    handleClick(data,checked, node){
+      if(checked){
+        this.$refs.TXJGTree.setCheckedNodes([data]);
+      }
+    },
     TXJGcloseDrawer () {
       this.TXJGmodal = false
     },

src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue

@@ -644,7 +644,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '总院标准法规部产品标准工程师/各事业部标准化员发布'){
+          }else if (row.taskInfo === '总院标准法规部产品标准工程师发布'){
             this.$router.push({
               name: 'bussLibraryProduct13',
               query: {

src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue

@@ -485,6 +485,16 @@ export default {
                   verifySarStandard: true,
                 }
               })
+            }else if (mes.taskInfo === '会签征求意见'){
+              this.$router.push({
+                name: 'bussLibraryProduct5',
+                query: {
+                  type: 'buss2',
+                  processName: mes.taskInfo,
+                  bpnId: id,
+                  verifySarStandard: true,
+                }
+              })
             }else if (mes.taskInfo === '意见汇总及标准修改'){
               this.$router.push({
                 name: 'bussLibraryProduct6',
@@ -505,6 +515,16 @@ export default {
                   verifySarStandard: true,
                 }
               })
+            }else if (mes.taskInfo === '总院标准法规部产品标准工程师发布'){
+              this.$router.push({
+                name: 'bussLibraryProduct13',
+                query: {
+                  type: 'buss2',
+                  processName: mes.taskInfo,
+                  bpnId: id,
+                  verifySarStandard: true,
+                }
+              })
             }
           }else {
             this.$router.push({

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -288,10 +288,15 @@
                                                 <el-input
                                                         clearable
                                                         v-model="addForm.unitName"
-                                                        placeholder="请选择起草责任单位"
+                                                        readonly>
-                                                        readonly
-                                                        @click.native="choiceZRBM(addForm.unit)">
                                                 </el-input>
+<!--                                                <el-input-->
+<!--                                                        clearable-->
+<!--                                                        v-model="addForm.unitName"-->
+<!--                                                        placeholder="请选择起草责任单位"-->
+<!--                                                        readonly-->
+<!--                                                        @click.native="choiceZRBM(addForm.unit)">-->
+<!--                                                </el-input>-->
                                             </div>
                                         </el-form-item>
                                         <el-form-item prop="drafter" label="起草人" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
@@ -834,11 +839,6 @@
                 this.addForm.unit = list
                 this.addForm.unitName = listName
                 this.modalshowflagZRBM = false
-                this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {
-                    institutionIds: list
-                }, {}, res => {
-                    console.log(res);
-                })
             },
             choiceZRBM(id) {
                 if (this.DrawerType === 'see') {
@@ -891,15 +891,22 @@
                 this.modalshowflag2 = true
             },
             checkedRole2 (data) {
-                var idList = ''
+                console.log(data);
-                var nameList = ''
+                let idList = ''
+                let nameList = ''
+                let bmIdList = ''
+                let bmNameList = ''
                 data.forEach( item => {
                     if (nameList.length > 0) {
                         nameList += ','
                         idList += ','
+                        bmIdList += ','
+                        bmNameList += ','
                     }
                     idList += item.id
                     nameList += item.name
+                    bmIdList += item.institutionId
+                    bmNameList += item.institutionName
                 })
                 if (this.type === 'resPerson') {
                     this.addForm.resPerson = idList
@@ -907,6 +914,8 @@
                 } else if (this.type === 'drafter') {
                     this.addForm.drafter = idList
                     this.addForm.drafterName = nameList
+                    this.addForm.unitName = bmNameList
+                    this.addForm.unit = bmIdList
                 }
             },
             addDrawerSubmit () {