From ef33455b1b2e08bb12bc3ea8d6734dd803736615 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 17 十一月 2025 09:47:01 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/ICMO/ScICMOBillList.vue | 81 +++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 22 deletions(-)
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index 495613d..7c13427 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -56,9 +56,9 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍗曟嵁鍙�" prop="HMaterNumber">
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
<el-input
- v-model="queryParams.HMaterNumber"
+ v-model="queryParams.HBillNo"
placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�"
@keyup.enter.native="handleQuery"
/>
@@ -376,7 +376,7 @@
icon="el-icon-delete"
size="mini"
:disabled="single"
- @click="handleDelete((row = rowForm))"
+ @click="handleDelete"
>鍒犻櫎
</el-button>
</el-col>
@@ -597,7 +597,7 @@
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog
- title="缂栬緫鑱屽憳"
+ title="缂栬緫鐢熶骇璁㈠崟"
:visible.sync="openEdit"
width="1480px"
append-to-body
@@ -833,7 +833,14 @@
btResList: [],
tableData: [], //鏀舵枡閫氱煡鍗曞垪琛�(鍒嗛〉鏄剧ず)
dataList: [],
- titleData: ["HItemID", "Hprocid", "HUSEORGID", "HCREATEORGID", "HParentID"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ titleData: [
+ "HItemID",
+ "hmainid",
+ "Hprocid",
+ "HUSEORGID",
+ "HCREATEORGID",
+ "HParentID",
+ ], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
pageSizes: [50, 100, 500, 5000, 50000],
page: 1,
pageSize: 50,
@@ -872,8 +879,7 @@
},
mounted() {},
created() {
- // this.form.Organization = sessionStorage["Organization"];
- this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+ this.form.Organization = sessionStorage["Organization"];
this.riqiChange();
this.get_HProjectList();
this.get_HDeptNameList();
@@ -1031,13 +1037,42 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
+ fetchData() {
+ //鐧诲綍鐢ㄦ埛淇℃伅
+ axios
+ .get(
+ "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
+ )
+ .then((res) => {
+ let data = res.data.data[0];
+ this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+ this.queryParams.HOrgID = data.HUSEORGID;
+ this.user = data.Czymc;
+ axios
+ .get(this.baseURL + "/Web/GetOrganizations", {})
+ .then((res) => {
+ if (res.data.count == 1) {
+ this.organizationList = res.data.data; //缁勭粐鍒楄〃
+ }
+
+ this.handleQuery();
+ // this.getList();
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ })
+ .catch((error) => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
async getList() {
this.tableShow = false;
this.loading = true;
if (this.pageSize == 0) {
this.pageSize = 50;
}
- // this.queryParams.HOrgID = sessionStorage["OrganizationID"];
+ this.queryParams.HOrgID = sessionStorage["OrganizationID"];
if (this.dateRange.length > 0) {
this.sWhere +=
@@ -1052,15 +1087,18 @@
console.log(Organization);
try {
- let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
- params: {
- sWhere: this.sWhere,
- user: this.user,
- Organization: Organization,
- page: this.page,
- size: this.pageSize,
- },
- });
+ let res = await axios.get(
+ this.baseURL + "/LEMS/MES_IF_ICMOBillList_Json_byPage",
+ {
+ params: {
+ sWhere: this.sWhere,
+ user: this.user,
+ Organization: Organization,
+ page: this.page,
+ size: this.pageSize,
+ },
+ }
+ );
this.tyResList = [...JSON.parse(JSON.stringify(res.data.data))]; //鎬绘暟鎹�
let data1 = res.data;
let option = [];
@@ -1304,7 +1342,7 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.HItemID)) {
+ if (this.ids.includes(row.hmainid)) {
return { background: "#ecf5ff" };
}
},
@@ -1316,7 +1354,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.HItemID);
+ this.ids = selection.map((item) => item.hmainid);
this.single = selection.length != 1;
this.multiple = !selection.length;
if (!this.single) {
@@ -1520,14 +1558,13 @@
(this.multiple = true), this.getList();
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- console.log(row);
+ handleDelete() {
this.$modal
.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠")
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
axios
- .get(this.baseURL + "/Sc_ICMOBill/DeltetSc_ICMOReportBill", {
+ .get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
params: {
HInter: this.rowForm.hmainid.toString(),
HsupId: this.rowForm.HsupId,
--
Gitblit v1.9.1