From 60ab09fb9ad6fcb5c21225f1d0994072b984aa68 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 19 Nov 2024 09:09:06 +0800
Subject: [PATCH] =?UTF-8?q?11/19=20=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=961?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/IoCreateOrder.vue            |  2 +-
 .../companyDrug/basicCompanyDrugProducts.vue  |  8 +++----
 .../basicCompanyProductsImport.vue            | 14 +++++------
 .../supplier/products/supProductsOptinDi.vue  | 23 ++++++++++++-------
 4 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/views/pharmaceuticals/distribution/IoCreateOrder.vue b/src/views/pharmaceuticals/distribution/IoCreateOrder.vue
index 61e57c1..795f692 100644
--- a/src/views/pharmaceuticals/distribution/IoCreateOrder.vue
+++ b/src/views/pharmaceuticals/distribution/IoCreateOrder.vue
@@ -412,7 +412,7 @@ export default {
         productType: 2
 
       },
-      viewType: 4,
+      viewType: 3,
       checkStatus: {
         1: "草稿",
         2: "等待处理",
diff --git a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
index 1608364..e4c8d08 100644
--- a/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
+++ b/src/views/supplier/companyDrug/basicCompanyDrugProducts.vue
@@ -479,7 +479,7 @@
         <selectProduct
           :closeSelDialog="closeSelDialog"
           :uuid="uuid"
-          :nameCodes="nameCodes"
+          :productIds="productIds"
         ></selectProduct>
       </el-dialog>
 
@@ -610,7 +610,7 @@ export default {
       checked: false,
       list: [],
       allProduct:[],
-      nameCodes:[],
+      productIds:[],
       detailList: [],
       sysList: [],
       filterList: [],
@@ -993,7 +993,7 @@ export default {
       this.multipleSelection = val;
     },
     closeSelDialog(val) {
-      this.nameCodes = []
+      this.productIds = []
       this.selectProductVisible = false;
       this.addProductVisible = false;
       this.getList();
@@ -1226,7 +1226,7 @@ export default {
         .then((response) => {
           this.allProduct = response.data.list ;
           if (this.allProduct.length > 0){
-            this.nameCodes = this.allProduct.map(item => item.nameCode)
+            this.productIds = this.allProduct.map(item => item.prid)
           }
           this.selectProductVisible = true;
         })
diff --git a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
index 325365d..b8c3a54 100644
--- a/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
+++ b/src/views/supplier/companyDrug/basicCompanyProductsImport.vue
@@ -89,7 +89,7 @@
                 :header-cell-class-name="cellClass" @current-change="handleSelectionChange">
         <el-table-column label width="45">
           <template slot-scope="scope">
-            <el-radio :label="scope.row.nameCode" v-model="radioCheck" :disabled="isDisabled(scope.row.nameCode)"><span></span></el-radio>
+            <el-radio :label="scope.row.productId" v-model="radioCheck" :disabled="isDisabled(scope.row.productId)"><span></span></el-radio>
           </template>
         </el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
@@ -799,7 +799,7 @@ export default {
       type: Function,
       required: true,
     },
-    nameCodes: {
+    productIds: {
       type: Array,
       required: true,
     }
@@ -1147,10 +1147,10 @@ export default {
         });
     },
     handleSelectionChange(selection) {
-      if (this.nameCodes.includes(selection.nameCode)){
+      if (this.productIds.includes(selection.productId)){
         return
       }else{
-        this.radioCheck = selection.nameCode;
+        this.radioCheck = selection.productId;
       }
 
       this.curSelectDi = selection;
@@ -1184,9 +1184,9 @@ export default {
       // }
 
     },
-    isDisabled(nameCode){
-      if (this.nameCodes.length > 0){
-        return this.nameCodes.includes(nameCode);
+    isDisabled(productId){
+      if (this.productIds.length > 0){
+        return this.productIds.includes(productId);
       }
     },
     handleErpChange(val) {
diff --git a/src/views/supplier/products/supProductsOptinDi.vue b/src/views/supplier/products/supProductsOptinDi.vue
index 5093d31..802e4ed 100644
--- a/src/views/supplier/products/supProductsOptinDi.vue
+++ b/src/views/supplier/products/supProductsOptinDi.vue
@@ -570,14 +570,21 @@ export default {
       let query = {
         id: row.id,
       };
-      delThrDiProducts(query).then((res) => {
-        if (res.code === 20000) {
-          _this.$message.success("删除成功");
-          _this.getList();
-        } else {
-          _this.$message.error("删除失败");
-        }
-      });
+      _this.$confirm('此操作将删除该产品，是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        delThrDiProducts(query).then((res) => {
+          if (res.code === 20000) {
+            _this.$message.success("删除成功");
+            _this.getList();
+          } else {
+            _this.$message.error("删除失败");
+          }
+        });
+      }).catch(() => {})
+
     },
     closeDialog() {
       this.selectErpDialogVisible = false;