From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001 From: renkang <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 24 一月 2025 18:24:31 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1 --- admin/src/views/stock/check.vue | 115 +++++++++++++++++++++++++++++++++------------------------ 1 files changed, 66 insertions(+), 49 deletions(-) diff --git a/admin/src/views/stock/check.vue b/admin/src/views/stock/check.vue index eaebf2d..49018c2 100644 --- a/admin/src/views/stock/check.vue +++ b/admin/src/views/stock/check.vue @@ -2,41 +2,54 @@ <div class="main_app"> <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" /> <div class="mt20"> - <el-button type="primary" @click="handleEx()" v-permissions="['business:ywpatrolline:create']">娣诲姞</el-button> + <el-button type="primary" @click="$refs.newInventory.open('鏂板缓鐩樼偣鍗�')" v-permissions="['business:ywpatrolline:create']">娣诲姞</el-button> </div> <el-table v-loading="loading" :data="list" stripe> - <el-table-column prop="platformName" label="鐩樼偣鍗曞悕绉�" min-width="120" show-overflow-tooltip /> - <el-table-column prop="platformGroupName" label="鐩樼偣浠撳簱" min-width="100" show-overflow-tooltip /> - <el-table-column prop="carCodeFront" label="鐩樼偣鍛�" min-width="80" show-overflow-tooltip /> - <el-table-column prop="carCodeBack" label="鐩樼偣鏃ユ湡" min-width="110" show-overflow-tooltip /> - <el-table-column prop="param1" label="鍒涘缓浜�" min-width="80" show-overflow-tooltip /> - <el-table-column prop="param2" label="鍒涘缓鏃堕棿" min-width="140" show-overflow-tooltip /> - <el-table-column prop="workTime" label="鐩樼偣鐘舵��" min-width="80" show-overflow-tooltip /> + <el-table-column prop="name" label="鐩樼偣鍗曞悕绉�" min-width="120" show-overflow-tooltip /> + <el-table-column prop="warehouseName" label="鐩樼偣浠撳簱" min-width="100" show-overflow-tooltip /> + <el-table-column prop="userName" label="鐩樼偣鍛�" min-width="80" show-overflow-tooltip /> + <el-table-column prop="planDate" label="鐩樼偣鏃ユ湡" min-width="110" show-overflow-tooltip /> + <el-table-column prop="createName" label="鍒涘缓浜�" min-width="80" show-overflow-tooltip /> + <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="140" show-overflow-tooltip /> + <el-table-column label="鐩樼偣鐘舵��" min-width="80"> + <template v-slot="{ row }"> + <span v-if="row.status === 0">鏈紑濮�</span> + <span v-if="row.status === 1">杩涜涓�</span> + <span v-if="row.status === 2">宸插畬鎴�</span> + <span v-if="row.status === 3">宸插彇娑�</span> + </template> + </el-table-column> <el-table-column prop="workTime" label="鎿嶄綔" min-width="140" show-overflow-tooltip> <template v-slot="{ row }"> - <span class="primaryColor pointer">鏌ョ湅璇︽儏</span> - <span class="primaryColor pointer">鍙栨秷</span> - <span class="primaryColor pointer">鍒犻櫎</span> + <el-button type="text" @click="$refs.inventoryDetails.open('鐩樼偣璇︾粏', row.id)">鏌ョ湅璇︽儏</el-button> + <el-button type="text" v-if="[0,1].includes(row.status)" @click="cancel(row.id)">鍙栨秷</el-button> + <el-button type="text" v-if="[0,3].includes(row.status)" @click="dele(row.id)">鍒犻櫎</el-button> </template> </el-table-column> </el-table> <div class="mt20"> <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" /> </div> + <NewInventory ref="newInventory" @success="getList" /> + <InventoryDetails ref="inventoryDetails" /> </div> </template> <script> import Pagination from '@/components/common/Pagination' import QueryForm from '@/components/common/QueryForm' +import NewInventory from './components/newInventory' +import InventoryDetails from './components/inventoryDetails' import dayjs from 'dayjs' import duration from 'dayjs/plugin/duration' dayjs.extend(duration) -import { platformLogPage, getPlatformGroupList } from '@/api' +import { fetchList, cancelById, deleteById } from '@/api/ywStocktaking' export default { components: { Pagination, - QueryForm + QueryForm, + NewInventory, + InventoryDetails }, data() { return { @@ -52,15 +65,20 @@ queryFormConfig: { formItems: [ { - filed: 'carCodeFront', + filed: 'name', type: 'input', - label: '鐩樼偣鍗�', + label: '鐩樼偣鍗曞悕绉�', }, { - filed: 'platformGroupId', + filed: 'status', type: 'select', label: '鐩樼偣鐘舵��', - options: [] + options: [ + { value: 0, label: '鏈紑濮�' }, + { value: 1, label: '杩涜涓�' }, + { value: 2, label: '宸插畬鎴�' }, + { value: 3, label: '宸插彇娑�' } + ] }, ], online: true @@ -68,55 +86,54 @@ } }, created() { - // this.getList() - // this.getGroupList() + this.getList() }, methods: { - handleSub() { - this.$refs.ruleForm.validate((valid) => { - if (valid) { - alert('submit!') - } - }) - }, - handleEx() { }, - getGroupList() { - getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => { - this.queryFormConfig.formItems[1].options = res.map(i => { - return { - value: i.id, - label: i.name - } - }) - // this.queryFormConfig.formItems[1].options.unshift({ value: '', label: '鍏ㄩ儴鏈堝彴缁�' }) - }) - }, getList(page) { const { pagination, filters } = this this.loading = true - platformLogPage({ + fetchList({ model: { - ...filters, - queryStatus: '6,7,8', - beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null, - beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null, + ...filters }, - sorts: [{ direction: 'DESC', property: 'param1' }], capacity: pagination.pageSize, page: page || pagination.page, }).then(res => { this.loading = false this.list = res.records || [] - this.list.forEach(item => { - item.inTypeTemp = item.inType == 0 ? '鏁存墭鐩�' : '浠剁儫' - item.taskOrigin = 'WMS鑾峰彇' - item.workTime = dayjs.duration(item.param3, 'seconds').format('H鏃秏鍒唖绉�') - }) this.pagination.total = res.total || 0 }, () => { this.loading = false }) }, + cancel(id) { + this.$confirm('鏄惁纭鍙栨秷?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }).then(() => { + cancelById(id) + .then(res => { + this.getList() + }) + }).catch(() => { + + }); + }, + dele(id) { + this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + type: 'warning' + }).then(() => { + deleteById(id) + .then(res => { + this.getList() + }) + }).catch(() => { + + }); + }, clear() { this.filters = {} this.pagination.pageSize = 10 -- Gitblit v1.9.3