From bb40eba5dd2ec75a6fa2cd2c8eb41d769c092fca Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 05 十二月 2025 09:33:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index a326bae..f84ab8f 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -46,12 +46,13 @@
<el-form-item label="寰�鏉ュ崟浣�" prop="HSupName">
<el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ュ線鏉ュ崟浣�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <div slot="header" class="clearfix"><span>杩囨护</span></div>
+ <div slot="header" class="clearfix"><span>鍏朵粬鏉′欢</span></div>
<div>
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -64,7 +65,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -74,7 +75,8 @@
<el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange">
<span v-for="(item, index) in btList" :key="index">
<el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
@@ -87,7 +89,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -96,7 +98,8 @@
</el-row>
<el-form-item label-width="0">
<el-row>
- <el-col :span="7">
+ <el-col :span="2"><span>杩囨护</span></el-col>
+ <el-col :span="6">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
<el-option v-for="(item, index) in btList" :key="index" :label="item.field"
:value="item.field"></el-option>
@@ -108,7 +111,7 @@
:value="item.value"></el-option>
</el-select>
</el-col>
- <el-col :span="11">
+ <el-col :span="10">
<el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
@keyup.enter.native="handleQuery" />
</el-col>
@@ -393,7 +396,8 @@
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
"page": this.page,
- "size": this.pageSize
+ "size": this.pageSize,
+ "Type":"3849",
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
@@ -589,7 +593,7 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 2
- this.handleEdit()
+ this.handleEdit(row)
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -667,6 +671,22 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+ if (this.queryParams.HStatus) {
+ switch (this.queryParams.HStatus) {
+ case '-1': //鍏ㄩ儴
+ this.sWhere += "";
+ break;
+ case '0': //鏈鏍�
+ this.sWhere += " and 瀹℃牳浜�=''";
+ break;
+ case '1': //宸插鏍�
+ this.sWhere += " and 瀹℃牳浜�<>''";
+ break;
+ case '2': //宸插叧闂�
+ this.sWhere += " and 鍏抽棴浜�<>''";
+ default:
+ }
+ }
if (this.sTime) {
this.sTime = moment(this.sTime).format('YYYY-MM-DD')
this.sWhere += " and 鏃ユ湡 >= '" + this.sTime + "'";
@@ -682,11 +702,12 @@
this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
}
if (this.queryParams.HModelNumber) {
- this.sWhere += " and 妯″叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
+ this.sWhere += " and 鍣ㄥ叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
}
if (this.queryParams.HSupName) {
this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
}
+ this.clearData()
this.getList()
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -712,6 +733,7 @@
}
this.riqiChange()
this.resetForm("queryForm")
+ this.clearData()
this.getList()
},
@@ -721,6 +743,7 @@
this.tableShow = true
this.openEdit = false
this.editShow = false
+ this.clearData()
this.getList()
},
//鎵撳紑鏂板缁勪欢寮圭獥
@@ -740,7 +763,16 @@
this.open = val
this.editShow = false
this.openEdit = val
+ this.clearData()
this.getList()
+ },
+ //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+ clearData(){
+ this.ids = []
+ this.multiple = true
+ this.single = true
+ this.OperationType = 0
+ this.copyType = 0
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
@@ -769,6 +801,7 @@
let result = response.data
if (result.count == 1) {
this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ this.clearData()
this.getList();
}
else {
--
Gitblit v1.9.1