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/scMould/basicModeling/Gy_MouldFile.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index 7e4fa62..03b5789 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -95,9 +95,9 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍗曚綅" prop="HUnitName" v-show="isHide">
+ <el-form-item label="鍗曚綅" prop="HUnitName" v-show="isShow">
<el-input v-model="form.HUnitName" placeholder="璇疯緭鍏ュ崟浣�" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(11)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -505,6 +505,7 @@
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
+ <GyUnit @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyUnitShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -527,11 +528,12 @@
import GySupplier from '@/views/basic/gy/gySupplier.vue'
import GyCustomer from '@/views/GyCustomer'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import GyUnit from '@/views/basic/gyUnit/gyUnit.vue'
import moment from 'moment';
export default {
name: 'Gy_MouldFile',
- components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySource, GySupplier, GyCustomer, GyStockPlace },
+ components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySource, GySupplier, GyCustomer, GyStockPlace,GyUnit },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -569,6 +571,7 @@
gySupplierShow: false,
gyCustomerShow: false,
gyStockPlaceShow: false,
+ gyUnitShow: false,
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
@@ -624,6 +627,7 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ HUnitName:[{required: true, message: "鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }],
// HSupName: [
// { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
// ],
@@ -651,7 +655,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
@@ -770,7 +774,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
@@ -841,7 +845,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
@@ -856,6 +859,12 @@
}
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
+
}
} else {
this.$modal.msgError("璇烽�夋嫨鍗曟潯鏁版嵁!");
@@ -901,7 +910,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]
@@ -962,7 +971,7 @@
HMouldDotCheckRuleInterID: 0,
HMouldMaintainRuleInterName: '',
HMouldMaintainRuleInterID: 0,
- HBarCode: '',
+ HBarCode: '1',
HMadeSupID: 0,
HMadeSupName: '',
HMouldClass: '',
@@ -1019,7 +1028,7 @@
})
},
getHBillNo() {
- axios.get(this.baseURL + "/Web/GetMAXNum", {
+ axios.get(this.$baseUrl + "/Web/GetMAXNum", {
params: {
HBillType: '3899'
}
@@ -1033,7 +1042,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) {
@@ -1048,7 +1057,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];
@@ -1063,7 +1072,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)
@@ -1143,8 +1152,8 @@
// 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.HMouldWidth = data.瀹�
@@ -1170,7 +1179,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) {
@@ -1214,7 +1223,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
@@ -1248,7 +1257,7 @@
},
//鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
getCustomerByCusID(HCusID) {
- axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ axios.get(this.$baseUrl + "/Xs_SeOrderBill/getCustomerByCusID", {
params: {
HCusID: HCusID
}
@@ -1424,7 +1433,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) {
@@ -1471,7 +1480,7 @@
console.log(oMain)
axios({
method: 'post',
- url: this.baseURL + url,
+ url: this.$baseUrl + url,
data: {
'oMain': oMain
},
@@ -1503,6 +1512,7 @@
this.gySupplierShow = false
this.gyCustomerShow = false
this.gyStockPlaceShow = false
+ this.gyUnitShow= false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1543,6 +1553,10 @@
this.dialogTitle = '浠撲綅鍒楄〃'
this.gyStockPlaceShow = true
this.openData = true
+ } else if (num == 11) {
+ this.dialogTitle = '鍗曚綅鍒楄〃'
+ this.gyUnitShow = true
+ this.openData = true
}
},
}
--
Gitblit v1.9.1