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/transferApplication/index.vue | 136 ++++++++++++++++++++++++++++++++-------------
1 files changed, 97 insertions(+), 39 deletions(-)
diff --git a/admin-web/src/views/stock/transfer/transferApplication/index.vue b/admin-web/src/views/stock/transfer/transferApplication/index.vue
index 497b784..3b16249 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">
@@ -21,7 +21,8 @@
<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>
@@ -35,6 +36,22 @@
@click="handleIncome(item)"
>鍏ュ簱</el-button
>
+
+ <el-button v-if="item.states == 0 && item.procureDoc ==null" site="form" type="primary" size="mini"
+ @click="handleExport('transferExport',`璋冩嫧鍗�-${item.businessFormCode}`, {id:item.id,type:0})"
+ >涓嬭浇
+ </el-button
+ >
+
+ <el-button
+ v-if="item.states == 0 && item.procureDoc ==null"
+ site="form"
+ type="primary"
+ size="mini"
+ @click="handleUploadPage(item)"
+ >涓婁紶</el-button
+ >
+
<el-button
v-if="item.states == 0"
site="form"
@@ -48,7 +65,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)"
@@ -87,7 +104,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"
@@ -103,6 +120,16 @@
</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"
@@ -121,23 +148,25 @@
</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';
+import uploadPage from './uploadPage';
+import * as dataExport from "@/api/exportExcel";
+import {downLoad} from "@/utils/base";
export default {
name: 'index',
mixins: [listPage, transfer],
- components: { MyButton, myImport, edit, detail },
+ components: { MyButton, myImport, edit, detail,uploadPage },
data() {
return {
loading: false,
- adddialog: false,
list: [],
// 鎼滅储妗�
items: [
@@ -149,11 +178,17 @@
defaultValue: '',
},
{
- type: 'text',
- dataIndex: 'goodsTemplateName',
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
- placeholder: '鍙ā绯婃悳绱�',
+ placeholder: '璇疯緭鍏�',
defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
},
{
type: 'select',
@@ -214,23 +249,31 @@
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);
- });
+ 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();
+ }
+ },
});
- },
-
- // 瀵煎嚭
- handleExport(row) {
- transferExport({ id: row.id }).then((res) => {});
},
// 鎾ら攢
@@ -242,21 +285,36 @@
});
});
},
- 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);
+ // 瀵煎叆
+ handleUploadPage(row) {
+ this.uploadPageSetting.id = row.id;
+ this.uploadPageSetting.title = '瀵煎叆';
+ this.uploadPageSetting.show = true;
+ },
+ /**
+ * 瀵煎嚭璋冩嫧鍏ュ簱鍗�
+ * @param api
+ * @param fileName
+ * @param params
+ */
+ handleExport(api, fileName, params) {
+ let loading = this.$loading({
+ lock: true,
+ text: '瀵煎嚭涓紝璇风◢鍊�...',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)',
+ });
+ // 鍒ゆ柇鎬绘潯鏁版槸鍚﹀ぇ浜庢渶澶ф敮鎸佹潯鏁�
+ dataExport[api](params)
+ .then((res) => {
+ console.log(res)
+ downLoad(res)
+ this.$message.success('瀵煎嚭鎴愬姛锛�');
+ loading.close();
+ })
+ .catch(() => {
+ loading.close();
+ });
},
},
};
--
Gitblit v1.9.1