From f8ddb1cdc0caafa8aa74a214fffa552aac1d04a7 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 20 十一月 2025 14:37:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyWarehouse/gyWarehouse.vue | 67 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 6 deletions(-)
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index 8f30f57..6c1e39b 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -1,4 +1,5 @@
<template>
+
<div style="padding: 10px; position: relative">
<el-form
:model="queryParams"
@@ -9,6 +10,7 @@
>
<el-row>
<el-form-item label="浠撳簱浠ｇ爜" prop="HNumber" style="padding-left: 100px">
+
<el-input
v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
@@ -17,6 +19,7 @@
/>
</el-form-item>
<el-form-item label="浠撳簱鍚嶇О" prop="HName">
+
<el-input
v-model="queryParams.HName"
placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"
@@ -25,6 +28,7 @@
/>
</el-form-item>
<el-form-item label="缁勭粐">
+
<el-select
v-model="queryParams.HOrgID"
placeholder="璇烽�夋嫨"
@@ -40,6 +44,7 @@
</el-select>
</el-form-item>
<el-form-item label="鍚屾" :inline="true">
+
<el-input
v-model="queryParams.HSyncNumber"
placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
@@ -65,6 +70,7 @@
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
+
<el-select
v-model="queryParams.ColName1"
placeholder="璇烽�夋嫨"
@@ -72,6 +78,7 @@
class="ForFilteringSchemes"
>
<span v-for="(item, index) in btList" :key="index">
+
<el-option
:label="item.field"
:value="item.field"
@@ -81,6 +88,7 @@
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange"
<el-select
v-model="queryParams.Comparator1"
placeholder="璇烽�夋嫨"
@@ -96,6 +104,7 @@
</el-select>
</el-col>
<el-col :span="11">
+
<el-input
v-model="queryParams.ColContent1"
placeholder="璇疯緭鍏�"
@@ -109,6 +118,7 @@
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
+
<el-select
v-model="queryParams.ColName2"
placeholder="璇烽�夋嫨"
@@ -116,6 +126,7 @@
class="ForFilteringSchemes"
>
<span v-for="(item, index) in btList" :key="index">
+
<el-option
:label="item.field"
:value="item.field"
@@ -125,6 +136,7 @@
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
+
<el-select
v-model="queryParams.Comparator2"
placeholder="璇烽�夋嫨"
@@ -132,6 +144,7 @@
class="ForFilteringSchemes"
>
<span v-for="(item, index) in comparatorList" :key="index">
+
<el-option
:label="item.label"
:value="item.value"
@@ -141,6 +154,7 @@
</el-select>
</el-col>
<el-col :span="11">
+
<el-input
v-model="queryParams.ColContent2"
placeholder="璇疯緭鍏�"
@@ -154,6 +168,7 @@
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
+
<el-select
v-model="queryParams.ColName"
placeholder="璇烽�夋嫨"
@@ -169,6 +184,7 @@
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
+
<el-select
v-model="queryParams.Comparator"
placeholder="璇烽�夋嫨"
@@ -184,6 +200,7 @@
</el-select>
</el-col>
<el-col :span="11">
+
<el-input
v-model="queryParams.ColContent"
placeholder="璇疯緭鍏�"
@@ -202,6 +219,7 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-download"
@@ -211,6 +229,7 @@
>
</el-col>
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-plus"
@@ -221,6 +240,7 @@
>
</el-col>
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-edit"
@@ -231,6 +251,7 @@
>
</el-col>
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-edit"
@@ -241,6 +262,7 @@
>
</el-col>
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-delete"
@@ -251,6 +273,7 @@
</el-button>
</el-col>
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-edit"
@@ -261,6 +284,7 @@
>
</el-col>
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-edit"
@@ -271,6 +295,7 @@
>
</el-col>
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-edit"
@@ -281,6 +306,7 @@
>
</el-col>
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-edit"
@@ -291,6 +317,7 @@
>
</el-col>
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-download"
@@ -300,6 +327,7 @@
>
</el-col>
<el-col :span="1.5">
+
<el-button
type="primary"
icon="el-icon-download"
@@ -309,6 +337,7 @@
>
</el-col>
<el-col :span="1.5" class="zy-hidden">
+
<el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
>鎼� 绱�</el-button
>
@@ -321,6 +350,7 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
+
<el-table
:data="tableData"
ref="tableData"
@@ -335,6 +365,7 @@
v-if="tableShow"
>
<template v-for="(item, index) in btList">
+
<el-table-column
type="selection"
width="55"
@@ -372,6 +403,7 @@
</el-table-column>
</template>
</el-table>
+
<pagination
v-show="total > 0"
:total="total"
@@ -413,6 +445,7 @@
ref="editRef"
/>
</el-dialog>
+
<el-dialog
:title="upload.title"
:visible.sync="upload.open"
@@ -422,6 +455,7 @@
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
+
<el-upload
ref="upload"
:limit="1"
@@ -435,6 +469,7 @@
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
+
<el-table
:data="uploadData"
v-loading="uploadTableLoading"
@@ -451,6 +486,7 @@
<el-table-column label="澶囨敞" prop="澶囨敞" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
+
<el-button
size="mini"
type="text"
@@ -461,6 +497,7 @@
</template>
</el-table-column>
</el-table>
+
<pagination
v-show="uploadTotal > 0"
:total="uploadTotal"
@@ -491,6 +528,7 @@
editRef: null,
activeSeach: "",
HModName: "Gy_Warehouse",
+
activeSeach: "",
editShow: false,
openEdit: false,
@@ -544,11 +582,13 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: "",
+
organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API,
+
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -769,6 +809,8 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
+
+
getList() {
this.tableShow = false;
this.loading = true;
@@ -1057,13 +1099,15 @@
},
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
- if (this.checkIsIframe) {
- // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
- window.parent.iframeWareHouseCallBack(row);
- return;
- }
+
+ // if (this.checkIsIframe) {
+ // // IFrame 鍙屽嚮 杩斿洖褰撳墠鍙屽嚮鐨勬暟鎹�
+ // window.parent.iframeWareHouseCallBack(row);
+ // return;
+ // }
this.OperationType = 3;
if (this.openPage) {
+
this.$emit("deptEmitDb", row, 2);
} else {
this.handleEdit();
@@ -1075,19 +1119,23 @@
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];
}
+ }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1173,6 +1221,7 @@
if (this.queryParams.HName) {
this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.HName + "%'";
}
+
if (this.queryParams.HOrgID) {
let OrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
?.Name;
@@ -1283,6 +1332,7 @@
if (!this.rowForm.瀹℃牳浜�) {
axios
.get(this.baseURL + "/DeltetGy_Warehouse", {
+
params: {
HItemID: this.rowForm.HItemID.toString(),
user: sessionStorage["HUserName"],
@@ -1303,6 +1353,7 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
+
.catch(() => {});
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
@@ -1311,6 +1362,7 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
+
params: {
HInterID: InterID,
IsAudit: num,
@@ -1336,6 +1388,7 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
+
params: {
HInterID: InterID,
IsStop: num,
@@ -1406,6 +1459,7 @@
}
}
var sSubStr = JSON.stringify(num);
+
var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
@@ -1442,6 +1496,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
+
.catch(() => {});
},
getPage(page, list) {
@@ -1457,7 +1512,6 @@
this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
}, 100);
},
- },
};
</script>
<style>
@@ -1465,6 +1519,7 @@
width: 100%;
}
+
.form-item-inline > .el-form-item__content {
display: flex;
flex-direction: row;
--
Gitblit v1.9.1