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

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

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

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

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

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

@@ -1296,7 +1296,7 @@
     import ProcessFooter from '../../components/ProcessFooter'
     import ProcessTitle from '../../components/ProcessTitle'
     import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
-    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
+    import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,processBack} from "api/process";
     import TreeSelect from '@/components/treeSelect/treeSelect.vue';
     import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
     import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1634,6 +1634,8 @@
                 txlbOptions: [], // 体系类别
                 data: [], // 标准列表数据
                 ListForm: {}, // 新增数据
+
+            bpnId: ''
             }
         },
         watch:{
@@ -2758,6 +2760,7 @@
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData && checkedData.length != 0) {
+                  console.log(checkedData)
                     if(checkedData.length > 0){
                         this.form.dybxh = checkedData.map(item => item.model).join(",")
                         this.form.dymc = checkedData.map(item => item.name).join(",")
@@ -2819,7 +2822,7 @@
                 saveTaskFirst(_formData).then(res => {
                     this.saveLoading = false
                     this.$message.success('保存成功')
-                    // this.bpnId = res.result
+                    this.bpnId = res.result
                 }).catch(e => {
                     this.saveLoading = false
                 })
@@ -2878,7 +2881,17 @@
                                 json.applyUpdUserId = this.form.applyUpdUserId
                                 json.prcCreateUser = this.form.prcCreateUser
                                 json.prcCreateUserName = this.form.prcCreateUserName
-                                this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
+                                this.$http.post('lawss/activiti/startProcessRollBack', {
+                                  createUser: this.$store.getters.userInfo.userId,
+                                  createUserName: this.$store.getters.userInfo.uName,
+                                  json: JSON.stringify({
+                                    taskInfo: '申请人发起',
+                                    form: this.form,
+                                    roleForm: this.roleForm,
+                                    commentText: this.commentText
+                                  }),
+                                  type: '1',
+                                }, {
                                     _this: this
                                 }, res => {
                                     if (res.ok) {
@@ -2892,6 +2905,14 @@
                                             if (res.success) {
                                                 this.$message.success(res.message)
                                                 this.isSubmit = false
+                                              if (this.bpnId !== '') {
+                                                let taskId = {
+                                                  id: this.bpnId
+                                                }
+                                                taskDel(taskId).then(res => {
+                                                  return res
+                                                })
+                                              }
                                                 // 流程提交之后，应该流转至待办任务页面
                                                 this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
                                             }
@@ -2933,12 +2954,12 @@
             },
         },
         mounted () {
+          this.bpnId = this.$route.query.bpnId
           this.getTaskId()
             this.getTree()
             this.$http.get('sys/dictype/getDicTypeListCode', '', {
                 _this: this
             }, res => {
-              console.log(res.data.ENERGYTYPES)
                 this.countryOptions=res.data.COUNTRY//国家地区
                 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
                 this.standNatureOptions = res.data.SARPROPERTY // 标准性质

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

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

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

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

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

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

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

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

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

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

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

@@ -592,7 +592,23 @@
             },
             handleSubmit() {
                 if (this.data.length < 1) {
-                    this.$message.warning('请输入征求意见')
+                    this.isSubmit = true
+                    var json = this.json
+                    json.commentText = this.commentText
+                    json.info = []
+                    json.form = this.form
+                    json.department = this.$store.getters.userInfo.orgName
+                    this.$http.post('lawss/activiti/completeTask', {
+                        json: JSON.stringify(json),
+                        taskId: this.taskIds,
+                        userId: this.$store.getters.userInfo.userId
+                    }, {}, res => {
+                        if (res.success) {
+                            this.$message.success('提交成功')
+                            this.$router.push('/processCenter')
+                        }
+                        this.isSubmit = false
+                    })
                 } else {
                     var a = 0
                     var b = 0

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

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

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

@@ -408,6 +408,7 @@ export default {
       }
     },
     upload(row, title) {
+      if (row.length > 0) {
         var params = {
           columnName: {
             chapterNumber: "章条编号",
@@ -436,6 +437,9 @@ export default {
         });
         this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
         });
+      } else {
+        this.$message.warning('无上报数据')
+      }
     },
     handleTabs(name) {
       this.active = name;
@@ -443,9 +447,6 @@ export default {
     handleSave() {
     },
     handleSubmit() {
-      if (this.data.length < 1) {
-        this.$message.warning("请输入征求意见搞");
-      } else {
         this.isSubmit = true;
         var json = this.json;
         json.hqFlag = '0';
@@ -461,7 +462,6 @@ export default {
           }
           this.isSubmit = false;
         });
-      }
     },
     handleSubmitNo() {
       if (this.commentText) {

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

@@ -398,6 +398,7 @@ export default {
       })
     },
     upload(row, title) {
+      if (row.length > 0) {
         var params = {
           columnName: {
             chapterNumber: "章条编号",
@@ -410,22 +411,25 @@ export default {
             responUserName: "提出人",
           },
           dataList: []
-      }
+        };
         if (title === '上报意见.xls') {
           params.columnName.stateText = "处理意见"
         }
-      params.dataList = JSON.parse(JSON.stringify(row))
+        params.dataList = JSON.parse(JSON.stringify(row));
         params.dataList.forEach(item => {
-        if (item.state === '1') {
+          if (item.state === "1") {
-          item.stateText = '上报'
+            item.stateText = "上报";
-        } else if (item.state === '2') {
+          } else if (item.state === "2") {
-          item.stateText = '处理后上报'
+            item.stateText = "处理后上报";
           } else {
-          item.stateText = '不上报'
+            item.stateText = "不上报";
+          }
+        });
+        this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+        });
+      } else {
+        this.$message.warning('无上报数据')
       }
-      })
-      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
-      })
     },
     stateText(row) {
       if (row === '1') {
@@ -440,9 +444,6 @@ export default {
     handleSave() {
     },
     handleSubmit() {
-      if (this.data.length < 1) {
-        this.$message.warning('请输入征求意见搞')
-      } else {
         this.isSubmit = true
         var json = this.json
         json.bdFlag = '0'
@@ -458,7 +459,6 @@ export default {
           }
           this.isSubmit = false
         })
-      }
     },
     handleSubmitNo() {
       if (this.commentText) {

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

@@ -398,6 +398,7 @@ export default {
       })
     },
     upload(row, title) {
+      if (row.length > 0) {
         var params = {
           columnName: {
             chapterNumber: "章条编号",
@@ -410,22 +411,25 @@ export default {
             responUserName: "提出人",
           },
           dataList: []
-      }
+        };
         if (title === '上报意见.xls') {
           params.columnName.stateText = "处理意见"
         }
-      params.dataList = JSON.parse(JSON.stringify(row))
+        params.dataList = JSON.parse(JSON.stringify(row));
         params.dataList.forEach(item => {
-        if (item.state === '1') {
+          if (item.state === "1") {
-          item.stateText = '上报'
+            item.stateText = "上报";
-        } else if (item.state === '2') {
+          } else if (item.state === "2") {
-          item.stateText = '处理后上报'
+            item.stateText = "处理后上报";
           } else {
-          item.stateText = '不上报'
+            item.stateText = "不上报";
+          }
+        });
+        this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
+        });
+      } else {
+        this.$message.warning('无上报数据')
       }
-      })
-      this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
-      })
     },
     stateText(row) {
       if (row === '1') {
@@ -440,9 +444,6 @@ export default {
     handleSave() {
     },
     handleSubmit() {
-      if (this.data.length < 1) {
-        this.$message.warning('请输入征求意见搞')
-      } else {
         this.isSubmit = true
         var json = this.json
         json.directorFlag = '0'
@@ -458,7 +459,6 @@ export default {
           }
           this.isSubmit = false
         })
-      }
     },
     handleSubmitNo() {
       if (this.commentText) {

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

@@ -398,6 +398,7 @@ export default {
       });
     },
     upload(row, title) {
+      if (row.length > 0) {
         var params = {
           columnName: {
             chapterNumber: "章条编号",
@@ -426,6 +427,9 @@ export default {
         });
         this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
         });
+      } else {
+        this.$message.warning('无上报数据')
+      }
     },
     stateText(row) {
       if (row === "1") {
@@ -440,9 +444,6 @@ export default {
     handleSave() {
     },
     handleSubmit() {
-      if (this.data.length < 1) {
-        this.$message.warning("请输入征求意见搞");
-      } else {
         this.isSubmit = true;
         var json = this.json;
         json.presidentFlag = '0';
@@ -458,7 +459,6 @@ export default {
           }
           this.isSubmit = false;
         });
-      }
     },
     handleSubmitNo() {
       if (this.commentText) {

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

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

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

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

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

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

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

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

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

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

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

@@ -738,7 +738,6 @@ export default {
               this.$set(item,'countermeasures', '')
               this.$set(item,'completionTime', '')
             })
-
           } else {
             this.dataList = item.dataList;
             this.dataList.forEach(item => {
@@ -811,6 +810,16 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      let submitFlag = 0;
+      this.dataList.forEach(item => {
+       if(item.complianceReasons || item.noCompliance){
+         submitFlag = 1
+       }
+        return
+      })
+      if(submitFlag === 0 ){
+        this.$message.warning('请至少对一条信息进行评估')
+      }else{
         this.handlePrice()
         if(this.comFlag > 0) {
           this.$message.warning('请填写完整的不符合项信息')
@@ -822,7 +831,8 @@ export default {
           this.listForm.signFlag = "";
           this.listForm.dataList = this.dataList;
           const json = JSON.stringify(this.listForm);
-        this.isSubmit = true;
+          this.isSubmit = true
+          return
           this.$http.post("lawss/activiti/completeTask", {
             taskIds: this.taskIds,
             userId: this.userId,
@@ -839,6 +849,7 @@ export default {
 
           });
         }
+      }
     },
     //批量编辑
     batchEdit() {

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

@@ -794,6 +794,16 @@ export default {
     },
     //提交事件
     handleSubmit() {
+      let submitFlag = 0;
+      this.dataList.forEach(item => {
+        if(item.complianceReasons || item.noCompliance){
+          submitFlag = 1
+        }
+        return
+      })
+      if(submitFlag === 0 ){
+        this.$message.warning('请至少对一条信息进行评估')
+      }else{
         this.handlePrice()
         if(this.comFlag > 0) {
           this.$message.warning('请填写完整的不符合项信息')
@@ -822,6 +832,7 @@ export default {
           }, e => {
           });
         }
+      }
     },
     //标准表格选择框改变
     selectStandChange(data) {

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

@@ -350,6 +350,7 @@
                 }
             },
             upload(row, title) {
+                if (row.length > 0) {
                     var params = {
                         columnName: {
                             chapterNumber: "章条编号",
@@ -378,6 +379,9 @@
                     });
                     this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
                     });
+                } else {
+                    this.$message.warning('无上报数据')
+                }
             },
             handleTabs(name) {
                 this.active = name;
@@ -385,9 +389,6 @@
             handleSave() {
             },
             handleSubmit() {
-                if (this.data.length < 1) {
-                    this.$message.warning("请输入征求意见搞");
-                } else {
                     this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '0';
@@ -403,7 +404,6 @@
                         }
                         this.isSubmit = false;
                     });
-                }
             },
             handleSubmitNo() {
                 if (this.commentText) {

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

@@ -350,6 +350,7 @@
                 }
             },
             upload(row, title) {
+                if (row.length > 0) {
                     var params = {
                         columnName: {
                             chapterNumber: "章条编号",
@@ -378,6 +379,9 @@
                     });
                     this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
                     });
+                } else {
+                    this.$message.warning('无上报数据')
+                }
             },
             handleTabs(name) {
                 this.active = name;
@@ -385,9 +389,6 @@
             handleSave() {
             },
             handleSubmit() {
-                if (this.data.length < 1) {
-                    this.$message.warning("请输入征求意见搞");
-                } else {
                     this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '0';
@@ -403,7 +404,6 @@
                         }
                         this.isSubmit = false;
                     });
-                }
             },
             handleSubmitNo() {
                 if (this.commentText) {

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

@@ -350,6 +350,7 @@
                 }
             },
             upload(row, title) {
+                if (row.length > 0) {
                     var params = {
                         columnName: {
                             chapterNumber: "章条编号",
@@ -378,6 +379,9 @@
                     });
                     this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
                     });
+                } else {
+                    this.$message.warning('无上报数据')
+                }
             },
             handleTabs(name) {
                 this.active = name;
@@ -385,9 +389,6 @@
             handleSave() {
             },
             handleSubmit() {
-                if (this.data.length < 1) {
-                    this.$message.warning("请输入征求意见搞");
-                } else {
                     this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '0';
@@ -403,7 +404,6 @@
                         }
                         this.isSubmit = false;
                     });
-                }
             },
             handleSubmitNo() {
                 if (this.commentText) {

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

@@ -365,6 +365,7 @@
                 }
             },
             upload(row, title) {
+                if (row.length > 0) {
                     var params = {
                         columnName: {
                             chapterNumber: "章条编号",
@@ -393,6 +394,9 @@
                     });
                     this.$http.downloadFile("/api/lawss/activiti/export_excel", params, title, res => {
                     });
+                } else {
+                    this.$message.warning('无上报数据')
+                }
             },
             handleTabs(name) {
                 this.active = name;
@@ -400,9 +404,6 @@
             handleSave() {
             },
             handleSubmit() {
-                if (this.data.length < 1) {
-                    this.$message.warning("请输入征求意见搞");
-                } else {
                     this.isSubmit = true;
                     var json = this.json;
                     json.hqFlag = '0';
@@ -418,7 +419,6 @@
                         }
                         this.isSubmit = false;
                     });
-                }
             },
             handleSubmitNo() {
                 if (this.commentText) {

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

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

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

@@ -1173,9 +1173,9 @@
                               <el-form-item label="体系类别" class="add-form-item form-item-disabled">
                                   <el-input v-model="sarBussionessSearch.TXLBBUSS" placeholder="选择体系类别" clearable @click.native="choiceZRR1('TXLBBUSS', '体系类别', sarBussionessStandEO.TXLBBUSS)"></el-input>
                               </el-form-item>
-                              <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
+<!--                              <el-form-item label="模块VPPS编码" title="模块VPPS编码" class="add-form-item form-item-disabled">
                                   <el-input v-model="sarBussionessSearch.VPPSBMBUSS" placeholder="选择VPPS编码" @click.native="choiceZRR2('VPPSBMBUSS', 'VPPS编码', sarBussionessStandEO.VPPSBMBUSS,false)"></el-input>
-                              </el-form-item>
+                              </el-form-item>-->
                           </el-col>
                           <el-col :span="12">
                             <el-form-item
@@ -1238,9 +1238,9 @@
 <!--                                      ></el-option>-->
 <!--                                  </el-select>-->
 <!--                              </el-form-item>-->
-                              <el-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled">
+<!--                              <el-form-item label="模块中文名称" title="模块中文名称" class="add-form-item form-item-disabled">
                                   <el-input v-model="sarBussionessSearch.VPPSCNBUSS" placeholder="请输入模块中文名称" clearable></el-input>
-                              </el-form-item>
+                              </el-form-item>-->
                           </el-col>
                       </el-row>
                   </div>
@@ -2499,6 +2499,7 @@ export default {
                           type: 'success',
                           message: "删除成功"
                       })
+                      this.getBussionStandTable()
                       this.selectMenuList()
                   }else {
                       this.$message({
@@ -3812,6 +3813,7 @@ export default {
         this.sarBussionessSearch.advanceSearchVOStr = ''
         this.sarBussionessSearch.standEnName=''
         this.isAdvancedSearch = false
+        this.getBussionStandTable()
       } else if (flag === 2) {
         // 标准条目搜索
         // 标准条目搜索
@@ -4565,6 +4567,7 @@ export default {
         this.standNatureOptions = res.data.SARPROPERTY // 标准性质
         this.standStateOptions = res.data.TEXTSTATUSBUSS // 文本状态
         this.standSystemOptions = res.data.TXLBBUSS // 标准体系
+        console.log(this.standSystemOptions);
         this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
         this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
         this.applyAuthOptions.options = res.data.SYRZCLASS // 适用认证

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

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

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

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

src/pages/searchCenter/pages/advancedSearch.vue

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

src/router/index.js

@@ -2559,6 +2559,16 @@ const routes = [
           title: '政策征求意见流程'
         }
       },
+      {
+        path: '/phoneBzrkStep2',
+        name: 'phoneBzrkStep2',
+        component: () => import('@/pages/processCenter/pages/phone/bzrk/step2.vue'),
+        meta: {
+          isBoolean: true,
+          requireAuth: true,
+          title: '标准入库流程'
+        }
+      },
     ]
 
   },