From b77c699b4eb75980bcabba89018fdd3dd9ce91b4 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 08 六月 2023 17:27:32 +0800
Subject: [PATCH] 1.递交
---
src/views/produceManager/productWarehouse.vue | 212 +++-------------------------------------------------
1 files changed, 14 insertions(+), 198 deletions(-)
diff --git a/src/views/produceManager/productWarehouse.vue b/src/views/produceManager/productWarehouse.vue
index 30e0b39..da1ca13 100644
--- a/src/views/produceManager/productWarehouse.vue
+++ b/src/views/produceManager/productWarehouse.vue
@@ -19,9 +19,9 @@
<div style="font-size: 14px;margin-left: 5px;color: #a7a7a7">
鏌ヨ椤�
</div>
- <div v-if="!isPermission" style="font-size: 14px;margin-left: 10px;color: red">
- 褰撳墠鐢ㄦ埛鍦‥RP绯荤粺涓笉瀛樺湪鎴栨湭鎺堟潈锛屾棤娉曞叆搴撴彁浜�
- </div>
+ <!-- <div v-if="!isPermission" style="font-size: 14px;margin-left: 10px;color: red">-->
+ <!-- 褰撳墠鐢ㄦ埛鍦‥RP绯荤粺涓笉瀛樺湪鎴栨湭鎺堟潈锛屾棤娉曞叆搴撴彁浜�-->
+ <!-- </div>-->
</div>
<el-form
ref="form"
@@ -745,7 +745,7 @@
tableDataSummary: [], // 姹囨�昏〃
- isPermission: true, // 鏄惁鏈夋潈闄愬彲鎻愪氦
+ // isPermission: true, // 鏄惁鏈夋潈闄愬彲鎻愪氦
userArr: [] // ERP浜哄憳鏁扮粍
@@ -761,10 +761,7 @@
this.getWareHouseSelect()
this.getWorkShopSelect()
-
this.getProductInHouseOrderCodeSearch()
-
- // this.getProductInHouseOrderSearch()
},
methods: {
async getProductInHouseOrderCodeSearch() {
@@ -776,19 +773,13 @@
const { data: res } = await ErpUserSelect()
this.userArr = res
- if (!res.map(i => i.name).includes(getCookie('username'))) {
- this.isPermission = false
-
- await this.$alert('褰撳墠鐢ㄦ埛鍦‥RP绯荤粺涓笉瀛樺湪鎴栨湭鎺堟潈锛屾棤娉曞叆搴撴彁浜�', '鎻愮ず', {
- confirmButtonText: '纭畾'
- // callback: action => {
- // this.$message({
- // type: 'info',
- // message: `action: ${action}`
- // })
- // }
- })
- }
+ // if (!res.map(i => i.name).includes(getCookie('username'))) {
+ // this.isPermission = false
+ //
+ // await this.$alert('褰撳墠鐢ㄦ埛鍦‥RP绯荤粺涓笉瀛樺湪鎴栨湭鎺堟潈锛屾棤娉曞叆搴撴彁浜�', '鎻愮ず', {
+ // confirmButtonText: '纭畾'
+ // })
+ // }
},
// 鍗曟嵁绫诲瀷鏀瑰彉
@@ -881,10 +872,6 @@
this.tabClickIndex = row.index
this.tabClickLabel = column.label
break
- // case '鍒よ矗閲戦(鍏�)':
- // this.tabClickIndex = row.index
- // this.tabClickLabel = column.label
- // break
default:
return
}
@@ -907,66 +894,8 @@
// tab鐐瑰嚮
tabClick(val) {
- // this.$nextTick(() => {
- // this.$refs.tableDataRef.doLayout()
- // })
-
- // const stockcodeArr = [...new Set(this.multipleSelection.map(i => i.stockcode))]// 鏁扮粍鍘婚噸
-
const partcodeArr = [...new Set(this.multipleSelection.map(i => i.partcode))]// 鏁扮粍鍘婚噸
const newData = []
-
- // const Array2D = []
- //
- // stockcodeArr.forEach(i => {
- // Array2D.push(this.multipleSelection.filter(j => j.stockcode === i))
- // })
-
- // Array2D.forEach(k => {
- // const partcodeArr = [...new Set(k.map(j => j.partcode))]
- // partcodeArr.forEach(i => {
- // const t = k.find(j => j.partcode === i)
- // let sum = 0
- // const good_qty = k.filter(j => j.partcode === i).map(j => parseFloat(j.good_qty)).reduce((pre, curr) => {
- // sum = pre + curr
- // return sum
- // })
- // sum = 0
- // const inhouseqty = k.filter(j => j.partcode === i).map(j => parseFloat(j.inhouseqty)).reduce((pre, curr) => {
- // sum = pre + curr
- // return sum
- // })
- // sum = 0
- // const stinhouseqty = k.filter(j => j.partcode === i).map(j => parseFloat(j.stinhouseqty)).reduce((pre, curr) => {
- // sum = pre + curr
- // return sum
- // })
- // newData.push(
- // {
- // stockcode: t.stockcode,
- // partcode: t.partcode,
- // partname: t.partname,
- // partspec: t.partspec,
- // qty: t.qty,
- // good_qty,
- // inhouseqty,
- // stinhouseqty,
- // unitid: t.unitid,
- // unitname: t.unitname,
- // sourceVoucherDetailId: t.sbid,
- // saleOrderDetailId: t.saleOrderDetailId,
- // ManufactureOrderDetailId: t.sbid,
- // stck_id: this.stockcodeArr.find(i => i.code === t.stockcode).id,
- // SourceVoucherDetailIdByMergedFlow: t.sbid,
- // materiel_code: t.partcode,
- // warehouse: t.stockcode,
- // materiel_id: t.materiel_id
- // }
- // )
- // })
- // })
- // console.log(Array2D, 'Array2D')
- // console.log(newData, 'newData')
partcodeArr.forEach(i => {
const t = this.multipleSelection.find(j => j.partcode === i)
@@ -987,14 +916,6 @@
})
newData.push(
{
- // partcode: i,
- // partname: t.partname,
- // partspec: t.partspec,
- // qty: t.qty,
- // good_qty,
- // inhouseqty,
- // stinhouseqty
-
stockcode: t.stockcode,
partcode: t.partcode,
partname: t.partname,
@@ -1008,7 +929,7 @@
sourceVoucherDetailId: t.sbid,
saleOrderDetailId: t.saleOrderDetailId,
ManufactureOrderDetailId: t.sbid,
- stck_id: t.stockcode ? this.stockcodeArr.find(i => i.code === t.stockcode).id : '/',
+ stck_id: t.stockcode ? this.stockcodeArr.find(i => i.code === t.stockcode).id : '',
SourceVoucherDetailIdByMergedFlow: t.sbid,
materiel_code: t.partcode,
warehouse: t.stockcode,
@@ -1017,7 +938,6 @@
}
)
})
- // this.tableDataSummary = newData.flat()
this.tableDataSummary = newData
},
@@ -1032,8 +952,6 @@
this.$store.state.app.buttonIsDisabled = true
await this.tabClick()
const openToken = await getTPlusToken() // 鑾峰彇TPlus token
-
- // const openToken =
// 鏈夋簮鍗�
if (this.form.documentType === 'Y') {
@@ -1166,13 +1084,13 @@
const r1 = await ProductInHouseOrderSeave(data)
if (r1.code === '200') {
this.$message.success('鍏ュ簱鎴愬姛锛�')
- this.$store.state.app.buttonIsDisabled = false
await this.getProductInHouseOrderCodeSearch()
await this.wkshopcodeChange(this.form.wkshopcode)
this.tableDataDetail = []
this.tableDataSummary = []
this.multipleSelection = []
this.form.stockcode = ''
+ this.$store.state.app.buttonIsDisabled = false
}
} else {
this.$message.error('鍏ュ簱澶辫触锛�')
@@ -1243,7 +1161,7 @@
hbillno: this.form.hbillno,
incbit: this.form.incbit,
wkshpcode: this.form.wkshopcode,
- sourceVoucherId: this.form.documentType === 'Y' ? this.tableDataDetail[0].mpoid : this.tableDataDetail[0].wo_id, // 涓嬪崍鎶婅繖涓弬鏁板姞涓�
+ sourceVoucherId: this.form.documentType === 'Y' ? this.tableDataDetail[0].mpoid : this.tableDataDetail[0].wo_id,
sourceVoucherCode: this.form.documentType === 'Y' ? this.tableDataDetail[0].m_po : this.tableDataDetail[0].wo_code,
saleOrderId: this.tableDataDetail[0].saleOrderid,
saleOrderCode: this.tableDataDetail[0].saleOrderCode,
@@ -1277,7 +1195,6 @@
compositionQuantity: i.stinhouseqty + i.unitname,
baseQuantity: i.stinhouseqty,
sourceVoucherId: this.form.documentType === 'Y' ? this.tableDataDetail[0].mpoid : '',
- // sourceVoucherCode: this.form.documentType === 'Y' ? this.tableDataDetail[0].m_po : this.tableDataDetail[0].wo_code,
sourceVoucherCode: '',
sourceVoucherDetailId: i.sourceVoucherDetailId,
idsourcevouchertype: 69,
@@ -1310,7 +1227,6 @@
const r1 = await ProductInHouseOrderSeave(data)
if (r1.code === '200') {
this.$message.success('鍏ュ簱鎴愬姛锛�')
- this.$store.state.app.buttonIsDisabled = false
await this.getProductInHouseOrderCodeSearch()
await this.wkshopcodeChange(this.form.wkshopcode)
this.tableDataDetail = []
@@ -1324,106 +1240,6 @@
this.$store.state.app.buttonIsDisabled = false
}
}
- },
- // 鍏ュ簱鎻愪氦
- submit2() {
- this.tabClick()
-
- this.$confirm('鏄惁纭鎻愪氦?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- if (this.multipleSelection.length === 0) {
- return this.$message.error('鏈�夋嫨浜у搧锛�')
- }
- if (this.multipleSelection.find(i => !i.stockcode)) {
- return this.$message.error('鏄庣粏閲岄潰鏈変骇鍝佹湭濉啓浠撳簱锛�')
- }
- this.multipleSelection.forEach(i => {
- i.stockname = this.stockcodeArr.find(j => j.code === i.stockcode).name
- i.id = this.stockcodeArr.find(j => j.code === i.stockcode).id
- })
-
- const head = {
- rightcode: '2064',
- hbillno: this.form.hbillno,
- incbit: this.form.incbit,
- wkshpcode: this.form.wkshopcode,
- sourceVoucherId: this.form.documentType === 'Y' ? this.tableDataDetail[0].mpoid : '',
- sourceVoucherCode: this.form.documentType === 'Y' ? this.tableDataDetail[0].m_po : this.tableDataDetail[0].wo_code,
- saleOrderId: this.tableDataDetail[0].saleOrderid,
- saleOrderCode: this.tableDataDetail[0].saleOrderCode,
- rdDirectionFlag: 1,
- makerid: this.userArr.find(i => i.name === getCookie('username')).id,
- maker: getCookie('username'),
- accountingyear: new Date().getFullYear(),
- VoucherYear: new Date().getFullYear(),
- VoucherPeriod: new Date().getMonth() + 1,
- ManufactureOrderCode: this.form.documentType === 'Y' ? this.tableDataDetail[0].m_po : this.tableDataDetail[0].wo_code,
- idbusitype: '03',
- iddepartment: this.WorkShopArr.find(i => i.code === this.form.wkshopcode).id,
- idrdstyle: 21,
- idwarehouse: '',
- voucherState: 181,
- idvouchertype: 15,
- voucherdate: handleDatetime(new Date().getTime()),
- madedate: handleDatetime(new Date().getTime()),
- createdtime: handleDatetime2(new Date().getTime()),
- DataSource: '56133',
- idsourcevouchertype: 69
- }
-
- const subsum = []
- this.tableDataSummary.forEach((i, index) => {
- subsum.push({
- code: index.toString().padStart(4, '0'),
- rownumber: index + 1,
- arrivalQuantity: i.qty,
- quantity: i.stinhouseqty,
- compositionQuantity: i.stinhouseqty + i.unitname,
- baseQuantity: i.stinhouseqty,
- sourceVoucherId: this.form.documentType === 'Y' ? this.tableDataDetail[0].mpoid : '',
- sourceVoucherCode: this.form.documentType === 'Y' ? this.tableDataDetail[0].m_po : this.tableDataDetail[0].wo_code,
- sourceVoucherDetailId: i.sourceVoucherDetailId,
- idsourcevouchertype: 69,
- saleOrderId: this.tableDataDetail[0].saleOrderid,
- saleOrderCode: this.tableDataDetail[0].saleOrderCode,
- saleOrderDetailId: i.saleOrderDetailId,
- ManufactureOrderId: this.form.documentType === 'Y' ? this.tableDataDetail[0].mpoid : '',
- ManufactureOrderCode: this.form.documentType === 'Y' ? this.tableDataDetail[0].m_po : this.tableDataDetail[0].wo_code,
- ManufactureOrderDetailId: i.ManufactureOrderDetailId,
- idbusiTypeByMergedFlow: 3,
- idinventory: i.materiel_id,
- idbaseunit: i.unitid,
- idunit: i.unitid,
- idwarehouse: i.stck_id,
- SourceVoucherIdByMergedFlow: this.tableDataDetail[0].mpoid,
- SourceVoucherCodeByMergedFlow: this.tableDataDetail[0].m_po,
- SourceVoucherDetailIdByMergedFlow: i.SourceVoucherDetailIdByMergedFlow,
- idsourceVoucherTypeByMergedFlow: 69,
- createdtime: handleDatetime2(new Date().getTime()),
- DataSource: '56133',
- materiel_code: i.materiel_code,
- warehouse: i.warehouse
- })
- })
-
- const data = {
- head, sub: this.multipleSelection, subsum
- }
-
- ProductInHouseOrderSeave(data).then(res => {
- if (res.code === '200') {
- this.$message.success('鍏ュ簱鎻愪氦鎴愬姛锛�')
- this.getProductInHouseOrderCodeSearch()
- this.wkshopcodeChange(this.form.wkshopcode)
- this.tableDataDetail = []
- this.tableDataSummary = []
- this.multipleSelection = []
- }
- })
- })
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
--
Gitblit v1.9.3