From 9b26df9a644c17cdd587f0999f81c77dbb7b33c4 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 10 十二月 2025 18:07:09 +0800
Subject: [PATCH] 生产报工修改
---
Scripts/config.js | 1
H5/Js/Scbg.js | 223 ++++++++++++++++++++++++++++++++++++++++----
H5/Scbg.aspx | 71 +++++++++++++
3 files changed, 269 insertions(+), 26 deletions(-)
diff --git a/H5/Js/Scbg.js b/H5/Js/Scbg.js
index cbafb1f..3aa7fe6 100644
--- a/H5/Js/Scbg.js
+++ b/H5/Js/Scbg.js
@@ -12,21 +12,27 @@
stafId: "",
stafName: "",
stafList: [],
-
+ BarcodesDetail: [],
+ itemDetail: [],
taskNo: "", //宸ュ崟鍙�
itemNo: "", //鐗╂枡缂栧彿
planQty: "", //璁″垝鏁伴噺
reportedQty: "", //宸叉姤宸ユ暟閲�
currentQty: "", //鏈鎶ュ伐鏁伴噺
barcodeQty: "", //鏉＄爜鏁伴噺
+ sjBillNo: "",//閫佹鍗曞彿
itemName: "", //鐗╂枡鍚嶇О
itemModel: "", //鐗╂枡鍨嬪彿
load: false,
active: 0,
- show: false,
- actions: [],
+ actions: [],//鍒楄〃鐨勫��
+ show: false,//鍒楄〃灞曠ず
+
+ billactive: 0,
+ billactions: [],//鍒楄〃鐨勫��
+ billshow: false,//鍒楄〃灞曠ず
}
},
mounted() {
@@ -46,18 +52,45 @@
return { name: item.staffName }
});
+ that.stafId = that.userInfo.loginAccount;
+ //that.stafId = '0305';
+ console.log('DAccccccccDAD' + that.stafId);
+
that.stafList = json.data.tbBillList;
+ //console.log('DAWDADWDADADADWD' + that.stafList);
+ //console.log('DAWDADWDA' + that.stafList);
+ //console.log('DADADAD' + that.stafId);
+
+ let staf = that.stafList.filter(it => String(it.staffNo) === String(that.stafId));
+
+ if (staf.length > 0) {
+ that.stafName = staf[0].staffName;
+ that.stafId = staf[0].staffNo;
+ that.$refs.barcode.focus();
+ } else {
+ that.$toast("鏈壘鍒板尮閰嶇殑 鐢ㄦ埛鍚嶇О");
+ that.$playSound('error');
+ }
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
+ that.$playSound('error');
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
console.log(error);
});
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+
+
+ //this.GetMesItemBlDetailByBillNo();
+ //this.$toast(item.name);
+
},
methods: {
@@ -75,11 +108,48 @@
that.actions = json.data.tbBillList.map(item => {
return { name: item.staffName }
});
+ that.$playSound('success');
that.stafList = json.data.tbBillList;
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ });
+ },
+ selectBillNo() {
+ this.billshow = true;
+
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesWorkProd/GetRksqSelect',
+ {
+ staffNo: that.stafId
+ //name: that.userInfo.loginAccount,
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+ that.billactions = json.data.result.rksqOrderList.map(item => {
+ return { name: item.billNo }
+ });
+
+
+
+ that.stafList = json.data.result.rksqOrderList;
+ that.$playSound('success');
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
@@ -112,6 +182,26 @@
//this.$toast(item.name);
},
+ onBillSelect(item) {
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+ this.billshow = false;
+
+ let staf = this.stafList.filter(it => it.billNo === item.name);
+
+ if (staf.length > 0) {
+ this.sjBillNo = staf[0].billNo;
+ this.$refs.sjBillNo.focus();
+ } else {
+ this.$toast("鏈壘鍒板尮閰嶇殑閫佹鍗曞彿");
+ that.$playSound('error');
+ }
+
+ this.getBillNo();
+ //this.GetMesItemBlDetailByBillNo();
+ //this.$toast(item.name);
+
+ },
getStaff() {
var that = this;
@@ -127,21 +217,28 @@
});
that.stafList = json.data.tbBillList;
+ that.$playSound('success');
+ console.log('DAWDADWDADADADWD' + that.stafList);
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
})
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
// 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
// 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
- let staf = that.stafList.filter(it => it.staffNo === that.stafId);
+ console.log('DAWDADWDA' + that.stafList);
+ console.log('DADADAD' + this.stafId);
+
+ let staf = that.stafList.filter(it => String(it.staffNo) === String(that.stafId));
if (staf.length > 0) {
that.stafName = staf[0].staffName;
@@ -157,22 +254,25 @@
getBarcode() {
//this.barcode = value;
-
+ //this.show = true;
var that = this;
-
+
if (!that.userInfo.loginAccount) {
this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+ that.$playSound('error');
return;
}
if (!that.barcode) {
this.$toast.fail("鏉＄爜涓嶈兘涓虹┖");
+ that.$playSound('error');
return;
}
if (!that.stafId) {
that.$toast.fail("鍛樺伐涓嶅厑璁镐负绌�");
+ that.$playSound('error');
return;
}
@@ -195,12 +295,20 @@
that.barcodeQty = entity.barcodeQty; //鏉＄爜鏁伴噺
that.itemName = entity.itemName; //鐗╂枡鍚嶇О
that.itemModel = entity.itemModel; //鐗╂枡鍨嬪彿
+ that.sjBillNo = entity.sjBillNo;
+ that.BarcodesDetail = entity.barcodesDetail;
+ that.itemDetail = entity.itemDetail;
+ console.log('DADWADWD WDD AD AD A');
+ console.log(entity.barcodesDetail);
+ console.log(that.BarcodesDetail);
that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$playSound('success');
that.$refs.barcode.focus();
that.barcode = null;
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
that.$refs.barcode.focus();
that.barcode = null;
}
@@ -209,6 +317,7 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
},
@@ -221,40 +330,53 @@
if (!that.userInfo.loginAccount) {
this.$toast.fail("璇烽噸鏂版鏌ョ櫥褰曠姸鎬�");
+ that.$playSound('error');
that.load = false;
return;
}
- if (!that.barcode) {
- this.$toast.fail("鏉＄爜涓嶈兘涓虹┖");
- that.load = false;
- return;
- }
+ //if (!that.barcode) {
+ // this.$toast.fail("鏉＄爜涓嶈兘涓虹┖");
+ // that.load = false;
+ // return;
+ //}
- if (!that.currentQty) {
- this.$toast.fail("鎶ュ伐鏁伴噺涓嶈兘涓虹┖");
- that.load = false;
- return;
- }
+ //if (!that.currentQty) {
+ // this.$toast.fail("鎶ュ伐鏁伴噺涓嶈兘涓虹┖");
+ // that.load = false;
+ // return;
+ //}
- if (that.currentQty <=0) {
- this.$toast.fail("鎶ュ伐鏁伴噺闇�瑕佸ぇ浜庨浂");
+ //if (that.currentQty <=0) {
+ // this.$toast.fail("鎶ュ伐鏁伴噺闇�瑕佸ぇ浜庨浂");
+ // that.load = false;
+ // return;
+ //}
+
+ if (!that.sjBillNo) {
+ this.$toast.fail("閫佹鍗曞彿涓嶈兘涓虹┖");
+ that.$playSound('error');
that.load = false;
return;
}
that.AxiosHttp("post", 'MesWorkProd/ScanWorkProd', {
- userNo: that.userInfo.loginAccount,
- itemBarcode: that.barcode,
- quantity: that.currentQty
+ userNo: that.stafId,
+ //itemBarcode: that.barcode,
+ //quantity: that.currentQty
+ sjBillNo: that.sjBillNo
}, false)
.then(function (res) {
var json = res;
if (json.status == 0) {
- that.$notify({ type: 'success', message: '淇濆瓨鎴愬姛' });
+ that.$notify({ type: 'success', message: '閫佹鎴愬姛' });
+ that.sjBillNo = "";
+ that.BarcodesDetail = [];
+ that.$playSound('success');
}
else {
that.$toast.fail(json.message);
+ that.$playSound('error');
}
that.isLoading = false;
that.load = false;
@@ -262,8 +384,65 @@
.catch(function (error) {
that.isLoading = false;
that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
console.log(error);
});
+ },
+
+ getBillNo() {
+ var that = this;
+ that.isLoading = true;
+ that.AxiosHttp("post", 'MesWorkProd/GetRksqList', {
+ staffNo: that.stafId,
+ sjBillNo: that.sjBillNo
+ }, false)
+ .then(function (res) {
+ var json = res;
+ if (json.status == 0) {
+
+ let entity = json.data.result;
+ that.BarcodesDetail = entity.barcodesDetail;
+ that.itemDetail = entity.itemDetail;
+ console.log('DADWADWD WDD AD AD A');
+ console.log(entity.barcodesDetail);
+ console.log(that.BarcodesDetail);
+ that.$notify({ type: 'success', message: '鎵弿鎴愬姛' });
+ that.$refs.sjBillNo.focus();
+ that.$playSound('success');
+ }
+ else {
+ that.$toast.fail(json.message);
+ that.$refs.sjBillNo.focus();
+ that.$playSound('error');
+ that.barcode = null;
+ }
+ that.isLoading = false;
+ })
+ .catch(function (error) {
+ that.isLoading = false;
+ that.$toast.fail("缃戠粶閿欒锛岃閲嶈瘯锛�");
+ that.$playSound('error');
+ console.log(error);
+ });
+ // 榛樿鎯呭喌涓嬬偣鍑婚�夐」鏃朵笉浼氳嚜鍔ㄦ敹璧�
+ // 鍙互閫氳繃 close-on-click-action 灞炴�у紑鍚嚜鍔ㄦ敹璧�
+
+ //console.log('DAWDADWDA' + that.stafList);
+ //console.log('DADADAD' + this.stafId);
+
+ //let staf = that.stafList.filter(it => String(it.staffNo) === String(that.stafId));
+
+ //if (staf.length > 0) {
+ // that.stafName = staf[0].staffName;
+ // that.stafId = staf[0].staffNo;
+ // that.$refs.barcode.focus();
+ //} else {
+ // that.$toast("鏈壘鍒板尮閰嶇殑 鐢ㄦ埛鍚嶇О");
+ //}
+ //this.GetMesItemBlDetailByBillNo();
+ //this.$toast(item.name);
+
}
+
}
})
\ No newline at end of file
diff --git a/H5/Scbg.aspx b/H5/Scbg.aspx
index b52bd29..3578b7e 100644
--- a/H5/Scbg.aspx
+++ b/H5/Scbg.aspx
@@ -38,7 +38,7 @@
readonly
></van-field>
<van-field
- ref="barcode"
+ ref="barcode"
value=""
label="鎶ュ伐鏉＄爜"
clearable
@@ -120,10 +120,73 @@
:right-icon-size="19"
placeholder="鎶ュ伐鏁伴噺"
></van-field>
+ <van-field
+ ref="sjBillNo"
+ value=""
+ label="閫佹鍗曞彿"
+ clearable
+placeholder="閫佹鍗曞彿"
+ @keyup.enter.native ="getBillNo"
+ <%--@input="getBillNo"--%>
+ :right-icon-size="19"
+ v-model="sjBillNo"
+ v-focus.noKeyboard
+>
+ <template #button>
+ <van-button size="small" type="info" plain @click="selectBillNo" >閫夋嫨</van-button>
+ </template>
+ </van-field>
+
</van-cell-group>
- <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>
+ <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>
+ <van-action-sheet v-model="billshow" :actions="billactions" @select="onBillSelect" ></van-action-sheet>
+
+ <van-tabs color="#000" title-active-color="#0283EF">
+
+ <van-tab title="鎶ュ伐鐗╂枡姹囨��" class="mySolid font">
+ <van-row>
+ <van-col span="8" >鐗╂枡缂栧彿</van-col>
+ <van-col span="6" >鐗╂枡鍚嶇О</van-col>
+ <van-col span="6">瑙勬牸</van-col>
+ <van-col span="3">鏁伴噺</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in itemDetail" :key="index">
+ <van-col span="8" >
+ <div class="blue-text">{{itm.itemNo}}</div>
+ </van-col>
+ <van-col span="6">
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="6">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.bgQuantity}}</van-col>
+ </van-row>
+</van-tab>
+
+ <van-tab title="鎶ュ伐鏉＄爜淇℃伅" class="mySolid font">
+ <van-row>
+ <van-col span="8" >鏉＄爜缂栧彿</van-col>
+ <van-col span="6" >鐗╂枡鍚嶇О</van-col>
+ <van-col span="6">瑙勬牸</van-col>
+ <van-col span="3">鏁伴噺</van-col>
+ </van-row>
+ <van-row v-for="(itm,index) in BarcodesDetail" :key="index">
+ <van-col span="8" >
+ <div class="blue-text">{{itm.itemBarcode}}</div>
+ </van-col>
+ <van-col span="6">
+ <div>{{itm.itemName}}</div>
+ </van-col>
+ <van-col span="6">
+ <div>{{itm.itemModel}}</div>
+ </van-col>
+ <van-col span="3" class="blue-text">{{itm.bgQuantity}}</van-col>
+ </van-row>
+ </van-tab>
+
</div>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder3" Runat="Server">
@@ -131,5 +194,5 @@
<%--<comback ></comback>--%>
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="ContentPlaceHolder4" Runat="Server">
- <script src="Js/Scbg.js?<%=12328 %>"></script>
+ <script src="Js/Scbg.js?<%=12369 %>"></script>
</asp:Content>
diff --git a/Scripts/config.js b/Scripts/config.js
index 4dad32c..2171cbe 100644
--- a/Scripts/config.js
+++ b/Scripts/config.js
@@ -1,4 +1,5 @@
锘縱ar APIURL = "http://192.168.0.51:8083/api/";//PDA鍚庣鍙戝竷娴嬭瘯鍦板潃锛堝唴缃戯級
+//var APIURL = "http://localhost:5204/api/";//鏈湴娴嬭瘯
var APIURL_PC = "http://192.168.0.51:8081/"; //PC鍚庣鐨勬祴璇曞湴鍧�锛堝缃戯級
var APIURL_IMAGE = APIURL_PC+"upload/";
--
Gitblit v1.9.3