From 723793a0aa8d69cbbb463830a3344dbd6655cee5 Mon Sep 17 00:00:00 2001
From: chenhaozhe <gaozhechen26@gmail.com>
Date: 星期六, 04 四月 2026 14:57:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index 4ed5db1..c371703 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="datetime" placeholder="閫夋嫨鏃ユ湡鏃堕棿" value-format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
@@ -112,6 +112,16 @@
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍐呴儴鍗曟嵁鍙�" prop="HInnerBillNo">
<el-input v-model="form.HInnerBillNo" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item v-show="HIsShow" label="瀛愬崟鎹被鍨�" prop="HBillSubType">
+ <el-select v-model="form.HBillSubType" placeholder="璇烽�夋嫨瀛愬崟鎹被鍨�">
+ <el-option label="鍙戣揣" value="鍙戣揣"></el-option>
+ <el-option label="瀹㈣繑" value="瀹㈣繑"></el-option>
+ <el-option label="渚涘簲鍟嗙鍊�" value="渚涘簲鍟嗙鍊�"></el-option>
+ <el-option label="渚涘簲鍟嗚繑杩�" value="渚涘簲鍟嗚繑杩�"></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -409,6 +419,7 @@
formShow: false,
temp: undefined,
formLoading: true,
+ HBillSubType: '',
zzSelDis: false,
rowHideShow: false,
openRowHide: false,
@@ -493,6 +504,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HSecManagerName: [
{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -601,6 +615,7 @@
this.form.HSecManagerName = data.HSecManagerName
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
+ this.form.HBillSubType = data.HBillSubType
this.form.HStockOrgID = data.HStockOrgID == null ? 0 : data.HStockOrgID
this.ifOrganizationEdit = true
//瀛愯〃 璧嬪��
@@ -796,6 +811,7 @@
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
HSupTypeID: 1,
+ HBillSubType: '',
HSupName:'',
HSupID:0,
HDeptName: '',
@@ -881,7 +897,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
if (this.OperationType == 1) {
this.handleAddSysZb()
}
@@ -911,7 +927,7 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo()
let date = new Date()
- this.form.HDate = moment(date).format('YYYY-MM-DD')
+ this.form.HDate = moment(date).format('YYYY-MM-DD HH:mm:ss')
//璁剧疆婧愬崟绫诲瀷
this.form.HSourceBillType = this.HSouceBillType
@@ -978,6 +994,7 @@
, "HRemark": data[0].琛ㄥご澶囨敞
, "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
, "HStockOrgID": data[0].HMainStockOrgID
+ , "HBillSubType": data[0].瀛愬崟鎹被鍨�
, "HMaker": data[0].鍒跺崟浜�
, "HChecker": data[0].瀹℃牳浜�
, "HCloseMan": data[0].鍏抽棴浜�
@@ -1261,10 +1278,12 @@
}else if(!item.HWHID){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細璋冨叆浠撳簱鏈�夋嫨锛�");
- }else if(!item.HUnitID){
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
- }else if(item.HQty == 0){
+ }
+ // else if(!item.HUnitID){
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細璁￠噺鍗曚綅涓虹┖锛�");
+ // }
+ else if(item.HQty == 0){
fhck = true
this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
}
--
Gitblit v1.9.1