From caf1f99e718ca2ac07fa64e7a71a6d7fa88b8989 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 20 十二月 2023 17:57:18 +0800
Subject: [PATCH] 报价单列表和对应产品列表的数据调试

---
 src/views/sales/quotation/AddQuotationDialog.vue |   46 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/views/sales/quotation/AddQuotationDialog.vue b/src/views/sales/quotation/AddQuotationDialog.vue
index f09c5f7..bbe9a7f 100644
--- a/src/views/sales/quotation/AddQuotationDialog.vue
+++ b/src/views/sales/quotation/AddQuotationDialog.vue
@@ -29,16 +29,14 @@
                   <el-input
                     v-if="
                       editConfig.title == '缂栬緫' ||
-                      (editConfig.title == '鏂板缓' &&
-                        codenumer &&
-                        (explain != '' || isIdDisabled))
+                      (editConfig.title == '鏂板缓' && codenumer && (explain != '' || isIdDisabled))
                     "
                     :disabled="editConfig.title == '缂栬緫'"
                     v-model="editConfig.infomation.number"
                     placeholder="璇疯緭鍏ョ紪鐮�"
                   >
                   </el-input>
-                  <span  v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
+                  <span v-else-if="editConfig.title == '鏂板缓'" style="color: #f56c6c"
                     >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
                   >
                   <!-- <WordInput
@@ -239,13 +237,13 @@
           <!-- 浜у搧绠＄悊 -->
           <div class="basic-info-title" style="display: flex">
             浜у搧绠＄悊
-            <div style="margin-left: 400px">
+            <!-- <div style="margin-left: 400px">
               甯佺
               <el-select v-model="editConfig.infomation.currency" placeholder="璇烽�夋嫨" size="mini" style="width: 63%">
                 <el-option v-for="item in currencyOptions" :key="item.id" :label="item.name" :value="item.id">
                 </el-option>
               </el-select>
-            </div>
+            </div> -->
           </div>
           <div class="product-view">
             <CommonFormTableView
@@ -370,11 +368,11 @@
       dialogWidth: "50%",
       editConfig: this.editCommonConfig,
       rules: {
-        number: [{ required: true, validator: this.validateCheckCode,  trigger: ["blur","change"] }],
+        number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
         quotationName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
         quotation_status_id: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
         sale_chance_name: [{ required: true, validator: this.checkChance, trigger: "change" }],
-        member_id: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }]
+        member_id: [{ required: true, validator: this.validateMemberId, trigger: "change" }]
       },
       memberOptions: [],
       quotationStatusOptions: [], // 鎶ヤ环鍗曠姸鎬�
@@ -424,7 +422,7 @@
       if (val) {
         this.formInfo()
       }
-    },
+    }
   },
   methods: {
     formInfo() {
@@ -438,7 +436,17 @@
       getAllData()
         .then((res) => {
           this.memberOptions = res.data.member
-          this.quotationStatusOptions = res.data.quotationStatus
+          this.quotationStatusOptions = res.data.quotationStatus?res.data.quotationStatus:[]
+          if (this.editConfig.title === "鏂板缓") {
+            let username = document.cookie.replace(/(?:(?:^|.*;\s*)username\s*=\s*([^;]*).*$)|^.*$/, "$1")
+            this.memberOptions.map((item) => {
+              if (item.username == username) {
+                this.$set(this.editConfig.infomation, "member_id", item.id)
+              }
+            })
+            this.$set(this.editConfig.infomation,'quotation_status_id',this.quotationStatusOptions.length>0?this.quotationStatusOptions[0].id:'')
+          }
+          
           this.dataProcess()
         })
         .catch((err) => {
@@ -605,7 +613,8 @@
             name: "",
             number: "",
             price: 0,
-            total: 0
+            total: 0,
+            unit: ""
           }
         ]
       } else {
@@ -621,6 +630,7 @@
           { label: "浜у搧鍚嶇О", prop: "name", productName: true, isRequird: true },
           { label: "浜у搧缂栧彿", prop: "number" },
           { label: "鏁伴噺", prop: "amount", inputNumber: true, isRequird: true },
+          { label: "鍗曚綅", prop: "unit" },
           { label: "閿�鍞崟浠�", prop: "price", inputFloat: true },
           { label: "浠风◣鍚堣", prop: "total", inputFloat: true }
         ]
@@ -646,7 +656,8 @@
         name: "",
         number: "",
         price: 0,
-        total: 0
+        total: 0,
+        unit: ""
       })
       this.showSummary.show = true
     },
@@ -662,7 +673,8 @@
           name: "",
           number: "",
           price: 0,
-          total: 0
+          total: 0,
+          unit: ""
         }
       ]
       this.productTableList.tableData = this.tableData
@@ -680,6 +692,14 @@
       } else {
         callback(new Error("璇烽�夋嫨閿�鍞満浼�"))
       }
+    },
+    // 閿�鍞礋璐ｄ汉鑷畾涔夋牎楠岃鍒�
+    validateMemberId(rule, value, callback) {
+      if (this.editConfig.infomation?.member_id > 0) {
+        callback()
+      } else {
+        callback(new Error("璇烽�夋嫨閿�鍞礋璐ｄ汉"))
+      }
     }
   }
 }

--
Gitblit v1.8.0