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/sell/XsSeOutStockBackBillList.vue | 140 ++++++++++++++++++++++++++++++----------------
1 files changed, 90 insertions(+), 50 deletions(-)
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index 5ecb99e..a91712e 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -9,15 +9,27 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鏃ユ湡" style="margin-left: 100px">
+ <el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
- v-model="dateRange"
+ v-model="sTime"
+ type="date"
+ placeholder="寮�濮嬫棩鏈�"
+ style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
value-format="yyyy-MM-dd"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃ユ湡">
+ <el-date-picker
+ v-model="eTime"
+ type="date"
+ placeholder="缁撴潫鏃ユ湡"
+ style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
+ >
+ </el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
<el-select
@@ -267,7 +279,7 @@
icon="el-icon-edit"
size="mini"
:disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3))"
+ @click="handleEdit((row = rowForm), (OperationType = 3), (copyType = -1))"
>缂栬緫</el-button
>
</el-col>
@@ -277,7 +289,7 @@
icon="el-icon-edit"
size="mini"
:disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))"
+ @click="handleEdit((row = rowForm), (OperationType = 2), (copyType = 1))"
>澶嶅埗</el-button
>
</el-col>
@@ -466,7 +478,7 @@
}}</span>
<el-button
type="text"
- @click="handleEdit(row, (OperationType = 3))"
+ @click.stop="handleEdit(row, (OperationType = 3), (copyType = 1))"
v-else-if="column.property == '鍗曟嵁鍙�'"
>{{ row.鍗曟嵁鍙� }}</el-button
>
@@ -499,14 +511,14 @@
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog
- title="缂栬緫鑱屽憳"
+ title="缂栬緫閫�璐ч�氱煡鍗�"
:visible.sync="openEdit"
width="1480px"
append-to-body
class="xsckdBox"
:before-close="close"
>
- <edit
+ <!-- <edit
:OperationType="OperationType"
:linterid="this.rowForm.HItemID"
:HSouceBillType="this.rowForm.HSourceBillType"
@@ -514,7 +526,10 @@
:copyType="copyType"
@editCloseGy="editGyClose"
v-if="editShow"
- />
+ /> -->
+ <div style="height: 70vh">
+ <iframe :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
+ </div>
</el-dialog>
<el-dialog
:title="upload.title"
@@ -613,7 +628,7 @@
import dayjs from "dayjs";
export default {
- name: "GySource",
+ name: "XsSeOutStockBackBillList",
components: { RowSettings },
props: {
openPage: { type: String },
@@ -621,7 +636,7 @@
data() {
return {
activeSeach: "",
- HModName: "Cg_POOrderBillList",
+ HModName: "XsSeOutStockBackBillList",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -630,7 +645,7 @@
openPrintList: false,
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
- HBillType: "1202",
+ HBillType: "1105",
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -662,6 +677,7 @@
{ label: "杩�30澶�", value: 29 },
{ label: "杩戝崐骞�", value: 180 },
{ label: "杩戜竴骞�", value: 365 },
+ { label: "浠绘剰鏃堕棿", value: -1 },
],
hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
@@ -680,7 +696,6 @@
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
- user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
@@ -773,14 +788,22 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ window.editGyClose = () => {
+ this.editGyClose(); // 缁勪欢鍐呯殑鏂规硶缁戝畾鍒皐indows
+ };
+ },
created() {
this.riqiChange();
this.getList();
},
+ beforeDestroy() {
+ // 缁勪欢閿�姣佹椂娓呯悊鍏ㄥ眬鏂规硶锛岄伩鍏嶅唴瀛樻硠婕�
+ delete window.editGyClose;
+ },
methods: {
BillSync() {
- axios.get(`${this.baseURL}/Xs_SeOutStockBackBill/Xs_SeOutStockBackBillViewApi`, {
+ axios.get(`${this.$baseUrl}/Xs_SeOutStockBackBill/Xs_SeOutStockBackBillViewApi`, {
params: { BillNo: this.form.HBillno2, BillType: 1403 },
});
},
@@ -824,7 +847,7 @@
defaintOperationByCompanyName() {
var result = false;
axios
- .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+ .get(this.$baseUrl + "/Xt_getInfo/getCompanyName")
.then((res) => {
var data1 = res.data;
if (data1.count == 1) {
@@ -859,6 +882,10 @@
this.getList();
},
riqiChange() {
+ if (this.queryParams.HInitTimeCycle == -1) {
+ // 浠绘剰鏃堕棿
+ return;
+ }
const end = dayjs(new Date()).format("YYYY-MM-DD");
const start = dayjs(new Date())
.subtract(this.queryParams.HInitTimeCycle, "d")
@@ -872,7 +899,6 @@
// const ddE = String(end.getDate()).padStart(2, "0");
this.sTime = start;
this.eTime = end;
- this.dateRange = [this.sTime, this.eTime];
},
organizationChange(val) {
// let options=undefined
@@ -926,18 +952,16 @@
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
- if (this.dateRange.length > 0) {
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
- this.sWhere +=
- " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
+ if (this.sTime && this.eTime) {
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
try {
- let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
+ let res = await axios.get(this.$baseUrl + "/Xs_SeOutStockBackBill/list_byPage", {
params: {
sWhere: this.sWhere,
- user: this.user,
+ user: sessionStorage["HUserName"],
Organization: HOrgName,
page: this.page,
size: this.pageSize,
@@ -1026,7 +1050,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 (err) {
this.$modal.msgError(`鑾峰彇鏀舵枡閫氱煡鍗曢敊璇�: ${err}`);
@@ -1035,7 +1064,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,
@@ -1186,19 +1215,19 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.HItemID)) {
+ if (this.ids.includes(row.hmainid)) {
return { background: "#ecf5ff" };
}
},
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- this.handleEdit();
+ this.handleEdit(row, 3, 1);
},
// 澶氶�夋閫変腑鏁版嵁
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) {
@@ -1282,6 +1311,7 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
+
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
@@ -1315,10 +1345,10 @@
getOrgIDByUser() {
var res = "";
axios
- .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+ .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1373,13 +1403,15 @@
//鎵撳紑鏂板缁勪欢寮圭獥
handleAddEdit() {
this.rowForm.HItemID = 0;
+ this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=0&OperationType=1&CopyType=2`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
});
},
//鎵撳紑淇敼缁勪欢寮圭獥
- handleEdit() {
+ handleEdit(row, OperationType, copyType) {
+ this.iframeUrl = `/iframe/XsSeOutStockBackBillEdit?HInterID=${row.hmainid}&OperationType=${OperationType}&CopyType=${copyType}`;
this.$nextTick(() => {
this.openEdit = true;
this.editShow = true;
@@ -1398,14 +1430,14 @@
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
axios
- .get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
+ .get(this.$baseUrl + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
params: {
HInter: this.rowForm.hmainid.toString(),
HsupId: this.rowForm.HsupId,
HQty: this.rowForm.HQty,
HSourceInterID: this.rowForm.HSourceInterID,
HSourceEntryID: this.rowForm.HSourceEntryID,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
})
.then((res) => {
@@ -1430,8 +1462,12 @@
var InterID = form.HItemID || form.HInterID || form.hmainid;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
- params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
+ .get(this.$baseUrl + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
+ params: {
+ HInterID: InterID,
+ TypeError: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1451,12 +1487,12 @@
let HInterID = form.HItemID || form.HInterID || form.hmainid;
try {
let res = await axios.get(
- `${this.baseURL}/Xs_SeOutStockBill/CloseXs_SeOutStockBill`,
+ `${this.$baseUrl}/Xs_SeOutStockBill/CloseXs_SeOutStockBill`,
{
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1478,13 +1514,13 @@
let HEntryID = form.HEntryID || form.hsubid;
try {
let res = await axios.get(
- `${this.baseURL}/Xs_SeOutStockBill/CloseRowXs_SeOutStockBill`,
+ `${this.$baseUrl}/Xs_SeOutStockBill/CloseRowXs_SeOutStockBill`,
{
params: {
HInterID: HInterID,
HEntryID: HEntryID,
ISAudit: num,
- CurUserName: this.user,
+ CurUserName: sessionStorage["HUserName"],
},
}
);
@@ -1505,12 +1541,12 @@
let HInterID = form.HItemID || form.HInterID || form.hmainid;
try {
let res = await axios.get(
- `${this.baseURL}/Xs_SeOutStockBill/CancellXs_SeOutStockBill`,
+ `${this.$baseUrl}/Xs_SeOutStockBill/CancellXs_SeOutStockBill`,
{
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1531,8 +1567,12 @@
var InterID = form.HItemID || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ .get(this.$baseUrl + "/Gy_Employee/StopGy_Employee", {
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1598,10 +1638,10 @@
}
}
var sSubStr = JSON.stringify(num);
- var sMainSub = sSubStr + "&鍜�" + this.user;
+ var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
- url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+ url: this.$baseUrl + "/Gy_Source/Gy_Source_btnSave",
data: {
sMainSub: sMainSub,
},
--
Gitblit v1.9.1