Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop

src/pages/localTool/standAutoSplit/index.vue

@@ -852,7 +852,7 @@ export default {
           }
         })
       } else {
-        this.$http.get('lawss/sarStandardsInfo/getSarStandardsInfoPage', {
+        this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', {
           page: this.conditionForm.page,
           pageSize: this.conditionForm.pageSize,
           standNumber: this.conditionForm.numberName,

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

@@ -80,7 +80,6 @@
               class="common-button-default"
               size="small"
               type="primary"
-              v-btn-permission="'5905d0743c3504799aee83ac9697f8c5'"
               @click="dutyEngineerList">
               批量分发负责人
             </el-button>
@@ -88,7 +87,8 @@
         <el-table
           :data="dataList"
           border
-          @selection-change="handleSelectionChange"
+          ref="multipleTable"
+          @select="handleSelectionChange"
           height="49%"
           style="width: 100%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -101,12 +101,12 @@
           <el-table-column prop="planCloseTime" label="整改完成时间"/>
           <el-table-column prop="responsibleUnit" label="责任部门"/>
           <el-table-column prop="dutyEngineer" label="责任工程师"/>
-          <el-table-column label="选择分发责任人" prop="duty">
+          <el-table-column label="选择分发责任人" prop="dutyPeople">
               <template slot-scope="scope">
                 <span v-if="scope.row.show">
-                  <el-input size="mini"  placeholder="请输入内容" @blur="choiceDuty" v-model="scope.row.duty"></el-input>
+                  <el-input v-model="scope.row.dutyPeople"  size="mini" placeholder="请输入内容" @click.native="choiceDuty"></el-input>
                 </span>
-                <span v-else :disabled="true">{{scope.row.duty}}</span>
+                <span v-else>{{scope.row.dutyPeople}}</span>
             </template>
           </el-table-column>
         </el-table>
@@ -253,45 +253,7 @@ export default {
       active: '1', // 默认显示
       isSubmit: false,
       saveLoading: false,
-      dataList: [
-        {
-          standId: '1',
-          productName: '1',
-          itemsNum: '1',
-          itemsName: '1',
-          planCloseTime: '1',
-          responsibleUnit: '1',
-          dutyEngineer: '1',
-          duty: '',
-      },{
-          standId: '332',
-          productName: '333',
-          itemsNum: '33',
-          itemsName: '33',
-          planCloseTime: '33',
-          responsibleUnit: '33',
-          dutyEngineer: '33',
-          duty: ''
-        },{
-          standId: '312`',
-          productName: '31312',
-          itemsNum: '31`2',
-          itemsName: '312`1`',
-          planCloseTime: '321`3`2',
-          responsibleUnit: '312`123`',
-          dutyEngineer: '312123',
-          duty: '121'
-        },{
-          standId: '32123',
-          productName: '32132',
-          itemsNum: '312321',
-          itemsName: '3123',
-          planCloseTime: '3123',
-          responsibleUnit: '3123',
-          dutyEngineer: '3123',
-          duty: ''
-        },
-      ],
+      dataList: [],
       // 新增选择分发责任人数组
       multipleSelection: [],
       // 当前页数
@@ -333,8 +295,51 @@ export default {
     ProcessTitle
   },
   created() {
+    this.getData()
+    this.getTree()
   },
   methods: {
+    getData() {
+      this.dataList = [
+        {
+          standId: '1',
+          productName: '1',
+          itemsNum: '1',
+          itemsName: '1',
+          planCloseTime: '1',
+          responsibleUnit: '1',
+          dutyEngineer: '1',
+          dutyPeople: '',
+        },{
+          standId: '332',
+          productName: '333',
+          itemsNum: '33',
+          itemsName: '33',
+          planCloseTime: '33',
+          responsibleUnit: '33',
+          dutyEngineer: '33',
+          dutyPeople: ''
+        },{
+          standId: '312`',
+          productName: '31312',
+          itemsNum: '31`2',
+          itemsName: '312`1`',
+          planCloseTime: '321`3`2',
+          responsibleUnit: '312`123`',
+          dutyEngineer: '312123',
+          dutyPeople: '121'
+        },{
+          standId: '32123',
+          productName: '32132',
+          itemsNum: '312321',
+          itemsName: '3123',
+          planCloseTime: '3123',
+          responsibleUnit: '3123',
+          dutyEngineer: '3123',
+          dutyPeople: ''
+        },
+      ]
+    },
     getList() {
       this.myLoading.loadData = true
       this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
@@ -357,32 +362,23 @@ export default {
       if (this.multipleSelection.length === 0) {
         this.$message.warning("请选择至少一条数据进行分发责任人");
       } else {
-        this.multipleSelection.forEach((val, index)=> {
-          val.show = true
-          this.$set(val, index)
+        this.multipleSelection.map((i, index)=> {
+          i.show = true
+          this.$set(this.dataList, i, index)
         })
-        // this.modalshowflag = true
-        // this.$set(this.dataList.duty)
       }
     },
     // 选择勾选项的集合
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-      console.log(this.multipleSelection)
+    handleSelectionChange(value) {
+      this.multipleSelection = value
+      console.log(value)
     },
     // 选择分发责任人时
-    choiceDuty() {
-      for (let i = 0; i < this.multipleSelection.length; i++ ) {
-        if (this.multipleSelection[i].duty !== '') {
-          console.log(i)
-          for (let b = 0; b < this.multipleSelection.length; b++) {
-            this.multipleSelection[b].duty = this.multipleSelection[i].duty
-            this.multipleSelection.forEach(val=> {
-              val.show = false
-            })
-          }
-        }
-      }
+    choiceDuty(type, title, id) {
+      this.nodeList = []
+      this.nodeList.push(id)
+      this.drawerTitle = title
+      this.modalshowflag = true
     },
     selectPeople(row) {
       this.modalshowflag = true
@@ -421,6 +417,18 @@ export default {
     },
     // 流程节点负责人抽屉保存按钮
     saveUserInfo () {
+      // 选取负责人时的操作
+      for (let i = 0; i < this.multipleSelection.length; i++ ) {
+          this.multipleSelection[i].dutyPeople = this.roleRow.name
+          for (let b = 0; b < this.multipleSelection.length; b++) {
+            this.multipleSelection[b].dutyPeople = this.multipleSelection[i].dutyPeople
+            this.dataList.forEach(val=> {
+              val.show = false
+            })
+          }
+        this.multipleSelection = []
+        this.$refs.multipleTable.clearSelection();
+      }
       if (this.type === 'dockUser') {
         this.roleForm.dockUser = this.roleRow.id
         this.roleForm.dockUserName = this.roleRow.name