From fa3a13b43cdcd3bcc42abae4d9c0a67e48ebea41 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 16:05:41 +0800
Subject: [PATCH] feat: bug修复 12536
---
admin-web/src/views/stock/transfer/transferApplication/index.vue | 118 ++++++++++++++++++++++------------------------------------
1 files changed, 45 insertions(+), 73 deletions(-)
diff --git a/admin-web/src/views/stock/transfer/transferApplication/index.vue b/admin-web/src/views/stock/transfer/transferApplication/index.vue
index 64f853c..af1e2c1 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/index.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/index.vue
@@ -12,7 +12,7 @@
<div class="table-tool-bar" style="margin-bottom: 15px">
<my-button name="璋冩嫧鐢宠" icon="el-icon-plus" @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 - 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">
@@ -48,7 +48,7 @@
site="form"
type="primary"
size="mini"
- @click="handleExport(item)"
+ @click="handleExport('transferExport',`璋冩嫧鍏ュ簱鍗�-${item.businessFormCode}`,{id:item.id,type: 1})"
>瀵煎嚭璋冩嫧鍏ュ簱鍗�</el-button
>
<el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
@@ -62,9 +62,7 @@
<div class="box">
<span class="span-two">鐢宠璋冩嫧鏃堕棿锛�</span>{{ item.createTime | formatTime }}
</div>
- <div class="box">
- <span class="span-two">鎺ユ敹鏃堕棿锛�</span>{{ item.inTime | formatTime }}
- </div>
+ <div class="box"><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>
@@ -89,7 +87,7 @@
</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"
@@ -123,14 +121,14 @@
</template>
<script>
-import { transferList, transferUpdStatus, transfeIncome, transferExport } from '@/api/stock/transfer';
+import {transfeIncome, transferList, transferUpdStatus} from '@/api/stock/transfer';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
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 SettingIplatform from '@/utils/settingIplatform';
export default {
name: 'index',
@@ -139,7 +137,6 @@
data() {
return {
loading: false,
- adddialog: false,
list: [],
// 鎼滅储妗�
items: [
@@ -151,29 +148,17 @@
defaultValue: '',
},
{
- type: 'text',
- dataIndex: 'goodsTemplateName',
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
- placeholder: '鍙ā绯婃悳绱�',
- defaultValue: '',
- },
- {
- type: 'cascader',
- dataIndex: 'outAgencyId',
- label: '璋冩嫧鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: { url: commonsApi.cascader_tree_fin_tenant, props: null },
+ placeholder: '璇疯緭鍏�',
defaultValue: '',
options: [],
- },
- {
- type: 'cascader',
- dataIndex: 'inAgencyId',
- label: '鎺ユ敹鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: { url: commonsApi.cascader_tree_fin_tenant, props: null },
- defaultValue: '',
- options: [],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
},
{
type: 'select',
@@ -208,14 +193,13 @@
defaultValue: '',
},
],
- filterFrom:{
- }
+ filterFrom: {},
};
},
created() {
this.filterFrom = {
- operatorId:this.userInfo.id
- }
+ inAgencyId: this.userInfo.tenantId,
+ };
this.fetchData();
this.items.map((v) => {
if (v.label == '鐘舵��') {
@@ -235,53 +219,41 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
- console.log(this.list);
- });
- },
-
- // 鍏ュ簱
- handleIncome(row) {
- this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 璋冩嫧鍑哄簱鍚�?`, '璋冩嫧鍑哄簱').then(() => {
- transfeIncome({ id: row.id })
- .then((res) => {
- this.$message.success('璋冩嫧鍑哄簱鎴愬姛锛�');
- this.search(1);
- })
});
},
- // 瀵煎嚭
- handleExport(row) {
- transferExport({id:row.id}).then(res=>{
-
- })
+ // 鍏ュ簱
+ handleIncome(row) {
+ this.$confirm(`鎮ㄧ‘瀹� 鍗曞彿锛�${row.businessFormCode} 鎺ユ敹鍏ュ簱鍚�?`, '鎺ユ敹鍏ュ簱', {
+ beforeClose: (action, instance, done) => {
+ if (action == 'confirm') {
+ instance.confirmButtonLoading = true;
+ instance.confirmButtonText = '鎵ц涓�...';
+ transfeIncome({ id: row.id })
+ .then((res) => {
+ this.$message.success('鎺ユ敹鍏ュ簱鎴愬姛锛�');
+ done();
+ instance.confirmButtonLoading = false;
+ this.search(1);
+ })
+ .catch(() => {
+ done();
+ });
+ } else {
+ done();
+ }
+ },
+ });
},
// 鎾ら攢
handleRevoke(row) {
this.$confirm(`鎮ㄧ‘瀹氭挙閿�鍗曞彿涓�"${row.businessFormCode}" 鐨勬暟鎹悧?`, '鎾ら攢').then(() => {
- transferUpdStatus({ id: row.id })
- .then((res) => {
- this.$message.success('鎾ら攢鎴愬姛锛�');
- this.search(1);
- })
+ transferUpdStatus({ id: row.id }).then((res) => {
+ this.$message.success('鎾ら攢鎴愬姛锛�');
+ this.search(1);
+ });
});
- },
- 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