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/stock/procure/receiptDetails/index.vue |   75 +++++++++++++++++++++----------------
 1 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/admin-web/src/views/stock/procure/receiptDetails/index.vue b/admin-web/src/views/stock/procure/receiptDetails/index.vue
index acb87e4..902be8f 100644
--- a/admin-web/src/views/stock/procure/receiptDetails/index.vue
+++ b/admin-web/src/views/stock/procure/receiptDetails/index.vue
@@ -33,7 +33,7 @@
 import SettingIplatform from '@/utils/settingIplatform';
 import detail from '../purchaseOrder/detail';
 import * as finsystenant from '@/api/baseSetting/finsystenant';
-import {goodsModel} from '@/api/stock/procure/purchaseOrder';
+import { goodsModel } from '@/api/stock/procure/purchaseOrder';
 import myImport from '@/views/components/myImport';
 import { getBaseUrl } from '@/utils/base';
 
@@ -52,19 +52,31 @@
           defaultValue: '',
         },
         {
-          type: 'text',
-          dataIndex: 'goodsTemplateName',
+          type: 'select',
+          dataIndex: 'goodsTemplateId',
           label: '鐗╁搧鍚嶇О',
           placeholder: '璇疯緭鍏�',
           defaultValue: '',
+          options: [],
+          cascader: [{ key: 'baseGoodsModelsId', queryKey: 'goodsTemplatesId' }],
+          optionsConfig: {
+            label: 'goodsName',
+            value: 'id',
+            url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
+          },
         },
         {
           type: 'select',
           dataIndex: 'baseGoodsModelsId',
           label: '瑙勬牸鍨嬪彿',
-          placeholder: '璇烽�夋嫨',
+          placeholder: '璇疯緭鍏�',
           defaultValue: '',
-          options:[]
+          options: [],
+          optionsConfig: {
+            label: 'modelName',
+            value: 'id',
+            url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel',
+          },
         },
         {
           type: 'cascader',
@@ -100,7 +112,7 @@
       // 鎼滅储鏉′欢
       filterFrom: {
         tenantId: null,
-        agencyId:[],
+        agencyId: [],
         status: 1,
       },
       // 瀵煎叆
@@ -147,14 +159,28 @@
         },
         // 鍒椾俊鎭�
         columns: [
-          { title: '鍗曞彿', field: 'businessFormCode', align: 'center' },
-          { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'center' },
-          { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'center' },
-          { title: '鍗曚环', field: 'price', align: 'center' },
+          { title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130 },
+          { title: '鐗╁搧鍚嶇О', field: 'goodsTemplateName', align: 'left', minWidth: 140 },
+          { title: '瑙勬牸鍨嬪彿', field: 'baseGoodsModelsName', align: 'left', width: 130 },
+          {
+            title: '鍗曚环',
+            field: 'price',
+            align: 'center',
+            formatter: (row) => {
+              return { value: row.price / 100 };
+            },
+          },
           { title: '鍏ュ簱鏁伴噺', field: 'counts', align: 'center' },
-          { title: '閲戦', field: 'amount', align: 'center' },
-          { title: '鎵�灞炴満鏋�', field: 'agencyName', align: 'center' },
-          { title: '鍒涘缓浜�', field: 'buyerName', align: 'center' },
+          {
+            title: '閲戦',
+            field: 'amount',
+            align: 'center',
+            formatter: (row) => {
+              return { value: row.price / 100 };
+            },
+          },
+          { title: '鎵�灞炴満鏋�', field: 'agencyName', align: 'center', width: 130 },
+          { title: '鍒涘缓浜�', field: 'buyerName', align: 'center', width: 90 },
           {
             title: '鎿嶄綔鏃堕棿',
             field: 'procureTime',
@@ -168,7 +194,7 @@
         // 鎿嶄綔淇℃伅
         operation: {
           show: true, // 鏄剧ず鎿嶄綔鍒�
-          width: '150', // 鍒楀
+          width: 100, // 鍒楀
           attr: [
             {
               title: '璇︽儏',
@@ -192,18 +218,6 @@
     };
   },
   created() {
-    // 鎼滅储妗嗚鏍煎瀷鍙�
-    goodsModel().then(res=>{
-      this.items.forEach(v=>{
-        if(v.label=='瑙勬牸鍨嬪彿'){
-          v.options = res.map(item=>{
-            item.label = item.modelName,
-            item.value = item.id
-            return item
-          })
-        }
-      })
-    })
   },
   methods: {
     //瀵煎叆
@@ -247,9 +261,9 @@
         .catch(() => {});
     },
     showDetail(row) {
-      this.detailSetting.id=row.businessId
-      this.detailSetting.title='璇︽儏'
-      this.detailSetting.show=true
+      this.detailSetting.id = row.businessId;
+      this.detailSetting.title = '璇︽儏';
+      this.detailSetting.show = true;
     },
     // 鏌ヨtable鍒楄〃
     search(pageNum) {
@@ -266,9 +280,6 @@
       }
       if (this.filterFrom.incomeTimeEnd) {
         this.filterFrom.incomeTimeEnd = this.filterFrom.incomeTimeEnd.replace(/\-/g, '');
-      }
-      if (params.agencyId&&params.agencyId.length) {
-        this.filterFrom.agencyId = params.agencyId[params.agencyId.length - 1];
       }
       this.search(1);
     },

--
Gitblit v1.9.1