From b8dc4ccc6ee580b084aa860e64af2d90d1cb5979 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 10:11:52 +0800
Subject: [PATCH] feat: 1、首页接口对接 2、部门物品分发

---
 admin-web/src/views/departmentitem/itemdis/disDetails/index.vue |   48 ++++++++++++++++++++++++++++++------------------
 1 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
index edd496a..e8cdc6b 100644
--- a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
@@ -10,12 +10,12 @@
           <el-row style="margin-top: 15px">
             <el-col>
               <!--鍒楄〃-->
-              <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
+              <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
             </el-col>
           </el-row>
           <!--娣诲姞/缂栬緫寮圭獥-->
-          <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search" />
-          <detail v-if="detailSetting.show" :setting="detailSetting" @close="detailSetting.show = false" />
+          <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
+          <detail v-if="detailSetting.show" :setting="detailSetting" @close="detailSetting.show = false"/>
         </el-card>
       </el-container>
     </el-container>
@@ -29,11 +29,12 @@
 import edit from './edit';
 import detail from '../distribution/detail';
 import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { getBaseUrl } from '@/utils/base';
+import {getBaseUrl} from '@/utils/base';
+import * as DateFormatter from "@/utils/DateFormatter";
 
 export default {
   name: 'index',
-  components: { MyButton, MyTableV2, edit, detail },
+  components: {MyButton, MyTableV2, edit, detail},
   data() {
     return {
       // 鎼滅储妗�
@@ -65,7 +66,7 @@
           dataIndex: 'agencyId',
           label: '鏈烘瀯',
           placeholder: '璇烽�夋嫨',
-          optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+          optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null},
           defaultValue: '',
           options: [],
         },
@@ -120,7 +121,7 @@
       table: {
         showIndex: true, // 鏄惁鏄剧ず搴忓彿
         expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
-        url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+        url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/transfer/department/list', // 璇锋眰鍦板潃
         // 宸ュ叿鏉�
         tools: {
           columnsCtrl: {
@@ -136,20 +137,30 @@
         },
         // 鍒椾俊鎭�
         columns: [
-          { title: '鍗曞彿', field: 'code', align: 'center' },
-          { title: '鐗╁搧鍚嶇О', field: 'lv', align: 'center' },
-          { title: '绫诲埆', field: 'lv', align: 'center' },
-          { title: '瑙勬牸鍨嬪彿', field: 'lv', align: 'center' },
-          { title: '鍒嗗彂鏁伴噺', field: 'summary', align: 'left' },
-          { title: '鎵�灞炴満鏋�', field: 'summary', align: 'left' },
-          { title: '閮ㄩ棬', field: 'summary', align: 'left' },
-          { title: '鍒嗗彂浜�', field: 'summary', align: 'left' },
-          { title: '鎿嶄綔鏃堕棿', field: 'summary', align: 'left' },
+          {title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130},
+          {title: '鐗╁搧鍚嶇О', field: 'goodsName', align:  'left', minWidth: 140},
+          {
+            title: '绫诲埆', field: 'type', align: 'center', formatter: (row) => {
+              return {value: row.type + '绫�'};
+            },
+          },
+          {title: '瑙勬牸鍨嬪彿', field: 'goodsModelName', align: 'left', minWidth: 130},
+          {title: '鍒嗗彂鏁伴噺', field: 'goodsCount', align: 'center'},
+          {title: '鎵�灞炴満鏋�', field: 'tenantName', align: 'left', minWidth: 130},
+          {title: '閮ㄩ棬', field: 'departmentName', align: 'left', minWidth: 130},
+          {title: '鍒嗗彂浜�', field: 'operatorName', align: 'center'},
+          {
+            title: '鎿嶄綔鏃堕棿', field: 'createTime', align: 'center',
+            width: 160,
+            formatter: (row) => {
+              return {value: DateFormatter.LongToDateTime(row.createTime)};
+            },
+          },
         ],
         // 鎿嶄綔淇℃伅
         operation: {
           show: true, // 鏄剧ず鎿嶄綔鍒�
-          width: '200', // 鍒楀
+          width: 160, // 鍒楀
           attr: [
             {
               title: '浣跨敤浜�',
@@ -180,7 +191,8 @@
       },
     };
   },
-  created() {},
+  created() {
+  },
   methods: {
     handleEdit(row) {
       this.editSetting.id = row.id;

--
Gitblit v1.9.1