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_MouldProdMoveBillEdit.vue | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 52c9a9c..282f30d 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.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="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd HH:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
@@ -56,6 +56,14 @@
</el-select>
</el-form-item>
</el-col>
+ <el-form-item 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-row>
<el-row>
<el-col :span="6">
@@ -447,6 +455,7 @@
zzSelDis: false,
rowHideShow: false,
openRowHide: false,
+ HBillSubType: '',
hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
HSourceBillTypes:[],
addBtnShow: false,
@@ -532,6 +541,9 @@
],
HStockOutOrgID: [
{ required: true, message: "璋冨嚭缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HSecManagerName: [
{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -647,6 +659,7 @@
this.form.HDeptID = data.HDeptID
this.form.HDeptName = data.HDeptName
this.form.HStockOrgID = data.HStockOutOrgID
+ this.form.HBillSubType = data.HBillSubType
this.form.HStockInOrgID = data.HStockInOrgID == null ? 0 : data.HStockInOrgID
this.form.HStockOutOrgID = data.HStockOutOrgID == null ? 0 : data.HStockOutOrgID
this.ifOrganizationEdit = true
@@ -952,6 +965,7 @@
HSupName:'',
HSupID:0,
HStockOutOrgID:sessionStorage["OrganizationID"] - 0,
+ HBillSubType: '',
HDeptName: '',
HDeptID: 0,
HWHName:'',
@@ -1037,7 +1051,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()
}
@@ -1067,7 +1081,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
@@ -1107,7 +1121,7 @@
if (this.copyType == 1) {
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')
} else {
if (data[0].HSourceInterID != "0") {
this.ifOrganizationEdit = true
@@ -1137,6 +1151,7 @@
, "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
, "HStockInOrgID": data[0].HStockInOrgID
, "HStockOutOrgID": data[0].HStockOutOrgID
+ , "HBillSubType": data[0].瀛愬崟鎹被鍨�
, "HMaker": data[0].鍒跺崟浜�
, "HChecker": data[0].瀹℃牳浜�
, "HCloseMan": data[0].鍏抽棴浜�
@@ -1341,10 +1356,12 @@
}else if(!item.HSCWHID){
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