From 4959a25a7cac2a514a9b8fb2471101c067fd72e4 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 18 四月 2024 17:22:54 +0800
Subject: [PATCH] 产品 启用多单位的时候如果没有设置显示弹框

---
 src/views/productManage/product/AddProductDialog.vue |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/productManage/product/AddProductDialog.vue b/src/views/productManage/product/AddProductDialog.vue
index fd0e079..a923d07 100644
--- a/src/views/productManage/product/AddProductDialog.vue
+++ b/src/views/productManage/product/AddProductDialog.vue
@@ -148,9 +148,8 @@
                       placeholder="鍗曚綅"
                       filterable
                       @change="Gtechange"
-                      style="width: calc(85% - 0px)"
+                      style="width: calc(85% - 110px)"
                     >
-                    <!-- style="width: calc(85% - 110px)" -->
                       <el-option
                         v-for="ele in unitList"
                         :key="ele.id"
@@ -163,14 +162,14 @@
                       style="font-size: 20px; color: gray"
                       @click="handleUnitShow"
                     ></i>
-                    <!-- <el-checkbox
+                    <el-checkbox
                     class="margin_left_10px"
                     :disabled="editConfig.infomation.unit&&showFooter?false:true"
                     v-model="editConfig.infomation.moreUnit"
                     @change="moreUnitChange"
                     ></el-checkbox
-                  > -->
-                  <!-- <span class="margin_left_10px cursor_pointer"  @click="handleUnitMore">鍚敤澶氬崟浣�</span> -->
+                  >
+                  <span class="margin_left_10px cursor_pointer"  @click="handleUnitMore">鍚敤澶氬崟浣�</span>
                   </el-form-item>
                   
                   <el-form-item label="浜у搧鏍囩" prop="productTagName">
@@ -231,6 +230,7 @@
                       placeholder="璇烽�夋嫨"
                       size="mini"
                       clearable
+                      filterable
                       style="width: 85%"
                       :disabled="!showFooter"
                     >
@@ -247,6 +247,7 @@
                     <el-input
                       style="width: 85%"
                       :disabled="!showFooter"
+                      filterable
                       v-model="editConfig.infomation.type"
                       placeholder="璇疯緭鍏�"
                     ></el-input>
@@ -614,6 +615,7 @@
       ref="unitMoreDialog"
       @saveUnitMore="saveUnitMore"
       :workList="unitList"
+      :unitRight='editConfig.infomation.unit'
       :dataList="editConfig.infomation.moreUnitList"
       title="鍚敤澶氬崟浣�"
     ></UnitMoreDialog>
@@ -819,18 +821,25 @@
     // 鍚敤澶氬崟浣嶇殑寮�鍏�
     moreUnitChange(){
       let string=false;
-      if(this.editConfig.infomation.moreUnitList&&this.editConfig.infomation.moreUnitList.length>0){
-        for(let i in this.editConfig.infomation.moreUnitList){
-          if(this.editConfig.infomation.moreUnitList[i].unit&&this.editConfig.infomation.moreUnitList[i].amount){
-            string=true;
-            break;
+      if(this.editConfig.infomation.unit){
+        if(this.editConfig.infomation.moreUnitList&&this.editConfig.infomation.moreUnitList.length>0){
+          for(let i in this.editConfig.infomation.moreUnitList){
+            if(this.editConfig.infomation.moreUnitList[i].unit&&this.editConfig.infomation.moreUnitList[i].amount){
+              string=true;
+              break;
+            }
           }
         }
-      }
-      if(!string){
+        if(!string){
+          this.editConfig.infomation.moreUnit=false
+          this.$message.error('璇峰厛閰嶇疆澶氬崟浣嶏紒')
+          this.$refs.unitMoreDialog.editDialogVisible = true;
+        }
+      }else{
         this.editConfig.infomation.moreUnit=false
-        this.$message.error('璇峰厛閰嶇疆澶氬崟浣嶏紒')
+        this.$message.error('璇峰厛閫夋嫨鍗曚綅锛�')
       }
+      
     },
     handleConfirmSave(dataList) {
       saveUnitDict({ data: dataList }).then((res) => {
@@ -982,7 +991,7 @@
         params.codeStandardID = this.autoCodeObj.codeStandardID
         params.autoIncr = this.autoCodeObj.maxAutoIncr
       }
-      if(params.moreUnitList.length>0){
+      if(params.moreUnitList&&params.moreUnitList.length>0){
         for(let i in params.moreUnitList){
           params.moreUnitList[i].amount=Number(params.moreUnitList[i].amount)
         }

--
Gitblit v1.8.0