From c466006a64f1cbbcbf04e0ae4a2d73de302aa92a Mon Sep 17 00:00:00 2001
From: qq_41295110 <qq_41295110@noreply.gitcode.com>
Date: 星期二, 13 一月 2026 11:35:08 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MouldFileList.vue | 157 ++++++++++++++++++++++++++--------------------------
1 files changed, 78 insertions(+), 79 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MouldFileList.vue b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
index ab3efee..01eddec 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFileList.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
@@ -96,9 +96,9 @@
</el-collapse>
</el-form>
<el-row :gutter="10" class="mb8" style="margin-top: 10px;">
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleImport">瀵煎叆</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
id="btn-Add">鏂板</el-button>
@@ -107,10 +107,10 @@
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="handleEdit(row = rowForm, OperationType = 3)">缂栬緫</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit(row = rowForm, OperationType = 2)">澶嶅埗</el-button>
- </el-col>
+ @click="handleEdit(row = rowForm, copyType = 1)">澶嶅埗</el-button>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
@@ -123,14 +123,14 @@
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="set_CheckBill(1, form = rowForm)">杩斿鏍�</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="set_De_Stop(0, form = rowForm)">绂佺敤</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="set_De_Stop(1, form = rowForm)">鍙嶇鐢�</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
</el-col>
@@ -295,7 +295,7 @@
HUSEORGID: sessionStorage["OrganizationID"] - 0,
HName: null,
HNumber: null,
- HMouldTypeID: null,
+ HMouldTypeID: 0,
Comparator1: '',
Comparator2: '',
Comparator: '',
@@ -412,11 +412,9 @@
"user": sessionStorage["HUserName"],
},
}).then(response => {
-
let data1 = response.data
if (data1.count == 1) {
let data = JSON.parse(data1.data)
- console.log(JSON.parse(data1.data))
var liStr = '[';
//閬嶅巻鐢熸垚涓昏彍鍗�
for (var i = 0; i < data.length; i++) {
@@ -438,7 +436,6 @@
this.treeOptions = JSON.parse(liStr);
}
}).catch(error => {
- console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
@@ -521,77 +518,78 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
}
}
- option.cols = [[
- { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
- , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 120 }
- , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', sort: true, width: 120 }
- , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿', sort: true, width: 120 }
- , { field: '妯″叿缂栧彿', title: '瀹瑰櫒缂栧彿', sort: true, width: 120 }
- , { field: '妯″叿鍚嶇О', title: '瀹瑰櫒鍚嶇О', sort: true, width: 120 }
- , { field: '妯″叿鍨嬪彿', title: '瀹瑰櫒鍨嬪彿', sort: true, width: 120 }
- , { field: '妯″叿鍝佺被', title: '瀹瑰櫒鍝佺被', sort: true, width: 120 }
- , { field: '妯″叿鐘舵��', title: '瀹瑰櫒鐘舵��', sort: true, width: 120 }
- , { field: '妯″叿鍙敤鐘舵��', title: '妯″叿鍙敤鐘舵��', sort: true, width: 140 }
- , { field: '绌存暟', title: '绌存暟', sort: true, width: 120 }
- , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '瀹瑰櫒ERP鐗╂枡', sort: true, width: 140 }
- , { field: '鐩村緞', title: '鐩村緞', sort: true, width: 120 }
- , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', sort: true, width: 120 }
- , { field: '杈呭姪灞炴��2', title: '杈呭姪灞炴��2', sort: true, width: 120 }
- , { field: '鍥惧彿', title: '鍥惧彿', sort: true, width: 120 }
- , { field: '鐢熶骇浜у搧鍨嬪彿', title: '鐢熶骇浜у搧鍨嬪彿', sort: true, width: 120 }
- , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true, width: 120 }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true, width: 120 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true, width: 120 }
- , { field: '鍑哄巶鏃ユ湡', title: '鍑哄巶鏃ユ湡', sort: true, width: 120 }
- , { field: '鍑哄巶缂栧彿', title: '鍑哄巶缂栧彿', sort: true, width: 120 }
- , { field: '浣跨敤閮ㄩ棬浠ｇ爜', title: '浣跨敤閮ㄩ棬浠ｇ爜', sort: true, width: 120 }
- , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', sort: true, width: 120 }
- , { field: 'HSupID', title: 'HSupID', hide: true, sort: true, width: 120 }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', sort: true, width: 120 }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', sort: true, width: 120 }
- , { field: 'HWhID', title: 'HWhID', hide: true, sort: true, width: 120 }
- , { field: '榛樿浠撳簱', title: '榛樿浠撳簱', sort: true, width: 120 }
- , { field: 'HSPID', title: 'HSPID', hide: true, sort: true, width: 120 }
- , { field: '榛樿浠撲綅', title: '榛樿浠撲綅', sort: true, width: 120 }
- , { field: '鐗堟湰', title: '鐗堟湰', sort: true, width: 120 }
- , { field: '褰撳墠浠撳簱', title: '褰撳墠浠撳簱', sort: true, width: 120 }
- , { field: '褰撳墠浠撲綅', title: '褰撳墠浠撲綅', sort: true, width: 120 }
- , { field: '铏氭嫙浠撶被鍨�', title: '铏氭嫙浠撶被鍨�', sort: true, width: 120 }
- , { field: '铏氭嫙浠�', title: '铏氭嫙浠�', sort: true, width: 120 }
- , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠瀹瑰櫒瑙勬牸', sort: true, width: 140 }
- , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆瀹瑰櫒瑙勬牸', sort: true, width: 140 }
- , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡', sort: true, totalRow: true, width: 140 }
- , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡', sort: true, totalRow: true, width: 140 }
- , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', sort: true, totalRow: true, width: 120 }
- , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', sort: true, totalRow: true, width: 120 }
- , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�', sort: true, totalRow: true, width: 120 }
- , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�', sort: true, totalRow: true, width: 120 }
- , { field: '澶囨敞', title: '澶囨敞', sort: true, width: 120 }
- , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true, totalRow: true, width: 120 }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true, width: 120 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true, width: 120 }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true, width: 120 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true, width: 120 }
- , { field: '淇敼浜�', title: '淇敼浜�', sort: true, width: 120 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true, width: 120 }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true, width: 120 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true, width: 120 }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', sort: true, width: 120 }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', sort: true, width: 120 }
- , { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true, width: 120 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true, sort: true, width: 120 }
- , { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true, width: 120 }
- , { field: 'hsubid', title: 'hsubid', hide: true, sort: true, width: 120 }
- ]]
+ option.cols = [col]
+ // option.cols = [[
+ // { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣琛�' }
+ // , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ // , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
+ // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 120 }
+ // , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', sort: true, width: 120 }
+ // , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '鐗╂枡缂栧彿', sort: true, width: 120 }
+ // , { field: '妯″叿缂栧彿', title: '瀹瑰櫒缂栧彿', sort: true, width: 120 }
+ // , { field: '妯″叿鍚嶇О', title: '瀹瑰櫒鍚嶇О', sort: true, width: 120 }
+ // , { field: '妯″叿鍨嬪彿', title: '瀹瑰櫒鍨嬪彿', sort: true, width: 120 }
+ // , { field: '妯″叿鍝佺被', title: '瀹瑰櫒鍝佺被', sort: true, width: 120 }
+ // , { field: '妯″叿鐘舵��', title: '瀹瑰櫒鐘舵��', sort: true, width: 120 }
+ // , { field: '妯″叿鍙敤鐘舵��', title: '妯″叿鍙敤鐘舵��', sort: true, width: 140 }
+ // , { field: '绌存暟', title: '绌存暟', sort: true, width: 120 }
+ // , { field: '瀵瑰簲ERP鐗╂枡缂栫爜', title: '瀹瑰櫒ERP鐗╂枡', sort: true, width: 140 }
+ // , { field: '鐩村緞', title: '鐩村緞', sort: true, width: 120 }
+ // , { field: '杈呭姪灞炴��', title: '杈呭姪灞炴��', sort: true, width: 120 }
+ // , { field: '杈呭姪灞炴��2', title: '杈呭姪灞炴��2', sort: true, width: 120 }
+ // , { field: '鍥惧彿', title: '鍥惧彿', sort: true, width: 120 }
+ // , { field: '鐢熶骇浜у搧鍨嬪彿', title: '鐢熶骇浜у搧鍨嬪彿', sort: true, width: 120 }
+ // , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true, width: 120 }
+ // , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', sort: true, width: 120 }
+ // , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', sort: true, width: 120 }
+ // , { field: '鍑哄巶鏃ユ湡', title: '鍑哄巶鏃ユ湡', sort: true, width: 120 }
+ // , { field: '鍑哄巶缂栧彿', title: '鍑哄巶缂栧彿', sort: true, width: 120 }
+ // , { field: '浣跨敤閮ㄩ棬浠ｇ爜', title: '浣跨敤閮ㄩ棬浠ｇ爜', sort: true, width: 120 }
+ // , { field: '浣跨敤閮ㄩ棬', title: '浣跨敤閮ㄩ棬', sort: true, width: 120 }
+ // , { field: 'HSupID', title: 'HSupID', hide: true, sort: true, width: 120 }
+ // , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', sort: true, width: 120 }
+ // , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', sort: true, width: 120 }
+ // , { field: 'HWhID', title: 'HWhID', hide: true, sort: true, width: 120 }
+ // , { field: '榛樿浠撳簱', title: '榛樿浠撳簱', sort: true, width: 120 }
+ // , { field: 'HSPID', title: 'HSPID', hide: true, sort: true, width: 120 }
+ // , { field: '榛樿浠撲綅', title: '榛樿浠撲綅', sort: true, width: 120 }
+ // , { field: '鐗堟湰', title: '鐗堟湰', sort: true, width: 120 }
+ // , { field: '褰撳墠浠撳簱', title: '褰撳墠浠撳簱', sort: true, width: 120 }
+ // , { field: '褰撳墠浠撲綅', title: '褰撳墠浠撲綅', sort: true, width: 120 }
+ // , { field: '铏氭嫙浠撶被鍨�', title: '铏氭嫙浠撶被鍨�', sort: true, width: 120 }
+ // , { field: '铏氭嫙浠�', title: '铏氭嫙浠�', sort: true, width: 120 }
+ // , { field: '褰撳墠妯″叿瑙勬牸', title: '褰撳墠瀹瑰櫒瑙勬牸', sort: true, width: 140 }
+ // , { field: '鍒濆妯″叿瑙勬牸', title: '鍒濆瀹瑰櫒瑙勬牸', sort: true, width: 140 }
+ // , { field: '褰撳墠璁捐瀵垮懡', title: '褰撳墠璁捐瀵垮懡', sort: true, totalRow: true, width: 140 }
+ // , { field: '鍒濆璁捐瀵垮懡', title: '鍒濆璁捐瀵垮懡', sort: true, totalRow: true, width: 140 }
+ // , { field: '浣跨敤瀵垮懡', title: '浣跨敤瀵垮懡', sort: true, totalRow: true, width: 120 }
+ // , { field: '鍓╀綑瀵垮懡', title: '鍓╀綑瀵垮懡', sort: true, totalRow: true, width: 120 }
+ // , { field: '宸茬敓浜ф暟閲�', title: '宸茬敓浜ф暟閲�', sort: true, totalRow: true, width: 120 }
+ // , { field: '宸茬敓浜ч噸閲�', title: '宸茬敓浜ч噸閲�', sort: true, totalRow: true, width: 120 }
+ // , { field: '澶囨敞', title: '澶囨敞', sort: true, width: 120 }
+ // , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', sort: true, totalRow: true, width: 120 }
+ // , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true, width: 120 }
+ // , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', sort: true, width: 120 }
+ // , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true, width: 120 }
+ // , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', sort: true, width: 120 }
+ // , { field: '淇敼浜�', title: '淇敼浜�', sort: true, width: 120 }
+ // , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', sort: true, width: 120 }
+ // , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', sort: true, width: 120 }
+ // , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', sort: true, width: 120 }
+ // , { field: '浣滃簾浜�', title: '浣滃簾浜�', sort: true, width: 120 }
+ // , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', sort: true, width: 120 }
+ // , { field: 'hbilltype', title: 'hbilltype', hide: true, sort: true, width: 120 }
+ // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true, sort: true, width: 120 }
+ // , { field: 'HMoudType', title: 'HMoudType', hide: true, sort: true, width: 120 }
+ // , { field: 'hsubid', title: 'hsubid', hide: true, sort: true, width: 120 }
+ // ]]
this.dataList = option
option.data = data1.data;
var result = data1.data;
option.data = result;
this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
} else {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ this.$modal.msgError(data1.Message);
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -851,10 +849,10 @@
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
if (this.queryParams.HNumber) {
- this.sWhere += " and 鍣ㄥ叿缂栧彿 like '%" + this.queryParams.HNumber + "%'";
+ this.sWhere += " and 妯″叿缂栧彿 like '%" + this.queryParams.HNumber + "%'";
}
if (this.queryParams.HName) {
- this.sWhere += " and 鍣ㄥ叿鍚嶇О like '%" + this.queryParams.HName + "%'";
+ this.sWhere += " and 妯″叿鍚嶇О like '%" + this.queryParams.HName + "%'";
}
if (this.queryParams.HUSEORGID) {
this.sWhere += " and HUSEORGID = '" + this.queryParams.HUSEORGID + "'"
@@ -903,9 +901,10 @@
resetQuery() {
this.sWhere = ''
this.queryParams = {
- HUSEORGID: null,
+ HUSEORGID: sessionStorage["OrganizationID"] - 0,
HName: null,
HNumber: null,
+ HMouldTypeID: 0,
Comparator1: '',
Comparator2: '',
Comparator: '',
--
Gitblit v1.9.1