From dcecb039035f4b2e82e31c39b74db9402444c536 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 08 四月 2025 21:35:39 +0800
Subject: [PATCH] 代码更新,优化等内容

---
 代码管理/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/proOutboundOrderDetail.vue |   70 +++++++++++++++++++----------------
 1 files changed, 38 insertions(+), 32 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/proOutboundOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/proOutboundOrderDetail.vue"
index 5941acb..5c092bc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/proOutboundOrderDetail.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/extension/outbound/extend/proOutboundOrderDetail.vue"
@@ -3,7 +3,7 @@
     <vol-box
       v-model="showDetialBox"
       :lazy="true"
-      width="75%"
+      width="85%"
       :padding="15"
       title="鍗曟嵁鏄庣粏淇℃伅"
     >
@@ -14,13 +14,13 @@
               <span>宸查�変腑 {{ selection.length }} 椤�</span>
             </el-col>
             <el-col :span="8">
-              <el-link
+              <!-- <el-link
                 type="primary"
                 size="small"
                 style="float: right; height: 20px"
                 @click="lockstocks"
                 >閿佸畾搴撳瓨</el-link
-              >
+              > -->
               <el-link
                 type="primary"
                 size="small"
@@ -91,7 +91,7 @@
         </el-table>
       </div>
     </vol-box>
-    <pp-stock-select ref="childs" ></pp-stock-select>
+    <stock-select ref="childs" ></stock-select>
     <selected-stock
       ref="SelectedStock"
       @parentCall="parentCall"
@@ -101,8 +101,8 @@
 <script>
 import VolBox from "@/components/basic/VolBox.vue";
 import VolForm from "@/components/basic/VolForm.vue";
-import StockSelect from "./StockSelect.vue";
-import SelectedStock from "./SelectedStock.vue";
+import StockSelect from "./ProStockSelect.vue";
+import SelectedStock from "./ProSelectedStock.vue";
 export default {
   components: { VolBox, VolForm, StockSelect, SelectedStock },
   data() {
@@ -183,9 +183,15 @@
           type: "string",
           width: 150,
         },
+        // {
+        //   prop: "overQtyPcs",
+        //   title: "宸插嚭鏁伴噺",
+        //   type: "string",
+        //   width: 150,
+        // },
         {
-          prop: "overQtyPcs",
-          title: "宸插嚭鏁伴噺",
+          prop: "lockQtyPcs",
+          title: "閿佸畾鏁伴噺",
           type: "string",
           width: 150,
         },
@@ -208,12 +214,6 @@
           width: 120,
         },
         {
-          prop: "spareQty",
-          title: "澶囧搧鏁�",
-          type: "string",
-          width: 120,
-        },
-          {
           prop: "assignStock",
           title: "鎸囧畾搴撳瓨",
           type: "icon",
@@ -228,6 +228,12 @@
           icon: "el-icon-s-operation",
         },
         {
+          prop: "spareQty",
+          title: "澶囧搧鏁�",
+          type: "string",
+          width: 120,
+        },
+        {
           prop: "creater",
           title: "鍒涘缓浜�",
           type: "string",
@@ -239,18 +245,18 @@
           type: "datetime",
           width: 160,
         },
-        {
-          prop: "modifier",
-          title: "淇敼浜�",
-          type: "string",
-          width: 100,
-        },
-        {
-          prop: "modifyDate",
-          title: "淇敼鏃堕棿",
-          type: "datetime",
-          width: 160,
-        },
+        // {
+        //   prop: "modifier",
+        //   title: "淇敼浜�",
+        //   type: "string",
+        //   width: 100,
+        // },
+        // {
+        //   prop: "modifyDate",
+        //   title: "淇敼鏃堕棿",
+        //   type: "datetime",
+        //   width: 160,
+        // },
         {
           prop: "remark",
           title: "澶囨敞",
@@ -308,7 +314,7 @@
       this.getData();
     },
     getData() {
-      var wheres = [{ name: "orderId", value: this.row.id }];
+      var wheres = [{ name: "proOrderId", value: this.row.id }];
       var param = {
         page: this.paginations.page,
         rows: this.paginations.rows,
@@ -356,7 +362,7 @@
       var keys = this.selection.map((item) => item.id); // 鑾峰彇閫変腑琛岀殑id
 
       this.http
-        .post("api/Mes/PPCutOutGenerateOutboundTasks", keys, "鏁版嵁澶勭悊涓�")
+        .post("api/Task/OutProductTask?stationCode=5236", keys, "鏁版嵁澶勭悊涓�")
         .then((x) => {
           if (!x.status) return this.$message.error(x.message);
           this.$message.success("鎿嶄綔鎴愬姛");
@@ -375,10 +381,10 @@
     getButtonEnable(propName, row) {
       if (propName == "assignStock") {
         if (
-          row.orderDetailStatus !== 0 &&
-          row.orderDetailStatus !== 60 &&
-          row.orderDetailStatus !== 70 &&
-          row.orderDetailStatus !== 80
+          row.proOrderDetailStatus !== 0 &&
+          row.proOrderDetailStatus !== 60 &&
+          row.proOrderDetailStatus !== 70 &&
+          row.proOrderDetailStatus !== 80
         ) {
           return true;
         } else {

--
Gitblit v1.9.3