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

src/assets/styles/phone.less

@@ -1,6 +1,21 @@
 .phoneBox {
   width: 100%;
   height: 100%;
+  .form-item-disabled {
+    color: #666 !important;
+    /deep/.el-form-item__label {
+      color: #666 !important;
+    }
+    /deep/.el-form-item__content {
+      color: #666 !important;
+      /deep/.el-input {
+        color: #666 !important;
+        /deep/.el-input__inner {
+          color: #666 !important;
+        }
+      }
+    }
+  }
   .headerTabs {
     height: 52px;
     display: flex;

src/components/CustomFormComponents/InputForAllStandards.vue

@@ -21,6 +21,7 @@
         size="mini"
         style="position:absolute;top: 10px;right: 0;"
         @click="selectLaws"
+        :disabled="disabled"
         v-if="(processModel && !disabled) || !processModel"
       >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}</el-button>
     </el-form-item>

src/components/CustomFormComponents/InputForAllStandards2.vue

@@ -21,6 +21,7 @@
                     size="mini"
                     style="position:absolute;top: 10px;right: 0;"
                     @click="selectLaws"
+                    :disabled="disabled"
                     v-if="(processModel && !disabled) || !processModel"
             >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}}</el-button>
         </el-form-item>

src/pages/details/otherStandardDetails/index.vue

@@ -90,7 +90,7 @@
                           </span>
 <!--                          多个文件时-->
                           <span v-else-if="child.value && child.value.length > 0">
-                            <span style="margin-left: 19%">
+                            <div style="margin-left: 15%;margin-top: -60px;line-height: 90px">
                               <a style="font-size: 16px;color: #409EFF;cursor: pointer"
                                  @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
                                  :title="file.oldFileName">{{ file.oldFileName }}</a>
@@ -106,7 +106,7 @@
                                   class="icon-download2"
                                   v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
                               />
-                            </span>
+                            </div>
                             <!--                      <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
                           </span>
                           <el-button

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

@@ -395,7 +395,7 @@
                     this.roleForm.presidentUserName = data[0].name
                 }
             },
-            choiceZRRS () {
+            choiceZRRS (type) {
                 this.type2 = type
                 this.nodeList2 = []
                 if (type === '1') {

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

@@ -250,6 +250,7 @@
         name: "bzdyStep3",
         data() {
             return {
+                newDocUser: '',
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
@@ -397,6 +398,7 @@
             handleSave() {
                 this.saveLoading = true
                 let _formData = new FormData()
+                this.form.docUser = this.newDocUser
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
                     form: this.form,
@@ -431,6 +433,7 @@
                         // json.commentText = this.commentText
                         json.fileId = this.form.fileId
                         json.fileName = this.form.fileName
+                        json.docUser = this.newDocUser
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -468,11 +471,12 @@
                         this.json = data || data.form
                         this.form.fjList = data.fjList || data.form.fjList
                         this.form.modelList = data.modelList || data.form.modelList
-                        this.form.responUserList = data.form.responUserList
+                        this.form.responUserList = data.form ? data.form.responUserList : data.responUserList
-                        this.form.responUserListName = data.form.responUserListName
+                        this.form.responUserListName = data.form ? data.form.responUserListName : data.responUserListName
                         this.form.fileName = data.form?  data.form.fileName : ''
                         this.form.fileId = data.form ?  data.form.fileId : ''
                         this.form.dyhz = data.form ? data.form.dyhz : ''
+                        this.newDocUser = data.form ? data.form.docUser : data.docUser
                     }).catch(e => {
                     })
                 })

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

@@ -201,7 +201,6 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
-                @save="handleSave"
                 @submit="handleSubmit"
                 show-back
                 @back="handleSubmitNo"
@@ -231,6 +230,7 @@
         name: "bzdyStep4",
         data() {
             return {
+                newDocUser: '',
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
@@ -329,7 +329,6 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() { // 同意
                 this.isSubmit = true
                 var json = this.json
@@ -384,6 +383,7 @@
                         this.form.fileId = data.form ? data.form.fileId : data.fileId
                         this.form.modelList = data.form ? data.form.modelList : data.modelList
                         this.form.fjList = data.fjList || data.form.fjList
+                        this.newDocUser = data.form ? data.form.docUser : data.docUser
                     }).catch(e => {
                     })
                 })

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

@@ -237,6 +237,7 @@
         name: "bzdyStep5",
         data() {
             return {
+                newDocUser: '',
                 drawerModal: false,
                 foldFormFlag: false,
                 histortData: [],
@@ -367,6 +368,7 @@
                 this.saveLoading = true
                 let json = this.form
                 json.responUserList = this.tableData
+                this.form.docUser = this.newDocUser
                 let _formData = new FormData()
                 _formData.append('taskIds', this.taskIds)
                 _formData.append('json', JSON.stringify({
@@ -388,6 +390,7 @@
                         json.commentText = this.commentText
                         json.hzfileId = this.form.hzfileId
                         json.hzfileName = this.form.hzfileName
+                        json.docUser = this.newDocUser
                         this.$http.post('lawss/activiti/completeTask', {
                             json: JSON.stringify(json),
                             taskId: this.taskIds,
@@ -415,6 +418,7 @@
                         this.tableData = data.responUserList || data.form.responUserList
                         this.form.hzfileId = data.hzfileId || data.form.hzfileId
                         this.form.hzfileName = data.hzfileName || data.form.hzfileName
+                        this.newDocUser = data.form ? data.form.docUser : data.docUser
                     }).catch(e => {
                     })
                 })

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

@@ -401,7 +401,7 @@
                 :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
             <div class="demo-drawer-content">
                 <div style="display: flex; height: 100%;">
-                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1">
+                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
                         <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
                         <div v-else style="height: 100%;">
                             <div style="margin: 10px 5px;">比对条款: {{ plForm.itemsNum }}</div>

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

@@ -137,8 +137,8 @@
                 height="100%"
                 :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-                row-key="id"
       >
+        <el-table-column type="selection" width="55" align="center"/>
         <el-table-column
                 prop="itemsNum"
                 label="条款号"
@@ -149,8 +149,8 @@
         <el-table-column
                 prop="itemsName"
                 label="条款名称"
-                fixed
                 show-overflow-tooltip
+                fixed
                 align="center">
         </el-table-column>
         <el-table-column
@@ -165,90 +165,91 @@
           </template>
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
+                v-if="!form.itemsNum1"
                 prop="technicalRequir"
                 width="200"
-                v-if="!form.itemsNum1"
                 label="核心技术要求"
+                show-overflow-tooltip
                 align="center">
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
-                v-if="sarType === 'INLAND' && form.itemsNum1"
                 prop="changePoint"
                 width="150"
+                v-show="form.itemsNum1"
                 label="基于上一版本差异"
+                show-overflow-tooltip
                 align="center">
         </el-table-column>
         <el-table-column
-                show-overflow-tooltip
+                v-show="sarType === 'FOREIGN' && form.itemsNum1"
-                v-if="sarType === 'FOREIGN'"
                 prop="changePoint"
                 width="150"
                 label="相对于国行标差异点"
+                show-overflow-tooltip
                 align="center">
         </el-table-column>
         <el-table-column
-          prop="complianceRequir"
+                prop="newData"
-          width="150"
+                width="180"
-          label="符合项状态"
+                show-overflow-tooltip
-          align="center">
+                label="新车型实施日期"
-          <template slot-scope="scope">
+                align="center">
-            <div v-if="scope.row.complianceRequir === '1'">符合</div>
-            <div v-else>不符合</div>
-          </template>
         </el-table-column>
         <el-table-column
-          show-overflow-tooltip
+                prop="onlineData"
-          prop="complianceState"
+                width="180"
-          width="200"
+                show-overflow-tooltip
-          label="合规性分析"
+                label="在产车型实施日期"
-          align="center">
+                align="center">
         </el-table-column>
         <el-table-column
-          prop="newData"
+                prop="applyArctic"
-          width="150"
+                width="200"
-          show-overflow-tooltip
+                label="适用车型"
-          label="新车型实施日期"
+                show-overflow-tooltip
-          align="center">
+                align="center">
-        </el-table-column>
-        <el-table-column
-          prop="onlineData"
-          width="150"
-          show-overflow-tooltip
-          label="在产车型实施日期"
-          align="center">
-        </el-table-column>
-        <el-table-column
-          prop="applyArctic"
-          width="150"
-          show-overflow-tooltip
-          label="适用车型"
-          align="center">
           <template slot-scope="scope">
             {{ scope.row.applyArctic.toString() }}
           </template>
         </el-table-column>
         <el-table-column
-          prop="unitDeptName"
+                prop="unitDeptName"
-          label="责任部门"
+                label="责任部门"
-          show-overflow-tooltip
+                width="200"
-          width="170"
+                show-overflow-tooltip
-          align="center">
+                align="center">
         </el-table-column>
         <el-table-column
-          label="责任人"
+                label="责任人"
-          width="170"
+                width="170"
-          prop="zrUserName"
+                prop="zrUserName"
-          align="center">
+                show-overflow-tooltip
+                align="center">
+        </el-table-column>
+        <el-table-column
+                prop="complianceRequir"
+                width="150"
+                label="符合项状态"
+                show-overflow-tooltip
+                align="center">
+          <template slot-scope="scope">
+            {{ scope.row.complianceRequir === '1' ? '符合' : '不符合' }}
+          </template>
+        </el-table-column>
+        <el-table-column
+                prop="complianceState"
+                width="200"
+                label="合规性分析"
+                show-overflow-tooltip
+                align="center">
         </el-table-column>
         <el-table-column
                 label="操作"
-                v-if="form.itemsNum1"
                 width="140"
+                v-show="form.itemsNum1"
                 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>
+            <el-button class="common-button-primary" size="mini" type="primary" @click="checkBD(scope.row.itemsId, scope.row.itemsId2, scope.row.itemsNum)">查看比对</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -336,6 +337,7 @@
             title="查看比对内容"
             :visible.sync="BDmodel"
             size="1100px">
+      <div>比对条款: {{ itemsNum }}</div>
       <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>
@@ -355,6 +357,7 @@ export default {
   name: "bzjdStep1-6",
   data() {
     return {
+      itemsNum: '',
       similarityDegree: '',
       BDmodel: false,
       oldNumber: '',
@@ -422,7 +425,7 @@ export default {
       }, e => {
       })
     },
-    checkBD (id,id2) {
+    checkBD (id,id2,itemsNum) {
       let itemsEoPage = {
         oldItemId: id,
         newItemId: id2,
@@ -434,6 +437,7 @@ export default {
         if (res.data.leftString === '' && res.data.rightString === '') {
           this.$message.warning('暂无找到相似的文本')
         } else {
+          this.itemsNum = itemsNum
           this.leftData = res.data.leftString
           this.rightData = res.data.rightString
           this.BDmodel = true

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

@@ -69,7 +69,7 @@
                 <el-button :disabled="!itemList.length" type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">批量编辑</el-button>
             </div>
             <el-table border
-                      ref="selection"
+                      ref="selections"
                       :data="itemList"
                       tooltip-effect="dark"
                       style="width: 100%;"
@@ -150,7 +150,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.applyArctic.toString() }}
+                        {{ JSON.parse(scope.row.applyArctic).join(',') }}
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -378,7 +378,7 @@
                 if (type === 1) {
                     this.drawerTitle = '选择执行人'
                     this.nodeList2 = []
-                    this.zxIndex= index
+                    this.zxIndex = index
                     this.nodeList2.push(row)
                     this.modalshowflag2 = true
                 } else {
@@ -415,6 +415,7 @@
                     }
                 }
                 this.modalshowflag = false
+               this.$refs.selections.clearSelection()
             },
             handleTabs(name) {
                 this.active = name
@@ -485,6 +486,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText = data.commentText
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''

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

@@ -151,7 +151,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.applyArctic.toString() }}
+                        {{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -497,7 +497,7 @@
                     complianceState: '', // 合规性分析
                     newData: '', // 新车型实施日期
                     onlineData: '', // 在产车实施日期
-                    applyArctic: '', // 适用车型
+                    applyArctic: [], // 适用车型
                 },
                 editForm: {
                     itemsNum: '',
@@ -507,7 +507,7 @@
                     complianceState: '', // 合规性分析
                     newData: '', // 新车型实施日期
                     onlineData: '', // 在产车实施日期
-                    applyArctic: '', // 适用车型
+                    applyArctic: [], // 适用车型
                     itemsId: '',
                 },
                 modalshowflag: false,
@@ -857,6 +857,7 @@
                             this.acceptShow = false
                             this.submitShow = true
                         }
+                        this.commentText = data.commentText
                         this.todoId = res.id
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
@@ -886,11 +887,6 @@
                             item.changePoint = item.changePoint || ''
                             item.technicalRequir = item.technicalRequir || ''
                             item.itemsTitle = item.itermsConditions
-                            if (typeof (item.applyArctic) === 'string') {
-                                item.applyArctic = JSON.parse(item.applyArctic) || []
-                            } else {
-                                item.applyArctic = item.applyArctic || []
-                            }
                         })
                         this.getBDList()
                         this.itemList = itemList

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

@@ -145,7 +145,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.applyArctic.toString() }}
+                        {{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -436,12 +436,12 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
                 json.resolveFlag = 1
                 json.commentText = this.commentText
+                json.AOLIGEI = this.AOLIGEI
                 this.$http.post('lawss/activiti/completeTask', {
                     json: JSON.stringify(json),
                     taskId: this.taskIds,
@@ -484,6 +484,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText = data.commentText
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''

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

@@ -145,7 +145,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.applyArctic.toString() }}
+                        {{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -263,7 +263,6 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
-                @save="handleSave"
                 @submit="handleSubmit"
                 show-transfer
                 @transfer="handleTransfer"
@@ -424,7 +423,6 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
@@ -472,6 +470,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText = data.commentText
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''

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

@@ -145,7 +145,7 @@
                         show-overflow-tooltip
                         align="center">
                     <template slot-scope="scope">
-                        {{ scope.row.applyArctic.toString() }}
+                        {{ typeof (scope.row.applyArctic) === 'string' ? JSON.parse(scope.row.applyArctic).join(',') : scope.row.applyArctic.join(',') }}
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -263,7 +263,6 @@
                 show-submit
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
-                @save="handleSave"
                 @submit="handleSubmit"
                 show-transfer
                 @transfer="handleTransfer"
@@ -422,7 +421,6 @@
             handleTabs(name) {
                 this.active = name
             },
-            handleSave() {},
             handleSubmit() {
                 this.isSubmit = true
                 var json = this.json
@@ -470,6 +468,7 @@
                         let data = JSON.parse(res.mesg)
                         this.form.itemsNum = data.itemsNum || data.form.itemsNum
                         this.form.itemsName = data.itemsName || data.form.itemsName
+                        this.commentText = data.commentText
                         if (data.form) {
                             this.form.itemsName1 = data.form.itemsName1 || ''
                             this.form.itemsNum1 = data.form.itemsNum1 || ''
@@ -479,7 +478,6 @@
                         }
                         this.sarType = data.standInData || data.sarType
                         this.json = data
-                        console.log(data.itemList);
                         this.itemList = data.itemList
                         this.loading = false
                     }).catch(e => {

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

@@ -43,6 +43,16 @@
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
+                <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
+                  <el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
+                    <el-option
+                            v-for="(item, index) in textTypeList"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
                   <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
@@ -51,7 +61,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div style="">
                     <div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       <span @click="fileLook(item)" >{{ item.fileName }}</span>
                       <el-button
@@ -366,6 +376,7 @@ export default {
   name: "bzzqyjStep1-1",
   data() {
     return {
+      textTypeList: [],
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -397,7 +408,6 @@ export default {
         standId: '',
         fjList: [],
         fjListId: '',
-        fjListId: '',
         textType: '',
         modelList: [],
         modelNameList: ''
@@ -411,6 +421,9 @@ export default {
         ],
         fjListId: [
           {required: true, message: '请选择附件', trigger: 'change'},
+        ],
+        textType: [
+          {required: true, message: '请选择文本状态', trigger: 'change'},
         ]
       },
       // 标准征求意见数据可库
@@ -418,6 +431,7 @@ export default {
         standSort: '',
         standNumber: '',
         standType: '',
+        standId: '',
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent
       },
@@ -598,19 +612,9 @@ export default {
           }
         }
       })
-      // this.$http.get('lawss/sarStandFile/queryFileInfo', {
-      //   standId: this.form.standId
-      // }, {}, res => {
-      //   this.fjList = res.data
-      //   this.fzlistModel = true
-      // })
     },
     handleSelection2(data) {
-      if (data.length > 1) {
+      this.addFjList = data
-        this.$message.warning('最多选择1条附件')
-      } else {
-        this.addFjList = data
-      }
     },
     closeDrawer2() {
       this.fzlistModel = false
@@ -619,16 +623,18 @@ export default {
     enterDrawer2() {
       this.fzlistModel = false
       this.form.fjList = this.addFjList
-      this.form.textType =  this.setWBType(this.addFjList[0].standFileClassify)
-      this.form.textValue = this.addFjList[0].standFileClassify
       let idList = []
       let nameList = []
       this.addFjList.forEach(item => {
-        idList.push(item.id)
+        if (nameList.length > 0) {
-        nameList.push(item.fileName)
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.fileName
       })
-      this.form.fjListName = nameList.join(',')
+      this.form.fjListName = nameList
-      this.form.fjListId = idList.join(',')
+      this.form.fjListId = idList
     },
     // 点击查看
     handlePreview(item) {
@@ -681,7 +687,7 @@ export default {
     sarStandCompareHis() {
       this.spinShow = true
       var formData = this.standCommonlySearch
-      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', formData, {
         _this: this
       }, res => {
         this.standInfoList = res.data.list
@@ -725,7 +731,14 @@ export default {
         } else {
           this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
         }
+        this.form.standType = bringData[0].standType
+        this.form.standId = bringData[0].id
         this.listModel = false;
+        this.$http.get('SarStandItems/sar-stand-items/getFileType', {
+          standId: bringData[0].id
+        }, {}, res => {
+          this.textTypeList = res.data
+        })
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
       } else {
@@ -747,7 +760,7 @@ export default {
       })
       if (this.type2 === '1') {
         this.roleForm.dockUserList = idList
-        this.roleForm.dockUserName = nameList
+        this.roleForm.dockUserListName = nameList
       } else {
         this.roleForm.directorUser = idList
         this.roleForm.directorUserName = nameList

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

@@ -53,7 +53,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
                   </div>
                 </el-form-item>

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

@@ -43,6 +43,16 @@
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
+                <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
+                  <el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
+                    <el-option
+                            v-for="(item, index) in textTypeList"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
                   <div class="addButton" style="padding-left: 10px">
                     <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
@@ -51,7 +61,7 @@
                     v-model="form.fjListId"
                     style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div style="">
                     <div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
                       <span @click="fileLook(item)" >{{ item.fileName }}</span>
                       <el-button
@@ -236,7 +246,6 @@
                       type="primary"
                       size="mini"
                       class="common-button-primary"
-
                       @click="sarStandCompareHisInfo">查询
                     </el-button>
                     <el-button
@@ -375,6 +384,7 @@ export default {
   name: "bzzqyjStep1",
   data() {
     return {
+      textTypeList: [],
       drawerTitle2: '',
       type2: '',
       pickerOptions: {
@@ -408,7 +418,6 @@ export default {
         fjList: [],
         fjListName: '',
         fjListId: '',
-        textValue: '',
         textType: '',
         modelList: [],
         modelNameList: ''
@@ -422,6 +431,9 @@ export default {
         ],
         fjListId: [
           {required: true, message: '请选择附件', trigger: 'change'},
+        ],
+        textType: [
+          {required: true, message: '请选择文本状态', trigger: 'change'},
         ]
       },
       // 标准征求意见数据可库
@@ -609,19 +621,9 @@ export default {
           }
         }
       })
-      // this.$http.get('lawss/sarStandFile/queryFileInfo', {
-      //   standId: this.form.standId
-      // }, {}, res => {
-      //   this.fjList = res.data
-      //   this.fzlistModel = true
-      // })
     },
     handleSelection2(data) {
-      if (data.length > 1) {
+      this.addFjList = data
-        this.$message.warning('最多选择1条附件')
-      } else {
-        this.addFjList = data
-      }
     },
     closeDrawer2() {
       this.fzlistModel = false
@@ -630,16 +632,18 @@ export default {
     enterDrawer2() {
       this.fzlistModel = false
       this.form.fjList = this.addFjList
-      this.form.textType =  this.setWBType(this.addFjList[0].standFileClassify)
-      this.form.textValue = this.addFjList[0].standFileClassify
       let idList = []
       let nameList = []
       this.addFjList.forEach(item => {
-        idList.push(item.id)
+        if (nameList.length > 0) {
-        nameList.push(item.fileName)
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.fileName
       })
-      this.form.fjListName = nameList.join(',')
+      this.form.fjListName = nameList
-      this.form.fjListId = idList.join(',')
+      this.form.fjListId = idList
     },
     // 点击查看
     handlePreview(item) {
@@ -728,6 +732,11 @@ export default {
         this.form.standType = bringData[0].standType
         this.form.standId = bringData[0].id
         this.listModel = false;
+        this.$http.get('SarStandItems/sar-stand-items/getFileType', {
+          standId: bringData[0].id
+        }, {}, res => {
+          this.textTypeList = res.data
+        })
       } else if (this.selectedList.length > 1) {
         this.$message.warning("只能选择一条数据进行带入");
       } else {

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div style="">
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                                             v-model="form.fjListId"
                                             style="display: none;"
                                     ></el-input>
-                                    <div style="display: flex;">
+                                    <div>
                                         <div class="fileClass"
                                              style="margin-right: 15px;padding-left: 10px"
                                              v-for="(item, index) in form.fjList"
@@ -659,6 +659,7 @@
                 }, {}, res => {
                     if (res.ok) {
                         this.options = res.data.list
+                        console.log(res);
                     }
                 }, e => {
                 })
@@ -691,7 +692,7 @@
                         this.form.endTime = data.endTime || data.form.endTime
                         this.todoId = res.id
                         this.json = data
-                        this.getItemList(data.standId,this.form.textValue)
+                        this.getItemList(data.standId,data.textType)
                         this.data = data.info || data.data || data.form.data || []
                     }).catch(e => {
                     })

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

@@ -45,7 +45,7 @@
                                             v-model="form.fjListId"
                                             style="display: none;"
                                     ></el-input>
-                                    <div style="display: flex;">
+                                    <div>
                                         <div class="fileClass"
                                              style="margin-right: 15px;padding-left: 10px"
                                              v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                                             v-model="form.fjListId"
                                             style="display: none;"
                                     ></el-input>
-                                    <div style="display: flex;">
+                                    <div>
                                         <div class="fileClass"
                                              style="margin-right: 15px;padding-left: 10px"
                                              v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"
@@ -664,7 +664,7 @@ export default {
           this.form.spId = data.spId || ''
           this.form.spName = data.spName || ''
           this.json = data
-          this.getItemList(data.standId,this.form.textValue)
+          this.getItemList(data.standId,data.textType)
           this.data = data.info || data.data
         }).catch(e => {
         })

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -45,7 +45,7 @@
                           v-model="form.fjListId"
                           style="display: none;"
                   ></el-input>
-                  <div style="display: flex;">
+                  <div>
                     <div class="fileClass"
                          style="margin-right: 15px;padding-left: 10px"
                          v-for="(item, index) in form.fjList"

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

@@ -493,7 +493,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院各中心兼职标准化员/各事业部标准化员" prop="bussUser4Name" placement="top" :color="roleForm.bussUser4Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="标准化初审" prop="bussUser4Name" placement="top" :color="roleForm.bussUser4Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser4Name" style="margin-bottom: 0">
                                         <h4>总院各中心兼职标准化员/各事业部标准化员</h4>
@@ -503,7 +503,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择会签征求意见人员" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="征求意见" prop="bussUser5Name" placement="top" :color="roleForm.bussUser5Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser5Name" style="margin-bottom: 0">
                                         <h4>会签征求意见人员</h4>
@@ -513,7 +513,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择意见汇总及标准修改人员" placement="top" :color="roleForm.bussUser6Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="意见汇总及标准修改" placement="top" :color="roleForm.bussUser6Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser6Name" style="margin-bottom: 0">
                                         <h4>意见汇总及标准修改人员</h4>
@@ -523,7 +523,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院标准法规部产品标准工程师/各事业部标准法规部人员" prop="bussUser7Name" placement="top" :color="roleForm.bussUser7Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="标准化复审" prop="bussUser7Name" placement="top" :color="roleForm.bussUser7Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser7Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部产品标准工程师/各事业部标准法规部人员</h4>
@@ -533,7 +533,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院项目总工/各事业部整车所产品经理" prop="bussUser8Name" placement="top" :color="roleForm.bussUser8Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审核" prop="bussUser8Name" placement="top" :color="roleForm.bussUser8Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser8Name" style="margin-bottom: 0">
                                         <h4>总院项目总工/各事业部整车所产品经理</h4>
@@ -543,7 +543,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择标总院标准法规部高级经理/各事业部标准业务/认证业务经理" prop="bussUser9Name" placement="top" :color="roleForm.bussUser9Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审核" prop="bussUser9Name" placement="top" :color="roleForm.bussUser9Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser9Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部高级经理/各事业部标准业务/认证业务经理</h4>
@@ -553,7 +553,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院标准法规部高级经理/各事业部标准业务/认证业务经理" prop="bussUser10Name" placement="top" :color="roleForm.bussUser10Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审定" prop="bussUser10Name" placement="top" :color="roleForm.bussUser10Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser10Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部高级经理/各事业部标准业务/认证业务经理</h4>
@@ -563,7 +563,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院技术管理中心主任/各事业部主管标准业务高级经理" prop="bussUser11Name" placement="top" :color="roleForm.bussUser11Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审定" prop="bussUser11Name" placement="top" :color="roleForm.bussUser11Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser11Name" style="margin-bottom: 0">
                                         <h4>总院技术管理中心主任/各事业部主管标准业务高级经理</h4>
@@ -573,7 +573,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院平台总监/各事业部研发副总裁" prop="bussUser12Name" placement="top" :color="roleForm.bussUser12Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="批准" prop="bussUser12Name" placement="top" :color="roleForm.bussUser12Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser12Name" style="margin-bottom: 0">
                                         <h4>总院平台总监/各事业部研发副总裁</h4>
@@ -583,7 +583,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院标准法规部产品标准工程师/各事业部标准化员" prop="bussUser13Name" placement="top" :color="roleForm.bussUser13Name ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="发布" prop="bussUser13Name" placement="top" :color="roleForm.bussUser13Name ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser13Name" style="margin-bottom: 0">
                                         <h4>总院标准法规部产品标准工程师/各事业部标准化员</h4>
@@ -593,7 +593,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择抄送人员" prop="bussUser14Name" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="抄送" prop="bussUser14Name" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bussUser14Name" style="margin-bottom: 0">
                                         <h4>抄送人员</h4>
@@ -1330,7 +1330,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                   standEnName: [
                     { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -920,7 +920,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -920,7 +920,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -920,7 +920,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -1001,7 +1001,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -1001,7 +1001,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -923,7 +923,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -986,7 +986,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -920,7 +920,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -940,7 +940,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -987,7 +987,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -208,12 +208,15 @@
     <!--        保存||提交-->
     <ProcessFooter
             v-show="verifySarStandard"
-            show-save
+            :show-save="false"
-            show-submit
+            show-over2
-            :saveLoading="saveLoading"
+            show-submit2
+            show-transfer
             :submitLoading="isSubmit"
-            @save="handleSave"
+            :saveLoading="saveLoading"
-            @submit="handleSubmit"
+            @transfer="handleTransfer"
+            @submit2="handle2"
+            @over2="handle1"
     >
     </ProcessFooter>
     <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
@@ -352,6 +355,13 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <!--        <el-drawer-->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -560,7 +570,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1004,7 +1014,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -2310,6 +2320,37 @@
                     this.rules.commentText[0].required = true;
                 }
             },
+            checkedRoleTransfer (data) {
+                this.assigneeNewLoading = true
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    this.assigneeNewLoading = false
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
+            handle1(){
+                this.formTongGuo.approvalOpinion = 1
+                this.handleSubmit()
+            },
+            handle2(){
+                this.formTongGuo.approvalOpinion = 0
+                this.handleSubmit()
+            },
             handleSubmit() {
                 this.getRule()
                 // const val= this.form.country;

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

@@ -920,7 +920,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -920,7 +920,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -978,7 +978,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -987,7 +987,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -916,7 +916,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -25,7 +25,7 @@
                         <el-row :gutter="24">
                             <el-col :span="12">
                                 <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.standSort" filterable clearable>
+                                    <el-select v-model="form.standSort" filterable clearable :disabled="planDisabled">
                                         <el-option
                                                 v-for="item in standSortOptions"
                                                 placeholder="请选择企标类别"
@@ -35,8 +35,9 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
+                                <el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled" >
                                     <el-input
+                                            :disabled="planDisabled"
                                             v-model="form.standName"
                                             placeholder="请输入中文名称"
                                             clearable
@@ -96,10 +97,9 @@
                                 <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
                                             type="primary"
-                                            :disabled="true"
                                             :loading="loadSarStandard"
                                             @click="handleSearchStandard">
-                                        根据企标编号、企标名称查询
+                                        根据企标名称、起草责任单位查询
                                     </el-button>
                                 </el-form-item>
                                 <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -493,7 +493,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院各中心兼职标准化员/各事业部标准化员" prop="bzhUserName" placement="top" :color="roleForm.bzhUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="标准化初审" prop="bzhUserName" placement="top" :color="roleForm.bzhUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bzhUserName" style="margin-bottom: 0">
                                         <h4>总院各中心兼职标准化员/各事业部标准化员</h4>
@@ -503,7 +503,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择会签征求意见人员" prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="征求意见" prop="hqUserName" placement="top" :color="roleForm.hqUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="hqUserName" style="margin-bottom: 0">
                                         <h4>会签征求意见人员</h4>
@@ -513,7 +513,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择技术委员会评审/评审意见修改人员" placement="top" :color="roleForm.xdUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="评审/评审意见修改" placement="top" :color="roleForm.xdUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="xdUserName" style="margin-bottom: 0">
                                         <h4>技术委员会评审/评审意见修改人员</h4>
@@ -523,7 +523,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择标准法规部标准化工程师" prop="fggcsUserName" placement="top" :color="roleForm.fggcsUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="复审" prop="fggcsUserName" placement="top" :color="roleForm.fggcsUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="fggcsUserName" style="margin-bottom: 0">
                                         <h4>标准法规部标准化工程师</h4>
@@ -533,7 +533,7 @@
                                     </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>
@@ -543,7 +543,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择标准法规部高级经理" prop="bzUserName" placement="top" :color="roleForm.bzUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审核" prop="bzUserName" placement="top" :color="roleForm.bzUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="bzUserName" style="margin-bottom: 0">
                                         <h4>标准法规部高级经理</h4>
@@ -553,7 +553,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择起草单位中心主任" prop="fzrUserName" placement="top" :color="roleForm.fzrUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="审定" prop="fzrUserName" placement="top" :color="roleForm.fzrUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="fzrUserName" style="margin-bottom: 0">
                                         <h4>起草单位中心主任</h4>
@@ -563,7 +563,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择总院院长或总院主管副院长" prop="zhrUserName" placement="top" :color="roleForm.zhrUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="批准" prop="zhrUserName" placement="top" :color="roleForm.zhrUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="zhrUserName" style="margin-bottom: 0">
                                         <h4>总院院长或总院主管副院长</h4>
@@ -573,7 +573,7 @@
                                     </el-form-item>
                                 </el-card>
                             </el-timeline-item>
-                            <el-timeline-item timestamp="选择标准法规部标准化工程师发布人员" prop="pxUserName" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">
+                            <el-timeline-item timestamp="发布" prop="pxUserName" placement="top" :color="roleForm.pxUserName ? '#66b1ff' : ''">
                                 <el-card>
                                     <el-form-item prop="pxUserName" style="margin-bottom: 0">
                                         <h4>标准法规部标准化工程师发布人员</h4>
@@ -791,39 +791,36 @@
             <div class="standard-content">
                 <div class="content">
                     <div class="standard-table-search">
-                        <el-form :model="standardSearchForm" inline class="label-input-form search-area">
+                        <el-form :model="standardSearchForm" inline class="label-input-form search-area" style="justify-content:left">
-                            <el-form-item label="政策编号" style="margin-right:-20px" prop="lawsNumber" class="search-item" >
+<!--                            <el-form-item label="计划状态" style="margin-right:-20px" prop="planStatus" class="search-item" >-->
+<!--                                <el-select v-model="standardSearchForm.planStatus" placeholder="请选择计划状态">-->
+<!--                                    <el-option label="制定" value="2"></el-option>-->
+<!--                                    <el-option label="修订" value="1"></el-option>-->
+<!--                                    <el-option label="完成" value="0"></el-option>-->
+<!--                                </el-select>-->
+<!--                            </el-form-item>-->
+<!--                            <el-form-item label="制修订状态" style="margin-right:-20px" prop="reviseStatus" class="search-item" >-->
+<!--                                <el-select v-model="standardSearchForm.reviseStatus" placeholder="请选择制修订状态">-->
+<!--                                    <el-option label="制定完成" value="0"></el-option>-->
+<!--                                    <el-option label="制定中" value="1"></el-option>-->
+<!--                                    <el-option label="未制定" value="2"></el-option>-->
+<!--                                </el-select>-->
+<!--                            </el-form-item>-->
+                            <el-form-item label="企标名称" style="margin-right:20px" prop="esName" class="search-item" >
                                 <el-input
-                                        v-model="standardSearchForm.lawsNumber"
+                                        v-model="standardSearchForm.esName"
-                                        clearable placeholder="根据编号查找"
+                                        placeholder="请输入企标名称"
-                                        :maxlength="100"
-                                        @keyup.enter.native="handleSearchStandard"/>
-                            </el-form-item>
-                            <el-form-item label="中文名称" style="margin-right:-20px" prop="lawsName" class="search-item" >
-                                <el-input
-                                        v-model="standardSearchForm.lawsName"
-                                        placeholder="请输入中文名称"
                                         clearable
                                         :maxlength="100"></el-input>
                             </el-form-item>
-                            <el-form-item label="英文名称" style="margin-right:-20px" prop="lawsEnName" class="search-item" >
+                            <el-form-item label="起草责任单位" style="margin-right:20px" prop="unit" class="search-item" >
                                 <el-input
-                                        v-model="standardSearchForm.lawsEnName"
+                                        style="width:176px"
-                                        placeholder="请输入英文名称"
+                                        v-model="standardSearchForm.unit"
+                                        placeholder="请输入起草责任单位"
                                         clearable
                                         :maxlength="100"></el-input>
                             </el-form-item>
-                            <el-formItem label="文本状态" prop="lawsTextState" class="search-item">
-                                <el-select v-model="standardSearchForm.lawsTextState" filterable clearable>
-                                    <el-option
-                                            v-for="item in standStateOptions"
-                                            placeholder="请选择"
-                                            :key="item.value"
-                                            :value="item.value"
-                                            :label="item.label"
-                                    ></el-option>
-                                </el-select>
-                            </el-formItem>
                             <el-form-item>
                                 <el-button
                                         icon="el-icon-search"
@@ -863,41 +860,86 @@
                                     align="center"
                             ></el-table-column>
                             <el-table-column
-                                    label="政策编号"
+                                    prop="bussSort"
+                                    label="企标类别"
                                     align="center"
-                            >
+                                    width="120">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="esName"
+                                    label="企标名称"
+                                    align="center"
+                                    width="120">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="planStatus"
+                                    label="计划状态"
+                                    align="center"
+                                    width="150">
                                 <template slot-scope="scope">
-                                    <a @click="handlePreview(scope.row)">{{ scope.row.lawsNumber }}</a>
+                                    <div>{{ getMap1(scope.row.planStatus)}}</div>
                                 </template>
                             </el-table-column>
                             <el-table-column
-                                    prop="lawsName"
+                                    prop="reviseStatus"
-                                    label="中文名称"
+                                    width="150"
-                                    align="center">
+                                    align="center"
-                            </el-table-column>
+                                    label="制修订状态">
-                            <el-table-column
-                                    prop="lawsEnName"
-                                    label="英文名称"
-                                    align="center">
-                            </el-table-column>
-                            <el-table-column
-                                    prop="textStatus"
-                                    label="文本状态"
-                                    align="center">
-                              <template slot-scope="scope">
-                                <span>{{ scope.row.standStatusShow }}</span>
-                              </template>
-                            </el-table-column>
-                            <el-table-column label="操作" align="center" width="80">
                                 <template slot-scope="scope">
-                                    <el-button
+                                    <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
-                                            class="opera-btn"
-                                            size="mini"
-                                            type="primary"
-                                            @click="handlePreview(scope.row)">查看
-                                    </el-button>
                                 </template>
                             </el-table-column>
+                            <el-table-column
+                                    prop="drafterName"
+                                    width="120"
+                                    align="center"
+                                    label="起草人">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="resPersonName"
+                                    width="120"
+                                    align="center"
+                                    label="评审责任人">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="wgLeaderName"
+                                    width="120"
+                                    align="center"
+                                    label="工作组组长">
+                            </el-table-column>
+                            <el-table-column
+                                    prop="draftTime"
+                                    width="200"
+                                    align="center"
+                                    label="计划标准初稿完成时间">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.draftTime ? $moment(scope.row.draftTime).format("YYYY-MM-DD") : "" }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    width="200"
+                                    prop="releaseTime"
+                                    align="center"
+                                    label="计划标准发布时间">
+                                <template slot-scope="scope">
+                                    <span>{{ scope.row.releaseTime ? $moment(scope.row.releaseTime).format("YYYY-MM-DD") : "" }}</span>
+                                </template>
+                            </el-table-column>
+                            <el-table-column
+                                    align="center"
+                                    prop="unitName"
+                                    label="起草责任单位">
+                            </el-table-column>
+<!--                            <el-table-column label="操作" align="center" width="80">-->
+<!--                                <template slot-scope="scope">-->
+<!--                                    <el-button-->
+<!--                                            class="opera-btn"-->
+<!--                                            size="mini"-->
+<!--                                            type="primary"-->
+<!--                                            @click="handlePreview(scope.row)">查看-->
+<!--                                    </el-button>-->
+<!--                                </template>-->
+<!--                            </el-table-column>-->
                         </el-table>
                     </div>
                     <pagination
@@ -909,12 +951,6 @@
                 </div>
             </div>
             <div class="demo-drawer-footer">
-                <el-button
-                        round
-                        class="common-button-primary"
-                        icon="el-icon-check"
-                        type="primary"
-                        @click="handleProcessStandardNext(1)">新增</el-button>
                 <el-button
                         round
                         class="common-button-primary"
@@ -985,6 +1021,27 @@
                 // callback()
             };
 
+            const validateStandName = (rule, value, callback) => {
+                if(this.form.planId === undefined || this.form.planId === null || this.form.planId === ''){
+                    callback(new Error('请先选择企标计划带入企标名称！'))
+                }else if(value === undefined || value === null || value === ''){
+                    callback(new Error('请输入企标名称！'))
+                }else {
+                    callback()
+                }
+            };
+
+            const validateStandSort = (rule, value, callback) => {
+                if(this.form.planId === undefined || this.form.planId === null || this.form.planId === ''){
+                    callback(new Error('请先选择企标计划带入企标类别！'))
+                }else if(value === undefined || value === null || value === ''){
+                    callback(new Error('请选择企标类别！'))
+                }else {
+                    callback()
+                }
+                callback()
+            };
+
             const validateModelName = (rule, value, callback) => {
                 if(this.FBGBUSSFileList.length === 0){
                     callback(new Error('请上传发布稿文件！'))
@@ -1059,11 +1116,10 @@
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
                     total: 0,
-                    standType: 'INLAND',
+                    unit: '',
-                    standSort: '',
+                    esName: '',
-                    standName: '',
+                    planStatus: '0,3',
-                    standEnName: '',
+                    reviseStatus: '',
-                    standNumber: ''
                 },
                 tableData: {
                     // 标准表格数据
@@ -1166,7 +1222,10 @@
                 fileType: '',
                 countryArr:'',
               commentCycleDate:'',
+              planDisabled:true,
                 form: {
+                    planId:'',
+                    reviseStatus:'',
                     modelData:[],
                     modelDataNameVerify:[],
                     modelDataZrUserVerify:[],
@@ -1291,7 +1350,7 @@
                         { required: true, message: '选择维护模块名称', validator: validateModelName,trigger: 'blur' },
                     ],
                     standSort: [
-                        { required: true, message: '请选择企标类别', trigger: 'change' }
+                        { required: true, validator:validateStandSort,trigger: 'change' }
                     ],
                     standNumber: [
                         { required: true, message: '请输入企标编号', trigger: 'blur' },
@@ -1302,9 +1361,9 @@
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
                     ],
                     standName: [
-                        { required: true, message: '请输入企标中文名称', trigger: 'blur' },
+                        { required: true, validator:validateStandName, trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                   standEnName: [
                     { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1407,6 +1466,15 @@
           },
         },
         methods: {
+            getMap1(item){
+                const map = new Map();
+                map.set('0','未开始')
+                map.set('1','制定中')
+                map.set('2','修订中')
+                map.set('3','已取消')
+                map.set('4','已完成')
+                return map.get(item)
+            },
             modelProp(row,index){
                 console.log(row)
                 console.log(index)
@@ -1697,42 +1765,19 @@
                     // 带入
                     case 2:
                         if (this.standardCheckedList.length === 1) {
-                          this.$http.get('lawss/sarLawsInfo/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
+                            this.form.standName = this.standardCheckedList[0].esName
-                            _this: this
+                            this.form.standSort = this.standardCheckedList[0].bussSort
-                          }, res => {
+                            this.form.planId = this.standardCheckedList[0].id
-                            if(res && res.data){
+                            this.form.reviseStatus = this.standardCheckedList[0].reviseStatus
-                              const bringData = res.data
+                            this.standardDrawer = false
-
+                            this.verifySarStandard = true
-                              const json = Object.assign(bringData, bringData.attrInfoMap);
+                            this.planDisabled = false
-                              this.form = JSON.parse(JSON.stringify(json))
+                            this.$forceUpdate()
-                              this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : []
-                              this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : []
-                              this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : []
-                              this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : []
-                              this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : []
-                              this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : []
-                              this.form.prcNum = this.prcNum
-                              this.form.prcName = this.prcName
-                              this.form['id'] = bringData.id
-                              this.standardDrawer = false
-                              this.verifySarStandard = true
-                              this.busVsFunc()
-                              this.modelFunc()
-                              this.$forceUpdate()
-                            }
-                            // 遍历对象初始化文件信息
-                            for(const p in this.form) {
-                              if (typeof (this.form[p ]) != "function") {
-                                this.initializeFileList(p,this.form[p]);
-                              }
-                            }
-                            console.log("res",res);
-                          })
 
                         } else if (this.standardCheckedList.length > 1) {
-                            this.$message.warning('最多可以带入一条政策信息')
+                            this.$message.warning('最多可以带入一条计划信息')
                         } else {
-                            this.$message.warning('请选择要带入的政策信息')
+                            this.$message.warning('请选择要带入的计划信息')
                         }
                         break
                     // 取消
@@ -1751,6 +1796,7 @@
               case 'fbgbjbd':
                 this.getFileList(value,this.FBGBJBDFileList);
                 break;
+
               case 'ssg':
                 this.getFileList(value,this.ssgFileList);
                 break;
@@ -1818,11 +1864,11 @@
                 this.standardCheckedList = data
             },
             handleResetSearch() {
-                this.standardSearchForm.standType = 'BUSINESS'
+                this.standardSearchForm.page = 1
-                this.standardSearchForm.standNumber = ''
+                this.standardSearchForm.unit = ''
-                this.standardSearchForm.standSort = ''
+                this.standardSearchForm.esName = ''
-                this.standardSearchForm.standName = ''
+                this.standardSearchForm.planStatus = ''
-                this.standardSearchForm.standEnName = ''
+                this.standardSearchForm.reviseStatus = '0,3'
                 setTimeout(() => {
                     this.handleSearchStandard()
                 }, 100)
@@ -1836,7 +1882,9 @@
             },
             getDomesticStandardTable () {
                 this.loadSarStandard = true
-                this.$http.get('lawss/sarLawsInfo/page', this.standardSearchForm, {}, res => {
+                this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans', this.standardSearchForm, {
+                    _this: this
+                }, res => {
                     this.loadSarStandard = false
                     if (res.ok) {
                         this.tableData.standardData = res.data.list
@@ -1847,19 +1895,15 @@
                 })
             },
             handleSearchStandard () {
-                if (this.form.standType === '') {
+                this.standardDrawer = true
-                    this.$message.warning('请选择标准来源')
+                this.$nextTick(() => {
-                } else {
+                    // 动态设置表格高度
-                    this.standardDrawer = true
+                    this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
-                    this.$nextTick(() => {
+                    window.onresize = () => {
-                        // 动态设置表格高度
                         this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
-                        window.onresize = () => {
+                    }
-                            this.tableHeight.standardTableHeight = $('.standard-table-wrap').height()
+                })
-                        }
+                this.getDomesticStandardTable()
-                    })
-                    this.getDomesticStandardTable()
-                }
             },
             saveUserInfo () {
               this.filterText = ''
@@ -2577,6 +2621,27 @@
                                         }, res => {
                                             if (res.success) {
                                                 this.$message.success(res.message)
+                                                const planForm = {}
+                                                planForm.id = this.form.planId
+                                                planForm.planStatus = this.form.reviseStatus !== undefined ? ( this.form.reviseStatus === '1' ? '1' : '2') :''
+                                                this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, {
+                                                    _this: this
+                                                }, res => {
+                                                    this.submitLoading = false
+                                                    if (res.ok) {
+                                                        if (res.data === '操作成功') {
+                                                            this.addDrawer = false
+                                                            this.$message.success(tips + '成功')
+                                                            this.getData()
+                                                        } else {
+                                                            this.addDrawer = false
+                                                            this.$message.warning(res.data)
+                                                            this.getData()
+                                                        }
+                                                    } else {
+                                                        this.$message.warning(tips + '失败')
+                                                    }
+                                                })
                                                 this.isSubmit = false
                                                 // 流程提交之后，应该流转至待办任务页面
                                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})

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

@@ -934,7 +934,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -933,7 +933,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -2194,7 +2194,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {

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

@@ -923,7 +923,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -2154,7 +2154,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {

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

@@ -924,7 +924,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -986,7 +986,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -929,7 +929,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -1044,7 +1044,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -2353,7 +2353,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
@@ -2371,7 +2371,7 @@
                                     this.isSubmit = true
                                     this.saveLoading = true
                                     this.form.commentText = this.formTongGuo.commentText
-                                    this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                    // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     // 会签意见存储
                                     const infoList = []
                                     const info = {}

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

@@ -1028,7 +1028,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -2394,7 +2394,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
@@ -2413,7 +2413,7 @@
                                 this.isSubmit = true
                                 this.saveLoading = true
                                 this.form.commentText = this.formTongGuo.commentText
-                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 const json = JSON.stringify(this.form);
                                 this.$http.post('lawss/activiti/completeTask', {
                                     taskIds: this.taskIds,

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

@@ -314,13 +314,18 @@
     <ProcessFooter
             v-show="verifySarStandard"
             show-save
-            show-submit
+            show-over2
-            :saveLoading="saveLoading"
+            show-submit2
+            show-transfer
             :submitLoading="isSubmit"
+            :saveLoading="saveLoading"
             @save="handleSave"
-            @submit="handleSubmit"
+            @transfer="handleTransfer"
+            @submit2="handle2"
+            @over2="handle1"
     >
     </ProcessFooter>
+    </ProcessFooter>
     <el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
         <el-upload
                 multiple
@@ -457,6 +462,14 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <!-- 福田全公司选人解决方案 -->
+    <Role-tree
+            check-box
+            :is-title="drawerTitle"
+            :is-visible.sync="drawerModal"
+            @checkedRole="checkedRoleTransfer"
+            :nodeList="nodeList"
+    ></Role-tree>
     <!--        <el-drawer-->
     <!--                :title="drawerTitle"-->
     <!--                :visible.sync="modalShowFlag"-->
@@ -665,7 +678,7 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,changeAssigneeNew} from "api/process";
     import {getEvaluationIndex} from "api/businessApi";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
@@ -1047,7 +1060,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -1383,6 +1396,25 @@
                     this.roleForm.hqUserName=nameList;
                 }
             },
+            checkedRoleTransfer (data) {
+                this.assigneeNewLoading = true
+                changeAssigneeNew({
+                    taskId: this.$route.query.taskIds, // 任务id
+                    userId:this.$store.getters.userInfo.userId, // 委托人
+                    assignee: data[0].id, // 被委托人
+                    pId: this.$route.query.prcId, // 流程实例
+                }).then(res => {
+                    this.assigneeNewLoading = false
+                    if (res.success) {
+                        this.drawerModal = false
+                        this.$message.success('调整成功')
+                        this.processNum()
+                        this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                    } else {
+                        this.$message.warning(res.message)
+                    }
+                })
+            },
             checkedRole (data) {
                 if (this.type === 0) {
                     this.roleForm.deptUserId = data[0].id
@@ -2234,6 +2266,22 @@
             handleTabs(name) {
                 this.active = name
             },
+            handleTransfer() {
+                this.drawerModal = true
+                this.drawerTitle = '转办处理人'
+            },
+            handle1(){
+                this.formTongGuo.approvalOpinion = 1
+                this.handleSubmit()
+            },
+            handle2(){
+                this.formTongGuo.approvalOpinion = 0
+                this.$refs['form'].validate((valid) => {
+                    if (valid) {
+                        this.handleSubmit()
+                    }
+                })
+            },
             //保存
             handleSave() {
             this.form.country=this.countryArr;

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

@@ -1063,7 +1063,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -1063,7 +1063,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -985,7 +985,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -2333,7 +2333,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
@@ -2352,7 +2352,7 @@
                                 this.isSubmit = true
                                 this.saveLoading = true
                                 this.form.commentText = this.formTongGuo.commentText
-                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 const json = JSON.stringify(this.form);
                                 this.$http.post('lawss/activiti/completeTask', {
                                     taskIds: this.taskIds,

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

@@ -1028,7 +1028,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },
@@ -2394,7 +2394,7 @@
                 }
             },
             handleSubmit() {
-                this.getRule()
+                // this.getRule()
                 // const val= this.form.country;
                 // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
                 //     if (val instanceof Array) {
@@ -2413,7 +2413,7 @@
                                 this.isSubmit = true
                                 this.saveLoading = true
                                 this.form.commentText = this.formTongGuo.commentText
-                                this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                                // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                 const json = JSON.stringify(this.form);
                                 this.$http.post('lawss/activiti/completeTask', {
                                     taskIds: this.taskIds,

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

@@ -918,7 +918,7 @@
                     standName: [
                         { required: true, message: '请输入企标中文名称', trigger: 'blur' },
                         { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     standEnName: [
                         { required: false, message: '请输入企标英文名称', trigger: 'blur' },

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

@@ -22,6 +22,16 @@
                 clearable
               ></el-input>
             </el-form-item>
+            <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+                <el-option
+                  v-for="(item, index) in standSortOptions"
+                  :key="index"
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -54,11 +64,11 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
               <el-input
                 disabled
                 v-model="qbfsForm.rqbName"
-                placeholder="请输入企业标准"
+                placeholder="请输入被修订标准代号"
                 :maxlength="500"/>
             </el-form-item>
             <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -199,9 +209,8 @@
                 </el-form-item>
                 <el-form-item label="制修订状态" class="search-item search-item-last">
                   <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态">
-                    <el-option label="制定完成" value="制定完成"></el-option>
+                    <el-option label="制定" value="制定"></el-option>
-                    <el-option label="制定中" value="制定中"></el-option>
+                    <el-option label="修订" value="修订"></el-option>
-                    <el-option label="未制定" value="未制定"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">
@@ -248,7 +257,8 @@
                 label="计划状态"
                 align="center">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -256,7 +266,7 @@
                 align="center"
                 label="制修订状态">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                  <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -326,6 +336,9 @@ export default {
   data(){
     return{
       formRules: {
+        bussSort: [
+          { required: true, message: "请选择企标类别", trigger: "blur" }
+        ],
         cancelReason: [
           {required: true, message: '请输入取消原因', trigger:'blur'},
         ]
@@ -334,6 +347,7 @@ export default {
       ListModel: false,
       standinfoList: [],
       BZList: [],
+      standSortOptions: [],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -376,6 +390,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods: {
@@ -432,22 +447,28 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
+          (this.selectList[0] === '3'? '已取消' : '已完成')))
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
         this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         if(this.selectList[0].area){
           this.qbfsForm.area = this.selectList[0].area.split(',')
         }
+        if(this.selectList[0].bussSort){
+          this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',')
+        }
         this.qbfsForm.rqbName = this.selectList[0].rqbName
         this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
         this.qbfsForm.isRelate = this.selectList[0].isRelate
         this.qbfsForm.useLevel = this.selectList[0].useLevel
         this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
         this.qbfsForm.technologic = this.selectList[0].technologic
-        this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
+        if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){
+          this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
+        }
         this.ListModel = false
       }
     },

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

@@ -22,6 +22,16 @@
                clearable
              ></el-input>
            </el-form-item>
+           <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+             <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+               <el-option
+                 v-for="(item, index) in standSortOptions"
+                 :key="index"
+                 :value="item.value"
+                 :label="item.label">
+               </el-option>
+             </el-select>
+           </el-form-item>
            <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
              <el-input
                readonly
@@ -32,9 +42,8 @@
            </el-form-item>
            <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
              <el-select disabled v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
-               <el-option label="制定完成" value="制定完成"></el-option>
+               <el-option label="制定" value="1"></el-option>
-               <el-option label="制定中" value="制定中"></el-option>
+               <el-option label="修订" value="2"></el-option>
-               <el-option label="未制定" value="未制定"></el-option>
              </el-select>
            </el-form-item>
            <el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
@@ -54,11 +63,11 @@
                placeholder="请选择初稿完成时间">
              </el-date-picker>
            </el-form-item>
-           <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+           <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
              <el-input
                disabled
                v-model="qbfsForm.rqbName"
-               placeholder="请输入企业标准"
+               placeholder="请输入被修订标准代号"
                :maxlength="500"/>
            </el-form-item>
            <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -216,9 +225,8 @@
                </el-form-item>
                <el-form-item label="制修订状态" class="search-item search-item-last">
                  <el-select  v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态">
-                   <el-option label="制定完成" value="制定完成"></el-option>
+                   <el-option label="制定" value="制定"></el-option>
-                   <el-option label="制定中" value="制定中"></el-option>
+                   <el-option label="修订" value="修订"></el-option>
-                   <el-option label="未制定" value="未制定"></el-option>
                  </el-select>
                </el-form-item>
                <el-form-item class="search-item btn-box">
@@ -265,7 +273,8 @@
                label="计划状态"
                align="center">
                <template slot-scope="scope">
-                 <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                 <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+                   (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
                </template>
              </el-table-column>
              <el-table-column
@@ -273,7 +282,7 @@
                align="center"
                label="制修订状态">
                <template slot-scope="scope">
-                 <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                 <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
                </template>
              </el-table-column>
              <el-table-column
@@ -343,7 +352,11 @@ export default {
   data(){
     return{
       BZList: [],
+      standSortOptions: [],
       formRules: {
+        bussSort: [
+          { required: true, message: "请选择企标类别", trigger: "blur" }
+        ],
         yqDraftTime: [
           { required: true, message: '请选择延期后初稿完成时间', trigger: 'blur' },
         ],
@@ -398,6 +411,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods: {
@@ -455,22 +469,28 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
+          (this.selectList[0] === '3'? '已取消' : '已完成')))
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
         this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         if(this.selectList[0].area){
           this.qbfsForm.area = this.selectList[0].area.split(',')
         }
+        if(this.selectList[0].bussSort){
+          this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',')
+        }
         this.qbfsForm.rqbName = this.selectList[0].rqbName
         this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
         this.qbfsForm.isRelate = this.selectList[0].isRelate
         this.qbfsForm.useLevel = this.selectList[0].useLevel
         this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
         this.qbfsForm.technologic = this.selectList[0].technologic
-        this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
+        if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){
+          this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
+        }
         this.ListModel = false
       }
     },

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

@@ -11,6 +11,16 @@
           clearable
         ></el-input>
       </el-form-item>
+      <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+        <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+          <el-option
+            v-for="(item, index) in standSortOptions"
+            :key="index"
+            :value="item.value"
+            :label="item.label">
+          </el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
         <el-input
           v-model="qbfsForm.esName"
@@ -74,7 +84,7 @@
                   @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
         </el-input>
       </el-form-item>
-      <el-form-item prop="rqbName" label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+      <el-form-item prop="rqbName" label="被修订标准代号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
         <el-input
           style="display: none;"
           v-model="qbfsForm.rqbJson">
@@ -82,7 +92,7 @@
         <el-input
           clearable
           v-model="qbfsForm.rqbName"
-          placeholder="请选择企业标准"
+          placeholder="请选择被修订标准代号"
           readonly
           @click.native="choiceQYBZ">
         </el-input>
@@ -258,7 +268,7 @@
     <el-drawer
       title="选择体系结构"
       :visible.sync="TXJGmodal"
-      size="900px"
+      size="400px"
       custom-class="demo-drawer"
     >
       <div class="standardForComments">
@@ -334,7 +344,7 @@ export default {
       standSystemOptions: [],
       QYBZform: {
         page: 1,
-        pageSzie: this.$store.getters.userInfo.configContent,
+        pageSize: this.$store.getters.userInfo.configContent,
         validFlag: '0',
         userId: this.$store.getters.userInfo.userId,
         standCode: '',
@@ -349,6 +359,7 @@ export default {
       modalshowflag: false,
       nodeList2: [],
       nodeList: [],
+      standSortOptions: [],
       BZList: [],
       qcdwOptions: [],
       qbfsForm: {
@@ -372,46 +383,13 @@ export default {
         newReason: "" //新增原因
         // remarks: '', // 备注
       },
-      useOptions: [
-        {
-          value: "ISO",
-          label: "ISO"
-        }, {
-          value: "ESE",
-          label: "ESE"
-        }, {
-          value: "EC/EEC",
-          label: "EC/EEC"
-        }, {
-          value: "IEC",
-          label: "IEC"
-        }, {
-          value: "GB",
-          label: "GB"
-        }, {
-          value: "GB/T",
-          label: "GB/T"
-        }, {
-          value: "QC/T",
-          label: "QC/T"
-        }, {
-          value: "JT/T",
-          label: "JT/T"
-        }, {
-          value: "HJ",
-          label: "HJ"
-        }, {
-          value: "TB",
-          label: "团标"
-        },{
-          value: "QT",
-          label: "其他"
-        },
-        ],
       qbfsFormRules: {
         unit: [
           { required: true, message: "请选择起草单位", trigger: "change" }
         ],
+        bussSort: [
+          { required: true, message: "请选择企标类别", trigger: "blur" }
+        ],
         esName: [
           { required: true, message: "请输入企标名称", trigger: "blur" }
         ],
@@ -464,6 +442,7 @@ export default {
        _this: this
      }, res => {
        this.BZList = res.data.ENERGYTYPES //标准范围
+       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
        this.standSystemOptions = res.data.TXLBBUSS // 体系结构
        this.qcdwOptions = res.data.QCDW // 起草单位
      })
@@ -646,8 +625,6 @@ export default {
 @import '~@/assets/styles/mixins';
 @import '~@/assets/styles/style';
 #establish {
-  height: 100%;
-  background: #fff;
   .classDisplay {
     /deep/.el-form-item__content {
       width: calc(~'100% - 180px');

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

@@ -53,6 +53,16 @@
                 clearable
               ></el-input>
             </el-form-item>
+            <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+                <el-option
+                  v-for="(item, index) in standSortOptions"
+                  :key="index"
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
               <el-input
                 v-model="qbfsForm.esName"
@@ -62,9 +72,8 @@
             </el-form-item>
             <el-form-item prop="reviseStatus" label="制修订状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
               <el-select  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
-                <el-option label="制定完成" value="制定完成"></el-option>
+                <el-option label="制定" value="制定"></el-option>
-                <el-option label="制定中" value="制定中"></el-option>
+                <el-option label="修订" value="修订"></el-option>
-                <el-option label="未制定" value="未制定"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
@@ -87,7 +96,7 @@
                         @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
               </el-input>
             </el-form-item>
-            <el-form-item prop="rqbName" label="企业标准" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-form-item prop="rqbName" label="被修订标准代号" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
               <el-input
                 style="display: none;"
                 v-model="qbfsForm.rqbJson">
@@ -95,7 +104,7 @@
               <el-input
                 clearable
                 v-model="qbfsForm.rqbName"
-                placeholder="请选择企业标准"
+                placeholder="请选择被修订标准代号"
                 readonly
                 @click.native="choiceQYBZ">
               </el-input>
@@ -127,11 +136,13 @@
 
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="planStatus" label="计划状态" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-form-item prop="planStatus" label="计划类型" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
-              <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划状态">
+              <el-select  v-model="qbfsForm.planStatus" placeholder="请选择计划类型">
-                <el-option label="制定" value="制定"></el-option>
+                <el-option label="未开始" value="未开始"></el-option>
-                <el-option label="修订" value="修订"></el-option>
+                <el-option label="制定中" value="制定中"></el-option>
-                <el-option label="完成" value="完成"></el-option>
+                <el-option label="修订中" value="修订中"></el-option>
+                <el-option label="已取消" value="已取消"></el-option>
+                <el-option label="已完成" value="已完成"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
@@ -213,9 +224,8 @@
                 </el-form-item>
                 <el-form-item label="制修订状态" class="search-item search-item-last">
                   <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态">
-                    <el-option label="制定完成" value="制定完成"></el-option>
+                    <el-option label="制定" value="制定"></el-option>
-                    <el-option label="制定中" value="制定中"></el-option>
+                    <el-option label="修订" value="修订"></el-option>
-                    <el-option label="未制定" value="未制定"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">
@@ -262,7 +272,8 @@
                 label="计划状态"
                 align="center">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -270,7 +281,7 @@
                 align="center"
                 label="制修订状态">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                  <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -425,7 +436,7 @@
     <el-drawer
       title="选择体系结构"
       :visible.sync="TXJGmodal"
-      size="900px"
+      size="400px"
       custom-class="demo-drawer"
     >
       <div class="standardForComments">
@@ -496,12 +507,14 @@ export default {
         label: 'menuName'
       },
       TXJGList: [],
+      BZList: [],
+      standSortOptions: [],
       QYBZList: [],
       QYBZformSelect: [],
       standSystemOptions: [],
       QYBZform: {
         page: 1,
-        pageSzie: this.$store.getters.userInfo.configContent,
+        pageSize: this.$store.getters.userInfo.configContent,
         validFlag: '0',
         userId: this.$store.getters.userInfo.userId,
         standCode: '',
@@ -528,6 +541,9 @@ export default {
       pageSize: this.$store.getters.userInfo.configContent,
       selectList: [],
       qbfsFormRules: {
+        bussSort: [
+          { required: true, message: "请选择企标类别", trigger: "blur" }
+        ],
         esName1: [
           {required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
         ],
@@ -616,6 +632,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
       this.standSystemOptions = res.data.TXLBBUSS // 体系结构
       this.qcdwOptions = res.data.QCDW // 起草单位
     })
@@ -825,8 +842,9 @@ export default {
         if(this.showType === 'one'){
           this.qbfsForm.esId1 = this.selectList[0].id || '--'
           this.qbfsForm.esName1 = this.selectList[0].esName || '--'
-          this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
+          this.qbfsForm.planStatus1 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
-          this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+            (this.selectList[0] === '3'? '已取消' : '已完成')))
+          this.qbfsForm.reviseStatus1 = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
           this.standShow = true
         }else{
           if(this.qbfsForm.esName1 === this.selectList[0].esName ){
@@ -834,8 +852,9 @@ export default {
           }else{
             this.qbfsForm.esId2 = this.selectList[0].id || '--'
             this.qbfsForm.esName2 = this.selectList[0].esName || '--'
-            this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
+            this.qbfsForm.planStatus2 = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
-            this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+              (this.selectList[0] === '3'? '已取消' : '已完成')))
+            this.qbfsForm.reviseStatus2 = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
             this.standShow2 = true
           }
         }

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

@@ -22,6 +22,16 @@
                 clearable
               ></el-input>
             </el-form-item>
+            <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+              <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+                <el-option
+                  v-for="(item, index) in standSortOptions"
+                  :key="index"
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="企标名称" prop="esName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -32,9 +42,8 @@
             </el-form-item>
             <el-form-item prop="reviseStatus"  label="制修订状态" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
               <el-select disabled  v-model="qbfsForm.reviseStatus" placeholder="请选择制修订状态">
-                <el-option label="制定完成" value="制定完成"></el-option>
+                <el-option label="制定" value="制定"></el-option>
-                <el-option label="制定中" value="制定中"></el-option>
+                <el-option label="修订" value="修订"></el-option>
-                <el-option label="未制定" value="未制定"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="评审责任人" prop="resPersonName" class="add-form-item form-item-disabled">
@@ -54,11 +63,11 @@
                 placeholder="请选择初稿完成时间">
               </el-date-picker>
             </el-form-item>
-            <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+            <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
               <el-input
                 disabled
                 v-model="qbfsForm.rqbName"
-                placeholder="请输入企业标准"
+                placeholder="请输入被修订标准代号"
                 :maxlength="500"/>
             </el-form-item>
             <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -207,9 +216,8 @@
                 </el-form-item>
                 <el-form-item label="制修订状态" class="search-item search-item-last">
                   <el-select v-model="standardSearch.reviseStatus" placeholder="请选择制修订状态">
-                    <el-option label="制定完成" value="制定完成"></el-option>
+                    <el-option label="制定" value="制定"></el-option>
-                    <el-option label="制定中" value="制定中"></el-option>
+                    <el-option label="修订" value="修订"></el-option>
-                    <el-option label="未制定" value="未制定"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">
@@ -256,7 +264,8 @@
                 label="计划状态"
                 align="center">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.planStatus === '0'? '完成' : (scope.row.planStatus === '1'? '修订' : '制定') }}</div>
+                  <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
+                    (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -264,7 +273,7 @@
                 align="center"
                 label="制修订状态">
                 <template slot-scope="scope">
-                  <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                  <div>{{ scope.row.reviseStatus === '1'? '制定' : '修订'}}</div>
                 </template>
               </el-table-column>
               <el-table-column
@@ -334,6 +343,9 @@ export default {
   data(){
     return{
       formRules: {
+        bussSort: [
+          { required: true, message: "请选择企标类别", trigger: "blur" }
+        ],
         renameEs: [
           {required: true, message: '请输入更名后企标名称', trigger:'blur'},
         ],
@@ -345,6 +357,7 @@ export default {
       ListModel: false,
       standinfoList: [],
       BZList: [],
+      standSortOptions: [],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
@@ -385,6 +398,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods: {
@@ -441,22 +455,28 @@ export default {
         this.qbfsForm.esName = this.selectList[0].esName
         this.qbfsForm.draftTime = this.selectList[0].draftTime
         this.qbfsForm.drafterName = this.selectList[0].drafterName
-        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '完成' : (this.selectList[0].planStatus === '1'? '修订' : '制定')
+        this.qbfsForm.planStatus = this.selectList[0].planStatus === '0'? '未开始' : (this.selectList[0].planStatus === '1'? '制定中' : (this.selectList[0] === '2'? '修订中' :
+          (this.selectList[0] === '3'? '已取消' : '已完成')))
         this.qbfsForm.releaseTime = this.selectList[0].releaseTime
         this.qbfsForm.resPersonName = this.selectList[0].resPersonName
-        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus  === '1'? '制定中' : '未制定')
+        this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '1'? '制定' : '修订'
         this.qbfsForm.unitName = this.selectList[0].unitName
         this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
         if(this.selectList[0].area){
           this.qbfsForm.area = this.selectList[0].area.split(',')
         }
+        if(this.selectList[0].bussSort){
+          this.qbfsForm.bussSort = this.selectList[0].bussSort.split(',')
+        }
         this.qbfsForm.rqbName = this.selectList[0].rqbName
         this.qbfsForm.tsJsonName = this.selectList[0].tsJsonName
         this.qbfsForm.isRelate = this.selectList[0].isRelate
         this.qbfsForm.useLevel = this.selectList[0].useLevel
         this.qbfsForm.esStandRelations = this.selectList[0].esStandRelations
         this.qbfsForm.technologic = this.selectList[0].technologic
-        this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
+        if(this.selectList[0].esMatingRelations && this.selectList[0].esMatingRelations !== 'null'){
+          this.qbfsForm.esMatingRelations = this.selectList[0].esMatingRelations
+        }
         this.ListModel = false
       }
     },

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

@@ -15,6 +15,16 @@
         </process-title>
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
+          <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in standSortOptions"
+                :key="index"
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -82,11 +92,11 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+          <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.rqbName"
-              placeholder="请输入企业标准"
+              placeholder="请输入被修订标准代号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -348,7 +358,7 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      standSortOptions: [],
     }
   },
   mounted() {
@@ -359,6 +369,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods:{

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

@@ -455,7 +455,6 @@ export default {
                 if (valid) {
                   this.isSubmit = true;
                   let json = Object.assign(qbzxdFrom, this.roleForm);
-                  console.log(json);
                   this.$http.post("lawss/activiti/startProcessRollBack", {
                     createUser: this.$store.getters.userInfo.userId,
                     createUserName: this.$store.getters.userInfo.userName,

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

@@ -15,6 +15,16 @@
         </process-title>
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
+          <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in standSortOptions"
+                :key="index"
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -82,11 +92,11 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+          <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.rqbName"
-              placeholder="请输入企业标准"
+              placeholder="请输入被修订标准代号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -335,6 +345,7 @@ export default {
   data(){
     return {
       BZList: [],
+      standSortOptions: [],
       active: '1',
       type: '',
       commentText: '',
@@ -359,6 +370,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods:{

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

@@ -15,6 +15,16 @@
         </process-title>
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
+          <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in standSortOptions"
+                :key="index"
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -82,11 +92,11 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+          <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.rqbName"
-              placeholder="请输入企业标准"
+              placeholder="请输入被修订标准代号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -346,7 +356,7 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      standSortOptions: [],
     }
   },
   mounted() {
@@ -357,6 +367,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods:{

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

@@ -15,6 +15,16 @@
         </process-title>
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
+          <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in standSortOptions"
+                :key="index"
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -82,11 +92,11 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+          <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.rqbName"
-              placeholder="请输入企业标准"
+              placeholder="请输入被修订标准代号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -348,7 +358,7 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      standSortOptions: [],
     }
   },
   mounted() {
@@ -359,6 +369,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods:{

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

@@ -15,6 +15,16 @@
         </process-title>
         <el-form :model="qbfsForm" class="label-input-form prc-content-border"
                  label-width="150px">
+          <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
+            <el-select disabled v-model="qbfsForm.bussSort" multiple filterable placeholder="请选择企标类别" style="width: 100%;">
+              <el-option
+                v-for="(item, index) in standSortOptions"
+                :key="index"
+                :value="item.value"
+                :label="item.label">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item prop="esName" label="企标名称" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -82,11 +92,11 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item  label="企业标准" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
+          <el-form-item  label="被修订标准代号" style="width: 100%; margin-right:10px"  prop="rqbName" class="add-form-item form-item-disabled">
             <el-input
               disabled
               v-model="qbfsForm.rqbName"
-              placeholder="请输入企业标准"
+              placeholder="请输入被修订标准代号"
               :maxlength="500"/>
           </el-form-item>
           <el-form-item  label="体系结构" style="width: 100%; margin-right:10px"  prop="tsJsonName" class="add-form-item form-item-disabled">
@@ -348,7 +358,7 @@ export default {
       nodeList:[],
       drawerTitle: '',
       detailData: [],
-
+      standSortOptions: [],
     }
   },
   mounted() {
@@ -359,6 +369,7 @@ export default {
       _this: this
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
+      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })
   },
   methods:{

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

@@ -66,7 +66,6 @@
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
-          height="100%"
           ref="selection"
           :data="detailData"
           tooltip-effect="dark"

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

@@ -443,32 +443,34 @@
                 </el-form-item>
               </el-form>
             </div>
-            <el-table
+            <div style="height: calc(100% - 65px); overflow: auto;">
-              :data="productData"
+              <el-table
-              tooltip-effect="dark"
+                :data="productData"
-              style="width: 100%"
+                tooltip-effect="dark"
-              border
+                style="width: 100%"
-              ref="projectTable"
+                border
-              height="100%"
+                ref="projectTable"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectThree"
+                @selection-change="selectThree"
-            >
+              >
-              <el-table-column
+                <el-table-column
-                type="selection"
+                  type="selection"
-                width="55"
+                  width="55"
-                align="center">
+                  align="center">
-              </el-table-column>
+                </el-table-column>
-              <el-table-column
+                <el-table-column
-                prop="productLine"
+                  prop="productLine"
-                label="产品线">
+                  label="产品线">
-              </el-table-column>
+                </el-table-column>
-              <el-table-column
+                <el-table-column
-                show-overflow-tooltip
+                  show-overflow-tooltip
-                prop="uname"
+                  prop="uname"
-                label="产品线责任人">
+                  label="产品线责任人">
-              </el-table-column>
+                </el-table-column>
-            </el-table>
+              </el-table>
+            </div>
           </div>
           <pagination
             :page="pageNo"

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

@@ -446,32 +446,34 @@
                 </el-form-item>
               </el-form>
             </div>
-            <el-table
+            <div style="height: calc(100% - 65px); overflow: auto">
-              :data="productData"
+              <el-table
-              tooltip-effect="dark"
+                :data="productData"
-              style="width: 100%"
+                tooltip-effect="dark"
-              border
+                style="width: 100%"
-              ref="projectTable"
+                border
-              height="100%"
+                ref="projectTable"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+                height="100%"
+                :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectThree"
+                @selection-change="selectThree"
-            >
+              >
-              <el-table-column
+                <el-table-column
-                type="selection"
+                  type="selection"
-                width="55"
+                  width="55"
-                align="center">
+                  align="center">
-              </el-table-column>
+                </el-table-column>
-              <el-table-column
+                <el-table-column
-                prop="productLine"
+                  prop="productLine"
-                label="产品线">
+                  label="产品线">
-              </el-table-column>
+                </el-table-column>
-              <el-table-column
+                <el-table-column
-                show-overflow-tooltip
+                  show-overflow-tooltip
-                prop="uname"
+                  prop="uname"
-                label="产品线责任人">
+                  label="产品线责任人">
-              </el-table-column>
+                </el-table-column>
-            </el-table>
+              </el-table>
+            </div>
           </div>
           <pagination
             :page="pageNo"

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

@@ -759,6 +759,7 @@ export default {
             }
           }
         });
+        this.$refs.table.clearSelection()
         this.projectModel = false;
       }
 
@@ -778,7 +779,7 @@ export default {
           this.selectList.map(item => {
             let index;
             index = this.breakdownList.findIndex(items => {
-              return items.itemsName === item.itemsName;
+              return items.itemsName === item.itemsName  && items.projectName === item.projectName;
             });
             if (index > -1) {
               this.breakdownList.splice(index, 1);
@@ -874,6 +875,7 @@ export default {
     //保存事件
     handleSave() {
       this.saveLoading = true;
+      this.listForm.breakdownList = this.breakdownList;
       let _formData = new FormData();
       _formData.append("id", this.bpnId || "");
       _formData.append("prcType", "5");

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

@@ -731,6 +731,7 @@ export default {
               item.implementerId = this.$store.getters.userInfo.userId;
               item.implementer = this.$store.getters.userInfo.userName;
             });
+            // this.commentText = ''
             this.dataList = item.step3DTOS;
             this.dataList.forEach(item => {
               this.$set(item,'complianceReasons', '')
@@ -740,6 +741,7 @@ export default {
             })
           } else {
             this.dataList = item.dataList;
+            // this.commentText = ''
             this.dataList.forEach(item => {
               item.implementerId = this.$store.getters.userInfo.userId;
               item.implementer = this.$store.getters.userInfo.userName;
@@ -870,7 +872,7 @@ export default {
     saveBatchEditForm() {
       this.dataList.forEach(item => {
         this.selectList.forEach(items => {
-          if (item.itemNum === items.itemNum) {
+          if (item.itemNum === items.itemNum && item.projectName === items.projectName) {
             item.complianceReasons = this.batchEditForm.complianceReasons;
             //不合规
             item.noCompliance = this.batchEditForm.noCompliance;
@@ -881,6 +883,7 @@ export default {
           }
         });
       });
+      this.$refs.multipleTable.clearSelection()
       this.modalShowFlag = false;
     },
     cancelBatchEditForm() {

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

@@ -568,6 +568,7 @@ export default {
       if(!this.commentText){
         this.$message.warning('请填写审批意见')
       }else{
+        this.isSubmit = true
         this.listForm.applyUpdUserId = this.dataList[0].distributePersonId
         this.listForm.commentText = this.commentText;
         this.listForm.dataList = this.dataList
@@ -584,6 +585,7 @@ export default {
             this.$message.success(res.message)
             this.$router.push('/processCenter')
           }
+          this.isSubmit = false
         }, e => {
         });
       }

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

@@ -553,6 +553,7 @@ export default {
         this.listForm.prcNum = this.prcNum
         this.listForm.prcName = this.prcName
         this.listForm.id = item.id
+        // this.commentText = ''
         this.dataList = item.dataList
       })
     },

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

@@ -1252,7 +1252,7 @@
                     lawsName: [
                         {required: true, message: '中文名称不能为空', trigger: 'change'},
                         {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     lawsEnName: [
                         {required: false, message: '英文名称不能为空', trigger: 'change'},

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

@@ -1302,7 +1302,7 @@
                     lawsName: [
                         {required: true, message: '中文名称不能为空', trigger: 'change'},
                         {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-                        {validator: this.verify.valiateName, trigger: 'change'}
+                        {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
                     ],
                     lawsEnName: [
                         {required: false, message: '英文名称不能为空', trigger: 'change'},

src/pages/processCenter/pages/newProcess/index.vue

@@ -190,7 +190,7 @@
       <el-divider content-position="left"><h2>企业标准相关流程</h2></el-divider>
       <div class="process-box">
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'7a53ef593e5401aab19485b937ce78a0'">
+          <el-card shadow="hover" v-btn-permission="''">
             <div class="card-box" @click="handleCreateProcess('buss1')">
               <div class="card-top">
                 <div class="card-top-left">

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

@@ -84,7 +84,7 @@
                     </ProcessTitle>
                     <div class="prc-content-border">
                         <el-row :gutter="24">
-                            <el-col :span="12">
+                            <el-col :span="24">
                                 <el-form-item label="调研结果" prop="fileName" class="add-form-item form-item-disabled">
                                     <div v-if="form.file" class="fileClass">
                                         <div style="display: flex;align-items: center;">
@@ -315,14 +315,14 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.dyhz = data.form ? data.form.dyhz : ''
+                        this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
-                        this.form.file = data.form ? data.form.fileId : ''
+                        this.form.file = data.form ? data.form.fileId : data.fileId
-                        this.form.fileName = data.form ? data.form.fileName : ''
+                        this.form.fileName = data.form ? data.form.fileName : data.fileName
-                        this.form.fileId = data.form ? data.form.fileId : ''
+                        this.form.fileId = data.form ? data.form.fileId : data.fileId
-                        this.form.modelList = data.form ? data.form.modelList : []
+                        this.form.modelList = data.form ? data.form.modelList : data.modelList
                         this.form.fjList = data.fjList || data.form.fjList
                     }).catch(e => {
                     })

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

@@ -23,7 +23,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <el-row :gutter="24">
-                                <el-col :span="12">
+                                <el-col :span="24">
                                     <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                         <el-input
                                                 disabled

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

@@ -23,7 +23,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <el-row :gutter="24">
-                                <el-col :span="12">
+                                <el-col :span="24">
                                     <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                         <el-input
                                                 disabled

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

@@ -23,7 +23,7 @@
                     <el-collapse-transition>
                         <div class="prc-content-border" v-if="foldFormFlag === false">
                             <el-row :gutter="24">
-                                <el-col :span="12">
+                                <el-col :span="24">
                                     <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
                                         <el-input
                                                 disabled

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

@@ -425,7 +425,7 @@ export default {
             this.$router.push({
               name: 'bussLibrary1',
               query: {
-                type: '1',
+                type: 'buss1',
                 processName: '发起企标制修订流程',
                 bpnId: id,
                 verifySarStandard: true,
@@ -439,7 +439,7 @@ export default {
               this.$router.push({
                 name: 'bussLibraryProduct2',
                 query: {
-                  type: 'buss1',
+                  type: 'buss2',
                   processName: mes.taskInfo,
                   bpnId: id,
                   verifySarStandard: true,
@@ -449,7 +449,7 @@ export default {
               this.$router.push({
                 name: 'bussLibraryProduct3',
                 query: {
-                  type: 'buss1',
+                  type: 'buss2',
                   processName: mes.taskInfo,
                   bpnId: id,
                   verifySarStandard: true,
@@ -459,7 +459,7 @@ export default {
               this.$router.push({
                 name: 'bussLibraryProductC3',
                 query: {
-                  type: 'buss1',
+                  type: 'buss2',
                   processName: mes.taskInfo,
                   bpnId: id,
                   verifySarStandard: true,
@@ -469,7 +469,7 @@ export default {
               this.$router.push({
                 name: 'bussLibraryProduct6',
                 query: {
-                  type: 'buss1',
+                  type: 'buss2',
                   processName: mes.taskInfo,
                   bpnId: id,
                   verifySarStandard: true,
@@ -479,7 +479,7 @@ export default {
               this.$router.push({
                 name: 'bussLibraryProductC6',
                 query: {
-                  type: 'buss1',
+                  type: 'buss2',
                   processName: mes.taskInfo,
                   bpnId: id,
                   verifySarStandard: true,
@@ -490,7 +490,7 @@ export default {
             this.$router.push({
               name: 'bussLibraryProduct1',
               query: {
-                type: '1',
+                type: 'buss2',
                 processName: '发起企标制修订流程',
                 bpnId: id,
                 verifySarStandard: true,

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -4289,7 +4289,7 @@ export default {
     },
     // 分页查询国内标准
     getDomesticStandardTable(item) {
-      console.log(item)
+      console.log('4292',item)
       if (item !== '' && item !== null && item !== undefined) {
         item.pageSize = this.$store.getters.userInfo.configContent
       }
@@ -4330,9 +4330,26 @@ export default {
       // // 自定义属性字段高级搜索处理
       //advanceSearchVOStr
       const advanceSearchVOList = [];
+      console.log('4333',this.advanceSearchMapping)
       for (let key in this.advanceSearchMapping) {
+        console.log('key',key)
         const value = this.advanceSearchMapping[key];
-        if (value !== null && value !== '') {
+        console.log('value',value)
+        if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'regexp',
+            value: value.join(',')
+          });
+        }else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'between',
+            value: value.join(',')
+          });
+        }else if (value !== null && value !== ''){
           advanceSearchVOList.push({
             connect: "and",
             field: key || '',

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

@@ -1919,7 +1919,7 @@ export default {
         standName: [
           {required: true, message: '中文名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-          {validator: this.verify.valiateName, trigger: 'change'}
+          {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
         ],
         standEnName: [
           {required: true, message: '英文名称不能为空', trigger: 'change'},

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -5,6 +5,7 @@
                 <el-form :modal="form" inline class="label-input-form">
                     <el-form-item label="计划状态" class="search-item">
                         <el-select v-model="form.planStatus" placeholder="请选择计划状态">
+                            <el-option label="请选择" value=""></el-option>
                             <el-option label="未开始" value="0"></el-option>
                             <el-option label="制定中" value="1"></el-option>
                             <el-option label="修订中" value="2"></el-option>
@@ -14,6 +15,7 @@
                     </el-form-item>
                     <el-form-item label="制修订状态" class="search-item">
                         <el-select v-model="form.reviseStatus" placeholder="请选择制修订状态">
+                            <el-option label="请选择" value=""></el-option>
                             <el-option label="制定" value="1"></el-option>
                             <el-option label="修订" value="2"></el-option>
                         </el-select>
@@ -118,7 +120,7 @@
                                 align="center"
                                 label="制修订状态">
                             <template slot-scope="scope">
-                            <div>{{ scope.row.reviseStatus === '0'? '制定完成' : (scope.row.reviseStatus === '1'? '制定中' : '未制定') }}</div>
+                            <div>{{ scope.row.reviseStatus === ''? '' : (scope.row.reviseStatus === '1'? '制定' : '修订') }}</div>
                         </template>
                         </el-table-column>
                         <el-table-column
@@ -204,10 +206,10 @@
                                 <el-col :span="24">
                                     <el-form :model="addForm" inline class="label-input-form" label-width="180px"  :rules="addFormRules" ref="addForm">
                                         <el-form-item prop="bussSort" label="企标类别" style="width: 100%; margin-right:10px" class="add-form-item" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
-                                            <el-select v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
+                                            <el-select :disabled="DrawerType === 'see'" v-model="addForm.bussSort" filterable clearable placeholder="" style="appearance: none" placeholder="请选择企标类别">
                                                 <el-option
-                                                        v-for="item in standSortOptions"
+                                                        v-for="(item, index) in standSortOptions"
-                                                        :key="item.value"
+                                                        :key="index"
                                                         :value="item.value"
                                                         :label="item.label"
                                                 ></el-option>
@@ -321,7 +323,7 @@
                                         </el-form-item>
                                         <el-form-item label="标准范围" style="width: 100%; margin-right:10px" class="add-form-item" prop="area" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex;justify-content: space-between;align-items: center;">
-                                                <el-select v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
+                                                <el-select :disabled="DrawerType === 'see'" v-model="addForm.area" multiple filterable placeholder="请选择标准范围" style="width: 100%;">
                                                     <el-option
                                                             v-for="item in BZList"
                                                             :key="item.value"
@@ -333,7 +335,7 @@
                                         </el-form-item>
                                         <el-form-item label="是否引用标准" style="width: 100%; margin-right:10px" class="add-form-item" prop="isRelate" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
-                                                <el-radio-group v-model="addForm.isRelate">
+                                                <el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.isRelate">
                                                     <el-radio label="是" value="是"></el-radio>
                                                     <el-radio label="否" value="否"></el-radio>
                                                 </el-radio-group>
@@ -343,13 +345,14 @@
                                             <custom-input-for-all-standards
                                                     class="classDisplay"
                                                     :config="{attrName: '采用标准'}"
+                                                    :disabled="DrawerType === 'see'"
                                                     :labelWidth="'180px'"
                                                     v-model="addForm.esStandRelations"
                                             ></custom-input-for-all-standards>
                                         </template>
                                         <el-form-item v-if="addForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px" class="add-form-item" prop="useLevel" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex; height: 100%; justify-content: space-between;align-items: center;">
-                                                <el-radio-group v-model="addForm.useLevel">
+                                                <el-radio-group :disabled="DrawerType === 'see'" v-model="addForm.useLevel">
                                                     <el-radio label="等同" value="等同"></el-radio>
                                                     <el-radio label="修改" value="修改"></el-radio>
                                                     <el-radio label="非等效" value="非等效"></el-radio>
@@ -359,6 +362,7 @@
                                         <el-form-item v-if="addForm.isRelate === '否'" label="简述技术指标依据" style="width: 100%; margin-right:10px" class="add-form-item" prop="technologic" :class="DrawerType === 'see' ? 'form-item-disabled' : ''">
                                             <div style="display: flex;justify-content: space-between;align-items: center;">
                                                 <el-input
+                                                        :disabled="DrawerType === 'see'"
                                                         v-model="addForm.technologic"
                                                         placeholder="请简述技术指标依据">
                                                 </el-input>
@@ -367,6 +371,7 @@
                                         <template>
                                             <custom-input-for-all-standards2
                                                     class="classDisplay"
+                                                    :disabled="DrawerType === 'see'"
                                                     :config="{attrName: '配套标准'}"
                                                     :labelWidth="'180px'"
                                                     v-model="addForm.esMatingRelations"
@@ -716,12 +721,16 @@
                 this.TXJGmodal = false
             },
             choiceTXJG (id) {
-                if (id) {
+                if ( this.DrawerType === 'see') {
-                    this.TXJGList = id.split(',')
+                    return
                 } else {
-                    this.TXJGList = []
+                    if (id) {
+                        this.TXJGList = id.split(',')
+                    } else {
+                        this.TXJGList = []
+                    }
+                    this.TXJGmodal = true
                 }
-                this.TXJGmodal = true
             },
             QYBZcloseDrawer () {
                 this.clearQYBZ()
@@ -766,9 +775,13 @@
                 }
             },
             choiceQYBZ (id) {
-                this.QYBZformSelect = []
+                if (this.DrawerType === 'see') {
-                this.QYBZget()
+                    return
-                this.QYBZmodal = true
+                } else {
+                    this.QYBZformSelect = []
+                    this.QYBZget()
+                    this.QYBZmodal = true
+                }
             },
             drawerCheckZRBM (data) {
                 let list = ''

src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue

@@ -1817,7 +1817,7 @@
           lawsName: [
             {required: true, message: '中文名称不能为空', trigger: 'change'},
             {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-            {validator: this.verify.valiateName, trigger: 'change'}
+            {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
           ],
           lawsEnName: [
             {required: false, message: '英文名称不能为空', trigger: 'change'},
@@ -1859,7 +1859,7 @@
           lawsName: [
             {required: true, message: '中文名称不能为空', trigger: 'change'},
             {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'},
-            {validator: this.verify.valiateName, trigger: 'change'}
+            {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
           ],
           lawsEnName: [
             {required: false, message: '英文名称不能为空', trigger: 'change'},

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -945,22 +945,22 @@
                             placeholder="请输入标准英文名称"
                             clearable></el-input>
                 </el-form-item>
-                <el-form-item prop="standNature" label-width="150px" class="add-form-item">
+<!--                <el-form-item prop="standNature" label-width="150px" class="add-form-item">-->
-                  <template slot="label">标准性质</template>
+<!--                  <template slot="label">标准性质</template>-->
-                  <el-select v-model="sarStandardsInfoEO.standNature"
+<!--                  <el-select v-model="sarStandardsInfoEO.standNature"-->
-                             placeholder="请选择标准性质"
+<!--                             placeholder="请选择标准性质"-->
-                             clearable>
+<!--                             clearable>-->
-                    <el-option
+<!--                    <el-option-->
-                      v-for="item in standNatureOptions"
+<!--                      v-for="item in standNatureOptions"-->
-                      placeholder="请选择"
+<!--                      placeholder="请选择"-->
-                      :key="item.value"
+<!--                      :key="item.value"-->
-                      :value="item.value"
+<!--                      :value="item.value"-->
-                      :label="item.label"
+<!--                      :label="item.label"-->
-                    >
+<!--                    >-->
-                      {{ item.label }}
+<!--                      {{ item.label }}-->
-                    </el-option>
+<!--                    </el-option>-->
-                  </el-select>
+<!--                  </el-select>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item title="“计划修订”、“修订中”均为现行有效版本；“已修订”标准的有效性根据实际实施情况判定。"
                               prop="standState" label-width="150px" class="add-form-item">
                   <template slot="label">文本状态</template>
@@ -2285,11 +2285,11 @@ export default {
           {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
         ],
         standName: [
-          {required: true, message: '中文名称不能为空', trigger: 'change'},
+          {required: false, message: '中文名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
         ],
         standEnName: [
-          {required: true, message: '英文名称不能为空', trigger: 'change'},
+          {required: false, message: '英文名称不能为空', trigger: 'change'},
           {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
           // {validator: this.verify.valiateEnName, trigger: 'blur'}
         ],
@@ -3810,9 +3810,26 @@ export default {
       // // 自定义属性字段高级搜索处理
       //advanceSearchVOStr
       const advanceSearchVOList = [];
+      console.log('4333',this.advanceSearchMapping)
       for (let key in this.advanceSearchMapping) {
+        console.log('key',key)
         const value = this.advanceSearchMapping[key];
-        if (value !== null && value !== '') {
+        console.log('value',value)
+        if (value !== null && value !== '' && (key === 'NYLX' || key === 'SYRZ' || key === 'SYCPX' || (item.CLLX&&item.CLLX.length>0)) ){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'regexp',
+            value: value.join(',')
+          });
+        }else if (value !== null && value !== '' && (key === 'SSRQ' || key === 'XCXSSRQ' || key === 'ZCCSSRQ' )){
+          advanceSearchVOList.push({
+            connect: "and",
+            field: key || '',
+            type: 'between',
+            value: value.join(',')
+          });
+        }else if (value !== null && value !== ''){
           advanceSearchVOList.push({
             connect: "and",
             field: key || '',

src/pages/searchCenter/pages/advancedSearch.vue

@@ -975,7 +975,7 @@
                         show-overflow-tooltip
                 >
                   <template slot-scope="scope">
-                    <span style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'INLAND_LAWS' ? scope.row.lawsNumber : scope.row.numbershow}}</span>
+                    <span style="margin-left: 10px" @click="judgeRolePermiOnSar(scope.row, 1)">{{ selectIndex === 'INLAND_LAWS' ? scope.row.lawsNumber : filterTitle(scope.row.numbershow)}}</span>
                   </template>
                 </el-table-column>
                 <el-table-column
@@ -1912,6 +1912,14 @@
         this.page = 1;
         this.searchSarBykey();
       },
+      filterTitle(title){
+        if(title && (title.indexOf(",") !== -1)){
+          let titleSpt = title.split(",");
+          return titleSpt.length > 1 ? titleSpt[titleSpt.length-1] : titleSpt[0]
+        }else {
+          return title;
+        }
+      },
       judgeRolePermiOnSar(item, type) {
         let pagetype;
         if (type !== 5 && item.type === "msgdyinfo") {

src/pages/searchCenter/pages/standardSearch.vue

@@ -243,7 +243,7 @@
                                 <div v-for="(item,key) in Allitems" :key="key" class="AllBox">
                                     <div class="AllBoxTitle">
                                         <span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
-                                        <span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
+                                        <span style="cursor:pointer;" class="AllBoxText" v-html="filterTitle(item.title)" @click="toPage(item)"></span>
                                         <span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
                                     </div>
                                     <div class="AllBoxContent" v-html="item.textContent"></div>
@@ -479,6 +479,14 @@
             itermsConditionsClose () {
                 this.itermsConditionsFlag = false
             },
+            filterTitle(title){
+                if(title && (title.indexOf(",") !== -1)){
+                    let titleSpt = title.split(",");
+                    return titleSpt.length > 1 ? titleSpt[titleSpt.length-1] : titleSpt[0]
+                }else {
+                    return title;
+                }
+            },
             // 跳转
             toPage (item) {
                 // 国内外----两个值