Merge branch 'develop' into 'FOTON'

Develop

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

src/pages/config/pages/mechanismManage/index.vue

@@ -68,6 +68,12 @@
                 清空
               </el-button>
             </el-form-item>
+
+            <el-form-item>
+              <el-button size="mini" type="primary" @click="selectEdit">
+                批量配置岗位
+              </el-button>
+            </el-form-item>
           </el-form>
         </div>
         <el-table
@@ -78,8 +84,14 @@
           style="width: 100%; flex: auto;"
           class="drag-table"
           height="100%"
+          @selection-change="selectedData"
           :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}">
+          <el-table-column
+            type="selection"
+            width="55"
+            align="center"
+          />
           <el-table-column
             prop="account"
             label="账号"
@@ -177,7 +189,7 @@
     <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
     <el-drawer
       class="postPage"
-      title="配置岗位"
+      :title="drawerTitle"
       :visible.sync="modalPost"
       :wrapperClosable="false"
       size="800px"
@@ -269,7 +281,10 @@ export default {
       data: [], // table数据
       treeLoading: false,
       Loading: false,
-      id: ''
+      id: '',
+      // 批量配置岗位勾选暂存
+      manageData: [],
+      drawerTitle: '配置岗位'
     }
   },
   methods: {
@@ -285,16 +300,30 @@ export default {
       this.modalPost = false
     },
     PostSubmit() {
-      this.$http.postData('sarUser/user/position', {
+      if (this.drawerTitle === '配置岗位') {
-        positionIds: this.$refs.tree2.getCheckedKeys(),
+        this.$http.postData('sarUser/user/position', {
-        userId: this.userId
+          positionIds: this.$refs.tree2.getCheckedKeys(),
-      }, {}, res => {
+          userId: this.userId
-        if (res.ok) {
+        }, {}, res => {
-          this.$message.success('配置岗位成功')
+          if (res.ok) {
-          this.modalPost = false
+            this.$message.success('配置岗位成功')
-          this.getData()
+            this.modalPost = false
-        }
+            this.getData()
-      })
+          }
+        })
+      } else {
+        this.$http.postData('sarUser/user/positionBatch', {
+          positionIds: this.$refs.tree2.getCheckedKeys(),
+          userId: this.userId
+        }, {}, res => {
+          if (res.ok) {
+            this.$message.success('配置岗位成功')
+            this.modalPost = false
+            this.getData()
+          }
+        })
+      }
+
     },
     searchPostName() {
       this.page = 1;
@@ -407,7 +436,6 @@ export default {
         loading: 'treeLoading'
       }, res => {
         this.treeData = res.data
-        console.log(this.treeData);
         this.nodeKeyId = this.treeData[0].id
         this.$nextTick(function () {
           this.$refs.tree.setCurrentKey(this.nodeKeyId)
@@ -493,6 +521,20 @@ export default {
       this.pageSize = pageSize
       this.getTree2()
     },
+
+    /** 批量编辑岗位的勾选数据 */
+    selectedData(val) {
+      this.manageData = val
+    },
+
+    selectEdit() {
+      this.userId = []
+      this.manageData.forEach(item=>{
+        this.userId.push(item.userId)
+      })
+      this.drawerTitle = '批量配置岗位'
+      this.modalPost = true
+    },
   },
   computed: {},
   watch: {

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

@@ -14,7 +14,6 @@
         <el-form
           ref="bzzqyjForm"
           :model="form"
-          :rules="formRules"
           class="label-input-form"
           label-width="210px"
         >
@@ -265,18 +264,6 @@ export default {
       commentText: '',
       taskIds: this.$route.query.taskIds,
       pId: this.$route.query.prcId,
-      roleRow: {},
-      nodeList: [],
-      type: '',
-      defaultProps: {
-        children: 'children',
-        label: 'name'
-      },
-      treeData: [], // 人员数据
-      modalshowflag: false, // drawer开关
-      drawerTitle: '', //drawer标题
-      textarea: '', // 意见
-      ListModel: false, // 新增编辑抽屉开关
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
@@ -290,11 +277,6 @@ export default {
         modelList: [],
         modelNameList: '',
       },
-      formRules: {
-        responUserList: [
-          { required: true, message: '请选择责任人', trigger: 'change' },
-        ]
-      },
       json: {}
     }
   },
@@ -323,16 +305,6 @@ export default {
         this.$message.warning('文件不存在,下载失败')
       }
     },
-    updataFj (item) {
-      let id
-      let type = item.fileName.split('.')
-      if (type[1] === 'pdf') {
-        id = item.attId
-      } else {
-        id = item.oriAttId
-      }
-      window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
-    },
     getHistoryData () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,
@@ -384,27 +356,6 @@ export default {
     handleTabs(name) {
       this.active = name
     },
-    handleSubmitNo() {
-      if (this.commentText) {
-        this.isSubmit = true
-        var json = this.json
-        json.actionFlag = 1
-        json.commentText = this.commentText
-        this.$http.post('lawss/activiti/completeTask', {
-          json: JSON.stringify(json),
-          taskIds: this.taskIds,
-          userId: this.$store.getters.userInfo.userId
-        }, {}, res => {
-          if (res.success) {
-            this.$message.success('驳回成功')
-            this.$router.push('/processCenter')
-          }
-          this.isSubmit = false
-        })
-      } else {
-        this.$message.warning('请输入反馈意见')
-      }
-    },
     getData() {
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({

src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue

@@ -314,7 +314,7 @@ export default {
     },
     //清空
     clearSearch() {
-      this.sarSarAccessEOSearch.projectName = ''
+      this.sarSarAccessEOSearch.carType = ''
       this.sarSarAccessEOSearch.detailedListName = ''
       this.searchSarAccess()