From 2d3c852255eb205be1c577ae21cf05beb0cf33b6 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 6 Sep 2024 11:46:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AD=BE=E6=94=B6=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/distribution/TripartiteTransfer.js |  8 ++--
 .../distribution/inventory/CreateOrder.vue    | 33 +++++++++++----
 .../signfor/distributionSignforedt.vue        | 42 ++++++++++---------
 3 files changed, 52 insertions(+), 31 deletions(-)

diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js
index 750574d8..2458c9f8 100644
--- a/src/option/distribution/TripartiteTransfer.js
+++ b/src/option/distribution/TripartiteTransfer.js
@@ -279,7 +279,7 @@ export const detailsColumnList = [
   {
     prop: 'loadCode',
     label: '配载批次',
-    type: 2,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -391,7 +391,7 @@ export const detailsColumnList = [
   {
     prop: 'unloadTrayName',
     label: '卸车托盘名称',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
@@ -401,7 +401,7 @@ export const detailsColumnList = [
   {
     prop: 'unloadTrayCode',
     label: '卸车托盘码',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
@@ -451,7 +451,7 @@ export const detailsColumnList = [
   {
     prop: 'unloadTime',
     label: '卸车时间',
-    type: 2,
+    type: 1,
     values: '',
     width: '130',
     checkarr: [],
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index e890e427..ecdb6eee 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -1052,7 +1052,7 @@
               </div>
             </template>
 
-            <div>
+            <div style="display: flex">
               <el-select
                 v-model="details.package.incomeCategoryId"
                 filterable
@@ -1096,7 +1096,7 @@
               @inputTxt="(index, row) => inputsc(index, row, 2)"
               @timeCheck="timesc"
               @btnCheck="btnsc"
-              @selectCheck="selectsc"
+              @selectCheck="(index, row) => selectsc(index, row, 2)"
               @selection="list => (details.package.selectionList = list)"
               :isShowRefresh="false"
             >
@@ -1261,7 +1261,7 @@
             @inputTxt="(index, row) => inputsc(index, row, 1)"
             @timeCheck="timesc"
             @btnCheck="btnsc"
-            @selectCheck="selectsc"
+            @selectCheck="(index, row) => selectsc(index, row, 1)"
             @selection="selectionChange"
             :isShowRefresh="false"
           >
@@ -1422,6 +1422,8 @@ import {
   getObjType,
   handleInputQuery,
   handleFilterData,
+  handleClearTableQuery,
+  handleSelectQuery,
 } from '@/utils/util';
 import { columnList, packageColumnList } from '@/option/waybill/TemporaryStorageList';
 import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList';
@@ -2060,6 +2062,7 @@ const details = reactive<any>({
     /** 筛选条件 */
     query: {
       inputQuery: {},
+      selectQuery: {},
     },
     /** 品类 */
     goodsListOptions: [],
@@ -2727,11 +2730,23 @@ const timesc = (index, row) => {
 const btnsc = () => {};
 
 /** 表格表头下拉框选择 */
-const selectsc = (index, row) => {
-  const _key = row.prop.replace('Name', '');
-  details.tableQuery[_key] = index;
-  if (!index && index !== 0) delete details.tableQuery[_key];
-  init();
+const selectsc = (index, row, type) => {
+  switch (type) {
+    case 1:
+      handleSelectQuery(index, row, details.tableQuery);
+      init();
+      break;
+    case 2:
+      handleSelectQuery(index, row, details.package.query.selectQuery);
+      details.package.renderData = handleFilterData(
+        details.package.data,
+        [],
+        details.package.query
+      );
+      break;
+    default:
+      break;
+  }
 };
 
 /** 表格表头复选框选择 */
@@ -4181,6 +4196,8 @@ const handleClearPackageQuery = () => {
     details.package.query[key] = {};
   }
 
+  handleClearTableQuery(details.package.columnList);
+
   packageTableNode.value.handleClearSelect();
 
   details.package.renderData = handleFilterData(details.package.data, [], details.package.query);
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 5391c37a..9c0412d0 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -385,26 +385,28 @@
         >
           <template v-for="item in Tabs" :key="item.name">
             <el-tab-pane :label="item.label" :name="item.name">
-              <template v-if="item.type === 'package'">
-                <el-tabs
-                  tabPosition="left"
-                  v-model="item.activeName"
-                  class="demo-tabs"
-                  @tab-change="handleChooseSigneState"
+              <div style="display: flex; overflow: hidden">
+                <template v-if="item.type === 'package'">
+                  <el-tabs
+                    tabPosition="left"
+                    v-model="item.activeName"
+                    class="demo-tabs"
+                    @tab-change="handleChooseSigneState"
+                  >
+                    <el-tab-pane label="已签收" name="haveBeenSigned"></el-tab-pane>
+                    <el-tab-pane label="未签收" name="unreceipted"></el-tab-pane>
+                  </el-tabs>
+                </template>
+
+                <tablecmt
+                  class="goodsTable"
+                  :columnList="item.columnList"
+                  :tableData="item.renderData"
+                  :loading="false"
+                  @inputTxt="(value, row) => inputsc(value, row, item.type)"
                 >
-                  <el-tab-pane label="已签收" name="haveBeenSigned"></el-tab-pane>
-                  <el-tab-pane label="未签收" name="unreceipted"></el-tab-pane>
-                </el-tabs>
-              </template>
-
-              <tablecmt
-                class="goodsTable"
-                :columnList="item.columnList"
-                :tableData="item.renderData"
-                :loading="false"
-                @inputTxt="(value, row) => inputsc(value, row, item.type)"
-              >
-              </tablecmt>
+                </tablecmt>
+              </div>
             </el-tab-pane>
           </template>
         </el-tabs>
@@ -2759,6 +2761,8 @@ const handleChooseSigneState = val => {
 // 表格
 .goodsTable {
   flex: 1;
+  min-width: 50%;
+  // width: fit-content;
 }
 .el_Server {
   .el-tab-pane {