From 6156331374cefbe908c5aeaebda911646c1d5f10 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 14 十一月 2024 10:35:48 +0800
Subject: [PATCH] 1.递交
---
src/views/produce/productWarehouse.vue | 296 +++++++++++++++++++++++-----------------------------------
1 files changed, 118 insertions(+), 178 deletions(-)
diff --git a/src/views/produce/productWarehouse.vue b/src/views/produce/productWarehouse.vue
index f28fe61..02b766d 100644
--- a/src/views/produce/productWarehouse.vue
+++ b/src/views/produce/productWarehouse.vue
@@ -32,6 +32,24 @@
>
<div class="elForm" style="display: flex;flex-direction: column;justify-content: flex-start">
<div style="display: flex">
+ <el-form-item label="鍏ュ簱閮ㄩ棬" required style="display: flex;">
+ <el-select
+ v-model="form.deptno"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <!-- @change="getProductInHouseOrderSearch"-->
+ <el-option
+ v-for="item in departmentArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+
<el-form-item label="鐢熶骇杞﹂棿" style=" display: flex;">
<el-select
v-model="form.wkshopcode"
@@ -68,6 +86,10 @@
style="width: 200px"
/>
</el-form-item>
+
+ </div>
+
+ <div style="display: flex">
<el-form-item
label="閿�鍞鍗�"
style="display: flex;"
@@ -78,9 +100,6 @@
style="width: 200px"
/>
</el-form-item>
- </div>
-
- <div style="display: flex">
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partcode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
@@ -155,23 +174,6 @@
</el-select>
</el-form-item>
- <el-form-item label="鍏ュ簱閮ㄩ棬" required style=" display: flex;">
- <el-select
- v-model="form.deptno"
- :popper-append-to-body="false"
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in departmentArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
-
</div>
<div
class="bodySearchReset"
@@ -236,39 +238,6 @@
label="搴忓彿"
/>
- <!-- <el-table-column-->
- <!-- prop="stockcode"-->
- <!-- label="浠撳簱"-->
- <!-- width="160"-->
- <!-- show-tooltip-when-overflow-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div>{{ row.stockcode ? stockcodeArr.find(i => i.code === row.stockcode).name : '/' }}</div>-->
- <!-- <!– <div–>-->
- <!-- <!– v-if="!(row.index === tabClickIndex && tabClickLabel === '浠撳簱')"–>-->
- <!-- <!– >–>-->
- <!-- <!– {{ row.stockcode ? stockcodeArr.find(i => i.code === row.stockcode).name : '/' }}–>-->
- <!-- <!– </div>–>-->
- <!-- <!– <el-select–>-->
- <!-- <!– v-if="row.index === tabClickIndex && tabClickLabel === '浠撳簱'"–>-->
- <!-- <!– v-model="row.stockcode"–>-->
- <!-- <!– placeholder="璇烽�夋嫨"–>-->
- <!-- <!– >–>-->
- <!-- <!– <el-option–>-->
- <!-- <!– v-for="item in stockcodeArr"–>-->
- <!-- <!– :key="item.code"–>-->
- <!-- <!– :label="item.name"–>-->
- <!-- <!– :value="item.code"–>-->
- <!-- <!– />–>-->
- <!-- <!– </el-select>–>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="inbarcode"-->
- <!-- label="鍏ュ簱鏉＄爜"-->
- <!-- width="160"-->
- <!-- show-tooltip-when-overflow-->
- <!-- />-->
<el-table-column
prop="stockcode"
label="鍏ュ簱浠撳簱"
@@ -429,131 +398,94 @@
</div>
</el-tab-pane>
- <el-tab-pane label="姹囨��">
- <div class="elTableDiv" style="margin: 0 auto 10px;">
- <el-table
- ref="tableDataRef"
- class="tableFixed"
- :data="tableDataSummary"
- :height="(tableHeight-25)+'px'"
- border
- :row-class-name="tableRowClassName2"
- :style="{width: 100+'%',height:(tableHeight-25)+'px',}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- >
- <el-table-column
- type="index"
- width="50"
- fixed
- label="搴忓彿"
- />
- <!-- <el-table-column-->
- <!-- prop="stockcode"-->
- <!-- label="浠撳簱"-->
- <!-- width="110"-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div>{{ stockcodeArr.find(i => i.code === row.stockcode).name }}</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.stockname">{{ row.stockname }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
+ <!-- <el-tab-pane label="姹囨��">-->
+ <!-- <div class="elTableDiv" style="margin: 0 auto 10px;">-->
+ <!-- <el-table-->
+ <!-- ref="tableDataRef"-->
+ <!-- class="tableFixed"-->
+ <!-- :data="tableDataSummary"-->
+ <!-- :height="(tableHeight-25)+'px'"-->
+ <!-- border-->
+ <!-- :row-class-name="tableRowClassName2"-->
+ <!-- :style="{width: 100+'%',height:(tableHeight-25)+'px',}"-->
+ <!-- highlight-current-row-->
+ <!-- :header-cell-style="this.$headerCellStyle"-->
+ <!-- :cell-style="this.$cellStyle"-->
+ <!-- >-->
+ <!-- <el-table-column-->
+ <!-- type="index"-->
+ <!-- width="50"-->
+ <!-- fixed-->
+ <!-- label="搴忓彿"-->
+ <!-- />-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="inbarcode"-->
- <!-- label="鍏ュ簱鏉＄爜"-->
- <!-- width="160"-->
- <!-- show-tooltip-when-overflow-->
- <!-- />-->
- <!-- <el-table-column-->
- <!-- prop="m_po"-->
- <!-- label="璁㈠崟缂栧彿"-->
- <!-- width="160"-->
- <!-- show-tooltip-when-overflow-->
- <!-- >-->
- <!-- <template slot-scope="{row}">-->
- <!-- <div v-if="row.m_po">{{ row.m_po }}</div>-->
- <!-- <div v-else>/</div>-->
- <!-- </template>-->
- <!-- </el-table-column>-->
- <!-- <el-table-column-->
- <!-- prop="wo_code"-->
- <!-- label="宸ュ崟缂栧彿"-->
- <!-- width="160"-->
- <!-- show-tooltip-when-overflow-->
- <!-- />-->
- <el-table-column
- prop="partcode"
- label="浜у搧缂栫爜"
- min-width="160"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="partname"
- label="浜у搧鍚嶇О"
- min-width="160"
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="partspec"
- label="浜у搧瑙勬牸"
- min-width="160"
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.stockname">{{ row.stockname }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
+ <!-- <el-table-column-->
+ <!-- prop="partcode"-->
+ <!-- label="浜у搧缂栫爜"-->
+ <!-- min-width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partname"-->
+ <!-- label="浜у搧鍚嶇О"-->
+ <!-- min-width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="partspec"-->
+ <!-- label="浜у搧瑙勬牸"-->
+ <!-- min-width="160"-->
+ <!-- show-tooltip-when-overflow-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.stockname">{{ row.stockname }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
- <el-table-column
- prop="qty"
- label="璁㈠崟鏁伴噺"
- min-width="95"
+ <!-- <el-table-column-->
+ <!-- prop="qty"-->
+ <!-- label="璁㈠崟鏁伴噺"-->
+ <!-- min-width="95"-->
- show-tooltip-when-overflow
- >
- <template slot-scope="{row}">
- <div v-if="row.qty">{{ row.qty }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <!-- <el-table-column-->
- <!-- prop="plan_qty"-->
- <!-- label="宸ュ崟鏁伴噺"-->
- <!-- min-width="95"-->
- <!-- fixed="right"-->
- <!-- show-tooltip-when-overflow-->
- <!-- />-->
- <el-table-column
- prop="good_qty"
- label="瀹屽伐鏁伴噺"
- min-width="95"
+ <!-- show-tooltip-when-overflow-->
+ <!-- >-->
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.qty">{{ row.qty }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <!– <el-table-column–>-->
+ <!-- <!– prop="plan_qty"–>-->
+ <!-- <!– label="宸ュ崟鏁伴噺"–>-->
+ <!-- <!– min-width="95"–>-->
+ <!-- <!– fixed="right"–>-->
+ <!-- <!– show-tooltip-when-overflow–>-->
+ <!-- <!– />–>-->
+ <!-- <el-table-column-->
+ <!-- prop="good_qty"-->
+ <!-- label="瀹屽伐鏁伴噺"-->
+ <!-- min-width="95"-->
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="inhouseqty"
- label="宸插叆搴撴暟閲�"
- min-width="95"
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="inhouseqty"-->
+ <!-- label="宸插叆搴撴暟閲�"-->
+ <!-- min-width="95"-->
- show-tooltip-when-overflow
- />
- <el-table-column
- prop="stinhouseqty"
- label="鍙叆搴撴暟閲�"
- min-width="95"
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- <el-table-column-->
+ <!-- prop="stinhouseqty"-->
+ <!-- label="鍙叆搴撴暟閲�"-->
+ <!-- min-width="95"-->
- show-tooltip-when-overflow
- />
- </el-table>
- </div>
- </el-tab-pane>
+ <!-- show-tooltip-when-overflow-->
+ <!-- />-->
+ <!-- </el-table>-->
+ <!-- </div>-->
+ <!-- </el-tab-pane>-->
</el-tabs>
</div>
@@ -627,7 +559,7 @@
this.getProductInHouseOrderCodeSearch()
this.getDeptSelectData()
- this.getProductInHouseOrderSearch()
+ // this.getProductInHouseOrderSearch()
},
methods: {
// 鑾峰彇鍏ュ簱閮ㄩ棬
@@ -653,6 +585,9 @@
},
// 鑾峰彇澶у垪琛ㄦ煡璇�
async getProductInHouseOrderSearch() {
+ if (this.form.deptno === '') {
+ return this.$message.info('鍏ュ簱閮ㄩ棬涓嶈兘涓虹┖锛�')
+ }
const data = {
saleordercode: this.form.saleordercode, // 閿�鍞崟鍙�
wkshopcode: this.form.wkshopcode, // 鐢熶骇杞﹂棿
@@ -660,7 +595,8 @@
mesordercode: this.form.mesordercode, // 宸ュ崟缂栧彿
partcode: this.form.partcode, // 浜у搧缂栫爜
partname: this.form.partname, // 浜у搧鍚嶇О
- partspec: this.form.partspec // 瑙勬牸鍨嬪彿
+ partspec: this.form.partspec, // 瑙勬牸鍨嬪彿
+ deptno: this.form.deptno// 鍏ュ簱閮ㄩ棬
}
const { data: res } = await ProductInHouseOrderSearch(data)
@@ -738,14 +674,16 @@
TableDetailData// 琛ㄤ綋
]
}
-
+ this.$store.state.app.buttonIsDisabled = true
const res = await ProductInHouseOrderSeave(data)
+ this.$store.state.app.buttonIsDisabled = false
if (res.code === '200') {
this.$message.success('鍏ュ簱鎴愬姛锛�')
this.multipleSelection = []
- this.form.deptno = ''
- this.form.stockcode = ''
- await this.getProductInHouseOrderSearch()
+ // this.form.deptno = ''
+ // this.form.stockcode = ''
+ // await this.getProductInHouseOrderSearch()
+ this.reset()
await this.getProductInHouseOrderCodeSearch()
}
},
@@ -758,6 +696,8 @@
this.form.partcode = ''// 浜у搧缂栫爜
this.form.partname = '' // 浜у搧鍚嶇О
this.form.partspec = '' // 瑙勬牸鍨嬪彿
+ this.form.deptno = '' // 瑙勬牸鍨嬪彿
+ this.tableDataDetail = []
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
--
Gitblit v1.9.3