From fed5c0ec889ad66057c353f93550e6434353a38f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 10 十二月 2025 14:20:48 +0800
Subject: [PATCH] 添加 辅助属性 修改 条码生成页面 选源单 模块获取单据 逻辑 调整 调拨申请单 添加 物料 可选辅助属性
---
src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue | 148 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 96 insertions(+), 52 deletions(-)
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
index f91d3c1..a1d295e 100644
--- a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
@@ -137,8 +137,8 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="璋冨叆缁勭粐" prop="HSTOCKINORGID">
- <el-select v-model="form.HSTOCKINORGID" placeholder="璇烽�夋嫨璋冨叆缁勭粐">
+ <el-form-item label="璋冨叆缁勭粐" prop="HSTOCKINORGID" >
+ <el-select v-model="form.HSTOCKINORGID" placeholder="璇烽�夋嫨璋冨叆缁勭粐" :disabled="OperationType == 3">
<el-option
v-for="(item, index) in organizationList"
:key="index"
@@ -151,7 +151,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="璋冨嚭缁勭粐" prop="HSTOCKOUTORGID">
- <el-select v-model="form.HSTOCKOUTORGID" placeholder="璇烽�夋嫨璋冨叆缁勭粐">
+ <el-select v-model="form.HSTOCKOUTORGID" placeholder="璇烽�夋嫨璋冨叆缁勭粐" :disabled="OperationType == 3">
<el-option
v-for="(item, index) in organizationList"
:key="index"
@@ -300,7 +300,7 @@
>涓嬬Щ</el-button
>
</div>
- <!-- TODO 鏄庣粏鍒楄〃娣诲姞杈呭姪灞炴�ч�夋嫨 -->
+ <!-- TODO: 鏄庣粏鍒楄〃娣诲姞杈呭姪灞炴�ч�夋嫨 -->
<el-table
:data="editData"
style="width: 100%"
@@ -337,6 +337,16 @@
<el-table-column align="center" label="璁￠噺鍗曚綅" width="120">
<template slot-scope="scope">
<span>{{ scope.row.璁￠噺鍗曚綅 }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="杈呭姪灞炴��" width="120">
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.杈呭姪灞炴��"
+ placeholder="璇疯緭鍏�"
+ @keyup.native.f7="openDataDialog(7, scope.row)"
+ @dblclick.native="openDataDialog(7, scope.row)"
+ />
</template>
</el-table-column>
<el-table-column align="center" label="鎹㈢畻鐜�" width="120">
@@ -476,6 +486,12 @@
:openPage="HModName"
v-if="materialShow"
/>
+ <GyProperty
+ @deptEmitDb="dbEmitData"
+ @deptEmit="emitData"
+ :openPage="HModName"
+ v-if="propertyShow"
+ />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -505,11 +521,20 @@
import Warehouse from "@/views/basic/gyWarehouse/gyWarehouse.vue";
import GySupplier from "@/views/basic/gy/gySupplier.vue";
import Material from "@/views/gyMaterial/GyMaterial.vue";
+import GyProperty from "@/views/basic/gyProperty/gyPropertyList.vue";
import moment from "moment";
export default {
name: "Kf_MoveStockRequestBillEdit",
- components: { Dept, Warehouse, RowSettings, GyEmployee, GySupplier, Material },
+ components: {
+ Dept,
+ Warehouse,
+ RowSettings,
+ GyEmployee,
+ GySupplier,
+ Material,
+ GyProperty,
+ },
props: {
OperationType: { type: Number },
linterid: { type: Number },
@@ -534,6 +559,7 @@
gyEmployeeShow: false, //閿�鍞憳鏁版嵁缁勪欢
gySupplierShow: false, //渚涘簲鍟嗘暟鎹粍浠�
materialShow: false, //鐗╂枡鏁版嵁缁勪欢
+ propertyShow: false, // 杈呭姪灞炴�у熀纭�璧勬枡
eHWHType: 1, //浠撳簱寮圭獥鍖哄垎鏍囧織
empType: 1, //鑱屽憳寮圭獥鍖哄垎鏍囧織
deptform: {}, //寮圭獥閫変腑鏁版嵁
@@ -659,7 +685,7 @@
//寮圭獥璧嬪��
dbEmitData(deptRow, num) {
// num=1閮ㄩ棬 num=2浠撳簱
- console.log(deptRow);
+ console.log(deptRow, num);
if (deptRow.HItemID || deptRow.hmainid) {
if (num == 1) {
this.form.HDeptName = deptRow.閮ㄩ棬鍚嶇О;
@@ -711,6 +737,12 @@
this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�;
this.form.HSupID = deptRow.HItemID;
this.gySupplierShow = false;
+ this.openData = false;
+ } else if (num == "gyProperty") {
+ this.editData[this.zbIndex].HPropertyID = deptRow.HItemID;
+ this.editData[this.zbIndex]["杈呭姪灞炴��"] = deptRow["杈呭姪灞炴�у悕绉�"];
+
+ this.propertyShow = false;
this.openData = false;
}
} else {
@@ -836,10 +868,9 @@
//鏂板鑾峰彇鍗曟嵁鍙�
this.getHBillNo();
let date = new Date();
- this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
- this.form.HSTOCKOUTORGID = sessionStorage["OrganizationID"];
- this.form.HSTOCKINORGID = sessionStorage["OrganizationID"];
- this.form.HSTOCKORGID = sessionStorage["OrganizationID"];
+ this.$set(this.form, "HSTOCKOUTORGID", sessionStorage["OrganizationID"]);
+ this.$set(this.form, "HSTOCKINORGID", sessionStorage["OrganizationID"]);
+ this.$set(this.form, "HDate", moment(date).format("YYYY-MM-DD HH:mm:ss"));
if (this.OperationType == 1) {
this.handleAddSysZb();
}
@@ -880,13 +911,10 @@
var result = response.data;
var data = response.data.data;
console.log(result, data);
- if (this.copyType == 1) {
- this.getHBillNo();
- let date = new Date();
- this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
- } else {
- this.allVal = data[0];
- this.form = {
+
+ this.allVal = data[0];
+ this.form = {
+ ...{
HBillNo: data[0].鍗曟嵁鍙�,
HDate: data[0].鏃ユ湡,
HDeptName: data[0].閮ㄩ棬,
@@ -917,42 +945,52 @@
HCloseDate: data[0].鍏抽棴鏃ユ湡,
HUpDateDate: data[0].淇敼鏃ユ湡,
HDeleteDate: data[0].浣滃簾鏃ユ湡,
- HSTOCKOUTORGID: sessionStorage["OrganizationID"],
- HSTOCKORGID: sessionStorage["OrganizationID"],
- };
- //瀛愯〃
- var rowdata = [];
- for (let i = 0; i < data.length; i++) {
- rowdata.push({
- HMaterID: data[i].HMaterID,
- 鐗╂枡浠ｇ爜: data[i].鐗╂枡浠ｇ爜,
- 鐗╂枡鍚嶇О: data[i].鐗╂枡鍚嶇О,
- 瑙勬牸鍨嬪彿: data[i].瑙勬牸鍨嬪彿,
- HUnitID: data[i].HUnitID,
- 璁￠噺鍗曚綅: data[i].璁￠噺鍗曚綅,
- HSecUnitRate: data[i].鎹㈢畻鐜�,
- HSecUnitID: data[i].HSecUnitID,
- 杈呭姪璁￠噺鍗曚綅: data[i].杈呭姪璁￠噺鍗曚綅,
- HQtyMust: data[i].搴旀敹鏁伴噺,
- HQty: data[i].瀹炴敹鏁伴噺,
- HRemark: data[i].琛ㄤ綋澶囨敞,
- HPrice: data[i].鍗曚环,
- HMoney: data[i].閲戦,
- HOutPrice: data[i].璋冨嚭鍗曚环,
- HOutMoney: data[i].璋冨嚭閲戦,
- HWHID: data[i].HWHID,
- 璋冨叆浠撳簱: data[i].璋冨叆浠撳簱,
- HSCWHID: data[i].HSCWHID,
- 璋冨嚭浠撳簱: data[i].璋冨嚭浠撳簱,
- HBASEUNITID: data[i].HBASEUNITID,
- 鍩烘湰璁￠噺鍗曚綅: data[i].鍩烘湰璁￠噺鍗曚綅,
- HEXTAUXUNITID: data[i].HEXTAUXUNITID,
- 杈呭崟浣�: data[i].杈呭崟浣�,
- HSTOCKORGID: sessionStorage["OrganizationID"],
- });
- }
- this.editData = rowdata;
+ HSTOCKOUTORGID: data[0].HSTOCKOUTORGID.toString(),
+ HSTOCKINORGID: data[0].HSTOCKINORGID.toString(),
+ },
+ };
+ //瀛愯〃
+ var rowdata = [];
+ for (let i = 0; i < data.length; i++) {
+ rowdata.push({
+ HMaterID: data[i].HMaterID,
+ 鐗╂枡浠ｇ爜: data[i].鐗╂枡浠ｇ爜,
+ 鐗╂枡鍚嶇О: data[i].鐗╂枡鍚嶇О,
+ 瑙勬牸鍨嬪彿: data[i].瑙勬牸鍨嬪彿,
+ HUnitID: data[i].HUnitID,
+ 璁￠噺鍗曚綅: data[i].璁￠噺鍗曚綅,
+ HSecUnitRate: data[i].鎹㈢畻鐜�,
+ HSecUnitID: data[i].HSecUnitID,
+ 杈呭姪璁￠噺鍗曚綅: data[i].杈呭姪璁￠噺鍗曚綅,
+ HQtyMust: data[i].搴旀敹鏁伴噺,
+ HQty: data[i].瀹炴敹鏁伴噺,
+ HRemark: data[i].琛ㄤ綋澶囨敞,
+ HPrice: data[i].鍗曚环,
+ HMoney: data[i].閲戦,
+ HOutPrice: data[i].璋冨嚭鍗曚环,
+ HOutMoney: data[i].璋冨嚭閲戦,
+ HWHID: data[i].HWHID,
+ 璋冨叆浠撳簱: data[i].璋冨叆浠撳簱,
+ HSCWHID: data[i].HSCWHID,
+ 璋冨嚭浠撳簱: data[i].璋冨嚭浠撳簱,
+ HBASEUNITID: data[i].HBASEUNITID,
+ 鍩烘湰璁￠噺鍗曚綅: data[i].鍩烘湰璁￠噺鍗曚綅,
+ HEXTAUXUNITID: data[i].HEXTAUXUNITID,
+ 杈呭崟浣�: data[i].杈呭崟浣�,
+ HSTOCKORGID: data[i]["HSTOCKORGID"],
+ HPropertyID: data[i]["HPropertyID"],
+ 杈呭姪灞炴��: data[i]["杈呭姪灞炴��"],
+ });
}
+ this.editData = rowdata;
+
+ // 娓叉煋瀹屽悗鍐嶅弬涓庢槸鍚﹀鍒剁殑鍒ゆ柇
+ if (this.copyType == 1) {
+ this.getHBillNo();
+ let date = new Date();
+ this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
+ }
+
this.formShow = true;
this.formLoading = false;
}
@@ -997,6 +1035,8 @@
杈呭崟浣�: "",
HRemark: "",
HSTOCKORGID: sessionStorage["OrganizationID"],
+ HPropertyID: 0,
+ 杈呭姪灞炴��: "",
};
if (index) {
this.editData.splice(index, 0, obj);
@@ -1176,6 +1216,10 @@
this.dialogTitle = "渚涘簲鍟嗗垪琛�";
this.gySupplierShow = true;
this.openData = true;
+ } else if (num == 7) {
+ this.dialogTitle = "杈呭姪灞炴�у垪琛�";
+ this.propertyShow = true;
+ this.openData = true;
}
},
},
--
Gitblit v1.9.1