From 2edeef58633a0a303c243f1b8fcc85b79780eea1 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 15 四月 2025 16:45:08 +0800
Subject: [PATCH] 1.采购退货优化 2.生产补料优化 3.生产领料优化 4.生产退料优化

---
 H5/PurchaseReturn.aspx |  151 +++++++++++++-------------------------------------
 1 files changed, 40 insertions(+), 111 deletions(-)

diff --git a/H5/PurchaseReturn.aspx b/H5/PurchaseReturn.aspx
index 8f82134..95949f8 100644
--- a/H5/PurchaseReturn.aspx
+++ b/H5/PurchaseReturn.aspx
@@ -8,6 +8,7 @@
 </style>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
+        <div class="content-wrapper">
     <van-nav-bar
   title="閲囪喘閫�鏂�"
   left-text="杩斿洖"
@@ -54,122 +55,50 @@
 </van-cell-group>
     </div>
   <van-tabs color="#000" title-active-color="#0283EF">
-  <van-tab title="寰呴��璐х殑鐗╂枡" class="mySolid font">
-      <van-row>
-            
-             <van-col span="12">鐗╂枡</van-col>
-          <%--<van-col span="6" class="text-left padding-left">閲囪喘鍗曞彿</van-col>--%>
-          <van-col span="6">鐢宠鏁伴噺</van-col>
-          <van-col span="6">宸叉壂鏁伴噺</van-col>
-    </van-row>
-    <van-row  v-for="(itm,index) in tableData" :key="index">
-        
-        <van-col span="12"  class="text-left padding-left">
-               <div>{{itm.itemNo}}</div>
-               <div>{{itm.itemName}}</div>
-          </van-col>
-        <%--<van-col span="6">{{itm.invBillNo}}</van-col>--%>
-          <van-col span="6">{{itm.sqNum}}</van-col>
-          <van-col span="6">{{itm.ysNum}}</van-col>
-    </van-row>
-  </van-tab>
-   <%--<van-tab title="宸叉壂鏉$爜" class="mySolid font">
-         <van-row>
-            <van-col span="12" class="text-left padding-left">鐗╂枡</van-col>
-             <van-col span="6">鏁伴噺</van-col>
-            <van-col span="6">搴撲綅缂栫爜</van-col>
+    <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
+        <van-row>
+            <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+            <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+            <van-col span="3">寰呮壂</van-col>
+            <van-col span="5">鎺ㄨ崘搴撲綅</van-col>
         </van-row>
-        <van-row  v-for="(itm,index) in codeTableData" :key="index">
-           <van-col span="12" class="text-left padding-left">
-                <div>{{itm.itemNo}}</div>
+        <van-row v-for="(itm,index) in ItemDetail.items" :key="index">
+            <van-col span="8" class="text-left padding-left">
+                <div class="blue-text">{{itm.itemNo}}</div>
                 <div>{{itm.itemName}}</div>
-           </van-col>
-            <van-col span="6" class="text-left padding-left">
-                <div>{{itm.quantity}}</div>
-                <div>{{itm.itemUnit}}</div>
             </van-col>
-           <van-col span="6">{{itm.depotSectionCode}}</van-col>
-       </van-row>
-   </van-tab>--%>
-      <%--<van-tab title="閫�璐у崟" class="mySolid font">
-         <van-field
-          v-model="formData.itemOutNo"
-          label="鍑哄簱鍗曞彿"
-          placeholder="鍑哄簱鍗曞彿"
-          disabled
-        ></van-field>
-        <van-field
-          v-model="formData.billTypeName"
-          label="鍗曟嵁绫诲瀷"
-          placeholder="鍗曟嵁绫诲瀷"
-          disabled
-        ></van-field>
-        <van-field
-          v-model="formData.createBy"
-          label="鍒涘缓浜�"
-          placeholder="鍒涘缓浜�"
-          disabled
-        ></van-field>
-        <van-field
-          v-model="formData.createDate"
-          label="鍒涘缓鏃堕棿"
-          placeholder="鍒涘缓鏃堕棿"
-          disabled
-        ></van-field>
-        <van-field
-          v-model="formData.depotName"
-          label="閫�鏂欎粨搴�"
-          placeholder="閫�鏂欎粨搴�"
-          disabled
-        ></van-field>
-        <van-checkbox v-model="formData.fType == 1" disabled>濮斿閫�璐�</van-checkbox>
-        <van-field
-          v-model="formData.reason"
-          label="閫�璐у師鍥�"
-          placeholder="閫�璐у師鍥�"
-          disabled
-        ></van-field>
-        <van-field
-          v-model="formData.fmrmode"
-          label="閫�鏂欐柟寮�"
-          placeholder="閫�鏂欐柟寮�"
-          disabled
-        ></van-field>
-        <van-field
-          v-model="formData.suppNo"
-          label="渚涘簲鍟嗙紪鐮�"
-          placeholder="渚涘簲鍟嗙紪鐮�"
-          disabled
-        ></van-field>
-        <van-field
-          v-model="formData.suppName"
-          label="渚涘簲鍟嗗悕绉�"
-          placeholder="渚涘簲鍟嗗悕绉�"
-          disabled
-        ></van-field>
-        <van-field
-           v-model="formData.checkUserFname"
-           label="瀹℃牳浜�"
-           placeholder="瀹℃牳浜�"
-           disabled
-         ></van-field>
-          <van-field
-           v-model="formData.checkDate"
-           label="瀹℃牳鏃堕棿"
-           placeholder="瀹℃牳鏃堕棿"
-           disabled
-         ></van-field>
-          <van-field
-           v-model="formData.remark"
-           label="澶囨敞"
-           placeholder="澶囨敞"
-           disabled
-         ></van-field>
-      </van-tab>--%>
+            <van-col span="8" class="text-left padding-left">
+                <div>{{itm.itemModel}}</div>
+            </van-col>
+            <van-col span="3" class="blue-text">{{itm.dsQty}}</van-col>
+            <van-col span="5">{{itm.recoKw}}</van-col>
+        </van-row>
+    </van-tab>
+
+    <van-tab title="宸查鐗╂枡" class="mySolid font">
+        <van-row>
+            <van-col span="8" class="text-left padding-left">鐗╂枡</van-col>
+            <van-col span="8" class="text-left padding-left">瑙勬牸</van-col>
+            <van-col span="3">闇�棰嗘暟</van-col>
+            <van-col span="5">宸查鏁�</van-col>
+        </van-row>
+        <van-row v-for="(itm,index) in ItemDetail.ysitems" :key="index">
+            <van-col span="8" class="text-left padding-left">
+                <div class="blue-text">{{itm.itemNo}}</div>
+                <div>{{itm.itemName}}</div>
+            </van-col>
+            <van-col span="8" class="text-left padding-left">
+                <div>{{itm.itemModel}}</div>
+            </van-col>
+            <van-col span="3">{{itm.fQty}}</van-col>
+            <van-col span="5" class="blue-text">{{itm.sQty}}</van-col>
+        </van-row>
+    </van-tab>
 </van-tabs>
 
-    <van-button type="primary" @click="SaveBarCodes" >纭</van-button>
+<%--    <van-button type="primary" @click="SaveBarCodes" >纭</van-button>--%>
     <van-action-sheet v-model="show" :actions="itemOutNoStr" @select="onSelect" ></van-action-sheet>
+                </div>
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
     <comloading  v-if="isLoading"></comloading>
@@ -178,5 +107,5 @@
     <%--<comback ></comback>--%>
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
-    <script src="Js/PurchaseReturn.js?<%=128 %>"></script>
+    <script src="Js/PurchaseReturn.js?<%=12811 %>"></script>
 </asp:Content>

--
Gitblit v1.9.3