From 414190deffd5bcfb6878bd2d631737bbb1dab01d Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期三, 14 一月 2026 08:45:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MouldFile.vue | 112 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 45 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index af6c6f5..2a04a5d 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>
@@ -129,7 +129,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 +232,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,21 +266,12 @@
</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="寮傚父" />
<el-option label="淇濆吇" value="淇濆吇" />
<el-option label="缁翠慨" value="缁翠慨" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="浣跨敤缁勭粐" prop="HCREATEORGID" v-show="isShow">
- <el-select v-model="form.HCREATEORGID" placeholder="璇烽�夋嫨缁勭粐浣跨敤" @change="organizationChange"
- :disabled="zzSelDis">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
- </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -300,22 +291,33 @@
<el-form-item label="楂�" prop="HMouldHeight" v-show="isShow">
<el-input v-model="form.HMouldHeight" placeholder="璇疯緭鍏ラ珮" />
</el-form-item>
- </el-col>
- <el-col :span="6">
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
<el-form-item label="鎶樺彔楂樺害" prop="HMouldFoldHeight" v-show="isShow">
<el-input v-model="form.HMouldFoldHeight" placeholder="璇疯緭鍏ユ姌鍙犻珮搴�" />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
<el-col :span="6">
- <el-form-item label="鍛ㄨ浆瀹瑰櫒鏍囪" prop="HTransPackFlag" v-show="isShow">
- <el-checkbox v-model="form.HTransPackFlag"></el-checkbox>
+ <el-form-item label="" prop="HTransPackFlag" v-show="isShow">
+ <el-checkbox v-model="form.HTransPackFlag">鍛ㄨ浆瀹瑰櫒鏍囪</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍙戣揣瀹瑰櫒鏍囪" prop="HSendPackFlag" v-show="isShow">
- <el-checkbox v-model="form.HSendPackFlag"></el-checkbox>
+ <el-form-item label="" prop="HSendPackFlag" v-show="isShow">
+ <el-checkbox v-model="form.HSendPackFlag">鍙戣揣瀹瑰櫒鏍囪</el-checkbox>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="浣跨敤缁勭粐" prop="HCREATEORGID" v-show="isShow">
+ <el-select v-model="form.HCREATEORGID" placeholder="璇烽�夋嫨缁勭粐浣跨敤" @change="organizationChange"
+ :disabled="zzSelDis">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
+ </el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -387,7 +389,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>
@@ -398,7 +400,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>
@@ -503,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>
@@ -525,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, },
@@ -567,6 +571,7 @@
gySupplierShow: false,
gyCustomerShow: false,
gyStockPlaceShow: false,
+ gyUnitShow: false,
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
@@ -622,6 +627,7 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ HUnitName:[{required: true, message: "鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }],
// HSupName: [
// { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
// ],
@@ -839,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
@@ -854,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("璇烽�夋嫨鍗曟潯鏁版嵁!");
@@ -960,7 +971,7 @@
HMouldDotCheckRuleInterID: 0,
HMouldMaintainRuleInterName: '',
HMouldMaintainRuleInterID: 0,
- HBarCode: '',
+ HBarCode: '1',
HMadeSupID: 0,
HMadeSupName: '',
HMouldClass: '',
@@ -990,6 +1001,7 @@
HDeleteDate: '',
HInComDate: moment(new Date()).format('YYYY-MM-DD'),
DateTime: moment(new Date()).format('YYYY-MM-DD'),
+ HCalibrationDate: moment(new Date()).format('YYYY-MM-DD'),
}
this.editData = []
this.editBtData = []
@@ -1063,6 +1075,7 @@
axios.get(this.baseURL + "/Gy_Mould_Edit/xg", {
params: { 'HInterID': rowHmainid }
}).then(response => {
+ console.log(response.data)
if (response.data.count == 1) {
var result = response.data
var data = response.data.data[0]
@@ -1135,12 +1148,16 @@
this.form.HMouldUseStatus = data.妯″叿鍙敤鐘舵��
this.form.HNextMainDate = data.鏍℃鏃ユ湡
this.form.HUSEORGID = data.HUSEORGID
- this.form.HMouldLength = data.HMouldLength
- this.form.HMouldWidth = data.HMouldWidth
- this.form.HMouldHeight = data.HMouldHeight
- this.form.HMouldFoldHeight = data.HMouldFoldHeight
- this.form.HTransPackFlag = data.HTransPackFlag == 0 ? false : true
- this.form.HSendPackFlag = data.HSendPackFlag == 0 ? false : true
+ // this.form.HMouldLength = data.HMouldLength
+ // 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.HMouldFoldHeight = data.鎶樺彔楂樺害
+ this.form.HMouldLength = data.闀�
+ this.form.HMouldWidth = data.瀹�
+ this.form.HMouldHeight = data.楂�
for (var i = 0; i < result.data.length; i++) {
this.editData.push(
{
@@ -1495,6 +1512,7 @@
this.gySupplierShow = false
this.gyCustomerShow = false
this.gyStockPlaceShow = false
+ this.gyUnitShow= false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1535,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