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/gyStockPlace/gyStockPlaceEdit.vue | 116 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 74 insertions(+), 42 deletions(-)
diff --git a/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue b/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
index 5e98170..0ad0b52 100644
--- a/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlaceEdit.vue
@@ -12,17 +12,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="浠撲綅浠ｇ爜" prop="HNumber">
- <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�" />
+ <el-input v-model="form.HNumber" placeholder="璇疯緭鍏ヤ粨浣嶄唬鐮�" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="浠撲綅鍚嶇О" prop="HName">
- <el-input v-model="form.HName" placeholder="璇疯緭鍏ヤ粨搴撳悕绉�" />
+ <el-input v-model="form.HName" placeholder="璇疯緭鍏ヤ粨浣嶅悕绉�" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鎵�灞炰粨浣�" prop="HSPGroupName" class="form-inline">
- <el-input disabled v-model="form.HSPGroupName" placeholder="璇烽�夋嫨浠撲綅">
+ <el-form-item label="鎵�灞炰粨搴�" prop="HSPGroupName" class="form-inline">
+ <el-input disabled v-model="form.HSPGroupName" placeholder="璇烽�夋嫨浠撳簱">
</el-input>
<el-button icon="el-icon-search" @click="openDataDialog(1)"></el-button>
</el-form-item>
@@ -40,7 +40,7 @@
v-for="(item, index) in organizationList"
:key="index"
:label="item.Name"
- :value="item.ID"
+ :value="item.ID.toString()"
>
</el-option>
</el-select>
@@ -48,12 +48,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍔╄鐮�" prop="HHelpCode">
- <el-input v-model="form.HAddress" placeholder="璇疯緭鍏ュ姪璁扮爜" />
+ <el-input v-model="form.HHelpCode" placeholder="璇疯緭鍏ュ姪璁扮爜" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="澶囨敞" prop="HRemark">
- <el-input v-model="form.HPhone" placeholder="璇疯緭鍏ュ娉�" />
+ <el-input v-model="form.HRemark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-col>
</el-row>
@@ -73,17 +73,26 @@
</el-tab-pane>
</el-tabs>
</el-form>
- <!-- 閮ㄩ棬寮圭獥 -->
+ <!-- 閫夋嫨寮圭獥 -->
<el-dialog
:title="dialogTitle"
:visible.sync="openData"
width="1280px"
append-to-body
>
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <!-- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
<Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
<Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
- <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" />
+ <GyWorkCenter @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="workCenterShow" /> -->
+ <div style="height: 60vh" v-if="openData">
+ <iframe
+ :src="iframeUrl"
+ frameborder="0"
+ width="100%"
+ height="100%"
+ ref="iframeInstance"
+ ></iframe>
+ </div>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -114,6 +123,9 @@
},
data() {
return {
+ dialogEnabledNum: -1,
+ iframeInstance: null,
+ iframeUrl: "",
formShow: false,
temp: undefined,
formLoading: true,
@@ -139,7 +151,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, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
@@ -187,23 +199,30 @@
this.reset();
this.fetchData();
},
+ mounted() {
+ window.iframeWareHouseCallBack = (info) => {
+ console.log(info);
+ // 鍥炶皟璧嬪��
+ this.form.HSPGroupName = info["浠撳簱鍚嶇О"];
+ this.form.HSPGroupID = info["HSPGroupID"];
+ // 鍏抽棴寮圭獥
+ this.deptClose();
+ };
+ },
activated() {
this.reset();
this.fetchData();
},
+ beforeDestroy() {
+ delete window.iframeWareHouseCallBack;
+ },
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; //缁勭粐鍒楄〃
@@ -213,10 +232,7 @@
.catch((error) => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+
},
getdata() {
this.reset();
@@ -224,7 +240,7 @@
if (this.OperationType != 1) {
this.zzSelDis = true;
axios
- .get(this.baseURL + "/Gy_StockPlace/cx", {
+ .get(this.$baseUrl + "/Gy_StockPlace/cx", {
params: {
HInterID: this.linterid,
},
@@ -235,18 +251,21 @@
if (result.code == 1) {
// 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data[0];
+ this.form = {
+ ...{
+ HUSEORGID: data.HUSEORGID,
+ HItemID: data.HMainID,
+ HNumber: data.浠撲綅浠ｇ爜,
+ HName: data.浠撲綅鍚嶇О,
+ HHelpCode: data.鍔╄鐮�,
+ HRemark: data.澶囨敞,
+ HSPGroupID: data.HSPGroupID,
+ HSPGroupName: data.鎵�灞炰粨搴�,
+ HStopflag: data.绂佺敤鏍囪 == "Y" ? true : false,
+ HStandard: data.榛樿浠撲綅 == "Y" ? true : false,
+ },
+ };
- Object.assign(this.form, {
- HItemID: data.HMainID,
- HNumber: data.浠撲綅浠ｇ爜,
- HName: data.浠撲綅鍚嶇О,
- HHelpCode: data.鍔╄鐮�,
- HRemark: data.澶囨敞,
- HSPGroupID: data.HSPGroupID,
- HSPGroupName: data.鎵�灞炰粨浣�,
- HStopflag: data.绂佺敤鏍囪 == "Y" ? true : false,
- HStandard: data.榛樿浠撲綅 == "Y" ? true : false,
- });
if (!data.HCheckEmp) {
this.CheckBillDisabled = false;
}
@@ -299,8 +318,19 @@
this.deptform = deptRow;
},
deptClickSub() {
- this.dbEmitData(this.deptform, this.dialogTypeNum);
- this.deptform = {};
+ // this.dbEmitData(this.deptform, this.dialogTypeNum);
+ // this.deptform = {};
+ // 浠庢墦寮�鐨刬frame涓幏鍙栭�変腑鏁版嵁
+ let selectedRow = this.$refs.iframeInstance.contentWindow.selectedRow;
+ console.log(selectedRow);
+ if (this.dialogEnabledNum == 1) {
+ // 淇敼閫変腑浠撳簱鏁版嵁
+ this.form.HSPGroupName = selectedRow["浠撳簱鍚嶇О"];
+ this.form.HSPGroupID = selectedRow["HSPGroupID"];
+ }
+
+ selectedRow = null; // 鎵嬪姩缃┖锛屾柟渚縂C鍥炴敹锛岄槻姝㈡硠闇�
+ this.deptClose();
},
deptClose() {
this.deptform = {};
@@ -380,7 +410,7 @@
var sMainSub = sMainStr + ";" + this.user;
axios({
method: "post",
- url: this.baseURL + "/Gy_StockPlace/AddBill1",
+ url: this.$baseUrl + "/Gy_StockPlace/AddBill1",
data: {
oMain: sMainSub,
},
@@ -413,7 +443,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) => {
@@ -437,7 +467,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) => {
@@ -461,12 +491,14 @@
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
+ this.dialogEnabledNum = num;
if (row) {
this.zbIndex = row.index - 1;
}
this.showReset();
if (num == 1) {
- this.dialogTitle = "浠撲綅鍒楄〃";
+ this.iframeUrl = "/iframe/GyWarehouse";
+ this.dialogTitle = "浠撳簱鍒楄〃";
this.warehouseShow = true;
this.openData = true;
}
--
Gitblit v1.9.1