Merge branch 'develop' into FOTON

# Conflicts:
#	src/sysConfig/index.js

src/components/CustomFormComponents/InputForAllStandards2.vue

@@ -310,12 +310,13 @@
                         type: 'warning'
                     })
                 }
-                if (this.selectedListRep.length + textArr.length > 20) {
+                //去除最多勾选20条限制
-                    return this.$message({
+                // if (this.selectedListRep.length + textArr.length > 20) {
-                        message: '代替标准号最多选择20项',
+                //     return this.$message({
-                        type: 'warning'
+                //         message: '代替标准号最多选择20项',
-                    })
+                //         type: 'warning'
-                }
+                //     })
+                // }
                 this.selectedListRep.map((item) => {
                     let texts = ''
                     if (item.standYear != null && item.standYear !== '') {

src/components/CustomFormComponents/InputForStandards.vue

@@ -351,12 +351,12 @@ export default {
           type: 'warning'
         })
       }
-      if (this.selectedListRep.length + textArr.length > 20) {
+      // if (this.selectedListRep.length + textArr.length > 20) {
-        return this.$message({
+      //   return this.$message({
-          message: `${this.config.attrName}最多选择20项`,
+      //     message: `${this.config.attrName}最多选择20项`,
-          type: 'warning'
+      //     type: 'warning'
-        })
+      //   })
-      }
+      // }
       this.selectedListRep.map((item) => {
         let texts = ''
         if (item.standYear != null && item.standYear !== '') {

src/components/roleTree/index.vue

@@ -82,7 +82,7 @@
                 </div>
             </div>
             <div id="roleFormButton" class="demo-drawer-footer">
-                <el-button :disabled="delList.length < 1" class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
+                <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
 
                 <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleTreeDrawerCancel">取消</el-button>
             </div>
@@ -248,6 +248,9 @@
                 this.visible = false
             },
             saveUserInfo () {
+                if(this.roleList.length === 0){
+                    this.roleList.push({id:"",name:""});
+                }
                 if (this.checkBox) {
                     this.$emit('checkedRole', this.roleList)
                     this.nodeList2 = []

src/components/treeSelect/treeSelectStand.vue

@@ -13,19 +13,21 @@
       placeholder="输入关键字进行过滤"
       v-model="filterText">
     </el-input>
-    <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
+    <div class="tree-height">
-             :load="loadNode"
+      <el-tree class="common-tree" :style="style" ref="tree" :data="data" :props="defaultProps"
-             :lazy="lazy"
+               :load="loadNode"
-             :show-checkbox="multiple"
+               :lazy="lazy"
-             :node-key="nodeKey"
+               :show-checkbox="multiple"
-             :check-strictly="checkStrictly"
+               :node-key="nodeKey"
-             :expand-on-click-node="false"
+               :check-strictly="checkStrictly"
-             :filter-node-method="filterNode"
+               :expand-on-click-node="false"
-             :default-checked-keys="defaultCheckedKeys"
+               :filter-node-method="filterNode"
-             :highlight-current="true"
+               :default-checked-keys="defaultCheckedKeys"
-             @node-click="handleNodeClick"
+               :highlight-current="true"
-             @check-change="handleCheckChange">
+               @node-click="handleNodeClick"
-    </el-tree>
+               @check-change="handleCheckChange">
+      </el-tree>
+    </div>
     <div id="roleFormButton" class="demo-drawer-footer">
       <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
       <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelUserInfo">取消</el-button>
@@ -289,6 +291,10 @@ export default {
   background-image: none !important;
   background-size:100% 100%;
 }
+.tree-height{
+  height: calc(~'100% - 65px');
+  overflow: auto;
+}
 .el-drawer__body{
  /* & > div:first-child{
     display: flex;

src/pages/details/otherBussStandardDetails/index.vue

@@ -505,15 +505,15 @@
                   >
                 {{ !child.value || child.value === 'null' ? '-' : child.value }}
               </span>
-                  <span
+                  <template v-else-if="child.attrField === 'DTQBBHBUSS'|| child.attrField === 'BDTQBBHBUSS'">
-                          v-else-if="child.attrField === 'DTQBBHBUSS'"
+                    <p class="modular-content-p-val" v-if="child.value">
-                          class="modular-content-p-val"
+                  <span v-for="(item, index) in child.value.split(',')" :key="index">
-                          :title="child.value || '-'"
+                    <a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
-                  >
+                       class="span-line" :title="item">{{ item }}</a>
-                    <span v-if="child.value" @click="showReplaceStandInfo(child.value)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;"
+                  </span>
-                          class="span-line">{{ child.value }}</span>
+                    </p>
-                    <span v-else>-</span>
+                    <span class="modular-content-p-val" v-else>-</span>
-              </span>
+                  </template>
                   <span
                       v-else-if="child.attrType !== 'FILE'"
                       class="modular-content-p-val"

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

@@ -55,7 +55,7 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.modelList.length > 0">
-                                        <div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px;padding-left: 10px">
                                             <div class="fileClass" >
                                                 <span @click="handlePreview(item)">{{ item.name }}</span>
                                                 <el-button
@@ -83,7 +83,7 @@
                                             clearable
                                     ></el-input>
                                     <div v-if="form.fjList.length > 0">
-                                        <div v-for="(item, index) in form.fjList" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.fjList" :key="index" style="margin-right: 5px;padding-left: 10px">
                                             <div class="fileClass" >
                                                 <span @click="handlePreview(item)">{{ item.name }}</span>
                                                 <el-button

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

@@ -55,7 +55,7 @@
                           clearable
                   ></el-input>
                   <div v-if="form.modelList.length > 0">
-                    <div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px; padding-left: 10px">
                       <div class="fileClass" >
                         <span @click="handlePreview(item)">{{ item.name }}</span>
                         <el-button
@@ -83,7 +83,7 @@
                           clearable
                   ></el-input>
                   <div v-if="form.fjList.length > 0">
-                    <div v-for="(item, index) in form.fjList" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.fjList" :key="index" style="margin-right: 5px;padding-left: 10px">
                       <div class="fileClass" >
                         <span @click="handlePreview(item)">{{ item.name }}</span>
                         <el-button

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

@@ -51,7 +51,7 @@
                                 </el-form-item>
                                 <el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.modelList.length > 0">
-                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
                                             <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"
@@ -67,7 +67,7 @@
                                 </el-form-item>
                                 <el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.fjList.length > 0">
-                                        <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
                                             <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"

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

@@ -51,7 +51,7 @@
                                 </el-form-item>
                                 <el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.modelList.length > 0">
-                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
                                             <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"
@@ -67,7 +67,7 @@
                                 </el-form-item>
                                 <el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.fjList.length > 0">
-                                        <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
                                             <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"

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

@@ -51,7 +51,7 @@
                                 </el-form-item>
                                 <el-form-item label="调研模板" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.modelList.length > 0">
-                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
                                             <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"
@@ -67,7 +67,7 @@
                                 </el-form-item>
                                 <el-form-item label="相关附件" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.fjList.length > 0">
-                                        <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.fjList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px">
                                             <span @click="clickButtonToUpload(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"

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

@@ -427,6 +427,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                       this.commentText5 = data.commentText5 || ''
                         this.form.title = data.title || data.form.title
                         this.form.processName = data.processName || data.form.processName
                         this.form.date = data.date || data.form.date

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

@@ -438,7 +438,7 @@
                   maxlength="500"
                 ></el-input>
               </el-form-item>
-              <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
+              <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
                 <el-input
                   type="textarea"
                   v-model="plForm.changePoint"
@@ -446,7 +446,7 @@
                   maxlength="500"
                 ></el-input>
               </el-form-item>
-              <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
+              <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
                 <el-input
                   type="textarea"
                   :autosize="{ minRows: 4, maxRows: 14}"
@@ -731,7 +731,9 @@ export default {
         }
       })
     },
+    //编辑按钮
     itemEdit (row, type, index) {
+      console.log(row);
       this.itermsConditions = row.itermsConditions.replace(/''/g, '\'')
       let itemsEoPage = {
         oldItemId: row.itemsId,
@@ -795,6 +797,7 @@ export default {
           }
         }
       }
+      this.$refs.filterTable.clearSelection()
       this.PLmodalshowflag = false
     },
     cancleUserInfo2 () {
@@ -953,6 +956,7 @@ export default {
         for (let i = 0; i < this.selectedList.length; i++) {
           bringData.push(deposit.get(this.selectedList[i]));
         }
+        console.log(bringData);
         this.form.itemsNum = bringData[0].showNumber
         this.form.itemsName = bringData[0].standName
         this.form.standId = bringData[0].standId

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

@@ -88,20 +88,17 @@
                         prop="itemsNum"
                         label="条款号"
                         width="70"
-                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
                         show-overflow-tooltip
-                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
-                        fixed
                         width="200"
                         show-overflow-tooltip
                         align="center">
@@ -172,14 +169,11 @@
 <!--                        align="center">-->
 <!--                </el-table-column>-->
                 <el-table-column
-                        prop="complianceRequir"
+                        prop="complianceRequirShow"
                         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"
@@ -505,6 +499,13 @@
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList
+                        this.itemList.forEach(item => {
+                          if(item.complianceRequir === '1'){
+                            item.complianceRequirShow = '符合'
+                          }else{
+                            item.complianceRequirShow = '不符合'
+                          }
+                        })
                         this.loading = false
                     }).catch(e => {
                     })

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

@@ -88,20 +88,17 @@
                         prop="itemsNum"
                         label="条款号"
                         width="70"
-                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
                         show-overflow-tooltip
-                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
-                        fixed
                         width="200"
                         show-overflow-tooltip
                         align="center">
@@ -172,14 +169,11 @@
 <!--                        align="center">-->
 <!--                </el-table-column>-->
                 <el-table-column
-                        prop="complianceRequir"
+                        prop="complianceRequirShow"
                         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"
@@ -502,6 +496,13 @@
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList
+                        this.itemList.forEach(item => {
+                        if(item.complianceRequir === '1'){
+                          item.complianceRequirShow = '符合'
+                        }else{
+                          item.complianceRequirShow = '不符合'
+                        }
+                      })
                         this.loading = false
                     }).catch(e => {
                     })

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

@@ -88,20 +88,17 @@
                         prop="itemsNum"
                         label="条款号"
                         width="70"
-                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itemsName"
                         label="条款名称"
                         show-overflow-tooltip
-                        fixed
                         align="center">
                 </el-table-column>
                 <el-table-column
                         prop="itermsConditions"
                         label="条款内容"
-                        fixed
                         width="200"
                         show-overflow-tooltip
                         align="center">
@@ -172,7 +169,7 @@
 <!--                        align="center">-->
 <!--                </el-table-column>-->
                 <el-table-column
-                        prop="complianceRequir"
+                        prop="complianceRequirShow"
                         width="150"
                         label="符合项状态"
                         show-overflow-tooltip
@@ -500,6 +497,13 @@
                         this.sarType = data.standInData || data.sarType
                         this.json = data
                         this.itemList = data.itemList
+                        this.itemList.forEach(item => {
+                        if(item.complianceRequir === '1'){
+                          item.complianceRequirShow = '符合'
+                        }else{
+                          item.complianceRequirShow = '不符合'
+                        }
+                      })
                         this.loading = false
                     }).catch(e => {
                     })

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

@@ -1269,19 +1269,19 @@
                     :maxlength="100"></el-input>
                 </el-form-item>
               </el-row>
-              <el-form-item label="标准名称" prop="standName" class="search-item">
+              <el-form-item v-if="standardSearchForm.standType === 'INLAND' || form.standInData === '0'" label="标准名称" prop="standName" class="search-item">
                 <el-input v-model="standardSearchForm.standName"
                           placeholder="请输入标准名称"
                           clearable
                           :maxlength="500"></el-input>
               </el-form-item>
-              <!--                            <el-form-item label="英文名称" prop="standEnName" class="search-item">-->
+                                          <el-form-item v-else label="英文名称" prop="standEnName" class="search-item">
-              <!--                                <el-input-->
+                                              <el-input
-              <!--                                        v-model="standardSearchForm.standEnName"-->
+                                                      v-model="standardSearchForm.standEnName"
-              <!--                                        maxlength="1000"-->
+                                                      maxlength="1000"
-              <!--                                        placeholder="请输入英文名称"-->
+                                                      placeholder="请输入英文名称"
-              <!--                                        clearable></el-input>-->
+                                                      clearable></el-input>
-              <!--                            </el-form-item>-->
+                                          </el-form-item>
               <el-form-item>
                 <el-button
                   type="primary"
@@ -1334,7 +1334,7 @@
                 </template>
               </el-table-column>
               <el-table-column
-                      v-if="standTypeModel === 'INLAND'"
+                v-if="standardSearchForm.standType === 'INLAND' || form.standInData === '0'"
                 prop="standName"
                 label="标准名称"
                 align="center">
@@ -1342,7 +1342,7 @@
                 <el-table-column
                         v-else
                         prop="standEnName"
-                        label="标准名称"
+                        label="英文名称"
                         align="center">
                 </el-table-column>
               <el-table-column
@@ -1450,6 +1450,7 @@ export default {
       callback()
     }
     return {
+      textList: [],
       gdType: '', //归档位置的赋值
         standTypeModel: 'INLAND',
       submitType: '',
@@ -2651,8 +2652,8 @@ export default {
     },
     // 代替政策编号确定
     replaceLawsNumModelBt() {
+      let subFlag = true
       let textArr = []
-
       if (typeof this.value === 'string') {
         if (this.value) {
           textArr = this.value.split(',')
@@ -2677,7 +2678,23 @@ export default {
         } else {
           texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
         }
-        textArr.push(texts)
+        // textArr.push(texts)
+        if(this.textList.length < 1){
+           textArr.push(texts)
+        }else{
+          this.textList.forEach(item =>{
+            if(item !== texts){
+              textArr.push(texts)
+            }else{
+              this.$message.warning('请勿重复添加数据')
+              subFlag = false
+              return
+            }
+          })
+        }
+        if(!subFlag){
+          textArr = []
+        }
         textArr = [...new Set(textArr)]
         this.replaceLawsNumModel = false
       })
@@ -2722,6 +2739,15 @@ export default {
       this.getReplaceLawsNumRow()
     },
     selectLaws(type) {
+      if(type === 'dtbjh'){
+        this.textList = this.form.dtbjh.split(',')
+      }else if(type === 'bfbdtbzh'){
+        this.textList = this.form.bfbdtbzh.split(',')
+      }else if(type === 'cbbh'){
+        this.textList = this.form.cbbh.split(',')
+      }else if(type === 'yybj'){
+        this.textList = this.form.yybj.split(',')
+      }
       // if (this.standNumFlag === 1) {
       // this.$refs.selections.selectAll(false)
       // }

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

@@ -119,7 +119,17 @@
                 page: 1
             }, {}, res => {
                 if (res.ok) {
-                    this.options = res.data.list
+                  let arr1 = res.data.list
+                  for (let i=0;i<arr1.length;i++) {
+                    for (let j = i + 1; j < arr1.length; j++) {
+                      if (arr1[i].itemsNum === arr1[j].itemsNum) {
+                          arr1.splice(j,1)
+                         // delete arr1[i]
+                        j--
+                      }
+                    }
+                  }
+                  this.options = arr1
                 }
             }, e => {
             })

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

@@ -828,7 +828,17 @@ export default {
             if (valid) {
               this.isSubmit = true
               this.$http.post('lawss/activiti/startProcessRollBack', {
-                type: '3'
+                id: '',
+                createUser: this.$store.getters.userInfo.userId,
+                createUserName: this.$store.getters.userInfo.userName,
+                type: '3',
+                json: JSON.stringify({
+                  form: this.form,
+                  roleForm: this.roleForm,
+                  commentText1: this.commentText1,
+                  filesId: this.addFjList,
+                  filesName: this.form.fjListName
+                })
               }, {}, res => {
                 if (res.ok) {
                   var json = Object.assign(this.form, this.roleForm)

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

@@ -61,7 +61,7 @@
                 </el-form-item>
                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                   <div v-if="form.modelList.length > 0">
-                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                       <span @click="fileLook(item)">{{ item.name }}</span>
                       <el-button
                               size="small"

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

@@ -62,7 +62,7 @@
                                 </el-form-item>
                                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.modelList.length > 0">
-                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                                             <span @click="fileLook(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"

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

@@ -62,7 +62,7 @@
                                 </el-form-item>
                                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                                     <div v-if="form.modelList.length > 0">
-                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                                        <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                                             <span @click="fileLook(item)">{{ item.name }}</span>
                                             <el-button
                                                     size="small"

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

@@ -62,7 +62,7 @@
                 </el-form-item>
                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                   <div v-if="form.modelList.length > 0">
-                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px; padding-left: 10px;">
                       <span @click="fileLook(item)">{{ item.name }}</span>
                       <el-button
                               size="small"

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

@@ -62,7 +62,7 @@
                 </el-form-item>
                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                   <div v-if="form.modelList.length > 0">
-                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                       <span @click="fileLook(item)">{{ item.name }}</span>
                       <el-button
                               size="small"

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

@@ -62,7 +62,7 @@
                 </el-form-item>
                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                   <div v-if="form.modelList.length > 0">
-                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                       <span @click="fileLook(item)">{{ item.name }}</span>
                       <el-button
                               size="small"

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

@@ -62,7 +62,7 @@
                 </el-form-item>
                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                   <div v-if="form.modelList.length > 0">
-                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                       <span @click="fileLook(item)">{{ item.name }}</span>
                       <el-button
                               size="small"

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

@@ -62,7 +62,7 @@
                 </el-form-item>
                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                   <div v-if="form.modelList.length > 0">
-                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                       <span @click="fileLook(item)">{{ item.name }}</span>
                       <el-button
                               size="small"

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

@@ -62,7 +62,7 @@
                 </el-form-item>
                 <el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
                   <div v-if="form.modelList.length > 0">
-                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
+                    <div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
                       <span @click="fileLook(item)">{{ item.name }}</span>
                       <el-button
                               size="small"

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

@@ -174,7 +174,7 @@
           ></el-input>
         </el-form-item>
         <el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
-          <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="" :disabled="disabledState" multiple>
+            <el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" :disabled="disabledState" multiple>
             <el-option
                     v-for="item in categoryOptions"
                     :key="item.value"
@@ -189,11 +189,20 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">
           <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
+        <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+        </el-form-item>
+          <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
+              <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
+          </el-form-item>
       </el-col>
       <el-col :span="12">
+       <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.QCRBUSS"  :disabled="disabledState" clearable></el-input>
+       </el-form-item>
         <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
           <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
             <el-option
@@ -220,12 +229,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
+          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
+              <el-input v-model="form.CYCDYMCBUSS" clearable :disabled="true"></el-input>
-        </el-form-item>
+          </el-form-item>
       </el-col>
     </el-row>
   </div>
@@ -268,9 +277,8 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
-        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+        <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
-          <el-select :popper-append-to-body="false"
+          <el-select :popper-append-to-body="false"  v-model="form.CYCD" placeholder="" :disabled="disabledState">
-          v-model="form.CBCD" placeholder="" :disabled="disabledState">
             <el-option
                     v-for="item in cbcdOptions"
                     :key="item.value"
@@ -650,38 +658,38 @@ export default {
       form:{},
       LXDList:[],
       FSDList:[],
-      countryOptions:[],//国家地区
+        countryOptions:[],//国家地区
-      standSortOptions: [], // 标准类别
+        standSortOptions: [], // 标准类别
-      standNatureOptions: [], // 标准性质
+        standNatureOptions: [], // 标准性质
-      standStateOptions: [], // 文本状态
+        standStateOptions: [], // 文本状态
-      standSystemOptions: [], // 标准体系
+        standSystemOptions: [], // 标准体系
-      busVppsOptions: [], // 车系体系架构
+        busVppsOptions: [], // 车系体系架构
-      busVppsChildOptions: [], // 车系体系架构子集合
+        busVppsChildOptions: [], // 车系体系架构子集合
-      modelOptions: [], // 模块体系架构
+        modelOptions: [], // 模块体系架构
-      modelChildOptions: [], // 模块体系架构子集合
+        modelChildOptions: [], // 模块体系架构子集合
-      applyArcticOptions: [], // 适用车型
+        applyArcticOptions: [], // 适用车型
-      gkglbmOptions: [], // 归口管理部门
+        gkglbmOptions: [], // 归口管理部门
-      categoryOptions: [], // 能源类型
+        categoryOptions: [], // 能源类型
-      applyAuthOptions: [], // 适用认证
+        applyAuthOptions: [], // 适用认证
-      cysdOptions: [], // 我司参与深度
+        cysdOptions: [], // 我司参与深度
-      cbcdOptions: [], // 采标程度
+        cbcdOptions: [], // 采标程度
-      wssmrOptions: [], // 我司署名人
+        wssmrOptions: [], // 我司署名人
-      sycpxOptions: [], // 适用产品线
+        sycpxOptions: [], // 适用产品线
-      zrbmOptions: [], // 责任部门
+        zrbmOptions: [], // 责任部门
-      zrgcsOptions: [], // 责任工程师
+        zrgcsOptions: [], // 责任工程师
-      qcdwOption: [], // 起草单位
+        qcdwOption: [], // 起草单位
-      txlbOptions: [], // 体系类别
+        txlbOptions: [], // 体系类别
-      standSortConfigOptions: [], // 标准类别下拉框
+        standSortConfigOptions: [], // 标准类别下拉框
-      adoptExtentOptions: [], // 采标程度下拉框
+        adoptExtentOptions: [], // 采标程度下拉框
-      emergyKindOptions: [], // 能源种类下拉框
+        emergyKindOptions: [], // 能源种类下拉框
-      categoryConfigOptions: [], // 所属类别下拉框
+        categoryConfigOptions: [], // 所属类别下拉框
-      assemClassOptions: [], // 总成分类下拉框
+        assemClassOptions: [], // 总成分类下拉框
-      qcdwOptions:[],//起草单位下拉框
+        qcdwOptions:[],//起草单位下拉框
-      qcrOptions:[],//起草人下拉框
+        qcrOptions:[],//起草人下拉框
-      nylxOptions:[],//能源类型下拉框
+        nylxOptions:[],//能源类型下拉框
-      syrzOptions:[],//适用认证下拉框
+        syrzOptions:[],//适用认证下拉框
-      data: [], // 标准列表数据
+        data: [], // 标准列表数据
-      ListForm: {}, // 新增数据
+        ListForm: {}, // 新增数据
     }
   },
   computed: {
@@ -834,44 +842,57 @@ export default {
         this.modelOptions = res.data
       })
     },
+      async getDataAsync(){
+          let res = await this.getDicTypeListCode()
+          if(res && res.data){
+              this.countryOptions = res.data.COUNTRY
+              this.applyCountryOptions = res.data.COUNTRY
+              this.regionOptions = res.data.REGION // 区域
+              this.standStateOptions = res.data.BUSSSTATE
+              this.energyKindOptions = res.data.ENERGYTYPES
+              this.standGeneraOptions = res.data.BUSSBIGCLASS
+              this.standSubclassOptions = res.data.BUSSFINECLASS
+              this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+              this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+              this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+              this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+              this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+              this.categoryOptions = res.data.NYLXCLASS // 能源类型
+              this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+              this.cysdOptions = res.data.WSCYSD // 我司参与深度
+              this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+              this.txlbOptions = res.data.TXLBCLASS // 体系类别
+              this.qcdwOptions = res.data.QCDW // 起草单位
+              this.qcrOptions = res.data.QCRBUSS // 起草人
+              this.nylxOptions = res.data.NYLXCLASS // 能源类型
+              this.syrzOptions = res.data.SYRZCLASS // 适用认证
+              this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+              this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+              this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+              this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+              this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
+
+              this.$emit('emitDataLoading',false)
+          }
+      },
+      getDicTypeListCode(res,json) {
+          return new Promise((resolve, reject) => {
+              this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                  _this: this
+              }, res => {
+                  const history = res;
+                  resolve(history)
+              })
+          })
+      },
   },
   mounted () {
-    this.form = this.formSub
+      if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
-    this.LXDList = this.LXDListSub
+          this.getDataAsync()
-    this.FSDList = this.FSDListSub
+          this.form = this.formSub
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+          this.LXDList = this.LXDListSub
-      _this: this
+          this.FSDList = this.FSDListSub
-    }, res => {
+      }
-      this.countryOptions = res.data.COUNTRY
-      this.applyCountryOptions = res.data.COUNTRY
-      this.regionOptions = res.data.REGION // 区域
-      this.standStateOptions = res.data.BUSSSTATE
-      this.energyKindOptions = res.data.ENERGYTYPES
-      this.standGeneraOptions = res.data.BUSSBIGCLASS
-      this.standSubclassOptions = res.data.BUSSFINECLASS
-      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
-      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-      this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
-      this.standSystemOptions = res.data.TXLBBUSS // 标准体系
-      this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
-      this.cysdOptions = res.data.WSCYSD // 我司参与深度
-      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-      this.txlbOptions = res.data.TXLBCLASS // 体系类别
-      this.qcdwOptions = res.data.QCDW // 起草单位
-      this.qcrOptions = res.data.QCRBUSS // 起草人
-      this.nylxOptions = res.data.NYLXCLASS // 能源类型
-      this.syrzOptions = res.data.SYRZCLASS // 适用认证
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
-      this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
-      this.setMap(this.standStateOptions)
-    })
-    this.busVsFunc()
-    this.modelFunc()
   },
   watch: {
     form: {

src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep5.vue

@@ -189,9 +189,15 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号" class="add-form-item form-item-disabled">
-          <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
+              <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
-        </el-form-item>
+          </el-form-item>
+          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+          </el-form-item>
+          <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
+              <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
+          </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
@@ -220,12 +226,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
+              <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
-        </el-form-item>
+          </el-form-item>
-        <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
+          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
+              <el-input v-model="form.CYCDYMCBUSS" clearable :disabled="true"></el-input>
-        </el-form-item>
+          </el-form-item>
       </el-col>
     </el-row>
   </div>
@@ -268,9 +274,9 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
-        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+        <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
           <el-select :popper-append-to-body="false"
-          v-model="form.CBCD" placeholder="" :disabled="disabledState">
+          v-model="form.CYCD" placeholder="" :disabled="disabledState">
             <el-option
                     v-for="item in cbcdOptions"
                     :key="item.value"
@@ -829,44 +835,57 @@ export default {
         this.modelOptions = res.data
       })
     },
+      async getDataAsync(){
+          let res = await this.getDicTypeListCode()
+          if(res && res.data){
+              this.countryOptions = res.data.COUNTRY
+              this.applyCountryOptions = res.data.COUNTRY
+              this.regionOptions = res.data.REGION // 区域
+              this.standStateOptions = res.data.BUSSSTATE
+              this.energyKindOptions = res.data.ENERGYTYPES
+              this.standGeneraOptions = res.data.BUSSBIGCLASS
+              this.standSubclassOptions = res.data.BUSSFINECLASS
+              this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+              this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+              this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
+              this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+              this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+              this.categoryOptions = res.data.NYLXCLASS // 能源类型
+              this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+              this.cysdOptions = res.data.WSCYSD // 我司参与深度
+              this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+              this.txlbOptions = res.data.TXLBCLASS // 体系类别
+              this.qcdwOptions = res.data.QCDW // 起草单位
+              this.qcrOptions = res.data.QCRBUSS // 起草人
+              this.nylxOptions = res.data.NYLXCLASS // 能源类型
+              this.syrzOptions = res.data.SYRZCLASS // 适用认证
+              this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+              this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+              this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+              this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
+              this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
+
+              this.$emit('emitDataLoading',false)
+          }
+      },
+      getDicTypeListCode(res,json) {
+          return new Promise((resolve, reject) => {
+              this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                  _this: this
+              }, res => {
+                  const history = res;
+                  resolve(history)
+              })
+          })
+      },
   },
   mounted () {
-    this.form = this.formSub
+    if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
-    this.LXDList = this.LXDListSub
+          this.getDataAsync()
-    this.FSDList = this.FSDListSub
+          this.form = this.formSub
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+          this.LXDList = this.LXDListSub
-      _this: this
+          this.FSDList = this.FSDListSub
-    }, res => {
+    }
-      this.countryOptions = res.data.COUNTRY
-      this.applyCountryOptions = res.data.COUNTRY
-      this.regionOptions = res.data.REGION // 区域
-      this.standStateOptions = res.data.BUSSSTATE
-      this.energyKindOptions = res.data.ENERGYTYPES
-      this.standGeneraOptions = res.data.BUSSBIGCLASS
-      this.standSubclassOptions = res.data.BUSSFINECLASS
-      this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
-      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-      this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
-      this.standSystemOptions = res.data.TXLBBUSS // 标准体系
-      this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
-      this.cysdOptions = res.data.WSCYSD // 我司参与深度
-      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-      this.txlbOptions = res.data.TXLBCLASS // 体系类别
-      this.qcdwOptions = res.data.QCDW // 起草单位
-      this.qcrOptions = res.data.QCRBUSS // 起草人
-      this.nylxOptions = res.data.NYLXCLASS // 能源类型
-      this.syrzOptions = res.data.SYRZCLASS // 适用认证
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
-      this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
-      this.setMap(this.standStateOptions)
-    })
-    this.busVsFunc()
-    this.modelFunc()
   },
   watch: {
     form: {

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

@@ -111,7 +111,7 @@
                                     style="margin-left: 0;margin-bottom:0;"
                                     :rules="formRules.bussFsSubUser1Name"
                             >
-                                <el-input v-model="scope.row.bussFsSubUser1Name" placeholder="请选择对接人" :title="scope.row.bussFsSubUser1Name" @click.native="choiceZRRS(scope.row.bussFsSubUser1, 1, scope.$index)" />
+                                <el-input v-model="scope.row.bussFsSubUser1Name" placeholder="请选择对接人" :title="scope.row.bussFsSubUser1Name" @click.native="choiceZRRS(scope.row, 1, scope.$index)" />
                             </el-form-item>
                         </template>
                 </el-table-column>
@@ -817,10 +817,8 @@ export default {
         this.nodeList2 = []
         this.zrIndex = index
         this.zrType = type
-        if(type === 'bussFsSubUser1'){
+        if ( row.bussFsSubUser1.length > 0) {
-          if ( row.bussFsSubUser1.length > 0) {
+          this.nodeList2 = row.bussFsSubUser1.split(',')
-              this.nodeList2 = row.bussFsSubUser1.split(',')
-          }
         }
         this.modalShowRoleFlag = true
       } else if (type === 2) {
@@ -1116,6 +1114,7 @@ export default {
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
       _formData.append('prcType', 'buss3')
       _formData.append('json', JSON.stringify({
+        taskInfo: '起草',
         roleForm: this.roleForm,
         qbfsForm: this.qbfsForm,
         commentText: this.commentText

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

@@ -31,6 +31,7 @@
               :disabledState = "disabledState"
               :opinionsShow2 = "false"
               :verifySarStandard = "verifySarStandard"
+              @emitDataLoading="emitDataLoading"
               @formCancel="formCancel"
               @formChoiceZRRListCancel = "formChoiceZRRListCancel"
       ></formList>
@@ -225,6 +226,56 @@ export default {
         jgUserId: '',
         bussFsSubUser2:'',
         bussFsSubUser2Name:'',
+          // 基础信息
+          country:[],
+          // 基础信息
+          standSort: '',
+          standCode: '',
+          standYear: '',
+          standName: '',
+          standEnName: '',
+          textStatusBuss: '',
+          issueTime: '',
+          putTime: '',
+          FZRQBUSS: '',
+          FSRQBUSS: '',
+          // 过程稿件
+          FBGBUSS: '',
+          FBGBUSSName: '',
+          BZSMBUSS: '',
+          BZSMBUSSName: '',
+          LSBBBUSS: '',
+          LSBBBUSSName: '',
+          QTWJBUSS: '',
+          QTWJBUSSName: '',
+          // 适用范围
+          QCDW: '',
+          QCRBUSS: '',
+          WJSCRYBUSS: this.$store.getters.userInfo.userId,
+          WJSCRYBUSSName: this.$store.getters.userInfo.userName,
+          SYCXCLASS: '',
+          NYLXCLASS: '',
+          SYCPXCLASS: '',
+          TXLBBUSS: '',
+          VPPSBMBUSS: '',
+          VPPSCNBUSS: '',
+          KCVPPSBMBUSS: '',
+          KCVPPSCNBUSS: '',
+          CYCVPPSBMBUSS: '',
+          CYCVPPSCNBUSS: '',
+          DYBXHBUSS: '',
+          DYMCBUSS: '',
+          // 关联信息
+          DTQBBHBUSS: '',
+          BDTQBBHBUSS: '',
+          XGJLBUSS: '',
+          XGLC: '',
+          GLWJBUSS: '',
+          GLWJBUSSName: '',
+          XCSJBUSS: '',
+          CBCD:'',
+          CYBZ:'',
+          YYBZ:'',
       },
       roleForm: {
         jgUser: ""
@@ -342,6 +393,7 @@ export default {
       this.choiceZRRList(type, title, id)
     },
     formCancel (form, list1,list2,list3,list4,list5,list6,list7) {
+        console.log(form)
           this.qbfsForm = form
           this.FBGBUSSFileList = list1
           this.LSBBBUSSFileList = list2
@@ -351,6 +403,9 @@ export default {
           this.LXDList = list6
           this.FSDList = list7
     },
+    emitDataLoading(boo){
+          this.dataLoading = boo
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -392,10 +447,14 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes)
+        console.log(mes)
         this.qbfsForm = mes.qbfsForm
         this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
         this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
-        this.qbfsForm['id'] = bringData.id
+        this.qbfsForm['id'] = mes.qbfsForm.id
+        this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+        this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+        this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
         this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
         this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
         this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
@@ -448,6 +507,9 @@ export default {
         this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
         this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
         this.qbfsForm['id'] = bringData.id
+        this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+        this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+        this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
         this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
         this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
         this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
@@ -457,9 +519,18 @@ export default {
         this.verifySarStandard = true
         this.formKey++
         this.$forceUpdate()
-        this.dataLoading = false
       })
     },
+    filterObj(obj){
+        if(obj && obj !== ''){
+            if(obj instanceof Array){
+              return obj;
+            }else {
+              return obj.split(",")
+            }
+        }
+        return "";
+    },
     handleTabs(name) {
       this.active = name;
     },
@@ -472,6 +543,7 @@ export default {
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
       _formData.append('prcType', 'buss3')
       _formData.append('json', JSON.stringify({
+        taskInfo: '复审',
         qbfsForm: this.qbfsForm,
         commentText: this.commentText
       }))

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

@@ -31,6 +31,7 @@
               :disabledState = "disabledState"
               :opinionsShow2 = "true"
               :verifySarStandard = "verifySarStandard"
+              @emitDataLoading="emitDataLoading"
               @formCancel="formCancel"
               @formChoiceZRRListCancel = "formChoiceZRRListCancel"
       ></formList>
@@ -250,9 +251,6 @@ export default {
         bussFsSubUser2Name: [
           {required: true, message: "请选择企标复审人", trigger: "change"}
         ],
-        QCRBUSS: [
-          {required: true, message: "请选择主起草人", trigger: "change"}
-        ],
         reviewResults: [
           {required: true, message: "请选择复审结果", trigger: "change"}
         ],
@@ -363,6 +361,9 @@ export default {
           this.LXDList = list6
           this.FSDList = list7
     },
+    emitDataLoading(boo){
+      this.dataLoading = boo
+    },
     processTable() {
       this.$http.get("lawss/activiti/get_list_by_instance", {
         prcNum: this.$route.query.prcNum,
@@ -404,10 +405,14 @@ export default {
         bpnId: this.$route.query.bpnId
       }).then(res => {
         let mes = JSON.parse(res.mes)
+        console.log(mes)
         this.qbfsForm = mes.qbfsForm
         this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
         this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
-        this.qbfsForm['id'] = bringData.id
+        this.qbfsForm['id'] = mes.qbfsForm.id
+        this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+        this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+        this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
         this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
         this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
         this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
@@ -459,14 +464,15 @@ export default {
             LXD:"",
             FSDName:"",
             FSD:"",
-            QCRBUSSID:"",
-            QCRBUSS:"",
         }
         const json = Object.assign(bringData, bringData.attrInfoMap,item,obj);
         this.qbfsForm = JSON.parse(JSON.stringify(json))
         this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
         this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
         this.qbfsForm['id'] = bringData.id
+        this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+        this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+        this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
         this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
         this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
         this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
@@ -494,9 +500,18 @@ export default {
         this.verifySarStandard = true
         this.formKey++
         this.$forceUpdate()
-        this.dataLoading = false
       })
     },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
     handleTabs(name) {
       this.active = name;
     },
@@ -509,6 +524,7 @@ export default {
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
       _formData.append('prcType', 'buss3')
       _formData.append('json', JSON.stringify({
+        taskInfo: '汇总',
         qbfsForm: this.qbfsForm,
         commentText: this.commentText
       }))

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

@@ -31,6 +31,7 @@
               :disabledState = "disabledState"
               :opinionsShow2 = "true"
               :verifySarStandard = "verifySarStandard"
+              @emitDataLoading="emitDataLoading"
               @formCancel="formCancel"
               @formChoiceZRRListCancel = "formChoiceZRRListCancel"
       ></formList>
@@ -427,6 +428,9 @@ export default {
     formChoiceZRRListCancel(type, title, id){
       this.choiceZRRList(type, title, id)
     },
+    emitDataLoading(boo){
+      this.dataLoading = boo
+    },
     formCancel (form, list1,list2,list3,list4,list5,list6,list7) {
           this.qbfsForm = form
           this.FBGBUSSFileList = list1
@@ -534,7 +538,6 @@ export default {
         this.verifySarStandard = true
         this.formKey++
         this.$forceUpdate()
-        this.dataLoading = false
       })
     },
     handleTabs(name) {
@@ -654,7 +657,10 @@ export default {
             }, res => {
               if (res.success) {
                 this.isSubmit = false
-                this.processCreateFsBuss(json)
+                if(this.qbfsForm.approvalOpinion === 0){
+                  this.processCreateFsBuss(json)
+                }
+                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
               }
             }, e => {
             });

src/pages/processCenter/pages/creatProcess/qbfs/stepC4.vue

@@ -31,6 +31,7 @@
               :disabledState = "disabledState"
               :opinionsShow2 = "true"
               :verifySarStandard = "verifySarStandard"
+              @emitDataLoading="emitDataLoading"
               @formCancel="formCancel"
               @formChoiceZRRListCancel = "formChoiceZRRListCancel"
       ></formList>
@@ -250,9 +251,6 @@ export default {
         bussFsSubUser2Name: [
           {required: true, message: "请选择企标复审人", trigger: "change"}
         ],
-        QCRBUSS: [
-          {required: true, message: "请选择主起草人", trigger: "change"}
-        ],
         reviewResults: [
           {required: true, message: "请选择复审结果", trigger: "change"}
         ],
@@ -353,6 +351,9 @@ export default {
     formChoiceZRRListCancel(type, title, id){
       this.choiceZRRList(type, title, id)
     },
+    emitDataLoading(boo){
+          this.dataLoading = boo
+      },
     formCancel (form, list1,list2,list3,list4,list5,list6,list7) {
           this.qbfsForm = form
           this.FBGBUSSFileList = list1
@@ -407,7 +408,10 @@ export default {
         this.qbfsForm = mes.qbfsForm
         this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
         this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
-        this.qbfsForm['id'] = bringData.id
+        this.qbfsForm['id'] = mes.qbfsForm.id
+        this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+        this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+        this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
         this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
         this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
         this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
@@ -459,14 +463,15 @@ export default {
             LXD:"",
             FSDName:"",
             FSD:"",
-            QCRBUSSID:"",
-            QCRBUSS:"",
         }
         const json = Object.assign(bringData, bringData.attrInfoMap,item,obj);
         this.qbfsForm = JSON.parse(JSON.stringify(json))
         this.qbfsForm.WJSCRYBUSS= this.$store.getters.userInfo.userId
         this.qbfsForm.WJSCRYBUSSName= this.$store.getters.userInfo.userName
         this.qbfsForm['id'] = bringData.id
+        this.qbfsForm['NYLXCLASS'] = this.filterObj(this.qbfsForm['NYLXCLASS'])
+        this.qbfsForm['SYCXCLASS'] = this.filterObj(this.qbfsForm['SYCXCLASS'])
+        this.qbfsForm['SYCPXCLASS'] = this.filterObj(this.qbfsForm['SYCPXCLASS'])
         this.FBGBUSSFileList=this.assemble(this.qbfsForm.FBGBUSS,this.qbfsForm.FBGBUSSName);
         this.BZSMBUSSFileList=this.assemble(this.qbfsForm.BZSMBUSS,this.qbfsForm.BZSMBUSSName);
         this.LSBBBUSSFileList=this.assemble(this.qbfsForm.LSBBBUSS,this.qbfsForm.LSBBBUSSName);
@@ -494,9 +499,18 @@ export default {
         this.verifySarStandard = true
         this.formKey++
         this.$forceUpdate()
-        this.dataLoading = false
       })
     },
+    filterObj(obj){
+          if(obj && obj !== ''){
+              if(obj instanceof Array){
+                  return obj;
+              }else {
+                  return obj.split(",")
+              }
+          }
+          return "";
+      },
     handleTabs(name) {
       this.active = name;
     },
@@ -509,6 +523,7 @@ export default {
       _formData.append('createUserName', this.$store.getters.userInfo.userName)
       _formData.append('prcType', 'buss3')
       _formData.append('json', JSON.stringify({
+        taskInfo: '重新汇总',
         qbfsForm: this.qbfsForm,
         commentText: this.commentText
       }))

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

@@ -2,7 +2,7 @@
 <div class="qbfs-step2">
   <ProcessHeader toggle>
     <template slot="proName">企标复审流程</template>
-    <template slot="proNode">企标复审流程详情</template>
+    <template slot="proNode">批准</template>
   </ProcessHeader>
   <div class="headerTabs">
     <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -31,6 +31,7 @@
               :disabledState = "disabledState"
               :opinionsShow2 = "true"
               :verifySarStandard = "verifySarStandard"
+              @emitDataLoading="emitDataLoading"
               @formCancel="formCancel"
               @formChoiceZRRListCancel = "formChoiceZRRListCancel"
       ></formList>
@@ -427,6 +428,9 @@ export default {
     formChoiceZRRListCancel(type, title, id){
       this.choiceZRRList(type, title, id)
     },
+    emitDataLoading(boo){
+      this.dataLoading = boo
+    },
     formCancel (form, list1,list2,list3,list4,list5,list6,list7) {
           this.qbfsForm = form
           this.FBGBUSSFileList = list1

src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue

@@ -143,19 +143,20 @@
         </el-table>
       </div>
       <div>
-<!--        <el-collapse accordion>-->
+        <el-collapse accordion>
-<!--          <el-collapse-item title="审批意见">-->
+          <el-collapse-item title="审批意见">
-<!--            <div style="margin: 10px 0;">-->
+            <div style="margin: 10px 0;">
-<!--              <el-input-->
+              <el-input
-<!--                type="textarea"-->
+                type="textarea"
-<!--                :rows="3"-->
+                :rows="3"
-<!--                resize="none"-->
+                resize="none"
-<!--                placeholder="请输入意见"-->
+                disabled
-<!--                v-model="commentText">-->
+                placeholder="请输入意见"
-<!--              </el-input>-->
+                v-model="commentText">
-<!--            </div>-->
+              </el-input>
-<!--          </el-collapse-item>-->
+            </div>
-<!--        </el-collapse>-->
+          </el-collapse-item>
+        </el-collapse>
       </div>
     </div>
     <div class="content" v-show="active === '3'">

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

@@ -147,7 +147,7 @@
             <div style="display: flex;justify-content: space-between">
               <div style="width: 80%;">
                 <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
                   <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -175,7 +175,7 @@
             <div style="display: flex;justify-content: space-between">
               <div style="width: 80%;">
                 <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
                   <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -205,7 +205,7 @@
             <div style="display: flex;justify-content: space-between">
               <div style="width: 80%;">
                 <div v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
                   <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -233,7 +233,7 @@
             <div style="display: flex;justify-content: space-between">
               <div style="width: 80%;">
                 <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
                   <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -374,7 +374,7 @@
             <div style="display: flex;justify-content: space-between">
               <div style="width: 80%;">
                 <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
                   <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -663,6 +663,22 @@
         default: false
       },
     },
+    filters: {
+      ellipsis (value) {
+        if (!value) return ''
+        if (value.length > 35) {
+          return value.slice(0,35) + '...'
+        }
+        return value
+      },
+      ellipsis22 (value) {
+        if (!value) return ''
+        if (value.length > 22) {
+          return value.slice(0,22) + '...'
+        }
+        return value
+      }
+    },
     data () {
       return {
         opinionsStand:[

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

@@ -433,6 +433,19 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-collapse v-show="verifySarStandard && active !== '2'" v-model="activeName" accordion>
+                        <el-collapse-item title="回执说明" name="1">
+                            <div style="margin: 10px 0;">
+                                <el-input
+                                        type="textarea"
+                                        :rows="3"
+                                        resize="none"
+                                        placeholder="请输入意见"
+                                        v-model="commentText">
+                                </el-input>
+                            </div>
+                        </el-collapse-item>
+                    </el-collapse>
                 </div>
 <!--                <div class="block" id="active2" v-show="active === '2'">-->
 <!--                    <ProcessTitle>-->
@@ -664,19 +677,6 @@
                     </el-timeline>
                 </div>
             </el-form>
-            <el-collapse v-show="verifySarStandard && active !== '2'" v-model="activeName" accordion>
-                <el-collapse-item title="回执说明" name="1">
-                    <div style="margin: 10px 0;">
-                        <el-input
-                                type="textarea"
-                                :rows="3"
-                                resize="none"
-                                placeholder="请输入意见"
-                                v-model="commentText">
-                        </el-input>
-                    </div>
-                </el-collapse-item>
-            </el-collapse>
         </div>
 <!--        保存||提交-->
         <ProcessFooter
@@ -740,20 +740,19 @@
                         </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
-                                    icon="el-icon-search"
                                     type="primary"
                                     class="common-button-primary"
-                                    round
+                                    size="small"
                                     @click="getReplaceLawsNumRowFirst">
+                                查询
                             </el-button>
                         </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
                                     class="common-button-default"
-                                    icon="el-icon-refresh-left"
+                                    size="small"
-                                    round
+                                    @click="getResetLawsNumRow">清空
-                                    type="default"
+                            </el-button>
-                                    @click="getResetLawsNumRow"></el-button>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -776,8 +775,7 @@
                 <el-table-column
                         label="标准编号">
                     <template slot-scope="scope">
-                        <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                        <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                        <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -791,11 +789,11 @@
                     <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
                 </el-table-column>
                 <el-table-column
-                        prop="textStatus"
+                        prop="textStatusBuss"
                         label="文本状态"
                         width="130">
                   <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                   </template>
                 </el-table-column>
             </el-table>
@@ -2437,10 +2435,14 @@
                 let textArr2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
@@ -2451,20 +2453,28 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
-                    this.form.standNum = textArr2.join(',')
+                    this.form.standNum = this.filterSetData(textArr2.join(','))
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
                 // this.$emit('input', textArr.join(','))
                 this.$refs.selections.clearSelection()
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2604,9 +2614,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);

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

@@ -1219,19 +1219,21 @@
                 })
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }

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

@@ -1219,19 +1219,21 @@
                 })
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }

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

@@ -1219,19 +1219,21 @@
                 })
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }

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

@@ -288,20 +288,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -324,8 +323,7 @@
             <el-table-column
                     label="标准编号">
                 <template slot-scope="scope">
-                    <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                    <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                 </template>
             </el-table-column>
             <el-table-column
@@ -339,11 +337,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -859,8 +857,8 @@
                     // 适用范围
                     QCDW: '',
                     QCRBUSS: '',
-                    WJSCRYBUSS: this.$store.getters.userInfo.userId,
+                    WJSCRYBUSS: this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
-                    WJSCRYBUSSName: this.$store.getters.userInfo.userName,
+                    WJSCRYBUSSName: this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
                     SYCXCLASS: '',
                     NYLXCLASS: '',
                     SYCPXCLASS: '',
@@ -1376,6 +1374,8 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                        this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
                         this.getStandInfoByReviseStatus()
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
@@ -1866,10 +1866,14 @@
                 let textArr2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
@@ -1880,14 +1884,14 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
-                    this.form.standNum = textArr2.join(',')
+                    this.form.standNum = this.filterSetData(textArr2.join(','))
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -1895,6 +1899,14 @@
                 this.$refs.selections.clearSelection()
                 this.formKey++
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2044,9 +2056,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -2507,6 +2519,8 @@
                     this.form.prcName = this.prcName
                     this.form.issueTime = this.dateFormatter()
                     this.form['id'] = item.id
+                    this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                    this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
                     this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
                     this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
                     this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);

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

@@ -233,6 +233,8 @@
                 ref="importfile"
                 name="file"
                 accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
+                :limit="1"
+                :on-exceed="handleExceed"
                 :before-upload="beginImportFile"
                 :on-success="importFileSuccess"
                 :on-preview="handleFilePreview"
@@ -1814,6 +1816,9 @@
                 }, e => {
                 })
             },
+            handleExceed(files, fileList) {
+                this.$message.warning(`当前限制上传 1 个文件，本次上传了 ${files.length} 个文件，共上传了 ${files.length + fileList.length} 个文件`);
+            },
             beginImportFile (file) {
                 var filename = file.name
                 var index1 = filename.lastIndexOf('.')

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

@@ -330,20 +330,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -366,8 +365,7 @@
             <el-table-column
                     label="标准编号">
                 <template slot-scope="scope">
-                    <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                    <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                 </template>
             </el-table-column>
             <el-table-column
@@ -381,11 +379,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -1925,10 +1923,14 @@
                 let textArr2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
@@ -1939,14 +1941,14 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
-                    this.form.standNum = textArr2.join(',')
+                    this.form.standNum = this.filterSetData(textArr2.join(','))
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -1954,6 +1956,14 @@
                 this.$refs.selections.clearSelection()
                 this.formKey++
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2110,9 +2120,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);

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

@@ -1218,19 +1218,21 @@
                 })
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }

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

@@ -1308,6 +1308,10 @@
                 this.previewShow(attId)
             },
             showDrawerClose () {
+                this.showForm.modelNum = ""
+                this.showForm.modelUpdBefore = ""
+                this.showForm.modelUpdAfter = ""
+                this.showForm.modelContent = ""
                 this.showDrawer = false
             },
             filterData2(){
@@ -1477,6 +1481,10 @@
                         };
                         this.form.modelData.push(list);
                         this.$message.success("新增成功！")
+                        this.showForm.modelNum = ""
+                        this.showForm.modelUpdBefore = ""
+                        this.showForm.modelUpdAfter = ""
+                        this.showForm.modelContent = ""
                     }
                 })
             },

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

@@ -400,20 +400,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -436,8 +435,7 @@
             <el-table-column
                     label="标准编号">
                 <template slot-scope="scope">
-                    <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                    <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                 </template>
             </el-table-column>
             <el-table-column
@@ -451,11 +449,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -2017,10 +2015,14 @@
                 let textArr2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
@@ -2031,14 +2033,14 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
-                    this.form.standNum = textArr2.join(',')
+                    this.form.standNum = this.filterSetData(textArr2.join(','))
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -2046,6 +2048,14 @@
                 this.$refs.selections.clearSelection()
                 this.formKey++
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2202,9 +2212,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);

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

@@ -2283,19 +2283,21 @@
                 }
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }

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

@@ -1219,19 +1219,21 @@
                 })
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }

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

@@ -1219,19 +1219,21 @@
                 })
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }

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

@@ -330,20 +330,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -366,8 +365,7 @@
             <el-table-column
                     label="标准编号">
                 <template slot-scope="scope">
-                    <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                    <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                 </template>
             </el-table-column>
             <el-table-column
@@ -381,11 +379,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -1926,10 +1924,14 @@
                 let textArr2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
@@ -1940,14 +1942,14 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
-                    this.form.standNum = textArr2.join(',')
+                    this.form.standNum = this.filterSetData(textArr2.join(','))
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -1955,6 +1957,14 @@
                 this.$refs.selections.clearSelection()
                 this.formKey++
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2111,9 +2121,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);

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

@@ -400,20 +400,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -451,11 +450,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -697,14 +696,21 @@
 </template>
 
 <script>
-    import { onlyOfficeUrl } from '@/sysConfig'
+    import {onlyOfficeUrl} from '@/sysConfig'
     import formEditList from './common/formEditList.vue'
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
+    import {
+        getBusStandFileByAttId,
+        inboundLiaisonDetail,
+        processModelHisOneCount,
+        queryTaskFirst,
+        saveTaskFirst
+    } from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+
     let Base64 = require('js-base64').Base64;
 
     export default {
@@ -1993,7 +1999,7 @@
                 this.replaceLawsNumForm.pageSize = pageSize
                 this.getReplaceLawsNumRow()
             },
-            // 代替政策编号确定
+            // 代替企标编号确定
             replaceLawsNumModelBt () {
                 let textArr = []
 
@@ -2017,10 +2023,14 @@
                 let textArr2 = []
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr2.push(item.standNumber)
                     textArr.push(texts)
@@ -2031,14 +2041,14 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
                 }else if(this.replaceLawType === 'yybj'){
                     this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'cbbh'){
                     this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
                 }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-                    this.form.BDTQBBHBUSS = textArr.join(',')
+                    this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
-                    this.form.standNum = textArr2.join(',')
+                    this.form.standNum = this.filterSetData(textArr2.join(','))
                 }else {
                     this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
                 }
@@ -2046,6 +2056,14 @@
                 this.$refs.selections.clearSelection()
                 this.formKey++
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2202,9 +2220,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);

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

@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-产品标准</template>
-        <template slot="proNode">企标制修订流程详情</template>
+        <template slot="proNode">发布</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

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

@@ -129,7 +129,7 @@
           <div style="display: flex;justify-content: space-between">
             <div style="width: 80%;">
               <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
                 <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -157,7 +157,7 @@
           <div style="display: flex;justify-content: space-between">
             <div style="width: 80%;">
               <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
                 <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -187,7 +187,7 @@
           <div style="display: flex;justify-content: space-between">
             <div style="width: 80%;">
               <div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
                 <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -215,7 +215,7 @@
           <div style="display: flex;justify-content: space-between">
             <div style="width: 80%;">
               <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
                 <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -270,14 +270,17 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="关联模块--乘用车VPPS中文名称" title="关联模块--乘用车VPPS中文名称" class="add-form-item form-item-disabled">
+        <el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPSVPPS编码" class="add-form-item form-item-disabled">
-          <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
+          <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--乘用车VPPS编码" @click.native="choiceZRR2('car', '关联模块--乘用车VPPSVPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
         </el-form-item>
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
-          <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
+          <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
-          <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>
+          <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>
+        </el-form-item>
+        <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>
         </el-form-item>
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
@@ -320,8 +323,11 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
-          <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>
+          <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+          <el-input v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable :disabled="true"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
@@ -404,8 +410,8 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
-        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+        <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
-          <el-select v-model="form.CBCD" filterable clearable
+          <el-select v-model="form.CYCD" filterable clearable
                      placeholder="请先选择采标程度"
           >
             <el-option
@@ -426,7 +432,7 @@
           <div style="display: flex;justify-content: space-between">
             <div style="width: 80%;">
               <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :tile="item.name">{{ item.name | ellipsis22 }}</span>
                 <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
                         <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
                   </span>
@@ -696,6 +702,22 @@ export default {
       default: false
     },
   },
+  filters: {
+    ellipsis (value) {
+      if (!value) return ''
+      if (value.length > 35) {
+        return value.slice(0,35) + '...'
+      }
+      return value
+    },
+    ellipsis22 (value) {
+      if (!value) return ''
+      if (value.length > 22) {
+        return value.slice(0,22) + '...'
+      }
+      return value
+    }
+  },
   data () {
     return {
       fileId:'',
@@ -798,6 +820,10 @@ export default {
       this.$emit('formChoiceZRR4',type,title,id)
     },
 
+    choiceZRR5(type, title, id) {
+      this.$emit('formChoiceZRR5',type,title,id)
+    },
+
     choiceQCDW(type, title, id) {
       this.$emit('formChoiceQCDW',type,title,id)
     },
@@ -861,7 +887,6 @@ export default {
         default : ;
       }
       this.fileMadel = true;
-      console.log(this.madelSubList)
       this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,this.fileMadel,this.fileList,fileType,this.madelSubList);
     },
     filePreview(){
@@ -965,7 +990,7 @@ export default {
     if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
         this.getDataAsync()
         this.form = this.formSub
-        console.log(this.form)
+        console.log(this.QTWJBUSSFileListSub)
         this.FBGBUSSFileList= this.FBGBUSSFileListSub
         this.BZSMBUSSFileList= this.BZSMBUSSFileListSub
         this.LSBBBUSSFileList= this.LSBBBUSSFileListSub

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

@@ -183,9 +183,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
           <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
+          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+          </el-form-item>
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
         </el-form-item>
@@ -220,9 +223,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
         </el-form-item>
+        <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+              <el-input v-model="form.CYCDYMCBUSS" clearable :disabled="true"></el-input>
+        </el-form-item>
       </el-col>
     </el-row>
   </div>
@@ -265,9 +271,9 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
-        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+        <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
           <el-select :popper-append-to-body="false"
-          v-model="form.CBCD" placeholder="" :disabled="disabledState">
+          v-model="form.CYCD" placeholder="" :disabled="disabledState">
             <el-option
                     v-for="item in cbcdOptions"
                     :key="item.value"

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

@@ -194,9 +194,12 @@
           <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
             <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
           </el-form-item>
-          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
             <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
           </el-form-item>
+          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+            <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+          </el-form-item>
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
           </el-form-item>
@@ -231,9 +234,12 @@
           <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
           </el-form-item>
+          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.CYCDYMCBUSS" clearable :disabled="true"></el-input>
+          </el-form-item>
         </el-col>
       </el-row>
     </div>
@@ -276,8 +282,8 @@
                     :disabled="true"
             ></el-input>
           </el-form-item>
-          <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+          <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
-            <el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState">
+            <el-select :popper-append-to-body="false" v-model="form.CYCD" placeholder="" :disabled="disabledState">
               <el-option
                       v-for="item in cbcdOptions"
                       :key="item.value"

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

@@ -269,13 +269,16 @@
                                     </el-select>
                                 </el-form-item>
                                 <el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR2('car', '乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
+                                    <el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="关联模块--乘用车VPPS编码" @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
                                 </el-form-item>
                                 <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择VPPS编码" @click.native="choiceZRR3('struck', '卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
+                                    <el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
                                 </el-form-item>
-                                <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+                                <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxhbuss', '模块结构单元', form.DYBXHBUSS,false)"></el-input>
+                                    <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>
+                                </el-form-item>
+                                <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>
                                 </el-form-item>
                                 <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
                                     <el-input v-model="form.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', form.TXLBBUSS)"></el-input>
@@ -319,8 +322,11 @@
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
                                     <el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable :disabled="true"></el-input>
                                 </el-form-item>
-                                <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+                                <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
-                                    <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称" clearable :disabled="true"></el-input>
+                                    <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable :disabled="true"></el-input>
+                                </el-form-item>
+                                <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+                                    <el-input v-model="form.CYCDYMCBUSS" placeholder="模块结构单元名称(乘用车)" clearable :disabled="true"></el-input>
                                 </el-form-item>
                             </el-col>
                         </el-row>
@@ -397,8 +403,8 @@
                                             :disabled="true"
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+                                <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
-                                    <el-select v-model="form.CBCD" filterable clearable
+                                    <el-select v-model="form.CYCD" filterable clearable
                                                placeholder="请先选择采标程度"
                                     >
                                         <el-option
@@ -435,6 +441,19 @@
                             </el-col>
                         </el-row>
                     </div>
+                    <el-collapse v-show="verifySarStandard && active !== '2'" v-model="activeName" accordion>
+                        <el-collapse-item title="回执说明" name="1">
+                            <div style="margin: 10px 0;">
+                                <el-input
+                                        type="textarea"
+                                        :rows="3"
+                                        resize="none"
+                                        placeholder="请输入意见"
+                                        v-model="commentText">
+                                </el-input>
+                            </div>
+                        </el-collapse-item>
+                    </el-collapse>
                 </div>
 <!--                <div class="block" id="active2" v-show="active === '2'">-->
 <!--                    <ProcessTitle>-->
@@ -656,19 +675,6 @@
                     </el-timeline>
                 </div>
             </el-form>
-            <el-collapse v-show="verifySarStandard && active !== '2'" v-model="activeName" accordion>
-                <el-collapse-item title="回执说明" name="1">
-                    <div style="margin: 10px 0;">
-                        <el-input
-                                type="textarea"
-                                :rows="3"
-                                resize="none"
-                                placeholder="请输入意见"
-                                v-model="commentText">
-                        </el-input>
-                    </div>
-                </el-collapse-item>
-            </el-collapse>
         </div>
 <!--        保存||提交-->
         <ProcessFooter
@@ -732,20 +738,19 @@
                         </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
-                                    icon="el-icon-search"
                                     type="primary"
                                     class="common-button-primary"
-                                    round
+                                    size="small"
                                     @click="getReplaceLawsNumRowFirst">
+                                查询
                             </el-button>
                         </el-form-item>
                         <el-form-item class="search-item btn-box">
                             <el-button
                                     class="common-button-default"
-                                    icon="el-icon-refresh-left"
+                                    size="small"
-                                    round
+                                    @click="getResetLawsNumRow">清空
-                                    type="default"
+                            </el-button>
-                                    @click="getResetLawsNumRow"></el-button>
                         </el-form-item>
                     </el-form>
                 </div>
@@ -768,8 +773,7 @@
                 <el-table-column
                         label="标准编号">
                     <template slot-scope="scope">
-                        <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                        <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode }}</a>
-                        <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                     </template>
                 </el-table-column>
                 <el-table-column
@@ -783,11 +787,11 @@
                     <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
                 </el-table-column>
                 <el-table-column
-                        prop="textStatus"
+                        prop="textStatusBuss"
                         label="文本状态"
                         width="130">
                   <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                   </template>
                 </el-table-column>
             </el-table>
@@ -890,19 +894,21 @@
                                         clearable
                                         :maxlength="100"></el-input>
                             </el-form-item>
-                            <el-form-item>
+                            <el-form-item class="search-item btn-box">
                                 <el-button
-                                        icon="el-icon-search"
                                         type="primary"
                                         class="common-button-primary"
-                                        @click="handleSearchStandard"
+                                        size="small"
-                                        round>
+                                        @click="handleSearchStandard">
+                                    查询
                                 </el-button>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
                                 <el-button
                                         class="common-button-default"
-                                        icon="el-icon-refresh-left"
+                                        size="small"
-                                        @click="handleResetSearch"
+                                        @click="handleResetSearch">清空
-                                        round></el-button>
+                                </el-button>
                             </el-form-item>
                         </el-form>
                     </div>
@@ -1013,7 +1019,7 @@
                     </div>
                     <pagination
                             :page="standardSearchForm.page"
-                            :total="standardSearchForm.total"
+                            :total="tableCount"
                             @pageChange="handleStandardPageChange"
                             @pageSizeChange="handleStandardPageSizeChange"></pagination>
                     <loading :loading="loadSarStandard">数据获取中</loading>
@@ -1087,6 +1093,19 @@
             :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
             :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
             @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag5"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="modelType"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+            @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
     </div>
 </template>
 
@@ -1223,7 +1242,6 @@
                 standardSearchForm: {
                     page: 1,
                     pageSize: this.$store.getters.userInfo.configContent,
-                    total: 0,
                     unit: '',
                     esName: '',
                     planStatus: '0,3',
@@ -1235,6 +1253,7 @@
                     // 任务分解单数据
                     taskTableData: []
                 },
+                tableCount : 0,
                 tableHeight: {
                     standardTableHeight: null
                 },
@@ -1312,10 +1331,12 @@
                 modalShowFlag2: false, // drawer开关
                 modalShowFlag3: false, // drawer开关
                 modalShowFlag4: false, // drawer开关
+                modalShowFlag5: false, // drawer开关
                 drawerTitle1:'',
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
+                modelType:'',
                 drawerTitle: '', //drawer标题
                 showCheckBox: true, // 树形控件是否展示多选框
                 nodeKey: 'id',
@@ -1325,6 +1346,7 @@
                 defaultCheckedKeys1: [],
                 defaultCheckedKeys2: [],
                 defaultCheckedKeys3: [],
+                defaultCheckedKeys4: [],
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
@@ -1388,7 +1410,7 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -1917,6 +1939,16 @@
                     XCSJBUSS: '',
                 } // 标准信息
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             filterDate(data){
                 if(data === undefined || data === null || data === '' || data === 'null'){
                     return ""
@@ -1950,9 +1982,9 @@
                             // 标准编号
                             this.form.standNum = this.filterDate(this.standardCheckedList[0].standNum)
                             // 适用车型
-                            this.form.SYCXCLASS = this.filterDate(this.standardCheckedList[0].area)
+                            this.form.SYCXCLASS = this.filterObj(this.standardCheckedList[0].area)
                             // 采标程度
-                            this.form.CBCD = this.filterDate(this.standardCheckedList[0].useLevel)
+                            this.form.CYCD = this.filterDate(this.standardCheckedList[0].useLevel)
                             // 采用标准drafter
                             this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations)
                             // 引用标准
@@ -2085,7 +2117,7 @@
                     this.loadSarStandard = false
                     if (res.ok) {
                         this.tableData.standardData = res.data.list
-                        this.standardSearchForm.total = res.data.count
+                        this.tableCount = res.data.count
                     }
                 }, e => {
                     this.loadSarStandard = false
@@ -2266,9 +2298,19 @@
                 this.modalShowFlag4 = true
                 this.url = ''
                 this.urlChild = ''
+                this.modelType = type
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
             },
+            choiceZRR5(type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag5 = true
+                this.url = ''
+                this.urlChild = ''
+                this.modelType = type
+                this.url = "sarModelTree/listByType"
+                this.urlChild = "sarModelTree/childByList"
+            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
 
@@ -2353,10 +2395,14 @@
                 }
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -2365,11 +2411,14 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
               // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'CYBZ'){
-                    this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.CYBZ =  this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'YYBZ'){
-                    this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.YYBZ = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'bfbdtbzh'){
                     this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
@@ -2378,6 +2427,14 @@
                 // this.$emit('input', textArr.join(','))
                 this.$refs.selections.clearSelection()
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2598,19 +2655,6 @@
                 // }
 
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
-                    if(checkedData.length > 0){
-                        this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.VPPSBMBUSS = checkedData.code
-                        this.form.VPPSCNBUSS = checkedData.chineseName
-                    }
-                }
-                this.modalShowFlag2 = false
-                this.$forceUpdate()
-            },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if (checkedData.length > 0) {
@@ -2634,19 +2678,6 @@
             popoverHideCancel(){
               this.modalShowFlag1  = false
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0 && checkedData.length != 0){
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.cycvppsbm = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
-                    }
-                    this.modalShowFlag2 = false
-                }
-
-            },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if (checkedData && checkedData.length != 0) {
                     if (checkedData.length > 0) {
@@ -2705,6 +2736,22 @@
                popoverHideModelCancel(){
                 this.modalShowFlag4 = false
             },
+            popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.CYCDYBXHBUSS = checkedData.model
+                        this.form.CYCDYMCBUSS = checkedData.name
+                    }
+                    this.modalShowFlag5 = false
+                }
+                this.$forceUpdate()
+            },
+            popoverCarHideModelCancel() {
+                this.modalShowFlag5 = false
+            },
             closeDrawer() {
                 this.ListModel = false
             },

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

@@ -1218,19 +1218,21 @@
                 }
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }
@@ -2293,8 +2295,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -1217,19 +1217,21 @@
                 }
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }
@@ -2292,8 +2294,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -42,6 +42,7 @@
                         @formChoiceZRR2 = "formChoiceZRR2"
                         @formChoiceZRR3 = "formChoiceZRR3"
                         @formChoiceZRR4 = "formChoiceZRR4"
+                        @formChoiceZRR5 = "formChoiceZRR5"
                 />
                 <div>
                     <el-collapse accordion v-model="activeName">
@@ -288,20 +289,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -324,8 +324,7 @@
             <el-table-column
                     label="标准编号">
                 <template slot-scope="scope">
-                    <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                    <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                 </template>
             </el-table-column>
             <el-table-column
@@ -339,11 +338,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -569,16 +568,56 @@
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
             :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
     <tree-select-new
-            width = "500"
+            width="500"
             :lazy=true
-            :multiple="multipleFlag2"
+            :multiple ='modalShowFlag2'
             :check-strictly=true
             :modalShowFlag="modalShowFlag2"
             :drawerTitle="drawerTitle"
+            :type="type"
             :url="url"
             :urlChild="urlChild"
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+            @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag3"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="'truck'"
+            :urlChild="urlChild"
+            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
+            @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag4"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+            @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag5"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="modelType"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+            @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
     <loading :loading="dataLoading">正在加载数据</loading>
 </div>
 </template>
@@ -591,6 +630,7 @@
     import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+    import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
     let Base64 = require('js-base64').Base64;
 
     export default {
@@ -601,7 +641,8 @@
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
+            TreeSelectModule
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -791,7 +832,9 @@
                 modalShowFlag2: false, // drawer开关
                 modalShowFlag3: false, // drawer开关
                 modalShowFlag4: false, // drawer开关
+                modalShowFlag5: false, // drawer开关
                 drawerTitle1:'',
+                modelType:'',
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
@@ -804,6 +847,7 @@
                 defaultCheckedKeys1: [],
                 defaultCheckedKeys2: [],
                 defaultCheckedKeys3: [],
+                defaultCheckedKeys4: [],
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
@@ -1125,6 +1169,9 @@
             formChoiceZRR4(type, title, id){
                 this.choiceZRR4(type, title, id)
             },
+            formChoiceZRR5(type, title, id){
+                this.choiceZRR5(type, title, id)
+            },
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
@@ -1354,6 +1401,9 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
@@ -1747,9 +1797,19 @@
                 this.modalShowFlag4 = true
                 this.url = ''
                 this.urlChild = ''
+                this.modelType = type
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
             },
+            choiceZRR5(type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag5 = true
+                this.url = ''
+                this.urlChild = ''
+                this.modelType = type
+                this.url = "sarModelTree/listByType"
+                this.urlChild = "sarModelTree/childByList"
+            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
 
@@ -1840,10 +1900,14 @@
                 }
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -1851,12 +1915,15 @@
                 })
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
-                if(this.replaceLawType === 'dtbjh'){
+                if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
-                }else if(this.replaceLawType === 'yybj'){
+                    this.form.DTQBBHBUSS = this.filterSetData(arr1)
-                    this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
+                }else if(this.replaceLawType === 'CYBZ'){
-                }else if(this.replaceLawType === 'cbbh'){
+                    let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
-                    this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.CYBZ =  this.filterSetData(arr1)
+                }else if(this.replaceLawType === 'YYBZ'){
+                    let arr1 = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.YYBZ = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'bfbdtbzh'){
                     this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
@@ -1865,6 +1932,14 @@
                 // this.$emit('input', textArr.join(','))
                 this.$refs.selections.clearSelection()
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2031,9 +2106,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -2121,19 +2196,6 @@
                     default : ;
                 }
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
-                    if(checkedData.length > 0){
-                        this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.VPPSBMBUSS = checkedData.code
-                        this.form.VPPSCNBUSS = checkedData.chineseName
-                    }
-                }
-                this.modalShowFlag2 = false
-                this.$forceUpdate()
-            },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if (checkedData.length > 0) {
@@ -2157,53 +2219,79 @@
                 this.modalShowFlag1  = false
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0 && checkedData.length != 0){
+                    if (checkedData.length > 0) {
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.cycvppsbm = checkedData.code
+                        this.form.CYCVPPSBMBUSS = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
+                        this.form.CYCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag2 = false
+                }else {
+                    this.form.CYCVPPSBMBUSS = ''
+                    this.form.CYCVPPSCNBUSS = ''
                 }
-
+                this.modalShowFlag2 = false
+                this.$forceUpdate()
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
             },
             popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
+                    if (checkedData.length > 0) {
-                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.kccvppsbm = checkedData.code
+                        this.form.KCVPPSBMBUSS = checkedData.code
-                        this.form.kccvppscn = checkedData.chineseName
+                        this.form.KCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag3 = false
+                }else {
-
+                    this.form.KCVPPSBMBUSS = ''
+                    this.form.KCVPPSCNBUSS = ''
                 }
+                this.modalShowFlag3 = false
+                this.$forceUpdate()
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                console.log(checkedData)
-                    if(checkedData.length > 0){
+                if (checkedData && checkedData.length != 0) {
-                        this.form.dybxh = checkedData.map(item => item.model).join(",")
+                    if (checkedData.length > 0) {
-                        this.form.dymc = checkedData.map(item => item.name).join(",")
+                        this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
-                    }else {
+                        this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
-                        this.form.dybxh = checkedData.model
+                    } else {
-                        this.form.dymc = checkedData.name
+                        this.form.DYBXHBUSS = checkedData.model
+                        this.form.DYMCBUSS = checkedData.name
                     }
-                    this.modalShowFlag4 = false
+                }else {
+                    this.form.DYBXHBUSS = ''
+                    this.form.DYMCBUSS = ''
                 }
-
+                this.modalShowFlag4 = false
+                this.$forceUpdate()
             },
             popoverHideModelCancel(){
                 this.modalShowFlag4 = false
             },
+            popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.CYCDYBXHBUSS = checkedData.model
+                        this.form.CYCDYMCBUSS = checkedData.name
+                    }
+                    this.modalShowFlag5 = false
+                }
+                this.$forceUpdate()
+            },
+            popoverCarHideModelCancel() {
+                this.modalShowFlag5 = false
+            },
             closeDrawer() {
                 this.ListModel = false
             },
@@ -2457,10 +2545,23 @@
                     this.form.prcName = this.prcName
                     this.form.issueTime = this.dateFormatter()
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                     this.formKey++
                     // this.getStandInfoByReviseStatus()
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -43,6 +43,7 @@
                         @formChoiceZRR2 = "formChoiceZRR2"
                         @formChoiceZRR3 = "formChoiceZRR3"
                         @formChoiceZRR4 = "formChoiceZRR4"
+                        @formChoiceZRR5 = "formChoiceZRR5"
                 />
                 <div>
                     <el-collapse accordion v-model="activeName">
@@ -289,20 +290,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -325,8 +325,7 @@
             <el-table-column
                     label="标准编号">
                 <template slot-scope="scope">
-                    <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                    <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                 </template>
             </el-table-column>
             <el-table-column
@@ -340,11 +339,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -570,16 +569,56 @@
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
             :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
     <tree-select-new
-            width = "500"
+            width="500"
             :lazy=true
-            :multiple="multipleFlag2"
+            :multiple ='modalShowFlag2'
             :check-strictly=true
             :modalShowFlag="modalShowFlag2"
             :drawerTitle="drawerTitle"
+            :type="type"
             :url="url"
             :urlChild="urlChild"
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+            @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag3"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="'truck'"
+            :urlChild="urlChild"
+            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
+            @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag4"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+            @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag5"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="modelType"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+            @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
     <loading :loading="dataLoading">正在加载数据</loading>
 </div>
 </template>
@@ -592,6 +631,7 @@
     import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,inboundLiaisonDetail,processCreateBuss,evaluationHisList} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+    import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
     let Base64 = require('js-base64').Base64;
 
     export default {
@@ -602,7 +642,8 @@
             ProcessFooter,
             ProcessTitle,
             TreeSelect,
-            TreeSelectNew
+            TreeSelectNew,
+            TreeSelectModule
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -792,7 +833,9 @@
                 modalShowFlag2: false, // drawer开关
                 modalShowFlag3: false, // drawer开关
                 modalShowFlag4: false, // drawer开关
+                modalShowFlag5: false, // drawer开关
                 drawerTitle1:'',
+                modelType:'',
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
@@ -805,6 +848,7 @@
                 defaultCheckedKeys1: [],
                 defaultCheckedKeys2: [],
                 defaultCheckedKeys3: [],
+                defaultCheckedKeys4: [],
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
@@ -847,8 +891,8 @@
                     // 适用范围
                     QCDW: '',
                     QCRBUSS: '',
-                    WJSCRYBUSS: this.$store.getters.userInfo.userId,
+                    WJSCRYBUSS: this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
-                    WJSCRYBUSSName: this.$store.getters.userInfo.userName,
+                    WJSCRYBUSSName: this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
                     SYCXCLASS: '',
                     NYLXCLASS: '',
                     SYCPXCLASS: '',
@@ -875,7 +919,7 @@
                     commentText:'',
                     prcName:'',
                     standType: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -1129,6 +1173,9 @@
             formChoiceZRR4(type, title, id){
                 this.choiceZRR4(type, title, id)
             },
+            formChoiceZRR5(type, title, id){
+                this.choiceZRR5(type, title, id)
+            },
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
@@ -1358,6 +1405,11 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                        this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                        this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
@@ -1751,9 +1803,19 @@
                 this.modalShowFlag4 = true
                 this.url = ''
                 this.urlChild = ''
+                this.modelType = type
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
             },
+            choiceZRR5(type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag5 = true
+                this.url = ''
+                this.urlChild = ''
+                this.modelType = type
+                this.url = "sarModelTree/listByType"
+                this.urlChild = "sarModelTree/childByList"
+            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
 
@@ -1844,10 +1906,14 @@
                 }
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -1856,12 +1922,15 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(arr1)
                     this.getStandInfoByReviseStatus()
                 }else if(this.replaceLawType === 'CYBZ'){
-                    this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.CYBZ =  this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'YYBZ'){
-                    this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.YYBZ = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'bfbdtbzh'){
                     this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
@@ -1870,6 +1939,14 @@
                 // this.$emit('input', textArr.join(','))
                 this.$refs.selections.clearSelection()
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2019,9 +2096,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -2144,53 +2221,79 @@
                 this.modalShowFlag1  = false
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0 && checkedData.length != 0){
+                    if (checkedData.length > 0) {
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.cycvppsbm = checkedData.code
+                        this.form.CYCVPPSBMBUSS = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
+                        this.form.CYCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag2 = false
+                }else {
+                    this.form.CYCVPPSBMBUSS = ''
+                    this.form.CYCVPPSCNBUSS = ''
                 }
-
+                this.modalShowFlag2 = false
+                this.$forceUpdate()
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
             },
             popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
+                    if (checkedData.length > 0) {
-                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.kccvppsbm = checkedData.code
+                        this.form.KCVPPSBMBUSS = checkedData.code
-                        this.form.kccvppscn = checkedData.chineseName
+                        this.form.KCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag3 = false
+                }else {
-
+                    this.form.KCVPPSBMBUSS = ''
+                    this.form.KCVPPSCNBUSS = ''
                 }
+                this.modalShowFlag3 = false
+                this.$forceUpdate()
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                console.log(checkedData)
-                    if(checkedData.length > 0){
+                if (checkedData && checkedData.length != 0) {
-                        this.form.dybxh = checkedData.map(item => item.model).join(",")
+                    if (checkedData.length > 0) {
-                        this.form.dymc = checkedData.map(item => item.name).join(",")
+                        this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
-                    }else {
+                        this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
-                        this.form.dybxh = checkedData.model
+                    } else {
-                        this.form.dymc = checkedData.name
+                        this.form.DYBXHBUSS = checkedData.model
+                        this.form.DYMCBUSS = checkedData.name
                     }
-                    this.modalShowFlag4 = false
+                }else {
+                    this.form.DYBXHBUSS = ''
+                    this.form.DYMCBUSS = ''
                 }
-
+                this.modalShowFlag4 = false
+                this.$forceUpdate()
             },
             popoverHideModelCancel(){
                 this.modalShowFlag4 = false
             },
+            popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.CYCDYBXHBUSS = checkedData.model
+                        this.form.CYCDYMCBUSS = checkedData.name
+                    }
+                    this.modalShowFlag5 = false
+                }
+                this.$forceUpdate()
+            },
+            popoverCarHideModelCancel() {
+                this.modalShowFlag5 = false
+            },
             closeDrawer() {
                 this.ListModel = false
             },
@@ -2475,9 +2578,24 @@
                     this.form.issueTime = this.dateFormatter()
                     this.form['id'] = item.id
                     this.getStandInfoByReviseStatus()
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+                    this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
+                    this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.userId)+')',
                     this.formKey++
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -358,6 +358,8 @@
                 ref="importfile"
                 name="file"
                 accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
+                :limit="1"
+                :on-exceed="handleExceed"
                 :before-upload="beginImportFile"
                 :on-success="importFileSuccess"
                 :on-preview="handleFilePreview"
@@ -973,7 +975,7 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -1513,6 +1515,9 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.fileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
@@ -2069,6 +2074,9 @@
                 }, e => {
                 })
             },
+            handleExceed(files, fileList) {
+                this.$message.warning(`当前限制上传 1 个文件，本次上传了 ${files.length} 个文件，共上传了 ${files.length + fileList.length} 个文件`);
+            },
             beginImportFile (file) {
                 var filename = file.name
                 var index1 = filename.lastIndexOf('.')
@@ -2502,7 +2510,7 @@
                 this.$refs['formTongGuo'].validate((valid) => {
                     if (valid) {
                         if(this.footFileList !== undefined && this.footFileList.length > 0){
-                            this.form.footFile=this.footFileList.map(item => item.response.data.id).join(",")
+                            this.form.footFile=this.footFileList.map(item => item.id ? item.id : item.response.data.id).join(",")
                             this.form.footFileName=this.footFileList.map(item => item.name).join(",")
                             this.isSubmit = true
                             this.saveLoading = true
@@ -2597,11 +2605,24 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                     this.form.evaluationData = []
                     this.evaluationHisListRep()
                     this.evaluationHisListRepSum()
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -39,6 +39,7 @@
                     @formChoiceZRR2 = "formChoiceZRR2"
                     @formChoiceZRR3 = "formChoiceZRR3"
                     @formChoiceZRR4 = "formChoiceZRR4"
+                    @formChoiceZRR5 = "formChoiceZRR5"
             />
                 <ProcessTitle>
                     <template slot="title">文件汇总</template>
@@ -333,20 +334,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -369,8 +369,7 @@
             <el-table-column
                     label="标准编号">
                 <template slot-scope="scope">
-                    <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                    <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                 </template>
             </el-table-column>
             <el-table-column
@@ -384,11 +383,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -608,22 +607,62 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
             :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
     <tree-select-new
-            width = "500"
+            width="500"
             :lazy=true
-            :multiple="multipleFlag2"
+            :multiple ='modalShowFlag2'
             :check-strictly=true
             :modalShowFlag="modalShowFlag2"
             :drawerTitle="drawerTitle"
+            :type="type"
             :url="url"
             :urlChild="urlChild"
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+            @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag3"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="'truck'"
+            :urlChild="urlChild"
+            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
+            @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag4"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+            @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag5"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="modelType"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+            @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
     <loading :loading="dataLoading">正在加载数据</loading>
 </div>
 </template>
@@ -637,6 +676,7 @@
     import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+    import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
     let Base64 = require('js-base64').Base64;
 
     export default {
@@ -647,7 +687,8 @@
             ProcessTitle,
             TreeSelect,
             TreeSelectNew,
-            formEditList
+            formEditList,
+            TreeSelectModule
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -838,8 +879,10 @@
                 modalShowFlag2: false, // drawer开关
                 modalShowFlag3: false, // drawer开关
                 modalShowFlag4: false, // drawer开关
+                modalShowFlag5: false, // drawer开关
                 drawerTitle1:'',
                 multipleFlag2:'',
+                modelType:'',
                 url:'',
                 urlChild:'',
                 drawerTitle: '', //drawer标题
@@ -851,6 +894,7 @@
                 defaultCheckedKeys1: [],
                 defaultCheckedKeys2: [],
                 defaultCheckedKeys3: [],
+                defaultCheckedKeys4: [],
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
@@ -913,7 +957,7 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -1167,6 +1211,9 @@
             formChoiceZRR4(type, title, id){
                 this.choiceZRR4(type, title, id)
             },
+            formChoiceZRR5(type, title, id){
+                this.choiceZRR5(type, title, id)
+            },
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
@@ -1411,6 +1458,9 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
@@ -1801,9 +1851,19 @@
                 this.modalShowFlag4 = true
                 this.url = ''
                 this.urlChild = ''
+                this.modelType = type
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
             },
+            choiceZRR5(type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag5 = true
+                this.url = ''
+                this.urlChild = ''
+                this.modelType = type
+                this.url = "sarModelTree/listByType"
+                this.urlChild = "sarModelTree/childByList"
+            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
 
@@ -1894,10 +1954,14 @@
                 }
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -1906,11 +1970,14 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'CYBZ'){
-                    this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.CYBZ =  this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'YYBZ'){
-                    this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.YYBZ = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'bfbdtbzh'){
                     this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
@@ -1920,6 +1987,14 @@
                 this.$refs.selections.clearSelection()
                 this.formKey++
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2076,9 +2151,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -2184,53 +2259,79 @@
                 this.modalShowFlag1  = false
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0 && checkedData.length != 0){
+                    if (checkedData.length > 0) {
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.cycvppsbm = checkedData.code
+                        this.form.CYCVPPSBMBUSS = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
+                        this.form.CYCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag2 = false
+                }else {
+                    this.form.CYCVPPSBMBUSS = ''
+                    this.form.CYCVPPSCNBUSS = ''
                 }
-
+                this.modalShowFlag2 = false
+                this.$forceUpdate()
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
             },
             popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
+                    if (checkedData.length > 0) {
-                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.kccvppsbm = checkedData.code
+                        this.form.KCVPPSBMBUSS = checkedData.code
-                        this.form.kccvppscn = checkedData.chineseName
+                        this.form.KCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag3 = false
+                }else {
-
+                    this.form.KCVPPSBMBUSS = ''
+                    this.form.KCVPPSCNBUSS = ''
                 }
+                this.modalShowFlag3 = false
+                this.$forceUpdate()
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                console.log(checkedData)
-                    if(checkedData.length > 0){
+                if (checkedData && checkedData.length != 0) {
-                        this.form.dybxh = checkedData.map(item => item.model).join(",")
+                    if (checkedData.length > 0) {
-                        this.form.dymc = checkedData.map(item => item.name).join(",")
+                        this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
-                    }else {
+                        this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
-                        this.form.dybxh = checkedData.model
+                    } else {
-                        this.form.dymc = checkedData.name
+                        this.form.DYBXHBUSS = checkedData.model
+                        this.form.DYMCBUSS = checkedData.name
                     }
-                    this.modalShowFlag4 = false
+                }else {
+                    this.form.DYBXHBUSS = ''
+                    this.form.DYMCBUSS = ''
                 }
-
+                this.modalShowFlag4 = false
+                this.$forceUpdate()
             },
             popoverHideModelCancel(){
                 this.modalShowFlag4 = false
             },
+            popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.CYCDYBXHBUSS = checkedData.model
+                        this.form.CYCDYMCBUSS = checkedData.name
+                    }
+                    this.modalShowFlag5 = false
+                }
+                this.$forceUpdate()
+            },
+            popoverCarHideModelCancel() {
+                this.modalShowFlag5 = false
+            },
             closeDrawer() {
                 this.ListModel = false
             },
@@ -2516,8 +2617,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -852,7 +852,7 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -1228,19 +1228,21 @@
                 })
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }
@@ -2304,8 +2306,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -1205,7 +1205,7 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -1470,6 +1470,10 @@
                 this.previewShow(attId)
             },
             showDrawerClose () {
+                this.showForm.modelNum = ""
+                this.showForm.modelUpdBefore = ""
+                this.showForm.modelUpdAfter = ""
+                this.showForm.modelContent = ""
                 this.showDrawer = false
             },
             filterData2(){
@@ -1642,6 +1646,10 @@
                         };
                         this.form.modelData.push(list);
                         this.$message.success("新增成功！")
+                        this.showForm.modelNum = ""
+                        this.showForm.modelUpdBefore = ""
+                        this.showForm.modelUpdAfter = ""
+                        this.showForm.modelContent = ""
                     }
                 })
             },
@@ -1831,6 +1839,10 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.getEvaluation()
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -2879,8 +2891,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
@@ -2975,7 +3000,6 @@
             },
         },
         mounted () {
-            console.log(this.$store.getters.userInfo)
             this.getTaskId()
             this.getData()
             this.processTable()

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

@@ -168,6 +168,7 @@
                         @formChoiceZRR2 = "formChoiceZRR2"
                         @formChoiceZRR3 = "formChoiceZRR3"
                         @formChoiceZRR4 = "formChoiceZRR4"
+                        @formChoiceZRR5 = "formChoiceZRR5"
                 />
                 <ProcessTitle>
                     <template slot="title">意见信息</template>
@@ -536,20 +537,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -572,8 +572,7 @@
             <el-table-column
                     label="标准编号">
                 <template slot-scope="scope">
-                    <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                    <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                 </template>
             </el-table-column>
             <el-table-column
@@ -587,11 +586,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -817,16 +816,56 @@
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
             :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
     <tree-select-new
-            width = "500"
+            width="500"
             :lazy=true
-            :multiple="multipleFlag2"
+            :multiple ='modalShowFlag2'
             :check-strictly=true
             :modalShowFlag="modalShowFlag2"
             :drawerTitle="drawerTitle"
+            :type="type"
             :url="url"
             :urlChild="urlChild"
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+            @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag3"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="'truck'"
+            :urlChild="urlChild"
+            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
+            @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag4"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+            @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag5"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="modelType"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+            @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
     <loading :loading="dataLoading">正在加载数据</loading>
 </div>
 </template>
@@ -840,6 +879,7 @@
     import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+    import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
     import {getEvaluationIndex} from "api/businessApi";
     let Base64 = require('js-base64').Base64;
 
@@ -851,7 +891,8 @@
             ProcessTitle,
             TreeSelect,
             TreeSelectNew,
-            formEditList
+            formEditList,
+            TreeSelectModule
         },
         filters: {
             ellipsis (value) {
@@ -1071,7 +1112,9 @@
                 modalShowFlag2: false, // drawer开关
                 modalShowFlag3: false, // drawer开关
                 modalShowFlag4: false, // drawer开关
+                modalShowFlag5: false, // drawer开关
                 drawerTitle1:'',
+                modelType:'',
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
@@ -1084,6 +1127,7 @@
                 defaultCheckedKeys1: [],
                 defaultCheckedKeys2: [],
                 defaultCheckedKeys3: [],
+                defaultCheckedKeys4: [],
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
@@ -1516,6 +1560,9 @@
             formChoiceZRR4(type, title, id){
                 this.choiceZRR4(type, title, id)
             },
+            formChoiceZRR5(type, title, id){
+                this.choiceZRR5(type, title, id)
+            },
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
@@ -1533,6 +1580,7 @@
                 this.LSBBBUSSFileList = list2
                 this.BZSMBUSSFileList = list3
                 this.QTWJBUSSFileList = list4
+                console.log(this.QTWJBUSSFileList)
                 this.GLWJBUSSFileList = list5
                 if(fileMadel){
                     this.fileType = fileType
@@ -1757,6 +1805,10 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.getEvaluation()
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
@@ -2148,9 +2200,19 @@
                 this.modalShowFlag4 = true
                 this.url = ''
                 this.urlChild = ''
+                this.modelType = type
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
             },
+            choiceZRR5(type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag5 = true
+                this.url = ''
+                this.urlChild = ''
+                this.modelType = type
+                this.url = "sarModelTree/listByType"
+                this.urlChild = "sarModelTree/childByList"
+            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
 
@@ -2241,10 +2303,14 @@
                 }
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -2253,11 +2319,14 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'CYBZ'){
-                    this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.CYBZ =  this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'YYBZ'){
-                    this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.YYBZ = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'bfbdtbzh'){
                     this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
@@ -2267,6 +2336,14 @@
                 this.$refs.selections.clearSelection()
                 this.formKey++
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2423,9 +2500,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -2505,19 +2582,6 @@
                 }
                 this.formKey++
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
-                    if(checkedData.length > 0){
-                        this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.VPPSBMBUSS = checkedData.code
-                        this.form.VPPSCNBUSS = checkedData.chineseName
-                    }
-                }
-                this.modalShowFlag2 = false
-                this.$forceUpdate()
-            },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if (checkedData.length > 0) {
@@ -2541,53 +2605,79 @@
                 this.modalShowFlag1  = false
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0 && checkedData.length != 0){
+                    if (checkedData.length > 0) {
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.cycvppsbm = checkedData.code
+                        this.form.CYCVPPSBMBUSS = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
+                        this.form.CYCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag2 = false
+                }else {
+                    this.form.CYCVPPSBMBUSS = ''
+                    this.form.CYCVPPSCNBUSS = ''
                 }
-
+                this.modalShowFlag2 = false
+                this.$forceUpdate()
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
             },
             popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
+                    if (checkedData.length > 0) {
-                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.kccvppsbm = checkedData.code
+                        this.form.KCVPPSBMBUSS = checkedData.code
-                        this.form.kccvppscn = checkedData.chineseName
+                        this.form.KCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag3 = false
+                }else {
-
+                    this.form.KCVPPSBMBUSS = ''
+                    this.form.KCVPPSCNBUSS = ''
                 }
+                this.modalShowFlag3 = false
+                this.$forceUpdate()
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                console.log(checkedData)
-                    if(checkedData.length > 0){
+                if (checkedData && checkedData.length != 0) {
-                        this.form.dybxh = checkedData.map(item => item.model).join(",")
+                    if (checkedData.length > 0) {
-                        this.form.dymc = checkedData.map(item => item.name).join(",")
+                        this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
-                    }else {
+                        this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
-                        this.form.dybxh = checkedData.model
+                    } else {
-                        this.form.dymc = checkedData.name
+                        this.form.DYBXHBUSS = checkedData.model
+                        this.form.DYMCBUSS = checkedData.name
                     }
-                    this.modalShowFlag4 = false
+                }else {
+                    this.form.DYBXHBUSS = ''
+                    this.form.DYMCBUSS = ''
                 }
-
+                this.modalShowFlag4 = false
+                this.$forceUpdate()
             },
             popoverHideModelCancel(){
                 this.modalShowFlag4 = false
             },
+            popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.CYCDYBXHBUSS = checkedData.model
+                        this.form.CYCDYMCBUSS = checkedData.name
+                    }
+                    this.modalShowFlag5 = false
+                }
+                this.$forceUpdate()
+            },
+            popoverCarHideModelCancel() {
+                this.modalShowFlag5 = false
+            },
             closeDrawer() {
                 this.ListModel = false
             },
@@ -2878,9 +2968,22 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                     this.formKey++
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -1425,24 +1425,41 @@
                 }
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }
                 })
             },
+            // 请求转换流程图
+            processNum (row) {
+                axios.request({
+                    url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
+                    responseType: 'blob',
+                    method: 'get',
+                    params: {
+                        prcNum: this.$route.query.prcNum
+                    }
+                }).then(res => {
+                    // let blob = new Blob([res.data], {type: 'image/jpg'})
+                    // let url = window.URL.createObjectURL(res.data)
+                    this.processStep = window.URL.createObjectURL(res.data)
+                })
+            },
             checkedRole (data) {
                 if (this.type === 0) {
                     this.roleForm.deptUserId = data[0].id
@@ -1495,6 +1512,14 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        if(this.form.fsRejectStatus === 1){
+                            this.evaluationHisListByOne()
+                        }else {
+                            this.getEvaluation()
+                        }
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -2443,43 +2468,40 @@
                 // } else if (val === '') {
                 //     this.form.country = []
                 // }
-                this.$refs['form'].validate((valid) => {
+
-                        if (valid) {
+                this.$refs['formTongGuo'].validate((valid) => {
-                            this.$refs['formTongGuo'].validate((valid) => {
+                    if (valid) {
-                                if (valid) {
+                        this.isSubmit = true
-                                    this.isSubmit = true
+                        this.saveLoading = true
-                                    this.saveLoading = true
+                        this.form.commentText = this.formTongGuo.commentText
-                                    this.form.commentText = this.formTongGuo.commentText
+                        this.form.approvalOpinion = this.formTongGuo.approvalOpinion
-                                    this.form.approvalOpinion = this.formTongGuo.approvalOpinion
+                        const json = JSON.stringify(this.form);
-                                    const json = JSON.stringify(this.form);
+                        this.$http.post('lawss/activiti/completeTask', {
-                                    this.$http.post('lawss/activiti/completeTask', {
+                            taskIds: this.taskIds,
-                                        taskIds: this.taskIds,
+                            userId : this.userId,
-                                        userId : this.userId,
+                            json: json
-                                        json: json
+                        }, {
-                                    }, {
+                            _this: this
-                                        _this: this
+                        }, res => {
-                                    }, res => {
+                            if (res.success) {
-                                        if (res.success) {
+                                this.$message.success(res.message)
-                                            this.$message.success(res.message)
+                                // 流程提交之后，应该流转至待办任务页面
-                                            // 流程提交之后，应该流转至待办任务页面
+                                this.isSubmit = false
-                                            this.isSubmit = false
+                                this.saveLoading = false
-                                            this.saveLoading = false
+                                this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                            this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                // if(this.formTongGuo.approvalOpinion === '1'){
-                                            // if(this.formTongGuo.approvalOpinion === '1'){
+                                //     this.$message.warning("驳回成功")
-                                            //     this.$message.warning("驳回成功")
+                                //     this.isSubmit = false
-                                            //     this.isSubmit = false
+                                //     // 流程提交之后，应该流转至待办任务页面
-                                            //     // 流程提交之后，应该流转至待办任务页面
+                                //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
-                                            //     this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                                // }else{
-                                            // }else{
+                                //     this.processCreateLaws(json)
-                                            //     this.processCreateLaws(json)
+                                // }
-                                            // }
+                            }else {
-                                        }else {
+                                this.$message.success(res.message)
-                                            this.$message.success(res.message)
+                            }
-                                        }
+                        })
-                                    })
+                    }})
-                                }})
-                        }
-                })
             },
             busVsFunc(){
                 this.$http.get('sarVppsTree/list', '', {
@@ -2520,8 +2542,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -798,7 +798,7 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -1246,19 +1246,21 @@
                 }
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }
@@ -1316,6 +1318,9 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -2330,8 +2335,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -989,7 +989,7 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -1465,19 +1465,21 @@
                 }
             },
             checkedRoleTransfer (data) {
-                this.assigneeNewLoading = true
+                this.isSubmit = true
+                this.saveLoading = 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
+                    this.isSubmit = false
+                    this.saveLoading = false
                     if (res.success) {
                         this.drawerModal = false
                         this.$message.success('调整成功')
-                        this.processNum()
                         this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+                        this.processNum()
                     } else {
                         this.$message.warning(res.message)
                     }
@@ -1535,6 +1537,14 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        if(this.form.fsRejectStatus === 1){
+                            this.evaluationHisListByOne()
+                        }else {
+                            this.getEvaluation()
+                        }
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
                         this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -2572,8 +2582,21 @@
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
                     this.evaluationHisListRepSum()
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -410,20 +410,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -461,11 +460,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -999,7 +998,7 @@
                     commentText:'',
                     prcName:'',
                     standType: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -2275,9 +2274,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -2709,9 +2708,22 @@
                     this.evaluationHisListRep()
                     this.getStandInfoByReviseStatus()
                     this.evaluationHisListRepSum()
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                     this.formKey++
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -39,6 +39,7 @@
                         @formChoiceZRR2 = "formChoiceZRR2"
                         @formChoiceZRR3 = "formChoiceZRR3"
                         @formChoiceZRR4 = "formChoiceZRR4"
+                        @formChoiceZRR5 = "formChoiceZRR5"
                 />
                 <ProcessTitle>
                     <template slot="title">文件汇总</template>
@@ -333,20 +334,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -369,8 +369,7 @@
             <el-table-column
                     label="标准编号">
                 <template slot-scope="scope">
-                    <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                    <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                 </template>
             </el-table-column>
             <el-table-column
@@ -384,11 +383,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -608,22 +607,62 @@
             :multiple=false
             :lazy=false
             :modalShowFlag="modalShowFlag1"
-            :drawerTitle="drawerTitle1"
+            :drawerTitle="drawerTitle"
             width = "500"
             :data="standSystemOptions"
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
             :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
     <tree-select-new
-            width = "500"
+            width="500"
             :lazy=true
-            :multiple="multipleFlag2"
+            :multiple ='modalShowFlag2'
             :check-strictly=true
             :modalShowFlag="modalShowFlag2"
             :drawerTitle="drawerTitle"
+            :type="type"
             :url="url"
             :urlChild="urlChild"
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+            @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag3"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="'truck'"
+            :urlChild="urlChild"
+            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
+            @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag4"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+            @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag5"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="modelType"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+            @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
     <loading :loading="dataLoading">正在加载数据</loading>
 </div>
 </template>
@@ -637,6 +676,7 @@
     import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+    import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
     let Base64 = require('js-base64').Base64;
 
     export default {
@@ -647,7 +687,8 @@
             ProcessTitle,
             TreeSelect,
             TreeSelectNew,
-            formEditList
+            formEditList,
+            TreeSelectModule
         },
         data () {
             const validateZrUserIdName = (rule, value, callback) => {
@@ -704,8 +745,8 @@
                     }]
                 },
                 taskInfo:'重新企标编写汇总',
-                loading: false,
                 dataLoading: true,
+                loading: false,
                 disabledState: false,
                 userId:this.$store.getters.userInfo.userId,
                 taskIds: this.$route.query.taskIds,
@@ -838,8 +879,10 @@
                 modalShowFlag2: false, // drawer开关
                 modalShowFlag3: false, // drawer开关
                 modalShowFlag4: false, // drawer开关
+                modalShowFlag5: false, // drawer开关
                 drawerTitle1:'',
                 multipleFlag2:'',
+                modelType:'',
                 url:'',
                 urlChild:'',
                 drawerTitle: '', //drawer标题
@@ -851,6 +894,7 @@
                 defaultCheckedKeys1: [],
                 defaultCheckedKeys2: [],
                 defaultCheckedKeys3: [],
+                defaultCheckedKeys4: [],
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
@@ -913,7 +957,7 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -1037,9 +1081,6 @@
                     QCRBUSS: [
                         { required: true, message: '请选择起草人', trigger: 'change' }
                     ],
-                    DTQBBHBUSS: [
-                        { required: true, message: '请选择代替企标编号', trigger: 'change' }
-                    ],
                 },
                 zrUserIds: [], // 选择多个会签责任人
                 userType:'', // 选择用户ID判断
@@ -1170,6 +1211,9 @@
             formChoiceZRR4(type, title, id){
                 this.choiceZRR4(type, title, id)
             },
+            formChoiceZRR5(type, title, id){
+                this.choiceZRR5(type, title, id)
+            },
             formChoiceQCDW(type, title, id){
                 this.choiceQCDW(type, title, id)
             },
@@ -1414,6 +1458,9 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
@@ -1804,9 +1851,19 @@
                 this.modalShowFlag4 = true
                 this.url = ''
                 this.urlChild = ''
+                this.modelType = type
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
             },
+            choiceZRR5(type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag5 = true
+                this.url = ''
+                this.urlChild = ''
+                this.modelType = type
+                this.url = "sarModelTree/listByType"
+                this.urlChild = "sarModelTree/childByList"
+            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
 
@@ -1897,10 +1954,14 @@
                 }
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -1909,11 +1970,14 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'CYBZ'){
-                    this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.CYBZ =  this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'YYBZ'){
-                    this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.YYBZ = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'bfbdtbzh'){
                     this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
@@ -1923,6 +1987,14 @@
                 this.$refs.selections.clearSelection()
                 this.formKey++
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2079,9 +2151,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -2187,53 +2259,79 @@
                 this.modalShowFlag1  = false
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0 && checkedData.length != 0){
+                    if (checkedData.length > 0) {
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.cycvppsbm = checkedData.code
+                        this.form.CYCVPPSBMBUSS = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
+                        this.form.CYCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag2 = false
+                }else {
+                    this.form.CYCVPPSBMBUSS = ''
+                    this.form.CYCVPPSCNBUSS = ''
                 }
-
+                this.modalShowFlag2 = false
+                this.$forceUpdate()
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
             },
             popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
+                    if (checkedData.length > 0) {
-                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.kccvppsbm = checkedData.code
+                        this.form.KCVPPSBMBUSS = checkedData.code
-                        this.form.kccvppscn = checkedData.chineseName
+                        this.form.KCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag3 = false
+                }else {
-
+                    this.form.KCVPPSBMBUSS = ''
+                    this.form.KCVPPSCNBUSS = ''
                 }
+                this.modalShowFlag3 = false
+                this.$forceUpdate()
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                console.log(checkedData)
-                    if(checkedData.length > 0){
+                if (checkedData && checkedData.length != 0) {
-                        this.form.dybxh = checkedData.map(item => item.model).join(",")
+                    if (checkedData.length > 0) {
-                        this.form.dymc = checkedData.map(item => item.name).join(",")
+                        this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
-                    }else {
+                        this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
-                        this.form.dybxh = checkedData.model
+                    } else {
-                        this.form.dymc = checkedData.name
+                        this.form.DYBXHBUSS = checkedData.model
+                        this.form.DYMCBUSS = checkedData.name
                     }
-                    this.modalShowFlag4 = false
+                }else {
+                    this.form.DYBXHBUSS = ''
+                    this.form.DYMCBUSS = ''
                 }
-
+                this.modalShowFlag4 = false
+                this.$forceUpdate()
             },
             popoverHideModelCancel(){
                 this.modalShowFlag4 = false
             },
+            popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.CYCDYBXHBUSS = checkedData.model
+                        this.form.CYCDYMCBUSS = checkedData.name
+                    }
+                    this.modalShowFlag5 = false
+                }
+                this.$forceUpdate()
+            },
+            popoverCarHideModelCancel() {
+                this.modalShowFlag5 = false
+            },
             closeDrawer() {
                 this.ListModel = false
             },
@@ -2519,9 +2617,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
-                    this.formKey++
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
@@ -2593,43 +2703,21 @@
                     })
                 })
             },
+            getDicTypeListCode(res,json) {
+                return new Promise((resolve, reject) => {
+                    this.$http.get('sys/dictype/getDicTypeListCode', '', {
+                        _this: this
+                    }, res => {
+                        const history = res;
+                        resolve(history)
+                    })
+                })
+            },
         },
         mounted () {
             this.getTaskId()
             this.getData()
             this.processTable()
-            this.$http.get('sys/dictype/getDicTypeListCode', '', {
-                _this: this
-            }, res => {
-                this.countryOptions = res.data.COUNTRY
-                this.applyCountryOptions = res.data.COUNTRY
-                this.regionOptions = res.data.REGION // 区域
-                this.standStateOptions = res.data.BUSSSTATE
-                this.energyKindOptions = res.data.ENERGYTYPES
-                this.standGeneraOptions = res.data.BUSSBIGCLASS
-                this.standSubclassOptions = res.data.BUSSFINECLASS
-                this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
-                this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-                this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
-                this.standSystemOptions = res.data.TXLBBUSS // 标准体系
-                this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-                this.categoryOptions = res.data.NYLXCLASS // 能源类型
-                this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
-                this.cysdOptions = res.data.WSCYSD // 我司参与深度
-                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-                this.txlbOptions = res.data.TXLBCLASS // 体系类别
-                this.qcdwOptions = res.data.QCDW // 起草单位
-                this.qcrOptions = res.data.QCRBUSS // 起草人
-                this.nylxOptions = res.data.NYLXCLASS // 能源类型
-                this.syrzOptions = res.data.SYRZCLASS // 适用认证
-                this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-                this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-                this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-                this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
-                this.setMap(this.standStateOptions)
-            })
-            this.busVsFunc()
-            this.modelFunc()
         }
 
     }

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

@@ -82,7 +82,7 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.score'"
                                                 :rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" >
-                                            <el-input :disabled="form.fsRejectStatus === 1" v-model.number="scope.row.score" placeholder="请填写分值" />
+                                            <el-input v-model.number="scope.row.score" placeholder="请填写分值" />
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
@@ -105,7 +105,7 @@
                                         <el-form-item
                                                 :prop="'evaluationData.'+scope.$index + '.reason'"
                                                 :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
-                                            <el-input :disabled="form.fsRejectStatus === 1" v-model="scope.row.reason" placeholder="请填写扣分理由" />
+                                            <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
                                         </el-form-item>
                                     </template>
                                 </el-table-column>
@@ -168,6 +168,7 @@
                         @formChoiceZRR2 = "formChoiceZRR2"
                         @formChoiceZRR3 = "formChoiceZRR3"
                         @formChoiceZRR4 = "formChoiceZRR4"
+                        @formChoiceZRR5 = "formChoiceZRR5"
                 />
                 <ProcessTitle>
                     <template slot="title">意见信息</template>
@@ -186,7 +187,7 @@
                                 default-expand-all>
                             <el-table-column
                                     label="序号"
-                                    min-width="5%"
+                                    min-width="6%"
                                     align="center">
                                 <template slot-scope="scope">
                                     {{scope.$index + 1}}
@@ -254,7 +255,7 @@
                             <el-table-column
                                     prop="zrUserIdName"
                                     label="责任人"
-                                    min-width="15%"
+                                    min-width="14%"
                                     align="center">
                                 <!--                                <template slot-scope="scope">-->
                                 <!--                                    <el-form-item-->
@@ -536,20 +537,19 @@
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
-                                icon="el-icon-search"
                                 type="primary"
                                 class="common-button-primary"
-                                round
+                                size="small"
                                 @click="getReplaceLawsNumRowFirst">
+                            查询
                         </el-button>
                     </el-form-item>
                     <el-form-item class="search-item btn-box">
                         <el-button
                                 class="common-button-default"
-                                icon="el-icon-refresh-left"
+                                size="small"
-                                round
+                                @click="getResetLawsNumRow">清空
-                                type="default"
+                        </el-button>
-                                @click="getResetLawsNumRow"></el-button>
                     </el-form-item>
                 </el-form>
             </div>
@@ -572,8 +572,7 @@
             <el-table-column
                     label="标准编号">
                 <template slot-scope="scope">
-                    <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                    <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standCode}}</a>
-                    <a v-else class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber }}</a>
                 </template>
             </el-table-column>
             <el-table-column
@@ -587,11 +586,11 @@
                 <template slot-scope="scope">{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</template>
             </el-table-column>
             <el-table-column
-                    prop="textStatus"
+                    prop="textStatusBuss"
                     label="文本状态"
                     width="130">
                 <template slot-scope="scope">
-                    <span>{{ textStatusMap[scope.row.textStatus] }}</span>
+                    <span>{{ textStatusMap[scope.row.textStatusBuss] }}</span>
                 </template>
             </el-table-column>
         </el-table>
@@ -817,16 +816,56 @@
             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
             :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
     <tree-select-new
-            width = "500"
+            width="500"
             :lazy=true
-            :multiple="multipleFlag2"
+            :multiple ='modalShowFlag2'
             :check-strictly=true
             :modalShowFlag="modalShowFlag2"
             :drawerTitle="drawerTitle"
+            :type="type"
             :url="url"
             :urlChild="urlChild"
             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"
+            @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
+    <tree-select-new
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag3"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="'truck'"
+            :urlChild="urlChild"
+            :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
+            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"
+            @popoverHideCancel="popoverHideCarVsCancel()"></tree-select-new>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag4"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
+            @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag5"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="modelType"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+            @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
     <loading :loading="dataLoading">正在加载数据</loading>
 </div>
 </template>
@@ -837,9 +876,10 @@
     import ProcessHeader from '../../components/ProcessHeader'
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount,evaluationHisListByOne} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,inboundLiaisonDetail,processModelHisOneCount} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
+    import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
     import {getEvaluationIndex} from "api/businessApi";
     let Base64 = require('js-base64').Base64;
 
@@ -851,7 +891,8 @@
             ProcessTitle,
             TreeSelect,
             TreeSelectNew,
-            formEditList
+            formEditList,
+            TreeSelectModule
         },
         filters: {
             ellipsis (value) {
@@ -1071,7 +1112,9 @@
                 modalShowFlag2: false, // drawer开关
                 modalShowFlag3: false, // drawer开关
                 modalShowFlag4: false, // drawer开关
+                modalShowFlag5: false, // drawer开关
                 drawerTitle1:'',
+                modelType:'',
                 multipleFlag2:'',
                 url:'',
                 urlChild:'',
@@ -1084,6 +1127,7 @@
                 defaultCheckedKeys1: [],
                 defaultCheckedKeys2: [],
                 defaultCheckedKeys3: [],
+                defaultCheckedKeys4: [],
                 fileUrl: 'api/att/attFile/upload',
                 fileMadel: false,
                 fileType: '',
@@ -1150,7 +1194,7 @@
                     GLWJBUSS: '',
                     GLWJBUSSName: '',
                     XCSJBUSS: '',
-                    CBCD:'',
+                    CYCD:'',
                     CYBZ:'',
                     YYBZ:'',
                     standNum:'',
@@ -1516,6 +1560,9 @@
             formChoiceZRR4(type, title, id){
                 this.choiceZRR4(type, title, id)
             },
+            formChoiceZRR5(type, title, id){
+                this.choiceZRR5(type, title, id)
+            },
             formChoiceZRRListCancel(type, title, id){
                 this.choiceZRRList(type, title, id)
             },
@@ -1757,6 +1804,9 @@
                         let mes = JSON.parse(res.mes)
                         mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
                         this.form = mes.form
+                        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                         this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
                         this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
                         this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
@@ -2148,9 +2198,19 @@
                 this.modalShowFlag4 = true
                 this.url = ''
                 this.urlChild = ''
+                this.modelType = type
                 this.url="sarModelTree/list"
                 this.urlChild="sarModelTree/childByList"
             },
+            choiceZRR5(type, title, id) {
+                this.drawerTitle = title
+                this.modalShowFlag5 = true
+                this.url = ''
+                this.urlChild = ''
+                this.modelType = type
+                this.url = "sarModelTree/listByType"
+                this.urlChild = "sarModelTree/childByList"
+            },
             getTree () {
                 this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
 
@@ -2241,10 +2301,14 @@
                 }
                 this.selectedListRep.map((item) => {
                     let texts = ''
-                    if (item.standYear != null && item.standYear !== '') {
+                    if(item.standCode !== null && item.standCode !== ''){
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        texts = item.standCode
-                    } else {
+                    }else {
-                        texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        if (item.standYear != null && item.standYear !== '') {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+                        } else {
+                            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+                        }
                     }
                     textArr.push(texts)
                     textArr = [...new Set(textArr)]
@@ -2253,11 +2317,14 @@
                 // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
                 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
                 if(this.replaceLawType === 'DTQBBHBUSS'){
-                    this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
+                    this.form.DTQBBHBUSS = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'CYBZ'){
-                    this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.CYBZ =  this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'YYBZ'){
-                    this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    let arr1 = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
+                    this.form.YYBZ = this.filterSetData(arr1)
                 }else if(this.replaceLawType === 'bfbdtbzh'){
                     this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
                 }else {
@@ -2267,6 +2334,14 @@
                 this.$refs.selections.clearSelection()
                 this.formKey++
             },
+            filterSetData(data){
+                const arr=new Set()
+                let permission = data.split(",");
+                permission.forEach((item, index) => {
+                    arr.add(item)
+                })
+                return Array.from(arr).join(',');
+            },
             // 点击查看
             handlePreview (item) {
                 let routeUrl = this.$router.resolve({
@@ -2423,9 +2498,9 @@
                             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
                             this.LSBBBUSSFileList.push(fileObj)
                             break;
-                        case 'GLWJLAWS':
+                        case 'QTWJBUSS':
-                            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+                            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-                            this.GLWJLAWSFileList.push(fileObj)
+                            this.QTWJBUSSFileList.push(fileObj)
                             break;
                         case 'GLWJBUSS':
                             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -2505,19 +2580,6 @@
                 }
                 this.formKey++
             },
-            popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
-                    if(checkedData.length > 0){
-                        this.form.VPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.VPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
-                        this.form.VPPSBMBUSS = checkedData.code
-                        this.form.VPPSCNBUSS = checkedData.chineseName
-                    }
-                }
-                this.modalShowFlag2 = false
-                this.$forceUpdate()
-            },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
                     if (checkedData.length > 0) {
@@ -2541,53 +2603,79 @@
                 this.modalShowFlag1  = false
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0 && checkedData.length != 0){
+                    if (checkedData.length > 0) {
-                        this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.cycvppsbm = checkedData.code
+                        this.form.CYCVPPSBMBUSS = checkedData.code
-                        this.form.cycvppscn = checkedData.chineseName
+                        this.form.CYCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag2 = false
+                }else {
+                    this.form.CYCVPPSBMBUSS = ''
+                    this.form.CYCVPPSCNBUSS = ''
                 }
-
+                this.modalShowFlag2 = false
+                this.$forceUpdate()
             },
             popoverHideBusVsCancel(){
                 this.modalShowFlag2 = false
             },
             popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                if (checkedData && checkedData.length != 0) {
-                    if(checkedData.length > 0){
+                    if (checkedData.length > 0) {
-                        this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+                        this.form.KCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
-                        this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+                        this.form.KCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-                    }else {
+                    } else {
-                        this.form.kccvppsbm = checkedData.code
+                        this.form.KCVPPSBMBUSS = checkedData.code
-                        this.form.kccvppscn = checkedData.chineseName
+                        this.form.KCVPPSCNBUSS = checkedData.chineseName
                     }
-                    this.modalShowFlag3 = false
+                }else {
-
+                    this.form.KCVPPSBMBUSS = ''
+                    this.form.KCVPPSCNBUSS = ''
                 }
+                this.modalShowFlag3 = false
+                this.$forceUpdate()
             },
             popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData && checkedData.length != 0) {
+                console.log(checkedData)
-                    if(checkedData.length > 0){
+                if (checkedData && checkedData.length != 0) {
-                        this.form.dybxh = checkedData.map(item => item.model).join(",")
+                    if (checkedData.length > 0) {
-                        this.form.dymc = checkedData.map(item => item.name).join(",")
+                        this.form.DYBXHBUSS = checkedData.map(item => item.model).join(",")
-                    }else {
+                        this.form.DYMCBUSS = checkedData.map(item => item.name).join(",")
-                        this.form.dybxh = checkedData.model
+                    } else {
-                        this.form.dymc = checkedData.name
+                        this.form.DYBXHBUSS = checkedData.model
+                        this.form.DYMCBUSS = checkedData.name
                     }
-                    this.modalShowFlag4 = false
+                }else {
+                    this.form.DYBXHBUSS = ''
+                    this.form.DYMCBUSS = ''
                 }
-
+                this.modalShowFlag4 = false
+                this.$forceUpdate()
             },
             popoverHideModelCancel(){
                 this.modalShowFlag4 = false
             },
+            popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+                if (checkedData && checkedData.length != 0) {
+                    if (checkedData.length > 0) {
+                        this.form.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+                        this.form.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+                    } else {
+                        this.form.CYCDYBXHBUSS = checkedData.model
+                        this.form.CYCDYMCBUSS = checkedData.name
+                    }
+                    this.modalShowFlag5 = false
+                }
+                this.$forceUpdate()
+            },
+            popoverCarHideModelCancel() {
+                this.modalShowFlag5 = false
+            },
             closeDrawer() {
                 this.ListModel = false
             },
@@ -2873,19 +2961,27 @@
             getFormFieldList (item) {
                 this.$nextTick(() => {
                     this.form = JSON.parse(JSON.stringify(item))
-                    console.log(this.form)
                     this.form.evaluationData = []
-                    if(this.form.fsRejectStatus === 1){
+                    this.getEvaluation()
-                        this.evaluationHisListByOne()
-                    }else {
-                        this.getEvaluation()
-                    }
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                     this.formKey++
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
@@ -2919,19 +3015,6 @@
                     })
                 })
             },
-            evaluationHisListByOne() {
-                return new Promise((resolve, reject) => {
-                    evaluationHisListByOne({
-                        pid: this.pId,taskInfo:'技术委员会评审、评审意见修改'
-                    }).then(res => {
-                        if (res) {
-                            this.form.evaluationData = JSON.parse(res.mesg)
-                            this.$forceUpdate()
-                        }
-                    }).catch(e => {
-                    })
-                })
-            },
             getData() {
                 if(this.taskIds && this.pId){
                     return new Promise((resolve, reject) => {

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

@@ -2,7 +2,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
         <template slot="proName">企标制修订-技术标准</template>
-        <template slot="proNode">企标制修订流程详情</template>
+        <template slot="proNode">发布</template>
     </ProcessHeader>
     <div class="headerTabs">
         <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -2240,8 +2240,21 @@
                     this.form.prcNum = this.prcNum
                     this.form.prcName = this.prcName
                     this.form['id'] = item.id
+                    this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+                    this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+                    this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
                 })
             },
+            filterObj(obj){
+                if(obj && obj !== ''){
+                    if(obj instanceof Array){
+                        return obj;
+                    }else {
+                        return obj.split(",")
+                    }
+                }
+                return "";
+            },
             assemble(ids,names){
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){

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

@@ -831,14 +831,17 @@ export default {
       this.modalshowflag2 = true;
     },
     checkedRole2(data) {
-      console.log(data);
+      let unList = []
+      let uidList = []
       let idList = "", nameList = ""
       let unitList = "", unitNameList = ""
       data.forEach(item => {
+        unList.push(item.institutionName)
+        uidList.push(item.institutionId)
         if (nameList.length) {
           nameList += ",";
           idList += ",";
-          unitList += ",";
+          unitList += ","
           unitNameList += ",";
         }
         idList += item.id;
@@ -846,11 +849,39 @@ export default {
         unitList += item.institutionId
         unitNameList += item.institutionName
       });
+      let unNameList = []
+      let unIdList = []
+      unList.forEach(item => {
+        if(unNameList.length){
+          unNameList.forEach(items => {
+            if(items !== item){
+              unNameList.push(item)
+            }else{
+              return
+            }
+          })
+        }else{
+          unNameList.push(item)
+        }
+      })
+      uidList.forEach(item => {
+        if(unIdList.length){
+          unIdList.forEach(items => {
+            if(items !== item){
+              unIdList.push(item)
+            }else{
+              return
+            }
+          })
+        }else{
+          unIdList.push(item)
+        }
+      })
       if(this.roleType === '1'){
         this.$set(this.qbfsForm, 'drafter', idList)
         this.$set(this.qbfsForm, 'drafterName', nameList)
-        this.$set(this.qbfsForm, 'unit', unitList)
+        this.$set(this.qbfsForm, 'unit', unIdList.join(','))
-        this.$set(this.qbfsForm, 'unitName', unitNameList)
+        this.$set(this.qbfsForm, 'unitName', unNameList.join(','))
       }else if(this.roleType === '2'){
         this.$set(this.qbfsForm, 'resPerson', idList)
         this.$set(this.qbfsForm, 'resPersonName', nameList)

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

@@ -942,30 +942,62 @@ export default {
       this.modalshowflag2 = true;
     },
     checkedRole2(data) {
+      let unList = []
+      let uidList = []
       let idList = "", nameList = ""
       let unitList = "", unitNameList = ""
       data.forEach(item => {
+        unList.push(item.institutionName)
+        uidList.push(item.institutionId)
         if (nameList.length) {
           nameList += ",";
           idList += ",";
-          unitList += ",";
+          unitList += ","
           unitNameList += ",";
         }
         idList += item.id;
         nameList += item.name;
         unitList += item.institutionId
         unitNameList += item.institutionName
-
       });
-      if(this.type === '1'){
+      let unNameList = []
+      let unIdList = []
+      unList.forEach(item => {
+        if(unNameList.length){
+          unNameList.forEach(items => {
+            if(items !== item){
+              unNameList.push(item)
+            }else{
+              return
+            }
+          })
+        }else{
+          unNameList.push(item)
+        }
+      })
+      uidList.forEach(item => {
+        if(unIdList.length){
+          unIdList.forEach(items => {
+            if(items !== item){
+              unIdList.push(item)
+            }else{
+              return
+            }
+          })
+        }else{
+          unIdList.push(item)
+        }
+      })
+      if(this.roleType === '1'){
         this.$set(this.qbfsForm, 'drafter', idList)
         this.$set(this.qbfsForm, 'drafterName', nameList)
-        this.$set(this.qbfsForm, 'unit', unitList)
+        this.$set(this.qbfsForm, 'unit', unIdList.join(','))
-        this.$set(this.qbfsForm, 'unitName', unitNameList)
+        this.$set(this.qbfsForm, 'unitName', unNameList.join(','))
-      }else if(this.type === '2'){
+      }else if(this.roleType === '2'){
         this.$set(this.qbfsForm, 'resPerson', idList)
         this.$set(this.qbfsForm, 'resPersonName', nameList)
       }
+      // === '0' false null undefined都属于false类变量 如果里面有值可以直接判断
       if(this.qbfsForm.drafterName){
         this.$refs.qbfsForm.validateField('drafterName');
       }

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

@@ -427,18 +427,19 @@ export default {
       this.$http.post('esRevisePlan/es-revise-plan/queryAllPlans',{
         reviseStatus: this.standardSearch.reviseStatus || '',
         esName: this.standardSearch.standName,
+        planStatus: '0',
         page: this.page,
         pageSize: this.pageSize,
       }, {
         _this: this,
       }, res => {
-        this.standinfoList = []
+        this.standinfoList = res.data.list
         //展示的数据只能是未开始的
-        res.data.list.forEach(item => {
+        // res.data.list.forEach(item => {
-          if(item.planStatus === '0'){
+        //   if(item.planStatus === '0'){
-            this.standinfoList.push(item)
+        //     this.standinfoList.push(item)
-          }
+        //   }
-        })
+        // })
         this.total = this.standinfoList.length
       })
 

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

@@ -209,6 +209,14 @@
               clearable
             ></el-input>
           </el-form-item>
+          <el-form-item  v-if="type === '4'" label="更名后企标名称" prop="renameEs" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.renameEs"
+              placeholder="请输入更名后企标名称"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
               disabled

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

@@ -209,6 +209,14 @@
               clearable
             ></el-input>
           </el-form-item>
+          <el-form-item  v-if="type === '4'" label="更名后企标名称" prop="renameEs" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.renameEs"
+              placeholder="请输入更名后企标名称"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
               disabled

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

@@ -209,6 +209,14 @@
               clearable
             ></el-input>
           </el-form-item>
+          <el-form-item  v-if="type === '4'" label="更名后企标名称" prop="renameEs" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.renameEs"
+              placeholder="请输入更名后企标名称"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
               disabled

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

@@ -209,6 +209,14 @@
               clearable
             ></el-input>
           </el-form-item>
+          <el-form-item  v-if="type === '4'" label="更名后企标名称" prop="renameEs" class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.renameEs"
+              placeholder="请输入更名后企标名称"
+              clearable
+            ></el-input>
+          </el-form-item>
           <el-form-item  v-if="type === '4'" label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
             <el-input
               disabled

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

@@ -549,9 +549,15 @@ export default {
               this.$message.warning('请勿上传为空的文件')
             }
           }else{
-            this.$confirm(res.data, "提示", {
+            const arr = res.data.split('；')
+            let newDatas = [],h = this.$createElement;
+            for (const i in arr) {
+              newDatas.push(h('p', null, arr[i]))
+            }
+            this.$confirm(h('div', null, newDatas), "提示", {
               confirmButtonText: "确认",
               confirmButtonClass: "common-button-primary",
+              dangerouslyUseHTMLString: true,
               cancelButtonText: "取消",
               type: "warning"
             }).then(() => {

src/pages/processCenter/pages/phone/qbfs/common/formListStep5.vue

@@ -208,9 +208,9 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
-        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+        <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
           <el-select :popper-append-to-body="false"
-          v-model="form.CBCD" placeholder="" :disabled="disabledState">
+          v-model="form.CYCD" placeholder="" :disabled="disabledState">
             <el-option
                     v-for="item in cbcdOptions"
                     :key="item.value"

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

@@ -240,9 +240,9 @@
                   :disabled="true"
           ></el-input>
         </el-form-item>
-        <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+        <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
           <el-select :popper-append-to-body="false"
-          v-model="form.CBCD" placeholder="" :disabled="disabledState">
+          v-model="form.CYCD" placeholder="" :disabled="disabledState">
             <el-option
                     v-for="item in cbcdOptions"
                     :key="item.value"

src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue

@@ -276,8 +276,8 @@
                     :disabled="true"
             ></el-input>
           </el-form-item>
-          <el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
+          <el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled">
-            <el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState">
+            <el-select :popper-append-to-body="false" v-model="form.CYCD" placeholder="" :disabled="disabledState">
               <el-option
                       v-for="item in cbcdOptions"
                       :key="item.value"

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

@@ -155,7 +155,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'9c8cc1b74b1caa16f34a47895b489833'">
+          <el-card shadow="hover" v-btn-permission="''">
             <div class="card-box" @click="handleCreateProcess('laws1')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -220,7 +220,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'5af5073695c2e1d12ca3d5a6afae67b5'">
+          <el-card shadow="hover" v-btn-permission="''">
             <div class="card-box" @click="handleCreateProcess('23')">
               <div class="card-top">
                 <div class="card-top-left">
@@ -235,7 +235,7 @@
           </el-card>
         </div>
         <div class="process-name">
-          <el-card shadow="hover" v-btn-permission="'5104360fd3822e73b45e65d2337cf143'">
+          <el-card shadow="hover" v-btn-permission="''">
             <div class="card-box" @click="handleCreateProcess('24')">
               <div class="card-top">
                 <div class="card-top-left">

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

@@ -439,22 +439,20 @@ export default {
               this.$router.push({
                 name: 'bussLibrary12',
                 query: {
-                  taskIds: row.taskIds,
+                  type: 'buss1',
-                  prcId: row.prcId,
+                  processName: mes.taskInfo,
-                  prcNum: row.prcNum,
+                  bpnId: id,
-                  prcName: row.prcName,
+                  verifySarStandard: true,
-                  prcType: row.prcType
                 }
               })
             }else if (mes.taskInfo === '发布'){
               this.$router.push({
                 name: 'bussLibrary13',
                 query: {
-                  taskIds: row.taskIds,
+                  type: 'buss1',
-                  prcId: row.prcId,
+                  processName: mes.taskInfo,
-                  prcNum: row.prcNum,
+                  bpnId: id,
-                  prcName: row.prcName,
+                  verifySarStandard: true,
-                  prcType: row.prcType
                 }
               })
             }
@@ -569,7 +567,7 @@ export default {
               if(mes !== null && mes.taskInfo !== null) {
                 if (mes.taskInfo === '起草'){
                       this.$router.push({
-                          name: 'bussLibraryProduct1',
+                          name: 'qbfsStep1',
                           query: {
                               type: 'buss3',
                               processName: mes.taskInfo,

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -341,7 +341,7 @@
               </template>
             </el-table-column>
             <el-table-column fixed="right"
-                             v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
+                             v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50') >0"
                              label="收藏" align="center" width="50px"
             >
               <template slot-scope="scope">
@@ -371,13 +371,11 @@
                   <div @click.stop style="display: inline-block">
                     <!--                                            <i class="iconfont">&#xe61e;</i>-->
                     <el-button title="收藏" class="collection-btn" icon="el-icon-star-off"
-                               v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
                                v-if="scope.row.collectBtn"
                                @click="handleCommand([scope.row, '收藏'])"
                     >
                     </el-button>
                     <el-button title="取消收藏" class="collection-btn" icon="el-icon-star-on"
-                               v-btn-permission="'cac1eb379eb8e3b987cbb2e4599adb50'"
                                v-else
                                @click="handleCommand([scope.row, '取消收藏'])"
                     >
@@ -3721,6 +3719,7 @@ export default {
     },
     // 搜索
     getDomesticStandardTableBtn(item) {
+      sessionStorage.setItem('tableFlag', JSON.stringify(item))
       this.tableFlag = item
       item.page = 1
       this.getDomesticStandardTable(item)
@@ -4495,7 +4494,8 @@ export default {
     // 分页每页显示数改变后方法
     pageSizeChange(pageSize) {
       this.sarStandardsSearch.pageSize = this.$store.getters.userInfo.configContent
-      this.getDomesticStandardTable(this.tableFlag)
+      let tabFlag  = JSON.parse(sessionStorage.getItem('tableFlag'))
+      this.getDomesticStandardTable(tabFlag)
       this.selectConfiguraStand()
       // 此处需要调用接口，修改个人配置
     },

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

@@ -355,6 +355,13 @@
             label="代替企标编号"
             min-width="300"
           >
+            <template slot-scope="scope">
+              <span v-if="scope.row.standStatusShow === '作废'" style="color: #F56C6C" >{{scope.row.dtqbbhbuss}}</span>
+              <span v-if="scope.row.standStatusShow === '参考' " style="color: #E6A23C" class="table-jump">{{scope.row.dtqbbhbuss}}</span>
+              <span v-if="scope.row.standStatusShow !== '作废' && scope.row.standStatusShow !== '参考'" style="color: #333333" class="table-jump">{{
+                scope.row.dtqbbhbuss
+                }}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop="issueTime"
@@ -647,7 +654,7 @@
                         <el-input
                           v-model="sarBussionessStandEO.CYCVPPSBMBUSS"
                           placeholder="选择VPPS编码"
-                          @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.KCVPPSBMBUSS,true)"></el-input>
+                          @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', sarBussionessStandEO.CYCVPPSBMBUSS,true)"></el-input>
                       </el-form-item>
                     </el-tooltip>
                   </template>
@@ -690,17 +697,38 @@
                       label-width="150px"
                       class="add-form-item"
                     >
-                      <template slot="label">模块结构单元变型号</template>
+                      <template slot="label">模块结构单元变型号(卡车)</template>
                       <el-input
-                        v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号"
+                        v-model="sarBussionessStandEO.DYBXHBUSS" placeholder="选择模块结构单元变型号(卡车)"
-                        @click.native="choiceZRR4('dybxhbuss', '模块结构单元', sarBussionessStandEO.dybxh)">
+                        @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', sarBussionessStandEO.dybxh)">
                       </el-input>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'DYMCBUSS'">
-                    <el-form-item label="模块结构单元名称" label-width="150px" prop="DYMCBUSS" class="add-form-item">
+                    <el-form-item label="模块结构单元名称(卡车)" label-width="150px" prop="DYMCBUSS" class="add-form-item">
                       <el-input
-                        v-model="sarBussionessStandEO.DYMCBUSS" disabled
+                              v-model="sarBussionessStandEO.DYMCBUSS" disabled
+                              clearable
+                      ></el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'CYCDYBXHBUSS'">
+                    <el-form-item
+                            prop="CYCDYBXHBUSS"
+                            label-width="150px"
+                            class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号(乘用车)</template>
+                      <el-input
+                              v-model="sarBussionessStandEO.CYCDYBXHBUSS" placeholder="选择模块结构单元变型号(乘用车)"
+                              @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', sarBussionessStandEO.dybxh)">
+                      </el-input>
+                    </el-form-item>
+                  </template>
+                  <template v-else-if="field.attrField === 'CYCDYMCBUSS'">
+                    <el-form-item label="模块结构单元名称(乘用车)" label-width="150px" prop="CYCDYMCBUSS" class="add-form-item">
+                      <el-input
+                        v-model="sarBussionessStandEO.CYCDYMCBUSS" disabled
                         clearable
                       ></el-input>
                     </el-form-item>
@@ -1055,7 +1083,7 @@
       </el-dialog>
     </div>
     <el-drawer
-      title="高级搜索"
+      title="高级检索"
       size="700px"
       :wrapperClosable="false"
       :visible.sync="isAdvancedSearch">
@@ -1583,6 +1611,19 @@
       :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
       :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"
       @popoverHideCancel="popoverHideModelCancel()"></tree-select-module>
+    <tree-select-module
+            width="500"
+            :lazy=true
+            :multiple=true
+            :check-strictly=true
+            :modalShowFlag="modalShowFlag5"
+            :drawerTitle="drawerTitle"
+            :url="url"
+            :type="modelType"
+            :urlChild="urlChild"
+            :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys4"
+            :nodeKey="nodeKeyModel" @popoverHide="popoverCarHideModel"
+            @popoverHideCancel="popoverCarHideModelCancel()"></tree-select-module>
   </div>
 </template>
 
@@ -2240,6 +2281,7 @@ export default {
       defaultCheckedKeys1: [],
       defaultCheckedKeys2: [],
       defaultCheckedKeys3: [],
+      defaultCheckedKeys4: [],
       defaultCodeProps: {
         children: 'children',
         label: 'code'
@@ -2367,9 +2409,11 @@ export default {
       modalShowFlag2: false, // drawer开关
       modalShowFlag3: false, // drawer开关
       modalShowFlag4: false, // drawer开关
+      modalShowFlag5: false, // drawer开关
       type: '',
       url: '',
       urlChild: '',
+      modelType:'',
     }
   },
   methods: {
@@ -2588,15 +2632,13 @@ export default {
           if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
             this.sarBussionessSearch.CYCVPPSBMBUSS =  checkedData.map(item => item.code).join(",")
             this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-          } else {
             this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.map(item => item.code).join(",")
             this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.map(item => item.chineseName).join(",")
-          }
+            }
         } else {
           if (this.drawerTitle2 === '关联模块--乘用车VPPS编码') {
             this.sarBussionessSearch.CYCVPPSBMBUSS = checkedData.code
             this.sarBussionessSearch.CYCVPPSCNBUSS = checkedData.chineseName
-          } else {
             this.sarBussionessStandEO.CYCVPPSBMBUSS = checkedData.code
             this.sarBussionessStandEO.CYCVPPSCNBUSS = checkedData.chineseName
           }
@@ -2638,6 +2680,22 @@ export default {
     popoverHideModelCancel() {
       this.modalShowFlag4 = false
     },
+    popoverCarHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
+      if (checkedData && checkedData.length != 0) {
+        if (checkedData.length > 0) {
+          this.sarBussionessStandEO.CYCDYBXHBUSS = checkedData.map(item => item.model).join(",")
+          this.sarBussionessStandEO.CYCDYMCBUSS = checkedData.map(item => item.name).join(",")
+        } else {
+          this.sarBussionessStandEO.CYCDYBXHBUSS = checkedData.model
+          this.sarBussionessStandEO.CYCDYMCBUSS = checkedData.name
+        }
+        this.modalShowFlag5 = false
+      }
+      this.$forceUpdate()
+    },
+    popoverCarHideModelCancel() {
+      this.modalShowFlag5 = false
+    },
     popoverHideCancel() {
       this.modalShowFlag1 = false
     },
@@ -2685,9 +2743,19 @@ export default {
       this.modalShowFlag4 = true
       this.url = ''
       this.urlChild = ''
+      this.modelType = type
       this.url = "sarModelTree/list"
       this.urlChild = "sarModelTree/childByList"
     },
+    choiceZRR5(type, title, id) {
+      this.drawerTitle = title
+      this.modalShowFlag5 = true
+      this.url = ''
+      this.urlChild = ''
+      this.modelType = type
+      this.url = "sarModelTree/listByType"
+      this.urlChild = "sarModelTree/childByList"
+    },
     choiceZRR1(type, title, id) {
       this.drawerTitle1 = title
       this.modalShowFlag1 = true
@@ -3563,10 +3631,12 @@ export default {
         idList += item.id
         nameList += item.name
       })
-      this.sarBussionessSearch.QCDW = data[0].institutionName
+      if(data && data.length > 0){
-      this.sarBussionessSearch.QCDWId = data[0].institutionId
+          this.sarBussionessSearch.QCDW = data[0].institutionName
-      this.$set(this.sarBussionessStandEO, 'QCDWId', data[0].institutionId)
+          this.sarBussionessSearch.QCDWId = data[0].institutionId
-      this.$set(this.sarBussionessStandEO, 'QCDW', data[0].institutionName)
+          this.$set(this.sarBussionessStandEO, 'QCDWId', data[0].institutionId)
+          this.$set(this.sarBussionessStandEO, 'QCDW', data[0].institutionName)
+      }
       if (this.drawerTitle === '查询起草人') {
         this.sarBussionessSearch['QCRBUSS'] = nameList
       }
@@ -4206,6 +4276,7 @@ export default {
       this.tableFlag = item
       // item.advanceSearchVOStr = JSON.stringify(advancedSearch) || ''
       this.getBussionStandTable(item, '', type)
+      this.isAdvancedSearch = false
     },
     // 清空搜索框
     clearAllSearch(flag) {
@@ -4378,6 +4449,7 @@ export default {
       }
       this.SarExportSearchEo = formData
       formData.isKU = '1'
+      this.isAdvancedSearch = false
       this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', formData, {
         _this: this, loading: 'loading'
       }, res => {
@@ -4398,7 +4470,6 @@ export default {
         if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) {
           this.pageChange(1)
         }
-        this.isAdvancedSearch = false
       }, e => {
       })
       // this.$refs.selection.selectAll(false)

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -333,7 +333,7 @@
                 <span v-else style="color: #333333">{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>
-            <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e')>0" label="收藏" align="center" width="50">
+            <el-table-column fixed="right" v-if="isPermission('f9745194958bc9ed3ee5127459795dbc')>0" label="收藏" align="center" width="50">
               <template slot-scope="scope">
 <!--                <div v-if="isPermission('f9745194958bc9ed3ee5127459795dbc,e8d690904ee1895dd0d17d9c794fbcd7,b299fa5edb3f3f35badb2adb6bda9f2e') == 1"-->
 <!--                     @command="handleCommand"-->

src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue

@@ -89,8 +89,11 @@
       <el-table
               :data="standinfoList"
               height="100%"
+              tooltip-effect="dark"
+              header-cell-class-name="zTable_style"
               border
-              style="width: 100%"
+              style="width: 100%; flex: auto;"
+              class="drag-table"
               :default-sort = "{prop: 'partCode', order: 'ascending'}"
               :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
@@ -608,6 +611,9 @@
   @import '~@/assets/styles/style';
 
   .consultationDetails {
+    /deep/.zTable_style {
+      border-bottom: 1px solid #d1d1d1;
+    }
     height: 100%;
     display: flex;
     flex-direction: column;