From ed6c6350015d52ea1cb033c7558f72b721ece84a Mon Sep 17 00:00:00 2001
From: WangHan <wwh_work@126,com>
Date: 星期四, 19 十二月 2024 19:58:55 +0800
Subject: [PATCH] 打包名称修改，去除错误输出

---
 admin-web/src/views/departmentitem/itemret/returnNote/index.vue |   66 +++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
index 150e3e6..c327b00 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
@@ -27,20 +27,20 @@
                         </div>
                       </div>
                       <div class="one-hed">
-                        <div class="box"><span class="span-two">閮ㄩ棬锛�</span>{{ item.agencyName }}</div>
+                        <div class="box"><span class="span-two">閮ㄩ棬锛�</span>{{ item.departmentName }}</div>
                         <div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.operatorName }}</div>
                         <div class="box">
                           <span class="span-two">閫�鍥炴椂闂达細</span>{{ item.dealTime | formatTime }}
                         </div>
                       </div>
                       <div class="card-end">
-                        <div v-for="(just, index) in item.formOutputTemplateInfoList" :key="index" class="item">
-                          <div class="name">{{ just.goodsName }}</div>
+                        <div v-for="(just, index) in item.goodsTemplateInfoList" :key="index" class="item">
+                          <div class="name">{{ just.baseGoodsTemplateName }}</div>
                           <div class="value-box">
                             <div class="value-box-item">
                               <span class="label">鏁伴噺锛�</span>
                               <span class="value">{{ just.count }}</span>
-                              <span class="unit">{{ just.unit }}</span>
+                              <span class="unit">{{ just.unit||'' }}</span>
                             </div>
                           </div>
                         </div>
@@ -72,12 +72,14 @@
 </template>
 
 <script>
-import {outputList} from '@/api/stock/accessStock';
 import MyButton from '@/components/myButton/myButton';
 import myImport from '@/views/components/myImport';
 import edit from './edit';
 import detail from './detail';
-import listPage from '../../../mixins/listPage'
+import listPage from '@/views/mixins/listPage'
+import {getUserDetail} from "@/utils/auth";
+import SettingIplatform from "@/utils/settingIplatform";
+import {returnList} from "@/api/deptGoods/itemret";
 
 export default {
   name: 'index',
@@ -96,10 +98,36 @@
           defaultValue: '',
         },
         {
-          type: 'text',
-          dataIndex: 'goodsName',
+          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: 'select',
+          dataIndex: 'goodsTemplateId',
           label: '鐗╁搧鍚嶇О',
-          placeholder: '鍙ā绯婃悳绱�',
+          placeholder: '璇烽�夋嫨',
+          defaultValue: '',
+          options: [],
+          optionsConfig: {
+            label: 'goodsName',
+            value: 'id',
+            url: SettingIplatform.apiBaseURL + `/pc/base/goods/template/query/goodsTemplate?tenantId=${getUserDetail().tenantId}`,
+          },
+        },
+        {
+          type: 'text',
+          dataIndex: 'createName',
+          label: '鍒涘缓浜�',
+          placeholder: '璇疯緭鍏�',
           defaultValue: '',
         },
         {
@@ -117,10 +145,13 @@
       ],
     };
   },
+  created() {
+    this.fetchData()
+  },
   methods: {
     fetchData() {
       this.loading = true;
-      outputList({
+      returnList({
         pageNum: this.pageNum,
         pageSize: this.pageSize,
         ...this.filterFrom,
@@ -128,20 +159,9 @@
         this.list = res.datas;
         this.total = res.totalRows;
         this.loading = false;
+      }).catch(()=>{
+        this.loading = false;
       });
-    },
-    fifterForm(params) {
-      this.filterFrom = Object.assign(this.filterFrom, params);
-      if (this.filterFrom.startTime) {
-        this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
-      }
-      if (this.filterFrom.endTime) {
-        this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
-      }
-      if (this.filterFrom.agencyId&&this.filterFrom.agencyId.length) {
-        this.filterFrom.agencyId = this.filterFrom.agencyId[this.filterFrom.agencyId.length - 1];
-      }
-      this.search(1);
     },
   },
 };

--
Gitblit v1.9.1