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/disDetails/index.vue | 50 +++++++++++++++++++-------------------------------
1 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
index e65a243..3dc5876 100644
--- a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
@@ -29,6 +29,7 @@
import edit from './edit';
import detail from '../distribution/detail';
import * as DateFormatter from "@/utils/DateFormatter";
+import {getUserDetail} from "@/utils/auth";
export default {
name: 'index',
@@ -45,43 +46,17 @@
defaultValue: '',
},
{
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- cascader: [
- {key: 'inWarehouseId', queryKey: 'tenantId'},
- {key: 'goodsTemplateId', queryKey: 'agencyId'}
- ],
- optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
- defaultValue: '',
- options: [],
- },
- {
- type: 'select',
- dataIndex: 'inWarehouseId',
- label: '閮ㄩ棬',
- placeholder: '璇烽�夋嫨',
- optionsConfig: {
- url: `/pc/fin/sys/tenant/department/list/all`,
- label: 'name',
- value: 'id',
- },
- defaultValue: '',
- options: [],
- },
- {
type: 'select',
dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
- placeholder: '璇疯緭鍏�',
+ placeholder: '璇烽�夋嫨',
defaultValue: '',
options: [],
cascader: [{key: 'goodsModelId', queryKey: 'goodsTemplatesId'}],
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}`,
},
},
{
@@ -98,8 +73,21 @@
},
},
{
+ type: 'select',
+ dataIndex: 'departmentId',
+ label: '閮ㄩ棬',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: {
+ url: `/pc/fin/sys/tenant/department/list/all?tenantId=${getUserDetail().tenantId}`,
+ label: 'name',
+ value: 'id',
+ },
+ defaultValue: '',
+ options: [],
+ },
+ {
type: 'text',
- dataIndex: 'name',
+ dataIndex: 'operatorName',
label: '鍒涘缓浜�',
placeholder: '璇疯緭鍏�',
defaultValue: '',
@@ -165,7 +153,7 @@
},
{title: '瑙勬牸鍨嬪彿', field: 'goodsModelName', align: 'left', minWidth: 130},
{title: '鍒嗗彂鏁伴噺', field: 'goodsCount', align: 'center'},
- {title: '鎵�灞炴満鏋�', field: 'tenantName', align: 'left', minWidth: 130},
+ /*{title: '鎵�灞炴満鏋�', field: 'tenantName', align: 'left', minWidth: 130},*/
{title: '閮ㄩ棬', field: 'departmentName', align: 'left', minWidth: 130},
{title: '鍒嗗彂浜�', field: 'operatorName', align: 'center'},
{
@@ -231,7 +219,7 @@
// 鏌ヨtable鍒楄〃
search(pageNum) {
if (pageNum != undefined) {
- this.$refs.myTable.search(pageNum);
+ this.$refs.myTable.search({pageNum});
} else {
this.$refs.myTable.search();
}
--
Gitblit v1.9.1