From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期六, 11 五月 2024 17:26:02 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
admin-web/src/views/stock/procure/purchaseOrder/index.vue | 427 ++++++++++++++++++----------------------------------
1 files changed, 149 insertions(+), 278 deletions(-)
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/index.vue b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
index 826f06f..aa59722 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/index.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div class="app-container stock-container">
<el-container>
<el-card class="box-card" style="width: 100%" shadow="never">
<!--鎼滅储鏉′欢-->
@@ -9,67 +9,77 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <my-button name="鏂板" @click="addtable" site="tools" size="medium" />
- <my-button name="瀵煎叆" @click="importSetting.dialogShow = true" site="tools" size="medium" />
- <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
- <el-row class="card" :gutter="5">
- <el-col v-for="(item, index) in list" :key="index" class="cm-item">
- <el-card class="card-data">
- <div class="card-container">
- <div class="card-header">
- <div class="card-header-left">
- <span>鍏ュ簱鍗曞彿锛�</span>
- <span class="value">{{ item.businessFormCode }}</span>
- <div class="states" :class="item.states==1?'':'states-income'">{{ item.states == 1 ? '寰呭叆搴�' : '宸插叆搴�' }}</div>
- </div>
- <div class="card-header-right">
- <template v-if="item.states == 1">
- <el-button name="缂栬緫" site="form" type="success" size="mini" @click="handleEdit(item)"
- >缂栬緫</el-button
- >
- <el-button name="鍏ュ簱" site="form" type="primary" size="mini" @click="handleIncome(item)"
- >鍏ュ簱</el-button
- >
- <el-button name="鍒犻櫎" site="form" type="danger" size="mini" @click="del(item)"
- >鍒犻櫎</el-button
- >
- </template>
- <template v-if="item.states != 1">
- <el-button site="form" type="success" size="mini" @click="handleExport(item)"
- >瀵煎嚭鍏ュ簱鍗�</el-button
- >
- </template>
- <el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
- >鏌ョ湅璇︽儏</el-button
- >
- </div>
- </div>
- <div class="one-hed">
- <div class="box"><span class="span-two">鏈烘瀯锛�</span>{{ item.agencyId }}</div>
- <div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.buyerName }}</div>
- <div class="box"><span class="span-two">鍑哄簱鏃堕棿锛�</span>{{ item.procureTime }}</div>
- <div class="box"><span class="span-two">鍏ュ簱鏃堕棿锛�</span>{{ item.procureTime }}</div>
- </div>
- <div class="card-end">
- <div v-for="(just, index) in item.models" :key="index" class="item">
- <div class="name">{{ just.baseGoodsModelsId }}</div>
- <div class="value-box">
- <div class="value-box-item">
- <span class="label">鏁伴噺锛�</span>
- <span class="value">{{ just.counts }}</span>
+ <div class="table-tool-bar" style="margin-bottom: 15px">
+<!-- <my-button name="鏂板" check-permission="procure:order:add" @click="handleAdd" site="tools" size="medium" />-->
+ <my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
+ <my-button name="瀵煎叆" @click="openImport()" site="tools" size="medium" />
+ </div>
+ <div v-loading="loading" style="margin-bottom: 15px">
+ <div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }">
+ <el-row v-if="list.length" class="card" :gutter="5">
+ <el-col v-for="(item, index) in list" :key="index" class="cm-item">
+ <el-card class="card-data">
+ <div class="card-container">
+ <div class="card-header">
+ <div class="card-header-left">
+ <span>鍏ュ簱鍗曞彿锛�</span>
+ <span class="value">{{ item.businessFormCode }}</span>
+ <div class="states" :class="item.states == 1 ? '' : 'states-success'">
+ {{ item.states == 1 ? '寰呭叆搴�' : '宸插叆搴�' }}
</div>
- <div class="value-box-item">
- <span class="label">閲戦锛�</span>
- <span class="value">{{ just.price }}</span>
+ </div>
+ <div class="card-header-right">
+ <template v-if="item.states == 1">
+ <el-button name="缂栬緫" site="form" type="success" size="mini" @click="handleEdit(item)"
+ >缂栬緫</el-button
+ >
+ <el-button name="鍏ュ簱" site="form" type="primary" size="mini" @click="handleIncome(item)"
+ >鍏ュ簱</el-button
+ >
+ <el-button name="鍒犻櫎" site="form" type="danger" size="mini" @click="del(item)"
+ >鍒犻櫎</el-button
+ >
+ </template>
+ <template v-if="item.states != 1">
+ <el-button site="form" type="success" size="mini" @click="handleExport('procureExport',`閲囪喘鍏ュ簱鍗�-${item.businessFormCode}`,{id:item.id})"
+ >瀵煎嚭鍏ュ簱鍗�</el-button
+ >
+ </template>
+ <el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
+ >鏌ョ湅璇︽儏</el-button
+ >
+ </div>
+ </div>
+ <div class="one-hed">
+ <div class="box"><span class="span-two">鏈烘瀯锛�</span>{{ item.agencyName }}</div>
+ <div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.buyerName }}</div>
+ <div class="box">
+ <span class="span-two">閲囪喘鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
+ </div>
+ <div class="box">
+ <span class="span-two">鍏ュ簱鏃堕棿锛�</span>{{ item.incomeTime | formatTime }}
+ </div>
+ </div>
+ <div class="card-end">
+ <div v-for="(just, index) in item.fromProcureTemplateInfoList" :key="index" class="item">
+ <div class="name">{{ just.goodsTemplateName }}</div>
+ <div class="value-box">
+ <div class="value-box-item">
+ <span class="label">鏁伴噺锛�</span>
+ <span class="value">{{ just.count }}</span>
+ <span class="unit">{{ just.unit }}</span>
+ </div>
</div>
</div>
</div>
</div>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ </el-card>
+ </el-col>
+ </el-row>
+ <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
+ </div>
</div>
+
<el-pagination
:small="false"
:current-page="pageNum"
@@ -85,8 +95,19 @@
</el-card>
</el-container>
<!--娣诲姞/缂栬緫寮圭獥-->
- <edit ref="editRef"></edit>
- <detail ref="detailRef"></detail>
+ <edit
+ v-if="editSetting.show"
+ :setting="editSetting"
+ ref="editRef"
+ @close="editSetting.show = false"
+ @search="refreshData"
+ ></edit>
+ <detail
+ v-if="detailSetting.show"
+ :setting="detailSetting"
+ @close="detailSetting.show = false"
+ ref="detailRef"
+ ></detail>
<my-import
:import-setting="importSetting"
:dialog-show="importSetting.dialogShow"
@@ -96,32 +117,24 @@
</template>
<script>
-import { procureList, procureDel, procureIncome } from '@/api/stock/procure/purchaseOrder';
+import {procureDel, procureIncome, procureList} from '@/api/stock/procure/purchaseOrder';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
-import { getBaseUrl } from '@/utils/base';
+import {getBaseUrl} from '@/utils/base';
+import listPage from '@/views/mixins/listPage';
export default {
name: 'index',
+ mixins: [listPage],
components: { MyButton, myImport, edit, detail },
data() {
return {
loading: false,
adddialog: false,
list: [],
- formData: {
- tableData: [
- {
- projectName: '555',
- },
- {
- projectName: '444',
- },
- ],
- },
// 鎼滅储妗�
items: [
{
@@ -131,24 +144,39 @@
placeholder: '璇疯緭鍏�',
defaultValue: '',
},
+ // {
+ // type: 'text',
+ // dataIndex: 'goodsTemplateName',
+ // label: '鐗╁搧鍚嶇О',
+ // placeholder: '鍙ā绯婃悳绱�',
+ // defaultValue: '',
+ // },
{
- type: 'text',
- dataIndex: 'goodsTemplateName',
- label: '鐗╁搧鍚嶇О',
- placeholder: '鍙ā绯婃悳绱�',
- defaultValue: '',
- },
- {
- type: 'select',
- dataIndex: 'name',
+ type: 'cascader',
+ dataIndex: 'agencyId',
label: '鏈烘瀯',
placeholder: '璇烽�夋嫨',
+ optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ cascader: [{key:'goodsTemplateId',queryKey: 'agencyId'}],
defaultValue: '',
options: [],
},
{
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
+ label: '鐗╁搧鍚嶇О',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
+ },
+ {
type: 'text',
- dataIndex: 'buyerName',
+ dataIndex: 'createName',
label: '鍒涘缓浜�',
placeholder: '璇疯緭鍏�',
defaultValue: '',
@@ -176,62 +204,41 @@
},
{
type: 'date-picker',
- dataIndex: 'val1',
+ dataIndex: 'startTime',
label: '鍏ュ簱鏃堕棿',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'val2',
+ dataIndex: 'endTime',
label: '鑷�',
defaultValue: '',
},
],
// 鏍戞暟鎹�
treeDataList: [],
- // 鎼滅储鏉′欢
- filterFrom: {
- tenantId: null,
- userName: null,
- userPhone: null,
- states: null,
- },
// 瀵煎叆
importSetting: {
dialogTitle: '瀵煎叆',
dialogShow: false,
fileSettings: {
data: {},
- uploadUrl: getBaseUrl() + '/pc/fin/sys/tenant/import', // 涓婁紶鍦板潃
+ uploadUrl: getBaseUrl() + '/pc/whForm/procure/import', // 涓婁紶鍦板潃
accept: '.xls', // 鏍煎紡
type: 'text', // 鍥炴樉褰㈠紡
- loading: false, // 瀵煎叆鏁堟灉
+ loading: true, // 瀵煎叆鏁堟灉
},
/* 妯℃澘涓嬭浇 */
templateSettings: {
templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate', // 涓嬭浇鍦板潃
+ templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate?type=procure', // 涓嬭浇鍦板潃
},
onSuccess: null,
},
- editSetting: {
- title: '',
- id: '',
- orgId: '',
- show: false,
- },
- pageNum: 1,
- pageSize: 10,
- total: 0,
};
},
- computed: {
- clientHeight() {
- return document.documentElement.clientHeight;
- },
- },
- created() {
- this.fetchData();
+ created(){
+ this.fetchData()
},
methods: {
fetchData() {
@@ -244,9 +251,9 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
- console.log(this.list);
});
},
+
//瀵煎叆
importOrg() {
this.importSetting.dialogShow = true;
@@ -260,183 +267,47 @@
callBack();
};
},
- // 瀵煎嚭
- handleExport() {
-
- },
- // 鏂板
- addtable() {
- this.$refs.editRef.open();
- },
- // 缂栬緫
- handleEdit(row) {
- this.$refs.editRef.open(row.id);
- },
- // 璇︽儏
- handleDetail(row) {
- this.$refs.detailRef.open(row.id);
- },
// 鍏ュ簱
handleIncome(row) {
- this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 鍏ュ簱鍚�?`, '閲囪喘鍏ュ簱')
- .then(function () {
- procureIncome({ id: row.id }).then((res) => {
- this.$message.success('鍏ュ簱鎴愬姛锛�');
- });
- })
- .then((res) => {
- this.search();
- })
- .catch(() => {});
+ this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 鍏ュ簱鍚�?`, '閲囪喘鍏ュ簱', {
+ beforeClose: (action, instance, done) => {
+ if (action == 'confirm') {
+ instance.confirmButtonLoading = true;
+ instance.confirmButtonText = '鎵ц涓�...';
+ procureIncome({ id: row.id })
+ .then((res) => {
+ this.$message.success('鍏ュ簱鎴愬姛锛�');
+ done();
+ instance.confirmButtonLoading = false;
+ this.search();
+ })
+ .catch(() => {
+ done();
+ });
+ } else {
+ done();
+ }
+ },
+ });
},
del(row) {
- this.$modal
- .confirm('鏄惁纭鍒犻櫎鍏ュ簱鍗曞彿涓�"' + row.businessFormCode + '"鐨勬暟鎹悧锛�')
- .then(function () {
- procureDel({ id: row.id }).then((res) => {});
- })
- .then((res) => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search();
- })
- .catch(() => {});
+ this.$modal.confirm('鏄惁纭鍒犻櫎鍏ュ簱鍗曞彿涓�"' + row.businessFormCode + '"鐨勬暟鎹悧锛�').then(() => {
+ procureDel({ id: row.id })
+ .then((res) => {
+ this.$message.success('鍒犻櫎鎴愬姛锛�');
+ this.search();
+ })
+ .catch(() => {});
+ });
},
- // 鍒嗛〉
- handleSizeChange(pageSize) {
- this.pageSize = pageSize;
- this.search({ pageNum: 1 });
- },
- handleCurrentChange(pageNum) {
- this.myTable.paging.page.pageNum = pageNum;
- this.search({ pageNum: pageNum });
- },
- // 鏌ヨtable鍒楄〃
- search(pageNum) {
- this.fetchData();
- },
- fifterForm(params) {
- this.filterFrom = Object.assign(this.filterFrom, params);
- this.search(1);
- },
+ openImport(){
+ this.importOrg();
+ }
+
},
};
</script>
<style scoped lang="scss">
-.ml-20 {
- margin-left: 20px;
-}
-.card {
- display: flex;
- flex-wrap: wrap;
- margin: 0px !important;
- .cm-item {
- width: 100%;
- }
- .cm-item ::v-deep .el-card__body {
- padding-bottom: 5px;
- }
-}
-.card-data {
- position: relative;
- margin-top: 8px;
- .card-container {
- .card-header {
- height: 48px;
- display: flex;
- align-items: center;
- justify-content: space-between;
- background: #f3f9fe;
- padding: 0 32px 0 15px;
- box-sizing: border-box;
- }
- .card-header-left {
- display: flex;
- align-items: center;
- color: #999999;
- font-family: 'Microsoft YaHei UI';
- font-size: 18px;
- font-weight: 700;
- .value {
- color: #3d3d3d;
- }
-
- .states {
- width: 54px;
- height: 22px;
- line-height: 22px;
- text-align: center;
- border-radius: 4px;
- border: 1px solid #f9675b99;
- background: #f9675b1a;
- font-family: 'Microsoft YaHei';
- color: #f9675b;
- font-size: 13px;
- font-style: normal;
- font-weight: 400;
- margin-left: 8px;
- }
- .states-income {
- border: 1px solid #39ad6199;
- background: #39ad610f;
- color: #39ad61;
- }
- }
- .one-hed {
- margin-top: 15px;
- padding: 0 32px 0 15px;
- box-sizing: border-box;
- .box {
- display: inline-block;
- margin-right: 20px;
- }
- .span-two {
- color: #83919e;
- font-size: 14px;
- }
- }
- .card-end {
- font-size: 14px;
- color: #3d3d3d;
- margin-top: 15px;
- display: flex;
- flex-wrap: wrap;
- font-family: 'Microsoft YaHei UI';
- padding: 0 16px;
- box-sizing: border-box;
- .item {
- width: 379px;
- height: 60px;
- padding: 8px 12px 9px 12px;
- box-sizing: border-box;
- align-items: center;
- gap: 8px;
- flex-shrink: 0;
- background: #f9f9f9;
- margin-right: 15px;
- margin-bottom: 15px;
- &:last-child {
- margin-right: 0;
- }
- .name {
- height: 22px;
- line-height: 22px;
- }
- .value-box {
- display: flex;
- .value-box-item {
- margin-right: 20px;
- .label {
- color: #99999999;
- line-height: 22px;
- }
- .value {
- color: #ff3131;
- }
- }
- }
- }
- }
- }
-}
+@import url(../../index.scss);
</style>
--
Gitblit v1.9.1