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 | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
index 9b4f879..b994d13 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -21,8 +21,21 @@
<div class="card-header-left">
<span>鍒嗗彂鍗曞彿锛�</span>
<span class="value">{{ item.businessFormCode }}</span>
+
+ <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">
+ <!-- 瀵煎嚭鍗曞瓙 -->
+ <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>
@@ -30,9 +43,9 @@
</div>
<div class="one-hed">
<div class="box"><span class="span-two">閮ㄩ棬锛�</span>{{ item.inWarehouseName }}</div>
- <div class="box"><span class="span-two">棰嗗彇浜猴細</span>{{ item.inOperatorName }}</div>
+ <div class="box"><span class="span-two">鍒嗗彂浜猴細</span>{{ item.outOperatorName }}</div>
<div class="box">
- <span class="span-two">棰嗗彇鏃堕棿锛�</span>{{ item.createTime | formatTime }}
+ <span class="span-two">鍒嗗彂鏃堕棿锛�</span>{{ item.inTime | formatTime }}
</div>
</div>
<div class="card-end">
@@ -67,6 +80,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"
@@ -91,13 +114,14 @@
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
+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,
@@ -114,7 +138,7 @@
},
{
type: 'select',
- dataIndex: 'inAgencyId',
+ dataIndex: 'departmentId',
label: '鍒嗗彂閮ㄩ棬',
placeholder: '璇烽�夋嫨',
optionsConfig: {
@@ -135,7 +159,7 @@
optionsConfig: {
label: 'goodsName',
value: 'id',
- url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+ url: SettingIplatform.apiBaseURL + `/pc/base/goods/template/query/goodsTemplate?tenantId=${getUserDetail().tenantId}`,
},
},
{
@@ -179,11 +203,7 @@
this.total = res.totalRows;
this.loading = false;
});
- },
- fifterForm(params) {
- this.filterFrom = Object.assign(this.filterFrom, params);
- this.search(1);
- },
+ }
},
};
</script>
--
Gitblit v1.9.1