更新

src/views/backOfficeSystem/IntelligentControl/myControl/components/addBkdx.vue

@@ -17,7 +17,7 @@
                 <MOSTY.Select v-model="listQuery.bkDx" @change="shangeDx" :dictEnum="props.dic.D_GS_BK_DX" placeholder="请选择布控对象" clearable />
             </el-form-item>
             <div class="ww100 mt10 mb10">
-                <el-button type="primary" @click="handleAddPeo">
+                <el-button type="primary" @click="handleAddPeo" v-if="!disabled">
                     <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
                     <span style="vertical-align: middle">新增</span>
                 </el-button>
@@ -45,7 +45,7 @@
                     <!-- 操作 -->
                     <template #controls="{ row }">
                         <el-link type="primary" >查看档案</el-link>
-                        <el-link type="danger" >删除</el-link>
+                        <el-link type="danger" @click="deleteRow(row)">删除</el-link>
                     </template>
                 </MyTable>
             </div>
@@ -54,7 +54,7 @@
             <div class="ww100 relative mb10" style="height: 250px;border: 1px solid #dcdfe6;border-radius: 4px;overflow: hidden;">
                 <div class="absolute mapSearch flex">
                     <MOSTY.Select v-model="listQuery.bkqyList" filterable multiple :dictEnum="bkqyArr" style="width:350px" placeholder="请选择布控范围" clearable />
-                    <el-button type="primary" class="ml10">
+                    <el-button type="primary" class="ml10" v-if="!disabled">
                         <el-icon style="vertical-align: middle"><CirclePlus /></el-icon>
                         <span style="vertical-align: middle">添加范围模型</span>
                     </el-button>
@@ -148,7 +148,7 @@
     </div>
   </div>
   <!-- 选择布控人员 -->
-  <BkryDialod v-model="chooseVisible_RY" @choosed="choosed" :roleIds="roleIds" />
+  <BkryDialod v-model="chooseVisible_RY" @choosed="choosed" @choosedAdd="choosedAdd" :roleIds="roleIds" />
   <!-- 选择布控群体 -->
    <BkqtDialod v-model="chooseVisible_QT" @choosed="choosed" :roleIds="roleIds"  />
 </template>
@@ -174,6 +174,7 @@ const bkqyArr = ref([]); //布控区域
 const { proxy } = getCurrentInstance();
 const dialogForm = ref(false); //弹窗
 const loading = ref(false)
+const addPerson = ref([]) //单独新增的数据
 const listQuery = ref({
     bkYz:'01',
     bkdxList: [],
@@ -216,6 +217,7 @@ const disabled = ref(false)
 // 初始化数据
 const init = (type,row) => {
     if(type == 'add'){
+        tableDate.tableConfiger.haveControls = true;
         disabled.value = false;
         const userInfo = getItem("userInfo");
         listQuery.value.bkfqrXm = userInfo.userName;
@@ -225,8 +227,8 @@ const init = (type,row) => {
     }
     disabled.value = type == 'add' ? false : true;
     dialogForm.value = true;
+    if(row) tableDate.tableConfiger.haveControls = false;
     get_bkqy_list(row)
-
 };
 
 // 获取布控区域
@@ -251,14 +253,31 @@ const getDataById = (id) =>{
 const shangeDx = () =>{
     listQuery.value.bkdxList = [];
     roleIds.value = [];
+    addPerson.value = []
 }
+// 删除数据
+const deleteRow = (row) => {
+    roleIds.value = roleIds.value.filter(id => id != row.id);
+    addPerson.value = addPerson.value.filter(it => it.id != row.id);
+    listQuery.value.bkdxList = listQuery.value.bkdxList.filter(it => it.id != row.id);
+    console.log(row,'====');
+}
+// 单独新增的数据
+const choosedAdd = (item) =>{
+    let obj = { id:item.id, fjZp:item.fjZp, ryXm:item.ryXm, ryXb:item.ryXb, rySfzh:item.rySfzh, ryHjd:item.hjdXz, ryXjd:item.xzdXz, rySjhm:item.ryLxdh, qtXnsf:item.qtXnsf,clCjh:item.clCjh, clCph:item.clCph, qtTzms:item.qtTzms, bqList:item.bqList }
+    addPerson.value.push(obj) ;//缓存的数据
+    if(!listQuery.value.bkdxList) listQuery.value.bkdxList = [];
+    listQuery.value.bkdxList.unshift(obj);
+}
+
 // 选择重点人
 const choosed = (val) => {
     if(listQuery.value.bkDx == '01'){// 人员
-        roleIds.value = (val.filter(v => v.id)).map(it=>it.id);
+        roleIds.value = val.map(it=>it.id);
-        listQuery.value.bkdxList = val.map(item=>{
+        let arr = val.map(item=>{
-            return {  fjZp:'', ryXm:item.ryXm, ryXb:item.ryXb, rySfzh:item.rySfzh, ryHjd:item.hjdXz, ryXjd:item.xzdXz, rySjhm:item.ryLxdh, qtXnsf:item.qtXnsf,clCjh:item.clCjh, clCph:item.clCph, qtTzms:'', bqList:item.bqList }
+            return { id:item.id, fjZp:item.fjZp, ryXm:item.ryXm, ryXb:item.ryXb, rySfzh:item.rySfzh, ryHjd:item.hjdXz, ryXjd:item.xzdXz, rySjhm:item.ryLxdh, qtXnsf:item.qtXnsf,clCjh:item.clCjh, clCph:item.clCph, qtTzms:item.qtTzms, bqList:item.bqList }
-        }); 
+        })
+        listQuery.value.bkdxList = [...addPerson.value,...arr]; 
     }else{// 群体
         
 

src/views/backOfficeSystem/IntelligentControl/myControl/components/addPeo.vue

@@ -54,7 +54,6 @@ const rules = reactive({
     xzdXz: [{ required: true, message: "请输入现居住地址", trigger: "blur" }],
 })
 const init = () =>{
-    
     showDialog.value = true;
 }
 
@@ -74,6 +73,7 @@ const closeTag = (idx) =>{
 
 const submitForm = () =>{
     elform.value.submit((val)=>{
+        val.id = new Date().getTime()
         emit('change',val)
         showDialog.value = false;
     })

src/views/backOfficeSystem/IntelligentControl/myControl/components/bkryDialod.vue

@@ -140,17 +140,7 @@ const onComfirm = () => {
 
 // 自定义加人
 const changeZdy = (val) => {
-  const userList = multipleSelectionUser.value;
+  emits("choosedAdd", val);
-  let list = [];
-  let listId = [];
-  userList.forEach((val) => {
-    if (listId.indexOf(val.id) == -1) {
-      list.push(val);
-      listId.push(val.id);
-    }
-  });
-  list.unshift(val)
-  emits("choosed", list);
   closed();
 }
 /**