From 40292f0cc17a748b2ac8cf152dd1c17e3f95f806 Mon Sep 17 00:00:00 2001
From: myTest383 <address>
Date: Fri, 27 Sep 2024 08:35:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outStorage/alreadyOutStorage/index.vue    | 79 ++++++++++++++-----
 src/views/outStorage/toAllocated/index.vue    | 79 +++++++++++++------
 src/views/outStorage/toOutStorage/index.vue   | 78 +++++++++++++-----
 src/views/outStorage/zeroPicking/index.vue    | 78 +++++++++++++-----
 4 files changed, 229 insertions(+), 85 deletions(-)

diff --git a/src/views/outStorage/alreadyOutStorage/index.vue b/src/views/outStorage/alreadyOutStorage/index.vue
index 2bdd7c5..b438f13 100644
--- a/src/views/outStorage/alreadyOutStorage/index.vue
+++ b/src/views/outStorage/alreadyOutStorage/index.vue
@@ -224,8 +224,8 @@
                     <el-row>
                       <el-col :span="8">
                         <div class="span-sty">开票总金额</div>
-                        <el-form-item> <el-input v-model="totalQuantity" :readonly="true" placeholder="" clearable
-                            class="addinputInfo addinputw" /></el-form-item>
+                        <el-form-item> <el-input v-model="from.four.totalAmount" :readonly="true" placeholder=""
+                            clearable class="addinputInfo addinputw" /></el-form-item>
                       </el-col>
                       <el-col :span="8">
                         <div class="span-sty">税号</div>
@@ -242,7 +242,7 @@
                       <el-col :span="24">
                         <div class="span-sty">内容类型</div>
                         <el-form-item> <el-radio-group v-model="from.four.contentType" size="small"
-                            class="addinputInfo addinputw">
+                            class="addinputInfo addinputw" @change="radiogroupChange">
                             <el-radio :label="'1'">发票商品</el-radio>
                             <el-radio :label="'2'">自定义明细</el-radio>
                           </el-radio-group></el-form-item>
@@ -345,7 +345,7 @@
         <el-table-column label="分配数量" align="center" min-width="200">
           <template slot-scope="scope">
             <el-input v-model="scope.row.count" clearable placeholder=""
-              oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+              oninput="value=value.replace(/^0+(\d)|[^\d]+/g,'')" />
           </template>
         </el-table-column>
       </el-table>
@@ -804,6 +804,7 @@
         this.from.four.invoiceTypeValue = choose[0].dictValue
       },
       saveInvoice() {
+        this.from.four.billSid = this.rowItemSid
         req.saveOrderInvoive(this.from.four).then((resp) => {
           if (res.success) {
             this.$message({
@@ -821,17 +822,56 @@
       },
       handleClose() {
         this.dialogVisible = false
+        this.$refs.main.clearSelection()
       },
       handleSelectionChange(val) {
         console.log("val", val);
         this.goodsList = val
+      },
+      radiogroupChange(val) {
+        console.log("val", val);
+
+        let quantity = 0
+        if (this.from.first.length > 0) {
+          this.from.first.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
+
+        if (val == '1') {
+          this.from.four.detailsList = this.from.first
+        } else {
+          this.from.four.detailsList = []
+        }
+
+
       },
       saveData() {
         this.from.four.detailsList = this.goodsList
         this.dialogVisible = false
+        this.$refs.main.clearSelection()
+
+        let quantity = 0
+        if (this.from.four.detailsList.length > 0) {
+          this.from.four.detailsList.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
       },
       delGoods(index) {
         this.from.four.detailsList.splice(index, 1)
+        let quantity = 0
+        if (this.from.four.detailsList.length > 0) {
+          this.from.four.detailsList.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
       },
       selectCarrier(row, val) {
         console.log("selectCarrier", val);
@@ -909,23 +949,20 @@
 
           var item = this.goodsStockList[i]
 
-          if (Number(item.count) > 0) {
-
-            goodsStocks.push({
-              "sid": item.locationSid,
-              "sourceBillSid": this.rowItemSid,
-              "goodsSkuSid": item.goodsSkuSid,
-              "goodsSpuName": item.goodsSpuName,
-              "goodsSpuTitle": "",
-              "goodsSkuCode": '',
-              "count": item.count,
-              "rackSid": item.rackSid,
-              "rackCode": item.rackCode,
-              "inventorySid": item.inventorySid,
-              "initialCount": item.initialCount,
-              "locationSid": item.locationSid,
-            })
-          }
+          goodsStocks.push({
+            "sid": item.locationSid,
+            "sourceBillSid": this.rowItemSid,
+            "goodsSkuSid": item.goodsSkuSid,
+            "goodsSpuName": item.goodsSpuName,
+            "goodsSpuTitle": "",
+            "goodsSkuCode": '',
+            "count": item.count,
+            "rackSid": item.rackSid,
+            "rackCode": item.rackCode,
+            "inventorySid": item.inventorySid,
+            "initialCount": item.initialCount,
+            "locationSid": item.locationSid,
+          })
         }
 
         req.saveSelAvailable(goodsStocks).then((res) => {
diff --git a/src/views/outStorage/toAllocated/index.vue b/src/views/outStorage/toAllocated/index.vue
index 247d7f2..0a9e374 100644
--- a/src/views/outStorage/toAllocated/index.vue
+++ b/src/views/outStorage/toAllocated/index.vue
@@ -216,7 +216,6 @@
                       </el-col>
                       <el-col :span="8">
                         <div class="span-sty">抬头</div>
-
                         <el-form-item> <el-input v-model="from.four.rise" placeholder="" clearable
                             class="addinputInfo addinputw" /></el-form-item>
                       </el-col>
@@ -224,8 +223,8 @@
                     <el-row>
                       <el-col :span="8">
                         <div class="span-sty">开票总金额</div>
-                        <el-form-item> <el-input v-model="totalQuantity" :readonly="true" placeholder="" clearable
-                            class="addinputInfo addinputw" /></el-form-item>
+                        <el-form-item> <el-input v-model="from.four.totalAmount" :readonly="true" placeholder=""
+                            clearable class="addinputInfo addinputw" /></el-form-item>
                       </el-col>
                       <el-col :span="8">
                         <div class="span-sty">税号</div>
@@ -242,7 +241,7 @@
                       <el-col :span="24">
                         <div class="span-sty">内容类型</div>
                         <el-form-item> <el-radio-group v-model="from.four.contentType" size="small"
-                            class="addinputInfo addinputw">
+                            class="addinputInfo addinputw" @change="radiogroupChange">
                             <el-radio :label="'1'">发票商品</el-radio>
                             <el-radio :label="'2'">自定义明细</el-radio>
                           </el-radio-group></el-form-item>
@@ -345,7 +344,7 @@
         <el-table-column label="分配数量" align="center" min-width="200">
           <template slot-scope="scope">
             <el-input v-model="scope.row.count" clearable placeholder=""
-              oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+              oninput="value=value.replace(/^0+(\d)|[^\d]+/g,'')" />
           </template>
         </el-table-column>
       </el-table>
@@ -824,6 +823,7 @@
         this.from.four.invoiceTypeValue = choose[0].dictValue
       },
       saveInvoice() {
+        this.from.four.billSid = this.rowItemSid
         req.saveOrderInvoive(this.from.four).then((resp) => {
           this.$message({
             type: 'success',
@@ -839,17 +839,55 @@
       },
       handleClose() {
         this.dialogVisible = false
+        this.$refs.main.clearSelection()
       },
       handleSelectionChange(val) {
         console.log("val", val);
         this.goodsList = val
       },
+      radiogroupChange(val) {
+        console.log("val", val);
+
+        let quantity = 0
+        if (this.from.first.length > 0) {
+          this.from.first.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
+
+        if (val == '1') {
+          this.from.four.detailsList = this.from.first
+        } else {
+          this.from.four.detailsList = []
+        }
+
+      },
       saveData() {
         this.from.four.detailsList = this.goodsList
         this.dialogVisible = false
+        this.$refs.main.clearSelection()
+
+        let quantity = 0
+        if (this.from.four.detailsList.length > 0) {
+          this.from.four.detailsList.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
       },
       delGoods(index) {
         this.from.four.detailsList.splice(index, 1)
+        let quantity = 0
+        if (this.from.four.detailsList.length > 0) {
+          this.from.four.detailsList.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
       },
       selectCarrier(row, val) {
         console.log("selectCarrier", val);
@@ -926,23 +964,20 @@
 
           var item = this.goodsStockList[i]
 
-          if (Number(item.count) > 0) {
-
-            goodsStocks.push({
-              "sid": item.locationSid,
-              "sourceBillSid": this.rowItemSid,
-              "goodsSkuSid": item.goodsSkuSid,
-              "goodsSpuName": item.goodsSpuName,
-              "goodsSpuTitle": "",
-              "goodsSkuCode": '',
-              "count": item.count,
-              "rackSid": item.rackSid,
-              "rackCode": item.rackCode,
-              "inventorySid": item.inventorySid,
-              "initialCount": item.initialCount,
-              "locationSid": item.locationSid,
-            })
-          }
+          goodsStocks.push({
+            "sid": item.locationSid,
+            "sourceBillSid": this.rowItemSid,
+            "goodsSkuSid": item.goodsSkuSid,
+            "goodsSpuName": item.goodsSpuName,
+            "goodsSpuTitle": "",
+            "goodsSkuCode": '',
+            "count": item.count,
+            "rackSid": item.rackSid,
+            "rackCode": item.rackCode,
+            "inventorySid": item.inventorySid,
+            "initialCount": item.initialCount,
+            "locationSid": item.locationSid,
+          })
         }
 
         req.saveSelAvailable(goodsStocks).then((res) => {
diff --git a/src/views/outStorage/toOutStorage/index.vue b/src/views/outStorage/toOutStorage/index.vue
index ba054f1..9386600 100644
--- a/src/views/outStorage/toOutStorage/index.vue
+++ b/src/views/outStorage/toOutStorage/index.vue
@@ -224,8 +224,8 @@
                     <el-row>
                       <el-col :span="8">
                         <div class="span-sty">开票总金额</div>
-                        <el-form-item> <el-input v-model="totalQuantity" :readonly="true" placeholder="" clearable
-                            class="addinputInfo addinputw" /></el-form-item>
+                        <el-form-item> <el-input v-model="from.four.totalAmount" :readonly="true" placeholder=""
+                            clearable class="addinputInfo addinputw" /></el-form-item>
                       </el-col>
                       <el-col :span="8">
                         <div class="span-sty">税号</div>
@@ -242,7 +242,7 @@
                       <el-col :span="24">
                         <div class="span-sty">内容类型</div>
                         <el-form-item> <el-radio-group v-model="from.four.contentType" size="small"
-                            class="addinputInfo addinputw">
+                            class="addinputInfo addinputw" @change="radiogroupChange">
                             <el-radio :label="'1'">发票商品</el-radio>
                             <el-radio :label="'2'">自定义明细</el-radio>
                           </el-radio-group></el-form-item>
@@ -345,7 +345,7 @@
         <el-table-column label="分配数量" align="center" min-width="200">
           <template slot-scope="scope">
             <el-input v-model="scope.row.count" clearable placeholder=""
-              oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+              oninput="value=value.replace(/^0+(\d)|[^\d]+/g,'')" />
           </template>
         </el-table-column>
       </el-table>
@@ -809,6 +809,7 @@
         this.from.four.invoiceTypeValue = choose[0].dictValue
       },
       saveInvoice() {
+        this.from.four.billSid = this.rowItemSid
         req.saveOrderInvoive(this.from.four).then((resp) => {
           if (res.success) {
             this.$message({
@@ -826,17 +827,55 @@
       },
       handleClose() {
         this.dialogVisible = false
+        this.$refs.main.clearSelection()
       },
       handleSelectionChange(val) {
         console.log("val", val);
         this.goodsList = val
       },
+      radiogroupChange(val) {
+        console.log("val", val);
+
+        let quantity = 0
+        if (this.from.first.length > 0) {
+          this.from.first.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
+
+        if (val == '1') {
+          this.from.four.detailsList = this.from.first
+        } else {
+          this.from.four.detailsList = []
+        }
+
+      },
       saveData() {
         this.from.four.detailsList = this.goodsList
         this.dialogVisible = false
+        this.$refs.main.clearSelection()
+
+        let quantity = 0
+        if (this.from.four.detailsList.length > 0) {
+          this.from.four.detailsList.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
       },
       delGoods(index) {
         this.from.four.detailsList.splice(index, 1)
+        let quantity = 0
+        if (this.from.four.detailsList.length > 0) {
+          this.from.four.detailsList.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
       },
       selectCarrier(row, val) {
         console.log("selectCarrier", val);
@@ -912,23 +951,20 @@
 
           var item = this.goodsStockList[i]
 
-          if (Number(item.count) > 0) {
-
-            goodsStocks.push({
-              "sid": item.locationSid,
-              "sourceBillSid": this.rowItemSid,
-              "goodsSkuSid": item.goodsSkuSid,
-              "goodsSpuName": item.goodsSpuName,
-              "goodsSpuTitle": "",
-              "goodsSkuCode": '',
-              "count": item.count,
-              "rackSid": item.rackSid,
-              "rackCode": item.rackCode,
-              "inventorySid": item.inventorySid,
-              "initialCount": item.initialCount,
-              "locationSid": item.locationSid,
-            })
-          }
+          goodsStocks.push({
+            "sid": item.locationSid,
+            "sourceBillSid": this.rowItemSid,
+            "goodsSkuSid": item.goodsSkuSid,
+            "goodsSpuName": item.goodsSpuName,
+            "goodsSpuTitle": "",
+            "goodsSkuCode": '',
+            "count": item.count,
+            "rackSid": item.rackSid,
+            "rackCode": item.rackCode,
+            "inventorySid": item.inventorySid,
+            "initialCount": item.initialCount,
+            "locationSid": item.locationSid,
+          })
         }
 
         req.saveSelAvailable(goodsStocks).then((res) => {
diff --git a/src/views/outStorage/zeroPicking/index.vue b/src/views/outStorage/zeroPicking/index.vue
index 139ed1e..13fd156 100644
--- a/src/views/outStorage/zeroPicking/index.vue
+++ b/src/views/outStorage/zeroPicking/index.vue
@@ -224,8 +224,8 @@
                     <el-row>
                       <el-col :span="8">
                         <div class="span-sty">开票总金额</div>
-                        <el-form-item> <el-input v-model="totalQuantity" :readonly="true" placeholder="" clearable
-                            class="addinputInfo addinputw" /></el-form-item>
+                        <el-form-item> <el-input v-model="from.four.totalAmount" :readonly="true" placeholder=""
+                            clearable class="addinputInfo addinputw" /></el-form-item>
                       </el-col>
                       <el-col :span="8">
                         <div class="span-sty">税号</div>
@@ -242,7 +242,7 @@
                       <el-col :span="24">
                         <div class="span-sty">内容类型</div>
                         <el-form-item> <el-radio-group v-model="from.four.contentType" size="small"
-                            class="addinputInfo addinputw">
+                            class="addinputInfo addinputw" @change="radiogroupChange">
                             <el-radio :label="'1'">发票商品</el-radio>
                             <el-radio :label="'2'">自定义明细</el-radio>
                           </el-radio-group></el-form-item>
@@ -345,7 +345,7 @@
         <el-table-column label="分配数量" align="center" min-width="200">
           <template slot-scope="scope">
             <el-input v-model="scope.row.count" clearable placeholder=""
-              oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
+              oninput="value=value.replace(/^0+(\d)|[^\d]+/g,'')" />
           </template>
         </el-table-column>
       </el-table>
@@ -863,6 +863,7 @@
         this.from.four.invoiceTypeValue = choose[0].dictValue
       },
       saveInvoice() {
+        this.from.four.billSid = this.rowItemSid
         req.saveOrderInvoive(this.from.four).then((resp) => {
           if (res.success) {
             this.$message({
@@ -880,17 +881,55 @@
       },
       handleClose() {
         this.dialogVisible = false
+        this.$refs.main.clearSelection()
       },
       handleSelectionChange(val) {
         console.log("val", val);
         this.goodsList = val
       },
+      radiogroupChange(val) {
+        console.log("val", val);
+
+        let quantity = 0
+        if (this.from.first.length > 0) {
+          this.from.first.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
+
+        if (val == '1') {
+          this.from.four.detailsList = this.from.first
+        } else {
+          this.from.four.detailsList = []
+        }
+
+      },
       saveData() {
         this.from.four.detailsList = this.goodsList
         this.dialogVisible = false
+        this.$refs.main.clearSelection()
+
+        let quantity = 0
+        if (this.from.four.detailsList.length > 0) {
+          this.from.four.detailsList.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
       },
       delGoods(index) {
         this.from.four.detailsList.splice(index, 1)
+        let quantity = 0
+        if (this.from.four.detailsList.length > 0) {
+          this.from.four.detailsList.forEach((e) => {
+            quantity += Number(e.salesAmount)
+          })
+        }
+
+        this.from.four.totalAmount = quantity
       },
       selectCarrier(row, val) {
         console.log("selectCarrier", val);
@@ -967,23 +1006,20 @@
 
           var item = this.goodsStockList[i]
 
-          if (Number(item.count) > 0) {
-
-            goodsStocks.push({
-              "sid": item.locationSid,
-              "sourceBillSid": this.rowItemSid,
-              "goodsSkuSid": item.goodsSkuSid,
-              "goodsSpuName": item.goodsSpuName,
-              "goodsSpuTitle": "",
-              "goodsSkuCode": '',
-              "count": item.count,
-              "rackSid": item.rackSid,
-              "rackCode": item.rackCode,
-              "inventorySid": item.inventorySid,
-              "initialCount": item.initialCount,
-              "locationSid": item.locationSid,
-            })
-          }
+          goodsStocks.push({
+            "sid": item.locationSid,
+            "sourceBillSid": this.rowItemSid,
+            "goodsSkuSid": item.goodsSkuSid,
+            "goodsSpuName": item.goodsSpuName,
+            "goodsSpuTitle": "",
+            "goodsSkuCode": '',
+            "count": item.count,
+            "rackSid": item.rackSid,
+            "rackCode": item.rackCode,
+            "inventorySid": item.inventorySid,
+            "initialCount": item.initialCount,
+            "locationSid": item.locationSid,
+          })
         }
 
         req.saveSelAvailable(goodsStocks).then((res) => {