From b136c0a80500d929897a8e24f920efad47e2e307 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 01 十一月 2023 19:03:01 +0800
Subject: [PATCH] 变更公海 的接口传参修改

---
 src/views/sales/salesReturn/AddSalesReturnDialog.vue |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/views/sales/salesReturn/AddSalesReturnDialog.vue b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
index 814a295..55b08b1 100644
--- a/src/views/sales/salesReturn/AddSalesReturnDialog.vue
+++ b/src/views/sales/salesReturn/AddSalesReturnDialog.vue
@@ -25,7 +25,20 @@
             <el-row>
               <el-col :span="12">
                 <el-form-item label="閿�鍞��璐у崟缂栧彿" prop="number">
-                  <WordInput
+                  <el-input
+                    v-if="
+                      editConfig.title == '缂栬緫' ||
+                      (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"
+                    >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
+                  >
+                  <!-- <WordInput
                     v-if="codenumer && (explain != '' || isIdDisabled) && method == 0"
                     :codenumer="codenumer"
                     :sum="sum"
@@ -36,7 +49,7 @@
                   <span v-else-if="method == 0" style="color: #f56c6c"
                     >璇蜂紭鍏堥厤缃紪鐮佽鑼� <el-button type="text" @click="numberClick"> 閰嶇疆瑙勮寖 </el-button></span
                   >
-                  <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span>
+                  <span v-else>{{ editConfig.title === "鏂板缓" ? "鑷姩鐢熸垚" : editConfig.infomation.number }}</span> -->
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -249,7 +262,7 @@
 import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
 // import { getProductList } from "@/api/common/other"
 import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
-import codeMixin from "@/views/client/followupRecords/mixin/codeMixin"
+import codeMixin from "@/components/makepager/mixin/codeMixin"
 import { getSalesDetailsList } from "@/api/sales/salesDetails"
 // import { mapActions } from "vuex"
 
@@ -282,7 +295,7 @@
       dialogWidth: "50%",
       editConfig: this.editCommonConfig,
       rules: {
-        number: [{ required: true, message: "璇疯緭鍏ラ攢鍞��璐у崟鍙�", trigger: "blur" }],
+        number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
         repository: [{ required: true, message: "璇烽�夋嫨閫�鍏ヤ粨搴�", trigger: "change" }],
         memberId: [{ required: true, message: "璇烽�夋嫨璐熻矗浜�", trigger: "change" }],
         salesDetailNumber: [{ required: true, message: "璇烽�夋嫨閿�鍞槑缁嗗崟", trigger: "change" }]
@@ -335,9 +348,6 @@
       if (val) {
         this.formInfo()
       }
-    },
-    "editClientManageConfig.infomation.codeStandID"() {
-      this.formInfo()
     }
   },
   methods: {
@@ -375,7 +385,6 @@
     // 淇濆瓨
     saveClick(formName) {
       this.$refs[formName].validate((valid) => {
-        this.validateFormNumber()
         if (valid) {
           console.log(this.editConfig.infomation)
           for (let i = 0; i < this.selProductData.length; i++) {
@@ -431,8 +440,7 @@
           returnDate: data.returnDate || "",
           salesReturnStatusId: data.salesReturnStatusId || 0,
           sourceId: this.SalesDetailsId,
-          sourceType: 1,
-          codeRule: this.codeRule
+          sourceType: 1
         }
       }
       return params
@@ -453,8 +461,14 @@
                 this.tableData = item.products
                 this.tableData.map((item, index) => {
                   item.productId = index + 1
+                  this.selProductData.forEach((key) => {
+                    if (item.number === key.number) {
+                      item.amount = key.amount
+                      item.id = key.id
+                    }
+                  })
                 })
-                this.productTableList.tableData = item.products
+                this.productTableList.tableData = this.tableData
                 this.selProductData.forEach((key) => {
                   this.tableData.forEach((row) => {
                     if (key.number === row.number) {
@@ -530,6 +544,7 @@
         this.editConfig.infomation.salesDetailNumber = ""
         this.editConfig.infomation.client_name = ""
         this.clientId = 0
+        this.productTableList.tableData = []
       } else if (value === "contract") {
         this.editConfig.infomation.salesDetailNumber = ""
         this.productTableList.tableData = []

--
Gitblit v1.8.0