From cf83459b41f2a8d172c4129710bd853ccfd2a4bb Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 27 一月 2026 10:56:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue | 125 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 114 insertions(+), 11 deletions(-)
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index 710cc10..485caa3 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -131,6 +131,36 @@
</el-button>
</el-col>
<el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+ @click="set_CheckBill(0)">瀹℃牳
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+ @click="set_CheckBill(1)">鍙嶅鏍�
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+ @click="set_CloseBill(0)">鍏抽棴
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+ @click="set_CloseBill(1)">鍙嶅叧闂�
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+ @click="set_DropBill(0)">浣滃簾
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single"
+ @click="set_DropBill(1)">鍙嶄綔搴�
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
</el-row>
@@ -177,7 +207,7 @@
<script>
import axios from "axios";
import RowSettings from "@/views/component/rowSettings";
-import Edit from "@/views/warehouse/shipment/Kf_StockOutRequestBill.vue";
+import Edit from "@/views/scMould/basicModeling/Gy_MaterialPackingRelation_Edit.vue";
import PrintList from "@/views/component/printList";
import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
import moment from "moment";
@@ -185,6 +215,11 @@
export default {
name: "Kf_StockOutRequestBillList",
components: { RowSettings, Edit, PrintList, BarCodeDetail },
+ props: {
+ openPage: { type: String, },
+ propHMaterID: { },
+ propHOrgID: {},
+ },
data() {
return {
activeSeach: "",
@@ -359,8 +394,14 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
+ if (this.propHOrgID) {
+ this.sWhere += " and HOrgID like '%" + this.propHOrgID + "%'";
+ }
+ if (this.propHMaterID) {
+ this.sWhere += " and HMaterID like '%" + this.propHMaterID + "%'";
+ }
// 鍒楄〃
- axios.get(this.baseURL + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList", {
+ axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList", {
params: {
sWhere: this.sWhere,
user: sessionStorage["HUserName"],
@@ -463,7 +504,7 @@
DisPlay_HideColumn(HModName, user, option, dataOption) {
this.totalNameList = [];
axios
- .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+ .get(this.$baseUrl + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
params: {
HModName: HModName,
user: user,
@@ -611,6 +652,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 }) {
@@ -621,7 +665,12 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit();
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 17)
+ }
+ else {
+ this.handleEdit();
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -734,22 +783,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();
},
@@ -808,7 +857,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠").then(() => {
- axios.get(this.baseURL + "/Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation", {
+ axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation", {
params: {
HInterID: this.rowForm.hmainid.toString(),
user: sessionStorage["HUserName"],
@@ -825,6 +874,60 @@
});
}).catch(() => { });
},
+ set_CheckBill(num) {
+ //閫昏緫瀹℃牳鏂规硶
+ axios.get(this.$baseUrl + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
+ params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.checkDisabled = true
+ this.abandoncheckDisabled = false
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ set_CloseBill(num) {
+ //閫昏緫鍏抽棴鏂规硶
+ axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/CloseGy_MaterialPackingRelation", {
+ params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.checkDisabled = true
+ this.abandoncheckDisabled = false
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ set_DropBill(num) {
+ //閫昏緫浣滃簾鏂规硶
+ axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/DeleteGy_MaterialPackingRelation", {
+ params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.checkDisabled = true
+ this.abandoncheckDisabled = false
+ this.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ }
+ else {
+ this.$modal.msgError("閿欒:" + result.code + result.Message,);
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
},
};
</script>
--
Gitblit v1.9.1