From 358377336e3e64e088d05bf67bd952bf4f25f419 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 28 一月 2026 15:06:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MouldFile.vue | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index e45f187..b430e67 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -107,6 +107,16 @@
</el-date-picker>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="鎵樹綋绉�" prop="HPackV" v-show="isShow">
+ <el-input v-model="form.HPackV" placeholder="璇疯緭鍏ユ墭浣撶Н" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎵樻爣鍑嗗鍣ㄦ暟閲�" prop="HStandardQtyForMouldInPack" v-show="isShow">
+ <el-input v-model="form.HStandardQtyForMouldInPack" placeholder="璇疯緭鍏ユ墭鏍囧噯瀹瑰櫒鏁伴噺" />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="6">
@@ -627,6 +637,7 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ HUnitName:[{required: true, message: "鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }],
// HSupName: [
// { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
// ],
@@ -654,7 +665,7 @@
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', {
+ axios.get(this.$baseUrl + '/Xs_SeOrderBill/loadXs_SeOrderBill_Push', {
params: {
"HInterID": data[i].hmainid
, "HSubID": data[i].hsubid
@@ -773,7 +784,7 @@
},
//鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
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
@@ -844,7 +855,6 @@
this.gySupplierShow = false
this.openData = false
} else if (num == 7) {
- console.log(deptRow)
this.form.HCusName = deptRow.瀹㈡埛鍚嶇О
this.form.HCusID = deptRow.HItemID
this.gyCustomerShow = false
@@ -860,6 +870,8 @@
this.gyStockPlaceShow = false
this.openData = false
} else if (num == 11){
+ this.form.HUnitName = deptRow.璁￠噺鍗曚綅鍚嶇О;
+ this.form.HUnitID = deptRow.HItemID;
this.gyUnitShow= false
this.openData = false
@@ -908,7 +920,7 @@
},
//鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
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]
@@ -1000,6 +1012,8 @@
HInComDate: moment(new Date()).format('YYYY-MM-DD'),
DateTime: moment(new Date()).format('YYYY-MM-DD'),
HCalibrationDate: moment(new Date()).format('YYYY-MM-DD'),
+ HPackV:0,
+ HStandardQtyForMouldInPack:0,
}
this.editData = []
this.editBtData = []
@@ -1026,7 +1040,7 @@
})
},
getHBillNo() {
- axios.get(this.baseURL + "/Web/GetMAXNum", {
+ axios.get(this.$baseUrl + "/Web/GetMAXNum", {
params: {
HBillType: '3899'
}
@@ -1040,7 +1054,7 @@
},
//鑾峰彇瀵瑰簲鐨勬潯鐮佹槑缁�
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) {
@@ -1055,7 +1069,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];
@@ -1070,7 +1084,7 @@
handleUpdate() {
this.reset()
let rowHmainid = this.linterid
- axios.get(this.baseURL + "/Gy_Mould_Edit/xg", {
+ axios.get(this.$baseUrl + "/Gy_Mould_Edit/xg", {
params: { 'HInterID': rowHmainid }
}).then(response => {
console.log(response.data)
@@ -1150,12 +1164,14 @@
// this.form.HMouldWidth = data.HMouldWidth
// this.form.HMouldHeight = data.HMouldHeight
// this.form.HMouldFoldHeight = data.HMouldFoldHeight
- this.form.HTransPackFlag = data.鍙戣揣瀹瑰櫒鏍囪
- this.form.HSendPackFlag = data.鍛ㄨ浆瀹瑰櫒鏍囪
+ this.form.HTransPackFlag = data.鍛ㄨ浆瀹瑰櫒鏍囪
+ this.form.HSendPackFlag = data.鍙戣揣瀹瑰櫒鏍囪
this.form.HMouldFoldHeight = data.鎶樺彔楂樺害
- this.form.HMouldLength = data.闀�
+ this.form.HMouldLength = data.闀�
this.form.HMouldWidth = data.瀹�
this.form.HMouldHeight = data.楂�
+ this.form.HPackV = data.鎵樹綋绉�
+ this.form.HStandardQtyForMouldInPack = data.鎵樻爣鍑嗗鍣ㄦ暟閲�
for (var i = 0; i < result.data.length; i++) {
this.editData.push(
{
@@ -1177,7 +1193,7 @@
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
- axios.get(this.baseURL + "/Gy_MouldFileMain/Gy_MouldFileSubDetai", {
+ axios.get(this.$baseUrl + "/Gy_MouldFileMain/Gy_MouldFileSubDetai", {
params: { 'HInterID': rowHmainid }
}).then(response => {
if (response.data.code == 1) {
@@ -1221,7 +1237,7 @@
},
//#region 璁＄畻-涓嬫淇濆吇/鏍℃鏃ユ湡
calculateHNextMainDate(HInterID, HCycleUnit, HCheckCycle) {
- axios.get(this.baseURL + "/Gy_Mould_Edit/calculateHNextMainDate", {
+ axios.get(this.$baseUrl + "/Gy_Mould_Edit/calculateHNextMainDate", {
params: { 'HInterID': HInterID }
}).then(response => {
let d = response.data
@@ -1255,7 +1271,7 @@
},
//鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
getCustomerByCusID(HCusID) {
- axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ axios.get(this.$baseUrl + "/Xs_SeOrderBill/getCustomerByCusID", {
params: {
HCusID: HCusID
}
@@ -1431,7 +1447,7 @@
var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${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) {
@@ -1478,7 +1494,7 @@
console.log(oMain)
axios({
method: 'post',
- url: this.baseURL + url,
+ url: this.$baseUrl + url,
data: {
'oMain': oMain
},
--
Gitblit v1.9.1