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 | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
index ce87e36..3dc5876 100644
--- a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
@@ -28,8 +28,6 @@
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit';
import detail from '../distribution/detail';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
-import {getBaseUrl} from '@/utils/base';
import * as DateFormatter from "@/utils/DateFormatter";
import {getUserDetail} from "@/utils/auth";
@@ -51,14 +49,14 @@
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}`,
},
},
{
@@ -75,22 +73,12 @@
},
},
{
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- cascader: [{key: 'inWarehouseId', queryKey: 'tenantId'}],
- optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
- defaultValue: '',
- options: [],
- },
- {
type: 'select',
- dataIndex: 'inWarehouseId',
+ dataIndex: 'departmentId',
label: '閮ㄩ棬',
placeholder: '璇烽�夋嫨',
optionsConfig: {
- url: `/pc/fin/sys/tenant/department/list/all`,
+ url: `/pc/fin/sys/tenant/department/list/all?tenantId=${getUserDetail().tenantId}`,
label: 'name',
value: 'id',
},
@@ -99,7 +87,7 @@
},
{
type: 'text',
- dataIndex: 'name',
+ dataIndex: 'operatorName',
label: '鍒涘缓浜�',
placeholder: '璇疯緭鍏�',
defaultValue: '',
@@ -157,7 +145,7 @@
// 鍒椾俊鎭�
columns: [
{title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130},
- {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 140},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 140},
{
title: '绫诲埆', field: 'type', align: 'center', formatter: (row) => {
return {value: row.type + '绫�'};
@@ -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'},
{
@@ -184,8 +172,8 @@
{
title: '浣跨敤浜�',
type: 'primary',
- hidden: (row) => {
- return row.type!=='A'
+ hidden: (row) => {
+ return row.type !== 'A'
},
events: (row) => {
this.handleEdit(row);
@@ -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