From 05fb7af4f0316fdae54f52076509e582ca5e1e4c Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期四, 04 十二月 2025 11:01:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MouldFile.vue | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MouldFile.vue b/src/views/scMould/basicModeling/Gy_MouldFile.vue
index 55a336c..76e0213 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFile.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFile.vue
@@ -285,7 +285,40 @@
</el-form-item>
</el-col>
</el-row>
-
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="闀�" prop="HMouldLength">
+ <el-input v-model="form.HMouldLength" placeholder="璇疯緭鍏ラ暱" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹�" prop="HMouldWidth">
+ <el-input v-model="form.HMouldWidth" placeholder="璇疯緭鍏ュ" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="楂�" prop="HMouldHeight">
+ <el-input v-model="form.HMouldHeight" placeholder="璇疯緭鍏ラ珮" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎶樺彔楂樺害" prop="HMouldFoldHeight">
+ <el-input v-model="form.HMouldFoldHeight" placeholder="璇疯緭鍏ユ姌鍙犻珮搴�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍛ㄨ浆瀹瑰櫒鏍囪" prop="HTransPackFlag">
+ <el-checkbox v-model="form.HTransPackFlag"></el-checkbox>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍙戣揣瀹瑰櫒鏍囪" prop="HSendPackFlag">
+ <el-checkbox v-model="form.HSendPackFlag"></el-checkbox>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-tab-pane>
<el-tab-pane label="鍒跺崟淇℃伅" name="third">
<el-row>
@@ -935,8 +968,14 @@
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: '',
HChecker: '',
@@ -1090,6 +1129,12 @@
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.HTransPackFlag == 0 ? false : true
+ this.form.HSendPackFlag = data.HSendPackFlag == 0 ? false : true
for (var i = 0; i < result.data.length; i++) {
this.editData.push(
{
@@ -1379,7 +1424,6 @@
},
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
- console.log(1)
this.$refs["form"].validate(valid => {
if (valid) {
let url = null
@@ -1394,6 +1438,8 @@
} 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);
--
Gitblit v1.9.1