From 61eec888693c019dac099d4bb6b0470647031473 Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期日, 05 四月 2026 02:03:53 +0800
Subject: [PATCH] 采购入库修改bug
---
src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue | 274 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 180 insertions(+), 94 deletions(-)
diff --git a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
index 9a49282..2013d8c 100644
--- a/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
+++ b/src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue
@@ -3,7 +3,7 @@
<div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
<el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">鏂板</el-button>
<el-button type="primary" @click="submitForm" :disabled="subDisabled">淇� 瀛�</el-button>
- <el-button type="primary" @click="set_CheckBill(0, form)">瀹� 鏍�</el-button>
+
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -26,7 +26,7 @@
<el-col :span="6">
<el-form-item label="涓氬姟鍛�" prop="HEmpName">
<el-input v-model="form.HEmpName" placeholder="璇疯緭鍏ヤ笟鍔″憳" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(5,empType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -42,7 +42,7 @@
<el-col :span="6">
<el-form-item label="渚涘簲鍟�" prop="HSupName">
<el-input v-model="form.HSupName" placeholder="璇疯緭鍏ヤ緵搴斿晢" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -54,14 +54,14 @@
<el-col :span="6">
<el-form-item label="浠撳簱" prop="HWHName">
<el-input v-model="form.HWHName" placeholder="璇疯緭鍏ヤ粨搴�">
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="楠屾敹鍛�" prop="HSecManagerName">
<el-input v-model="form.HSecManagerName" placeholder="璇疯緭鍏ラ獙鏀跺憳" disabled>
- <el-button slot="append" icon="el-icon-search"></el-button>
+ <el-button slot="append" icon="el-icon-search" @click="openDataDialog(5,empType=2)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -222,14 +222,14 @@
</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(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
+ <el-input v-model="scope.row.鏀舵枡浠撳簱" placeholder="璇疯緭鍏ユ敹鏂欎粨搴�" @keyup.native.f7="openDataDialog(2,scope.row,eHWHType=2)"
+ @dblclick.native="openDataDialog(2, scope.row,eHWHType=2)" />
</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(2, scope.row)"
- @dblclick.native="openDataDialog(2, scope.row)" />
+ <el-input v-model="scope.row.浠撲綅鍚嶇О" placeholder="璇疯緭鍏ヤ粨浣嶅悕绉�" @keyup.native.f7="openDataDialog(9, scope.row)"
+ @dblclick.native="openDataDialog(9, scope.row)" />
</template>
</el-table-column>
<el-table-column align="center" label="澶囨敞" width="120">
@@ -258,11 +258,17 @@
<!-- 鏁版嵁寮圭獥 -->
<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" :openPage="HModName" v-if="deptShow" />
<!-- 浠撳簱 -->
- <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
+ <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
<!-- 鐗╂枡 -->
- <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
+ <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="materialShow" />
+ <!-- 鑱屽憳 -->
+ <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
+ <!-- 渚涘簲鍟� -->
+ <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
+ <!-- 浠撲綅 -->
+ <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -278,13 +284,16 @@
import axios from 'axios'
import moment from 'moment';
import RowSettings from '@/views/component/rowSettings'
-import Dept from '@/views/component/dept'
-import Warehouse from '@/views/component/warehouse'
-import Material from '@/views/component/material'
+import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
+import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
+import Dept from '@/views/basic/gy/gyDepartment'
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
+import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
+import Material from '@/views/gyMaterial/GyMaterial'
export default {
name: 'SellOutBill',
- components: { Dept, Warehouse, Material, RowSettings },
+ components: { Dept, Warehouse, Material, RowSettings,GySupplier ,GyStockPlace,GyEmployee},
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -295,14 +304,14 @@
data() {
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣↖P)
-
+ HModName:"Sc_MouldProdOutBillEdit",
organizationList: [], //椤甸潰鍒濆鍖栫粍缁囧垪琛�
loading: true, // 閬僵灞�
addBtnShow: false, //鏂板鎸夐挳鏄剧ず鏍囪
subDisabled: false, //淇濆瓨鎸夐挳绂佺敤鏍囪
-
+ openPageData:{},//浼犲叆寮圭獥鐨勬暟鎹�
formShow: false, //琛ㄥ崟鏄惁鏄剧ず鏍囪
formLoading: true, //琛ㄥ崟鍔犺浇閬僵
zzSelDis: false, //缁勭粐涓嬫媺鍒楄〃绂佺敤鏍囪
@@ -315,6 +324,8 @@
dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
deptShow: false, //閮ㄩ棬鏁版嵁缁勪欢鏄剧ず鏍囪
warehouseShow: false, //浠撳簱鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyEmployeeShow:false,
+ gySupplierShow :false,
materialShow: false, //鐗╂枡鏁版嵁缁勪欢鏄剧ず鏍囪
stockPlaceShow: false, //浠撲綅鏁版嵁缁勪欢鏄剧ず鏍囪
deptform: {}, //寮圭獥閫変腑鏁版嵁
@@ -509,57 +520,60 @@
//#region 椤甸潰鏁版嵁鍒濆鍖�
reset() {
this.form = {
- HInterID: 0,
- HBillNo: "",
- HDate: new Date(),
- HEmpID: 0,
- HEmpName: "",
- HDeptID: 0,
- HDeptName: "",
- HSupID: 0,
- HSupName: "",
- HInvoiceBillNo: "",
- HWHID: 0,
- HWHName: "",
- HSecManagerID: 0,
- HSecManagerName: "",
- HRemark: "",
- HOrgID: sessionStorage["OrganizationID"] - 0,
- HMaker: sessionStorage["HUserName"],
- HChecker: "",
- HCloseMan: "",
- HUpDater: "",
- HDeleteMan: "",
- HMakeDate: "",//new Date().format("yyyy-MM-dd hh:mm:ss"),
- HCheckDate: "",
- HCloseDate: "",
- HUpDateDate: "",
- HDeleteDate: "",
- BillType: '1402',
- HBillSubType: '1205',
- HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//缁勭粐id
- HOWNERID: sessionStorage["OrganizationID"] - 0,
+ HInterID: 0,
+ HBillNo: " ",
+ HDate: new Date(),
+ HEmpID: 1,
+ HEmpName: " ",
+ HDeptID: 1,
+ HDeptName: " ",
+ HSupID: 1,
+ HSupName: " ",
+ HInvoiceBillNo: " ",
+ HWHID: 1,
+ HWHName: " ",
+ HSecManagerID: 1,
+ HSecManagerName: " ",
+ HRemark: " ",
+ HOrgID: sessionStorage["OrganizationID"] - 0,
+ HMaker: sessionStorage["HUserName"],
+ HChecker: " ",
+ HCloseMan: " ",
+ HUpDater: " ",
+ HDeleteMan: " ",
+
+ HMakeDate: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HCheckDate: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HCloseDate: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HUpDateDate: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
+ HDeleteDate: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
-
- HManagerID: 0,
- HManagerName:"",
- HKeeperID: 0,
- HKeeperName: "",
- HProjectID: 0,
- HProjectNumber: "",
- HProjectName: "",
-
-
- HCurID: 0,
- HCurName: '',
- HExRate: 1,
- HSourceBillType: "",
- HMainSourceInterID: 0,
- HMainSourceEntryID: 0,
- HMainSourceBillType: '',
- HMainSourceBillNo: '',
- HExplanation :"",
- HInnerBillNo: "",
+ HBillType: "1201",
+ BillType: '1402',
+ HBillSubType: '1201',
+ HSTOCKORGID: sessionStorage["OrganizationID"] - 0,
+ HOWNERID: sessionStorage["OrganizationID"] - 0,
+ eHWHType: 1,
+ empType: 1,
+
+ HManagerID: 1,
+ HManagerName: " ",
+ HKeeperID: 1,
+ HKeeperName: " ",
+ HProjectID: 1,
+ HProjectNumber: " ",
+ HProjectName: " ",
+
+ HCurID: 1,
+ HCurName: " ",
+ HExRate: 1,
+ HSourceBillType: "0",
+ HMainSourceInterID: 1,
+ HMainSourceEntryID: 1,
+ HMainSourceBillType: '0',
+ HMainSourceBillNo: ' ',
+ HExplanation: " ",
+ HInnerBillNo: " "
}
this.editData = []
this.editBtData = []
@@ -730,7 +744,7 @@
this.deptShow = true
this.openData = true
} else if (num == 2) {
- this.dialogTitle = '鍑哄簱浠撳簱鍒楄〃'
+ this.dialogTitle = '浠撳簱鍒楄〃'
this.warehouseShow = true
this.openData = true
} else if (num == 3) {
@@ -741,6 +755,28 @@
this.dialogTitle = '浠撲綅鍒楄〃'
this.stockPlaceShow = true
this.openData = true
+ }else if (num == 5) {
+ if(this.empType == 1){
+ this.dialogTitle = '涓氬姟鍛樺垪琛�'
+ }else{
+ this.dialogTitle = '楠屾敹鍛樺憳鍒楄〃'
+ }
+ this.gyEmployeeShow = true
+ this.openData = true
+ }
+ else if (num == 6) {
+ this.dialogTitle = '渚涘簲鍟嗗垪琛�'
+ this.gySupplierShow = true
+ this.openData = true
+ }else if(num ==9 ){
+ if(this.editData[this.zbIndex].鏀舵枡浠撳簱){
+ this.dialogTitle = '浠撲綅鍒楄〃'
+ this.openPageData.HWHName = this.editData[this.zbIndex].鏀舵枡浠撳簱
+ this.gyStockPlaceShow = true
+ this.openData = true
+ }else{
+ this.$modal.msgError("璇峰厛閫夋嫨浠撳簱!");
+ }
}
},
//#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
@@ -748,6 +784,9 @@
this.deptShow = false
this.warehouseShow = false
this.materialShow = false
+ this.gyEmployeeShow =false
+ this.gySupplierShow = false
+ this.gyStockPlaceShow = false
},
//#endregion
//#endregion
@@ -759,34 +798,78 @@
this.form.HDeptID = deptRow.HItemID
this.form.HEmpID = deptRow.HEmpID
this.form.HManagerName = deptRow.璐熻矗浜�
+ this.deptShow = false
this.openData = false
}
- else if (num == 2) { //鏀舵枡浠撳簱
- this.editData[this.zbIndex].HWHID = deptRow.HItemID;
- this.editData[this.zbIndex].鏀舵枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
- this.openData = false
- }
- else if (num == 4) { //浠撲綅
- this.editData[this.zbIndex].HSPID = deptRow.HItemID;
- this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О;
- this.openData = false
+ else if (num == 2) {
+ if(this.eHWHType == 1){
+ this.form.HWHName = deptRow.浠撳簱鍚嶇О
+ this.form.HWHID = deptRow.HItemID
+ this.form.HWHNumber = deptRow.浠撳簱浠ｇ爜
+ this.openData = false
+ }else{
+ this.editData[this.zbIndex].HWHID = deptRow.HItemID;
+ this.editData[this.zbIndex].鏀舵枡浠撳簱 = deptRow.浠撳簱鍚嶇О;
+ this.openData = false
+ }
+ this.openData = false
}
else if (num == 3) { //鐗╂枡
this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
this.editData[this.zbIndex].鐗╂枡浠ｇ爜 = deptRow.鐗╂枡浠ｇ爜;
this.editData[this.zbIndex].鐗╂枡鍚嶇О = deptRow.鐗╂枡鍚嶇О;
this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
- this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿
- this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О
- this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�
- this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼
+ this.editData[this.zbIndex].瑙勬牸鍨嬪彿 = deptRow.瑙勬牸鍨嬪彿;
+ this.editData[this.zbIndex].璁￠噺鍗曚綅 = deptRow.璁￠噺鍗曚綅鍚嶇О;
+ this.editData[this.zbIndex].HTaxPrice = deptRow.鍚◣鎴愭湰浠�;
+ this.editData[this.zbIndex].HTaxRate = deptRow.榛樿绋庣巼;
+ this.materialShow = false
this.openData = false
}
+ else if (num == 4) { //浠撲綅
+ if(this.empType == 1){
+ this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HEmpID = deptRow.HItemID
+ }else if(this.empType == 2){
+ this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HSecManagerID = deptRow.HItemID
+ }
+ this.gyEmployeeShow =false
+ this.openData = false
+ }
+ else if (num == 5) { //鑱屽憳
+ if(this.empType == 1){
+ this.form.HEmpName = deptRow.鑱屽憳鍚嶇О
+ this.form.HEmpID = deptRow.HItemID
+ }else if(this.empType == 2){
+ this.form.HMangerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HMangerID = deptRow.HItemID
+ }else if(this.empType == 3){
+ this.form.HSecManagerName = deptRow.鑱屽憳鍚嶇О
+ this.form.HSecManagerID = deptRow.HItemID
+ }else if(this.empType == 4){
+ this.form.HKeeperName = deptRow.鑱屽憳鍚嶇О
+ this.form.HKeeperID = deptRow.HItemID
+ }
+ this.openData = false
+ }
+ else if (num == 6) {
+ this.form.HSupName = deptRow.渚涘簲鍟嗗悕绉�
+ this.form.HSupID = deptRow.HItemID
+ this.openData = false
+ }
+ else if (num == 9){
+ this.editData[this.zbIndex].HSPID = deptRow.HItemID
+ this.editData[this.zbIndex].浠撲綅鍚嶇О = deptRow.浠撲綅鍚嶇О
+ this.gyStockPlaceShow = false
+ this.openData = false
+ }
},
//#endregion
//#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
emitData(deptRow, num) {
+
this.dialogTypeNum = num
this.deptform = deptRow
},
@@ -813,12 +896,12 @@
this.$refs["form"].validate(valid => {
if (valid) {
let fhck = false
- this.editData.map((item, index) => {
- if (!item.鍙戣揣浠撳簱) {
- fhck = true
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
- }
- })
+ // this.editData.map((item, index) => {
+ // if (!item.鍙戣揣浠撳簱) {
+ // fhck = true
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍙戣揣浠撳簱鏈�夋嫨锛�");
+ // }
+ // })
this.$nextTick(() => {
if (!fhck) {
var sMainStr = JSON.stringify(this.form);
@@ -826,7 +909,7 @@
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
axios({
method: 'post',
- url: this.$baseUrl + "/Kf_SellOutBill/SaveSellOutBillList",
+ url: this.$baseUrl + "/Kf_POStockInBill/SaveSellOutBillList",
data: {
'msg': sMainSub
},
@@ -914,7 +997,7 @@
HMoney: 0,
HTaxMoney: 0,
HWHID: 0,
- 鍙戣揣浠撳簱: '',
+ 鏀舵枡浠撳簱: '',
HRemark: '',
HQty_Full: 0,
HQty_Empty: 0,
@@ -924,15 +1007,15 @@
HSalePrice: 0,
HSeOrderInterID: 741,
HSeOrderEntryID: 18,
- HSeOrderBillNo: 'XSFH00000747',
+ HSeOrderBillNo: '',
HSourceInterID: 741,
HSourceEntryID: 18,
- HSourceBillNo: 'XSFH00000747',
+ HSourceBillNo: '',
HSourceBillType: 1402,
HRelationQty: 0,
HRelationMoney: 0,
HSPID: 0,
- HSPName: '',
+ 浠撲綅鍚嶇О: '',
HSPGroupID: 0,
HSPGroupName: '',
HSCWHID: 0,
@@ -1078,7 +1161,10 @@
//#region 鑾峰彇鏈�澶у崟鎹彿
get_MAXNum_Task(Type) {
- var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
+ const formatDate = this.form.HDate
+ ? new Date(this.form.HDate).toISOString().split('T')[0]
+ : new Date().toISOString().split('T')[0];
+ var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${formatDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
axios({
method: 'get',
url: this.$baseUrl + "/CommonModel/searchMethod",
--
Gitblit v1.9.1