From 86d627eecb14597a338ee402eab5a0c05ce1bdeb Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期四, 27 十一月 2025 08:26:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyStockPlace/gyStockPlace.vue | 146 +++++++++++++++++++++++++-----------------------
1 files changed, 76 insertions(+), 70 deletions(-)
diff --git a/src/views/basic/gyStockPlace/gyStockPlace.vue b/src/views/basic/gyStockPlace/gyStockPlace.vue
index e91221e..c9af3c0 100644
--- a/src/views/basic/gyStockPlace/gyStockPlace.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlace.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px">
+ <div style="padding: 10px;position: relative">
<el-form
:model="queryParams"
ref="queryForm"
@@ -26,7 +26,7 @@
</el-form-item>
<el-form-item label="缁勭粐">
<el-select
- v-model="queryParams.HOrgName"
+ v-model="queryParams.HOrgID"
placeholder="璇烽�夋嫨"
class="ForFilteringSchemes"
>
@@ -34,7 +34,7 @@
v-for="(item, index) in organizationList"
:key="index"
:label="item.Name"
- :value="item.Name"
+ :value="item.ID.toString()"
>
</el-option>
</el-select>
@@ -62,8 +62,8 @@
<el-card class="box-card">
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
- <el-form-item label-width="0">
- <el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
<el-select
v-model="queryParams.ColName1"
@@ -104,10 +104,10 @@
class="ForFilteringSchemes"
/>
</el-col>
- </el-row>
- </el-form-item>
- <el-form-item label-width="0">
- <el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
<el-select
v-model="queryParams.ColName2"
@@ -149,10 +149,10 @@
class="ForFilteringSchemes"
/>
</el-col>
- </el-row>
- </el-form-item>
- <el-form-item label-width="0">
- <el-row>
+ </el-form-item>
+ </el-row>
+ <el-row>
+ <el-form-item label-width="0">
<el-col :span="7">
<el-select
v-model="queryParams.ColName"
@@ -192,8 +192,8 @@
class="ForFilteringSchemes"
/>
</el-col>
- </el-row>
- </el-form-item>
+ </el-form-item>
+ </el-row>
</div>
</el-card>
</el-collapse-item>
@@ -248,12 +248,12 @@
>闅愯棌鍒楄缃�</el-button
>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5" class="zy-hidden">
<el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
>鎼� 绱�</el-button
>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5" class="zy-hidden">
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
>閲� 缃�</el-button
>
@@ -303,8 +303,8 @@
<el-button
type="text"
@click="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '鍗曟嵁鍙�'"
- >{{ row.鍗曟嵁鍙� }}</el-button
+ v-else-if="column.property == '浠撲綅浠ｇ爜'"
+ >{{ row.浠撲綅浠ｇ爜 }}</el-button
>
<span v-else>{{ row[column.label] }}</span>
</div>
@@ -341,6 +341,7 @@
append-to-body
class="xsckdBox"
:before-close="close"
+ @close="beforeEditCloseHandler"
>
<edit
:OperationType="OperationType"
@@ -349,6 +350,7 @@
:copyType="copyType"
@editCloseGy="editGyClose"
v-if="editShow"
+ ref="editRef"
/>
</el-dialog>
<el-dialog
@@ -426,6 +428,8 @@
},
data() {
return {
+ editRef: null,
+ activeSeach: "",
HModName: "Gy_Warehouse",
editShow: false,
openEdit: false,
@@ -479,12 +483,11 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
- baseURL: "http://localhost:81/API/",
- user: "admin",
+ baseURL: process.env.VUE_APP_BASE_API,
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -503,7 +506,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -528,7 +531,7 @@
btResList: [],
tableData: [], //閿�鍞嚭搴撳垪琛�(鍒嗛〉鏄剧ず)
dataList: [],
- titleData: ["HItemID", "HParentID"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ titleData: ["HItemID", "HParentID", "閫夋嫨"], //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
pageSizes: [50, 100, 500, 5000, 50000],
page: 1,
pageSize: 50,
@@ -566,10 +569,13 @@
};
},
created() {
- this.fetchData();
+ this.handleQuery();
this.riqiChange();
},
methods: {
+ beforeEditCloseHandler() {
+ this.$refs.editRef.close();
+ },
// 浠撲綅鍚屾(API涓殏鏃舵病鏈夊搴旂殑API)
async handleSync() {
try {
@@ -702,37 +708,6 @@
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((response) => {
- let data = response.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
-
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((response) => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data; //缁勭粐鍒楄〃
- this.queryParams.HOrgName = response.data.data.find(
- (e) => e.ID == data.HUSEORGID
- )?.Name;
- }
- this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
getList() {
this.tableShow = false;
this.loading = true;
@@ -743,11 +718,10 @@
this.sWhere += "";
//浠撲綅鍒楄〃
axios
- .get(this.baseURL + "/Gy_StockPlace/list1page", {
+ .get(this.baseURL + "/Gy_StockPlace/list2Page", {
params: {
sWhere: `${this.sWhere}`,
- user: this.user,
- Organization: "娴欐睙鏅轰簯杩堟��",
+ user: sessionStorage["HUserName"],
page: this.page,
size: this.pageSize,
},
@@ -836,7 +810,12 @@
}
}
option.data = result;
- this.DisPlay_HideColumn(this.HModName, this.user, option, this.dataList);
+ this.DisPlay_HideColumn(
+ this.HModName,
+ sessionStorage["HUserName"],
+ option,
+ this.dataList
+ );
}
})
.catch((error) => {
@@ -994,6 +973,9 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit("deptEmit", row, 9);
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -1004,16 +986,32 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit();
+ if (this.openPage) {
+ this.$emit("deptEmitDb", row, 9);
+ } else {
+ this.handleEdit();
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.ids = selection.map((item) => item.HItemID);
- this.single = selection.length != 1;
- this.multiple = !selection.length;
- if (!this.single) {
+ if (this.openPage) {
+ //鍒楄〃鍗曢��
+ if (selection.length > 1) {
+ const del_row = selection.shift();
+ this.$refs.tableData.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑
+ }
+ this.rowForm = {};
+ this.ids = selection.map((item) => item.HItemID);
this.rowForm = selection[0];
+ } else {
+ //澶氶��
+ this.ids = selection.map((item) => item.HItemID);
+ this.single = selection.length != 1;
+ this.multiple = !selection.length;
+ if (!this.single) {
+ this.rowForm = selection[0];
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1099,8 +1097,10 @@
if (this.queryParams.HName) {
this.sWhere += " and 浠撲綅鍚嶇О like '%" + this.queryParams.HName + "%'";
}
- if (this.queryParams.HOrgName) {
- this.sWhere += " and 缁勭粐鍚嶇О = '" + this.queryParams.HOrgName + "'";
+ if (this.queryParams.HOrgID) {
+ let OrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
+ ?.Name;
+ this.sWhere += " and 缁勭粐鍚嶇О = '" + OrgName + "'";
}
// this.sWhere += this.addSWhereByOpenType()
// this.sWhere += this.getOrgIDByUser()
@@ -1125,7 +1125,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1208,7 +1208,10 @@
if (!this.rowForm.瀹℃牳浜�) {
axios
.get(this.baseURL + "Deltet_Gy_StockPlace", {
- params: { HItemID: this.rowForm.HItemID.toString(), user: this.user },
+ params: {
+ HItemID: this.rowForm.HItemID.toString(),
+ user: sessionStorage["HUserName"],
+ },
})
.then((response) => {
if (response.data.count == 1) {
@@ -1278,7 +1281,7 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
@@ -1342,4 +1345,7 @@
flex-direction: row;
width: 60%;
}
+.zy-hidden {
+ display: none;
+}
</style>
--
Gitblit v1.9.1