Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!250

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>
@@ -1152,22 +1147,22 @@
       <div class="see-drawer-content">
         <div class="see-drawer-div">
           <label class="see-drawer-name" style="font-size: 14px" title="条款号">条款号</label>
-          <span class="see-drawer-val" :title="standShowItemEO.itemsNum">{{ standShowItemEO.itemsNum }}</span>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsNum">{{ standShowItemEO.itemsNum }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="条款名称">条款名称</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="条款名称">条款名称</label>
-          <span class="see-drawer-val" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.itemsName">{{ standShowItemEO.itemsName }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="内容简介">条款内容</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="内容简介">条款内容</label>
-          <span class="see-drawer-val"
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''">{{
               standShowItemEO.termsConditions ? standShowItemEO.termsConditions.replace(/<.*?>/ig, ' ') : ''
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="解读内容">解读内容</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="解读内容">解读内容</label>
-          <span class="see-drawer-val"
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''">
             {{
               standShowItemEO.readContent ? standShowItemEO.readContent.replace(/<.*?>/ig, ' ') : ''
@@ -1175,49 +1170,49 @@
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="新车型实施日期">新车型实施日期</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="新车型实施日期">新车型实施日期</label>
-          <span class="see-drawer-val"
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.xcxssrq">{{
               standShowItemEO.xccssrq
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="在产车实施日期">在产车实施日期</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="在产车实施日期">在产车实施日期</label>
-          <span class="see-drawer-val"
+          <span class="see-drawer-val" style="font-size: 12px"
                 :title="standShowItemEO.zccssrq">{{
               standShowItemEO.zccssrq
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="适用车型">适用车型</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="适用车型">适用车型</label>
-          <span class="see-drawer-val" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.applyArctic">{{ standShowItemEO.applyArctic }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="责任部门">责任部门</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="责任部门">责任部门</label>
-          <span class="see-drawer-val" :title="standShowItemEO.responsibleUnit">{{
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.responsibleUnit">{{
               standShowItemEO.responsibleUnit
             }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="责任工程师">责任工程师</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="责任工程师">责任工程师</label>
-          <span class="see-drawer-val" :title="standShowItemEO.dutyEngineer">
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.dutyEngineer">
             {{ standShowItemEO.dutyEngineer }}</span>
         </div>
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="基于上一版本差异">基于上一版本差异</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="基于上一版本差异">基于上一版本差异</label>
-          <span class="see-drawer-val" :title="standShowItemEO.comparedWithPrevious">
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.comparedWithPrevious">
             {{ standShowItemEO.comparedWithPrevious }}</span>
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="符合性状态">符合性状态</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="符合性状态">符合性状态</label>
-          <span class="see-drawer-val" :title="standShowItemEO.complianceRequire">
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceRequire">
             {{ standShowItemEO.complianceRequire }}</span>
         </div>
 
         <div class="see-drawer-div">
-          <label class="see-drawer-name" style="font-size: 15px" title="合规性分析">合规性分析</label>
+          <label class="see-drawer-name" style="font-size: 14px" title="合规性分析">合规性分析</label>
-          <span class="see-drawer-val" :title="standShowItemEO.complianceState">
+          <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.complianceState">
             {{ standShowItemEO.complianceState }}</span>
         </div>
         <!--        <div class="see-drawer-div">-->

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.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/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="审批意见">
@@ -323,6 +332,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 +355,11 @@ export default {
   name: "bzjdStep1-6",
   data() {
     return {
+      similarityDegree: '',
+      BDmodel: false,
+      oldNumber: '',
+      leftData: '',
+      rightData: '',
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
       itermsConditionsFlag: false,
@@ -366,6 +390,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 +493,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/step5.vue

@@ -525,6 +525,7 @@
                         this.json = data
                         this.itemList = data.itemList
                         this.loading = false
+                        this.getBDList()
                     }).catch(e => {
                     })
                 })

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

@@ -396,21 +396,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 +509,7 @@
                         this.json = data
                         this.itemList = data.itemList
                         this.loading = false
+                        this.getBDList()
                     }).catch(e => {
                     })
                 })

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

@@ -1807,37 +1807,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') {

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.vue

@@ -410,7 +410,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/step3.vue

@@ -592,7 +592,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.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"

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"
@@ -537,9 +537,6 @@
         });
       },
       handleSubmit() {
-        if (this.data.length < 1) {
-          this.$message.warning("请输入征求意见搞");
-        } else {
           this.isSubmit = true;
           var json = this.json;
           json.oldinfo = this.oldData;
@@ -556,7 +553,6 @@
             }
             this.isSubmit = false;
           });
-        }
       },
       getData() {
         return new Promise((resolve, reject) => {

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

@@ -408,34 +408,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 +447,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 +462,6 @@ export default {
           }
           this.isSubmit = false;
         });
-      }
     },
     handleSubmitNo() {
       if (this.commentText) {

src/pages/processCenter/pages/creatProcess/bzzqyj/step7.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.bdFlag = '0'
@@ -458,7 +459,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/step1.vue

@@ -6,7 +6,7 @@
         </ProcessHeader>
         <div class="headerTabs">
             <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
-            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>
+<!--            <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div>-->
             <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">人员信息</div>
         </div>
         <div class="content">
@@ -137,28 +137,21 @@
                                             v-model="form.FBGBUSSName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="FBGBUSSFileList.length>0">
+                                  <div style="display: flex;justify-content: space-between">
-<!--                                        {{ form.fbgbjbdName }}-->
+                                      <div style="width: 80%;">
-                                        <el-button
+                                          <div v-for="(item,index) in FBGBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
-                                                type="primary"
+                                      </div>
-                                                class="common-button-primary"
+                                      <div style="width: 20%;">
-                                                size="mini"
+                                          <el-button
-                                                style="margin-left: 10px"
+                                                  type="primary"
-                                                @click="fileUpload('FBGBUSS')">
+                                                  class="common-button-primary"
-                                          <i class="el-icon-upload el-icon--right"></i>
+                                                  size="mini"
-                                         查看已上传的文件
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
-                                        </el-button>
+                                                  @click="fileUpload('FBGBUSS')">
-                                    </div>
+                                              <i class="el-icon-upload"></i>
-                                    <div v-else>
+                                          </el-button>
-                                        <el-button
+                                      </div>
-                                                type="primary"
+                                  </div>
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('FBGBUSS')">
-                                          <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
-                                    </div>
                                 </el-form-item>
                               <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
                                 <el-input
@@ -167,28 +160,21 @@
                                     v-model="form.LSBBBUSSName"
                                     clearable
                                 ></el-input>
-                                <div v-if="LSBBBUSSFileList.length>0">
+                                  <div style="display: flex;justify-content: space-between">
-                                  <!--                                        {{ form.caName }}-->
+                                      <div style="width: 80%;">
-                                  <el-button
+                                          <div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
-                                      type="primary"
+                                      </div>
-                                      class="common-button-primary"
+                                      <div style="width: 20%;">
-                                      size="mini"
+                                          <el-button
-                                      style="margin-left: 10px"
+                                                  type="primary"
-                                      @click="fileUpload('LSBBBUSS')">
+                                                  class="common-button-primary"
-                                    <i class="el-icon-upload el-icon--right"></i>
+                                                  size="mini"
-                                    查看已上传的文件
+                                                  style="margin-left: 10px; margin-top: 11px; float: right;"
-                                  </el-button>
+                                                  @click="fileUpload('LSBBBUSS')">
-                                </div>
+                                              <i class="el-icon-upload"></i>
-                                <div v-else>
+                                          </el-button>
-                                  <el-button
+                                      </div>
-                                      type="primary"
+                                  </div>
-                                      class="common-button-primary"
-                                      size="mini"
-                                      @click="fileUpload('LSBBBUSS')">
-                                    <i class="el-icon-upload el-icon--right"></i>
-                                    点击上传
-                                  </el-button>
-                                </div>
                               </el-form-item>
                             </el-col>
                             <el-col :span="12">
@@ -199,27 +185,20 @@
                                             v-model="form.BZSMBUSSName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="BZSMBUSSFileList.length>0">
+                                    <div style="display: flex;justify-content: space-between">
-                                        <!--                                        {{ form.ssgName }}-->
+                                        <div style="width: 80%;">
-                                        <el-button
+                                            <div v-for="(item,index) in BZSMBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
-                                                type="primary"
+                                        </div>
-                                                class="common-button-primary"
+                                        <div style="width: 20%;">
-                                                size="mini"
+                                            <el-button
-                                                style="margin-left: 10px"
+                                                    type="primary"
-                                                @click="fileUpload('BZSMBUSS')">
+                                                    class="common-button-primary"
-                                            <i class="el-icon-upload el-icon--right"></i>
+                                                    size="mini"
-                                            查看已上传的文件
+                                                    style="margin-left: 10px; margin-top: 11px; float: right;"
-                                        </el-button>
+                                                    @click="fileUpload('BZSMBUSS')">
-                                    </div>
+                                                <i class="el-icon-upload"></i>
-                                    <div v-else>
+                                            </el-button>
-                                        <el-button
+                                        </div>
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('BZSMBUSS')">
-                                            <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
                                     </div>
                                 </el-form-item>
                                 <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
@@ -229,27 +208,20 @@
                                             v-model="form.QTWJBUSSName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="QTWJBUSSFileList.length>0">
+                                    <div style="display: flex;justify-content: space-between">
-                                        <!--                                        {{ form.ssgName }}-->
+                                        <div style="width: 80%;">
-                                        <el-button
+                                            <div v-for="(item,index) in QTWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
-                                                type="primary"
+                                        </div>
-                                                class="common-button-primary"
+                                        <div style="width: 20%;">
-                                                size="mini"
+                                            <el-button
-                                                style="margin-left: 10px"
+                                                    type="primary"
-                                                @click="fileUpload('QTWJBUSS')">
+                                                    class="common-button-primary"
-                                            <i class="el-icon-upload el-icon--right"></i>
+                                                    size="mini"
-                                            查看已上传的文件
+                                                    style="margin-left: 10px; margin-top: 11px; float: right;"
-                                        </el-button>
+                                                    @click="fileUpload('QTWJBUSS')">
-                                    </div>
+                                                <i class="el-icon-upload"></i>
-                                    <div v-else>
+                                            </el-button>
-                                        <el-button
+                                        </div>
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('QTWJBUSS')">
-                                            <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
                                     </div>
                                 </el-form-item>
 
@@ -263,15 +235,12 @@
                         <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="请选择起草部门" multiple>
+                                    <el-input
-                                        <el-option
+                                            clearable
-                                                v-for="item in qcdwOptions"
+                                            v-model="form.QCDW"
-                                                placeholder="请选择"
+                                            placeholder="选择起草部门"
-                                                :key="item.value"
+                                            @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)">
-                                                :value="item.value"
+                                    </el-input>
-                                                :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
@@ -301,15 +270,12 @@
                             </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="请选择起草人">
+                                    <el-input
-                                        <el-option
+                                        v-model="form.QCRBUSS"
-                                                v-for="item in qcrOptions"
+                                        placeholder="选择起草人"
-                                                placeholder="请选择"
+                                        clearable
-                                                :key="item.value"
+                                        @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
-                                                :value="item.value"
+                                    </el-input>
-                                                :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="请选择适用车型" multiple>
@@ -366,49 +332,42 @@
                                             v-model="form.GLWJBUSSName"
                                             clearable
                                     ></el-input>
-                                    <div v-if="GLWJBUSSFileList.length>0">
+                                    <div style="display: flex;justify-content: space-between">
-
+                                        <div style="width: 80%;">
-                                        <el-button
+                                            <div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
-                                                type="primary"
+                                        </div>
-                                                class="common-button-primary"
+                                        <div style="width: 20%;">
-                                                size="mini"
+                                            <el-button
-                                                @click="fileUpload('GLWJBUSS')">
+                                                    type="primary"
-                                            <i class="el-icon-upload el-icon--right"></i>
+                                                    class="common-button-primary"
-                                            查看已上传文件
+                                                    size="mini"
-                                        </el-button>
+                                                    style="margin-left: 10px; margin-top: 11px; float: right;"
-                                        <!--                                        {{ form.glwjName }}-->
+                                                    @click="fileUpload('GLWJBUSS')">
-                                    </div>
+                                                <i class="el-icon-upload"></i>
-                                    <div v-else>
+                                            </el-button>
-                                        <el-button
+                                        </div>
-                                                type="primary"
-                                                class="common-button-primary"
-                                                size="mini"
-                                                @click="fileUpload('GLWJLAWS')">
-                                            <i class="el-icon-upload el-icon--right"></i>
-                                            点击上传
-                                        </el-button>
                                     </div>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="12">
-                                <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">
+<!--                                <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
-                                  <el-input
+<!--                                  <el-input-->
-                                      v-model="form.BDTWJHLAWS"
+<!--                                      v-model="form.BDTWJHLAWS"-->
-                                      placeholder="请输入被代替企标编号"
+<!--                                      placeholder="请输入被代替企标编号"-->
-                                      clearable
+<!--                                      clearable-->
-                                  ></el-input>
+<!--                                  ></el-input>-->
-                                  <el-button
+<!--                                  <el-button-->
-                                      type="primary"
+<!--                                      type="primary"-->
-                                      class="common-button-primary"
+<!--                                      class="common-button-primary"-->
-                                      size="mini"
+<!--                                      size="mini"-->
-                                      style="position:absolute;top: 10px;right: 0;"
+<!--                                      style="position:absolute;top: 10px;right: 0;"-->
-                                      @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"
+<!--                                      @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"-->
-                                  >{{'手动查找'}}</el-button>
+<!--                                  >{{'手动查找'}}</el-button>-->
-                                </el-form-item>
+<!--                                </el-form-item>-->
                                 <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.XCSJBUSS"
-                                            placeholder="请输入代替标准号"
+                                            placeholder=""
                                             clearable
                                             :disabled="true"
                                     ></el-input>
@@ -417,85 +376,85 @@
                         </el-row>
                     </div>
                 </div>
-                <div class="block" id="active2" v-show="active === '2'">
+<!--                <div class="block" id="active2" v-show="active === '2'">-->
-                    <ProcessTitle>
+<!--                    <ProcessTitle>-->
-                        <template slot="title">模块信息</template>
+<!--                        <template slot="title">模块信息</template>-->
-                    </ProcessTitle>
+<!--                    </ProcessTitle>-->
-                    <template>
+<!--                    <template>-->
-                        <div class="prc-content-border" style="height: 66vh;position: relative;">
+<!--                        <div class="prc-content-border" style="height: 66vh;position: relative;">-->
-                            <div class="action-bar">
+<!--                            <div class="action-bar">-->
-                                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">
+<!--                                <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
-                                    批量编辑
+<!--                                    批量编辑-->
-                                </el-button>
+<!--                                </el-button>-->
-                                <el-button
+<!--                                <el-button-->
-                                        type="primary"
+<!--                                        type="primary"-->
-                                        size="mini"
+<!--                                        size="mini"-->
-                                        class="common-button-primary add-button"
+<!--                                        class="common-button-primary add-button"-->
-                                        @click="createRow"
+<!--                                        @click="createRow"-->
-                                >创建模块</el-button>
+<!--                                >创建模块</el-button>-->
-                            </div>
+<!--                            </div>-->
-                            <el-table
+<!--                            <el-table-->
-                                    ref="selection"
+<!--                                    ref="selection"-->
-                                    tooltip-effect="dark"
+<!--                                    tooltip-effect="dark"-->
-                                    style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"
+<!--                                    style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
-                                    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+<!--                                    :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
-                                        fontWeight: 'bold', height: '48px'}"
+<!--                                        fontWeight: 'bold', height: '48px'}"-->
-                                    @selection-change="handleSelectionChange"
+<!--                                    @selection-change="handleSelectionChange"-->
-                                    row-key="id"
+<!--                                    row-key="id"-->
-                                    :data="form.modelData"
+<!--                                    :data="form.modelData"-->
-                                    border
+<!--                                    border-->
-                                    default-expand-all
+<!--                                    default-expand-all-->
-                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+<!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-                                <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>
+<!--                                <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
-                                <el-table-column
+<!--                                <el-table-column-->
-                                        prop="modelNum"
+<!--                                        prop="modelNum"-->
-                                        label="序号"
+<!--                                        label="序号"-->
-                                        min-width="15%"
+<!--                                        min-width="15%"-->
-                                        align="center"
+<!--                                        align="center"-->
-                                        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+<!--                                        :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
-                                </el-table-column>
+<!--                                </el-table-column>-->
-                                <el-table-column
+<!--                                <el-table-column-->
-                                        label="名称"
+<!--                                        label="名称"-->
-                                        align="center"
+<!--                                        align="center"-->
-                                        min-width="30%">
+<!--                                        min-width="30%">-->
-                                    <template slot-scope="scope">
+<!--                                    <template slot-scope="scope">-->
-                                        <el-form-item
+<!--                                        <el-form-item-->
-                                                style="margin-left: 0;margin-bottom:0;"
+<!--                                                style="margin-left: 0;margin-bottom:0;"-->
-                                                >
+<!--                                                >-->
-                                            <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>
+<!--                                            <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
-                                        </el-form-item>
+<!--                                        </el-form-item>-->
-                                    </template>
+<!--                                    </template>-->
-                                </el-table-column>
+<!--                                </el-table-column>-->
-                                <el-table-column
+<!--                                <el-table-column-->
-                                        label="责任人"
+<!--                                        label="责任人"-->
-                                        min-width="15%"
+<!--                                        min-width="15%"-->
-                                        align="center">
+<!--                                        align="center">-->
-                                    <template slot-scope="scope">
+<!--                                    <template slot-scope="scope">-->
-                                        <el-form-item
+<!--                                        <el-form-item-->
-                                                style="margin-left: 0;margin-bottom:0;"
+<!--                                                style="margin-left: 0;margin-bottom:0;"-->
-                                                >
+<!--                                                >-->
-                                            <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>
+<!--                                            <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
-                                        </el-form-item>
+<!--                                        </el-form-item>-->
-                                    </template>
+<!--                                    </template>-->
-                                </el-table-column>
+<!--                                </el-table-column>-->
-                                <el-table-column label="操作" align="center"  min-width="5%">
+<!--                                <el-table-column label="操作" align="center"  min-width="5%">-->
-                                    <template slot-scope="scope">
+<!--                                    <template slot-scope="scope">-->
-                                        <div @click.stop style="display: inline-block">
+<!--                                        <div @click.stop style="display: inline-block">-->
-                                            <el-dropdown trigger="click" @command="handleCommand">
+<!--                                            <el-dropdown trigger="click" @command="handleCommand">-->
-                                                <i class="iconfont">&#xe61e;</i>
+<!--                                                <i class="iconfont">&#xe61e;</i>-->
-                                                <el-dropdown-menu slot="dropdown">
+<!--                                                <el-dropdown-menu slot="dropdown">-->
-<!--                                                    <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
+<!--&lt;!&ndash;                                                    <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>&ndash;&gt;-->
-                                                    <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>
+<!--                                                    <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
-                                                    <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
+<!--                                                    <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
-                                                </el-dropdown-menu>
+<!--                                                </el-dropdown-menu>-->
-                                            </el-dropdown>
+<!--                                            </el-dropdown>-->
-                                        </div>
+<!--                                        </div>-->
-                                    </template>
+<!--                                    </template>-->
-                                </el-table-column>
+<!--                                </el-table-column>-->
-                            </el-table>
+<!--                            </el-table>-->
-                        </div>
+<!--                        </div>-->
-                    </template>
+<!--                    </template>-->
-                </div>
+<!--                </div>-->
                 <div class="block" style="padding-top: 20px;" v-show="active === '3'">
                     <el-timeline>
                         <el-form
@@ -513,22 +472,22 @@
                                 </el-form-item>
                             </el-card>
                             </el-timeline-item>
-<!--                            <el-timeline-item timestamp="选择其他起草人" prop="qcUserName" placement="top" :color="roleForm.qcUserName ? '#66b1ff' : ''">-->
+                            <el-timeline-item timestamp="选择其他起草人" prop="qcUserName" placement="top" :color="roleForm.qcUserName ? '#66b1ff' : ''">
-<!--                                <el-card>-->
+                                <el-card>
-<!--                                    <el-form-item prop="qcUserName" style="margin-bottom: 0">-->
+                                    <el-form-item prop="qcUserName" style="margin-bottom: 0">
-<!--                                        <h4>其他起草人</h4>-->
+                                        <h4>其他起草人</h4>
-<!--                                        <div style="margin-top: 10px;width: 300px;">-->
+                                        <div style="margin-top: 10px;width: 300px;">
-<!--                                            <el-input v-model="roleForm.qcUserName" placeholder="其他起草人" @click.native="choiceZRRList('qcUserId', '选择其他起草人', roleForm.qcUserId)"></el-input>-->
+                                            <el-input v-model="roleForm.qcUserName" clearable placeholder="其他起草人" @click.native="choiceZRR('qcUserId', '选择其他起草人', roleForm.qcUserId)"></el-input>
-<!--                                        </div>-->
+                                        </div>
-<!--                                    </el-form-item>-->
+                                    </el-form-item>
-<!--                                </el-card>-->
+                                </el-card>
-<!--                            </el-timeline-item>-->
+                            </el-timeline-item>
                             <el-timeline-item timestamp="主起草人汇总修订" placement="top" :color="roleForm.hzUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="hzUserName" style="margin-bottom: 0">
                                         <h4>主起草人汇总修订人</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input disabled v-model="roleForm.hzUserName" placeholder="主起草人汇总修订人"></el-input>
+                                            <el-input disabled v-model="roleForm.hzUserName" clearable placeholder="主起草人汇总修订人"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -573,12 +532,12 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择技术委员会负责刃/起草中心主任" prop="fggcsUserName" placement="top" :color="roleForm.jsfzrUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="选择技术委员会负责人/起草中心主任" prop="fggcsUserName" placement="top" :color="roleForm.jsfzrUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="jsfzrUserName" style="margin-bottom: 0">
-                                        <h4>技术委员会负责刃/起草中心主任</h4>
+                                        <h4>技术委员会负责人/起草中心主任</h4>
                                         <div style="margin-top: 10px;width: 300px;">
-                                            <el-input v-model="roleForm.jsfzrUserName" placeholder="选择技术委员会负责刃/起草中心主任" @click.native="choiceZRR('jsfzrUserId', '选择技术委员会负责刃/起草中心主任', roleForm.jsfzrUserId)"></el-input>
+                                            <el-input v-model="roleForm.jsfzrUserName" placeholder="选择技术委员会负责人/起草中心主任" @click.native="choiceZRR('jsfzrUserId', '选择技术委员会负责人/起草中心主任', roleForm.jsfzrUserId)"></el-input>
                                         </div>
                                     </el-form-item>
                                 </el-card>
@@ -776,7 +735,7 @@
             </div>
         </el-dialog>
         <Role-tree
-                is-title="选择责任部门对接人"
+                :is-title="drawerTitle"
                 :is-visible.sync="modalShowRoleFlag"
                 @checkedRole="checkedRole2"
                 :nodeList="nodeList2"
@@ -968,6 +927,12 @@
                         @click="handleProcessStandardNext(3)">取消</el-button>
             </div>
         </el-drawer>
+        <Mechanism-tree
+                is-title="选择部门信息"
+                :is-visible.sync="modalShowFlagZRBM"
+                :nodeList="nodeListZRBM"
+                @checkedRole="drawerCheckZRBM"
+        />
         <!-- 组件树-->
         <tree-select-new
                 :multiple=false
@@ -1066,6 +1031,7 @@
                   }]
               },
               fileList: [],
+              footFileList: [],
               FBGBUSSFileList: [],
               BZSMBUSSFileList: [],
               LSBBBUSSFileList: [],
@@ -1159,6 +1125,8 @@
                     children: 'children',
                     label: 'model'
                 },
+                modalShowFlagZRBM: false,
+                nodeListZRBM: [],
                 nodeList: [],
                 nodeList2: [],
                 zrType: '',
@@ -1202,6 +1170,8 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    footFile:'',
+                    footFileName:'',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1226,7 +1196,9 @@
                     QTWJBUSSName: '',
                     // 适用范围
                     QCDW: '',
+                    QCDWID: '',
                     QCRBUSS: '',
+                    QCRBUSSID: '',
                     WJSCRYBUSS: this.$store.getters.userInfo.userId,
                     WJSCRYBUSSName: this.$store.getters.userInfo.userName,
                     SYCXCLASS: '',
@@ -1295,7 +1267,7 @@
                         { required: true, message: '请选择会签责任人', trigger: 'blur' },
                     ],
                     fggcsUserName: [
-                        { required: true, message: '选择技术委员会负责刃/起草中心主任', trigger: 'blur' },
+                        { required: true, message: '选择标准法规工程师', trigger: 'blur' },
                     ],
                     jsfzrUserName: [
                         { required: true, message: '选择技术委员会负责人/起草中心主任', trigger: 'blur' },
@@ -1342,7 +1314,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' }
@@ -1582,6 +1554,9 @@
                 }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;
                 }
             },
             checkedRole (data) {
@@ -1619,6 +1594,9 @@
                 }else if(this.userType === 'zhrUserId'){
                     this.roleForm.zhrUserId = data[0].id
                     this.roleForm.zhrUserName = data[0].name
+                }else if(this.userType === 'qcUserId'){
+                    this.roleForm.qcUserId = data[0].id
+                    this.roleForm.qcUserName = data[0].name
                 }
                 this.modalShowFlag = false
             },
@@ -1636,6 +1614,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);
@@ -1938,8 +1917,8 @@
                 }
             },
             choiceZRRList (type, title, id) {
-                this.nodeList = []
+                this.nodeList2 = []
-                this.nodeList.push(id)
+                this.nodeList2.push(id)
                 this.userType = type
                 this.drawerTitle = title
                 this.modalShowRoleFlag = true
@@ -1984,6 +1963,19 @@
             //     this.drawerTitle = title
             //     this.modalShowRoleFlag = true
             // },
+            choiceQCR (type, title, id) {
+                this.nodeList = []
+                this.nodeList.push(id)
+                this.userType = type
+                this.drawerTitle = title
+                this.modalShowRoleFlag = true
+            },
+            choiceQCDW(type, title, id) {
+                this.nodeListZRBM = []
+                this.nodeListZRBM.push(id)
+                this.drawerTitle = title
+                this.modalShowFlagZRBM = true
+            },
             choiceZRR1 (type, title, id) {
                 this.drawerTitle = title
                 this.modalShowFlag1 = true
@@ -2266,6 +2258,9 @@
                       case 'GLWJBUSS':
                         this.GLWJBUSSFileList = fileList
                         break;
+                      case 'footFile':
+                        this.footFileList = fileList
+                        break;
                     default : ;
                   }
                   this.$message({
@@ -2297,6 +2292,9 @@
                 case 'GLWJBUSS':
                   this.fileList=this.GLWJBUSSFileList
                   break;
+                case 'footFile':
+                  this.fileList=this.footFileList
+                  break;
                 default : ;
               }
               this.fileMadel = true;
@@ -2320,9 +2318,29 @@
                 case 'GLWJBUSS':
                     this.GLWJBUSSFileList = fileList
                     break;
+                case 'footFile':
+                    this.footFileList = fileList
+                    break;
               default : ;
             }
           },
+            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
+
+            },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if(checkedData.length > 0){
@@ -2446,6 +2464,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(",")
 
@@ -2531,54 +2552,54 @@
                 // this.form.country=this.countryArr;
                 // test
                 this.isSubmit = false
-                this.changeTree(this.form.modelData)
+                // this.changeTree(this.form.modelData)
                 this.$refs['form'].validate((valid) => {
                     if (valid) {
-                        if(this.form.modelData === undefined || this.form.modelData.length === 0){
+                        // if(this.form.modelData === undefined || this.form.modelData.length === 0){
-                            this.$message.warning('请检查模块信息是否填写完整')
+                        //     this.$message.warning('请检查模块信息是否填写完整')
-                        }else if( this.modelDataNameVerify !== undefined && this.modelDataNameVerify.length > 0){
+                        // }else if( this.modelDataNameVerify !== undefined && this.modelDataNameVerify.length > 0){
-                            this.$message.warning('请检查模块信息模块名称是否填写完整')
+                        //     this.$message.warning('请检查模块信息模块名称是否填写完整')
-                        }else if( this.modelDataZrUserVerify !== undefined && this.modelDataZrUserVerify.length > 0){
+                        // }else if( this.modelDataZrUserVerify !== undefined && this.modelDataZrUserVerify.length > 0){
-                            this.$message.warning('请检查模块信息责任人是否填写完整')
+                        //     this.$message.warning('请检查模块信息责任人是否填写完整')
-                        }else {
+                        // }else {
-                            this.$refs['userForm'].validate((valid) => {
+                        // }
-                                if (valid) {
+                        this.$refs['userForm'].validate((valid) => {
-                                    this.fileInfoHandle()
+                            if (valid) {
-                                    this.isSubmit = true
+                                this.fileInfoHandle()
-                                    this.form.country=this.countryArr;
+                                this.isSubmit = true
-                                    this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) +' X'
+                                this.form.country=this.countryArr;
-                                    var json = Object.assign(this.form, this.roleForm)
+                                this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) +' X'
-                                    json.zrUserId = this.form.zrUserId
+                                var json = Object.assign(this.form, this.roleForm)
-                                    json.jlUserId = this.form.jlUserId
+                                json.zrUserId = this.form.zrUserId
-                                    json.commentText = this.commentText
+                                json.jlUserId = this.form.jlUserId
-                                    json.applyUpdUserId = this.form.applyUpdUserId
+                                json.commentText = this.commentText
-                                    json.prcCreateUser = this.form.prcCreateUser
+                                json.applyUpdUserId = this.form.applyUpdUserId
-                                    json.prcCreateUserName = this.form.prcCreateUserName
+                                json.prcCreateUser = this.form.prcCreateUser
-                                    this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, {
+                                json.prcCreateUserName = this.form.prcCreateUserName
-                                        _this: this
+                                this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, {
-                                    }, res => {
+                                    _this: this
-                                        if (res.ok) {
+                                }, res => {
-                                            this.$http.post('lawss/activiti/completeTask', {
+                                    if (res.ok) {
-                                                taskIds: res.data,
+                                        this.$http.post('lawss/activiti/completeTask', {
-                                                userId : this.$store.getters.userInfo.userId,
+                                            taskIds: res.data,
-                                                json: JSON.stringify(json)
+                                            userId : this.$store.getters.userInfo.userId,
-                                            }, {
+                                            json: JSON.stringify(json)
-                                                _this: this
+                                        }, {
-                                            }, res => {
+                                            _this: this
-                                                if (res.success) {
+                                        }, res => {
-                                                    this.$message.success(res.message)
+                                            if (res.success) {
-                                                    this.isSubmit = false
+                                                this.$message.success(res.message)
-                                                    // 流程提交之后，应该流转至待办任务页面
+                                                this.isSubmit = false
-                                                    this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                                // 流程提交之后，应该流转至待办任务页面
-                                                }
+                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                            })
+                                            }
-                                        }
+                                        })
-                                    })
+                                    }
-                                }else {
+                                })
-                                    this.$message.warning('请检查人员信息表单是否填写完整')
+                            }else {
-                                }
+                                this.$message.warning('请检查人员信息表单是否填写完整')
-                            })
+                            }
-                        }
+                        })
                     } else {
                         this.$message.warning('请检查基础信息表单是否填写完整')
                     }

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

@@ -158,14 +158,7 @@
                     <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-input v-model="form.QCDW"  :disabled="disabledState" clearable></el-input>
-                                    <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
@@ -193,14 +186,7 @@
                         </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-input v-model="form.QCRBUSS"  :disabled="disabledState" clearable></el-input>
-                                    <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>
@@ -241,7 +227,7 @@
                                 ></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)">
+                                <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>
@@ -455,10 +441,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"
     >
@@ -887,6 +875,7 @@
                 prcName: this.$route.query.prcName,
                 detailData: [],
                 fileList: [],
+                footFileList: [],
                 FBGBUSSFileList: [],
                 BZSMBUSSFileList: [],
                 LSBBBUSSFileList: [],
@@ -971,6 +960,7 @@
                 ListModel: false, // 新增编辑抽屉开关
                 active: '1', // 默认显示
                 isSubmit: false,
+                uploadFileStatus: true,
                 saveLoading: false,
                 defaultProps: {
                     children: 'children',
@@ -1027,6 +1017,8 @@
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
+                    footFile:'',
+                    footFileName:'',
                     // 基础信息
                     country:[],
                     // 基础信息
@@ -1169,7 +1161,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 +1460,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);
@@ -2071,22 +2064,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 +2091,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 +2130,9 @@
                     case 'GLWJBUSS':
                         this.fileList=this.GLWJBUSSFileList
                         break;
+                    case 'footFile':
+                        this.fileList=this.footFileList
+                        break;
                     default : ;
                 }
                 this.fileMadel = true;
@@ -2171,6 +2156,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 +2271,17 @@
                     })
                 })
             },
+            handleUploadFile(){
+                this.fileType = '';
+                this.fileType = 'footFile';
+
+                this.fileList=this.footFileList
+
+                this.fileMadel = true;
+            },
+            handleUploadedFile(){
+                this.fileMadel = true
+            },
             // 在线编辑
             handleOnLineEdit(){
                 this.isSubmit = true
@@ -2335,6 +2335,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 +2441,54 @@
                 // }
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
-                        this.processModelHisOne(this.pId,this.taskIds)
+                        if(this.footFileList !== undefined && this.footFileList.length > 0){
-                            .then(res => {
+                            this.isSubmit = true
-                                if(res){
+                            this.saveLoading = true
-                                    const editFileInfo = res
+                            this.form.commentText = this.formTongGuo.commentText
-                                    if(editFileInfo && editFileInfo.editStatus === '1'){
+                            this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                                        this.isSubmit = true
+                            const json = JSON.stringify(this.form);
-                                        this.saveLoading = true
+                            this.$http.post('lawss/activiti/completeTask', {
-                                        this.form.commentText = this.formTongGuo.commentText
+                                taskIds: this.taskIds,
-                                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                userId : this.userId,
-                                        const json = JSON.stringify(this.form);
+                                json: json
-                                        this.$http.post('lawss/activiti/completeTask', {
+                            }, {
-                                            taskIds: this.taskIds,
+                                _this: this
-                                            userId : this.userId,
+                            }, res => {
-                                            json: json
+                                if (res.success) {
-                                        }, {
+                                    this.$message.success(res.message)
-                                            _this: this
+                                    // 流程提交之后，应该流转至待办任务页面
-                                        }, res => {
+                                    this.isSubmit = false
-                                            if (res.success) {
+                                    this.saveLoading = false
-                                                this.$message.success(res.message)
+                                    this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                                // 流程提交之后，应该流转至待办任务页面
+                                    // if(this.formTongGuo.approvalOpinion === '1'){
-                                                this.isSubmit = false
+                                    //     this.$message.warning("驳回成功")
-                                                this.saveLoading = false
+                                    //     this.isSubmit = false
-                                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                    //     // 流程提交之后，应该流转至待办任务页面
-                                                // if(this.formTongGuo.approvalOpinion === '1'){
+                                    //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                                //     this.$message.warning("驳回成功")
+                                    // }else{
-                                                //     this.isSubmit = false
+                                    //     this.processCreateLaws(json)
-                                                //     // 流程提交之后，应该流转至待办任务页面
+                                    // }
-                                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                }else {
-                                                // }else{
+                                    this.$message.success(res.message)
-                                                //     this.processCreateLaws(json)
-                                                // }
-                                            }else {
-                                                this.$message.success(res.message)
-                                            }
-                                        })
-                                    }else {
-                                        this.$message.warning('请先在线编辑,再提交流程')
-                                    }
-
                                 }
-                            }).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 +2554,13 @@
                                 }
 
                                 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);
                                 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 +2599,7 @@
             },
         },
         mounted () {
+            this.getTaskId()
             this.getData()
             this.processTable()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {

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/step1.vue

@@ -10,46 +10,46 @@
     </div>
     <div class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto;">
-          <ProcessTitle>
+        <ProcessTitle>
-            <template slot="title">基础信息</template>
+          <template slot="title">基础信息</template>
-          </ProcessTitle>
+        </ProcessTitle>
-          <div class="tableTitle">
+        <div class="tableTitle">
-            <div class="tableButton">
+          <div class="tableButton">
-              <el-button size="mini" type="primary" @click="addList">添加</el-button>
+            <el-button size="mini" type="primary" @click="addList">添加</el-button>
-              <el-button size="mini" type="danger" @click="deleteList">批量删除</el-button>
+            <el-button size="mini" type="danger" @click="deleteList">批量删除</el-button>
-            </div>
           </div>
-          <el-table
+        </div>
-            :data="dataList"
+        <el-table
-            border
+          :data="dataList"
-            ref="entryTable"
+          border
-            height="80%"
+          ref="entryTable"
-            @selection-change="selectedDelete"
+          height="80%"
-            style="width: 100%"
+          @selection-change="selectedDelete"
-            :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
+          style="width: 100%"
+          :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 type="selection" width="55" align="center"/>
-            <el-table-column prop="standSerialNumber" width="150" label="标准号" show-overflow-tooltip align="center">
+          <el-table-column prop="standSerialNumber" width="150" label="标准号" show-overflow-tooltip align="center">
-              <template slot-scope="scope">
+            <template slot-scope="scope">
-                <a  class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
+              <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
-              </template>
+            </template>
-            </el-table-column>
+          </el-table-column>
-            <el-table-column prop="standName" width="250" align="center" show-overflow-tooltip label="标准名称">
+          <el-table-column prop="standName" width="250" align="center" show-overflow-tooltip label="标准名称">
-              <template slot-scope="scope">
+            <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
+              <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-              </template>
+            </template>
-            </el-table-column>
+          </el-table-column>
-            <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
+          <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-            <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
-            <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
+          <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
-            <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
+          <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
-              <template slot-scope="scope">
+            <template slot-scope="scope">
-                <span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
+              <span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
-              </template>
+            </template>
-            </el-table-column>
+          </el-table-column>
-            <el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
+          <el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
-            <el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
+          <el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
-          </el-table>
+        </el-table>
       </div>
       <el-collapse accordion>
         <el-collapse-item title="回执说明">
@@ -173,7 +173,7 @@
                 class="common-button-primary"
                 size="mini"
                 v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-                @click="getTableByPage('')">
+                @click="getTableByPage">
                 查询
               </el-button>
             </el-form-item>
@@ -326,8 +326,9 @@
 import ProcessHeader from '../../components/ProcessHeader'
 import ProcessFooter from '../../components/ProcessFooter'
 import ProcessTitle from '../../components/ProcessTitle'
-import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel,processBack } from '@/api/process.js'
+import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js'
-import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js'
+import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js'
+
 export default {
   name: "wfhxzgStep1",
   data() {
@@ -365,7 +366,7 @@ export default {
       },
       deleteDataList: [],
       roleFormRules: {
-        dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
+        dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
       },
       nodeList: [],
       drawerTitle: '', //drawer标题
@@ -419,23 +420,23 @@ export default {
             if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
               let k = (item.responsibleUnit || "").split(',')
               for (let i in this.zrbmOptions) {
-                for (let m = 0; m< k.length; m++) {
+                for (let m = 0; m < k.length; m++) {
                   if (this.zrbmOptions[i].value === k[m]) {
-                    k[m]  = this.zrbmOptions[i].label
+                    k[m] = this.zrbmOptions[i].label
                   }
                   item.responsibleUnit = k.join(',')
                 }
               }
             }
-            this.$set(item,'engineer','')
+            this.$set(item, 'engineer', '')
-            this.$set(item,'engineerId','')
+            this.$set(item, 'engineerId', '')
-            this.$set(item,'dutyPeopleInfo','')
+            this.$set(item, 'dutyPeopleInfo', '')
-            this.$set(item,'dutyPeople','')
+            this.$set(item, 'dutyPeople', '')
-            this.$set(item,'dutyPeopleInfoId','')
+            this.$set(item, 'dutyPeopleInfoId', '')
-            this.$set(item,'dutyPeopleId','')
+            this.$set(item, 'dutyPeopleId', '')
-            this.$set(item,'fileText',[])
+            this.$set(item, 'fileText', [])
-            this.$set(item,'fileTextId',[])
+            this.$set(item, 'fileTextId', [])
-            this.$set(item,'fileTextPath',[])
+            this.$set(item, 'fileTextPath', [])
           })
           this.total = res.data.total
           this.loading = false
@@ -478,7 +479,7 @@ export default {
       }
     },
     // 点击查看
-    handlePreview (item) {
+    handlePreview(item) {
       let routeUrl = this.$router.resolve({
         name: 'OtherStandardDetails',
         params: {
@@ -506,12 +507,12 @@ export default {
           addList = this.dataList.findIndex(items => {
             return items.id === item.id
           })
-          if(addList > -1){
+          if (addList > -1) {
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
             this.$refs.searchTable.clearSelection()
             this.$message.warning('请勿添加重复数据')
-          } else{
+          } else {
             this.dataList.push(item)
             // this.$refs.accessTypeSelect.clearSelection()
             this.$refs.entryTable.clearSelection()
@@ -557,7 +558,7 @@ export default {
     },
     // 提交按钮
     handleSubmit() {
-      this.dataList.forEach(item =>{
+      this.dataList.forEach(item => {
         item.standId = item.standSerialNumber
       })
       let json = {
@@ -593,13 +594,13 @@ export default {
                 params.set('userId', this.$store.getters.userInfo.userId)
                 params.set('taskIds', this.taskID)
                 completeTask(params).then(res => {
-                  if(res.success === true) {
+                  if (res.success === true) {
                     this.$message.success('提交成功')
                     if (this.bpnId !== '') {
                       let taskId = {
                         id: this.bpnId
                       }
-                      taskDel(taskId).then(res=>{
+                      taskDel(taskId).then(res => {
                         return res
                       })
                     }
@@ -614,14 +615,14 @@ export default {
       }
     },
     // 流程阶段负责人选择
-    choiceZRR (type, title, id) {
+    choiceZRR(type, title, id) {
       this.nodeList = []
       this.nodeList.push(id)
       this.type = type
       this.drawerTitle = title
       this.modalshowflag = true
     },
-    drawerCheck (data) {
+    drawerCheck(data) {
       this.unqualidiedData.forEach(item => {
         item.engineer = data[0].name
         item.engineerId = data[0].id
@@ -635,20 +636,18 @@ export default {
       this.addList()
     },
     // 清空 查询条件
-    clearAllSearch (search = true) {
+    clearAllSearch() {
-      this.queryUnqualidiedData = {
+      this.queryUnqualidiedData.standSerialNumber = ''
-        standSerialNumber: '',
+      this.queryUnqualidiedData.productName = ''
-        productName: '',
+      this.queryUnqualidiedData.responsibleUnit = ''
-        responsibleUnit: ''
-      }
       this.getTableByPage()
     },
     // 分页事件
-    pageChange (page) {
+    pageChange(page) {
       this.pageNo = page
       this.getTableByPage()
     },
-    pageSizeChange (pageSize) {
+    pageSizeChange(pageSize) {
       this.size = pageSize
       this.getTableByPage(pageSize)
     },
@@ -659,18 +658,22 @@ export default {
 
 <style lang="less" scoped>
 @import '~@/assets/styles/style';
+
 .wfhxzgStep1 {
-  /deep/.el-table--scrollable-y .el-table__body-wrapper {
+  /deep/ .el-table--scrollable-y .el-table__body-wrapper {
     height: calc(100% - 57px) !important;
   }
-  /deep/.el-drawer__container {
+
+  /deep/ .el-drawer__container {
     .prc-content-border {
       border: none;
       padding: 0 20px 0;
     }
   }
+
   position: relative;
   height: 100%;
+
   .headerTabs {
     height: 52px;
     display: flex;
@@ -678,6 +681,7 @@ export default {
     position: absolute;
     top: 0;
     right: 10px;
+
     .headerTabsItem {
       border: 1px solid #c1c1c1;
       padding: 0 5px;
@@ -685,21 +689,25 @@ export default {
       line-height: 30px;
       cursor: pointer;
     }
+
     .active {
       border: 1px solid #E6A23C;
       color: #fff;
       background: #E6A23C;
     }
   }
+
   .content-center {
     padding: 10px 0px 10px 10px;
   }
+
   .content {
     display: flex;
     flex-direction: column;
     justify-content: space-between;
     height: calc(~'100% - 103px');
     overflow: auto;
+
     .tableTitle {
       margin-bottom: 10px;
       height: 30px;
@@ -707,6 +715,7 @@ export default {
       position: relative;
       font-size: 13px;
       font-weight: bold;
+
       .tableButton {
         position: absolute;
         right: 0;

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

@@ -44,7 +44,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-          <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">
@@ -66,7 +66,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/wfhxzg/step3.vue

@@ -44,7 +44,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-          <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">

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

@@ -32,7 +32,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-          <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">

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

@@ -32,7 +32,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-          <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">

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

@@ -32,7 +32,7 @@
             </template>
           </el-table-column>
           <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
-          <el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
+          <el-table-column prop="itemsNum" label="条款号" align="center"/>
           <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
           <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
             <template slot-scope="scope">

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/creatProcess/zcch/step1-1.vue

@@ -774,28 +774,19 @@
                                     this.$refs['Form'].validate((valid) => {
                                         if (valid) {
                                             this.isSubmit = true
-                                            this.$http.get('lawss/activiti/startProcess', {
+                                            var json = Object.assign(this.rhform, this.roleForm)
-                                                type: '18'
+                                            json.commentText = this.commentText
+                                            json.data1 = this.data1
+                                            json.data2 = this.data2
+                                            this.$http.post('lawss/activiti/completeTask', {
+                                                json: JSON.stringify(json),
+                                                taskId: res.data,
+                                                userId: this.$store.getters.userInfo.userId
                                             }, {}, res => {
-                                                if (res.ok) {
+                                                if (res.success) {
-                                                    var json = Object.assign(this.rhform, this.roleForm)
+                                                    this.$message.success('流程发起成功')
-                                                    json.commentText = this.commentText
+                                                    this.$router.push('/processCenter')
-                                                    json.data1 = this.data1
+                                                    this.isSubmit = false
-                                                    json.data2 = this.data2
-                                                    this.$http.post('lawss/activiti/completeTask', {
-                                                        json: JSON.stringify(json),
-                                                        taskId: res.data,
-                                                        userId: this.$store.getters.userInfo.userId
-                                                    }, {}, res => {
-                                                        if (res.success) {
-                                                            this.$message.success('流程发起成功')
-                                                            this.$router.push('/processCenter')
-                                                            this.isSubmit = false
-                                                        } else {
-                                                            this.$message.warning('流程启动失败')
-                                                            this.isSubmit = false
-                                                        }
-                                                    })
                                                 } else {
                                                     this.$message.warning('流程启动失败')
                                                     this.isSubmit = false

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

@@ -752,28 +752,19 @@
                                     this.$refs['Form'].validate((valid) => {
                                         if (valid) {
                                             this.isSubmit = true
-                                            this.$http.get('lawss/activiti/startProcess', {
+                                            var json = Object.assign(this.rhform, this.roleForm)
-                                                type: '17'
+                                            json.commentText = this.commentText
+                                            json.data1 = this.data1
+                                            json.data2 = this.data2
+                                            this.$http.post('lawss/activiti/completeTask', {
+                                                json: JSON.stringify(json),
+                                                taskId: res.data,
+                                                userId: this.$store.getters.userInfo.userId
                                             }, {}, res => {
-                                                if (res.ok) {
+                                                if (res.success) {
-                                                    var json = Object.assign(this.rhform, this.roleForm)
+                                                    this.$message.success('流程发起成功')
-                                                    json.commentText = this.commentText
+                                                    this.$router.push('/processCenter')
-                                                    json.data1 = this.data1
+                                                    this.isSubmit = false
-                                                    json.data2 = this.data2
-                                                    this.$http.post('lawss/activiti/completeTask', {
-                                                        json: JSON.stringify(json),
-                                                        taskId: res.data,
-                                                        userId: this.$store.getters.userInfo.userId
-                                                    }, {}, res => {
-                                                        if (res.success) {
-                                                            this.$message.success('流程发起成功')
-                                                            this.$router.push('/processCenter')
-                                                            this.isSubmit = false
-                                                        } else {
-                                                            this.$message.warning('流程启动失败')
-                                                            this.isSubmit = false
-                                                        }
-                                                    })
                                                 } else {
                                                     this.$message.warning('流程启动失败')
                                                     this.isSubmit = false

src/pages/processCenter/pages/phone/bzqdfb/step4.vue

@@ -9,7 +9,7 @@
       <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 class="content" v-show="active === '1'">
       <div style="flex: auto; overflow: auto">
         <process-title>
           <template slot="title">基础信息</template>

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/processDetail/index.vue

@@ -83,7 +83,7 @@
             sortable="custom"
             align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -91,7 +91,7 @@
             label="完成时间"
             align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+            <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
           </template>
         </el-table-column>
         <el-table-column

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

@@ -426,9 +426,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 +460,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 +477,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 +519,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 +526,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 +533,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 +540,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 +551,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 +619,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 +626,6 @@
                   </template>
                   <template v-else>
                     <custom-input
-                        :key="field.attrField"
                         :config="field"
                         v-if="field.attrField !== 'BDTBZBH'"
                         v-model="sarStandardsInfoEO[field.attrField]"
@@ -643,7 +636,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 +644,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 +652,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 +660,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 +668,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 +683,6 @@
                     >
                       <template slot="label">责任部门</template>
                       <el-input
-                          :key="field.attrField"
                           :config="field"
                           clearable
                           v-model="sarStandardsInfoEO['ZRBM']"
@@ -752,7 +739,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 +750,6 @@
                         </el-tooltip>
                         <div v-else>
                           <el-input
-                                  :key="field.attrField"
                                   :config="field"
                                   clearable
                                   v-model="sarStandardsInfoEO['QCDW']"
@@ -785,7 +770,6 @@
 <!--                  全选-->
                   <template v-else>
                     <custom-select-array
-                        :key="field.attrField"
                         :config="field"
                         v-model="sarStandardsInfoEO[field.attrField]"
                         :disabled="formdisableflag"
@@ -1006,8 +990,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>
@@ -1548,8 +1532,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 +1572,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 +1645,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 +1654,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 +1663,6 @@
                   <!--            适用车型-->
                   <template>
                     <custom-select-array
-                        :key="applyArcticOptions.options"
                         style="margin-left: -14px"
                         :config="applyArcticOptions"
                         v-model="sarStandardsSearch['applyArctic']"
@@ -1697,7 +1680,6 @@
                   <!--            适用认证-->
                   <template>
                     <custom-select-array
-                        :key="syrzOptions.options"
                         style="margin-left: -14px"
                         :config="syrzOptions"
                         v-model="advanceSearchMapping['SYRZ']"
@@ -1762,8 +1744,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 +1753,6 @@
                   <!--            能源类型-->
                   <template>
                     <custom-select-array
-                        :key="nylxOptions.options"
                         :config="nylxOptions"
                         style="margin-left: -14px"
                         v-model="advanceSearchMapping['NYLX']"
@@ -1789,7 +1770,6 @@
                   <!--            适用产品线（新增字段）-->
                   <template>
                     <custom-select-array
-                        :key="sycpxOptions.options"
                         :config="sycpxOptions"
                         style="margin-left: -14px"
                         v-model="advanceSearchMapping['SYCPX']"
@@ -1814,7 +1794,6 @@
                     >
                       <template slot="label">责任部门</template>
                       <el-input
-                          :key="zrbmOptions.options"
                           :config="zrbmOptions"
                           clearable
                           v-model="advanceSearchMapping['ZRBM']"
@@ -2009,8 +1988,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 +2996,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 +3370,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 +3893,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 +4178,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, ',')
               }
@@ -5554,7 +5528,6 @@ export default {
       })
     },
     choiceZRRS (type, title, id) {
-      console.log('2077',type, title, id)
       this.nodeList = []
       this.nodeList.push(id)
       this.userType = type
@@ -5562,7 +5535,6 @@ export default {
       this.modalShowRoleFlag = true
     },
     checkedRole2 (data) {
-      console.log('1712',data)
       let idList = ''
       let nameList = ''
       data.forEach( item => {
@@ -5611,8 +5583,6 @@ export default {
       this.modalshowflagZRBM = true
     },
     drawerCheckZRBM(data) {
-
-      console.log("5389", this.drawerTitle);
       let idList = ''
       let nameList = ''
       data.forEach(item => {
@@ -5674,7 +5644,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 // 标准性质

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']"
@@ -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']"
@@ -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"

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"
@@ -468,6 +468,9 @@
                 this.modalshowflagZRBM = false
             },
             choiceZRBM(id) {
+                if (this.DrawerType === 'see') {
+                    return
+                }
                 this.nodeListZRBM = []
                 if (id) {
                     this.nodeListZRBM = id.split(',')

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/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',