From 86d627eecb14597a338ee402eab5a0c05ce1bdeb Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 27 十一月 2025 08:26:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index 1aa1d91..38aa162 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -181,7 +181,7 @@
v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫閿�鍞嚭搴撳崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <el-dialog title="缂栬緫鍣ㄥ叿棰嗙敤鍑哄簱鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
<edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
:copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
@@ -395,6 +395,11 @@
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
+ }
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
@@ -664,19 +669,19 @@
this.sWhere += " and 缁勭粐鍚嶇О like '%" + this.queryParams.HStockOrgName + "%'";
}
if (this.queryParams.HDept) {
- sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
+ this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDept + "%'";
}
if (this.queryParams.HMaterNumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.HMaterNumber + "%'";
+ this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.HMaterNumber + "%'";
}
if (this.queryParams.HModelNumber) {
- sWhere += " and 妯″叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
+ this.sWhere += " and 妯″叿浠ｇ爜 like '%" + this.queryParams.HModelNumber + "%'";
}
if (this.queryParams.HWhName) {
- sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
+ this.sWhere += " and 浠撳簱 like '%" + this.queryParams.HWhName + "%'";
}
if (this.queryParams.HSupName) {
- sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
+ this.sWhere += " and 寰�鏉ュ崟浣� like '%" + this.queryParams.HSupName + "%'";
}
this.getList()
},
@@ -737,22 +742,18 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- if (this.rowForm.鐘舵�� == "鍒涘缓") {
- axios.get(this.baseURL + "/Sc_MouldProdOutBill/DeltetMouldProdOutBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
- }).then(response => {
- if (response.data.count == 1) {
- this.getList()
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- } else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- } else {
- this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
- }
+ axios.get(this.baseURL + "/Sc_MouldProdOutBill/DeltetMouldProdOutBill", {
+ params: { 'HInterID': this.rowForm.hmainid.toString(), 'user': sessionStorage["HUserName"] }
+ }).then(response => {
+ if (response.data.count == 1) {
+ this.getList()
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
+ } else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
}).catch(() => { })
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
--
Gitblit v1.9.1