Browse Source

库区新加数量
是否完成调拨

Qukatie 5 days ago
parent
commit
2274155840

+ 8 - 0
src/api/tirePartsMall/salesManagement/outboundWorkOrder.js

@@ -129,4 +129,12 @@ export const itemRemove = (data) => {
     method: 'POST',
     params: data
   })
+}
+// 确认调拨
+export const confirmComplete = (data) => {
+  return request({
+    url: '/api/blade-sales-part/transferAllocate/confirmComplete',
+    method: 'POST',
+    data: data
+  })
 }

+ 4 - 0
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -63,6 +63,8 @@
                   :remote="true"
                   dataName="cname"
                   @selectChange="rowDicChange('reservoirAreaName', $event, row)"
+                  :slotRight="true"
+                  rightLabel="balanceQuantity"
                 ></dic-select>
                 <span v-else>{{ row.reservoirAreaName }}</span>
               </template>
@@ -186,6 +188,8 @@
           :remote="true"
           dataName="cname"
           @selectChange="dicChange('reservoirAreaName', $event)"
+          :slotRight="true"
+          rightLabel="balanceQuantity"
         ></dic-select>
       </span>
       <span slot="footer" class="dialog-footer">

+ 41 - 5
src/views/tirePartsMall/salesManagement/outboundWorkOrderL/detailsPage.vue

@@ -9,12 +9,22 @@
       <div class="add-customer-btn">
         <el-button class="el-button&#45;&#45;small-yh" type="primary" size="small" v-if="editButton" @click="confirmEditing">编辑 </el-button>
         <el-button class="el-button--small-yh" type="primary" size="small" :disabled="isSave" @click="editCustomer">保存数据 </el-button>
-        <el-button class="el-button--small-yh" type="warning" size="small" v-if="form.statusName == '确认调拨'" @click="revoke" :disabled="isSave"
+        <el-button class="el-button--small-yh" type="warning" size="small" v-if="form.statusName == '确认调拨'" @click="revoke" :disabled="isSave||form.status == '是'"
           >撤销调拨
         </el-button>
         <el-button class="el-button--small-yh" type="success" size="small" style="margin-left: 6px;" v-else @click="complete" :disabled="isSave"
           >确认调拨
         </el-button>
+        <el-button
+          v-if="form.statusName == '确认调拨'&&form.status == '否'"
+          class="el-button--small-yh"
+          type="info"
+          size="small"
+          style="margin-left: 6px;"
+          @click="confirmComplete"
+          :disabled="isSave"
+          >完成调拨
+        </el-button>
       </div>
     </div>
     <div style="margin-top: 50px">
@@ -26,7 +36,7 @@
               placeholder="调出仓库"
               label="cname"
               res="records"
-              :disabled="isSave||isAddDisabled||form.shipItemsList.length"
+              :disabled="isSave || isAddDisabled || form.shipItemsList.length"
               url="/blade-sales-part/storageDesc/list?current=1&size=5"
               :filterable="true"
               :remote="true"
@@ -40,7 +50,7 @@
               placeholder="调入仓库"
               label="cname"
               res="records"
-              :disabled="isSave||isAddDisabled||form.shipItemsList.length"
+              :disabled="isSave || isAddDisabled || form.shipItemsList.length"
               url="/blade-sales-part/storageDesc/list?current=1&size=5"
               :filterable="true"
               :remote="true"
@@ -194,7 +204,8 @@ import {
   transferAllocateSubmit,
   confirmTransferAllocate,
   revokeTransferAllocate,
-  itemRemove
+  itemRemove,
+  confirmComplete
 } from "@/api/tirePartsMall/salesManagement/outboundWorkOrder";
 import { dateFormat } from "@/util/date";
 import reportDialog from "@/components/report-dialog/main";
@@ -993,7 +1004,7 @@ export default {
       if (name == "callInStorageName") {
         if (row) {
           this.form.callInStorageId = row.id;
-           this.form.remarks =row.remarks
+          this.form.remarks = row.remarks;
         } else {
           this.form.callInStorageId = null;
           this.form.callInStorageName = row.id;
@@ -1078,6 +1089,31 @@ export default {
         }
       });
     },
+    confirmComplete() {
+      this.$confirm("调拨单是否确认完成?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: "加载中",
+          spinner: "el-icon-loading",
+          background: "rgba(255,255,255,0.7)"
+        });
+        confirmComplete({
+          ...this.form,
+          bizTypeName: "DBGD"
+        })
+          .then(res => {
+            this.$message.success("撤销成功");
+            this.refresh(this.form.id);
+          })
+          .finally(() => {
+            loading.close();
+          });
+      });
+    },
     rowEdit(row, index) {
       this.$set(row, "$cellEdit", !row.$cellEdit);
       // if (this.form.statusName == '录入') {

+ 4 - 0
src/views/tirePartsMall/salesService/inStorage/detailsPage.vue

@@ -123,6 +123,8 @@
                   :remote="true"
                   dataName="cname"
                   @selectChange="rowDicChange('reservoirAreaName', $event, row)"
+                  :slotRight="true"
+                  rightLabel="balanceQuantity"
                 ></dic-select>
                 <span v-else>{{ row.reservoirAreaName }}</span>
               </template>
@@ -189,6 +191,8 @@
           :remote="true"
           dataName="cname"
           @selectChange="dicChange('reservoirAreaName', $event)"
+          :slotRight="true"
+          rightLabel="balanceQuantity"
         ></dic-select>
       </span>
       <span slot="footer" class="dialog-footer">