From 4d7d7f06a7a403cd261a699ddac27dd28e046788 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 22 Aug 2024 18:17:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E3=80=81=E5=88=86=E9=A1=B512?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basic/workplace/workplaceManage.vue      | 14 +++++++-------
 .../collect/CollectOrderAllotCardComponents.vue    | 11 +++++++++--
 src/views/collect/DealOrder.vue                    |  1 +
 src/views/collect/DealOrderBlank.vue               | 11 +++++------
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 310c76e4..68672e48 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -218,14 +218,14 @@
               </pagination>
             </el-tab-pane>
             <el-tab-pane>
-              <span slot="label">{{ workplaceName }}-单据类型</span>
+              <span slot="label">{{ workplaceName }}-业务类型</span>
               <el-form :inline="true" :model="busQuery" class="query-form" size="mini"
                        style="margin-bottom: 10px"
               >
-                <el-form-item class="query-form-item" label="单据类型编号/业务名称:">
+                <el-form-item class="query-form-item" label="业务类型编号/业务名称:">
                   <el-input
                     v-model="busQuery.busKey"
-                    placeholder="请输入单据类型编号/业务名称"
+                    placeholder="请输入业务类型编号/业务名称"
                     clearable
                   ></el-input>
                 </el-form-item>
@@ -244,7 +244,7 @@
                     >
                     <el-button type="primary" @click="chooseBusType"
                                icon="el-icon-plus"
-                    >新增单据类型
+                    >新增业务类型
                     </el-button
                     >
                   </el-button-group>
@@ -254,7 +254,7 @@
                         highlight-current-row
               >
                 <el-table-column type="index" label="序号"></el-table-column>
-                <el-table-column label="单据类型编码 " prop="documentTypeCode"></el-table-column>
+                <el-table-column label="业务类型编码 " prop="documentTypeCode"></el-table-column>
                 <el-table-column label="业务名称 " prop="busName"></el-table-column>
                 <el-table-column label="仓库名称 " prop="invName"></el-table-column>
                 <el-table-column label="是否配套系统" prop="isMatching">
@@ -700,8 +700,8 @@ export default {
       },
       busName: '',
       busTypeMap: {
-        'add': '新增单据类型',
-        'edit': '编辑单据类型'
+        'add': '新增业务类型',
+        'edit': '编辑业务类型'
       },
       formData: {
         operationType: 1,
diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue
index c61d17d7..f269a317 100644
--- a/src/views/collect/CollectOrderAllotCardComponents.vue
+++ b/src/views/collect/CollectOrderAllotCardComponents.vue
@@ -208,6 +208,7 @@
         :total="total"
         :limit.sync="filterQuery.limit"
         :page.sync="filterQuery.page"
+        :page-sizes="[12, 24, 48]"
         @pagination="handleCurrentChange"
       ></pagination>
     </el-card>
@@ -306,6 +307,7 @@
           :total="total"
           :limit.sync="filterQuery.limit"
           :page.sync="filterQuery.page"
+          :page-sizes="[12, 24, 48]"
           @pagination="handleCurrentChange"
         ></pagination>
       </div>
@@ -408,7 +410,7 @@ export default {
         billNo: null,
         tagStatus: null,
         page: 1,
-        limit: 10,
+        limit: 12,
       },
       defaultSort: {prop: 'createTime', order: 'desc'},
       loading: false,
@@ -488,7 +490,12 @@ export default {
       this.showSearch = !this.showSearch;
     },
     onReset() {
-      this.filterQuery = {};
+      this.filterQuery = {
+        billNo: null,
+        tagStatus: null,
+        page: 1,
+        limit: 12,
+      };
       this.actDateRange = [];
       this.getList();
     },
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 9163bc7c..b3b10082 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -872,6 +872,7 @@ export default {
       this.isLinkDisabled = true
       this.selectBusTypeDisabled = true
       this.corpOrderIdDisabled = true
+      this.workplaceId = Number(this.$route.query.workplaceId);
       this.formData.workPlaceCode = Number(this.$route.query.workplaceId);
       this.getWorkBindBusTypes(this.formData.workPlaceCode);
     }
diff --git a/src/views/collect/DealOrderBlank.vue b/src/views/collect/DealOrderBlank.vue
index c614b8a2..3e5f953e 100644
--- a/src/views/collect/DealOrderBlank.vue
+++ b/src/views/collect/DealOrderBlank.vue
@@ -418,18 +418,16 @@ export default {
   },
   methods: {
 
-    getBillNo(billNo,workPlaceCode){
+    getBillNo(billNo){
       let post =  {
         billNo: billNo,
-        workPlaceCode: workPlaceCode,
         page: 1,
         limit: 10,
       }
       findByBill(post).then(res => {
         if (res.code == 20000) {
-          if (res.data.billNo != null){
-            this.formData = res.data
-            this.startDeal();
+          if (res.data.list.length > 0){
+            this.formData = res.data.list[0]
           }
         }
       })
@@ -457,7 +455,7 @@ export default {
               this.findFromInvList("");
             }
             if (this.formData.billNo != null){
-              this.getBillNo(this.formData.billNo,this.formData.workPlaceCode)
+              this.getBillNo(this.formData.billNo)
             }else {
               this.findCurOrder();
             }
@@ -874,6 +872,7 @@ export default {
       this.isLinkDisabled = true
       this.selectBusTypeDisabled = true
       this.corpOrderIdDisabled = true
+      this.workplaceId = Number(this.$route.query.workplaceId);
       this.formData.workPlaceCode = Number(this.$route.query.workplaceId);
       this.getWorkBindBusTypes(this.formData.workPlaceCode);
     }