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 | 102 ++++++++++++++++++++++++++++++++------------------
1 files changed, 65 insertions(+), 37 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index d139a9e..b430e67 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -5,7 +5,7 @@
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
- <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">鍣ㄥ叿妗ｆ缂栬緫</div>
+ <div style="margin: 10px; font-size: 28px; font-weight: bold; text-align: center;">瀹瑰櫒妗ｆ缂栬緫</div>
<el-form ref="form" :model="form" :rules="rules" label-width="140px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
@@ -30,25 +30,25 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿缂栧彿" prop="HMouldNo" v-show="isShow">
- <el-input v-model="form.HMouldNo" placeholder="璇疯緭鍏ュ櫒鍏风紪鍙�" />
+ <el-form-item label="瀹瑰櫒缂栧彿" prop="HMouldNo" v-show="isShow">
+ <el-input v-model="form.HMouldNo" placeholder="璇疯緭鍏ュ鍣ㄧ紪鍙�" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿鍚嶇О" prop="HName" v-show="isShow">
- <el-input v-model="form.HName" placeholder="璇疯緭鍏ュ櫒鍏峰悕绉�" />
+ <el-form-item label="瀹瑰櫒鍚嶇О" prop="HName" v-show="isShow">
+ <el-input v-model="form.HName" placeholder="璇疯緭鍏ュ鍣ㄥ悕绉�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿瑙勬牸" prop="HModel" v-show="isShow">
- <el-input v-model="form.HModel" placeholder="璇疯緭鍏ュ櫒鍏疯鏍�" />
+ <el-form-item label="瀹瑰櫒瑙勬牸" prop="HModel" v-show="isShow">
+ <el-input v-model="form.HModel" placeholder="璇疯緭鍏ュ鍣ㄨ鏍�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿鍨嬪彿" prop="HModel2" v-show="isShow">
- <el-input v-model="form.HModel2" placeholder="璇疯緭鍏ュ櫒鍏峰瀷鍙�" />
+ <el-form-item label="瀹瑰櫒鍨嬪彿" prop="HModel2" v-show="isShow">
+ <el-input v-model="form.HModel2" placeholder="璇疯緭鍏ュ鍣ㄥ瀷鍙�" />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -88,16 +88,16 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿鍒嗙被" prop="HMouleTypeName" v-show="isHide">
- <el-input v-model="form.HMouleTypeName" placeholder="璇疯緭鍏ュ櫒鍏峰垎绫�" disabled>
+ <el-form-item label="瀹瑰櫒鍒嗙被" prop="HMouleTypeName" v-show="isHide">
+ <el-input v-model="form.HMouleTypeName" placeholder="璇疯緭鍏ュ鍣ㄥ垎绫�" disabled>
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</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>
@@ -105,6 +105,16 @@
<el-form-item label="鍑哄巶鏃ユ湡" prop="HOutComDate" v-show="isHide">
<el-date-picker v-model="form.HOutComDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
</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>
@@ -129,7 +139,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿鐘舵��" prop="HMouldStatus" v-show="isHide">
+ <el-form-item label="瀹瑰櫒鐘舵��" prop="HMouldStatus" v-show="isHide">
<el-select v-model="form.HMouldStatus" placeholder="璇烽�夋嫨">
<el-option label="鍦ㄥ簱" value="鍦ㄥ簱" />
<el-option label="涓婃満" value="涓婃満" />
@@ -232,14 +242,14 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿绫诲瀷" prop="HMouldClass" v-show="isHide">
+ <el-form-item label="瀹瑰櫒绫诲瀷" prop="HMouldClass" v-show="isHide">
<el-select v-model="form.HMouldClass" placeholder="璇烽�夋嫨">
<el-option label="妯″叿" value="妯″叿" />
<el-option label="宸ヨ" value="宸ヨ" />
<el-option label="澶瑰叿" value="澶瑰叿" />
<el-option label="鍒�鍏�" value="鍒�鍏�" />
<el-option label="妫�鍏�" value="妫�鍏�" />
- <el-option label="鍛ㄨ浆鍣ㄥ叿" value="鍛ㄨ浆鍣ㄥ叿" />
+ <el-option label="鍛ㄨ浆瀹瑰櫒" value="鍛ㄨ浆瀹瑰櫒" />
<el-option label="鍏朵粬" value="鍏朵粬" />
</el-select>
</el-form-item>
@@ -266,7 +276,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿鍙敤鐘舵��" prop="HMouldUseStatus" v-show="isHide">
+ <el-form-item label="瀹瑰櫒鍙敤鐘舵��" prop="HMouldUseStatus" v-show="isHide">
<el-select v-model="form.HMouldUseStatus" placeholder="璇烽�夋嫨">
<el-option label="姝ｅ父" value="姝ｅ父" />
<el-option label="寮傚父" value="寮傚父" />
@@ -389,7 +399,7 @@
</el-tab-pane>
</el-tabs>
<el-tabs type="border-card" v-show="isHide">
- <el-tab-pane label="瀛愬櫒鍏�">
+ <el-tab-pane label="瀛愬鍣�">
<div style="margin-bottom: 10px;">
<el-button type="success" plain icon="el-icon-plus" @click="handleAddSysZb(type = 'edit')"
size="mini">澧炲姞涓�琛�</el-button>
@@ -400,7 +410,7 @@
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="瀛愬櫒鍏�">
+ <el-table-column align="center" label="瀛愬鍣�">
<template slot-scope="scope">
<el-input v-model="scope.row.HMouldFileName" />
</template>
@@ -505,6 +515,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 +538,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 +581,7 @@
gySupplierShow: false,
gyCustomerShow: false,
gyStockPlaceShow: false,
+ gyUnitShow: false,
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
@@ -624,6 +637,7 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ HUnitName:[{required: true, message: "鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }],
// HSupName: [
// { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
// ],
@@ -651,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
@@ -770,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
@@ -841,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
@@ -856,6 +869,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 +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]
@@ -962,7 +981,7 @@
HMouldDotCheckRuleInterID: 0,
HMouldMaintainRuleInterName: '',
HMouldMaintainRuleInterID: 0,
- HBarCode: '',
+ HBarCode: '1',
HMadeSupID: 0,
HMadeSupName: '',
HMouldClass: '',
@@ -993,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 = []
@@ -1019,7 +1040,7 @@
})
},
getHBillNo() {
- axios.get(this.baseURL + "/Web/GetMAXNum", {
+ axios.get(this.$baseUrl + "/Web/GetMAXNum", {
params: {
HBillType: '3899'
}
@@ -1033,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) {
@@ -1048,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];
@@ -1063,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)
@@ -1143,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(
{
@@ -1170,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) {
@@ -1214,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
@@ -1248,7 +1271,7 @@
},
//鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
getCustomerByCusID(HCusID) {
- axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ axios.get(this.$baseUrl + "/Xs_SeOrderBill/getCustomerByCusID", {
params: {
HCusID: HCusID
}
@@ -1424,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) {
@@ -1471,7 +1494,7 @@
console.log(oMain)
axios({
method: 'post',
- url: this.baseURL + url,
+ url: this.$baseUrl + url,
data: {
'oMain': oMain
},
@@ -1503,6 +1526,7 @@
this.gySupplierShow = false
this.gyCustomerShow = false
this.gyStockPlaceShow = false
+ this.gyUnitShow= false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1543,6 +1567,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