Qukatie 1 день назад
Родитель
Сommit
1276e13733

+ 1 - 1
src/views/tirePartsMall/purchaseService/outStorage/detailsPage.vue

@@ -424,7 +424,7 @@ export default {
             disabled: false
           },
           {
-            label: "实际库存",
+            label: "参考库存",
             prop: "inventory",
             remote: true,
             overHidden: true

+ 23 - 2
src/views/tirePartsMall/salesManagement/Inventory/components/viewArea.vue

@@ -32,7 +32,9 @@
             placeholder="库区"
             label="cname"
             res="records"
-            :url="'/blade-sales-part/reservoirarea/list?current=1&size=5&storageId=' + form.storageId"
+            :url="
+              '/blade-sales-part/reservoirarea/listZero?current=1&size=5&storageId=' + form.storageId + '&goodsId=' + query.goodsId + '&dot=' + (query.dot?query.dot:'')
+            "
             :filterable="true"
             :remote="true"
             dataName="cname"
@@ -41,7 +43,7 @@
           ></dic-select>
         </template>
         <template slot="quantity" slot-scope="{ row }">
-          <el-input-number v-model="row.quantity" size="small" :controls="false" style="width: 100%" :disabled="disabled" />
+          <el-input-number v-model="row.quantity" size="small" :controls="false" style="width: 100%" :disabled="disabled" @change="qtyChange(row)"/>
         </template>
         <template slot-scope="{ row, index }" slot="menu">
           <el-button icon="el-icon-delete" :disabled="disabled" size="small" type="text" @click="rowDel(row, index)">删除 </el-button>
@@ -93,6 +95,16 @@ export default {
             prop: "reservoirAreaName",
             overHidden: true
           },
+               {
+            label: "库存",
+            prop: "balanceQuantity",
+            overHidden: true
+          },
+           {
+            label: "盈亏数量",
+            prop: "profitLossNum",
+            overHidden: true
+          },
           {
             label: "本次数量",
             prop: "quantity",
@@ -166,6 +178,9 @@ export default {
         }
       }
     },
+    qtyChange(row){
+      row.profitLossNum=Number(row.quantity)-Number(row.balanceQuantity)
+    },
     openDialog(form, row, index) {
       this.form = {};
       this.query = {};
@@ -179,6 +194,7 @@ export default {
     },
     submit() {
       let sum = 0;
+      let profitLossNumSum=0;
       for (let item of this.data) {
         if (!item.reservoirAreaId) {
           return this.$message.error("请选择库区");
@@ -187,10 +203,15 @@ export default {
           return this.$message.error("本次数量不能为0");
         }
         sum += Number(item.quantity);
+        profitLossNumSum+=Number(item.profitLossNum?item.profitLossNum:0);
+      }
+      if(Number(profitLossNumSum)==0){
+        return this.$message.error("盈亏数量的总数不能为零");
       }
       let obj = {
         ...this.query,
         sendNum: sum,
+        profitLossNum:profitLossNumSum,
         historyList: this.data
       };
       this.$emit("areaData", obj, this.index);

+ 13 - 5
src/views/tirePartsMall/salesManagement/Inventory/detailsPage.vue

@@ -974,9 +974,8 @@ export default {
     areaData(row, index) {
       this.form.orderItemsList[index].dot = row.dot;
       this.form.orderItemsList[index].historyList = row.historyList;
-      this.form.orderItemsList[index].sendNumHave = row.sendNum;
-      // this.form.orderItemsList[index].sendNum = row.sendNum;
-      this.calculator(this.form.orderItemsList[index]);
+      this.form.orderItemsList[index].profitLossNum =row.profitLossNum
+      this.calculation(this.form.orderItemsList[index]);
     },
     outExport() {
       if (!this.form.id) return this.$message.error("请保存单据");
@@ -1106,8 +1105,17 @@ export default {
       this.$set(row, "profitLossNum", Number(row.sendNum) - Number(row.inventory));
       this.$set(row, "profitLossAmount", Number(row.subTotalMoney) - Number(row.price));
     },
+    calculation(row) {
+      //明细的实际数量=明细总库存+明细盈亏数量
+      row.sendNum = Number(Number(row.profitLossNum) + Number(row.inventory));
+      //实际数量赋值给自有数量
+      row.sendNumHave = row.sendNum;
+      //实际金额=实际数量*库存单价
+      row.subTotalMoney = Number(Number(row.sendNum) * Number(row.costprie)).toFixed(2);
+      //盈亏金额=实际金额-账面金额
+      row.profitLossAmount = Number(Number(row.subTotalMoney) - Number(row.price)).toFixed(2);
+    },
     calculator(row) {
-      console.log(row);
       row.sendNum = Number(Number(row.sendNumFinancing) + Number(row.sendNumHave));
       row.subTotalMoney = Number(Number(row.sendNum) * Number(row.costprie)).toFixed(2);
       row.profitLossNum = Number(row.sendNum) - Number(row.inventory);
@@ -1219,7 +1227,7 @@ export default {
             this.editDisabled = true;
             this.optionForm.disabled = true;
           }
-          this.mingxibaocun=true
+          this.mingxibaocun = true;
           this.form = res.data.data;
           this.$nextTick(() => {
             this.$refs.formContacts.doLayout();

+ 1 - 1
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/components/viewArea.vue

@@ -43,7 +43,7 @@
                 '&goodsId=' +
                 query.goodsId +
                 '&dot=' +
-                query.dot
+                (query.dot?query.dot:'')
             "
             :filterable="true"
             :remote="true"

+ 1 - 1
src/views/tirePartsMall/salesService/inStorage/detailsPage.vue

@@ -561,7 +561,7 @@ export default {
             ovrHidden: true
           },
           {
-            label: "实际库存",
+            label: "参考库存",
             prop: "inventory",
             remote: true,
             overHidden: true