Преглед изворни кода

fix: 用户删除修改传参/导出全部携带全部workshopId

bxy пре 1 година
родитељ
комит
9d79a0d881

+ 2 - 0
src/views/datamanager/alertformdata/components/common/QueryForm.vue

@@ -146,6 +146,7 @@
   };
 
   const handleReset = () => {
+    workShopIds.value = [];
     issueTypeValue.value = [];
     typeDisable.value = true;
     workLocation.value = [];
@@ -195,6 +196,7 @@
       workShopIds.value.push(item[0]);
     });
     queryForm.workspaceId = arr;
+    workShopIds.value = [...new Set(workShopIds.value)];
   };
 
   const handleIssueStateChange = () => {

+ 9 - 3
src/views/datamanager/alertformdata/components/default/Default.vue

@@ -154,8 +154,14 @@
   };
   // 导出
   const handleExport = async (queryForm, workShop) => {
-    console.log(queryForm);
-    console.log('workshopId', workShop);
+    const tempWorkShopIds = ref<number[]>([]);
+    if (workShop.length === 0) {
+      locationOptions.value.forEach((item) => {
+        tempWorkShopIds.value.push(item.value);
+      });
+    } else {
+      tempWorkShopIds.value = workShop;
+    }
 
     try {
       const now = new Date();
@@ -169,7 +175,7 @@
         fileName: '',
         isExportHidden: true,
         startTime: queryForm.startTime,
-        workshopIds: workShop,
+        workshopIds: tempWorkShopIds.value,
       };
 
       const config: AxiosRequestConfig = {

+ 2 - 0
src/views/system/user/user.vue

@@ -229,6 +229,8 @@
       userId: record.userId,
       nickname: record.nickname,
       username: record.username,
+      mobile: record.mobile,
+      staffNo: record.staffNo,
     };
     ElMessageBox.confirm('确认要删除该用户吗', {
       confirmButtonText: '确认',