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 | 362 +++++++++++++++++++++++++--------------------------
1 files changed, 179 insertions(+), 183 deletions(-)
diff --git a/admin-web/src/views/stock/transfer/transferApplication/index.vue b/admin-web/src/views/stock/transfer/transferApplication/index.vue
index fe44d28..3b16249 100644
--- a/admin-web/src/views/stock/transfer/transferApplication/index.vue
+++ b/admin-web/src/views/stock/transfer/transferApplication/index.vue
@@ -9,11 +9,11 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <div class="table-tool-bar" style="margin-bottom: 15px;">
- <my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
+ <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">
- <el-row class="card" :gutter="5">
+ <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">
<div class="card-container">
@@ -21,26 +21,76 @@
<div class="card-header-left">
<span>璋冩嫧鍗曞彿锛�</span>
<span class="value">{{ item.businessFormCode }}</span>
+ <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 site="form" type="success" size="mini" @click="handleExport(item)"
- >瀵煎嚭璋冩嫧鍗�</el-button
- >
+ <el-button
+ v-if="item.states == 1"
+ site="form"
+ type="success"
+ size="mini"
+ @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"
+ type="danger"
+ size="mini"
+ @click="handleRevoke(item)"
+ >鎾ら攢</el-button
+ >
+ <el-button
+ v-if="item.states == 2"
+ site="form"
+ type="primary"
+ size="mini"
+ @click="handleExport('transferExport',`璋冩嫧鍏ュ簱鍗�-${item.businessFormCode}`,{id:item.id,type: 1})"
+ >瀵煎嚭璋冩嫧鍏ュ簱鍗�</el-button
+ >
<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.inAgencyName }}</div>
+ <div class="box"><span class="span-two">鐢宠浜猴細</span>{{ item.operatorName }}</div>
<div class="box">
- <span class="span-two">璋冩嫧鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
+ <span class="span-two">鐢宠璋冩嫧鏃堕棿锛�</span>{{ item.createTime | 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>
+ <div class="box"><span class="span-two">璋冩嫧浜猴細</span>{{ item.outOperatorName }}</div>
+ <div class="box">
+ <span class="span-two">璋冩嫧鏃堕棿锛�</span>{{ item.outputTime | 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>
@@ -54,6 +104,7 @@
</el-card>
</el-col>
</el-row>
+ <el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
</div>
<el-pagination
:small="false"
@@ -69,34 +120,53 @@
</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"></edit>
- <detail ref="detailRef"></detail>
- <my-import
- :import-setting="importSetting"
- :dialog-show="importSetting.dialogShow"
- :dialog-title="importSetting.dialogTitle"
- />
+ <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>
</div>
</template>
<script>
-import { procureList, procureDel, procureIncome } from '@/api/stock/procure/purchaseOrder';
+import {transfeIncome, transferList, transferUpdStatus} 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 * as DateFormatter from '@/utils/DateFormatter';
+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',
- components: { MyButton, myImport, edit, detail },
+ mixins: [listPage, transfer],
+ components: { MyButton, myImport, edit, detail,uploadPage },
data() {
return {
loading: false,
- adddialog: false,
list: [],
// 鎼滅储妗�
items: [
@@ -108,27 +178,17 @@
defaultValue: '',
},
{
- type: 'text',
- dataIndex: 'goodsTemplateName',
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
- placeholder: '鍙ā绯婃悳绱�',
- defaultValue: '',
- },
- {
- type: 'select',
- dataIndex: 'name',
- label: '璋冩嫧鏈烘瀯',
- placeholder: '璇烽�夋嫨',
+ placeholder: '璇疯緭鍏�',
defaultValue: '',
options: [],
- },
- {
- type: 'select',
- dataIndex: 'name',
- label: '鎺ユ敹鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- defaultValue: '',
- options: [],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ },
},
{
type: 'select',
@@ -136,102 +196,52 @@
label: '鐘舵��',
placeholder: '璇烽�夋嫨',
defaultValue: '',
- options: [
- {
- label: '鍏ㄩ儴',
- value: '',
- },
- {
- label: '寰呰皟鎷�',
- value: '1',
- },
- {
- label: '宸茶皟鎷�',
- value: '2',
- },
- ],
+ options: [],
},
{
type: 'date-picker',
- dataIndex: 'val1',
+ dataIndex: 'createTimeStart',
label: '鐢宠鏃堕棿',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'val2',
+ dataIndex: 'createTimeEnd',
label: '鑷�',
defaultValue: '',
},
{
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', // 涓婁紶鍦板潃
- accept: '.xls', // 鏍煎紡
- type: 'text', // 鍥炴樉褰㈠紡
- loading: false, // 瀵煎叆鏁堟灉
- },
- /* 妯℃澘涓嬭浇 */
- templateSettings: {
- templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate', // 涓嬭浇鍦板潃
- },
- onSuccess: null,
- },
- editSetting: {
- title: '',
- id: '',
- orgId: '',
- show: false,
- },
- pageNum: 1,
- pageSize: 10,
- total: 0,
+ filterFrom: {},
};
},
- computed: {
- clientHeight() {
- return document.documentElement.clientHeight;
- },
- },
- filters: {
- formatTime(time) {
- if (!time) return;
- return DateFormatter.LongToDateTime(time);
- },
- },
created() {
+ this.filterFrom = {
+ inAgencyId: this.userInfo.tenantId,
+ };
this.fetchData();
+ this.items.map((v) => {
+ if (v.label == '鐘舵��') {
+ v.options = this.statesOptions;
+ }
+ return v;
+ });
},
methods: {
fetchData() {
this.loading = true;
- procureList({
+ transferList({
pageNum: this.pageNum,
pageSize: this.pageSize,
...this.filterFrom,
@@ -239,86 +249,72 @@
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();
- };
- },
- // 瀵煎嚭
- handleExport() {},
- // 鏂板
- handleAdd() {
- this.editSetting.id = null;
- this.editSetting.info = null;
- this.editSetting.title = '鏂板';
- this.editSetting.show = true;
- },
- // 缂栬緫
- handleEdit(row) {
- this.editSetting.id = row.id;
- this.editSetting.info = null;
- this.editSetting.title = '缂栬緫';
- this.editSetting.show = true;
- },
- // 璇︽儏
- 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('璋冩嫧鎴愬姛锛�');
- this.search();
- });
- })
- .catch(() => {});
+ 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();
+ }
+ },
+ });
},
- del(row) {
- this.$modal
- .confirm('鏄惁纭鍒犻櫎璋冩嫧鍗曞彿涓�"' + row.businessFormCode + '"鐨勬暟鎹悧锛�')
- .then(function () {
- procureDel({ id: row.id }).then((res) => {});
- })
+
+ // 鎾ら攢
+ handleRevoke(row) {
+ this.$confirm(`鎮ㄧ‘瀹氭挙閿�鍗曞彿涓�"${row.businessFormCode}" 鐨勬暟鎹悧?`, '鎾ら攢').then(() => {
+ transferUpdStatus({ id: row.id }).then((res) => {
+ this.$message.success('鎾ら攢鎴愬姛锛�');
+ 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) => {
- this.$message.success('鍒犻櫎鎴愬姛锛�');
- this.search();
+ console.log(res)
+ downLoad(res)
+ this.$message.success('瀵煎嚭鎴愬姛锛�');
+ loading.close();
})
- .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();
- },
- refreshData() {
- this.pageNum = 1;
- this.pageSize = 10;
- this.search();
- },
- fifterForm(params) {
- this.filterFrom = Object.assign(this.filterFrom, params);
- this.search(1);
+ .catch(() => {
+ loading.close();
+ });
},
},
};
--
Gitblit v1.9.1