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_MouldOutRequestBillEdit.vue | 100 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 94 insertions(+), 6 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index 2097786..ff7defe 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.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>
@@ -285,7 +295,7 @@
<GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
<GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
<GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
- <GyMould @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
+ <GyMould ref="gyMouldRef" @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyMouldShow" />
<GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyStockPlaceShow" />
<ScICMOBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="ScICMOBillShow" />
<div slot="footer" class="dialog-footer">
@@ -338,6 +348,7 @@
hSupTypeList: [{name:'渚涘簲鍟�',id:1,},{name:'瀹㈡埛',id:2},{name:'杞﹂棿閮ㄩ棬',id:3}],
HSourceBillTypes:[],
addBtnShow: false,
+ HBillSubType: '',
zbIndex: null,
zbSelForm: {},//瀛愯〃閫変腑鏁版嵁
dialogTypeNum: null,//閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
@@ -415,6 +426,9 @@
],
HStockOrgID: [
{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HBillSubType: [
+ { required: true, message: "瀛愬崟鎹被鍨嬩笉鑳戒负绌�", trigger: "blur" }
],
HEmpName: [
{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }
@@ -549,6 +563,61 @@
} else {
this.$modal.msgError("璇烽�夋嫨鏁版嵁!");
}
+
+ }else if(deptRow.length > 1 && num == 8) {
+ var rowdata = [];
+ for (let i = 0; i < deptRow.length; i++) {
+ rowdata.push({
+ "HMaterID": deptRow[i].hmainid || 0,
+ "HMaterNumber": deptRow[i].妯″叿缂栧彿 || "",
+ "HMaterName": deptRow[i].妯″叿鍚嶇О || "",
+ "HMaterModel": deptRow[i].妯″叿鍨嬪彿 || "",
+ "HUnitID": deptRow[i].HUnitID || 0,
+ "HUnitNumber": deptRow[i].璁￠噺鍗曚綅浠ｇ爜 || "",
+ "HUnitName": deptRow[i].璁￠噺鍗曚綅 || "",
+ "HQty": "1", // 榛樿鏁伴噺
+ "HWHID": this.form.HWHID || "0",
+ "HWHNumber": this.form.HWHNumber || "",
+ "HWHName": this.form.HWHName || "",
+ "HSPID": "0",
+ "HSPNumber": "",
+ "HSPName": "",
+ "KuHQty": "0", // 搴撳瓨鏁伴噺
+ "HSourceInterID": "0",
+ "HSourceEntryID": "0",
+ "HSourceBillType": "",
+ "HSourceBillNo": "",
+ "HRelationQty": "0",
+ "HRelationMoney": "0",
+ "HRemark": "",
+ "HPropertyID": "0",
+ "HSecUnitID": "0",
+ "HSecUnitRate": "0",
+ "HQtyMust": "0",
+ "HPrice": "0",
+ "HMoney": "0",
+ "HERPInterID": "0",
+ "HERPEntryID": "0",
+ "HPOOrderInterID": "0",
+ "HPOOrderEntryID": "0",
+ "HPOOrderBillNo": "",
+ "HSeOrderInterID": "0",
+ "HSeOrderEntryID": "0",
+ "HSeOrderBillNo": "",
+ "HICMOInterID": "0",
+ "HICMOEntryID": "0",
+ "HICMOBillNo": "",
+ "HSTOCKORGID": this.form.HStockOrgID,
+ "HOWNERID": this.form.HStockOrgID,
+ "HOWNERTYPEID": "",
+ "HSEQ": "0",
+ "HSTOCKSTATUSID": "0"
+ })
+ }
+ this.editData.splice(this.zbIndex, 1, ...rowdata)
+ this.ScICMOBillShow = false
+ this.openData = false
+ this.gyMouldShow = false
}else{
if (deptRow.HItemID || deptRow.hmainid) {
if (num == 1) {
@@ -637,8 +706,17 @@
this.deptform = deptRow
},
deptClickSub() {
- this.dbEmitData(this.deptform, this.dialogTypeNum)
- this.deptform = {}
+ if(this.dialogTypeNum==8){
+ const selectedData = this.$refs.gyMouldRef.rowForm;
+ if(selectedData.length>1){
+ this.dbEmitData(selectedData, this.dialogTypeNum);
+ }else{
+ this.dbEmitData(this.deptform, this.dialogTypeNum);
+ }
+ }else{
+ this.dbEmitData(this.deptform, this.dialogTypeNum);
+ }
+ this.deptform = {};
},
deptClose() {
this.deptform = {}
@@ -653,6 +731,7 @@
HDate: new Date(),
HStockOrgID:sessionStorage["OrganizationID"] - 0,
HSupTypeID:1,
+ HBillSubType: '',
HSupName:'',
HSupID:0,
HDeptName: '',
@@ -822,7 +901,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()
}
@@ -859,7 +938,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.鍗曟嵁鍙�
@@ -882,6 +961,7 @@
, "HExplanation": data.鎽樿
, "HRemark": data.琛ㄥご澶囨敞
, "HStockOrgID": data.HStockOrgID
+ , "HBillSubType": data.瀛愬崟鎹被鍨�
, "HMaker": data.鍒跺崟浜�
, "HMakeDate": data.鍒跺崟鏃ユ湡 == null ? "" : data.鍒跺崟鏃ユ湡
@@ -1189,6 +1269,14 @@
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
//num1閮ㄩ棬锛�2鍑哄簱浠撳簱锛�3鐗╂枡锛�4閿�鍞憳
+ if (num == 8) {
+ if (this.$refs.gyMouldRef) {
+ this.$refs.gyMouldRef.clearSelection()
+ }
+ this.dialogTitle = '瀹瑰櫒鍒楄〃'
+ this.gyMouldShow = true
+ this.openData = true
+ }
if (row) {
this.zbIndex = row.index - 1
}
--
Gitblit v1.9.1