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 | 253 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 176 insertions(+), 77 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index 55a336c..b430e67 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -5,24 +5,24 @@
<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">
<el-row>
<el-col :span="6">
- <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo" v-show="isShow">
<el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鏃ユ湡" prop="HDate">
+ <el-form-item label="鏃ユ湡" prop="HDate" v-show="isShow">
<el-date-picker v-model="form.HDate" 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="HMouldOWNER">
+ <el-form-item label="璐т富绫诲瀷" prop="HMouldOWNER" v-show="isHide">
<el-select v-model="form.HMouldOWNER" placeholder="璇烽�夋嫨">
<el-option label="鑷垂" value="鑷垂" />
<el-option label="瀹緵" value="瀹緵" />
@@ -30,106 +30,116 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿缂栧彿" prop="HMouldNo">
- <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">
- <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">
- <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">
- <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">
- <el-form-item label="鐩村緞" prop="HDiameter">
+ <el-form-item label="鐩村緞" prop="HDiameter" v-show="isHide">
<el-input v-model="form.HDiameter" placeholder="璇疯緭鍏ョ洿寰�" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="杈呭姪灞炴��" prop="HSubjoin">
+ <el-form-item label="杈呭姪灞炴��" prop="HSubjoin" v-show="isHide">
<el-input v-model="form.HSubjoin" placeholder="璇疯緭鍏ヨ緟鍔╁睘鎬�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="杈呭姪灞炴��2" prop="HSubjoin2">
+ <el-form-item label="杈呭姪灞炴��2" prop="HSubjoin2" v-show="isHide">
<el-input v-model="form.HSubjoin2" placeholder="璇疯緭鍏ヨ緟鍔╁睘鎬�2" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍥惧彿" prop="HPICNo">
+ <el-form-item label="鍥惧彿" prop="HPICNo" v-show="isHide">
<el-input v-model="form.HPICNo" placeholder="璇疯緭鍏ュ浘鍙�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鐢熶骇浜у搧鍨嬪彿" prop="HWorkMaterModel">
+ <el-form-item label="鐢熶骇浜у搧鍨嬪彿" prop="HWorkMaterModel" v-show="isHide">
<el-input v-model="form.HWorkMaterModel" placeholder="璇疯緭鍏ョ敓浜т骇鍝佸瀷鍙�" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="瀵瑰簲ERP鐗╂枡" prop="HMaterNumber">
+ <el-form-item label="瀵瑰簲ERP鐗╂枡" prop="HMaterNumber" v-show="isHide">
<el-input v-model="form.HMaterNumber" placeholder="璇疯緭鍏ュ搴擡RP鐗╂枡" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(3)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿鍒嗙被" prop="HMouleTypeName">
- <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">
+ <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>
<el-col :span="6">
- <el-form-item label="鍑哄巶鏃ユ湡" prop="HOutComDate">
+ <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>
<el-row>
<el-col :span="6">
- <el-form-item label="鍑哄巶缂栧彿" prop="HOutComNo">
+ <el-form-item label="鍑哄巶缂栧彿" prop="HOutComNo" v-show="isHide">
<el-input v-model="form.HOutComNo" placeholder="璇疯緭鍏ュ嚭鍘傜紪鍙�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浣跨敤閮ㄩ棬" prop="HDeptName">
+ <el-form-item label="浣跨敤閮ㄩ棬" prop="HDeptName" v-show="isHide">
<el-input v-model="form.HDeptName" placeholder="璇疯緭鍏ヤ娇鐢ㄩ儴闂�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="渚涘簲鍟�" prop="HSupName">
+ <el-form-item label="渚涘簲鍟�" prop="HSupName" v-show="isHide">
<el-input v-model="form.HSupName" placeholder="璇疯緭鍏ヤ緵搴斿晢" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿鐘舵��" prop="HMouldStatus">
+ <el-form-item label="瀹瑰櫒鐘舵��" prop="HMouldStatus" v-show="isHide">
<el-select v-model="form.HMouldStatus" placeholder="璇烽�夋嫨">
<el-option label="鍦ㄥ簱" value="鍦ㄥ簱" />
<el-option label="涓婃満" value="涓婃満" />
@@ -147,24 +157,24 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="瀹夊叏瀵垮懡" prop="HSaveLife">
+ <el-form-item label="瀹夊叏瀵垮懡" prop="HSaveLife" v-show="isHide">
<el-input v-model="form.HSaveLife" placeholder="璇疯緭鍏ュ畨鍏ㄥ鍛�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="榛樿浠撳簱" prop="HWHName">
+ <el-form-item label="榛樿浠撳簱" prop="HWHName" v-show="isHide">
<el-input v-model="form.HWHName" placeholder="璇疯緭鍏ラ粯璁や粨搴�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(2, ckType = 1)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鐗堟湰鍙�" prop="HVersion">
+ <el-form-item label="鐗堟湰鍙�" prop="HVersion" v-show="isHide">
<el-input v-model="form.HVersion" placeholder="璇疯緭鍏ョ増鏈彿" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="榛樿浠撲綅" prop="HSPName">
+ <el-form-item label="榛樿浠撲綅" prop="HSPName" v-show="isHide">
<el-input v-model="form.HSPName" placeholder="璇疯緭鍏ラ粯璁や粨浣�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(9, cwType = 1)"></el-button>
</el-input>
@@ -173,100 +183,100 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="璁捐瀵垮懡" prop="HDesignLife">
+ <el-form-item label="璁捐瀵垮懡" prop="HDesignLife" v-show="isHide">
<el-input v-model="form.HDesignLife" placeholder="璇疯緭鍏ヨ璁″鍛�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="浣跨敤瀵垮懡" prop="HUseLife">
+ <el-form-item label="浣跨敤瀵垮懡" prop="HUseLife" v-show="isHide">
<el-input v-model="form.HUseLife" placeholder="璇疯緭鍏ヤ娇鐢ㄥ鍛�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍓╀綑瀵垮懡" prop="HLeaveLife">
+ <el-form-item label="鍓╀綑瀵垮懡" prop="HLeaveLife" v-show="isHide">
<el-input v-model="form.HLeaveLife" placeholder="璇疯緭鍏ュ墿浣欏鍛�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="宸茬敓浜ф暟閲�" prop="HProdQty">
+ <el-form-item label="宸茬敓浜ф暟閲�" prop="HProdQty" v-show="isHide">
<el-input v-model="form.HProdQty" placeholder="璇疯緭鍏ュ凡鐢熶骇鏁伴噺" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="宸茬敓浜ч噸閲�" prop="HProdWeight">
+ <el-form-item label="宸茬敓浜ч噸閲�" prop="HProdWeight" v-show="isHide">
<el-input v-model="form.HProdWeight" placeholder="璇疯緭鍏ュ凡鐢熶骇閲嶉噺" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="绌存暟" prop="HCaveQty">
+ <el-form-item label="绌存暟" prop="HCaveQty" v-show="isHide">
<el-input v-model="form.HCaveQty" placeholder="璇疯緭鍏ョ┐鏁�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="榛樿淇濆吇瑙勭▼" prop="HMouldMaintainRuleInterName">
+ <el-form-item label="榛樿淇濆吇瑙勭▼" prop="HMouldMaintainRuleInterName" v-show="isHide">
<el-input v-model="form.HMouldMaintainRuleInterName" 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="HBarCode">
+ <el-form-item label="鏉＄爜缂栧彿" prop="HBarCode" v-show="isHide">
<el-input v-model="form.HBarCode" placeholder="璇疯緭鍏ユ潯鐮佺紪鍙�" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鍒堕�犲巶鍟�" prop="HMadeSupName">
+ <el-form-item label="鍒堕�犲巶鍟�" prop="HMadeSupName" v-show="isHide">
<el-input v-model="form.HMadeSupName" 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="HNextMainDate">
+ <el-form-item label="涓嬫淇濆吇/鏍℃鏃ユ湡" prop="HNextMainDate" v-show="isHide">
<el-date-picker v-model="form.HNextMainDate" 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="HMouldClass">
+ <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>
</el-col>
<el-col :span="6">
- <el-form-item label="涓婄嚎鍒濆鍖栧鍛�" prop="HInitLife">
+ <el-form-item label="涓婄嚎鍒濆鍖栧鍛�" prop="HInitLife" v-show="isHide">
<el-input v-model="form.HInitLife" placeholder="璇疯緭鍏ヤ笂绾垮垵濮嬪寲瀵垮懡" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="褰撳墠浠撳簱" prop="HNowWHName">
+ <el-form-item label="褰撳墠浠撳簱" prop="HNowWHName" v-show="isHide">
<el-input v-model="form.HNowWHName" placeholder="璇疯緭鍏ュ綋鍓嶄粨搴�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(2, ckType = 2)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="褰撳墠浠撲綅" prop="HNowSPName">
+ <el-form-item label="褰撳墠浠撲綅" prop="HNowSPName" v-show="isHide">
<el-input v-model="form.HNowSPName" placeholder="璇疯緭鍏ュ綋鍓嶄粨搴�" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(9, cwType = 2)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍣ㄥ叿鍙敤鐘舵��" prop="HMouldUseStatus">
+ <el-form-item label="瀹瑰櫒鍙敤鐘舵��" prop="HMouldUseStatus" v-show="isHide">
<el-select v-model="form.HMouldUseStatus" placeholder="璇烽�夋嫨">
<el-option label="姝ｅ父" value="姝ｅ父" />
<el-option label="寮傚父" value="寮傚父" />
@@ -275,8 +285,44 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="6">
- <el-form-item label="浣跨敤缁勭粐" prop="HCREATEORGID">
+ <el-form-item label="闀�" prop="HMouldLength" v-show="isShow">
+ <el-input v-model="form.HMouldLength" placeholder="璇疯緭鍏ラ暱" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹�" prop="HMouldWidth" v-show="isShow">
+ <el-input v-model="form.HMouldWidth" placeholder="璇疯緭鍏ュ" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="楂�" prop="HMouldHeight" v-show="isShow">
+ <el-input v-model="form.HMouldHeight" placeholder="璇疯緭鍏ラ珮" />
+ </el-form-item>
+ </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-col :span="6">
+ <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>
+ </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">
@@ -285,7 +331,6 @@
</el-form-item>
</el-col>
</el-row>
-
</el-tab-pane>
<el-tab-pane label="鍒跺崟淇℃伅" name="third">
<el-row>
@@ -353,8 +398,8 @@
</el-row>
</el-tab-pane>
</el-tabs>
- <el-tabs type="border-card">
- <el-tab-pane label="瀛愬櫒鍏�">
+ <el-tabs type="border-card" v-show="isHide">
+ <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>
@@ -365,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>
@@ -470,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>
@@ -492,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, },
@@ -506,6 +553,8 @@
},
data() {
return {
+ isShow: true,
+ isHide: false,
HModName: "Gy_MouldFile",
ckType: null,
cwType: null,
@@ -532,6 +581,7 @@
gySupplierShow: false,
gyCustomerShow: false,
gyStockPlaceShow: false,
+ gyUnitShow: false,
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
@@ -587,6 +637,7 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ HUnitName:[{required: true, message: "鍗曚綅涓嶈兘涓虹┖", trigger: "blur" }],
// HSupName: [
// { required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
// ],
@@ -614,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
@@ -733,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
@@ -804,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
@@ -819,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("璇烽�夋嫨鍗曟潯鏁版嵁!");
@@ -864,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]
@@ -884,7 +940,7 @@
this.form = {
HInterID: 0,
HBillNo: '',
- HDate: moment(new Date()).format('YYYY-MM-DDTHH:mm:ss'),
+ HDate: moment(new Date()).format('YYYY-MM-DD'),
HMouldOWNER: '',
HMouldNo: '',
HName: '',
@@ -901,7 +957,7 @@
HMouleTypeName: '',
HUnitID: 0,
HUnitName: '',
- HOutComDate: moment(new Date()).format('YYYY-MM-DDTHH:mm:ss'),
+ HOutComDate: moment(new Date()).format('YYYY-MM-DD'),
HOutComNo: '',
HDeptID: 0,
HDeptName: '',
@@ -925,7 +981,7 @@
HMouldDotCheckRuleInterID: 0,
HMouldMaintainRuleInterName: '',
HMouldMaintainRuleInterID: 0,
- HBarCode: '',
+ HBarCode: '1',
HMadeSupID: 0,
HMadeSupName: '',
HMouldClass: '',
@@ -935,10 +991,16 @@
HNowSPName: '',
HMouldUseStatus: '',
HNextMainDate: '',
- HUSEORGID: sessionStorage["OrganizationID"],
- HCREATEORGID: sessionStorage["OrganizationID"],
+ HUSEORGID: sessionStorage["OrganizationID"] - 0,
+ HCREATEORGID: sessionStorage["OrganizationID"] - 0,
+ HMouldLength: '',
+ HMouldWidth: '',
+ HMouldHeight: '',
+ HMouldFoldHeight: '',
+ HTransPackFlag: 0,
+ HSendPackFlag: 0,
HMaker: sessionStorage["HUserName"],
- HMakeDate: '',
+ HMakeDate: moment(new Date()).format('YYYY-MM-DD'),
HChecker: '',
HCheckDate: '',
HUpDater: '',
@@ -947,6 +1009,11 @@
HCloseDate: '',
HDeleteMan: '',
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'),
+ HPackV:0,
+ HStandardQtyForMouldInPack:0,
}
this.editData = []
this.editBtData = []
@@ -973,11 +1040,13 @@
})
},
getHBillNo() {
- axios.get(this.baseURL + "/Web/GetMAXNum", {
+ axios.get(this.$baseUrl + "/Web/GetMAXNum", {
params: {
HBillType: '3899'
}
}).then(response => {
+ console.log(response)
+ this.form.HInterID = response.data.data[0].HInterID
this.form.HBillNo = response.data.data[0].HBillNo
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -985,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) {
@@ -1000,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];
@@ -1015,9 +1084,10 @@
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)
if (response.data.count == 1) {
var result = response.data
var data = response.data.data[0]
@@ -1090,6 +1160,18 @@
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.鍛ㄨ浆瀹瑰櫒鏍囪
+ this.form.HSendPackFlag = data.鍙戣揣瀹瑰櫒鏍囪
+ this.form.HMouldFoldHeight = 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(
{
@@ -1111,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) {
@@ -1155,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
@@ -1189,7 +1271,7 @@
},
//鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
getCustomerByCusID(HCusID) {
- axios.get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
+ axios.get(this.$baseUrl + "/Xs_SeOrderBill/getCustomerByCusID", {
params: {
HCusID: HCusID
}
@@ -1365,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) {
@@ -1379,7 +1461,6 @@
},
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
- console.log(1)
this.$refs["form"].validate(valid => {
if (valid) {
let url = null
@@ -1394,26 +1475,39 @@
} else (
url = '/Gy_Mould_Edit/AddBill'
)
+ this.form.HTransPackFlag = this.form.HTransPackFlag == false ? 0 : 1
+ this.form.HSendPackFlag = this.form.HSendPackFlag == false ? 0 : 1
var sMainStr = JSON.stringify(this.form);
- var sSubStr = JSON.stringify(this.editData);
- var mainTableMaintainRuleStr = JSON.stringify(this.maintainData);
- var mainTableDotCheckRuleStr = JSON.stringify(this.dotCheckData);
+ var sSubStr = JSON.stringify(this.editData)
+ var mainTableMaintainRuleStr = JSON.stringify(this.maintainData)
+ var mainTableDotCheckRuleStr = JSON.stringify(this.dotCheckData)
+ // if (this.editData.length > 0) {
+ // sSubStr = JSON.stringify(this.editData);
+ // }
+ // if (this.maintainData.length > 0) {
+ // mainTableMaintainRuleStr = JSON.stringify(this.maintainData);
+ // }
+ // if (this.dotCheckData.length > 0) {
+ // mainTableDotCheckRuleStr = JSON.stringify(this.dotCheckData);
+ // }
var oMain = sMainStr + ";" + ModRightNameAdd + ";" + user + ";" + sSubStr + ";" + mainTableMaintainRuleStr + ";" + mainTableDotCheckRuleStr;
+ console.log(oMain)
axios({
method: 'post',
- url: this.baseURL + url,
+ url: this.$baseUrl + url,
data: {
'oMain': oMain
},
}).then(response => {
console.log(response)
-
if (response.data.count == 1) {
// this.subDisabled = true//璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
this.$modal.msgSuccess(response.data.Message);
// this.addBtnShow = true
this.formShow = false
this.$emit('editClose', false)
+ } else {
+ this.$modal.msgError(response.data.Message);
}
}).catch(error => {
console.log(error)
@@ -1432,6 +1526,7 @@
this.gySupplierShow = false
this.gyCustomerShow = false
this.gyStockPlaceShow = false
+ this.gyUnitShow= false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1472,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