From 7fb0a8f0ab16c149484bf043754cd10cfa94de2f Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 19 一月 2026 14:48:05 +0800
Subject: [PATCH] 增加了业务员，保管员和验收员的对应的显示
---
src/views/basic/gyWarehouse/gyWarehouse.vue | 96 +++++++++++-------------------------------------
1 files changed, 22 insertions(+), 74 deletions(-)
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index 6c1e39b..05403a7 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -1,5 +1,4 @@
<template>
-
<div style="padding: 10px; position: relative">
<el-form
:model="queryParams"
@@ -10,7 +9,6 @@
>
<el-row>
<el-form-item label="浠撳簱浠ｇ爜" prop="HNumber" style="padding-left: 100px">
-
<el-input
v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
@@ -19,7 +17,6 @@
/>
</el-form-item>
<el-form-item label="浠撳簱鍚嶇О" prop="HName">
-
<el-input
v-model="queryParams.HName"
placeholder="璇疯緭鍏ヤ粨搴撳悕绉�"
@@ -28,7 +25,6 @@
/>
</el-form-item>
<el-form-item label="缁勭粐">
-
<el-select
v-model="queryParams.HOrgID"
placeholder="璇烽�夋嫨"
@@ -44,7 +40,6 @@
</el-select>
</el-form-item>
<el-form-item label="鍚屾" :inline="true">
-
<el-input
v-model="queryParams.HSyncNumber"
placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
@@ -70,7 +65,6 @@
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
-
<el-select
v-model="queryParams.ColName1"
placeholder="璇烽�夋嫨"
@@ -78,7 +72,6 @@
class="ForFilteringSchemes"
>
<span v-for="(item, index) in btList" :key="index">
-
<el-option
:label="item.field"
:value="item.field"
@@ -88,7 +81,6 @@
</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="璇烽�夋嫨"
@@ -104,7 +96,6 @@
</el-select>
</el-col>
<el-col :span="11">
-
<el-input
v-model="queryParams.ColContent1"
placeholder="璇疯緭鍏�"
@@ -118,7 +109,6 @@
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
-
<el-select
v-model="queryParams.ColName2"
placeholder="璇烽�夋嫨"
@@ -126,7 +116,6 @@
class="ForFilteringSchemes"
>
<span v-for="(item, index) in btList" :key="index">
-
<el-option
:label="item.field"
:value="item.field"
@@ -136,7 +125,6 @@
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
-
<el-select
v-model="queryParams.Comparator2"
placeholder="璇烽�夋嫨"
@@ -144,7 +132,6 @@
class="ForFilteringSchemes"
>
<span v-for="(item, index) in comparatorList" :key="index">
-
<el-option
:label="item.label"
:value="item.value"
@@ -154,7 +141,6 @@
</el-select>
</el-col>
<el-col :span="11">
-
<el-input
v-model="queryParams.ColContent2"
placeholder="璇疯緭鍏�"
@@ -168,7 +154,6 @@
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
-
<el-select
v-model="queryParams.ColName"
placeholder="璇烽�夋嫨"
@@ -184,7 +169,6 @@
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
-
<el-select
v-model="queryParams.Comparator"
placeholder="璇烽�夋嫨"
@@ -200,7 +184,6 @@
</el-select>
</el-col>
<el-col :span="11">
-
<el-input
v-model="queryParams.ColContent"
placeholder="璇疯緭鍏�"
@@ -219,7 +202,6 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-download"
@@ -229,7 +211,6 @@
>
</el-col>
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-plus"
@@ -240,7 +221,6 @@
>
</el-col>
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-edit"
@@ -251,7 +231,6 @@
>
</el-col>
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-edit"
@@ -262,7 +241,6 @@
>
</el-col>
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-delete"
@@ -273,7 +251,6 @@
</el-button>
</el-col>
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-edit"
@@ -284,7 +261,6 @@
>
</el-col>
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-edit"
@@ -295,7 +271,6 @@
>
</el-col>
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-edit"
@@ -306,7 +281,6 @@
>
</el-col>
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-edit"
@@ -317,7 +291,6 @@
>
</el-col>
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-download"
@@ -327,7 +300,6 @@
>
</el-col>
<el-col :span="1.5">
-
<el-button
type="primary"
icon="el-icon-download"
@@ -337,7 +309,6 @@
>
</el-col>
<el-col :span="1.5" class="zy-hidden">
-
<el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
>鎼� 绱�</el-button
>
@@ -350,7 +321,6 @@
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
-
<el-table
:data="tableData"
ref="tableData"
@@ -365,7 +335,6 @@
v-if="tableShow"
>
<template v-for="(item, index) in btList">
-
<el-table-column
type="selection"
width="55"
@@ -391,9 +360,10 @@
<span v-if="column.property.includes('鏃ユ湡')">{{
parseTime(row[column.property], "{y}-{m}-{d}")
}}</span>
+
<el-button
type="text"
- @click="handleEdit(row, (OperationType = 3))"
+ @click.stop="handleEdit(row, (OperationType = 3))"
v-else-if="column.property == '浠撳簱浠ｇ爜'"
>{{ row.浠撳簱浠ｇ爜 }}</el-button
>
@@ -403,7 +373,6 @@
</el-table-column>
</template>
</el-table>
-
<pagination
v-show="total > 0"
:total="total"
@@ -445,7 +414,6 @@
ref="editRef"
/>
</el-dialog>
-
<el-dialog
:title="upload.title"
:visible.sync="upload.open"
@@ -455,7 +423,6 @@
<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"
@@ -469,7 +436,6 @@
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
-
<el-table
:data="uploadData"
v-loading="uploadTableLoading"
@@ -486,7 +452,6 @@
<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"
@@ -497,7 +462,6 @@
</template>
</el-table-column>
</el-table>
-
<pagination
v-show="uploadTotal > 0"
:total="uploadTotal"
@@ -528,7 +492,6 @@
editRef: null,
activeSeach: "",
HModName: "Gy_Warehouse",
-
activeSeach: "",
editShow: false,
openEdit: false,
@@ -582,13 +545,11 @@
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, // 涓婁竴娆￠�変腑鐨勮
@@ -680,7 +641,7 @@
// 浠撳簱鍚屾
async handleSync() {
try {
- let res = await axios.get(this.baseURL + "/Gy_Warehouse/Gy_WarehouseViewApi", {
+ let res = await axios.get(this.$baseUrl + "/Gy_Warehouse/Gy_WarehouseViewApi", {
params: {
Number: this.queryParams.HSyncNumber,
Type: "CK",
@@ -730,7 +691,7 @@
defaintOperationByCompanyName() {
var result = false;
axios
- .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+ .get(this.$baseUrl + "/Xt_getInfo/getCompanyName")
.then((response) => {
var data1 = response.data;
if (data1.count == 1) {
@@ -809,8 +770,6 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
-
-
getList() {
this.tableShow = false;
this.loading = true;
@@ -821,7 +780,7 @@
this.sWhere += "";
//鐢熶骇璧勬枡鍒楄〃
axios
- .get(this.baseURL + "/Gy_WareHouse/listpage", {
+ .get(this.$baseUrl + "/Gy_WareHouse/listpage", {
params: {
sWhere: `${this.sWhere}`,
user: sessionStorage["HUserName"],
@@ -929,7 +888,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,
@@ -1075,7 +1034,7 @@
handleRowClick(row, column, event) {
this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
- if (this.checkIsIframe) {
+ if (this.checkIsIframe()) {
// 灏嗗綋鍓嶉�変腑鐨勬暟鎹毚闇插埌window涓�
window.selectedRow = row;
}
@@ -1099,18 +1058,16 @@
},
//鍙屽嚮琛�
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();
+ this.handleEdit(row);
}
},
// 澶氶�夋閫変腑鏁版嵁
@@ -1119,23 +1076,19 @@
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];
}
- }
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1221,7 +1174,6 @@
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;
@@ -1247,7 +1199,7 @@
getOrgIDByUser() {
var res = "";
axios
- .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+ .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
user: sessionStorage["HUserName"],
@@ -1312,7 +1264,9 @@
});
},
//鎵撳紑淇敼缁勪欢寮圭獥
- handleEdit() {
+
+ handleEdit(row) {
+ this.rowForm = row
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
@@ -1331,8 +1285,7 @@
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
axios
- .get(this.baseURL + "/DeltetGy_Warehouse", {
-
+ .get(this.$baseUrl + "/DeltetGy_Warehouse", {
params: {
HItemID: this.rowForm.HItemID.toString(),
user: sessionStorage["HUserName"],
@@ -1353,7 +1306,6 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
-
.catch(() => {});
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
@@ -1361,8 +1313,7 @@
var InterID = form.HItemID || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Warehouse/AuditGy_Warehouse", {
-
+ .get(this.$baseUrl + "/Gy_Warehouse/AuditGy_Warehouse", {
params: {
HInterID: InterID,
IsAudit: num,
@@ -1387,8 +1338,7 @@
var InterID = form.HItemID || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Warehouse/StopGy_Warehouse", {
-
+ .get(this.$baseUrl + "/Gy_Warehouse/StopGy_Warehouse", {
params: {
HInterID: InterID,
IsStop: num,
@@ -1459,11 +1409,10 @@
}
}
var sSubStr = JSON.stringify(num);
-
var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
- url: this.baseURL + "/Gy_Warehouse/Gy_Process_Excel",
+ url: this.$baseUrl + "/Gy_Warehouse/Gy_Process_Excel",
data: {
sMainSub: sMainSub,
},
@@ -1496,7 +1445,6 @@
return deleteList.indexOf(item.index) == -1;
});
})
-
.catch(() => {});
},
getPage(page, list) {
@@ -1512,13 +1460,13 @@
this.uploadData = this.getPage(this.uploadPage, this.alluploadList);
}, 100);
},
+ },
};
</script>
<style>
.xsckdBox .el-date-editor.el-input {
width: 100%;
}
-
.form-item-inline > .el-form-item__content {
display: flex;
--
Gitblit v1.9.1