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/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue | 180 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 92 insertions(+), 88 deletions(-)
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
index b60d0ca..ad6b118 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBillEdit.vue
@@ -56,14 +56,14 @@
<el-row>
<el-col :span="6">
<el-form-item label="閲囪喘閮ㄩ棬" prop="HDeptName">
- <el-input v-model="form.HCusName" placeholder="璇烽�夋嫨閲囪喘閮ㄩ棬" disabled>
+ <el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閲囪喘閮ㄩ棬" disabled>
<el-button slot="append" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="渚涘簲鍟�" prop="HSupName">
- <el-input v-model="form.HWHName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -111,7 +111,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="姹囩巼" prop="HRemarHExRatek">
+ <el-form-item label="姹囩巼" prop="HExRate">
<el-input-number v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" />
</el-form-item>
</el-col>
@@ -143,8 +143,8 @@
<el-option
v-for="(item, index) in organizationList"
:key="index"
- :label="item.label"
- :value="item.value"
+ :label="item.Name"
+ :value="item.ID"
></el-option>
</el-select>
</el-form-item> </el-col
@@ -421,7 +421,7 @@
deptform: {}, //寮圭獥閫変腑鏁版嵁
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage["organizationList"]), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -476,7 +476,7 @@
};
},
created() {
- this.fetchData();
+ // this.fetchData();
this.getdata();
},
beforeDestroy() {
@@ -488,7 +488,7 @@
methods: {
fetchData() {
axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
+ .get(this.$baseUrl + "/Web/GetOrganizations", {})
.then((response) => {
if (response.data.count == 1) {
this.organizationList = response.data.data.map((item) => {
@@ -509,7 +509,6 @@
this.HInterID2 = this.$route.query.HInterID || this.linterid || 0;
this.OperationType2 = this.$route.query.OperationType || this.OperationType || 1;
this.CopyType2 = this.$route.query.copyType || this.copyType || -1;
- console.log(this.CopyType2, this.OperationType2, this.HInterID2);
this.formShow = false;
this.formLoading = true;
@@ -521,7 +520,7 @@
for (var i = 0; i < data.length; i++) {
// this.getPushSourceBillInit(data[i].hmainid, data[i].hsubid);
axios
- .get(this.baseURL + "/Xs_SeOutStockBill/cx", {
+ .get(this.$baseUrl + "/Xs_SeOutStockBill/cx", {
params: {
HInterID: data[i].hmainid,
},
@@ -644,7 +643,7 @@
//鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢攢鍞鍗曟暟鎹�
getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
axios
- .get(this.baseURL + "/Xs_SeOrderBill/loadXs_SeOrderBill_Push", {
+ .get(this.$baseUrl + "/Xs_SeOrderBill/loadXs_SeOrderBill_Push", {
params: {
HInterID: HSourceInterID,
HSubID: HSourceEntryID,
@@ -795,8 +794,10 @@
//閫�鍑�
close() {
this.reset();
-
- if (!this.OperationType2 && !this.copyType) {
+ if (window.self != window.top) {
+ // iframe 椤甸潰 璋冪敤鐖堕〉闈㈡柟娉曞叧闂脊绐�
+ window.parent.editGyClose();
+ } else if (!this.OperationType2 && !this.copyType) {
// this.$router.back()
window.close();
} else {
@@ -807,7 +808,7 @@
//鏍规嵁鐢ㄦ埛鑾峰彇瀵瑰簲鑱屽憳銆侀儴闂ㄣ�侀攢鍞富绠�
getCzyglByUser() {
axios
- .get(this.baseURL + "/Xs_SeOrderBill/getCzyglByUser", {
+ .get(this.$baseUrl + "/Xs_SeOrderBill/getCzyglByUser", {
params: { CurUserName: sessionStorage["HUserName"] },
})
.then((response) => {
@@ -840,7 +841,7 @@
},
getHBillNo() {
axios
- .get(this.baseURL + "/WEBSController/GetMaxBillNoAndID_Json", {
+ .get(this.$baseUrl + "/WEBSController/GetMaxBillNoAndID_Json", {
params: {
HBillType: "1102",
},
@@ -859,7 +860,7 @@
//鑾峰彇閿�鍞嚭搴撳崟瀵瑰簲鐨勬潯鐮佹槑缁�
getBarCodeNoteBySellOutBill(rowHmainid) {
axios
- .get(this.baseURL + "/Kf_SellOutBill/BarCodeNote", {
+ .get(this.$baseUrl + "/Kf_SellOutBill/BarCodeNote", {
params: { HInterID: rowHmainid },
})
.then((response) => {
@@ -878,7 +879,7 @@
//#region 鏍规嵁瀹㈡埛鑾峰彇瀹㈡埛浣欓
getCustomerBalance(HCusID) {
axios
- .get(this.baseURL + "/Xs_CusRatingChangeBill/getCustomerBalance", {
+ .get(this.$baseUrl + "/Xs_CusRatingChangeBill/getCustomerBalance", {
params: { HCusID: HCusID, CurUserName: sessionStorage["HUserName"] },
})
.then((response) => {
@@ -896,7 +897,7 @@
this.reset();
let rowHmainid = this.HInterID2;
axios
- .get(this.baseURL + "/Xs_SeOutStockBill/cx", {
+ .get(this.$baseUrl + "/Cg_POOrderBill/cx", {
params: { HInterID: rowHmainid },
})
.then((response) => {
@@ -904,49 +905,65 @@
var result = response.data;
var data = response.data.data[0];
this.form.BillType = data.HSourceBillType;
- Object.assign(this.form, {
- HBillNo: data.鍗曟嵁鍙�,
- HInterID: data.hmainid,
- HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"),
- HSeOrderBillNo_M: data.閿�鍞鍗曞彿,
- HEmpID: data.HEmpID,
- HEmpName: data.涓氬姟鍛�,
- HCusID: data.HCusID,
- HCusName: data.瀹㈡埛,
- HWHID: data.涓讳粨搴揑D,
- HWHName: data.涓诲彂璐т粨搴�,
- HAddress: data.浜よ揣鍦板潃,
- HDeptName: data.閮ㄩ棬,
- HDeptID: data.HDeptID,
- HCurID: data.HCurID,
- HCurName: data.甯佸埆,
- HSSID: data.HSSID,
- HSSName: data.缁撶畻鏂瑰紡,
- HExRate: data.姹囩巼,
- HManagerName: data.涓荤,
- HManagerID: data.HManagerID,
- HSourceBillType: data.婧愬崟绫诲瀷,
- HLinkMan: data.鑱旂郴浜�,
- HLinkPhone: data.鑱旂郴鐢佃瘽,
- //, "HConveyCompID": data.杩愯緭鍏徃
- //, "HConveyTypeID": data.杩愯緭鏂瑰紡
- //, "HConveyMoney": data.杩愯垂
- //, "HDFflag": data.鏄惁鍨粯
- HProjectID: data.HProjectID,
- HProjectNumber: data.椤圭洰缂栫爜,
- HProjectName: data.椤圭洰鍚嶇О,
-
- Box2: "",
- HRemark: data.琛ㄥご澶囨敞,
- HMaker: data.鍒跺崟浜�,
- HChecker: data.瀹℃牳浜�,
- HCloseMan: data.鍏抽棴浜�,
- HMakeDate: data.鍒跺崟鏃ユ湡,
- HCheckDate: data.瀹℃牳鏃ユ湡,
- HCloseDate: data.鍏抽棴鏃ユ湡,
- HUpDateDate: data.淇敼鏃ユ湡,
- HDeleteDate: data.浣滃簾鏃ユ湡,
- });
+ this.form = {
+ ...{
+ HBillNo: data.鍗曟嵁鍙�, //璁剧疆鍗曟嵁鍙风殑绗竴涓�间负鈥淗BillNo鈥濆瓧娈电殑鍊兼槸data.鍗曟嵁鍙穈鐨勫��
+ HDate: dayjs(data.鏃ユ湡).format("YYYY-MM-DD"), //璁剧疆鈥淗Date鈥濆瓧娈电殑鍊间负`data.鏃ユ湡`缁忚繃`dayjs`鍑芥暟澶勭悊鍚庣殑鏍煎紡
+ HSSDate: dayjs(data.缁撶畻鏃ユ湡).format("YYYY-MM-DD"), //浣嗚缃殑鏄�滅粨绠楁棩鏈熲�濆瓧娈点��
+ //,"HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ HAddress: data.浜よ揣鍦扮偣, // 璁剧疆鈥滀氦璐у湴鐐光�濆瓧娈电殑鍊笺��
+ HDeptName: data.閮ㄩ棬, // 璁剧疆鈥滈儴闂ㄢ�濆悕绉板瓧娈电殑鍊笺��
+ HDeptID: data.HDeptID, // 璁剧疆鈥淗DeptID鈥濆悕绉板瓧娈电殑鍊笺��
+ HSupID: data.HSupID, // 璁剧疆鈥淗SupID鈥濆悕绉板瓧娈电殑鍊笺��
+ HSupName: data.渚涘簲鍟�, // 璁剧疆鈥滀緵搴斿晢鈥濆悕绉板瓧娈电殑鍊笺��
+ HEmpID: data.HEmpID,
+ HEmpName: data.涓氬姟鍛�, // 璁剧疆鈥滀笟鍔″憳鈥濆悕绉板瓧娈电殑鍊笺��
+ HCurID: data.HCurID,
+ HCurName: data.甯佸埆, // 璁剧疆鈥滃竵鍒�濆悕绉板瓧娈电殑鍊笺��
+ HExRate: data.姹囩巼, // 璁剧疆鈥滄眹鐜団�濆悕绉板瓧娈电殑鍊笺��
+ HManagerName: data.涓荤, // 璁剧疆鈥滀富绠♀�濆悕绉板瓧娈电殑鍊笺��
+ HManagerID: data.HManagerID,
+ HPSStyleID: data.HPSStyleID,
+ HPSStyleName: data.閲囪喘鏂瑰紡, // 璁剧疆鈥滈噰璐柟寮忊�濆悕绉板瓧娈电殑鍊笺��
+ HSSID: data.HSSID,
+ HSSName: data.缁撶畻鏂瑰紡, // 璁剧疆鈥滅粨绠楁柟寮忊�濆悕绉板瓧娈电殑鍊笺��
+ HLinkMan: data.鑱旂郴浜�, // 璁剧疆鈥滆仈绯讳汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HLinkPhone: data.鑱旂郴浜虹數璇�, // 璁剧疆鈥滆仈绯荤數璇濃�濆悕绉板瓧娈电殑鍊笺��
+ HInnerBillNo: data.杈呭姪瀛楁, // 璁剧疆鈥滆緟鍔╁瓧娈碘�濆悕绉板瓧娈电殑鍊笺��
+ HProjectID: data.HProjectID,
+ HProjectNumber: data.椤圭洰浠ｇ爜, // 璁剧疆鈥滈」鐩唬鐮佲�濆悕绉板瓧娈电殑鍊笺��
+ HProjectName: data.椤圭洰鍚嶇О, // 璁剧疆鈥滈」鐩悕绉扳�濆悕绉板瓧娈电殑鍊笺��
+ HWHID: data.HWHID,
+ HOrgID: data.HOrgID,
+ HWHName: data.浠撳簱, // 璁剧疆鈥滀粨搴撯�濆悕绉板瓧娈电殑鍊笺��
+ HRemark: data.琛ㄥご澶囨敞, // 璁剧疆鈥滆〃澶村娉ㄢ�濆悕绉板瓧娈电殑鍊笺��
+ HMaker: data.鍒跺崟浜�, // 璁剧疆鈥滃埗鍗曚汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HChecker: data.瀹℃牳浜�, // 璁剧疆鈥滃鏍镐汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HCloseMan: data.鍏抽棴浜�, // 璁剧疆鈥滃叧闂汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HUpDater: data.淇敼浜�, // 璁剧疆鈥滀慨鏀逛汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HDeleteMan: data.浣滃簾浜�, // 璁剧疆鈥滀綔搴熶汉鈥濆悕绉板瓧娈电殑鍊笺��
+ HMakeDate:
+ data.鍒跺崟鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍒跺崟鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HCheckDate:
+ data.瀹℃牳鏃ユ湡 == null
+ ? ""
+ : dayjs(data.瀹℃牳鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HCloseDate:
+ data.鍏抽棴鏃ユ湡 == null
+ ? ""
+ : dayjs(data.鍏抽棴鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HUpDateDate:
+ data.淇敼鏃ユ湡 == null
+ ? ""
+ : dayjs(data.淇敼鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ HDeleteDate:
+ data.浣滃簾鏃ユ湡 == null
+ ? ""
+ : dayjs(data.浣滃簾鏃ユ湡).format("yyyy-MM-dd hh:mm:ss"),
+ },
+ };
if (this.copyType == 1) {
this.getHBillNo();
let date = new Date();
@@ -966,7 +983,7 @@
this.form.HCloseDate = data.鍏抽棴鏃ユ湡;
this.form.HDeleteDate = data.浣滃簾鏃ユ湡;
}
- this.getCustomerByCusID(response.data.data[0].HCusID); //鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
+ // this.getCustomerByCusID(response.data.data[0].HCusID); //鏍规嵁瀹㈡埛鑾峰彇鑱旂郴浜猴紝鑱旂郴浜虹數璇�
let subdata = result.data;
for (var i = 0; i < subdata.length; i++) {
this.editData.push({
@@ -977,15 +994,19 @@
HUnitID: subdata[i].HUnitID,
璁￠噺鍗曚綅: subdata[i].璁￠噺鍗曚綅,
HWHID: subdata[i].HWHID,
- 鍙戣揣浠撳簱: subdata[i].鍙戣揣浠撳簱,
+ HWHName: subdata[i].浠撳簱鍚嶇О,
HQty: subdata[i].鏁伴噺,
+ HRemark: subdata[i].琛ㄤ綋澶囨敞,
HPrice: subdata[i].鍗曚环,
HMoney: subdata[i].閲戦,
- HRemark: subdata[i].琛ㄤ綋澶囨敞,
- HSourceBillNo: subdata[i].婧愬崟鍗曞彿, //婧愬崟鍙�
- HSourceBillType: subdata[i].婧愬崟绫诲瀷, //婧愬崟绫诲瀷
- HSourceInterID: subdata[i].婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
- HSourceEntryID: subdata[i].婧愬崟瀛愬唴鐮�, //婧愬崟瀛愬唴鐮�
+ HTaxRate: subdata[i].绋庣巼,
+ HTaxMoney: subdata[i].绋庨,
+ HlineTotal: subdata[i].浠风◣鍚堣,
+ HlineTotalBB: subdata[i].鏈綅甯佷环绋庡悎璁�,
+ HTaxPrice: subdata[i].鍚◣鍗曚环,
+ HDiscountRate: subdata[i].鎶樻墸鐜�,
+ HRelTaxPrice: subdata[i].瀹為檯鍚◣鍗曚环,
+ HDate: dayjs(new Date(subdata[i].浜よ揣鏃ユ湡)).format("YYYY-MM-DD"),
});
}
if (data.鐘舵�� != "鍒涘缓" && this.copyType != 1) {
@@ -999,23 +1020,6 @@
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触! ");
console.error(error);
- });
- },
- //鏍规嵁瀹㈡埛甯﹀嚭鑱旂郴浜恒�佽仈绯荤數璇�
- getCustomerByCusID(HCusID) {
- axios
- .get(this.baseURL + "/Xs_SeOrderBill/getCustomerByCusID", {
- params: {
- HCusID: HCusID,
- },
- })
- .then((response) => {
- this.form.鑱旂郴浜� = response.data.data[0].HLinkMan;
- this.form.鑱旂郴鐢佃瘽 = response.data.data[0].HLinkPhone;
- // this.form = response.data.data[0]
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
/** 閿�鍞嚭搴撳瓙琛ㄦ槑缁嗗簭鍙� */
@@ -1157,7 +1161,7 @@
var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1205','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
axios({
method: "get",
- url: this.baseURL + "/CommonModel/searchMethod",
+ url: this.$baseUrl + "/CommonModel/searchMethod",
params: { sql: sql, user: sessionStorage["HUserName"], ModRightNameCheck: "" },
})
.then((response) => {
@@ -1196,7 +1200,7 @@
this.OperationType;
axios({
method: "post",
- url: this.baseURL + "/Kf_SellOutBill/SaveSellOutBillList",
+ url: this.$baseUrl + "/Kf_SellOutBill/SaveSellOutBillList",
data: {
msg: sMainSub,
},
@@ -1226,7 +1230,7 @@
var InterID = form.hmainid || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ .get(this.$baseUrl + "/Kf_SellOutBill/AuditKf_SellOutBill", {
params: {
HInterID: InterID,
IsAudit: num,
--
Gitblit v1.9.1