From 74feb99b1b4e2eb3706bbb503d07fb087ca39d4a Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 02 四月 2026 15:15:02 +0800
Subject: [PATCH] 出运单增加过滤发货通知单和物流状态
---
src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index 7312404..f9ea0f3 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -150,7 +150,7 @@
@click="set_CloseBill(1)">鍙嶅叧闂�
</el-button>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
@click="set_DropBill(0)">浣滃簾
</el-button>
@@ -215,6 +215,12 @@
export default {
name: "Kf_StockOutRequestBillList",
components: { RowSettings, Edit, PrintList, BarCodeDetail },
+ props: {
+ openPage: { type: String, },
+ propHMaterID: {},
+ propHOrgID: {},
+ propMarkVal: {},
+ },
data() {
return {
activeSeach: "",
@@ -389,6 +395,20 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
+ if (this.propHOrgID) {
+ this.sWhere += " and HOrgID like '%" + this.propHOrgID + "%'";
+ }
+ console.log(this.propHMaterID)
+ if (this.propHMaterID) {
+ this.sWhere += " and HMaterID like '%" + this.propHMaterID + "%'";
+ }
+ // if(this.propMarkVal){
+ // this.sWhere += " and 榛樿鍙戣揣瀹瑰櫒鏍囪 = 'Y'"
+ // }
+ if (this.openPage) {
+ this.sWhere += " and 浣跨敤鏍囪 = 'Y' and 鍙戣揣瀹瑰櫒鏍囪 = 'Y' and ISNULL(瀹℃牳浜�,'') != ''"
+ }
+ console.log(this.sWhere)
// 鍒楄〃
axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList", {
params: {
@@ -400,6 +420,7 @@
},
})
.then((response) => {
+ console.log(response)
this.tyResList = response.data.data; //鎬绘暟鎹�
let data1 = response.data;
let option = [];
@@ -641,6 +662,9 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 17)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -651,7 +675,12 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit();
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 17)
+ }
+ else {
+ this.handleEdit();
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -764,22 +793,22 @@
this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.MaterialCode + "%'";
}
if (this.queryParams.MaterialName) {
- this.sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+ this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
}
if (this.queryParams.SpecificationModel) {
- this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+ this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
}
if (this.queryParams.HSourceBillNo) {
- this.sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
}
if (this.queryParams.Warehouse) {
- this.sWhere += " and 鍙戣揣浠撳簱 like '%" + Warehouse + "%'";
+ this.sWhere += " and 鍙戣揣浠撳簱 like '%" + this.queryParams.Warehouse + "%'";
}
if (this.queryParams.Hmaker) {
- this.sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+ this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
}
if (this.queryParams.HUSEORGID) {
- this.sWhere += " and HOrgID like '%" + HUSEORGID + "%'";
+ this.sWhere += " and HOrgID like '%" + this.queryParams.HUSEORGID + "%'";
}
this.getList();
},
@@ -857,7 +886,7 @@
},
set_CheckBill(num) {
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.$baseUrl + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
+ axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/AuditGy_MaterialPackingRelation", {
params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
--
Gitblit v1.9.1