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/stock/transfer/transferissue/index.vue | 124 +++++++++++++++++++----------------------
1 files changed, 58 insertions(+), 66 deletions(-)
diff --git a/admin-web/src/views/stock/transfer/transferissue/index.vue b/admin-web/src/views/stock/transfer/transferissue/index.vue
index f938a91..a004a19 100644
--- a/admin-web/src/views/stock/transfer/transferissue/index.vue
+++ b/admin-web/src/views/stock/transfer/transferissue/index.vue
@@ -9,7 +9,7 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <div :style="{ 'overflow-y': 'auto', height: `${clientHeight - 320}px` }" v-loading="loading">
+ <div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }" 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">
@@ -18,28 +18,29 @@
<div class="card-header-left">
<span>璋冩嫧鍗曞彿锛�</span>
<span class="value">{{ item.businessFormCode }}</span>
- <div v-if="item.states == 0" class="states states-warning">寰呭嚭搴�</div>
+ <div v-if="item.states == 0 && item.procureDoc !=null" class="states states-warning">寰呭嚭搴�</div>
+ <div v-if="item.states == 0 && item.procureDoc ==null" class="states states-warning">寰呮彁浜�</div>
<div v-if="item.states == 1" class="states states-warning">寰呮帴鏀�</div>
<div v-if="item.states == 2" class="states states-success">宸叉帴鏀�</div>
<div v-if="item.states == 4" class="states states-info">宸叉挙閿�</div>
</div>
<div class="card-header-right">
- <el-button v-if="item.states == 1" site="form" type="success" size="mini"
- >瀵煎嚭璋冩嫧鍑哄簱鍗�</el-button
- >
<el-button
- v-if="item.states == 0"
- site="form"
- type="success"
- size="mini"
- @click="handleOutput(item)"
- >鍑哄簱</el-button
+ v-if="item.states == 0 && item.procureDoc !=null"
+ site="form"
+ type="success"
+ size="mini"
+ @click="handleOutput(item)"
+ >鍑哄簱
+ </el-button
>
<el-button v-if="item.states == 2" site="form" type="primary" size="mini"
- >瀵煎嚭璋冩嫧鍏ュ簱鍗�</el-button
- >
+ @click="handleExport('transferExport',`璋冩嫧鍑哄簱鍗�-${item.businessFormCode}`,{id:item.id,type: 2})">
+ 瀵煎嚭璋冩嫧鍑哄簱鍗�
+ </el-button>
<el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
- >鏌ョ湅璇︽儏</el-button
+ >鏌ョ湅璇︽儏
+ </el-button
>
</div>
</div>
@@ -50,14 +51,14 @@
<span class="span-two">鐢宠璋冩嫧鏃堕棿锛�</span>{{ item.createTime | formatTime }}
</div>
<div class="box">
- <span class="span-two">鎺ユ敹鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
+ <span class="span-two">鎺ユ敹鏃堕棿锛�</span>{{ item.inTime | formatTime }}
</div>
</div>
<div class="one-hed">
<div class="box"><span class="span-two">璋冩嫧鏈烘瀯锛�</span>{{ item.outAgencyName }}</div>
<div class="box"><span class="span-two">璋冩嫧浜猴細</span>{{ item.outOperatorName }}</div>
<div class="box">
- <span class="span-two">璋冩嫧鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
+ <span class="span-two">璋冩嫧鏃堕棿锛�</span>{{ item.outputTime | formatTime }}
</div>
</div>
<div class="card-end">
@@ -76,48 +77,48 @@
</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>
<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>
</div>
</template>
<script>
-import { transferList, transferOutput } from '@/api/stock/transfer';
+import {transferList, transferOutput} from '@/api/stock/transfer';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import detail from './detail';
-import listPage from '../../../mixins/listPage';
-import transfer from '../../../mixins/transfer';
-import { commonsApi } from '@/api/commonsApi';
+import listPage from '@/views/mixins/listPage';
+import transfer from '@/views/mixins/transfer';
+import {commonsApi} from '@/api/commonsApi';
+import SettingIplatform from '@/utils/settingIplatform';
export default {
name: 'index',
mixins: [listPage, transfer],
- components: { MyButton, myImport, detail },
+ components: {MyButton, myImport, detail},
data() {
return {
loading: false,
- adddialog: false,
list: [],
// 鎼滅储妗�
items: [
@@ -129,18 +130,25 @@
defaultValue: '',
},
{
- type: 'text',
- dataIndex: 'goodsTemplateName',
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
- placeholder: '鍙ā绯婃悳绱�',
+ placeholder: '璇疯緭鍏�',
defaultValue: '',
+ options: [],
+ cascader: [{key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId'}],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
},
{
type: 'cascader',
dataIndex: 'inAgencyId',
label: '鎺ユ敹鏈烘瀯',
placeholder: '璇烽�夋嫨',
- optionsConfig: { url: commonsApi.cascader_tree_fin_tenant, props: null },
+ optionsConfig: {url: commonsApi.cascader_tree_fin_tenant, props: null},
defaultValue: '',
options: [],
},
@@ -195,6 +203,7 @@
fetchData() {
this.loading = true;
transferList({
+ qryType: 0,
pageNum: this.pageNum,
pageSize: this.pageSize,
...this.filterFrom,
@@ -202,7 +211,6 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
- console.log(this.list);
});
},
handleOutput(row) {
@@ -211,37 +219,21 @@
if (action == 'confirm') {
instance.confirmButtonLoading = true;
instance.confirmButtonText = '鎵ц涓�...';
- transferOutput({ id: row.id })
- .then((res) => {
- this.$message.success('璋冩嫧鍑哄簱鎴愬姛锛�');
- done();
- instance.confirmButtonLoading = false;
- this.search(1);
- })
- .catch(() => {
- done();
- });
+ transferOutput({id: row.id})
+ .then((res) => {
+ this.$message.success('璋冩嫧鍑哄簱鎴愬姛锛�');
+ done();
+ instance.confirmButtonLoading = false;
+ this.search(1);
+ })
+ .catch(() => {
+ done();
+ });
} else {
done();
}
},
});
- },
- fifterForm(params) {
- this.filterFrom = Object.assign(this.filterFrom, params);
- if (this.filterFrom.createTimeStart) {
- this.filterFrom.createTimeStart = this.filterFrom.createTimeStart.replace(/\-/g, '');
- }
- if (this.filterFrom.createTimeEnd) {
- this.filterFrom.createTimeEnd = this.filterFrom.createTimeEnd.replace(/\-/g, '');
- }
- if (this.filterFrom.startTime) {
- this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
- }
- if (this.filterFrom.endTime) {
- this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
- }
- this.search(1);
},
},
};
--
Gitblit v1.9.1