From 2e2b0700a25ce13c7a3eb113c577375da87bc0f3 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期二, 24 三月 2026 17:44:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/logistics/transportGPS/WL_YayBill.vue | 27 ++++++++-
src/views/scMould/basicModeling/Gy_MouldFileList.vue | 19 +++--
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 78 +++++++++++++++++++++++++-
3 files changed, 110 insertions(+), 14 deletions(-)
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index ad03eff..399c9f1 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -517,10 +517,30 @@
this.handleQuery()
},
//#endregion
-
+ //#region 鏉冮檺鍒ゆ柇
+ async set_ModCheck(ModRightNameCheck)
+ {
+ var Permission = false;
+ const res=await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
+ params: {
+ "ModRightNameCheck": ModRightNameCheck,
+ "user": sessionStorage["HUserName"],
+
+ },
+ }).then(result=>{
+ if (result.data.count != 1) {
+ Permission = true;
+ this.sWhere=this.sWhere+"and 鎵胯繍鍟咺D ="+sessionStorage["HSupID"]
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
//#region 蹇�熻繃婊�
- handleQuery() {
+ async handleQuery() {
this.sWhere = ''
+ await this.set_ModCheck("WLYayBill_SUPQuery")
if (this.queryParams.ColName && this.queryParams.Comparator) {
var com = "";
switch (this.queryParams.Comparator) {
@@ -595,6 +615,7 @@
// if (this.queryParams.HOrgID) {
// this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
// }
+ console.log("swhere",this.sWhere)
this.clearData()
this.getList()
},
@@ -608,7 +629,7 @@
}
this.tableShow = false
this.loading = true
-
+ console.log("swhere",this.sWhere)
// 鍒楄〃鏌ヨ
axios.get(this.$baseUrl + '/WLYayBillController/GetListPage', {
params: {
diff --git a/src/views/scMould/basicModeling/Gy_MouldFileList.vue b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
index 9833f91..a4cad85 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFileList.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
@@ -237,6 +237,7 @@
components: { RowSettings, Edit, BtnSettings },
props: {
openPage: { type: String, },
+ multiple: { type: Boolean, default: false },
},
data() {
return {
@@ -760,17 +761,19 @@
}
},
// 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- // this.rowForm = {}
+ handleSelectionChange(selection) {
if (this.openPage) {
- //鍒楄〃鍗曢��
- if (selection.length > 1) {
+ if (!this.multiple && selection.length > 1) {
const del_row = selection.shift()
- this.$refs.tableData.toggleRowSelection(del_row, false) //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ this.$refs.tableData.toggleRowSelection(del_row, false)
}
- this.rowForm = {}
- this.ids = selection.map(item => item.hmainid)
- this.rowForm = selection[0]
+ if (this.multiple) {
+ this.ids = selection.map(item => item.hmainid)
+ this.rowForm = selection
+ } else {
+ this.ids = selection.map(item => item.hmainid)
+ this.rowForm = selection[0]
+ }
} else {
this.ids = selection.map(item => item.hmainid)
this.single = selection.length != 1
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index 8094a14..dd93ce1 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -285,7 +285,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">
@@ -549,6 +549,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 +692,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 = {}
@@ -1189,6 +1253,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