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/Js/Scbl.js | 10 -
H5/Js/PurchaseReturn.js | 32 -----
H5/Scll.aspx | 27 ----
H5/PurchaseReturn.aspx | 151 ++++++++----------------------
H5/Scbg.aspx | 6
H5/Sctl.aspx | 4
H5/Scbl.aspx | 70 ++++++++-----
7 files changed, 98 insertions(+), 202 deletions(-)
diff --git a/H5/Js/PurchaseReturn.js b/H5/Js/PurchaseReturn.js
index b2618f8..d836ded 100644
--- a/H5/Js/PurchaseReturn.js
+++ b/H5/Js/PurchaseReturn.js
@@ -14,7 +14,7 @@
quantity:0
},
formData: {},
- tableData: [],
+ ItemDetail: [],
codeTableData: [],
itemOutNoList: [],
itemOutNoStr: [],
@@ -148,46 +148,22 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.tableData = json.data.tbBillList.sumItem;
- that.scanFormData.itemNo = json.data.tbBillList.itemNo
- //that.scanFormData.quantity = json.data.tbBillList.quantity
- //console.log(json);
+ that.ItemDetail = json.data.tbBillList;
that.$refs.barcode.focus();
}
else {
that.$toast.fail(json.message);
+ that.ItemDetail = [];
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- console.log(error);
+ that.ItemDetail = [];
});
},
- //getScanBarcode() {
- // var that = this;
- // that.isLoading = true;
- // that.AxiosHttp("post", 'MesInvItemOuts/GetScanBarcode', {
- // id: that.formData.guid
- // }, false)
- // .then(function (res) {
- // var json = res;
- // if (json.status == 0) {
- // that.codeTableData = res.data.tbBillList;
- // }
- // else {
- // that.$toast.fail(json.message);
- // }
- // that.isLoading = false;
- // })
- // .catch(function (error) {
- // that.isLoading = false;
- // that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
- // console.log(error);
- // });
- //},
SaveBarCodes() {
//if (!this.scanFormData.barcode) {
diff --git a/H5/Js/Scbl.js b/H5/Js/Scbl.js
index f8b69fb..cbfdb80 100644
--- a/H5/Js/Scbl.js
+++ b/H5/Js/Scbl.js
@@ -19,6 +19,7 @@
active: 0,
show: false,
actions: [],
+ ItemDetail: [],
}
},
mounted() {
@@ -64,11 +65,6 @@
console.log(error);
});
},
- onClick(index, title) {
- this.$toast(`${index} ${title}`);
- this.$notify({ type: 'success', message: '鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛鏌愭煇鐗╂枡鎵爜鎴愬姛' });
-
- },
onSelect(item) {
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
@@ -89,8 +85,8 @@
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.ItemBlDetail = json.data.tbBillList.item2;
- that.daa001 = json.data.tbBillList.item1;
+ that.ItemDetail = json.data.tbBillList;
+ that.daa001 = json.data.tbBillList.daa001;
that.$refs.barcode.focus();
}
else {
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>
diff --git a/H5/Scbg.aspx b/H5/Scbg.aspx
index 022cb8e..78ebfd8 100644
--- a/H5/Scbg.aspx
+++ b/H5/Scbg.aspx
@@ -14,7 +14,7 @@
left-arrow
@click-left="GoBack()"
></van-nav-bar>
- <div>
+ <div class="content-wrapper">
<van-cell-group>
<van-field
value=""
@@ -121,10 +121,10 @@
placeholder="鎶ュ伐鏁伴噺"
></van-field>
</van-cell-group>
- </div>
+
<van-button type="primary" @click="tmcf" :loading="load" loading-text="鍙戦�佷腑">纭</van-button>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
-
+</div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
<comloading v-if="isLoading"></comloading>
diff --git a/H5/Scbl.aspx b/H5/Scbl.aspx
index f5fa661..3fdc10b 100644
--- a/H5/Scbl.aspx
+++ b/H5/Scbl.aspx
@@ -14,7 +14,7 @@
left-arrow
@click-left="GoBack()"
></van-nav-bar>
- <div>
+ <div class="content-wrapper">
<van-cell-group>
<van-field
ref="billNo"
@@ -69,40 +69,56 @@
<van-button size="small" type="info" plain @click="tmcf" >鏉＄爜鎷嗗垎</van-button>
</template></van-field>
</van-cell-group>
- </div>
-
- <div class="van-tab-left">
- <van-tabs <%--@click="onClick"--%> color="#000" title-active-color="#0283EF" >
- <van-tab title="寰呭彂鐗╂枡" class="mySolid font">
-<%-- <van-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12">鐗╂枡:{{value.bld002}}</van-col>
- <van-col span="6">鐢宠鏁皗{value.bld007}}</van-col>
- <van-col span="6">宸查鏁皗{value.bld008}}</van-col>
- </van-row>--%>
+
+ <van-tabs color="#000" title-active-color="#0283EF">
+ <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-row>
-<van-row v-for="value in ItemBlDetail" class="font">
- <van-col span="12" class="text-left padding-left">
- <div>{{value.bld002}}</div>
- <div>{{value.bld003}}</div>
- </van-col>
- <van-col span="6">{{value.bld007}}</van-col>
- <van-col span="6">{{value.bld008}}</van-col>
-</van-row>
- </van-tab>
+ <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.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="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>
- </div>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
-
+ </div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
<comloading v-if="isLoading"></comloading>
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scbl.js?<%=12318 %>"></script>
+ <script src="Js/Scbl.js?<%=1231811 %>"></script>
</asp:Content>
diff --git a/H5/Scll.aspx b/H5/Scll.aspx
index 45b3867..15f4ce2 100644
--- a/H5/Scll.aspx
+++ b/H5/Scll.aspx
@@ -1,30 +1,9 @@
锘�<%@ Page Title="鐢熶骇棰嗘枡" Language="C#" MasterPageFile="~/Mst.master" AutoEventWireup="true" CodeFile="Scll.aspx.cs" Inherits="H5_Scll" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<style>
-
-
-
-/*.van-nav-bar__content {
- height: 0.8267rem;
-}*/
-
-/*.van-nav-bar__title {
- max-width: 60%;
- margin: 0 auto;
- color: #323233;
- font-weight: 500;
- font-size: .3267rem;
-}*/
-
-
-
-
-/* 鐗规畩鏂囨湰鏍峰紡 */
-/*.blue-text {
- color: #1989fa;
- font-weight: 500;
-}*/
-
+ .bg-info {
+ background-color: #fff;
+ }
</style>
</asp:Content>
diff --git a/H5/Sctl.aspx b/H5/Sctl.aspx
index 29435ed..d066c82 100644
--- a/H5/Sctl.aspx
+++ b/H5/Sctl.aspx
@@ -68,7 +68,7 @@
disabled
></van-field>
</van-cell-group>
- </div>
+
<%-- <van-tabs color="#000" title-active-color="#0283EF" >
<van-tab title="寰呴��鏄庣粏">
@@ -124,7 +124,7 @@
</van-tabs>
<van-action-sheet v-model="show" :actions="actions" @select="onSelect" ></van-action-sheet>
-
+ </div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
<comloading v-if="isLoading"></comloading>
--
Gitblit v1.9.3