From cbc2fe74fb54aad814695982c2987e064696f540 Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期五, 16 一月 2026 10:49:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 205 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 167 insertions(+), 38 deletions(-)
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 2fa0fc6..dd99f79 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -675,6 +675,117 @@
else if (this.OperationType == 3 || this.copyType == 1) {
this.handleUpdate()
}
+ else if (this.OperationType == 4) {
+ this.zzSelDis = true
+ this.handleAdd()
+ var data = this.getUrlVars_JSON();
+ var dataArray = [];
+ for (var i = 0; i < data.length; i++) {
+ // this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
+ axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+ params: {
+ "HInterID": data[i].hmainid
+ , "HSubID": data[i].hsubid
+ },
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ this.temp = result.data[0];
+ } else {
+ this.temp = result.data;
+ }
+ if (this.temp) {
+ dataArray.push(this.temp);
+ this.form.HDeptID = dataArray[0].HDeptID
+ this.form.HDeptName = dataArray[0].閮ㄩ棬
+ this.form.HEmpID = dataArray[0].HEmpID
+ this.form.HEmpName = dataArray[0].涓氬姟鍛�
+ this.form.HManagerID = dataArray[0].HManagerID
+ this.form.HManagerName = dataArray[0].涓荤
+ this.form.HMainSourceInterID = "0"
+ this.form.HMainSourceEntryID = "0"
+ this.form.HMainSourceBillNo = ""
+ this.form.HMainSourceBillType = dataArray[0].HBillType
+ this.form.HSupID = dataArray[0].HCusID
+ this.form.HSupName = dataArray[0].瀹㈡埛
+ this.form.HLinkMan = dataArray[0].鑱旂郴浜�
+ this.form.HLinkPhone = dataArray[0].鑱旂郴鐢佃瘽
+ this.form.HSellSID = dataArray[0].HSellSID
+ this.form.HSellSName = dataArray[0].閿�鍞柟寮�
+ this.form.HCurID = dataArray[0].HCurID
+ this.form.HCurName = dataArray[0].甯佸埆
+ this.form.HExRate = dataArray[0].姹囩巼
+ for (var i = 0; i < dataArray.length; i++) {
+ this.editData.push(
+ {
+ "HMaterID": dataArray[i].HMaterID
+ , "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
+ , "HUnitID": dataArray[i].HUnitID
+ , "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
+ , "HQtyMust": dataArray[i].鏁伴噺.toFixed(6)
+ , "HQty": dataArray[i].鏁伴噺.toFixed(6)
+ , "HPieceQty": "0"
+ , "HPrice": dataArray[i].鍗曚环.toFixed(4)
+ , "HTaxPrice": dataArray[i].瀹為檯鍚◣鍗曚环.toFixed(4)
+ , "HTaxRate": dataArray[i].绋庣巼
+ , "HMoney": dataArray[i].閲戦.toFixed(2)
+ , "HTaxMoney": dataArray[i].浠风◣鍚堣.toFixed(2)
+ , "HWHID": dataArray[i].HWHID
+ , "鍙戣揣浠撳簱": dataArray[i].HWHName
+ , "HRemark": ""
+ , "HQty_Full": "0"
+ , "HQty_Empty": "0"
+ , "HQty_Back": "0"
+ , "HCostPrice": "0"
+ , "HCostMoney": "0"
+ , "HSalePrice": "0"
+ , "HSeOrderInterID": dataArray[i].hmainid
+ , "HSeOrderEntryID": dataArray[i].hsubid
+ , "HSeOrderBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceInterID": dataArray[i].hmainid
+ , "HSourceEntryID": dataArray[i].hsubid
+ , "HSourceBillNo": dataArray[i].鍗曟嵁鍙�
+ , "HSourceBillType": dataArray[i].HBillType
+ , "HRelationQty": "0"
+ , "HRelationMoney": "0"
+ , 'HSPID': "0"
+ , 'HSPName': ""
+ , 'HSPGroupID': "0"
+ , "HSPGroupName": ""
+ , 'HSCWHID': "0"
+ , 'HSCWHName': ""
+ , 'HSCSPID': "0"
+ , 'HSCSPName': ""
+ , 'HBatchNo': ""
+ , 'HPOOrderInterID': "0"
+ , 'HPOOrderEntryID': "0"
+ , 'HPOOrderBillNo': ""
+ , 'HPropertyID': "0"
+ , 'HPropertyName': ""
+ , 'HSecUnitID': "0"
+ , 'HSecUnitName': ""
+ , 'HSecUnitRate': "0"
+ , 'HEngineNum': ""
+ , 'HUnderPanNum': ""
+ , 'HLeaveFactCard': ""
+ , 'HReqBuyQty': "0"
+ , 'HReqOutQty': "0"
+ , 'HCurrentInventory': "0"
+ }
+ );
+ }
+ }
+ this.$nextTick(() => {
+ this.formShow = true
+ this.formLoading = false
+ })
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ }
},
//#endregion
@@ -774,8 +885,8 @@
handleUpdate() {
this.reset()
let rowHmainid = this.linterid
- axios.get(this.baseURL + "/WLYayBillController/WL_YayBillDetail", {
- params: { 'HID': rowHmainid }
+ axios.get(this.$baseUrl + "/Kf_POStockInBill/cx", {
+ params: { 'HInterID': rowHmainid }
}).then(response => {
console.log(response.data.data.h_v_WL_YayBillEdit)
if (response.data.code == 1) {
@@ -1356,35 +1467,40 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
- var loadingRate = this.form.HLoadingRate;
- if (loadingRate && typeof loadingRate === 'string') {
- this.form.HLoadingRate = parseFloat(loadingRate.replace('%', '')) / 100;
- }
- var sMainStr = JSON.stringify(this.form);
- var sSubStr = JSON.stringify(this.editData);
- console.log(this.form)
-
- // var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
- var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"]
- console.log(sMainSub)
- axios({
- method: 'post',
- url: this.baseURL + "/WLYayBillController/SaveBill",
- data: {
- 'msg': sMainSub
- },
- }).then(response => {
- if (response.data.count == 1) {
- this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
- this.$modal.msgSuccess(response.data.Message);
- this.close()
- } else {
- this.$modal.msgError(response.data.Message)
+ let fhck = false
+ this.editData.map((item, index) => {
+ if (!item.鍙戣揣浠撳簱) {
+ fhck = true
+ this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
}
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
-
+ })
+ this.$nextTick(() => {
+ if (!fhck) {
+ var sMainStr = JSON.stringify(this.form);
+ var sSubStr = JSON.stringify(this.editData);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
+ axios({
+ method: 'post',
+ url: this.$baseUrl + "/Kf_SellOutBill/SaveSellOutBillList",
+ data: {
+ 'msg': sMainSub
+ },
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
+ this.$modal.msgSuccess(response.data.Message);
+ this.get_MAXNum_Task(1);//璁剧疆娴佹按鍙峰鍔�
+ if (response.data.Verify == "Y") //鑷姩瀹℃牳
+ {
+ this.set_CheckBill(0, this.form); //瀹℃牳
+ }
+ this.addBtnShow = true
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ })
}
});
},
@@ -1394,7 +1510,7 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ axios.get(this.$baseUrl + "/Kf_SellOutBill/AuditKf_SellOutBill", {
params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
@@ -1515,9 +1631,22 @@
},
//#endregion
+ //#region 缁勭粐涓嬫媺鍒楄〃鏁版嵁鍒濆鍖�
+ fetchData() {
+ axios.get(this.$baseUrl + "/Web/GetOrganizations", {
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.organizationList = response.data.data;//缁勭粐鍒楄〃
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+
//#region 鑾峰彇鍐呯爜銆佸崟鎹彿
getHBillNo() {
- axios.get(this.baseURL + "/Web/GetMAXNum", {
+ axios.get(this.$baseUrl + "/WEBSController/GetMaxBillNoAndID_Json", {
params: {
HBillType: '3321'
}
@@ -1534,7 +1663,7 @@
var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
axios({
method: 'get',
- url: this.baseURL + "/CommonModel/searchMethod",
+ url: this.$baseUrl + "/CommonModel/searchMethod",
params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
}).then(response => {
if (response.data.count == 1) {
@@ -1550,7 +1679,7 @@
//#region 鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
getCzyglByUser() {
- axios.get(this.baseURL + '/Xs_SeOrderBill/getCzyglByUser', {
+ axios.get(this.$baseUrl + '/Xs_SeOrderBill/getCzyglByUser', {
params: { "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let dataForm = response.data.data[0]
@@ -1568,7 +1697,7 @@
//#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
getCustomerBalance(HCusID) {
- axios.get(this.baseURL + '/Xs_CusRatingChangeBill/getCustomerBalance', {
+ axios.get(this.$baseUrl + '/Xs_CusRatingChangeBill/getCustomerBalance', {
params: { "HCusID": HCusID, 'CurUserName': sessionStorage["HUserName"] }
}).then(response => {
var data = response.data.data[0];
@@ -1583,7 +1712,7 @@
//#region 鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
getCustomerByCusID(HCusID) {
- axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ axios.get(this.$baseUrl + "/Xs_SeOrderBill/getCustomerByCusID", {
params: {
HCusID: HCusID
}
@@ -1600,7 +1729,7 @@
//#region 鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
getBarCodeNoteBySellOutBill(rowHmainid) {
- axios.get(this.baseURL + '/Kf_SellOutBill/BarCodeNote', {
+ axios.get(this.$baseUrl + '/Kf_SellOutBill/BarCodeNote', {
params: { "HInterID": rowHmainid }
}).then(response => {
if (response.data.count == 1) {
@@ -1617,7 +1746,7 @@
//#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
- axios.get(this.baseURL + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
+ axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
params: {
"HInterID": HSourceInterID
, "HSubID": HSourceEntryID
--
Gitblit v1.9.1