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_MouldInRequestBillEdit.vue | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index f5fa7b7..eb3a114 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.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>
@@ -90,6 +90,16 @@
<el-input v-model="form.HKeeperName" placeholder="璇烽�夋嫨" disabled>
<el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=4)"></el-button>
</el-input>
+ </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>
@@ -184,7 +194,7 @@
size="mini">涓婄Щ</el-button>
<el-button type="success" plain icon="el-icon-arrow-down" @click="handleMoveRowDown(zbSelForm)"
size="mini">涓嬬Щ</el-button>
- <el-button type="success" plain icon="el-icon-printer" @click="get_ICInventoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
+ <el-button type="success" plain icon="el-icon-printer" @click="get_ICInvget_ContainerInstantStockentoryMould(zbSelForm)">瀹瑰櫒搴撳瓨</el-button>
<el-button type="success" plain icon="el-icon-printer" @click="get_ContainerInstantStock(zbSelForm)">瀹瑰櫒鍗虫椂搴撳瓨</el-button>
</div>
<el-table :data="editData" style="width: 100%" height="300" width="100%" ref="zbTable"
@@ -305,6 +315,7 @@
HIsShow: true,
HIsHide: false,
HModName: "Sc_MouldInRequestBill",
+ HBillSubType:'',
formShow: false,
temp: undefined,
formLoading: true,
@@ -388,6 +399,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HEmpName: [
{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -558,6 +572,7 @@
HInterID: 0,
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
+ HBillSubType: '',
HSupTypeID:1,
HSupName:'',
HSupID:0,
@@ -643,7 +658,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()
}
@@ -764,7 +779,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 {
this.form = {
"HBillNo": data.鍗曟嵁鍙�
@@ -787,6 +802,7 @@
, "HExplanation": data.鎽樿
, "HRemark": data.琛ㄥご澶囨敞
, "HStockOrgID": data.HStockOrgID
+ , "HBillSubType": data.瀛愬崟鎹被鍨�
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
--
Gitblit v1.9.1