From d3ae6838a6309dae061d33fae7bdd64063f9a8fe Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 25 Sep 2024 16:44:13 +0800
Subject: [PATCH] =?UTF-8?q?9/25=20=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basic/collectPoint/userWorkplace.js   |  8 +++++++-
 .../basic/collectPoint/userWorkplace.vue      |  1 -
 src/views/basic/product/drug/drugAdd.vue      | 13 ++++++++----
 src/views/collect/IoDestroyOrder.vue          |  2 +-
 src/views/collect/bindWorkDialog.vue          |  2 +-
 src/views/collect/fieldOperation.vue          | 20 +++++++++++++++----
 6 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/src/api/basic/collectPoint/userWorkplace.js b/src/api/basic/collectPoint/userWorkplace.js
index e2d8723a..2b723775 100644
--- a/src/api/basic/collectPoint/userWorkplace.js
+++ b/src/api/basic/collectPoint/userWorkplace.js
@@ -38,5 +38,11 @@ export function delUserBindWork(query) {
   });
 }
 
-
+export function getUserWorkByWorkplaceCode(query) {
+  return axios({
+    url: '/udiwms/sysWorkplace/getUserWorkByWorkplaceCode',
+    method: 'get',
+    params: query
+  })
+}
 
diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue
index 80c5bcdc..c79854b1 100644
--- a/src/views/basic/collectPoint/userWorkplace.vue
+++ b/src/views/basic/collectPoint/userWorkplace.vue
@@ -505,7 +505,6 @@ export default {
 
     },
     workDetail(row) {
-      console.log("woshishhss",row)
       this.formData = row
       this.addWorkplaceDialogVisible = true
     },
diff --git a/src/views/basic/product/drug/drugAdd.vue b/src/views/basic/product/drug/drugAdd.vue
index 70d5d4a4..fed2b01f 100644
--- a/src/views/basic/product/drug/drugAdd.vue
+++ b/src/views/basic/product/drug/drugAdd.vue
@@ -545,6 +545,7 @@ import {
   delDrugLevel,
   updateLevelDrug, calculateDistCount, calculateUseCount
 } from '@/api/basic/product/drugUdiinfos'
+import {isBlank} from "@/utils/strUtil";
 
 import {
   getYbDrugDetail, removeRl, thirdSysDetail
@@ -605,6 +606,7 @@ export default {
         status: false,
         relId: null,
         drugLevelLists: [],
+        productId:null,
 
         useLevelDi: null,
         distributeLevelDi: null,
@@ -834,15 +836,16 @@ export default {
 
     //层级保存
     levelSave(row) {
-      if (row.nameCode == null) {
+      console.log("djdjdjjd",row)
+      if (isBlank(row.nameCode)) {
         this.$message.error('层级标识不能为空')
         return
       }
-      if (row.packLevel == null) {
+      if (isBlank(row.packLevel)) {
         this.$message.error('包装级别不能为空')
         return
       }
-      if (row.packUnit == null) {
+      if (isBlank(row.packUnit)) {
         this.$message.error('层级单位不能为空')
         return
       }
@@ -854,7 +857,8 @@ export default {
         bhxjcpbm: row.bhxjcpbm,
         bhxjsl: row.bhxjsl,
         relId: this.newProductData.id,
-        uuid: this.newProductData.uuid
+        uuid: this.newProductData.uuid,
+        productId:this.newProductData.productId
       }
       updateLevelDrug(editQuery).then(res => {
         this.saveLoading = false
@@ -885,6 +889,7 @@ export default {
         rowDisabled: false,
         isUpDisabled: true
       })
+      this.newProductData.productId = null
       this.selectedIndex = this.detailList.length - 1
       this.isSave = false
     },
diff --git a/src/views/collect/IoDestroyOrder.vue b/src/views/collect/IoDestroyOrder.vue
index 26374e33..26ae46cd 100644
--- a/src/views/collect/IoDestroyOrder.vue
+++ b/src/views/collect/IoDestroyOrder.vue
@@ -409,7 +409,7 @@ export default {
 
       };
       this.actDateRange = [];
-      // this.getList();
+      this.getList();
     },
     onSubmit(_this) {
       if (_this == null)
diff --git a/src/views/collect/bindWorkDialog.vue b/src/views/collect/bindWorkDialog.vue
index dbadeabd..1a735da2 100644
--- a/src/views/collect/bindWorkDialog.vue
+++ b/src/views/collect/bindWorkDialog.vue
@@ -37,7 +37,7 @@
         <el-table-column type="index" label="序号"></el-table-column>
         <el-table-column label="工位编码" prop="workplaceId"></el-table-column>
         <el-table-column label="工位名称" prop="workplaceName"></el-table-column>
-        <el-table-column label="所属仓库" prop="invName"></el-table-column>
+        <!--<el-table-column label="所属仓库" prop="invName"></el-table-column>-->
         <el-table-column label="备注" prop="remake"></el-table-column>
       </el-table>
     </el-card>
diff --git a/src/views/collect/fieldOperation.vue b/src/views/collect/fieldOperation.vue
index f4e3f69f..29e16f8e 100644
--- a/src/views/collect/fieldOperation.vue
+++ b/src/views/collect/fieldOperation.vue
@@ -54,7 +54,7 @@
 <script>
 import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage.js";
 import QRCode from 'qrcodejs2'
-import { getUserBindWork } from '@/api/basic/collectPoint/userWorkplace'
+import { getUserBindWork, getUserWorkByWorkplaceCode } from '@/api/basic/collectPoint/userWorkplace'
 
 export default {
   name: 'fieldOperation',
@@ -64,6 +64,7 @@ export default {
         workKey: '',
         workplaceStatus: 1,
         userId: this.$store.getters.adminId,
+        workplaceCode:'',
         // invCode: this.$store.getters.locInvCode,
         page: 1,
         limit: 200
@@ -91,9 +92,20 @@ export default {
       });
     },
     handleClick(index) {
-      let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId
-      // this.$router.push( workplaceId)
-      window.open(url, '_blank');
+      let query = {
+        userId: this.$store.getters.adminId,
+        workplaceCode: this.stationList[index].workplaceId,
+      }
+      getUserWorkByWorkplaceCode(query).then(res => {
+        if (res.code == 20000){
+          let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + this.stationList[index].workplaceId
+          // this.$router.push( workplaceId)
+          window.open(url, '_blank');
+        }else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {})
+
     },
     getStationList() {
       getUserBindWork(this.query).then(res => {