From b4adff68a07b783fc90da1c9370d8be5f383e700 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期三, 08 五月 2024 13:46:34 +0800
Subject: [PATCH] 20240528修改: bug41、42、43修改 领用单(分发单)，调拨单，流程优化
---
admin-web/src/views/departmentitem/itemdis/distribution/index.vue | 275 +++++++++++++++++++-----------------------------------
1 files changed, 99 insertions(+), 176 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
index 0c1733b..b994d13 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -10,57 +10,47 @@
<el-col>
<!--鍒楄〃-->
<div class="table-tool-bar" style="margin-bottom: 15px">
- <my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
- <my-button name="瀵煎叆" @click="importSetting.dialogShow = true" site="tools" size="medium" />
+ <my-button name="鏂板" @click="handleAdd" site="tools" size="medium"/>
</div>
- <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
+ <div :style="{ 'overflow-y': 'auto', height: `calc(100vh - 320px)` }" v-loading="loading">
<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>鍒嗗彂鍗曞彿锛�</span>
<span class="value">{{ item.businessFormCode }}</span>
- <div class="states" :class="item.states == 1 ? '' : 'states-success'">
- {{ item.states == 1 ? '寰呭叆搴�' : '宸插叆搴�' }}
- </div>
+
+ <span style="padding-left: 30px">鍒嗗彂鐘舵�侊細</span>
+ <span style="color: red" v-if="item.states === 0" class="value">鏈垎鍙�</span>
+ <span v-if="item.states === 2" class="value">宸插垎鍙�</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(item)"
- >瀵煎嚭鍏ュ簱鍗�</el-button
- >
- </template>
- <el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
- >鏌ョ湅璇︽儏</el-button
- >
+ <!-- 瀵煎嚭鍗曞瓙 -->
+ <el-button v-if="item.states === 0" name="涓嬭浇" site="form" type="primary" size="mini" @click="handleDetail(item)">
+ 涓嬭浇
+ </el-button>
+
+ <el-button v-if="item.states === 0" name="涓婁紶" site="form" type="primary" size="mini" @click="handleUploadPage(item)">
+ 涓婁紶
+ </el-button>
+
+ <el-button name="鏌ョ湅璇︽儏" site="form" type="primary" 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.inWarehouseName }}</div>
+ <div class="box"><span class="span-two">鍒嗗彂浜猴細</span>{{ item.outOperatorName }}</div>
<div class="box">
- <span class="span-two">閲囪喘鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
- </div>
- <div class="box">
- <span class="span-two">鍏ュ簱鏃堕棿锛�</span>{{ item.incomeTime | formatTime }}
+ <span class="span-two">鍒嗗彂鏃堕棿锛�</span>{{ item.inTime | 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 v-for="(just, index) in item.fromTransferTemplateInfoList" :key="index" class="item">
+ <div class="name">{{ just.goodsName }}</div>
<div class="value-box">
<div class="value-box-item">
<span class="label">鏁伴噺锛�</span>
@@ -74,58 +64,64 @@
</el-card>
</el-col>
</el-row>
- <div class="no-data" v-else>鏆傛棤鏁版嵁</div>
+ <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
</div>
<el-pagination
- :small="false"
- :current-page="pageNum"
- :page-sizes="[5, 10, 20, 50, 100, 200, 300, 400, 500]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
+ :small="false"
+ :current-page="pageNum"
+ :page-sizes="[5, 10, 20, 50, 100, 200, 300, 400, 500]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
/>
</el-col>
</el-row>
</el-card>
</el-container>
+
+ <!-- 涓婁紶鍒嗗彂鍗曟枃浠�-->
+ <uploadPage
+ v-if="uploadPageSetting.show"
+ :setting="uploadPageSetting"
+ ref="uploadRef"
+ @close="uploadPageSetting.show = false"
+ @search="refreshData"
+ ></uploadPage>
+
<!--娣诲姞/缂栬緫寮圭獥-->
<edit
- v-if="editSetting.show"
- :setting="editSetting"
- ref="editRef"
- @close="editSetting.show = false"
- @search="refreshData"
+ 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"
+ v-if="detailSetting.show"
+ :setting="detailSetting"
+ @close="detailSetting.show = false"
+ ref="detailRef"
></detail>
- <my-import
- :import-setting="importSetting"
- :dialog-show="importSetting.dialogShow"
- :dialog-title="importSetting.dialogTitle"
- />
</div>
</template>
<script>
-import { procureList, procureDel, procureIncome } from '@/api/stock/procure/purchaseOrder';
+import {transferList} from '@/api/stock/transfer';
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 listPage from '../../../mixins/listPage'
+import uploadPage from './uploadPage';
+import listPage from '@/views/mixins/listPage';
+import {getUserDetail} from "@/utils/auth";
export default {
name: 'index',
mixins: [listPage],
- components: { MyButton, myImport, edit, detail },
+ components: {MyButton, myImport, edit, detail,uploadPage},
data() {
return {
loading: false,
@@ -136,155 +132,82 @@
{
type: 'text',
dataIndex: 'businessFormCode',
- label: '鍏ュ簱鍗曞彿',
- placeholder: '璇疯緭鍏�',
- defaultValue: '',
- },
- {
- type: 'text',
- dataIndex: 'goodsTemplateName',
- label: '鐗╁搧鍚嶇О',
- placeholder: '鍙ā绯婃悳绱�',
- defaultValue: '',
- },
- {
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
- defaultValue: '',
- options: [],
- },
- {
- type: 'text',
- dataIndex: 'createName',
- label: '鍒涘缓浜�',
+ label: '鍒嗗彂鍗曞彿',
placeholder: '璇疯緭鍏�',
defaultValue: '',
},
{
type: 'select',
- dataIndex: 'states',
- label: '鐘舵��',
+ dataIndex: 'departmentId',
+ label: '鍒嗗彂閮ㄩ棬',
placeholder: '璇烽�夋嫨',
+ optionsConfig: {
+ url: `/pc/fin/sys/tenant/department/list/all?tenantId=${getUserDetail().tenantId}`,
+ label: 'name',
+ value: 'id',
+ },
defaultValue: '',
- options: [
- {
- label: '鍏ㄩ儴',
- value: '',
- },
- {
- label: '寰呭叆搴�',
- value: '1',
- },
- {
- label: '宸插叆搴�',
- value: '2',
- },
- ],
+ options: [],
},
{
- type: 'date-picker',
- dataIndex: 'incomeTimeStart',
- label: '鍏ュ簱鏃堕棿',
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
+ label: '鐗╁搧鍚嶇О',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + `/pc/base/goods/template/query/goodsTemplate?tenantId=${getUserDetail().tenantId}`,
+ },
+ },
+ {
+ type: 'text',
+ dataIndex: 'operatorName',
+ label: '棰嗗彇浜�',
+ placeholder: '璇疯緭鍏�',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeEnd',
+ dataIndex: 'startTime',
+ label: '棰嗗彇鏃堕棿',
+ defaultValue: '',
+ },
+ {
+ type: 'date-picker',
+ dataIndex: 'endTime',
label: '鑷�',
defaultValue: '',
},
],
// 鏍戞暟鎹�
- treeDataList: [],
- // 瀵煎叆
- importSetting: {
- dialogTitle: '瀵煎叆',
- dialogShow: false,
- fileSettings: {
- data: {},
- uploadUrl: getBaseUrl() + '/pc/fin/sys/tenant/import', // 涓婁紶鍦板潃
- accept: '.xls', // 鏍煎紡
- type: 'text', // 鍥炴樉褰㈠紡
- loading: false, // 瀵煎叆鏁堟灉
- },
- /* 妯℃澘涓嬭浇 */
- templateSettings: {
- templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate', // 涓嬭浇鍦板潃
- },
- onSuccess: null,
- },
+ treeDataList: []
};
+ },
+ created() {
+ this.fetchData()
},
methods: {
fetchData() {
this.loading = true;
- procureList({
+ transferList({
+ qryType: 1,
pageNum: this.pageNum,
pageSize: this.pageSize,
+ outAgencyId: this.userInfo.tenantId,
...this.filterFrom,
}).then((res) => {
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
- console.log(this.list);
});
- },
-
- //瀵煎叆
- importOrg() {
- this.importSetting.dialogShow = true;
- this.importSetting.onSuccess = (response, callBack) => {
- if (response.code === 1) {
- this.$message.success(response.msg);
- this.search(1);
- } else {
- this.$message.warning(response.msg);
- }
- callBack();
- };
- },
- // 鍏ュ簱
- handleIncome(row) {
- this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 鍏ュ簱鍚�?`, '閲囪喘鍏ュ簱').then(() => {
- procureIncome({ id: row.id })
- .then((res) => {
- this.$message.success('鍏ュ簱鎴愬姛锛�');
- this.search();
- })
- .catch(() => {});
- });
- },
- del(row) {
- this.$modal.confirm('鏄惁纭鍒犻櫎鍏ュ簱鍗曞彿涓�"' + row.businessFormCode + '"鐨勬暟鎹悧锛�').then( () => {
- procureDel({ id: row.id })
- .then((res) => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search();
- })
- .catch(() => {});
- });
- },
- fifterForm(params) {
- this.filterFrom = Object.assign(this.filterFrom, params);
- if (this.filterFrom.incomeTimeStart) {
- this.filterFrom.incomeTimeStart = this.filterFrom.incomeTimeStart.replace(/\-/g, '');
- }
- if (this.filterFrom.incomeTimeEnd) {
- this.filterFrom.incomeTimeEnd = this.filterFrom.incomeTimeEnd.replace(/\-/g, '');
- }
- if (this.filterFrom.agencyId && this.filterFrom.agencyId.length) {
- this.filterFrom.agencyId = this.filterFrom.agencyId[this.filterFrom.agencyId.length - 1];
- }
- this.search(1);
- },
+ }
},
};
</script>
<style scoped lang="scss">
-@import url(../../../../styles/store.scss);
+//@import url(../../../../styles/index.scss);
</style>
--
Gitblit v1.9.1