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/gyWarehouseEdit.vue | 162 +++++++++++++++++++++++++++---------------------------
1 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/src/views/basic/gyWarehouse/gyWarehouseEdit.vue b/src/views/basic/gyWarehouse/gyWarehouseEdit.vue
index cc6803e..035784b 100644
--- a/src/views/basic/gyWarehouse/gyWarehouseEdit.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouseEdit.vue
@@ -47,10 +47,19 @@
<el-form-item label="浠撳簱绫诲瀷" prop="HWarehouseType">
<el-select v-model="form.HWarehouseType" placeholder="璇烽�夋嫨浠撳簱绫诲瀷">
<el-option
- v-for="(item, index) in HWarehouseTypeList"
- :key="index"
- :label="item.Name"
- :value="item.Name"
+ v-for="item in [
+ {
+ label: '鐢熶骇浠撳簱',
+ value: '鐢熶骇浠撳簱',
+ },
+ {
+ label: '妯″叿浠撳簱',
+ value: '妯″叿浠撳簱',
+ },
+ ]"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
>
</el-option>
</el-select>
@@ -86,7 +95,7 @@
v-for="(item, index) in organizationList"
:key="index"
:label="item.Name"
- :value="item.ID"
+ :value="item.ID.toString()"
>
</el-option>
</el-select>
@@ -243,7 +252,7 @@
CheckBillDisabled: true,
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
- baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
+ baseURL: process.env.VUE_APP_BASE_API,
user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
@@ -265,26 +274,12 @@
ids: [],
// 琛ㄥ崟鍙傛暟
- form: {
- HWarehouseType: "鐢熶骇浠撳簱",
- },
+ form: {},
// 琛ㄥ崟鏍￠獙
rules: {
HNumber: [{ required: true, message: "浠撳簱浠ｇ爜涓嶈兘涓虹┖", trigger: "blur" }],
HName: [{ required: true, message: "浠撳簱鍚嶇О鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- HWarehouseType: [
- { required: true, message: "浠撳簱绫诲瀷涓嶈兘涓虹┖", trigger: "blur" },
- ],
},
-
- HWarehouseTypeList: [
- {
- Name: "鐢熶骇浠撳簱",
- },
- {
- Name: "妯″叿浠撳簱",
- },
- ],
};
},
created() {
@@ -298,16 +293,10 @@
methods: {
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.user = data.Czymc;
+ this.zuzhiId = sessionStorage["OrganizationID"]; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
+ this.user = sessionStorage["HUserName"];
axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
+ .get(this.$baseUrl + "/Web/GetOrganizations", {})
.then((response) => {
if (response.data.count == 1) {
this.organizationList = response.data.data; //缁勭粐鍒楄〃
@@ -317,18 +306,13 @@
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
},
getdata() {
this.reset();
- console.log(this.OperationType);
if (this.OperationType != 1) {
this.zzSelDis = true;
axios
- .get(this.baseURL + "/Gy_Warehouse/cx", {
+ .get(this.$baseUrl + "/Gy_Warehouse/cx", {
params: {
HInterID: this.linterid,
},
@@ -339,52 +323,68 @@
if (result.code == 1) {
// 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
-
- Object.assign(this.form, {
- HNumber: data.浠撳簱浠ｇ爜,
- HItemID: data.HItemID,
- HParentID: data.HParentID,
- HShortNumber: data.HNumber,
- HName: data.浠撳簱鍚嶇О,
- HHelpCode: data.HHelpCode,
- HEmpID: data.HEmpID,
- HEmpName: data.HEmpName,
- HAddress: data.浠撳簱鍦板潃,
- HPhone: data.鑱旂郴鐢佃瘽,
- HStopflag: data.绂佺敤鏍囪,
- HStockCtrlFlag: data.璐熷簱瀛樻帶鍒舵爣璁�,
- HSPFlag: data.鍚敤浠撲綅 == "Y" ? 1 : 0,
- HRemark: data.HRemark,
- HWarehouseType: data.浠撳簱绫诲瀷,
- //, "HItemID": data.鏉＄爜缂栧彿
- HBarCode: data.HBarCode,
- HUSEORGID: data.HUSEORGID,
- //, "HCreator": data.鍒涘缓浜�
- //, "lngBillKey": data.lngBillKey
- //, "lngBillSubKey": data.lngBillSubKey
- //, "HMaker": data.HMaker
- //, "HCreateDate": data.鍒涘缓鏃ユ湡
- HUpDater: sessionStorage["HUserName"],
- HMakeEmp: data["鍒涘缓浜�"],
- HMakeDate:
- data["鍒涘缓鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["鍒涘缓鏃ユ湡"])).format("yyyy-MM-dd"),
- HCheckEmp: data["瀹℃牳浜�"],
- HCheckDate:
- data["瀹℃牳鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["瀹℃牳鏃ユ湡"])).format("yyyy-MM-dd"),
- HStopEmp: data["绂佺敤浜�"],
- HStopDate:
- data["绂佺敤鏃ユ湡"] == null
- ? ""
- : dayjs(new Date(data["绂佺敤鏃ユ湡"])).format("yyyy-MM-dd"),
- });
+ // 浣跨敤 Object.assign 涓㈠け鍝嶅簲寮� 鏀逛负浣跨敤 this.form = {...{}}
+ this.form = {
+ ...{
+ HNumber: data.浠撳簱浠ｇ爜,
+ HItemID: data.HItemID,
+ HParentID: data.HParentID,
+ HShortNumber: data.HNumber,
+ HName: data.浠撳簱鍚嶇О,
+ HHelpCode: data.HHelpCode,
+ HEmpID: data.HEmpID,
+ HEmpName: data.HEmpName,
+ HAddress: data.浠撳簱鍦板潃,
+ HPhone: data.鑱旂郴鐢佃瘽,
+ HStopflag: data.绂佺敤鏍囪 == "true",
+ HStockCtrlFlag: data.璐熷簱瀛樻帶鍒舵爣璁� == "true",
+ HSPFlag: data.鍚敤浠撲綅 == "Y" ? true : false,
+ HRemark: data.HRemark,
+ HWarehouseType: data.浠撳簱绫诲瀷,
+ //, "HItemID": data.鏉＄爜缂栧彿
+ HBarCode: data.HBarCode,
+ HUSEORGID: data.HUSEORGID,
+ //, "HCreator": data.鍒涘缓浜�
+ //, "lngBillKey": data.lngBillKey
+ //, "lngBillSubKey": data.lngBillSubKey
+ //, "HMaker": data.HMaker
+ //, "HCreateDate": data.鍒涘缓鏃ユ湡
+ HUpDater: sessionStorage["HUserName"],
+ HMakeEmp: data["鍒涘缓浜�"],
+ HMakeDate:
+ data["鍒涘缓鏃ユ湡"] == null
+ ? ""
+ : dayjs(new Date(data["鍒涘缓鏃ユ湡"])).format("yyyy-MM-dd"),
+ HCheckEmp: data["瀹℃牳浜�"],
+ HCheckDate:
+ data["瀹℃牳鏃ユ湡"] == null
+ ? ""
+ : dayjs(new Date(data["瀹℃牳鏃ユ湡"])).format("yyyy-MM-dd"),
+ HStopEmp: data["绂佺敤浜�"],
+ HStopDate:
+ data["绂佺敤鏃ユ湡"] == null
+ ? ""
+ : dayjs(new Date(data["绂佺敤鏃ユ湡"])).format("yyyy-MM-dd"),
+ },
+ };
if (!data.HCheckEmp) {
this.CheckBillDisabled = false;
}
}
+
+ if (this.OperationType == 2) {
+ // 澶嶅埗
+ Object.assign(this.form, {
+ HItemID: 0,
+ HMakeEmp: sessionStorage["HUserName"],
+ HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
+ HCheckEmp: "",
+ HCheckDate: "",
+ HStopEmp: "",
+ HStopDate: "",
+ });
+ }
+
this.$nextTick(() => {
this.formShow = true;
this.formLoading = false;
@@ -510,7 +510,7 @@
var sMainSub = sMainStr + ";" + this.user;
axios({
method: "post",
- url: this.baseURL + "/Gy_Warehouse/ModifyByID",
+ url: this.$baseUrl + "/Gy_Warehouse/ModifyByID",
data: {
oMain: sMainSub,
},
@@ -543,7 +543,7 @@
.then(() => {
if (this.rowForm.鐘舵�� == "鍒涘缓") {
axios
- .get(this.baseURL + "/Kf_SellOutBill/DeltetSellOutBill", {
+ .get(this.$baseUrl + "/Kf_SellOutBill/DeltetSellOutBill", {
params: { HInterID: this.rowForm.hmainid.toString(), user: this.user },
})
.then((response) => {
@@ -567,7 +567,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, CurUserName: this.user },
})
.then((response) => {
--
Gitblit v1.9.1