Merge branch 'master-500-dev-xwx' into 'master-500-dev'

【禅道#1274】乙方运维人员录入功能优化



See merge request !582

@@ -2,8 +2,9 @@
     <div>
         <!--  人员信息总汇-->
         <el-divider content-position="left">人员信息汇总</el-divider>
+        <el-button  @click="deleteUser()" style="float:right;margin-right: 6px;margin-bottom: 6px">删除</el-button>
         <el-button  @click="add" style="float:right;margin-right: 6px;margin-bottom: 6px">录入</el-button>
-        <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage" :showIndex="true"
+        <cm-table-page :columns="columns" :dataList="dataList" @loaddata="getPage"@selectionChange="selectionChange" :showIndex="true"
                        :showBorder="true" :currentPage="currentPage" :total="total" :loading="false" :showSelection="true"
                        :showPage="true" :showTools="true" :height="height" :pageSize="pageSize">
             <template #tools="{scope}">
@@ -23,7 +24,7 @@
                           height="500"
                           :docTypeName="docTypeName"
                           :pageSize="pageSize"
-                          :treeNode="treeNode" :parentNode="parentNode" :projectId="projectId" :isAdd="isAdd"></component>
+                          :treeNode="treeNode" :parentNode="parentNode" :projectId="projectId" :isAdd="isAdd" @showPopout="showPopout"></component>
            </div>
         </template>
     </cm-dialog>

@@ -171,6 +171,10 @@ export default {
             dialogFlg.value = flg;
         }
 
+        let showPopout=(val)=>{
+            dialogFlg.value = val;
+            getPage();
+        }
         let dataList = Vue.ref([]);
         let currentPage = Vue.ref(1);
         let total = Vue.ref(0);
@@ -181,10 +185,20 @@ export default {
             isAdd.value = true;
             showDialog(true);
         }
-
+        let id = Vue.ref();
+        let selectionChange = (val) =>{
+            id.value=val.map(item => item.id).join(',')
+        }
         let deleteUser = (row) =>{
+            if (row != null && row != undefined){
+                id.value = row.id
+            }
+            if (id.value == null || id.value ==undefined){
+                proxy.$global.showMsg("请选择用户！","error");
+                return;
+            }
             let params={
-                id:row.id
+                id:id.value
             }
             proxy.$http.get("/api-web/bOpsPerson/delete", params, function (res) {
                 if (res.success){
@@ -257,7 +271,10 @@ export default {
             componentName,
             add,
             isAdd,
-            deleteUser
+            deleteUser,
+            showPopout,
+            selectionChange,
+            id
         }
     }
 }

@@ -368,6 +368,7 @@ export default {
                             if (res && res.code == 0) {
                                 proxy.$global.showMsg('保存成功！');
                             }
+                            emit('showPopout',false)
                         });
                     } else {
                         console.log('error submit!!');