Merge remote-tracking branch 'origin/develop' into develop

src/pages/details/otherLawsStandDetails/index.vue

@@ -17,7 +17,7 @@
       >
         <el-collapse v-model="activeNames" @change="handleChange">
           <div v-if="item.label === '基础信息'" class="details-content-modular basic-information"
-               style="border-top:none;position: absolute;right: 36px;border: none">
+               style="border-top:none; position: absolute;right: 36px;border: none">
             <div class="modular-header" style="height: 50px;">
               <div class="modular-header-btn">
                 <el-button v-if="sarStandardsInfoEO.collectId" @click="collectClick(sarStandardsInfoEO.collectId)" title="取消收藏" class="collection-btn" icon="el-icon-star-on" :loading="isSubmit"></el-button>

src/pages/details/otherStandardDetails/index.vue

@@ -46,7 +46,7 @@
             </template>
             <div class="modular-content">
               <template v-if="item.label === '基础信息'">
-                <div class="details-content-modular basic-information" style="border-top:none">
+                <div class="details-content-modular basic-information" style="border-top:none; border-bottom: none;">
                   <div class="basic-information-content">
                     <!--                <p><label style=" margin-right: 150px;">标准类别</label><span>{{ sarStandardsInfoEO.standSort || '-' }}</span></p>-->
                     <p class="">
@@ -906,7 +906,6 @@
         <!--适用车型-->
         <template>
           <custom-select-array
-              :key="applyArcticOptions.options"
               :config="applyArcticOptions"
               v-model="resolveListForm.applyArctic"
           ></custom-select-array>
@@ -1020,7 +1019,6 @@
           </el-form-item>
           <el-row>
             <custom-org
-                key="responsibleUnit"
                 :config="{
                 attrName: '责任部门',
                 attrField: 'responsibleUnit',
@@ -1036,7 +1034,6 @@
           </el-row>
           <el-row>
             <custom-org
-                key="FO"
                 :config="{
                 attrName: 'FO',
                 attrField: 'FO',
@@ -1052,7 +1049,6 @@
           </el-row>
           <el-row>
             <custom-org
-                key="dutyEngineer"
                 :config="{
                 attrName: '责任工程师',
                 attrField: 'dutyEngineer',
@@ -1068,7 +1064,6 @@
           </el-row>
           <el-row>
             <custom-SVPPS
-                key="svpps"
                 :config="{
                 attrName: 'SVPPS',
                 attrField: 'SVPPS',
@@ -1081,8 +1076,8 @@
           <el-form-item label="适用车辆类型" prop="applyArctic" class="add-form-item">
             <el-select v-model="standItemEO.applyArctic" multiple placeholder="请选择" :filterable="true">
               <el-option
-                  v-for="opt in applyArcticOptions"
+                  v-for="(opt, index) in applyArcticOptions"
-                  :key="opt.value"
+                  :key="index"
                   :label="opt.label"
                   :value="opt.value">
               </el-option>
@@ -1091,8 +1086,8 @@
           <el-form-item label="要求类型" prop="claimType" class="add-form-item">
             <el-select v-model="standItemEO.claimType" placeholder="请选择" :filterable="true">
               <el-option
-                  v-for="opt in requestOptions"
+                  v-for="(opt, index) in requestOptions"
-                  :key="opt.value"
+                  :key="index"
                   :label="opt.label"
                   :value="opt.value">
               </el-option>
@@ -1105,8 +1100,8 @@
                 placeholder="请选择"
             >
               <el-option
-                  v-for="item in BZFGGXOUIUJ"
+                  v-for="(item, index) in BZFGGXOUIUJ"
-                  :key="item.value"
+                  :key="index"
                   :value="item.value"
                   :label="item.label"
               ></el-option>

src/pages/processCenter/pages/components/ProcessFooter.vue

@@ -4,6 +4,25 @@
     <div class="footer-line"></div>
     <div class="btn-group-wrap">
       <slot></slot>
+      <el-button
+        type="warning"
+        icon="el-icon-edit-outline"
+        size="small"
+        class="common-button-warning"
+        :loading="submitLoading"
+        @click="handleUploadFile"
+        v-if="uploadFile">文件上传</el-button>
+      <el-button
+        type="primary"
+        class="common-button-primary"
+        size="mini"
+        style="margin-left: 10px"
+        :loading="submitLoading"
+        @click="handleUploadedFile"
+        v-if="uploadedFile">
+      <i class="el-icon-upload el-icon--right"></i>
+      查看文件
+      </el-button>
       <el-button
         type="warning"
         icon="el-icon-edit-outline"
@@ -254,6 +273,16 @@ export default {
     showEdit: {
       type: Boolean,
       default: false
+    },
+     // 是否显示文件上传按钮
+    uploadFile: {
+      type: Boolean,
+      default: false
+    },
+    // 是否显示已上传文件按钮
+    uploadedFile: {
+      type: Boolean,
+      default: false
     },
     // 标准编号(在线编辑)
     standNo: {
@@ -322,6 +351,12 @@ export default {
     handleOnLineReEdit(){
       this.$emit('onLineEdit')
     },
+    handleUploadFile(){
+      this.$emit('uploadFile')
+    },
+    handleUploadedFile(){
+      this.$emit('uploadedFile')
+    },
     handleSendEmail() {
       this.$emit('sendEmail')
     },

src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue

@@ -410,7 +410,7 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
-                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
+                if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.PPTX' || fileSuffix === '.pptx') {
                     return true
                 } else {
                     this.spinShow = false

src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue

@@ -127,20 +127,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/bzdy/step1.vue

@@ -402,7 +402,7 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
+      if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.XLS' || fileSuffix === '.XLSX' || fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.PPTX' || fileSuffix === '.pptx') {
         return true
       } else {
         this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS,PDF文件')

src/pages/processCenter/pages/creatProcess/bzdy/step2.vue

@@ -117,20 +117,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -155,20 +155,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -155,20 +155,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -374,14 +371,14 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.dyhz = data.form ? data.form.dyhz : ''
+                        this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
-                        this.form.file = data.form ? data.form.fileId : ''
+                        this.form.file = data.form ? data.form.fileId : data.fileId
-                        this.form.fileName = data.form ? data.form.fileName : ''
+                        this.form.fileName = data.form ? data.form.fileName : data.fileName
-                        this.form.fileId = data.form ? data.form.fileId : ''
+                        this.form.fileId = data.form ? data.form.fileId : data.fileId
-                        this.form.modelList = data.form ? data.form.modelList : []
+                        this.form.modelList = data.form ? data.form.modelList : data.modelList
                         this.form.fjList = data.fjList || data.form.fjList
                     }).catch(e => {
                     })

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

@@ -145,20 +145,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -140,20 +140,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -140,20 +140,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -140,20 +140,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -140,20 +140,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue

@@ -344,10 +344,10 @@
             <el-timeline-item timestamp="审定" placement="top" :color="roleForm.engineerUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="engineerUser" style="margin-bottom: 0">
-                  <h4>技术委员会常务副主任/总院院长</h4>
+                  <h4>业务主管副院长 </h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.engineerUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.engineerUser" placeholder="选择技术委员会常务副主任/总院院长" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
+                    <el-input v-model="roleForm.engineerUser" placeholder="选择业务主管副院长 " @click.native="choiceZRROne('engineerUser', '选择业务主管副院长 ', roleForm.engineerUser)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -356,10 +356,10 @@
             <el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>总院技术委员会主任</h4>
+                  <h4>院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择总院技术委员会主任" @click.native="choiceZRROne('directorUserId', '选择人员', roleForm.directorUserName)">
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择院长" @click.native="choiceZRROne('directorUserId', '选择院长', roleForm.directorUserName)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -526,8 +526,8 @@ export default {
         startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}],
         leaderUser: [{required: true, message: "请选择标准法规部主管领导", trigger: ['blur', 'change']}],
         feeUser: [{required: true, message: "请选择费用管理部门人员", trigger: ['blur', 'change']}],
-        engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
+        engineerUser: [{required: true, message: "请选择业务主管副院长 ", trigger: ['blur', 'change']}],
-        directorUserName: [{required: true, message: "请选择总院技术委员会主任", trigger: ['blur', 'change']}],
+        directorUserName: [{required: true, message: "请选择院长", trigger: ['blur', 'change']}],
       },
       roleShowflag: false,
       roleShowflagOne: false,

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue

@@ -18,21 +18,21 @@
           <el-form class="label-input-form" ref="ch_pageData" :model="ch_pageData" :rules="ch_rules" label-width="150px">
             <el-row :gutter="24">
               <el-col :span="8">
-                <el-form-item class="add-form-item" label="会议名称:">
+                <el-form-item class="add-form-item" label="会议名称:" prop="meetingName">
                   <el-input
                     v-model="ch_pageData.meetingName"
                     placeholder="请填写"/>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item class="add-form-item" label="主办单位:">
+                <el-form-item class="add-form-item" label="主办单位:" prop="primaryUnit">
                   <el-input v-model="ch_pageData.primaryUnit" placeholder="请填写"/>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="24">
               <el-col :span="8">
-                <el-form-item class="add-form-item" label="协会名称:">
+                <el-form-item class="add-form-item" label="协会名称:" prop="associaName">
                   <el-select
                     clearable
                     @change="comityChange"
@@ -78,7 +78,7 @@
             </el-row>
             <el-row :gutter="24">
               <el-col :span="8">
-                <el-form-item class="add-form-item" label="会议时间:">
+                <el-form-item class="add-form-item" label="会议时间:" prop="meetingStartTime">
                   <el-date-picker
                     v-model="ch_pageData.meetingStartTime"
                     type="datetime"
@@ -89,7 +89,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item class="add-form-item" label="会议地点:">
+                <el-form-item class="add-form-item" label="会议地点:" prop="meetingPlace">
                   <el-input v-model="ch_pageData.meetingPlace" placeholder="请填写"/>
                 </el-form-item>
               </el-col>
@@ -263,7 +263,7 @@
             <el-timeline-item timestamp="会签" placement="top" :color="roleForm.feeUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="feeUser" style="margin-bottom: 0">
-                  <h4>管理推荐部</h4>
+                  <h4>管理推进部</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.feeUserId" style="display: none;"></el-input>
                     <el-input v-model="roleForm.feeUser" placeholder="选择费用管理部门" @click.native="choiceZRR('feeUser', '选择费用管理部门', roleForm.feeUser)">
@@ -275,10 +275,10 @@
             <el-timeline-item timestamp="审定" placement="top" :color="roleForm.engineerUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="engineerUser" style="margin-bottom: 0">
-                  <h4>技术委员会常务副主任/总院院长</h4>
+                  <h4>业务主管副院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.engineerUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.engineerUser" placeholder="选择人员" @click.native="choiceZRROne('engineerUser', '选择人员', roleForm.engineerUser)">
+                    <el-input v-model="roleForm.engineerUser" placeholder="选择业务主管副院长" @click.native="choiceZRROne('engineerUser', '选择业务主管副院长', roleForm.engineerUser)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -287,10 +287,10 @@
             <el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="directorUserName" style="margin-bottom: 0">
-                  <h4>技术委员会主任</h4>
+                  <h4>院长</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
-                    <el-input v-model="roleForm.directorUserName" placeholder="选择技术委员会主任" @click.native="choiceZRROne('directorUser', '选择人员技术委员会主任', roleForm.directorUserName)">
+                    <el-input v-model="roleForm.directorUserName" placeholder="选择院长" @click.native="choiceZRROne('directorUser', '选择院长', roleForm.directorUserName)">
                     </el-input>
                   </div>
                 </el-form-item>
@@ -414,7 +414,13 @@ export default {
       // 上传所储存文件数组
       newDataList: [],
 
-      ch_rules: {},
+      ch_rules: {
+        meetingName: [{required: true, message: '请输入会议名称', trigger: 'change'}],
+        primaryUnit: [{required: true, message: '请输入主办单位', trigger: 'change'}],
+        associaName: [{required: true, message: '请选择协会名称', trigger: 'change'}],
+        meetingStartTime: [{required: true, message: '请选择会议时间', trigger: 'change'}],
+        meetingPlace: [{required: true, message: '请输入会议地点', trigger: 'change'}]
+      },
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
@@ -433,9 +439,9 @@ export default {
         dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}],
         startUserName: [{required: true, message: "请选择标准法规部人员", trigger: ['blur', 'change']}],
         leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}],
-        feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}],
+        feeUser: [{required: true, message: "请选择管理推进部", trigger: ['blur', 'change']}],
-        engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
+        engineerUser: [{required: true, message: "请选择业务主管副院长 ", trigger: ['blur', 'change']}],
-        directorUserName: [{required: true, message: "请选择技术委员会主任", trigger: ['blur', 'change']}],
+        directorUserName: [{required: true, message: "请选择院长", trigger: ['blur', 'change']}],
       },
       deleteDataList: [],
 

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -68,6 +68,7 @@
                                         <el-date-picker
                                                 v-model="form.endTime"
                                                 type="date"
+                                                :picker-options="pickerOptions"
                                                 placeholder="请选择截止日期"
                                                 value-format="yyyy-MM-dd">
                                         </el-date-picker>
@@ -553,6 +554,11 @@
         name: "bzjdStep1-1",
         data() {
             return {
+                pickerOptions: {
+                    disabledDate(time) {
+                        return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+                    }
+                },
                 similarityDegree: '',
                 leftData: [],
                 rightData: [],

src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue

@@ -139,51 +139,51 @@
          fontWeight: 'bold', height: '48px'}"
                 row-key="id"
       >
-        <el-table-column type="selection" width="55" align="center"/>
         <el-table-column
-          prop="itemsNum"
+                prop="itemsNum"
-          label="条款号"
+                label="条款号"
-          width="70"
+                width="70"
-          align="center">
+                align="center">
         </el-table-column>
         <el-table-column
-          prop="itemsName"
+                prop="itemsName"
-          label="条款名称"
+                label="条款名称"
-          show-overflow-tooltip
+                show-overflow-tooltip
-          align="center">
+                align="center">
         </el-table-column>
         <el-table-column
-          prop="itermsConditions"
+                prop="itermsConditions"
-          label="条款内容"
+                label="条款内容"
-          width="200"
+                width="200"
-          show-overflow-tooltip
+                show-overflow-tooltip
-          align="center">
+                align="center">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">查看条款内容</el-button>
           </template>
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
+                show-overflow-tooltip
-          prop="technicalRequir"
+                prop="technicalRequir"
-          width="200"
+                width="200"
-          label="核心技术要求"
+                v-if="!form.itemsNum1"
-          align="center">
+                label="核心技术要求"
+                align="center">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
+                show-overflow-tooltip
-          v-if="sarType === 'INLAND' && form.itemsNum1"
+                v-if="sarType === 'INLAND' && form.itemsNum1"
-          prop="changePoint"
+                prop="changePoint"
-          width="150"
+                width="150"
-          label="基于上一版本差异"
+                label="基于上一版本差异"
-          align="center">
+                align="center">
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
+                show-overflow-tooltip
-          v-if="sarType === 'FOREIGN'"
+                v-if="sarType === 'FOREIGN'"
-          prop="changePoint"
+                prop="changePoint"
-          width="150"
+                width="150"
-          label="相对于国行标差异点"
+                label="相对于国行标差异点"
-          align="center">
+                align="center">
         </el-table-column>
         <el-table-column
           prop="complianceRequir"
@@ -236,9 +236,18 @@
         <el-table-column
           label="责任人"
           width="170"
-          prop="zrUserIdName"
+          prop="zrUserName"
           align="center">
         </el-table-column>
+        <el-table-column
+                label="操作"
+                v-if="form.itemsNum1"
+                width="140"
+                align="center">
+          <template slot-scope="scope">
+            <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2)">查看比对</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <el-collapse accordion>
         <el-collapse-item title="审批意见">
@@ -268,20 +277,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -323,6 +329,16 @@
       </div>
     </el-dialog>
     <loading :loading="loading">加载中...</loading>
+    <el-dialog
+            title="查看比对内容"
+            :visible.sync="BDmodel"
+            size="1100px">
+      <div>相似度:{{ similarityDegree }}</div>
+      <div style="height: 600px;overflow: auto;display: flex;">
+        <div v-html="leftData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+        <div v-html="rightData" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px; width: 50%; overflow: auto;"></div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -336,6 +352,11 @@ export default {
   name: "bzjdStep1-6",
   data() {
     return {
+      similarityDegree: '',
+      BDmodel: false,
+      oldNumber: '',
+      leftData: '',
+      rightData: '',
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
       itermsConditionsFlag: false,
@@ -366,6 +387,57 @@ export default {
     ProcessTitle
   },
   methods: {
+    getBDList () {
+      this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+        standHisId: this.oldNumber,
+        leftOrRight: 'LEFT'
+      }, {
+        _this: this
+      }, res => {
+        for (let a = 0; a < this.itemList.length; a++) {
+          for (let b = 0; b < res.data.length; b++) {
+            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
+              this.itemList[a].itemsId = res.data[b].itemsId
+            }
+          }
+        }
+      }, e => {
+      })
+      this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+        standHisId: this.oldNumber,
+        leftOrRight: 'RIGHT'
+      }, {
+        _this: this
+      }, res => {
+        for (let a = 0; a < this.itemList.length; a++) {
+          for (let b = 0; b < res.data.length; b++) {
+            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
+              this.itemList[a].itemsId2 = res.data[b].itemsId
+            }
+          }
+        }
+      }, e => {
+      })
+    },
+    checkBD (id,id2) {
+      let itemsEoPage = {
+        oldItemId: id,
+        newItemId: id2,
+        flag: 1
+      }
+      this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
+        _this: this
+      }, res => {
+        if (res.data.leftString === '' && res.data.rightString === '') {
+          this.$message.warning('暂无找到相似的文本')
+        } else {
+          this.leftData = res.data.leftString
+          this.rightData = res.data.rightString
+          this.BDmodel = true
+          this.similarityDegree = res.data.similarityDegree
+        }
+      })
+    },
     //折叠/展开基础信息方法
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag
@@ -418,12 +490,18 @@ export default {
           let data = JSON.parse(res.mesg)
           this.form.itemsNum = data.itemsNum || data.form.itemsNum
           this.form.itemsName = data.itemsName || data.form.itemsName
-          this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
+          if (data.form) {
-          this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
+            this.form.itemsName1 = data.form.itemsName1 || ''
+            this.form.itemsNum1 = data.form.itemsNum1 || ''
+          } else {
+            this.form.itemsName1 = data.itemsName1 || ''
+            this.form.itemsNum1 = data.itemsNum1 || ''
+          }
           this.sarType = data.standInData || data.sarType
           this.json = data
           this.itemList = data.itemList
           this.loading = false
+          this.getBDList()
         }).catch(e => {
         })
       })

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -69,6 +69,7 @@
                   <el-date-picker
                           v-model="form.endTime"
                           type="date"
+                          :picker-options="pickerOptions"
                           placeholder="请选择截止日期"
                           value-format="yyyy-MM-dd">
                   </el-date-picker>
@@ -95,11 +96,14 @@
                 tooltip-effect="dark"
                 style="width: 100%;"
                 height="100%"
-                :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"
                 row-key="id">
-        <el-table-column type="selection" width="55" align="center"/>
+        <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+        </el-table-column>
         <el-table-column
           prop="itemsNum"
           label="条款号"
@@ -563,6 +567,11 @@ export default {
   name: "bzjdStep1",
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+        }
+      },
       similarityDegree: '',
       leftData: [],
       rightData: [],

src/pages/processCenter/pages/creatProcess/bzjd/step2.vue

@@ -189,20 +189,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -220,20 +220,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -212,20 +212,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -212,20 +212,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -525,6 +522,7 @@
                         this.json = data
                         this.itemList = data.itemList
                         this.loading = false
+                        this.getBDList()
                     }).catch(e => {
                     })
                 })

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

@@ -213,20 +213,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -396,21 +393,6 @@
                     }
                 })
             },
-            itemEdit (row) {
-                this.itemId = row.id
-                this.modalshowflag2 = true
-                this.editForm = {
-                    technicalRequir: row.technicalRequir, // 核心技术要求
-                    changePoint: row.changePoint, // 国内标准的差异点
-                    complianceRequir: row.complianceRequir || '1', // 符合性要求
-                    complianceState: row.complianceState, // 合规性分析
-                    newData: row.newData, // 新车型实施日期
-                    onlineData: row.onlineData, // 在产车实施日期
-                    applyArctic: row.applyArctic, // 适用车型
-                    itemsId: row.itemsId,
-                    itemsId2: row.itemsId2
-                }
-            },
             handleTransfer() {
                 this.drawerModal = true
             },
@@ -524,6 +506,7 @@
                         this.json = data
                         this.itemList = data.itemList
                         this.loading = false
+                        this.getBDList()
                     }).catch(e => {
                     })
                 })

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -1307,7 +1307,7 @@
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
     import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,processBack} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1647,6 +1647,8 @@
                 txlbOptions: [], // 体系类别
                 data: [], // 标准列表数据
                 ListForm: {}, // 新增数据
+
+            bpnId: ''
             }
         },
         watch:{
@@ -1820,37 +1822,7 @@
           // 文件预览
           filePreview(item) {
             const attId = item.response.data.id
-            this.getBusStandFileByAttId(attId)
+            this.$preview(attId)
-                .then(res => {
-                  console.log(res)
-                  if(res){
-                    const editFileInfo = res
-                    console.log(editFileInfo)
-                    if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-                      window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-                    }else {
-                      const nowTime = new Date().getTime()
-                      // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-                      window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                    }
-                    // window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
-                  }
-                  // switch (res.convertState) {
-                  //   case 'ERROR':
-                  //     this.$message.warning('文档转换失败')
-                  //     break
-                  //   case 'LODING':
-                  //     this.$message.info('文档转换中，请稍后查看')
-                  //     break
-                  //   case 'SUCCESS':
-                  //     const { convertFileInfo } = res
-                  //     window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + convertFileInfo.id))
-                  //     break
-                  // }
-                }).catch(e => {
-              console.log(e)
-              this.$message.warning('文件不存在,预览失败')
-            })
           },
             // choiceZRRS () {
             //     if (this.userType === 'zrUserId') {
@@ -2801,6 +2773,7 @@
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData && checkedData.length != 0) {
+                  console.log(checkedData)
                     if(checkedData.length > 0){
                         this.form.dybxh = checkedData.map(item => item.model).join(",")
                         this.form.dymc = checkedData.map(item => item.name).join(",")
@@ -2862,7 +2835,7 @@
                 saveTaskFirst(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
-                    // this.bpnId = res.result
+                    this.bpnId = res.result
                 }).catch(e => {
                     this.saveLoading = false
                 })
@@ -2921,7 +2894,17 @@
                                 json.applyUpdUserId = this.form.applyUpdUserId
                                 json.prcCreateUser = this.form.prcCreateUser
                                 json.prcCreateUserName = this.form.prcCreateUserName
-                                this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
+                                this.$http.post('lawss/activiti/startProcessRollBack', {
+                                  createUser: this.$store.getters.userInfo.userId,
+                                  createUserName: this.$store.getters.userInfo.uName,
+                                  json: JSON.stringify({
+                                    taskInfo: '申请人发起',
+                                    form: this.form,
+                                    roleForm: this.roleForm,
+                                    commentText: this.commentText
+                                  }),
+                                  type: '1',
+                                }, {
                                     _this: this
                                 }, res => {
                                     if (res.ok) {
@@ -2935,6 +2918,14 @@
                                             if (res.success) {
                                                 this.$message.success(res.message)
                                                 this.isSubmit = false
+                                              if (this.bpnId !== '') {
+                                                let taskId = {
+                                                  id: this.bpnId
+                                                }
+                                                taskDel(taskId).then(res => {
+                                                  return res
+                                                })
+                                              }
                                                 // 流程提交之后，应该流转至待办任务页面
                                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                             }
@@ -2976,12 +2967,12 @@
             },
         },
         mounted () {
+          this.bpnId = this.$route.query.bpnId
           this.getTaskId()
             this.getTree()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this
             }, res => {
-              console.log(res.data.ENERGYTYPES)
                 this.countryOptions=res.data.COUNTRY//国家地区
                 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
                 this.standNatureOptions = res.data.SARPROPERTY // 标准性质

src/pages/processCenter/pages/creatProcess/bzrk/step2.vue

@@ -701,11 +701,6 @@
                         :no-data-text="listNoDataText"
                         :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                 >
-                    <el-table-column
-                            type="selection"
-                            width="55"
-                            align="center">
-                    </el-table-column>
                     <el-table-column
                             prop="name"
                             label="任务步骤"
@@ -1116,7 +1111,6 @@
                         if (res) {
                             const processForm = JSON.parse(res.mesg)
 
-                          console.log("processFrom",processForm)
                             this.xgdFileId = processForm.xgd
                             this.fbgbjbdFileId = processForm.fbgbjbd
                             this.bpgFileId = processForm.bpg
@@ -1222,6 +1216,28 @@
                         this.isSubmit = true
                         this.form.commentText = this.formTongGuo.commentText
                         this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                      console.log(this.form)
+                        if (this.form.syrz.length === 0) {
+                          this.form.syrz = ''
+                        }
+                        if (this.form.nylx.length === 0) {
+                          this.form.nylx = ''
+                        }
+                        if (this.form.zrbm.length === 0) {
+                          this.form.zrbm = ''
+                        }
+                        if (this.form.qcdw.length === 0) {
+                          this.form.qcdw = ''
+                        }
+                        if (this.form.cllx.length === 0) {
+                          this.form.cllx = ''
+                        }
+                        if (this.form.sycpx.length === 0) {
+                          this.form.sycpx = ''
+                        }
+                        if (this.form.zrgcs.length === 0) {
+                          this.form.zrgcs = ''
+                        }
                         const json = JSON.stringify(this.form);
                         this.$http.post('lawss/activiti/completeTask', {
                             taskIds: this.taskIds,

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

@@ -629,11 +629,6 @@
             :no-data-text="listNoDataText"
             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
         >
-          <el-table-column
-              type="selection"
-              width="55"
-              align="center">
-          </el-table-column>
           <el-table-column
               prop="name"
               label="任务步骤"

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

@@ -1164,11 +1164,6 @@
             :no-data-text="listNoDataText"
             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
         >
-          <el-table-column
-              type="selection"
-              width="55"
-              align="center">
-          </el-table-column>
           <el-table-column
               prop="name"
               label="任务步骤"

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

@@ -613,11 +613,6 @@
                 :no-data-text="listNoDataText"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
             >
-<!--              <el-table-column-->
-<!--                  type="selection"-->
-<!--                  width="55"-->
-<!--                  align="center">-->
-<!--              </el-table-column>-->
               <el-table-column
                   prop="name"
                   label="任务步骤"

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue

@@ -399,10 +399,7 @@ export default {
           {required: true, message: '请输入标准编号', trigger: 'change'},
         ],
         endTime: [
-          {required: true, message: '请输入标准结束日期', trigger: 'change'},
+          {required: true, message: '请输入征求意见结束日期', trigger: 'change'},
-        ],
-        cname: [
-          {required: true, message: '请输入标准名称', trigger: 'change'},
         ],
         fjListId: [
           {required: true, message: '请选择附件', trigger: 'change'},

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue

@@ -169,20 +169,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -38,6 +38,7 @@
                 <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     v-model="form.endTime"
+                    :picker-options="pickerOptions"
                     type="date"
                     placeholder="请选择结束日期">
                   </el-date-picker>
@@ -374,6 +375,11 @@ export default {
   name: "bzzqyjStep1",
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
+        }
+      },
       activeNames: '1',
       bpnId: '',
       fileUrl: 'api/att/attFile/upload',
@@ -410,7 +416,7 @@ export default {
           {required: true, message: '请输入标准编号', trigger: 'change'},
         ],
         endTime: [
-          {required: true, message: '请输入标准结束日期', trigger: 'change'},
+          {required: true, message: '请输入征求意见结束日期', trigger: 'change'},
         ],
         fjListId: [
           {required: true, message: '请选择附件', trigger: 'change'},

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

@@ -117,20 +117,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -204,20 +204,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -592,7 +589,23 @@
             },
             handleSubmit() {
                 if (this.data.length < 1) {
-                    this.$message.warning('请输入征求意见')
+                    this.isSubmit = true
+                    var json = this.json
+                    json.commentText = this.commentText
+                    json.info = []
+                    json.form = this.form
+                    json.department = this.$store.getters.userInfo.orgName
+                    this.$http.post('lawss/activiti/completeTask', {
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
+                        }
+                        this.isSubmit = false
+                    })
                 } else {
                     var a = 0
                     var b = 0

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

@@ -183,20 +183,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -175,20 +175,17 @@
                         prop="name"
                         label="任务步骤"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="assignee"
                         label="任务受理人"
                         align="center"
-                        sortable="custom"
                 >
                 </el-table-column>
                 <el-table-column
                         prop="createTime"
                         label="创建时间"
-                        sortable="custom"
                         align="center">
                     <template slot-scope="scope">
                         <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -184,7 +184,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="审批意见">
+        <el-collapse-item title="回执说明">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"
@@ -211,20 +211,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>

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

@@ -179,7 +179,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="审批意见">
+        <el-collapse-item title="回执说明">
           <div style="margin: 10px 0;">
             <el-input
                     type="textarea"
@@ -206,20 +206,17 @@
                 prop="name"
                 label="任务步骤"
                 align="center"
-                sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="assignee"
                 label="任务受理人"
                 align="center"
-                sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -537,9 +534,6 @@
         });
       },
       handleSubmit() {
-        if (this.data.length < 1) {
-          this.$message.warning("请输入征求意见搞");
-        } else {
           this.isSubmit = true;
           var json = this.json;
           json.oldinfo = this.oldData;
@@ -556,7 +550,6 @@
             }
             this.isSubmit = false;
           });
-        }
       },
       getData() {
         return new Promise((resolve, reject) => {

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

@@ -195,20 +195,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -408,34 +405,38 @@ export default {
       }
     },
     upload(row, title) {
-      var params = {
+      if (row.length > 0) {
-        columnName: {
+        var params = {
-          chapterNumber: "章条编号",
+          columnName: {
-          chapterName: "章节名称",
+            chapterNumber: "章条编号",
-          commentText: "修改意见内容（包括理由或依据）",
+            chapterName: "章节名称",
-          oldText: "修改前",
+            commentText: "修改意见内容（包括理由或依据）",
-          newText: "修改后",
+            oldText: "修改前",
-          reason: "修改理由",
+            newText: "修改后",
-          department: "提出部门",
+            reason: "修改理由",
-          responUserName: "提出人",
+            department: "提出部门",
-        },
+            responUserName: "提出人",
-        dataList: []
+          },
-      };
+          dataList: []
-      if (title === '上报意见.xls') {
+        };
-        params.columnName.stateText = "处理意见"
+        if (title === '上报意见.xls') {
-      }
+          params.columnName.stateText = "处理意见"
-      params.dataList = JSON.parse(JSON.stringify(row));
-      params.dataList.forEach(item => {
-        if (item.state === "1") {
-          item.stateText = "上报";
-        } else if (item.state === "2") {
-          item.stateText = "处理后上报";
-        } else {
-          item.stateText = "不上报";
         }
-      });
+        params.dataList = JSON.parse(JSON.stringify(row));
-      this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+        params.dataList.forEach(item => {
-      });
+          if (item.state === "1") {
+            item.stateText = "上报";
+          } else if (item.state === "2") {
+            item.stateText = "处理后上报";
+          } else {
+            item.stateText = "不上报";
+          }
+        });
+        this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+        });
+      } else {
+        this.$message.warning('无上报数据')
+      }
     },
     handleTabs(name) {
       this.active = name;
@@ -443,9 +444,6 @@ export default {
     handleSave() {
     },
     handleSubmit() {
-      if (this.data.length < 1) {
-        this.$message.warning("请输入征求意见搞");
-      } else {
         this.isSubmit = true;
         var json = this.json;
         json.hqFlag = '0';
@@ -461,7 +459,6 @@ export default {
           }
           this.isSubmit = false;
         });
-      }
     },
     handleSubmitNo() {
       if (this.commentText) {

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

@@ -195,20 +195,17 @@
           prop="name"
           label="任务步骤"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
           prop="assignee"
           label="任务受理人"
           align="center"
-          sortable="custom"
         >
         </el-table-column>
         <el-table-column
                 prop="createTime"
                 label="创建时间"
-                sortable="custom"
                 align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
@@ -398,34 +395,38 @@ export default {
       })
     },
     upload(row, title) {
-      var params = {
+      if (row.length > 0) {
-        columnName: {
+        var params = {
-          chapterNumber: "章条编号",
+          columnName: {
-          chapterName: "章节名称",
+            chapterNumber: "章条编号",
-          commentText: "修改意见内容（包括理由或依据）",
+            chapterName: "章节名称",
-          oldText: "修改前",
+            commentText: "修改意见内容（包括理由或依据）",
-          newText: "修改后",
+            oldText: "修改前",
-          reason: "修改理由",
+            newText: "修改后",
-          department: "提出部门",
+            reason: "修改理由",
-          responUserName: "提出人",
+            department: "提出部门",
-        },
+            responUserName: "提出人",
-        dataList: []
+          },
-      }
+          dataList: []
-      if (title === '上报意见.xls') {
+        };
-        params.columnName.stateText = "处理意见"
+        if (title === '上报意见.xls') {
-      }
+          params.columnName.stateText = "处理意见"
-      params.dataList = JSON.parse(JSON.stringify(row))
-      params.dataList.forEach(item => {
-        if (item.state === '1') {
-          item.stateText = '上报'
-        } else if (item.state === '2') {
-          item.stateText = '处理后上报'
-        } else {
-          item.stateText = '不上报'
         }
-      })
+        params.dataList = JSON.parse(JSON.stringify(row));
-      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
+        params.dataList.forEach(item => {
-      })
+          if (item.state === "1") {
+            item.stateText = "上报";
+          } else if (item.state === "2") {
+            item.stateText = "处理后上报";
+          } else {
+            item.stateText = "不上报";
+          }
+        });
+        this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+        });
+      } else {
+        this.$message.warning('无上报数据')
+      }
     },
     stateText(row) {
       if (row === '1') {
@@ -440,9 +441,6 @@ export default {
     handleSave() {
     },
     handleSubmit() {
-      if (this.data.length < 1) {
-        this.$message.warning('请输入征求意见搞')
-      } else {
         this.isSubmit = true
         var json = this.json
         json.bdFlag = '0'
@@ -458,7 +456,6 @@ export default {
           }
           this.isSubmit = false
         })
-      }
     },
     handleSubmitNo() {
       if (this.commentText) {

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

@@ -398,34 +398,38 @@ export default {
       })
     },
     upload(row, title) {
-      var params = {
+      if (row.length > 0) {
-        columnName: {
+        var params = {
-          chapterNumber: "章条编号",
+          columnName: {
-          chapterName: "章节名称",
+            chapterNumber: "章条编号",
-          commentText: "修改意见内容（包括理由或依据）",
+            chapterName: "章节名称",
-          oldText: "修改前",
+            commentText: "修改意见内容（包括理由或依据）",
-          newText: "修改后",
+            oldText: "修改前",
-          reason: "修改理由",
+            newText: "修改后",
-          department: "提出部门",
+            reason: "修改理由",
-          responUserName: "提出人",
+            department: "提出部门",
-        },
+            responUserName: "提出人",
-        dataList: []
+          },
-      }
+          dataList: []
-      if (title === '上报意见.xls') {
+        };
-        params.columnName.stateText = "处理意见"
+        if (title === '上报意见.xls') {
-      }
+          params.columnName.stateText = "处理意见"
-      params.dataList = JSON.parse(JSON.stringify(row))
-      params.dataList.forEach(item => {
-        if (item.state === '1') {
-          item.stateText = '上报'
-        } else if (item.state === '2') {
-          item.stateText = '处理后上报'
-        } else {
-          item.stateText = '不上报'
         }
-      })
+        params.dataList = JSON.parse(JSON.stringify(row));
-      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
+        params.dataList.forEach(item => {
-      })
+          if (item.state === "1") {
+            item.stateText = "上报";
+          } else if (item.state === "2") {
+            item.stateText = "处理后上报";
+          } else {
+            item.stateText = "不上报";
+          }
+        });
+        this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+        });
+      } else {
+        this.$message.warning('无上报数据')
+      }
     },
     stateText(row) {
       if (row === '1') {
@@ -440,9 +444,6 @@ export default {
     handleSave() {
     },
     handleSubmit() {
-      if (this.data.length < 1) {
-        this.$message.warning('请输入征求意见搞')
-      } else {
         this.isSubmit = true
         var json = this.json
         json.directorFlag = '0'
@@ -458,7 +459,6 @@ export default {
           }
           this.isSubmit = false
         })
-      }
     },
     handleSubmitNo() {
       if (this.commentText) {

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

@@ -398,34 +398,38 @@ export default {
       });
     },
     upload(row, title) {
-      var params = {
+      if (row.length > 0) {
-        columnName: {
+        var params = {
-          chapterNumber: "章条编号",
+          columnName: {
-          chapterName: "章节名称",
+            chapterNumber: "章条编号",
-          commentText: "修改意见内容（包括理由或依据）",
+            chapterName: "章节名称",
-          oldText: "修改前",
+            commentText: "修改意见内容（包括理由或依据）",
-          newText: "修改后",
+            oldText: "修改前",
-          reason: "修改理由",
+            newText: "修改后",
-          department: "提出部门",
+            reason: "修改理由",
-          responUserName: "提出人",
+            department: "提出部门",
-        },
+            responUserName: "提出人",
-        dataList: []
+          },
-      };
+          dataList: []
-      if (title === '上报意见.xls') {
+        };
-        params.columnName.stateText = "处理意见"
+        if (title === '上报意见.xls') {
-      }
+          params.columnName.stateText = "处理意见"
-      params.dataList = JSON.parse(JSON.stringify(row));
-      params.dataList.forEach(item => {
-        if (item.state === "1") {
-          item.stateText = "上报";
-        } else if (item.state === "2") {
-          item.stateText = "处理后上报";
-        } else {
-          item.stateText = "不上报";
         }
-      });
+        params.dataList = JSON.parse(JSON.stringify(row));
-      this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+        params.dataList.forEach(item => {
-      });
+          if (item.state === "1") {
+            item.stateText = "上报";
+          } else if (item.state === "2") {
+            item.stateText = "处理后上报";
+          } else {
+            item.stateText = "不上报";
+          }
+        });
+        this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+        });
+      } else {
+        this.$message.warning('无上报数据')
+      }
     },
     stateText(row) {
       if (row === "1") {
@@ -440,9 +444,6 @@ export default {
     handleSave() {
     },
     handleSubmit() {
-      if (this.data.length < 1) {
-        this.$message.warning("请输入征求意见搞");
-      } else {
         this.isSubmit = true;
         var json = this.json;
         json.presidentFlag = '0';
@@ -458,7 +459,6 @@ export default {
           }
           this.isSubmit = false;
         });
-      }
     },
     handleSubmitNo() {
       if (this.commentText) {

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

@@ -0,0 +1,637 @@
+<template>
+<form>
+  <ProcessTitle>
+    <template slot="title">基础信息</template>
+  </ProcessTitle>
+  <div class="prc-content-border">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
+          <el-select v-model="form.standSort" filterable clearable>
+            <el-option
+                    v-for="item in standSortOptions"
+                    placeholder="请选择企标类别"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.standName"
+                  placeholder="请输入中文名称"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <!--                                <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
+        <!--                                    <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
+        <!--                                        <el-option-->
+        <!--                                                v-for="item in standStateOptions"-->
+        <!--                                                placeholder="请选择"-->
+        <!--                                                :key="item.value"-->
+        <!--                                                :value="item.value"-->
+        <!--                                                :label="item.label"-->
+        <!--                                        ></el-option>-->
+        <!--                                    </el-select>-->
+        <!--                                </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"-->
+        <!--                                              placeholder="请输入标准年份"-->
+        <!--                                              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"
+                         :editable="false"
+                         placeholder="请选择企标实施日期"
+                         value-format="yyyy-MM-dd"
+          ></el-datePicker>
+        </el-form-item>
+        <!--                                <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
+        <!--                                    <el-datePicker v-model="form.FSRQBUSS"-->
+        <!--                                                   :editable="false"-->
+        <!--                                                   :disabled="true"-->
+        <!--                                                   placeholder="请选择废止日期"-->
+        <!--                                                   value-format="yyyy-MM-dd"-->
+        <!--                                                   clearable></el-datePicker>-->
+        <!--                                </el-form-item>-->
+      </el-col>
+      <el-col :span="12">
+        <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
+        <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
+        <!--                                  <el-option-->
+        <!--                                      v-for="item in countryOptions"-->
+        <!--                                      placeholder="请选择"-->
+        <!--                                      :key="item.value"-->
+        <!--                                      :value="item.value"-->
+        <!--                                      :label="item.label"-->
+        <!--                                  ></el-option>-->
+        <!--                                </el-select>-->
+        <!--                              </el-form-item>-->
+        <!--                                <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
+        <!--                                    <el-input-->
+        <!--                                            v-model="form.standNumber"-->
+        <!--                                            placeholder="请输入企标编号"-->
+        <!--                                            clearable-->
+        <!--                                    ></el-input>-->
+        <!--                                </el-form-item>-->
+        <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.standEnName"
+                  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"
+                         placeholder="请选择发布日期"></el-datePicker>
+        </el-form-item>
+        <!--                                <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
+        <!--                                    <el-datePicker v-model="form.FZRQBUSS"-->
+        <!--                                                   :editable="false"-->
+        <!--                                                   placeholder="请选择废止日期"-->
+        <!--                                                   value-format="yyyy-MM-dd"-->
+        <!--                                                   clearable></el-datePicker>-->
+        <!--                                </el-form-item>-->
+      </el-col>
+    </el-row>
+  </div>
+  <ProcessTitle v-show="verifySarStandard">
+    <template slot="title">过程稿件</template>
+  </ProcessTitle>
+  <div class="prc-content-border"  v-show="verifySarStandard">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
+          <el-input
+                  disabled
+                  style="display: none;"
+                  v-model="form.FBGBUSSName"
+                  clearable
+          ></el-input>
+          <div style="display: flex;justify-content: space-between">
+            <div style="width: 80%;">
+              <div v-for="(item,index) in FBGBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+            </div>
+            <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('FBGBUSS')">
+                <i class="el-icon-upload"></i>
+              </el-button>
+            </div>
+          </div>
+        </el-form-item>
+        <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
+          <el-input
+                  disabled
+                  style="display: none;"
+                  v-model="form.LSBBBUSSName"
+                  clearable
+          ></el-input>
+          <div style="display: flex;justify-content: space-between">
+            <div style="width: 80%;">
+              <div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+            </div>
+            <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('LSBBBUSS')">
+                <i class="el-icon-upload"></i>
+              </el-button>
+            </div>
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
+          <el-input
+                  disabled
+                  style="display: none;"
+                  v-model="form.BZSMBUSSName"
+                  clearable
+          ></el-input>
+          <div style="display: flex;justify-content: space-between">
+            <div style="width: 80%;">
+              <div v-for="(item,index) in BZSMBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+            </div>
+            <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('BZSMBUSS')">
+                <i class="el-icon-upload"></i>
+              </el-button>
+            </div>
+          </div>
+        </el-form-item>
+        <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
+          <el-input
+                  disabled
+                  style="display: none;"
+                  v-model="form.QTWJBUSSName"
+                  clearable
+          ></el-input>
+          <div style="display: flex;justify-content: space-between">
+            <div style="width: 80%;">
+              <div v-for="(item,index) in QTWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+            </div>
+            <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('QTWJBUSS')">
+                <i class="el-icon-upload"></i>
+              </el-button>
+            </div>
+          </div>
+        </el-form-item>
+
+      </el-col>
+    </el-row>
+  </div>
+  <ProcessTitle v-show="verifySarStandard">
+    <template slot="title">适用范围</template>
+  </ProcessTitle>
+  <div class="prc-content-border"  v-show="verifySarStandard">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
+          <el-input
+                  clearable
+                  v-model="form.QCDW"
+                  placeholder="选择起草部门"
+                  @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.WJSCRYBUSSName"
+                  placeholder="请输入文件上传人员"
+                  :disabled="true"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="请选择能源类型" multiple>
+            <el-option
+                    v-for="item in categoryOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
+        </el-form-item>
+        <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
+          <el-input v-model="form.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', form.VPPSBMBUSS,false)"></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"
+                  placeholder="选择起草人"
+                  clearable
+                  @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
+          </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="请选择适用车型" multiple>
+            <el-option
+                    v-for="item in applyArcticOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="请选择适用认证" multiple>
+            <el-option
+                    v-for="item in sycpxOptions"
+                    placeholder="请选择"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable :disabled="true"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+  <ProcessTitle v-show="verifySarStandard">
+    <template slot="title">关联信息</template>
+  </ProcessTitle>
+  <div class="prc-content-border"  v-show="verifySarStandard">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.DTQBBHBUSS"
+                  placeholder="请输入代替标准号"
+                  clearable
+          ></el-input>
+          <el-button
+                  type="primary"
+                  class="common-button-primary"
+                  size="mini"
+                  style="position:absolute;top: 10px;right: 0;"
+                  @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
+          >{{'手动查找'}}</el-button>
+        </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" @click="handleFilePreview(item.GLWJBUSS)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
+            </div>
+            <div style="width: 20%;">
+              <el-button
+                      type="primary"
+                      class="common-button-primary"
+                      size="mini"
+                      style="margin-left: 10px; margin-top: 11px; float: right;"
+                      @click="fileUpload('GLWJBUSS')">
+                <i class="el-icon-upload"></i>
+              </el-button>
+            </div>
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <!--                                <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
+        <!--                                  <el-input-->
+        <!--                                      v-model="form.BDTWJHLAWS"-->
+        <!--                                      placeholder="请输入被代替企标编号"-->
+        <!--                                      clearable-->
+        <!--                                  ></el-input>-->
+        <!--                                  <el-button-->
+        <!--                                      type="primary"-->
+        <!--                                      class="common-button-primary"-->
+        <!--                                      size="mini"-->
+        <!--                                      style="position:absolute;top: 10px;right: 0;"-->
+        <!--                                      @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"-->
+        <!--                                  >{{'手动查找'}}</el-button>-->
+        <!--                                </el-form-item>-->
+        <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.XCSJBUSS"
+                  placeholder=""
+                  clearable
+                  :disabled="true"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+</form>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ProcessTitle from '../../../components/ProcessTitle'
+
+
+export default {
+  name: 'formEditList',
+  components: {
+    ProcessTitle,
+  },
+  props: {
+    formSub: {
+      type: Object,
+      required: true
+    },
+    FBGBUSSFileListSub: {
+      type: Array,
+      required: true
+    },
+    LSBBBUSSFileListSub: {
+      type: Array,
+      required: true
+    },
+    BZSMBUSSFileListSub: {
+      type: Array,
+      required: true
+    },
+    QTWJBUSSFileListSub: {
+      type: Array,
+      required: true
+    },
+    GLWJBUSSFileListSub: {
+      type: Array,
+      required: true
+    },
+    disabledState: {
+      type: Boolean,
+      default: false
+    },
+    verifySarStandard: {
+      type: Boolean,
+      default: false
+    },
+    fileMadelSub: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data () {
+    return {
+      config: {
+        attrName : '',
+      },
+      replaceLawsNumModel: false,
+      replaceLawType: '',
+      sarBussionessLawsEO: {
+        replaceLawsNum: ''
+      },
+      // 代替标准号
+      replaceLawsNumForm: {
+        lawsNumber:'',
+        numberName:'',
+        lawsTextState:'',
+        dataSource: '',
+        standNumber: '', // 标准编号
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: 'BUSINESS',
+        quoteIdList: '',
+        validFlag: '0',
+        menuId: 'nomenu'
+      },
+      replaceLawsNumRow: [], // 代替政策号 数组内容
+      replaceTotal: 0,
+      form:{},
+      fileList: [],
+      FBGBUSSFileList: [],
+      BZSMBUSSFileList: [],
+      LSBBBUSSFileList: [],
+      QTWJBUSSFileList: [],
+      GLWJBUSSFileList: [],
+      countryOptions:[],//国家地区
+      standSortOptions: [], // 标准类别
+      standNatureOptions: [], // 标准性质
+      standStateOptions: [], // 文本状态
+      standSystemOptions: [], // 标准体系
+      busVppsOptions: [], // 车系体系架构
+      busVppsChildOptions: [], // 车系体系架构子集合
+      modelOptions: [], // 模块体系架构
+      modelChildOptions: [], // 模块体系架构子集合
+      applyArcticOptions: [], // 适用车型
+      gkglbmOptions: [], // 归口管理部门
+      categoryOptions: [], // 能源类型
+      applyAuthOptions: [], // 适用认证
+      cysdOptions: [], // 我司参与深度
+      cbcdOptions: [], // 采标程度
+      wssmrOptions: [], // 我司署名人
+      sycpxOptions: [], // 适用产品线
+      zrbmOptions: [], // 责任部门
+      zrgcsOptions: [], // 责任工程师
+      qcdwOption: [], // 起草单位
+      txlbOptions: [], // 体系类别
+      standSortConfigOptions: [], // 标准类别下拉框
+      adoptExtentOptions: [], // 采标程度下拉框
+      emergyKindOptions: [], // 能源种类下拉框
+      categoryConfigOptions: [], // 所属类别下拉框
+      assemClassOptions: [], // 总成分类下拉框
+      qcdwOptions:[],//起草单位下拉框
+      qcrOptions:[],//起草人下拉框
+      nylxOptions:[],//能源类型下拉框
+      syrzOptions:[],//适用认证下拉框
+      data: [], // 标准列表数据
+      ListForm: {}, // 新增数据
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  methods: {
+    choiceQCDW(type, title, id) {
+      this.$emit('formChoiceQCDW',type,title,id)
+    },
+    choiceZRRList (type, title, id) {
+      this.$emit('formChoiceZRRListCancel',type,title,id)
+    },
+    // 代替企标编号 请求数据
+    getReplaceLawsNumRow () {
+      this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.replaceLawsNumForm, {
+        _this: this,
+        loading: 'replaceLoading'
+      }, res => {
+        this.replaceLawsNumRow = res.data.list
+        this.replaceTotal = res.data.count
+        if (this.selectedListRep.length !== 0) {
+          this.selectedListRep.map((list) => {
+            this.replaceLawsNumRow.map((item) => {
+              if (list.id === item.id) {
+                item._checked = true
+              }
+            })
+          })
+        }
+      }, e => {
+      })
+    },
+    selectLaws (type) {
+      // if (this.standNumFlag === 1) {
+      // this.$refs.selections.selectAll(false)
+      // }
+      // this.sarBussionessLawsEO.replaceLawsNum = ''
+      this.replaceLawsNumModel = true
+      this.replaceLawType = ''
+      this.replaceLawType = type
+      this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,'',this.replaceLawsNumModel,this.replaceLawType);
+    },
+    fileUpload (type) {
+      // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
+
+      const fileType = type;
+
+      switch (this.fileType){
+        case 'FBGBUSS':
+          this.fileList=this.FBGBUSSFileList
+          break;
+        case 'BZSMBUSS' :
+          this.fileList=this.BZSMBUSSFileList
+          break;
+        case 'LSBBBUSS':
+          this.fileList=this.LSBBBUSSFileList
+          break;
+        case 'QTWJBUSS':
+          this.fileList=this.QTWJBUSSFileList
+          break;
+        case 'GLWJBUSS':
+          this.fileList=this.GLWJBUSSFileList
+          break;
+        default : ;
+      }
+      this.fileMadel = true;
+      console.log(this.fileList)
+      this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType);
+    },
+    // 文件预览及下载
+    handleFilePreview(file) {
+      let attId = ""
+      if(file && file.id){
+        attId = file.id
+      }else {
+        attId = file.response.data.id
+      }
+      if (this.preview) {
+        if (attId) {
+          window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+        } else {
+          this.$message.warning('文件不存在,下载失败')
+        }
+      } else {
+        this.$preview(attId)
+      }
+    },
+    downloadFile (data) {
+      //文件id中出现了','字符,去除掉
+      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+    },
+    setMap(data){
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+
+    },
+    busVsFunc(){
+      this.$http.get('sarVppsTree/list', '', {
+        _this: this
+      }, res => {
+        this.busVppsOptions = []
+        this.busVppsOptions = res.data
+      })
+    },
+    modelFunc(){
+      this.$http.get('sarModelTree/list', '', {
+        _this: this
+      }, res => {
+        this.modelOptions = []
+        this.modelOptions = res.data
+      })
+    },
+  },
+  mounted () {
+    this.form = this.formSub,
+    this.FBGBUSSFileList= this.FBGBUSSFileListSub,
+    this.BZSMBUSSFileList= this.BZSMBUSSFileListSub,
+    this.LSBBBUSSFileList= this.LSBBBUSSFileListSub,
+    this.QTWJBUSSFileList= this.QTWJBUSSFileListSub,
+    this.GLWJBUSSFileList= this.GLWJBUSSFileListSub,
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY
+      this.applyCountryOptions = res.data.COUNTRY
+      this.regionOptions = res.data.REGION // 区域
+      this.standStateOptions = res.data.BUSSSTATE
+      this.energyKindOptions = res.data.ENERGYTYPES
+      this.standGeneraOptions = res.data.BUSSBIGCLASS
+      this.standSubclassOptions = res.data.BUSSFINECLASS
+      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+      this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+      this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+      this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+      this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+      this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+      this.txlbOptions = res.data.TXLBCLASS // 体系类别
+      this.qcdwOptions = res.data.QCDW // 起草单位
+      this.qcrOptions = res.data.QCRBUSS // 起草人
+      this.nylxOptions = res.data.NYLXCLASS // 能源类型
+      this.syrzOptions = res.data.SYRZCLASS // 适用认证
+      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+      this.setMap(this.standStateOptions)
+    })
+    this.busVsFunc()
+    this.modelFunc()
+  },
+  watch: {
+    form: {
+      handler: function (val) {
+        if(val){
+          this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel);
+        }
+      },
+      deep: true //对象的深度验证
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,391 @@
+<template>
+<form>
+  <ProcessTitle>
+    <template slot="title">基础信息</template>
+  </ProcessTitle>
+  <div class="prc-content-border">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
+          <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
+            <el-option
+                    v-for="item in standSortOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.standName" :disabled="disabledState"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <!--                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
+        <!--                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
+        <!--                                    <el-option-->
+        <!--                                            v-for="item in standStateOptions"-->
+        <!--                                            :key="item.value"-->
+        <!--                                            :value="item.value"-->
+        <!--                                            :label="item.label"-->
+        <!--                                    ></el-option>-->
+        <!--                                </el-select>-->
+        <!--                            </el-form-item>-->
+        <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+          <el-datePicker v-model="form.putTime" :disabled="disabledState"
+                         :editable="false"></el-datePicker>
+        </el-form-item>
+        <!--                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
+        <!--                                <el-datePicker v-model="form.FSRQBUSS"-->
+        <!--                                               :editable="false"-->
+        <!--                                               :disabled="true"-->
+        <!--                                               value-format="yyyy-MM-dd"-->
+        <!--                                               clearable></el-datePicker>-->
+        <!--                            </el-form-item>-->
+      </el-col>
+      <el-col :span="12">
+        <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
+        <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
+        <!--                                  <el-option-->
+        <!--                                      v-for="item in countryOptions"-->
+        <!--                                      placeholder="请选择"-->
+        <!--                                      :key="item.value"-->
+        <!--                                      :value="item.value"-->
+        <!--                                      :label="item.label"-->
+        <!--                                  ></el-option>-->
+        <!--                                </el-select>-->
+        <!--                              </el-form-item>-->
+        <!--                            <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
+        <!--                                <el-input-->
+        <!--                                        v-model="form.standNumber" :disabled="disabledState"-->
+        <!--                                        clearable-->
+        <!--                                ></el-input>-->
+        <!--                            </el-form-item>-->
+        <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.standEnName" :disabled="disabledState"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <!--                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">-->
+        <!--                                <el-input v-model="form.standYear" :disabled="disabledState"-->
+        <!--                                          clearable></el-input>-->
+        <!--                            </el-form-item>-->
+        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+          <el-datePicker v-model="form.issueTime" :disabled="disabledState"
+                         :editable="false"
+          ></el-datePicker>
+        </el-form-item>
+        <!--                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">-->
+        <!--                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"-->
+        <!--                                               :editable="false"-->
+        <!--                                               value-format="yyyy-MM-dd"-->
+        <!--                                               clearable></el-datePicker>-->
+        <!--                            </el-form-item>-->
+      </el-col>
+    </el-row>
+  </div>
+  <ProcessTitle v-show="verifySarStandard">
+    <template slot="title">过程稿件</template>
+  </ProcessTitle>
+  <div class="prc-content-border"  v-show="verifySarStandard">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
+        <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
+        <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+  <ProcessTitle v-show="verifySarStandard">
+    <template slot="title">适用范围</template>
+  </ProcessTitle>
+  <div class="prc-content-border"  v-show="verifySarStandard">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
+          <el-input v-model="form.QCDW"  :disabled="disabledState" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.WJSCRYBUSSName"
+                  :disabled="true"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
+            <el-option
+                    v-for="item in categoryOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
+          <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="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>
+            <el-option
+                    v-for="item in applyArcticOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
+          <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
+            <el-option
+                    v-for="item in sycpxOptions"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+  <ProcessTitle v-show="verifySarStandard">
+    <template slot="title">关联信息</template>
+  </ProcessTitle>
+  <div class="prc-content-border"  v-show="verifySarStandard">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.DTQBBHBUSS" :disabled="disabledState"
+                  clearable
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+            <!-- {{ value.name }} -->
+            {{value.name}}
+          </div>
+          <div v-else>
+            - -
+          </div>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+<!--        <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
+<!--          <el-input-->
+<!--                  v-model="form.BDTWJHLAWS" :disabled="disabledState"-->
+<!--                  clearable-->
+<!--          ></el-input>-->
+<!--        </el-form-item>-->
+        <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
+          <el-input
+                  v-model="form.XCSJBUSS"
+                  clearable
+                  :disabled="true"
+          ></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </div>
+</form>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import ProcessTitle from '../../../components/ProcessTitle'
+
+
+export default {
+  name: 'formList',
+  components: {
+    ProcessTitle,
+  },
+  props: {
+    form: {
+      type: Object,
+      required: true
+    },
+    FBGBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    LSBBBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    BZSMBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    QTWJBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    GLWJBUSSFileList: {
+      type: Array,
+      required: true
+    },
+    disabledState: {
+      type: Boolean,
+      default: false
+    },
+    verifySarStandard: {
+      type: Boolean,
+      default: false
+    },
+  },
+  data () {
+    return {
+      countryOptions:[],//国家地区
+      standSortOptions: [], // 标准类别
+      standNatureOptions: [], // 标准性质
+      standStateOptions: [], // 文本状态
+      standSystemOptions: [], // 标准体系
+      busVppsOptions: [], // 车系体系架构
+      busVppsChildOptions: [], // 车系体系架构子集合
+      modelOptions: [], // 模块体系架构
+      modelChildOptions: [], // 模块体系架构子集合
+      applyArcticOptions: [], // 适用车型
+      gkglbmOptions: [], // 归口管理部门
+      categoryOptions: [], // 能源类型
+      applyAuthOptions: [], // 适用认证
+      cysdOptions: [], // 我司参与深度
+      cbcdOptions: [], // 采标程度
+      wssmrOptions: [], // 我司署名人
+      sycpxOptions: [], // 适用产品线
+      zrbmOptions: [], // 责任部门
+      zrgcsOptions: [], // 责任工程师
+      qcdwOption: [], // 起草单位
+      txlbOptions: [], // 体系类别
+      standSortConfigOptions: [], // 标准类别下拉框
+      adoptExtentOptions: [], // 采标程度下拉框
+      emergyKindOptions: [], // 能源种类下拉框
+      categoryConfigOptions: [], // 所属类别下拉框
+      assemClassOptions: [], // 总成分类下拉框
+      qcdwOptions:[],//起草单位下拉框
+      qcrOptions:[],//起草人下拉框
+      nylxOptions:[],//能源类型下拉框
+      syrzOptions:[],//适用认证下拉框
+      data: [], // 标准列表数据
+      ListForm: {}, // 新增数据
+    }
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  methods: {
+    downloadFile (data) {
+      //文件id中出现了','字符,去除掉
+      window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + data.id
+    },
+    setMap(data){
+      data.forEach(item => {
+        this.$set(this.textStatusMap, item.value, item.label)
+      })
+
+    },
+    busVsFunc(){
+      this.$http.get('sarVppsTree/list', '', {
+        _this: this
+      }, res => {
+        this.busVppsOptions = []
+        this.busVppsOptions = res.data
+      })
+    },
+    modelFunc(){
+      this.$http.get('sarModelTree/list', '', {
+        _this: this
+      }, res => {
+        this.modelOptions = []
+        this.modelOptions = res.data
+      })
+    },
+  },
+  mounted () {
+    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+      _this: this
+    }, res => {
+      this.countryOptions = res.data.COUNTRY
+      this.applyCountryOptions = res.data.COUNTRY
+      this.regionOptions = res.data.REGION // 区域
+      this.standStateOptions = res.data.BUSSSTATE
+      this.energyKindOptions = res.data.ENERGYTYPES
+      this.standGeneraOptions = res.data.BUSSBIGCLASS
+      this.standSubclassOptions = res.data.BUSSFINECLASS
+      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+      this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+      this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+      this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+      this.categoryOptions = res.data.NYLXCLASS // 能源类型
+      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+      this.cysdOptions = res.data.WSCYSD // 我司参与深度
+      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+      this.txlbOptions = res.data.TXLBCLASS // 体系类别
+      this.qcdwOptions = res.data.QCDW // 起草单位
+      this.qcrOptions = res.data.QCRBUSS // 起草人
+      this.nylxOptions = res.data.NYLXCLASS // 能源类型
+      this.syrzOptions = res.data.SYRZCLASS // 适用认证
+      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+      this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+      this.setMap(this.standStateOptions)
+    })
+    this.busVsFunc()
+    this.modelFunc()
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -1177,7 +1177,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -1176,7 +1176,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -1171,7 +1171,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -18,255 +18,15 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
-                <ProcessTitle>
+                <formList
-                    <template slot="title">基础信息</template>
+                        :form = "form"
-                </ProcessTitle>
+                        :FBGBUSSFileList = "FBGBUSSFileList"
-                <div class="prc-content-border">
+                        :LSBBBUSSFileList = "LSBBBUSSFileList"
-                    <el-row :gutter="24">
+                        :BZSMBUSSFileList = "BZSMBUSSFileList"
-                        <el-col :span="12">
+                        :QTWJBUSSFileList = "QTWJBUSSFileList"
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
+                        :GLWJBUSSFileList = "GLWJBUSSFileList"
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
+                        :disabledState = "disabledState"
-                                    <el-option
+                        :verifySarStandard = "verifySarStandard"></formList>
-                                            v-for="item in standSortOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                                               :editable="false"></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FSRQBUSS"
-                                               :editable="false"
-                                               :disabled="true"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
-                            <!--                                  <el-option-->
-                            <!--                                      v-for="item in countryOptions"-->
-                            <!--                                      placeholder="请选择"-->
-                            <!--                                      :key="item.value"-->
-                            <!--                                      :value="item.value"-->
-                            <!--                                      :label="item.label"-->
-                            <!--                                  ></el-option>-->
-                            <!--                                </el-select>-->
-                            <!--                              </el-form-item>-->
-                            <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -455,10 +215,12 @@
             v-show="verifySarStandard"
             show-save
             show-submit
-            show-edit
+            :uploadFile="uploadFileStatus"
+            :uploadedFile="!uploadFileStatus"
             :submitLoading="isSubmit"
             :saveLoading="saveLoading"
-            @onLineEdit="handleOnLineEdit"
+            @uploadFile="handleUploadFile"
+            @uploadedFile="handleUploadedFile"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -805,6 +567,7 @@
 
 <script>
     import { onlyOfficeUrl } from '@/sysConfig'
+    import formList from './common/formList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -820,7 +583,8 @@
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
+            formList,
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -887,6 +651,7 @@
                 prcName: this.$route.query.prcName,
                 detailData: [],
                 fileList: [],
+                footFileList: [],
                 FBGBUSSFileList: [],
                 BZSMBUSSFileList: [],
                 LSBBBUSSFileList: [],
@@ -971,6 +736,7 @@
                 ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
                 isSubmit: false,
+                uploadFileStatus: true,
                 saveLoading: false,
                 defaultProps: {
                     children: 'children',
@@ -1027,6 +793,8 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    footFile:'',
+                    footFileName:'',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1169,7 +937,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change' }
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1468,6 +1236,7 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -2029,6 +1798,10 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
+                if(this.FBGBUSSFileList && this.FBGBUSSFileList.length > 1){
+                    this.$message.error('文件限制只可上传一个')
+                    return false
+                }
                 if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
@@ -2071,22 +1844,7 @@
                         this.$message.warning('文件不存在,下载失败')
                     }
                 } else {
-                    this.getBusStandFileByAttId(attId)
+                    this.$preview(attId)
-                        .then(res => {
-                            if(res){
-                                const editFileInfo = res
-                                if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-                                    window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-                                }else {
-                                    const nowTime = new Date().getTime()
-                                    // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-                                    window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                                }
-                            }
-                        }).catch(e => {
-                        console.log(e)
-                        this.$message.warning('文件不存在,预览失败')
-                    })
                 }
             },
             // 导入标准数据成功后执行
@@ -2113,6 +1871,10 @@
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = fileList
                             break;
+                        case 'footFile':
+                            this.footFileList = fileList
+                            this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
+                            break;
                         default : ;
                     }
                     this.$message({
@@ -2148,6 +1910,9 @@
                     case 'GLWJBUSS':
                         this.fileList=this.GLWJBUSSFileList
                         break;
+                    case 'footFile':
+                        this.fileList=this.footFileList
+                        break;
                     default : ;
                 }
                 this.fileMadel = true;
@@ -2171,6 +1936,10 @@
                     case 'GLWJBUSS':
                         this.GLWJBUSSFileList = fileList
                         break;
+                    case 'footFile':
+                        this.footFileList = fileList
+                        this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
+                        break;
                     default : ;
                 }
             },
@@ -2282,6 +2051,17 @@
                     })
                 })
             },
+            handleUploadFile(){
+                this.fileType = '';
+                this.fileType = 'footFile';
+
+                this.fileList=this.footFileList
+
+                this.fileMadel = true;
+            },
+            handleUploadedFile(){
+                this.fileMadel = true
+            },
             // 在线编辑
             handleOnLineEdit(){
                 this.isSubmit = true
@@ -2313,6 +2093,8 @@
 
                 this.saveLoading = true
                 let _formData = new FormData()
+                this.form.footFile=this.footFileList.map(item => item.response.data.id).join(",")
+                this.form.footFileName=this.footFileList.map(item => item.name).join(",")
                 // _formData.append('id', this.bpnId)
                 _formData.append('createUser', this.$store.getters.userInfo.userId)
                 _formData.append('createUserName', this.$store.getters.userInfo.uName)
@@ -2335,6 +2117,9 @@
             fileInfoHandle(){
 
                 //拼接文件名和id 提交到流程Activity
+                this.form.footFile=this.footFileList.map(item => item.response.data.id).join(",")
+                this.form.footFileName=this.footFileList.map(item => item.name).join(",")
+
                 this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
                 this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
 
@@ -2438,50 +2223,67 @@
                 // }
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
-                        this.processModelHisOne(this.pId,this.taskIds)
+                        if(this.footFileList !== undefined && this.footFileList.length > 0){
-                            .then(res => {
+                            this.form.footFile=this.footFileList.map(item => item.response.data.id).join(",")
-                                if(res){
+                            this.form.footFileName=this.footFileList.map(item => item.name).join(",")
-                                    const editFileInfo = res
+                            this.isSubmit = true
-                                    if(editFileInfo && editFileInfo.editStatus === '1'){
+                            this.saveLoading = true
-                                        this.isSubmit = true
+                            // 会签意见存储
-                                        this.saveLoading = true
+                            const infoList = []
-                                        this.form.commentText = this.formTongGuo.commentText
+                            const info = {}
-                                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                            info.footFile = this.form.footFile
-                                        const json = JSON.stringify(this.form);
+                            info.footFileName = this.form.footFileName
-                                        this.$http.post('lawss/activiti/completeTask', {
+                            info.userId = this.userId
-                                            taskIds: this.taskIds,
+                            info.userName = this.$store.getters.userInfo.userName
-                                            userId : this.userId,
+                            info.commentText = this.formTongGuo.commentText
-                                            json: json
+                            infoList.push(info)
-                                        }, {
+                            this.form.fileModelList = infoList
-                                            _this: this
+                            console.log(this.form.fileModelList)
-                                        }, res => {
+                            this.form.commentText = this.formTongGuo.commentText
-                                            if (res.success) {
+                            this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                                                this.$message.success(res.message)
+                            const json = JSON.stringify(this.form);
-                                                // 流程提交之后，应该流转至待办任务页面
+                            this.$http.post('lawss/activiti/completeTask', {
-                                                this.isSubmit = false
+                                taskIds: this.taskIds,
-                                                this.saveLoading = false
+                                userId : this.userId,
-                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                json: json
-                                                // if(this.formTongGuo.approvalOpinion === '1'){
+                            }, {
-                                                //     this.$message.warning("驳回成功")
+                                _this: this
-                                                //     this.isSubmit = false
+                            }, res => {
-                                                //     // 流程提交之后，应该流转至待办任务页面
+                                if (res.success) {
-                                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                    this.$message.success(res.message)
-                                                // }else{
+                                    // 流程提交之后，应该流转至待办任务页面
-                                                //     this.processCreateLaws(json)
+                                    this.isSubmit = false
-                                                // }
+                                    this.saveLoading = false
-                                            }else {
+                                    this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                                this.$message.success(res.message)
+                                    // if(this.formTongGuo.approvalOpinion === '1'){
-                                            }
+                                    //     this.$message.warning("驳回成功")
-                                        })
+                                    //     this.isSubmit = false
-                                    }else {
+                                    //     // 流程提交之后，应该流转至待办任务页面
-                                        this.$message.warning('请先在线编辑,再提交流程')
+                                    //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                    }
+                                    // }else{
-
+                                    //     this.processCreateLaws(json)
+                                    // }
+                                }else {
+                                    this.$message.success(res.message)
                                 }
-                            }).catch(e => {
+                            })
-                            console.log(e)
+                        }else {
-                            // this.$message.warning('文件不存在,预览失败')
+                            this.$message.warning('请先上传文件,再提交流程')
-                        })
+                        }
+                        // this.processModelHisOne(this.pId,this.taskIds)
+                        //     .then(res => {
+                        //         if(res){
+                        //             const editFileInfo = res
+                        //             if(editFileInfo && editFileInfo.editStatus === '1'){
+                        //             }else {
+                        //                 this.$message.warning('请先在线编辑,再提交流程')
+                        //             }
+                        //
+                        //         }
+                        //     }).catch(e => {
+                        //     console.log(e)
+                        //     // this.$message.warning('文件不存在,预览失败')
+                        // })
               }})
             },
             busVsFunc(){
@@ -2547,11 +2349,15 @@
                                 }
 
                                 this.getFormFieldList(processForm)
+                                if(processForm.footFile !== undefined && processForm.footFile !== ""){
+                                    this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
+                                }
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
                             }
                         }).catch(e => {
                         })
@@ -2590,6 +2396,7 @@
             },
         },
         mounted () {
+            this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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

@@ -18,255 +18,69 @@
                 label-width="210px"
         >
             <div style="flex: auto;" v-show="active === '1'">
+                <formEditList
+                    :key = "formKey"
+                    :formSub = "form"
+                    :FBGBUSSFileListSub = "FBGBUSSFileList"
+                    :LSBBBUSSFileListSub = "LSBBBUSSFileList"
+                    :BZSMBUSSFileListSub = "BZSMBUSSFileList"
+                    :QTWJBUSSFileListSub = "QTWJBUSSFileList"
+                    :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+                    :disabledState = "disabledState"
+                    :verifySarStandard = "verifySarStandard"
+                    :fileMadelSub = "fileMadel"
+                    @formCancel="formCancel"
+                    @formChoiceZRRListCancel = "formChoiceZRRListCancel"
+                    @formChoiceQCDW = "formChoiceQCDW"
+            />
                 <ProcessTitle>
-                    <template slot="title">基础信息</template>
+                    <template slot="title">文件汇总</template>
                 </ProcessTitle>
-                <div class="prc-content-border">
+                <template>
-                    <el-row :gutter="24">
+                    <div class="prc-content-border" style="height: 66vh;position: relative;">
-                        <el-col :span="12">
+                        <el-table
-                            <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
+                                ref="selection"
-                                <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
+                                tooltip-effect="dark"
-                                    <el-option
+                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
-                                            v-for="item in standSortOptions"
+                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-                                            :key="item.value"
+                                        fontWeight: 'bold', height: '48px'}"
-                                            :value="item.value"
+                                :data="form.fileModelList"
-                                            :label="item.label"
+                                border
-                                    ></el-option>
+                                default-expand-all>
-                                </el-select>
+<!--                            <el-table-column-->
-                            </el-form-item>
+<!--                                    label="序号"-->
-                            <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+<!--                                    min-width="15%"-->
-                                <el-input
+<!--                                    align="center">-->
-                                        v-model="form.standName" :disabled="disabledState"
+<!--                                <template slot-scope="scope">-->
-                                        clearable
+<!--                                    {{scope.$index + 1}}-->
-                                ></el-input>
+<!--                                </template>-->
-                            </el-form-item>
+<!--                            </el-table-column>-->
-                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">
+                            <el-table-column
-                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">
+                                    prop="footFileName"
-                                    <el-option
+                                    label="编写文件名称"
-                                            v-for="item in standStateOptions"
+                                    align="center"
-                                            :key="item.value"
+                                    min-width="30%">
-                                            :value="item.value"
+                            </el-table-column>
-                                            :label="item.label"
+                            <el-table-column
-                                    ></el-option>
+                                    prop="userName"
-                                </el-select>
+                                    label="起草人"
-                            </el-form-item>
+                                    min-width="15%"
-                            <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+                                    align="center">
-                                <el-datePicker v-model="form.putTime" :disabled="disabledState"
+                            </el-table-column>
-                                               :editable="false"></el-datePicker>
+                            <el-table-column label="操作" align="center"  min-width="5%">-->
-                            </el-form-item>
+                                <template slot-scope="scope">
-                            <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">
+                                    <div @click="filePreview(scope.row,'onLine')" style="display: inline-block;cursor: pointer;color: #409EFF;">
-                                <el-datePicker v-model="form.FSRQBUSS"
+                                        预览
-                                               :editable="false"
+                                    </div>
-                                               :disabled="true"
+                                    &nbsp;&nbsp;
-                                               value-format="yyyy-MM-dd"
+                                    <div @click="filePreview(scope.row,'down')" style="display: inline-block;cursor: pointer;color: #409EFF;">
-                                               clearable></el-datePicker>
+                                        下载
-                            </el-form-item>
+                                    </div>
-                        </el-col>
+                                </template>
-                        <el-col :span="12">
+                            </el-table-column>
-                            <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
+                        </el-table>
-                            <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
+                    </div>
-                            <!--                                  <el-option-->
+                </template>
-                            <!--                                      v-for="item in countryOptions"-->
-                            <!--                                      placeholder="请选择"-->
-                            <!--                                      :key="item.value"-->
-                            <!--                                      :value="item.value"-->
-                            <!--                                      :label="item.label"-->
-                            <!--                                  ></el-option>-->
-                            <!--                                </el-select>-->
-                            <!--                              </el-form-item>-->
-                            <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standNumber" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.standEnName" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.standYear" :disabled="disabledState"
-                                          clearable></el-input>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                                               :editable="false"
-                                               ></el-datePicker>
-                            </el-form-item>
-                            <el-form-item v-show="verifySarStandard" label="废止日期" prop="FZRQBUSS" class="add-form-item form-item-disabled">
-                                <el-datePicker v-model="form.FZRQBUSS" :disabled="disabledState"
-                                               :editable="false"
-                                               value-format="yyyy-MM-dd"
-                                               clearable></el-datePicker>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">过程稿件</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                            <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">适用范围</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in qcdwOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.WJSCRYBUSSName"
-                                        :disabled="true"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in categoryOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
-                            </el-form-item>
-                            <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSBMBUSS"  :disabled="disabledState"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" >
-                                    <el-option
-                                            v-for="item in qcrOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
-                                    <el-option
-                                            v-for="item in applyArcticOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
-                                <el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="" :disabled="disabledState"  multiple>
-                                    <el-option
-                                            v-for="item in sycpxOptions"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="模块中文名称" prop="VPPSCNBUSS" class="add-form-item form-item-disabled">
-                                <el-input v-model="form.VPPSCNBUSS" clearable :disabled="true"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
-                <ProcessTitle v-show="verifySarStandard">
-                    <template slot="title">关联信息</template>
-                </ProcessTitle>
-                <div class="prc-content-border"  v-show="verifySarStandard">
-                    <el-row :gutter="24">
-                        <el-col :span="12">
-                            <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.DTQBBHBUSS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                                <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-                                    <!-- {{ value.name }} -->
-                                    {{value.name}}
-                                </div>
-                                <div v-else>
-                                    - -
-                                </div>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.BDTWJHLAWS" :disabled="disabledState"
-                                        clearable
-                                ></el-input>
-                            </el-form-item>
-                            <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
-                                <el-input
-                                        v-model="form.XCSJBUSS"
-                                        clearable
-                                        :disabled="true"
-                                ></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </div>
                 <div>
                     <el-collapse accordion v-model="activeName">
                         <el-collapse-item title="审批意见" name = "1">
@@ -455,10 +269,8 @@
             v-show="verifySarStandard"
             show-save
             show-submit
-            show-edit
             :saveLoading="saveLoading"
             :submitLoading="isSubmit"
-            @onLineEdit="handleOnLineEdit"
             @save="handleSave"
             @submit="handleSubmit"
     >
@@ -599,6 +411,12 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <Mechanism-tree
+            is-title="选择部门信息"
+            :is-visible.sync="modalShowFlagZRBM"
+            :nodeList="nodeListZRBM"
+            @checkedRole="drawerCheckZRBM"
+    />
     <!--        <el-drawer-->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -804,6 +622,7 @@
 
 <script>
     import { onlyOfficeUrl } from '@/sysConfig'
+    import formEditList from './common/formEditList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
@@ -819,7 +638,8 @@
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
+            formEditList
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -877,7 +697,7 @@
                 },
                 taskInfo:'',
                 loading: false,
-                disabledState: true,
+                disabledState: false,
                 userId:this.$store.getters.userInfo.userId,
                 taskIds: this.$route.query.taskIds,
                 pId: this.$route.query.prcId,
@@ -886,6 +706,7 @@
                 prcName: this.$route.query.prcName,
                 detailData: [],
                 fileList: [],
+                footFileList: [],
                 FBGBUSSFileList: [],
                 BZSMBUSSFileList: [],
                 LSBBBUSSFileList: [],
@@ -970,6 +791,7 @@
                 ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
                 isSubmit: false,
+                uploadFileStatus: true,
                 saveLoading: false,
                 defaultProps: {
                     children: 'children',
@@ -983,6 +805,8 @@
                     children: 'children',
                     label: 'model'
                 },
+                modalShowFlagZRBM: false,
+                nodeListZRBM: [],
                 nodeList: [],
                 nodeList2: [],
                 zrType: '',
@@ -993,6 +817,7 @@
                     children: 'children',
                     label: 'name'
                 },
+                formKey:1,
                 key:1,
                 key1:2,
                 key2:3,
@@ -1026,6 +851,8 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    footFile:'',
+                    footFileName:'',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1168,7 +995,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1265,6 +1092,51 @@
             },
         },
         methods: {
+            drawerCheckZRBM(data) {
+                let idList = ''
+                let nameList = ''
+                data.forEach(item => {
+                    // if (item.hasChild === '0') {
+                    if (nameList.length > 0) {
+                        nameList += ','
+                        idList += ','
+                    }
+                    idList += item.id
+                    nameList += item.name
+                    // }
+                })
+                this.form.QCDW = nameList
+                this.form.QCDWID = idList
+                this.formKey++
+            },
+            choiceQCDW(type, title, id) {
+                this.nodeListZRBM = []
+                this.nodeListZRBM.push(id)
+                this.drawerTitle = title
+                this.modalShowFlagZRBM = true
+            },
+            formChoiceQCDW(type, title, id){
+                this.choiceQCDW(type, title, id)
+            },
+            formChoiceZRRListCancel(type, title, id){
+                this.choiceZRRList(type, title, id)
+            },
+            formCancel (form, list1,list2,list3,list4,list5,fileMadel,fileList,fileType,replaceLawsNumModel,replaceLawType) {
+                this.form = form
+                this.FBGBUSSFileList = list1
+                this.LSBBBUSSFileList = list2
+                this.BZSMBUSSFileList = list3
+                this.QTWJBUSSFileList = list4
+                this.GLWJBUSSFileList = list5
+                if(fileMadel){
+                    this.fileType = fileType
+                    this.fileUpload(fileType)
+                }else if(replaceLawsNumModel){
+                    this.replaceLawsNumModel = replaceLawsNumModel
+                    this.replaceLawType = replaceLawType
+                    this.getReplaceLawsNumRow()
+                }
+            },
             modelProp(row,index){
                 console.log(row)
                 console.log(index)
@@ -1413,6 +1285,10 @@
                 }else if(this.userType === 'hqUserId'){
                     this.roleForm.hqUserId=idList;
                     this.roleForm.hqUserName=nameList;
+                }else if(this.userType === 'QCRBUSS'){
+                    this.form.QCRBUSSID=idList;
+                    this.form.QCRBUSS=nameList;
+                    this.formKey++
                 }
             },
             checkedRole (data) {
@@ -1467,6 +1343,7 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -1474,6 +1351,7 @@
                         this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
                         this.roleForm = mes.roleForm
                         this.commentText = mes.commentText
+                        this.formKey++
                     })
                 }else {
                     this.form.XCSJBUSS = this.dateFormatter()
@@ -1948,8 +1826,8 @@
                 })
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
-                if(this.replaceLawType === 'dtbjh'){
+                if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
+                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
@@ -1961,6 +1839,7 @@
                 }
                 // this.$emit('input', textArr.join(','))
                 this.$refs.selections.clearSelection()
+                this.formKey++
             },
             // 点击查看
             handlePreview (item) {
@@ -2028,6 +1907,11 @@
                 var fileSuffix = filename.substring(index1, index2)
                 // const fileSuffix = file.name.split('.')[1] // 后缀名
                 // 判断上传文件格式
+                this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined && item.raw === undefined);
+                if(this.fileType === 'FBGBUSS' && this.FBGBUSSFileList && this.FBGBUSSFileList.length === 1){
+                    this.$message.error('文件限制只可上传一个')
+                    return false
+                }
                 if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
                     return true
                 } else {
@@ -2060,9 +1944,26 @@
                     })
                 })
             },
+            filePreview(file,type) {
+                const attId = file.footFile
+                if (type === 'down') {
+                    if (attId) {
+                        window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+                    } else {
+                        this.$message.warning('文件不存在,下载失败')
+                    }
+                } else {
+                    this.$preview(attId)
+                }
+            },
             // 文件预览及下载
             handleFilePreview(file) {
-                const attId = file.response.data.id
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 if (this.preview) {
                     if (attId) {
                         window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
@@ -2070,50 +1971,43 @@
                         this.$message.warning('文件不存在,下载失败')
                     }
                 } else {
-                    this.getBusStandFileByAttId(attId)
+                    this.$preview(attId)
-                        .then(res => {
-                            if(res){
-                                const editFileInfo = res
-                                if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
-                                    window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
-                                }else {
-                                    const nowTime = new Date().getTime()
-                                    // window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
-                                    window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
-                                }
-                            }
-                        }).catch(e => {
-                        console.log(e)
-                        this.$message.warning('文件不存在,预览失败')
-                    })
                 }
             },
             // 导入标准数据成功后执行
             importFileSuccess (response, file,fileList) {
                 // 上传成功后判断是否是两条数据是的话替换掉旧数据
                 // if (fileList.length > 1) {
-                //   this.fileList = fileList.splice(0, 1)
+                //     fileList = fileList.splice(0, 1)
                 // }
                 if (response.ok) {
-
+                    const fileObj = {}
-                    switch (this.fileType){
+                    fileObj.id = file.response.data.id
+                    fileObj.name = file.response.data.name
+                switch (this.fileType){
                         case 'FBGBUSS':
-                            this.FBGBUSSFileList = fileList
+                            this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
+                            this.FBGBUSSFileList.push(fileObj)
                             break;
                         case 'BZSMBUSS' :
-                            this.BZSMBUSSFileList = fileList
+                            this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined);
+                            this.BZSMBUSSFileList.push(fileObj)
                             break;
                         case 'LSBBBUSS':
-                            this.LSBBBUSSFileList = fileList
+                            this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
+                            this.LSBBBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJLAWS':
-                            this.QTWJBUSSFileList = fileList
+                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.GLWJLAWSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
-                            this.GLWJBUSSFileList = fileList
+                            this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
+                            this.GLWJBUSSFileList.push(fileObj)
                             break;
                         default : ;
                     }
+                    this.formKey++
                     this.$message({
                         showClose: true,
                         message: response.message,
@@ -2157,6 +2051,7 @@
                 switch (this.fileType){
                     case 'FBGBUSS':
                         this.FBGBUSSFileList = fileList
+                        console.log(this.FBGBUSSFileList)
                         break;
                     case 'BZSMBUSS' :
                         this.BZSMBUSSFileList = fileList
@@ -2172,6 +2067,7 @@
                         break;
                     default : ;
                 }
+                this.formKey++
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
@@ -2302,6 +2198,17 @@
                     // this.$message.warning('文件不存在,预览失败')
                 })
             },
+            handleUploadFile(){
+                this.fileType = '';
+                this.fileType = 'footFile';
+
+                this.fileList=this.footFileList
+
+                this.fileMadel = true;
+            },
+            handleUploadedFile(){
+                this.fileMadel = true
+            },
             //保存
             handleSave() {
                 this.form.country=this.countryArr;
@@ -2333,19 +2240,20 @@
             fileInfoHandle(){
 
                 //拼接文件名和id 提交到流程Activity
-                this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
+                console.log(this.FBGBUSSFileList)
+                this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",")
                 this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
 
-                this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",")
                 this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",")
 
-                this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",")
                 this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",")
 
-                this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",")
                 this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",")
 
-                this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",")
+                this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",")
                 this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",")
 
             },
@@ -2434,53 +2342,58 @@
                 // } else if (val === '') {
                 //     this.form.country = []
                 // }
-                this.$refs['formTongGuo'].validate((valid) => {
+                this.fileInfoHandle()
-                    if (valid) {
+                this.$refs['form'].validate((valid) => {
-                        this.processModelHisOneCount(this.pId)
+                        if (valid) {
-                            .then(res => {
+                            this.$refs['formTongGuo'].validate((valid) => {
-                                if(res){
+                                if (valid) {
-                                    const editFileInfo = res
+                                    this.isSubmit = true
-                                    if(editFileInfo && editFileInfo.editStatus === '1'){
+                                    this.saveLoading = true
-                                        this.isSubmit = true
+                                    this.form.commentText = this.formTongGuo.commentText
-                                        this.saveLoading = true
+                                    this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                                        this.form.commentText = this.formTongGuo.commentText
+                                    const json = JSON.stringify(this.form);
-                                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                    this.$http.post('lawss/activiti/completeTask', {
-                                        const json = JSON.stringify(this.form);
+                                        taskIds: this.taskIds,
-                                        this.$http.post('lawss/activiti/completeTask', {
+                                        userId : this.userId,
-                                            taskIds: this.taskIds,
+                                        json: json
-                                            userId : this.userId,
+                                    }, {
-                                            json: json
+                                        _this: this
-                                        }, {
+                                    }, res => {
-                                            _this: this
+                                        if (res.success) {
-                                        }, res => {
+                                            this.$message.success(res.message)
-                                            if (res.success) {
+                                            // 流程提交之后，应该流转至待办任务页面
-                                                this.$message.success(res.message)
+                                            this.isSubmit = false
-                                                // 流程提交之后，应该流转至待办任务页面
+                                            this.saveLoading = false
-                                                this.isSubmit = false
+                                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                                this.saveLoading = false
+                                            // if(this.formTongGuo.approvalOpinion === '1'){
-                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                            //     this.$message.warning("驳回成功")
-                                                // if(this.formTongGuo.approvalOpinion === '1'){
+                                            //     this.isSubmit = false
-                                                //     this.$message.warning("驳回成功")
+                                            //     // 流程提交之后，应该流转至待办任务页面
-                                                //     this.isSubmit = false
+                                            //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                                //     // 流程提交之后，应该流转至待办任务页面
+                                            // }else{
-                                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                            //     this.processCreateLaws(json)
-                                                // }else{
+                                            // }
-                                                //     this.processCreateLaws(json)
+                                        }else {
-                                                // }
+                                            this.$message.success(res.message)
-                                            }else {
+                                        }
-                                                this.$message.success(res.message)
+                                    })
-                                            }
+                                    // this.processModelHisOneCount(this.pId)
-                                        })
+                                    //     .then(res => {
-                                    }else {
+                                    //         if(res){
-                                        this.$message.warning('请先在线编辑,再提交流程')
+                                    //             const editFileInfo = res
-                                    }
+                                    //             if(editFileInfo && editFileInfo.editStatus === '1'){
-
+                                    //             }else {
-                                }
+                                    //                 this.$message.warning('请先在线编辑,再提交流程')
-                            }).catch(e => {
+                                    //             }
-                            console.log(e)
+                                    //
-                            // this.$message.warning('文件不存在,预览失败')
+                                    //         }
-                        })
+                                    //     }).catch(e => {
-              }})
+                                    //     console.log(e)
+                                    //     // this.$message.warning('文件不存在,预览失败')
+                                    // })
+                                }})
+                        }
+                })
             },
             busVsFunc(){
                 this.$http.get('sarVppsTree/list', '', {
@@ -2515,16 +2428,18 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.formKey++
                 })
             },
             assemble(ids,names){
                 let list= new Array();
-                let idArray=ids.split(',');
+                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;
             },
             getData() {
@@ -2545,11 +2460,14 @@
                                 }
 
                                 this.getFormFieldList(processForm)
+                                this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
                                 this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
                                 this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
                                 this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
+                                console.log(this.LSBBBUSSFileList)
                                 this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
                                 this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
+                                this.formKey++
                             }
                         }).catch(e => {
                         })

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

@@ -1177,7 +1177,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -1293,7 +1293,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -1274,7 +1274,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -1355,7 +1355,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -1306,7 +1306,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -1306,7 +1306,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -1163,7 +1163,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -1167,7 +1167,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

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

@@ -1163,7 +1163,7 @@
                         { required: true, message: '请选择文本状态', trigger: 'change' }
                     ],
                     issueTime: [
-                        { required: true, message: '请选择企标发布日期', trigger: 'change' }
+                        { required: false, message: '请选择企标发布日期', trigger: 'change'}
                     ],
                     FBGBUSSName: [
                         { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue

@@ -23,6 +23,8 @@
           <el-row :gutter="24">
             <el-col :span="24">
               <el-form-item label="调整类型" class="add-form-item form-item-disabled">
+                <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('establish')">立项
+                </el-button>
                 <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('merge')">合并
                 </el-button>
                 <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('delay')">延期
@@ -31,8 +33,6 @@
                 </el-button>
                 <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('rename')">更名
                 </el-button>
-                <el-button size="small" type="primary" style="margin: 10px;" @click="toggleComName('establish')">立项
-                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -270,11 +270,11 @@ export default {
   },
   data() {
     return {
-      toggleType: '1',
+      toggleType: '5',
       comFlag: 1,
       active: "1",
       commentText: "",
-      comName: "merge",
+      comName: "establish",
       qbfsForm: {},
       formLoading: false,
       approvalFlag: false,

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -282,7 +282,6 @@ export default {
           this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
         }
         this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
-        this.commentText = JSON.parse(JSON.stringify(item)).commentText
       })
     },
     // 批量选择分发责任人

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

@@ -411,6 +411,7 @@ export default {
       let json = {
         passInfo: this.passInfo,
         responUserList: list,
+        commentText: this.commentText,
         actionFlag: 0
       }
       if(flag)return;

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

@@ -473,7 +473,8 @@ export default {
       let fileDataList = this.dataList
       let json = {
         info: { fileDataList },
-        username: this.$store.getters.userInfo.userName
+        username: this.$store.getters.userInfo.userName,
+        commentText: this.commentText,
       }
       const params = new FormData();
       params.set('json', JSON.stringify(json))

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

@@ -50,7 +50,7 @@
         </el-table>
       </div>
       <el-collapse accordion>
-        <el-collapse-item title="回执说明">
+        <el-collapse-item title="审批意见">
           <div style="margin: 10px 0;">
             <el-input
               type="textarea"

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

@@ -892,13 +892,16 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      let standList = []
+      if(this.breakdownList < 1){
-      this.breakdownList.forEach(item => {
+        this.$message.warning('请添加产品线数据')
-        if (item.implementer) {
+      }else{
-          standList.push(item);
+        let standList = [];
-        }
+        this.breakdownList.forEach(item => {
-      });
+          if (item.implementer) {
-        this.listForm.breakdownList = standList
+            standList.push(item);
+          }
+        });
+        this.listForm.breakdownList = standList;
         this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
         this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
         this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
@@ -922,6 +925,7 @@ export default {
           this.isSubmit = false;
         }, e => {
         });
+      }
     },
     drawerCheck(data) {
       var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());

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

@@ -738,7 +738,6 @@ export default {
               this.$set(item,'countermeasures', '')
               this.$set(item,'completionTime', '')
             })
-
           } else {
             this.dataList = item.dataList;
             this.dataList.forEach(item => {
@@ -811,33 +810,45 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.handlePrice()
+      let submitFlag = 0;
-      if(this.comFlag > 0) {
+      this.dataList.forEach(item => {
-        this.$message.warning('请填写完整的不符合项信息')
+       if(item.complianceReasons || item.noCompliance){
-        this.comFlag = 0
+         submitFlag = 1
+       }
+        return
+      })
+      if(submitFlag === 0 ){
+        this.$message.warning('请至少对一条信息进行评估')
       }else{
-        this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+        this.handlePrice()
-        this.listForm.commentText = this.commentText;
+        if(this.comFlag > 0) {
-        this.listForm.approvalOpinion = "";
+          this.$message.warning('请填写完整的不符合项信息')
-        this.listForm.signFlag = "";
+          this.comFlag = 0
-        this.listForm.dataList = this.dataList;
+        }else{
-        const json = JSON.stringify(this.listForm);
+          this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-        this.isSubmit = true;
+          this.listForm.commentText = this.commentText;
-        this.$http.post("lawss/activiti/completeTask", {
+          this.listForm.approvalOpinion = "";
-          taskIds: this.taskIds,
+          this.listForm.signFlag = "";
-          userId: this.userId,
+          this.listForm.dataList = this.dataList;
-          json: json
+          const json = JSON.stringify(this.listForm);
-        }, {
+          this.isSubmit = true
-          _this: this
+          return
-        }, res => {
+          this.$http.post("lawss/activiti/completeTask", {
-          if (res.success) {
+            taskIds: this.taskIds,
-            this.$message.success(res.message);
+            userId: this.userId,
-            this.$router.push("/processCenter");
+            json: json
-          }
+          }, {
-          this.isSubmit = false;
+            _this: this
-        }, e => {
+          }, res => {
+            if (res.success) {
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false;
+          }, e => {
 
-        });
+          });
+        }
       }
     },
     //批量编辑

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

@@ -794,33 +794,44 @@ export default {
     },
     //提交事件
     handleSubmit() {
-      this.handlePrice()
+      let submitFlag = 0;
-      if(this.comFlag > 0) {
+      this.dataList.forEach(item => {
-        this.$message.warning('请填写完整的不符合项信息')
+        if(item.complianceReasons || item.noCompliance){
-        this.comFlag = 0
+          submitFlag = 1
+        }
+        return
+      })
+      if(submitFlag === 0 ){
+        this.$message.warning('请至少对一条信息进行评估')
       }else{
-        this.listForm.dataList.forEach(item => {
+        this.handlePrice()
-           if(item.workPeople === '请选择责任人'){
+        if(this.comFlag > 0) {
-             item.workPeople = ''
+          this.$message.warning('请填写完整的不符合项信息')
-           }
+          this.comFlag = 0
-        })
+        }else{
-        this.isSubmit = true;
+          this.listForm.dataList.forEach(item => {
-        this.listForm.commentText = this.commentText;
+            if(item.workPeople === '请选择责任人'){
-        const json = JSON.stringify(this.listForm);
+              item.workPeople = ''
-        this.$http.post("lawss/activiti/completeTask", {
+            }
-          taskIds: this.taskIds,
+          })
-          userId: this.userId,
+          this.isSubmit = true;
-          json: json
+          this.listForm.commentText = this.commentText;
-        }, {
+          const json = JSON.stringify(this.listForm);
-          _this: this
+          this.$http.post("lawss/activiti/completeTask", {
-        }, res => {
+            taskIds: this.taskIds,
-          if (res.success) {
+            userId: this.userId,
-            this.$message.success(res.message);
+            json: json
-            this.$router.push("/processCenter");
+          }, {
-          }
+            _this: this
-          this.isSubmit = false;
+          }, res => {
-        }, e => {
+            if (res.success) {
-        });
+              this.$message.success(res.message);
+              this.$router.push("/processCenter");
+            }
+            this.isSubmit = false;
+          }, e => {
+          });
+        }
       }
     },
     //标准表格选择框改变

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

@@ -350,34 +350,38 @@
                 }
             },
             upload(row, title) {
-                var params = {
+                if (row.length > 0) {
-                    columnName: {
+                    var params = {
-                        chapterNumber: "章条编号",
+                        columnName: {
-                        chapterName: "章节名称",
+                            chapterNumber: "章条编号",
-                        commentText: "修改意见内容（包括理由或依据）",
+                            chapterName: "章节名称",
-                        oldText: "修改前",
+                            commentText: "修改意见内容（包括理由或依据）",
-                        newText: "修改后",
+                            oldText: "修改前",
-                        reason: "修改理由",
+                            newText: "修改后",
-                        department: "提出部门",
+                            reason: "修改理由",
-                        responUserName: "提出人",
+                            department: "提出部门",
-                    },
+                            responUserName: "提出人",
-                    dataList: []
+                        },
-                };
+                        dataList: []
-                if (title === '上报意见.xls') {
+                    };
-                    params.columnName.stateText = "处理意见"
+                    if (title === '上报意见.xls') {
-                }
+                        params.columnName.stateText = "处理意见"
-                params.dataList = JSON.parse(JSON.stringify(row));
-                params.dataList.forEach(item => {
-                    if (item.state === "1") {
-                        item.stateText = "上报";
-                    } else if (item.state === "2") {
-                        item.stateText = "处理后上报";
-                    } else {
-                        item.stateText = "不上报";
                     }
-                });
+                    params.dataList = JSON.parse(JSON.stringify(row));
-                this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+                    params.dataList.forEach(item => {
-                });
+                        if (item.state === "1") {
+                            item.stateText = "上报";
+                        } else if (item.state === "2") {
+                            item.stateText = "处理后上报";
+                        } else {
+                            item.stateText = "不上报";
+                        }
+                    });
+                    this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+                    });
+                } else {
+                    this.$message.warning('无上报数据')
+                }
             },
             handleTabs(name) {
                 this.active = name;
@@ -385,9 +389,6 @@
             handleSave() {
             },
             handleSubmit() {
-                if (this.data.length < 1) {
-                    this.$message.warning("请输入征求意见搞");
-                } else {
                     this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '0';
@@ -403,7 +404,6 @@
                         }
                         this.isSubmit = false;
                     });
-                }
             },
             handleSubmitNo() {
                 if (this.commentText) {

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

@@ -350,34 +350,38 @@
                 }
             },
             upload(row, title) {
-                var params = {
+                if (row.length > 0) {
-                    columnName: {
+                    var params = {
-                        chapterNumber: "章条编号",
+                        columnName: {
-                        chapterName: "章节名称",
+                            chapterNumber: "章条编号",
-                        commentText: "修改意见内容（包括理由或依据）",
+                            chapterName: "章节名称",
-                        oldText: "修改前",
+                            commentText: "修改意见内容（包括理由或依据）",
-                        newText: "修改后",
+                            oldText: "修改前",
-                        reason: "修改理由",
+                            newText: "修改后",
-                        department: "提出部门",
+                            reason: "修改理由",
-                        responUserName: "提出人",
+                            department: "提出部门",
-                    },
+                            responUserName: "提出人",
-                    dataList: []
+                        },
-                };
+                        dataList: []
-                if (title === '上报意见.xls') {
+                    };
-                    params.columnName.stateText = "处理意见"
+                    if (title === '上报意见.xls') {
-                }
+                        params.columnName.stateText = "处理意见"
-                params.dataList = JSON.parse(JSON.stringify(row));
-                params.dataList.forEach(item => {
-                    if (item.state === "1") {
-                        item.stateText = "上报";
-                    } else if (item.state === "2") {
-                        item.stateText = "处理后上报";
-                    } else {
-                        item.stateText = "不上报";
                     }
-                });
+                    params.dataList = JSON.parse(JSON.stringify(row));
-                this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+                    params.dataList.forEach(item => {
-                });
+                        if (item.state === "1") {
+                            item.stateText = "上报";
+                        } else if (item.state === "2") {
+                            item.stateText = "处理后上报";
+                        } else {
+                            item.stateText = "不上报";
+                        }
+                    });
+                    this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+                    });
+                } else {
+                    this.$message.warning('无上报数据')
+                }
             },
             handleTabs(name) {
                 this.active = name;
@@ -385,9 +389,6 @@
             handleSave() {
             },
             handleSubmit() {
-                if (this.data.length < 1) {
-                    this.$message.warning("请输入征求意见搞");
-                } else {
                     this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '0';
@@ -403,7 +404,6 @@
                         }
                         this.isSubmit = false;
                     });
-                }
             },
             handleSubmitNo() {
                 if (this.commentText) {

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

@@ -350,34 +350,38 @@
                 }
             },
             upload(row, title) {
-                var params = {
+                if (row.length > 0) {
-                    columnName: {
+                    var params = {
-                        chapterNumber: "章条编号",
+                        columnName: {
-                        chapterName: "章节名称",
+                            chapterNumber: "章条编号",
-                        commentText: "修改意见内容（包括理由或依据）",
+                            chapterName: "章节名称",
-                        oldText: "修改前",
+                            commentText: "修改意见内容（包括理由或依据）",
-                        newText: "修改后",
+                            oldText: "修改前",
-                        reason: "修改理由",
+                            newText: "修改后",
-                        department: "提出部门",
+                            reason: "修改理由",
-                        responUserName: "提出人",
+                            department: "提出部门",
-                    },
+                            responUserName: "提出人",
-                    dataList: []
+                        },
-                };
+                        dataList: []
-                if (title === '上报意见.xls') {
+                    };
-                    params.columnName.stateText = "处理意见"
+                    if (title === '上报意见.xls') {
-                }
+                        params.columnName.stateText = "处理意见"
-                params.dataList = JSON.parse(JSON.stringify(row));
-                params.dataList.forEach(item => {
-                    if (item.state === "1") {
-                        item.stateText = "上报";
-                    } else if (item.state === "2") {
-                        item.stateText = "处理后上报";
-                    } else {
-                        item.stateText = "不上报";
                     }
-                });
+                    params.dataList = JSON.parse(JSON.stringify(row));
-                this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+                    params.dataList.forEach(item => {
-                });
+                        if (item.state === "1") {
+                            item.stateText = "上报";
+                        } else if (item.state === "2") {
+                            item.stateText = "处理后上报";
+                        } else {
+                            item.stateText = "不上报";
+                        }
+                    });
+                    this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+                    });
+                } else {
+                    this.$message.warning('无上报数据')
+                }
             },
             handleTabs(name) {
                 this.active = name;
@@ -385,9 +389,6 @@
             handleSave() {
             },
             handleSubmit() {
-                if (this.data.length < 1) {
-                    this.$message.warning("请输入征求意见搞");
-                } else {
                     this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '0';
@@ -403,7 +404,6 @@
                         }
                         this.isSubmit = false;
                     });
-                }
             },
             handleSubmitNo() {
                 if (this.commentText) {

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

@@ -365,34 +365,38 @@
                 }
             },
             upload(row, title) {
-                var params = {
+                if (row.length > 0) {
-                    columnName: {
+                    var params = {
-                        chapterNumber: "章条编号",
+                        columnName: {
-                        chapterName: "章节名称",
+                            chapterNumber: "章条编号",
-                        commentText: "修改意见内容（包括理由或依据）",
+                            chapterName: "章节名称",
-                        oldText: "修改前",
+                            commentText: "修改意见内容（包括理由或依据）",
-                        newText: "修改后",
+                            oldText: "修改前",
-                        reason: "修改理由",
+                            newText: "修改后",
-                        department: "提出部门",
+                            reason: "修改理由",
-                        responUserName: "提出人",
+                            department: "提出部门",
-                    },
+                            responUserName: "提出人",
-                    dataList: []
+                        },
-                };
+                        dataList: []
-                if (title === '上报意见.xls') {
+                    };
-                    params.columnName.stateText = "处理意见"
+                    if (title === '上报意见.xls') {
-                }
+                        params.columnName.stateText = "处理意见"
-                params.dataList = JSON.parse(JSON.stringify(row));
-                params.dataList.forEach(item => {
-                    if (item.state === "1") {
-                        item.stateText = "上报";
-                    } else if (item.state === "2") {
-                        item.stateText = "处理后上报";
-                    } else {
-                        item.stateText = "不上报";
                     }
-                });
+                    params.dataList = JSON.parse(JSON.stringify(row));
-                this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+                    params.dataList.forEach(item => {
-                });
+                        if (item.state === "1") {
+                            item.stateText = "上报";
+                        } else if (item.state === "2") {
+                            item.stateText = "处理后上报";
+                        } else {
+                            item.stateText = "不上报";
+                        }
+                    });
+                    this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+                    });
+                } else {
+                    this.$message.warning('无上报数据')
+                }
             },
             handleTabs(name) {
                 this.active = name;
@@ -400,9 +404,6 @@
             handleSave() {
             },
             handleSubmit() {
-                if (this.data.length < 1) {
-                    this.$message.warning("请输入征求意见搞");
-                } else {
                     this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '0';
@@ -418,7 +419,6 @@
                         }
                         this.isSubmit = false;
                     });
-                }
             },
             handleSubmitNo() {
                 if (this.commentText) {

src/pages/processCenter/pages/phone/xmpg2/step3.vue

@@ -0,0 +1,464 @@
+<template>
+  <div class="xmpg2-step3 phoneBox">
+    <ProcessHeaderPhone toggle>
+      <template slot="proName">项目合规评估流程-项目</template>
+      <template slot="proNode">工程经理进行转办</template>
+    </ProcessHeaderPhone>
+    <div class="headerTabs">
+      <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
+      <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
+    </div>
+    <div class="content" v-show="active === '1'">
+      <div style="flex: auto; overflow: auto">
+        <process-title>
+          <template slot="title">基础信息</template>
+        </process-title>
+        <el-form
+          :model="listForm"
+          class="label-input-form prc-content-border"
+          label-width="150px"
+        >
+          <el-row :gutter="24">
+            <el-col :span="24">
+              <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectNumber"
+                  placeholder="请输入项目编号"
+                  disabled
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.projectName"
+                  disabled
+                  placeholder="请输入项目名称"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="架构经理" prop="jgUser" class="add-form-item form-item-disabled">
+                <el-input
+                  v-model="listForm.jgUserId"
+                  style="display: none"
+                />
+                <el-input
+                  v-model="listForm.jgUser"
+                  placeholder="请选择架构经理"
+                  clearable
+                  @click.native="choiceZRR"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <process-title>
+          <template slot="title">填写信息</template>
+        </process-title>
+        <el-table
+          :data="dataList"
+          border
+          ref="selection"
+          height="70%"
+          style="width: 100%; border:1px solid #ccc"
+          @selection-change="selectStandChange"
+          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+              fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center">
+          </el-table-column>
+          <el-table-column
+            prop="standId"
+            align="center"
+            label="标准号"
+          >
+            <template slot-scope="scope">
+              <a v-if="scope.row.standYear" class="table-jump"
+                 @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
+                }}-{{ scope.row.standYear }}</a>
+              <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSort }}
+                {{ scope.row.standNumber }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standName"
+            align="center"
+            label="中文名称"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="standEnName"
+            label="英文名称"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="ssrq"
+            align="center"
+            label="标准实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="xcxssrq"
+            width="190px"
+            align="center"
+            label="新车型实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zccssrq"
+            align="center"
+            width="190px"
+            label="在产车实施日期">
+          </el-table-column>
+          <el-table-column
+            prop="zrbm"
+            label="责任部门"
+            align="center"
+          >
+          </el-table-column>
+        </el-table>
+      </div>
+      <div>
+        <el-collapse accordion>
+          <el-collapse-item title="回执说明">
+            <div style="margin: 10px 0;">
+              <el-input
+                type="textarea"
+                :rows="3"
+                resize="none"
+                placeholder="请输入意见"
+                v-model="commentText">
+              </el-input>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </div>
+    </div>
+    <div class="content" v-show="active === '3'">
+      <div class="flow-list" style="height: 100%">
+        <Phone-histort-table :prc-num="$route.query.prcNum"></Phone-histort-table>
+      </div>
+    </div>
+    <ProcessFooter
+      show-save
+      show-transfer
+      show-submit
+      :submitLoading="isSubmit"
+      :transfer-loading="isTransfer"
+      :saveLoading="saveLoading"
+      @save="handleSave"
+      @transfer="handleTransfer"
+      @submit="handleSubmit"
+    >
+    </ProcessFooter>
+    <phone-role
+      :role-title="drawerTitle"
+      :result-list="phoneRoleList"
+      :is-show-phone.sync="modalshowflag"
+      @checkedRole="drawerCheck"
+    />
+  </div>
+</template>
+
+<script>
+import ProcessHeaderPhone from '../../components/ProcessHeaderPhone'
+import ProcessHeader from "../../components/ProcessHeader";
+import ProcessFooter from "../../components/ProcessFooter";
+import ProcessTitle from "../../components/ProcessTitle";
+import { inboundLiaisonDetail, saveTaskForPub ,changeAssigneeNew} from "api/process";
+
+export default {
+  name: "phoneXmpg2Step3",
+  components: {
+    ProcessHeaderPhone,
+    ProcessTitle,
+    ProcessFooter
+  },
+  data() {
+    return {
+      isTransfer: false,
+      // 调整处理人抽屉状态
+      drawerModal: false,
+      active: "1",
+      loading: false,
+      // 当前流程类型(1待办/2已办)
+      processType: 1,
+      isSubmit: false,
+      saveLoading: false,
+      showColumn: true,
+      drawerTitle: "", //drawer标题
+      modalshowflag: false, // drawer开关
+      selectList: [],
+      treeData: [], // 人员数据
+      roleForm: {
+        jgUser: ""
+      },
+      nodeList: [],
+      defaultProps: {
+        children: "children",
+        label: "name"
+      },
+      //表单的数据
+      listForm: {
+        jgUserId: '',
+        projectNumber: "",  //项目编号
+        projectName: "",  //项目名称
+        jgUser: "", //架构经理
+        dataList: [], //项目下的标准数据
+        breakdownList: [] //标准下的分解单数据
+
+      },
+      dataList: [], //展示的标准数据
+      commentText: "", //审批意见
+      detailData: [], //流程历史数据
+      userId: this.$store.getters.userInfo.userId,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      phoneRoleList: [],
+    };
+  },
+  methods: {
+    // 请求转换流程图
+    processNum (row) {
+      axios.request({
+        url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+        responseType: 'blob',
+        method: 'get',
+        params: {
+          prcNum: this.$route.query.prcNum
+        }
+      }).then(res => {
+        // let blob = new Blob([res.data], {type: 'image/jpg'})
+        // let url = window.URL.createObjectURL(res.data)
+        this.processStep = window.URL.createObjectURL(res.data)
+      })
+    },
+    //转办事件
+    handleTransfer(){
+      this.phoneRoleList = [],
+      this.modalshowflag = true
+      this.drawerTitle = '转办处理人'
+    },
+    // 点击查看
+    //查询项目下的标准
+    getStandData() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
+        _this: this
+      }, res => {
+        this.standardData = res.data.list;
+        this.standardData.forEach(item => {
+          if (item.attrInfoMap === null) {
+            this.$set(item, "ZCCSSRQ", "");
+            this.$set(item, "XCXSSRQ", "");
+          } else {
+            this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
+            this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
+          }
+        });
+        this.totalNo = res.data.count;
+      }, e => {
+      });
+    },
+    //tab改变
+    handleTabs(type) {
+      this.active = type;
+    },
+    //获取数据
+    getData() {
+      return new Promise((resolve, reject) => {
+        inboundLiaisonDetail({
+          taskIds: this.taskIds,
+          pId: this.pId
+        }).then(res => {
+          if (res) {
+            const processForm = JSON.parse(res.mesg);
+            this.getFormFieldList(processForm);
+          }
+        }).catch(e => {
+        });
+      });
+    },
+    //动态表单读取
+    getFormFieldList(item) {
+      this.$nextTick(() => {
+        this.listForm = JSON.parse(JSON.stringify(item));
+        if (item.form === undefined) {
+          this.listForm.prcNum = this.prcNum;
+          this.listForm.prcName = this.prcName;
+          this.listForm["id"] = item.id;
+          this.listForm.dataList = item.dataList;
+          this.dataList = item.dataList;
+          this.dataList.forEach(item => {
+            if(item.zrbm === "[]"){
+              item.zrbm = ''
+            }
+          })
+          this.dataList.distributePerson = item.dataList[0].distributePerson;
+          this.listForm.breakdownList = item.breakdownList;
+        } else {
+          this.listForm = item.form
+          this.dataList = item.form.dataList
+        }
+
+      });
+    },
+    //保存事件
+    handleSave() {
+      this.saveLoading = true;
+      let _formData = new FormData();
+      _formData.append("id", this.bpnId || "");
+      _formData.append("prcType", "6");
+      _formData.append("taskIds", this.taskIds);
+      _formData.append("json", JSON.stringify({
+        form: this.listForm,
+        commentText: this.commentText
+      }));
+      saveTaskForPub(_formData).then(res => {
+        this.saveLoading = false;
+        this.$message.success("保存成功");
+        this.bpnId = res.result;
+      }).catch(e => {
+        this.saveLoading = false;
+      });
+    },
+    //提交事件
+    handleSubmit() {
+      if (!this.listForm.jgUser) {
+        this.$message.warning("请选择架构经理");
+      } else {
+        this.isSubmit = true;
+        this.listForm.commentText = this.commentText;
+        const json = JSON.stringify(this.listForm);
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
+        });
+      }
+    },
+    choiceZRR() {
+      this.drawerTitle = '选择架构经理'
+      if (this.listForm.jgUserId.length > 0 ) {
+        this.phoneRoleList = this.listForm.jgUserId.split(',')
+      }
+      this.modalshowflag = true;
+    },
+    //标准表格选择框改变
+    selectStandChange(data) {
+      this.selectList = data;
+    },
+
+    drawerCheck(data) {
+     if (this.drawerTitle = '选择架构经理') {
+       if (data.length > 0) {
+         this.listForm.jgUserId = data[0].id
+         this.listForm.jgUser = data[0].name
+       }
+     } else {
+       if (data.length > 0) {
+         changeAssigneeNew({
+           taskId: this.$route.query.taskIds, // 任务id
+           assignee: data[0].id, // 被委托人
+           userId: this.$store.getters.userInfo.userId, // 委托人
+           pId: this.$route.query.prcId // 流程实例
+         }).then(res => {
+           this.isTransfer = false
+           if (res.success) {
+             this.$message.success('调整成功')
+             this.$router.push("/processCenter");
+             this.processNum()
+           } else {
+             this.$message.warning(res.message)
+           }
+         })
+       }
+     }
+    },
+  },
+  mounted() {
+    this.getData();
+  }
+};
+</script>
+
+<style lang="less" scoped>
+@import '~@/assets/styles/phone';
+
+.xmpg2-step3 {
+  /deep/ .el-drawer__container {
+    .prc-content-border {
+      border: none;
+      padding: 0 20px 0;
+    }
+  }
+
+  /deep/.van-dialog__content {
+    min-height: 300px;
+    padding: 10px;
+  }
+  .prc-content-border {
+    overflow: auto;
+  }
+  /deep/.prc-content-border .el-form-item__content {
+    width: 270px;
+  }
+  .choiceBtn {
+    .el-button--primary {
+      width: 150px;
+    }
+  }
+
+  position: relative;
+  height: 100%;
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    overflow: auto;
+
+    .tableTitle {
+      margin-bottom: 10px;
+      height: 30px;
+      line-height: 30px;
+      position: relative;
+      font-size: 13px;
+      font-weight: bold;
+
+      .tableButton {
+        position: absolute;
+        right: 0;
+        top: 0;
+      }
+
+      .accessStandardsAndRegulations {
+        height: 100%;
+      }
+    }
+  }
+
+  .demo-drawer-content {
+    margin-top: 10px;
+  }
+}
+</style>

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

@@ -330,7 +330,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '企标汇总修订'){
+          }else if (row.taskInfo === '企标编写汇总修订'){
             this.$router.push({
               name: 'bussLibrary3',
               query: {
@@ -341,7 +341,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '标准化员审批'){
+          }else if (row.taskInfo === '总院各中心兼职标准化员/各事业部标准化员初审'){
             this.$router.push({
               name: 'bussLibrary4',
               query: {
@@ -374,7 +374,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '主起草人修订并组织评审'){
+          }else if (row.taskInfo === '技术委员会评审/评审意见修改评审'){
             this.$router.push({
               name: 'bussLibrary6',
               query: {
@@ -385,7 +385,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '标准法规工程师复审'){
+          }else if (row.taskInfo === '标准法规部标准化工程师复审'){
             this.$router.push({
               name: 'bussLibrary7',
               query: {
@@ -396,7 +396,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '重新修订并组织评审'){
+          }else if (row.taskInfo === '重新技术委员会评审/评审意见修改评审'){
             this.$router.push({
               name: 'bussLibraryC6',
               query: {
@@ -407,7 +407,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '技术委员会负责人/起草中心主任审核'){
+          }else if (row.taskInfo === '起草单位高级经理审核'){
             this.$router.push({
               name: 'bussLibrary8',
               query: {
@@ -418,7 +418,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '标准法规部部长审核'){
+          }else if (row.taskInfo === '标准法规部高级经理审核'){
             this.$router.push({
               name: 'bussLibrary9',
               query: {
@@ -440,7 +440,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          }else if (row.taskInfo === '专委会主任/总院院长或主管副院长批准'){
+          }else if (row.taskInfo === '起草单位中心主任审定'){
             this.$router.push({
               name: 'bussLibrary11',
               query: {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -81,9 +81,9 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="标准号/标准名称" class="search-item">
+            <el-form-item label="标准号" class="search-item">
               <el-input
-                  v-model="sarAccessInfoSearch.standName"
+                  v-model="sarAccessInfoSearch.standNumber"
                   placeholder="请输入"
                   :maxlength="100"
               ></el-input>
@@ -202,7 +202,6 @@
           </el-table-column>
           <el-table-column
               prop="issueTime"
-              sortable
               align="center"
               width="110"
               label="发布日期">
@@ -212,7 +211,6 @@
           </el-table-column>
           <el-table-column
               prop="xcxssrq"
-              sortable
               align="center"
               width="150"
               label="新车型实施日期">
@@ -220,7 +218,6 @@
           <el-table-column
               show-overflow-tooltip
               prop="zccssrq"
-              sortable
               align="center"
               width="150"
               label="在产车实施日期">
@@ -327,7 +324,6 @@
         </el-table-column>
         <el-table-column
             prop="ssrq"
-            sortable
             align="center"
             width="210px"
             label="标准实施日期">
@@ -335,14 +331,12 @@
         <el-table-column
             show-overflow-tooltip
             prop="zccssrqgj"
-            sortable
             width="210px"
             align="center"
             label="在产车实施日期">
         </el-table-column>
         <el-table-column
             prop="xcxssrqgj"
-            sortable
             align="center"
             width="210px"
             label="新车型实施日期">
@@ -635,9 +629,10 @@ export default {
       // 新增、编辑 数据搜索字段
       sarAccessInfoSearch: {
         id: '',
-        standName: '',
+        standNumber: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -649,6 +644,7 @@ export default {
         standName: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -998,7 +994,7 @@ export default {
     clearSearchLaws() {
       this.sarAccessInfoSearch.askType = '' // 监管类型
       this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
-      this.sarAccessInfoSearch.standName = ''
+      this.sarAccessInfoSearch.standNumber = ''
       this.sarAccessInfo.standName = ''
       this.sarAccessInfo.standNumber = ''
       this.isListType = false
@@ -1476,6 +1472,8 @@ export default {
       })
     },
     pageInfo() {
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1526,6 +1524,8 @@ export default {
 
     },
     selectPage() {
+      this.sarAccessInfo.pageNo = 1
+      this.sarAccessInfo.page = 1
       StandardsInfoPage(this.sarAccessInfo).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue

@@ -182,12 +182,10 @@
           <el-table-column
             prop="issueTime"
             align="center"
-            sortable
             label="发布日期">
           </el-table-column>
           <el-table-column
             prop="xcxssrq"
-            sortable
             align="center"
             label="新车型实施日期">
           </el-table-column>
@@ -195,7 +193,6 @@
             show-overflow-tooltip
             prop="zccssrq"
             align="center"
-            sortable
             label="在产车实施日期">
           </el-table-column>
           <el-table-column
@@ -297,7 +294,6 @@
         </el-table-column>
         <el-table-column
           prop="ssrq"
-          sortable
           align="center"
           width="210px"
           label="标准实施日期">
@@ -305,14 +301,12 @@
         <el-table-column
           show-overflow-tooltip
           prop="zccssrq"
-          sortable
           width="210px"
           align="center"
           label="在产车实施日期">
         </el-table-column>
         <el-table-column
           prop="xcxssrq"
-          sortable
           align="center"
           width="210px"
           label="新车型实施日期">
@@ -499,6 +493,7 @@ export default {
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
+        pageNo: 1,
         Size: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         advanceSearchVOStr: ''
@@ -510,6 +505,7 @@ export default {
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
         page: 1,
+        pageNo: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
         advanceSearchVOStr: ''
@@ -832,6 +828,8 @@ export default {
     // 点数据搜索 查询按钮 事件
     searchLawsStands () {
       this.showTableFlag = false
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       this.selectLawsStands()
     },
     // 点击清空查询条件 按钮事件
@@ -1232,6 +1230,8 @@ export default {
       })
     },
     pageInfo() {
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
         StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
           this.sarAccessInfoSearchList = res.data.list
@@ -1282,6 +1282,8 @@ export default {
       }
     },
     selectPage() {
+      this.sarAccessInfo.page = 1
+      this.sarAccessInfo.pageNo = 1
       StandardsInfoPage(this.sarAccessInfo).then(res =>{
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {
@@ -1297,6 +1299,7 @@ export default {
     },
     // 高级检索查询按钮
     selectBtn() {
+      this.sarAccessInfo.pageNo = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.selectPage()

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue

@@ -238,20 +238,17 @@
           </el-table-column>
           <el-table-column
               prop="issueTime"
-              sortable
               align="center"
               label="发布日期">
           </el-table-column>
           <el-table-column
               prop="xcxssrq"
-              sortable
               align="center"
               label="新车型实施日期">
           </el-table-column>
           <el-table-column
               show-overflow-tooltip
               prop="zccssrq"
-              sortable
               align="center"
               label="在产车实施日期">
           </el-table-column>
@@ -355,7 +352,6 @@
         </el-table-column>
         <el-table-column
             prop="ssrq"
-            sortable
             align="center"
             width="210px"
             label="标准实施日期">
@@ -363,14 +359,12 @@
         <el-table-column
             show-overflow-tooltip
             prop="zccssrq"
-            sortable
             width="210px"
             align="center"
             label="在产车实施日期">
         </el-table-column>
         <el-table-column
             prop="xcxssrq"
-            sortable
             align="center"
             width="210px"
             label="新车型实施日期">
@@ -569,6 +563,7 @@ export default {
         syrz: '',
         typeApplicable: '',
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -582,6 +577,7 @@ export default {
         typeApplicable: '',
         askType: '', // 监管类型
         dataSource: 'INLAND_STAND', // 数据来源
+        pageNo: 1,
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent,
         validFlag: 0,
@@ -1355,6 +1351,8 @@ export default {
     },
     //  查询按钮
     selectLawsStands() {
+      this.sarAccessInfoSearch.pageNo = 1
+      this.sarAccessInfoSearch.page = 1
       if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
         this.sarAccessInfoSearch.standType = 'INLAND'
         this.pageInfo()
@@ -1371,6 +1369,8 @@ export default {
     },
     /** 高级查询查询按钮*/
     selectPage() {
+      this.sarAccessInfo.pageNo = 1
+      this.sarAccessInfo.page = 1
       StandardsInfoPage(this.sarAccessInfo).then(res => {
         this.sarAccessInfoSearchList = res.data.list
         this.sarAccessInfoSearchList.forEach(item => {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -163,10 +163,12 @@
                    v-btn-permission="'5aedea192a77b14c364f19bdcee3513a'"><i class="iconfont">&#xe611;</i>移除标准
         </el-button>
         <el-button class="common-button-default"
+                   v-btn-permission="'249aaa052affd5ad579ecffb8fd6b084'"
                    size="mini"
                    @click="OCRAdd('0')"><i class="iconfont">&#xe611;</i>OCR
         </el-button>
         <el-button class="common-button-default"
+                   v-btn-permission="'7b0ee71c73a89a28e8e754b371e50dde'"
                    size="mini"
                    @click="OCRAdd('1')"><i class="iconfont">&#xe611;</i>拆分
         </el-button>
@@ -426,9 +428,9 @@
                 <el-form-item label="标准类别" prop="standSort" label-width="150px" class="add-form-item">
                   <el-select v-model="sarStandardsInfoEO.standSort" filterable>
                     <el-option
-                        v-for="item in standSortOptions"
+                        v-for="(item, index) in standSortOptions"
                         placeholder="请选择"
-                        :key="item.value"
+                        :key="index"
                         :value="item.value"
                         :label="item.label"
                     ></el-option>
@@ -460,9 +462,9 @@
                              placeholder="请选择标准性质"
                              clearable>
                     <el-option
-                        v-for="item in standNatureOptions"
+                        v-for="(item,index) in standNatureOptions"
                         placeholder="请选择"
-                        :key="item.value"
+                        :key="index"
                         :value="item.value"
                         :label="item.label"
                     >
@@ -477,9 +479,9 @@
                              placeholder="请选择文本状态"
                              clearable>
                     <el-option
-                        v-for="opt in standStateOptions"
+                        v-for="(opt,index) in standStateOptions"
                         :disabled="opt.value !== 'ZTXXYX' && opt.value !== standState && modalshowtitle !== '编辑国内标准'"
-                        :key="opt.value"
+                        :key="index"
                         :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                     >
                       {{ opt.label }}
@@ -519,7 +521,6 @@
               <template v-for="field in displayLocation.child">
                 <template v-if="field.attrField === 'EOPSSRQ'">
                   <custom-eop-date-pick
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -527,7 +528,6 @@
                 </template>
                 <template v-else-if="field.attrField === 'SVPPS'">
                   <custom-SVPPS
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -535,7 +535,6 @@
                 </template>
                 <template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ' || field.attrField === 'SSRQ'">
                   <custom-date-pick-group
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -543,7 +542,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
                   <custom-date-pick-group
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -555,7 +553,6 @@
                   <template
                       v-if="field.attrField === 'DTBJH' || field.attrField === 'YYBJ' || field.attrField === 'CBBH' || field.attrField === 'BFDTBZ'">
                     <custom-input-for-standards
-                        :key="field.attrField"
                         :config="field"
                         :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
                         v-model="sarStandardsInfoEO[field.attrField]"
@@ -624,7 +621,6 @@
                   </template>
                   <template v-else-if="field.attrField === 'BBFDTBZ' || field.attrField === 'BYYBJ'">
                     <custom-input
-                        :key="field.attrField"
                         :config="field"
                         v-model="sarStandardsInfoEO[field.attrField]"
                         :disabled="true"
@@ -632,7 +628,6 @@
                   </template>
                   <template v-else>
                     <custom-input
-                        :key="field.attrField"
                         :config="field"
                         v-if="field.attrField !== 'BDTBZBH'"
                         v-model="sarStandardsInfoEO[field.attrField]"
@@ -643,7 +638,6 @@
 
                 <template v-else-if="field.attrType === 'INPUT_NUM'">
                   <custom-input-num
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -652,7 +646,6 @@
                 <template v-else-if="field.attrType === 'DATE_PICKER'">
                   <custom-date-pick
                       v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -661,7 +654,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'FILE'">
                   <custom-file
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -670,7 +662,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'TEXTAREA'">
                   <custom-textarea
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarStandardsInfoEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -679,7 +670,6 @@
                 <template v-else-if="field.attrType === 'SEL_OPTION'">
                   <template>
                     <custom-select
-                        :key="field.attrField"
                         :config="field"
                         v-model="sarStandardsInfoEO[field.attrField]"
                         :disabled="formdisableflag"
@@ -695,7 +685,6 @@
                     >
                       <template slot="label">责任部门</template>
                       <el-input
-                          :key="field.attrField"
                           :config="field"
                           clearable
                           v-model="sarStandardsInfoEO['ZRBM']"
@@ -752,7 +741,6 @@
                       <div style="display: flex;justify-content: space-between;align-items: center;">
                         <el-tooltip v-if="sarStandardsInfoEO['QCDW']" class="item" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">
                           <el-input
-                                  :key="field.attrField"
                                   :config="field"
                                   clearable
                                   type="textarea"
@@ -764,7 +752,6 @@
                         </el-tooltip>
                         <div v-else>
                           <el-input
-                                  :key="field.attrField"
                                   :config="field"
                                   clearable
                                   v-model="sarStandardsInfoEO['QCDW']"
@@ -785,7 +772,6 @@
 <!--                  全选-->
                   <template v-else>
                     <custom-select-array
-                        :key="field.attrField"
                         :config="field"
                         v-model="sarStandardsInfoEO[field.attrField]"
                         :disabled="formdisableflag"
@@ -1006,8 +992,8 @@
                 <el-formItem label="标准类别" prop="standSort" class="search-item">
                   <el-select v-model="sarConfigStandSearch.standSort" placeholder="根据标准类别查找"
                              @keyup.enter.native="searchConfiguraStand(true)" clearable>
-                    <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value"
+                    <el-option v-for="(opt, index) in standSortOptions" :value="opt.value === undefined ? '' :opt.value"
-                               :key="opt.value" :label="opt.label">{{ opt.label }}
+                               :key="index" :label="opt.label">{{ opt.label }}
                     </el-option>
                   </el-select>
                 </el-formItem>
@@ -1067,22 +1053,27 @@
               <el-table-column
                   prop="issueTime"
                   label="发布日期"
-                  sortable="custom"
                   width="120"
                   align="center">
                 <template slot-scope="scope">
                   {{ formatIssueDate(scope.row.issueTime) }}
                 </template>
               </el-table-column>
+<!--              <el-table-column-->
+<!--                  prop="XCXSSRQ"-->
+<!--                  label="实施日期"-->
+<!--                  sortable="custom"-->
+<!--                  width="120"-->
+<!--                  align="center">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <span>{{ formatText(scope.row.XCXSSRQ) }}</span>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
               <el-table-column
-                  prop="XCXSSRQ"
+                      prop="ssrq"
-                  label="实施日期"
+                      label="实施日期"
-                  sortable="custom"
+                      width="120"
-                  width="120"
+                      align="center">
-                  align="center">
-                <template slot-scope="scope">
-                  <span>{{ formatText(scope.row.XCXSSRQ) }}</span>
-                </template>
               </el-table-column>
               <el-table-column
                   prop="textStatus"
@@ -1548,8 +1539,8 @@
                   <el-form-item label="标准体系" class="add-form-item form-item-disabled">
                     <el-select v-model="advanceSearchMapping.TXLB" placeholder="根据标准体系查找" clearable
                                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in txlbOptions" :value="opt.value === undefined ? '' :opt.value"
+                      <el-option v-for="(opt, index) in txlbOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
+                                 :key="index"
                                  :label="opt.label">{{ opt.label }}
                       </el-option>
                     </el-select>
@@ -1588,8 +1579,8 @@
                   <el-form-item :label="$t('m.standNatureShow')" class="add-form-item form-item-disabled">
                     <el-select v-model="sarStandardsSearch.standNature" placeholder="请选择标准性质" clearable
                                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
+                      <el-option v-for="(opt, index) in standNatureOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value" :label="opt.label">{{ opt.label }}
+                                 :key="index" :label="opt.label">{{ opt.label }}
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -1661,8 +1652,8 @@
                   <el-form-item label="归口管理部门" class="add-form-item form-item-disabled">
                     <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable
                                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
+                      <el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value" :label="opt.label">{{ opt.label }}
+                                 :key="index" :label="opt.label">{{ opt.label }}
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -1670,8 +1661,8 @@
                   <el-form-item label="我司参与深度" class="add-form-item form-item-disabled">
                     <el-select v-model="advanceSearchMapping.CYSD" placeholder="请选择我司参与深度" clearable
                                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in cysdOptions" :value="opt.value === undefined ? '' :opt.value"
+                      <el-option v-for="(opt, index) in cysdOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
+                                 :key="index"
                                  :label="opt.label">{{ opt.label }}
                       </el-option>
                     </el-select>
@@ -1679,7 +1670,6 @@
                   <!--            适用车型-->
                   <template>
                     <custom-select-array
-                        :key="applyArcticOptions.options"
                         style="margin-left: -14px"
                         :config="applyArcticOptions"
                         v-model="sarStandardsSearch['applyArctic']"
@@ -1697,7 +1687,6 @@
                   <!--            适用认证-->
                   <template>
                     <custom-select-array
-                        :key="syrzOptions.options"
                         style="margin-left: -14px"
                         :config="syrzOptions"
                         v-model="advanceSearchMapping['SYRZ']"
@@ -1762,8 +1751,8 @@
                   <el-form-item label="起草单位" class="add-form-item form-item-disabled">
                     <el-select v-model="advanceSearchMapping.QCDW" placeholder="根据起草单位查找" clearable
                                @keyup.enter.native="getDomesticStandardTableBtn(sarStandardsSearch)">
-                      <el-option v-for="opt in qcdwOptions" :value="opt.value === undefined ? '' :opt.value"
+                      <el-option v-for="(opt, index) in qcdwOptions" :value="opt.value === undefined ? '' :opt.value"
-                                 :key="opt.value"
+                                 :key="index"
                                  :label="opt.label">{{ opt.label }}
                       </el-option>
                     </el-select>
@@ -1771,7 +1760,6 @@
                   <!--            能源类型-->
                   <template>
                     <custom-select-array
-                        :key="nylxOptions.options"
                         :config="nylxOptions"
                         style="margin-left: -14px"
                         v-model="advanceSearchMapping['NYLX']"
@@ -1789,7 +1777,6 @@
                   <!--            适用产品线（新增字段）-->
                   <template>
                     <custom-select-array
-                        :key="sycpxOptions.options"
                         :config="sycpxOptions"
                         style="margin-left: -14px"
                         v-model="advanceSearchMapping['SYCPX']"
@@ -1814,7 +1801,6 @@
                     >
                       <template slot="label">责任部门</template>
                       <el-input
-                          :key="zrbmOptions.options"
                           :config="zrbmOptions"
                           clearable
                           v-model="advanceSearchMapping['ZRBM']"
@@ -2009,8 +1995,8 @@
             @closed="QCDWmodal = false">
       <el-select v-model="QCDWValue" multiple filterable placeholder="请选择" style="width: 100%;">
         <el-option
-                v-for="item in QCDWList"
+                v-for="(item, index) in QCDWList"
-                :key="item.value"
+                :key="index"
                 :label="item.label"
                 :value="item.label">
         </el-option>
@@ -3017,8 +3003,6 @@ export default {
       this.urlChild = "sarModelTree/childByList"
     },
     popoverHideQuery(ids, attrField) {
-      console.log(ids)
-      console.log(attrField)
     },
     popoverHide(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData) {
@@ -3393,7 +3377,6 @@ export default {
             this.standState = JSON.parse(JSON.stringify(this.sarStandardsInfoEO.standState))
             formFieldList.forEach((field) => {
               displayLocation.forEach((location) => {
-                console.log(location)
                 let value = this.sarStandardsInfoEO[field.attrField]
                 let valueName = ''
                 if (value && field.attrType === 'DATE_PICKER') {
@@ -3917,7 +3900,6 @@ export default {
         // this.$http.post('sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel', paramAll, {
         //     _this: this,responseType: 'blob',
         // }, res => {
-        //   console.log(res)
         //     this.exportLoading = false
         //   let url = window.URL.createObjectURL(new Blob([res]))
         //   let link = document.createElement('a')
@@ -4203,7 +4185,6 @@ export default {
                 nowstandinfo.putTime = this.$dateFormat(this.sarStandardsInfoEO.putTime, 'yyyy-MM-dd hh:mm:ss')
               }
               // 代替标准号
-              console.log('4007',nowstandinfo.DTBJH);
               if (nowstandinfo.DTBJH != null) {
                 nowstandinfo.DTBJH = nowstandinfo.DTBJH.replace(/，/ig, ',')
               }
@@ -4405,6 +4386,7 @@ export default {
           }
         }
         this.configStandList = res.data.list
+        console.log(this.configStandList);
         this.configTotal = res.data.count
         this.selectConfigStand = []
       }, e => {
@@ -5554,7 +5536,6 @@ export default {
       })
     },
     choiceZRRS (type, title, id) {
-      console.log('2077',type, title, id)
       this.nodeList = []
       this.nodeList.push(id)
       this.userType = type
@@ -5562,7 +5543,6 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2 (data) {
-      console.log('1712',data)
       let idList = ''
       let nameList = ''
       data.forEach( item => {
@@ -5611,8 +5591,6 @@ export default {
       this.modalshowflagZRBM = true
     },
     drawerCheckZRBM(data) {
-
-      console.log("5389", this.drawerTitle);
       let idList = ''
       let nameList = ''
       data.forEach(item => {
@@ -5674,7 +5652,6 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
       _this: this
     }, res => {
-      console.log('5608',res.data)
       this.allSelectOptions = res.data || {}
       this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
       this.standNatureOptions = res.data.SARPROPERTY // 标准性质
@@ -6000,7 +5977,7 @@ export default {
   .el-drawer__wrapper {
     .demo-drawer-content {
       .drawer-content {
-        //height: calc(~'100% - 52px - 56px');
+        height: calc(~'100% - 52px - 56px');
         flex: auto;
         display: flex;
         flex-direction: column;

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -144,7 +144,7 @@
               <el-col :span="8">
                 <el-form-item label="标准状态" class="search-item">
                   <el-select v-model="sarBussionessSearch.standStatus" placeholder="根据标准状态查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)">
-                    <el-option v-for="opt in standStateOptions" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                    <el-option v-for="(opt,index) in standStateOptions" :value="opt.value" :key="index" :label="opt.label">{{ opt.label}}</el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -158,14 +158,14 @@
               <el-col :span="8">
                 <el-form-item label="密级" class="search-item">
                   <el-select v-model="sarBussionessSearch.MJ" placeholder="根据密级查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)">
-                    <el-option v-for="opt in allSelectOptions['MJ']" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                    <el-option v-for="(opt,index) in allSelectOptions['MJ']" :value="opt.value" :key="index" :label="opt.label">{{ opt.label}}</el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item label="授权" class="search-item">
                   <el-select v-model="sarBussionessSearch.SQ" placeholder="根据授权查找" clearable @keyup.enter.native="getBussionStandTableBtn(sarBussionessSearch)">
-                    <el-option v-for="opt in allSelectOptions['SHIFOU']" :value="opt.value" :key="opt.value" :label="opt.label">{{ opt.label}}</el-option>
+                    <el-option v-for="(opt,index) in allSelectOptions['SHIFOU']" :value="opt.value" :key="index" :label="opt.label">{{ opt.label}}</el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -471,9 +471,9 @@
                     <el-form-item label="企标类别" prop="standSort" label-width="150px" class="add-form-item">
                         <el-select v-model="sarBussionessStandEO.standSort" filterable>
                             <el-option
-                                    v-for="item in standSortOptions"
+                                    v-for="(item, indexs) in standSortOptions"
                                     placeholder="请选择"
-                                    :key="item.value"
+                                    :key="indexs"
                                     :value="item.value"
                                     :label="item.label"
                             ></el-option>
@@ -515,8 +515,8 @@
                                    placeholder="请选择文本状态"
                                    clearable>
                             <el-option
-                                    v-for="opt in standStateOptions"
+                                    v-for="(opt,index) in standStateOptions"
-                                    :key="opt.value"
+                                    :key="index"
                                     :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                             >
                                 {{ opt.label }}
@@ -546,7 +546,6 @@
                     >
                       <template slot="label">起草部门</template>
                       <el-input
-                          :key="field.attrField"
                           :config="field"
                           clearable
                           v-model="sarBussionessStandEO[field.attrField]"
@@ -577,7 +576,6 @@
                   </template>
                 <template v-if="field.attrField === 'SVPPS'">
                   <custom-SVPPS
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -586,7 +584,6 @@
                 <template v-else-if="field.attrType === 'INPUT_STR' && field.attrField !== 'XGLC' && field.attrField !== 'XGJLBUSS' && field.attrField !== 'XGJH'">
                   <template v-if="field.attrField === 'GFXYYWJ'">
                     <custom-input-for-standards
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarBussionessStandEO[field.attrField]"
                       :disabled="formdisableflag"
@@ -594,7 +591,6 @@
                   </template>
                   <template v-else-if="field.attrField === 'FSRQBUSS'">
                     <custom-input
-                      :key="field.attrField"
                       :config="field"
                       v-model="sarBussionessStandEO[field.attrField]"
                       :disabled="true"
@@ -681,7 +677,6 @@
                     </template>
                     <template v-else-if="field.attrField === 'DTQBBHBUSS'">
                         <custom-input-for-standards
-                                :key="field.attrField"
                                 :config="field"
                                 :class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
                                 v-model="sarBussionessStandEO[field.attrField]"
@@ -691,7 +686,6 @@
                     </template>
                     <template v-else-if="field.attrField === 'BDTQBBHBUSS'">
                         <custom-input
-                                :key="field.attrField"
                                 :config="field"
                                 v-model="sarBussionessStandEO[field.attrField]"
                                 :disabled="true"
@@ -699,7 +693,6 @@
                     </template>
                     <template v-else-if="field.attrField === 'XCSJBUSS'">
                         <custom-input
-                                :key="field.attrField"
                                 :config="field"
                                 v-model="sarBussionessStandEO[field.attrField]"
                                 :disabled="true"
@@ -707,7 +700,6 @@
                     </template>
                     <template v-else>
                         <custom-input
-                                :key="field.attrField"
                                 :config="field"
                                 v-model="sarBussionessStandEO[field.attrField]"
                                 :disabled="formdisableflag"
@@ -716,7 +708,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'DATE_PICKER'">
                   <custom-date-pick
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -724,7 +715,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'FILE'">
                   <custom-file
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -732,7 +722,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'TEXTAREA'">
                   <custom-textarea
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -755,7 +744,6 @@
                   <template v-else>
                     <custom-org
                       v-if="field.attrField !== 'WFSPJS'"
-                      :key="field.attrField"
                       :config="field"
                       :zNodes="orgData"
                       v-model="sarBussionessStandEO[field.attrField]"
@@ -767,7 +755,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'SEL_OPTION'">
                   <custom-select
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag"
@@ -775,7 +762,6 @@
                 </template>
                 <template v-else-if="field.attrType === 'SEL_OPTS' && field.attrField !== 'QCDW' && field.attrField !== 'QCRBUSS'">
                   <custom-select-array
-                    :key="field.attrField"
                     :config="field"
                     v-model="sarBussionessStandEO[field.attrField]"
                     :disabled="formdisableflag || field.attrField === 'YQLX'"
@@ -1041,9 +1027,9 @@
                               <el-form-item label="企标类别" title="企标类别" class="add-form-item form-item-disabled">
                                   <el-select v-model="sarBussionessSearch.standSort" filterable clearable>
                                       <el-option
-                                              v-for="item in standSortOptions"
+                                              v-for="(item, index) in standSortOptions"
                                               placeholder="请选择"
-                                              :key="item.value"
+                                              :key="index"
                                               :value="item.value"
                                               :label="item.label"
                                       ></el-option>
@@ -1099,8 +1085,8 @@
                                              placeholder="请选择文本状态"
                                              clearable>
                                       <el-option
-                                              v-for="opt in standStateOptions"
+                                              v-for="(opt,index) in standStateOptions"
-                                              :key="opt.value"
+                                              :key="index"
                                               :value="opt.value === undefined ? '' :opt.value" :label="opt.label"
                                       >
                                           {{ opt.label }}
@@ -1146,7 +1132,6 @@
                             >
                               <template slot="label">起草部门</template>
                               <el-input
-                                  :key="qcdwOptions.options"
                                   :config="qcdwOptions"
                                   clearable
                                   v-model="sarBussionessSearch.QCDW"
@@ -1169,7 +1154,6 @@
                             <!--            适用车型-->
                             <template>
                               <custom-select-array
-                                  :key="applyArcticOptions.options"
                                   :config="applyArcticOptions"
                                   style="margin-left: -14px"
                                   v-model="sarBussionessSearch['SYCXCLASS']"
@@ -1189,9 +1173,9 @@
                               <el-form-item label="体系类别" class="add-form-item form-item-disabled">
                                   <el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
                               </el-form-item>
-                              <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
+<!--                              <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
                                   <el-input v-model="sarBussionessSearch.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,false)"></el-input>
-                              </el-form-item>
+                              </el-form-item>-->
                           </el-col>
                           <el-col :span="12">
                             <el-form-item
@@ -1219,7 +1203,6 @@
                             <!--            能源类型-->
                             <template>
                               <custom-select-array
-                                  :key="categoryOptions.options"
                                   :config="categoryOptions"
                                   style="margin-left: -14px"
                                   v-model="sarBussionessSearch['NYLXCLASS']"
@@ -1239,7 +1222,6 @@
                             <!--            适用产品线（新增字段）-->
                             <template>
                               <custom-select-array
-                                  :key="sycpxOptions.options"
                                   :config="sycpxOptions"
                                   style="margin-left: -14px"
                                   v-model="sarBussionessSearch['SYCPXCLASS']"
@@ -1256,9 +1238,9 @@
 <!--                                      ></el-option>-->
 <!--                                  </el-select>-->
 <!--                              </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="sarBussionessSearch.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input>
-                              </el-form-item>
+                              </el-form-item>-->
                           </el-col>
                       </el-row>
                   </div>
@@ -1304,10 +1286,10 @@
 <!--      @getDomesticStandardTableBtn="(advancedSearch) => getBussionStandTableBtn(sarBussionessSearch, advancedSearch)"-->
 <!--    ></AdvancedQuery>-->
     <!--企标编号生成组件-->
-    <GenerationNumber
+<!--    <GenerationNumber-->
-      :is-show.sync="isShow"
+<!--      :is-show.sync="isShow"-->
-      @isOk="isOk"
+<!--      @isOk="isOk"-->
-    ></GenerationNumber>
+<!--    ></GenerationNumber>-->
 
     <Role-tree
         :is-title="drawerTitle"
@@ -2517,6 +2499,7 @@ export default {
                           type: 'success',
                           message: "删除成功"
                       })
+                      this.getBussionStandTable()
                       this.selectMenuList()
                   }else {
                       this.$message({
@@ -3830,6 +3813,7 @@ export default {
         this.sarBussionessSearch.advanceSearchVOStr = ''
         this.sarBussionessSearch.standEnName=''
         this.isAdvancedSearch = false
+        this.getBussionStandTable()
       } else if (flag === 2) {
         // 标准条目搜索
         // 标准条目搜索
@@ -4583,6 +4567,7 @@ export default {
         this.standNatureOptions = res.data.SARPROPERTY // 标准性质
         this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
         this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+        console.log(this.standSystemOptions);
         this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
         this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
         this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -23,9 +23,9 @@
                                   clearable
                                   :maxlength="100"></el-input>
                     </el-form-item>
-                    <el-form-item label="起草责任部门" class="search-item">
+                    <el-form-item label="起草责任单位" class="search-item">
                         <el-input v-model="form.unit"
-                                  placeholder="请输入起草责任部门"
+                                  placeholder="请输入起草责任单位"
                                   clearable
                                   :maxlength="100"></el-input>
                     </el-form-item>
@@ -110,9 +110,9 @@
                                 width="150"
                                 align="center"
                                 label="制修订状态">
-                            <template slot-scope="scope">
+<!--                            <template slot-scope="scope">-->
-                                <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+<!--                                <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>-->
-                            </template>
+<!--                            </template>-->
                         </el-table-column>
                         <el-table-column
                                 prop="drafterName"
@@ -268,6 +268,7 @@
                                                         clearable
                                                         v-model="addForm.unitName"
                                                         placeholder="请选择起草责任单位"
+                                                        readonly
                                                         @click.native="choiceZRBM(addForm.unit)">
                                                 </el-input>
 
@@ -468,6 +469,9 @@
                 this.modalshowflagZRBM = false
             },
             choiceZRBM(id) {
+                if (this.DrawerType === 'see') {
+                    return
+                }
                 this.nodeListZRBM = []
                 if (id) {
                     this.nodeListZRBM = id.split(',')
@@ -489,6 +493,9 @@
                 this.QCDWmodal = true
             },
             choiceZRR (type, title, id) {
+                if (this.DrawerType === 'see') {
+                    return
+                }
                 this.nodeList = []
                 this.nodeList.push(id)
                 this.type = type
@@ -500,6 +507,9 @@
                 this.addForm.wgLeaderName = data[0].name
             },
             choiceZRRS (type, title, id) {
+                if (this.DrawerType === 'see') {
+                    return
+                }
                 this.type = type
                 this.drawerTitle = title
                 this.nodeList2 = []

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -387,7 +387,7 @@
       <el-dialog :visible.sync="exportModelFlag" title="导出文件" width="300px">
         <el-form :inline="true" class="label-input-form search-area">
           <el-form-item label="导出名称" class="search-item">
-            <el-input v-model="exportName" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
+            <el-input v-model="exportName" @keyup.native="btKeyUp" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
           </el-form-item>
         </el-form>
         <span slot="footer" class="demo-drawer-footer">
@@ -2471,6 +2471,10 @@ export default {
     }
   },
   methods: {
+    // 限制导出框输入的字符
+    btKeyUp(e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()\+=<>?"{}|,\/;'\\[\]·~！@#￥%……&*（）——\+={}|《》？：“”【】、；‘’，。、. <>]/g,"");
+    },
     // 左右拖动事件
     dragControllerLR: function() {
       var resize = document.getElementById("resize");

src/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup.vue

@@ -122,7 +122,12 @@ export default {
   },
   watch: {
     value (val) {
-      this.tagList = val !== '' && val !== null ? val.split(',') : []
+      if(val !== '' && val !== null) {
+        this.tagList = []
+      } else {
+        this.tagList = val.split(',')
+      }
+      // this.tagList = val !== '' && val !== null ? val.split(',') : []
     },
     tagList: {
       handler (val) {

src/pages/regulatoryRepository/workingGroup/components/workingGroup1/index.vue

@@ -732,22 +732,22 @@
                         </el-table-column>
                         <el-table-column
                                 v-if="itemType !== '3'"
-                                prop="XCXSSRQ"
+                                prop="xcxssrq"
                                 sortable="custom"
                                 width="150"
                                 label="新车型实施日期">
                             <template slot-scope="scope">
-                                <span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}</span>
+                                <span>{{ scope.row.xcxssrq ? scope.row.xcxssrq : '-' }}</span>
                             </template>
                         </el-table-column>
                         <el-table-column
                                 v-if="itemType !== '3'"
-                                prop="ZCCSSRQ"
+                                prop="zccssrq"
                                 sortable="custom"
                                 width="150"
                                 label="在产车实施日期">
                             <template slot-scope="scope">
-                                <span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}</span>
+                                <span>{{ scope.row.zccssrq ? scope.row.zccssrq : '-' }}</span>
                             </template>
                         </el-table-column>
                     </el-table>

src/pages/searchCenter/pages/advancedSearch.vue

@@ -317,6 +317,7 @@
                               :show-checkBox="showCheckBox"
                               :url="url"
                               :urlChild="urlChild"
+                              @popoverHideCancel = "modalShowFlag2 = false"
                               :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
                               :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
                     </el-form-item>
@@ -342,6 +343,7 @@
                               :drawerTitle="drawerTitle"
                               :show-checkBox="showCheckBox"
                               :url="url"
+                              @popoverHideCancel = "modalShowFlag3 = false"
                               :urlChild="urlChild"
                               :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
                               :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>

src/router/index.js

@@ -2211,7 +2211,7 @@ const routes = [
       },
       {
         path: '/phoneXmpg2Step2',
-        name: 'phoneXmpg2Step22',
+        name: 'phoneXmpg2Step2',
         component: () => import('@/pages/processCenter/pages/phone/xmpg2/step2.vue'),
         meta: {
           isBoolean: true,
@@ -2219,6 +2219,16 @@ const routes = [
           title: '项目合规评估流程'
         }
       },
+      {
+        path: '/phoneXmpg2Step3',
+        name: 'phoneXmpg2Step3',
+        component: () => import('@/pages/processCenter/pages/phone/xmpg2/step3.vue'),
+        meta: {
+          isBoolean: true,
+          requireAuth: true,
+          title: '项目合规评估流程'
+        }
+      },
       {
         path: '/phoneXmpg2Step7',
         name: 'phoneXmpg2Step7',
@@ -2549,6 +2559,16 @@ const routes = [
           title: '政策征求意见流程'
         }
       },
+      {
+        path: '/phoneBzrkStep2',
+        name: 'phoneBzrkStep2',
+        component: () => import('@/pages/processCenter/pages/phone/bzrk/step2.vue'),
+        meta: {
+          isBoolean: true,
+          requireAuth: true,
+          title: '标准入库流程'
+        }
+      },
     ]
 
   },