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/sell/XsSeOutStockBill.vue | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 3ee1ef7..dd2c4ce 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -15,6 +15,8 @@
type="date"
placeholder="寮�濮嬫棩鏈�"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -24,6 +26,8 @@
type="date"
placeholder="缁撴潫鏃ユ湡"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -66,7 +70,7 @@
v-for="(item, index) in organizationList"
:key="index"
:label="item.Name"
- :value="item.ID"
+ :value="item.ID.toString()"
>
</el-option>
</el-select>
@@ -631,7 +635,7 @@
import dayjs from "dayjs";
export default {
- name: "GySource",
+ name: "XsSeOutStockBill",
components: { RowSettings },
props: {
openPage: { type: String },
@@ -640,7 +644,7 @@
return {
iframeUrl: "",
activeSeach: "",
- HModName: "Cg_POOrderBillList",
+ HModName: "XsSeOutStockBill",
editShow: false,
openEdit: false,
totalNameList: [],
@@ -649,7 +653,7 @@
openPrintList: false,
printListShow: false,
HClassTag: "ForFilteringSchemes", //杩囨护鏉′欢鐨刢lass绫�
- HBillType: "1202",
+ HBillType: "1402",
openBtnHide: false,
btnHideShow: false,
rowHideShow: false,
@@ -681,6 +685,7 @@
{ label: "杩�30澶�", value: 29 },
{ label: "杩戝崐骞�", value: 180 },
{ label: "杩戜竴骞�", value: 365 },
+ { label: "浠绘剰闂撮殧", value: -1 },
],
hPriceTypeList: ["鎴愭湰浠�", "缁撶畻浠�"],
addBtnShow: false,
@@ -699,7 +704,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, // 涓婁竴娆￠�変腑鐨勮
@@ -718,7 +722,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["OrganizationID"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -798,7 +802,6 @@
};
},
created() {
- this.queryParams.HOrgID = sessionStorage["OrganizationID"];
this.riqiChange();
this.getList();
},
@@ -887,6 +890,9 @@
this.getList();
},
riqiChange() {
+ if (this.queryParams.HInitTimeCycle == -1) {
+ return;
+ }
const end = new Date();
const start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
@@ -954,13 +960,13 @@
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
let Organization = this.organizationList.find(
- (e) => (e.ID = this.queryParams.HOrgID)
+ (e) => e.ID == this.queryParams.HOrgID
)?.Name;
try {
let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
params: {
sWhere: this.sWhere,
- user: this.user,
+ user: sessionStorage["HUserName"],
Organization: Organization,
page: this.page,
size: this.pageSize,
@@ -1049,7 +1055,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}`);
@@ -1354,7 +1365,7 @@
.get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
- user: this.user,
+ user: sessionStorage["HUserName"],
HOrgID: this.zuzhiId,
},
})
@@ -1443,7 +1454,7 @@
HQty: this.rowForm.HQty,
HSourceInterID: this.rowForm.HSourceInterID,
HSourceEntryID: this.rowForm.HSourceEntryID,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
})
.then((res) => {
@@ -1469,7 +1480,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
- params: { HInterID: InterID, TypeError: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ TypeError: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1494,7 +1509,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1522,7 +1537,7 @@
HInterID: HInterID,
HEntryID: HEntryID,
ISAudit: num,
- CurUserName: this.user,
+ CurUserName: sessionStorage["HUserName"],
},
}
);
@@ -1548,7 +1563,7 @@
params: {
HInterID: HInterID,
Type: num,
- user: this.user,
+ user: sessionStorage["HUserName"],
},
}
);
@@ -1570,7 +1585,11 @@
//閫昏緫瀹℃牳鏂规硶
axios
.get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
- params: { HInterID: InterID, IsStop: num, CurUserName: this.user },
+ params: {
+ HInterID: InterID,
+ IsStop: num,
+ CurUserName: sessionStorage["HUserName"],
+ },
})
.then((res) => {
let result = res.data;
@@ -1636,7 +1655,7 @@
}
}
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",
--
Gitblit v1.9.1