From a06e1cbc8d9cc5d2b962545f3ea94514bc823011 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 15 Nov 2024 17:40:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=A1=B5=E9=9D=A2=E5=A4=9A=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MultiConditionSearch.vue                  | 227 ++++++++++++++++++
 src/components/edittablehead/index.vue        |   1 -
 src/option/aftersales/vueTvemp.js             |  22 +-
 src/views/aftersales/aftersalesWorkOrder.vue  |  44 ++--
 .../delivery/distributionStockArticle.vue     |  65 ++++-
 src/views/waybill/WaybillOrderList.vue        |  54 ++++-
 src/views/waybill/orderPackageList.vue        |  43 +++-
 7 files changed, 406 insertions(+), 50 deletions(-)
 create mode 100644 src/components/MultiConditionSearch/MultiConditionSearch.vue

diff --git a/src/components/MultiConditionSearch/MultiConditionSearch.vue b/src/components/MultiConditionSearch/MultiConditionSearch.vue
new file mode 100644
index 00000000..0cfd7951
--- /dev/null
+++ b/src/components/MultiConditionSearch/MultiConditionSearch.vue
@@ -0,0 +1,227 @@
+<template>
+  <!-- 搜索弹窗 -->
+  <div class="Searchboxpop-upwindow">
+    <el-dialog
+      v-model="dialogVisible"
+      :title="title"
+      :show-close="false"
+      :fullscreen="fullscreen"
+      :close-on-click-modal="false"
+      :draggable="true"
+      :overflow="false"
+      width="50%"
+    >
+      <template #header>
+        <div class="title">
+          <span>{{ title }}</span>
+        </div>
+        <div class="div_icon">
+          <el-icon @click="minimize"><Minus /></el-icon>
+          <el-icon @click="maximize"><FullScreen /></el-icon>
+          <el-icon @click="close"><CloseBold /></el-icon>
+        </div>
+      </template>
+      <el-input
+        v-model="localInputValue"
+        style="width: 100%; height: 100%"
+        :autosize="{ minRows: 24, maxRows: 24 }"
+        type="textarea"
+        placeholder="每一行算一个搜索单位“多个请【换行】输入"
+      />
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="dialogSearchSubmit"> 确认 </el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+  <!-- 最小化窗口 -->
+  <div class="minimize_windows" v-if="minimizeState">
+    <div class="title">
+      <span>{{ title }}</span>
+    </div>
+    <div class="div_icon">
+      <el-icon @click="expandWindow"><FullScreen /></el-icon>
+      <el-icon @click="destroyWindow"><Close /></el-icon>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, watch, defineProps, defineEmits } from 'vue';
+import { Minus, FullScreen, CloseBold, Close } from '@element-plus/icons-vue';
+
+const props = defineProps({
+  modelValue: {
+    type: Boolean,
+    required: true,
+  },
+  title: {
+    type: String,
+    required: true,
+  },
+  inputValue: {
+    type: String,
+    required: false,
+    default: '',
+  },
+});
+
+const emit = defineEmits(['update:modelValue', 'dialogSearchSubmit', 'update:inputValue']);
+
+const dialogVisible = ref(props.modelValue);
+const fullscreen = ref(false);
+const minimizeState = ref(false);
+const localInputValue = ref(props.inputValue);
+
+watch(
+  () => props.modelValue,
+  newVal => {
+    dialogVisible.value = newVal;
+  }
+);
+
+watch(
+  () => props.inputValue,
+  newVal => {
+    localInputValue.value = newVal;
+  }
+);
+
+const minimize = () => {
+  minimizeState.value = true;
+  dialogVisible.value = false;
+  emit('update:modelValue', false);
+};
+
+const maximize = () => {
+  fullscreen.value = !fullscreen.value;
+};
+
+const close = () => {
+  emit('update:modelValue', false);
+};
+
+const expandWindow = () => {
+  minimizeState.value = false;
+  dialogVisible.value = true;
+  emit('update:modelValue', true);
+};
+
+const destroyWindow = () => {
+  minimizeState.value = false;
+  emit('update:modelValue', false);
+};
+
+const dialogSearchSubmit = () => {
+  const lines = localInputValue.value
+    .split('\n') // 按换行分割
+    .map(line => line.trim()) // 移除每一行前后的空格
+    .filter(line => line !== ''); // 过滤掉空行
+
+  const joinedLines = lines.join(','); // 使用逗号连接，无空格
+  localInputValue.value = joinedLines;
+  emit('dialogSearchSubmit', localInputValue.value);
+};
+</script>
+
+<style scoped lang="scss">
+.Searchboxpop-upwindow {
+  :deep(.el-overlay) {
+    position: absolute;
+
+    .el-dialog {
+      min-height: 70%;
+    }
+    .el-overlay-dialog {
+      position: absolute;
+    }
+    .el-dialog__header {
+      display: flex !important;
+      justify-content: space-between;
+      .title {
+        position: relative;
+        padding: 0 10px;
+      }
+      .title::after {
+        content: '*';
+        color: #172e60;
+        position: absolute;
+        font-size: 20px;
+        top: 0;
+        left: 0;
+      }
+      .div_icon {
+        width: 100px;
+        display: flex;
+        justify-content: space-between;
+        font-size: 19px;
+        cursor: pointer;
+      }
+    }
+
+    .el-dialog__footer {
+      display: flex;
+      justify-content: center;
+      padding: 6px;
+      .el-button {
+        width: 160px;
+        height: 35px;
+      }
+    }
+  }
+}
+
+.minimize_windows {
+  width: 200px;
+  height: 35px;
+  border: 1px solid #cccccc82;
+  position: absolute;
+  bottom: 5px;
+  left: 5px;
+  box-shadow: 2px -1px 0.15625vw #c1c1c187;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  background-color: #fff;
+  .title {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    span {
+      font-size: 18px;
+    }
+  }
+  span {
+    font-size: 14px;
+  }
+  .div_icon {
+    display: flex;
+    align-items: center;
+    width: 54px;
+    justify-content: space-between;
+    font-size: 20px;
+  }
+}
+
+:deep(.el_exportSelection) {
+  width: 30%;
+  height: 150px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  .el-dialog__body {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+    border-radius: 12px;
+    .el-button {
+      width: 30%;
+      height: 44%;
+    }
+  }
+}
+</style>
diff --git a/src/components/edittablehead/index.vue b/src/components/edittablehead/index.vue
index 9dad8268..f76ef101 100644
--- a/src/components/edittablehead/index.vue
+++ b/src/components/edittablehead/index.vue
@@ -50,7 +50,6 @@ import { getTableSeting, postSaveTableSeting } from '@/api/basic/table';
 const functions = inject('functions') as any;
 import Sortable from 'sortablejs';
 import { getObjType, handleClearTableQuery } from '@/utils/util';
-import { it } from 'element-plus/es/locale';
 interface TableColumnType {
   /** 表格列的key */
   prop: string;
diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js
index 90da4b46..520ba6d2 100644
--- a/src/option/aftersales/vueTvemp.js
+++ b/src/option/aftersales/vueTvemp.js
@@ -41,17 +41,17 @@ export const columnList = [
     sortable: true,
     head: false,
   },
-  // {
-  //   prop: 'a',
-  //   label: '工单创建仓',
-  //   type: 1,
-  //   values: '',
-  //   width: '140',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  //   head: false,
-  // },
+  {
+    prop: 'warehouseName',
+    label: '工单创建仓',
+    type: 1,
+    values: '',
+    width: '140',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'workOrderNumber',
     label: '异常工单号',
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index fc2ba1c3..ef3c46d9 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -388,7 +388,7 @@
         <el-input
           v-model="TopQuery.inputAll"
           style="width: 100%; height: 100%"
-          :autosize="{ minRows: 24 }"
+          :autosize="{ minRows: 24, maxRows: 24 }"
           type="textarea"
           placeholder="每一行算一个搜索单位“多个请【换行】输入"
         />
@@ -1007,7 +1007,7 @@ const details = reactive({
   /** 时间选择器数据 */
   stockupDate: [],
   /** 列表 */
-  columnListPublic:columnList, //公共列表
+  columnListPublic: columnList, //公共列表
   /** 列表数据 */
   data: [],
   /** 页面loading */
@@ -1023,7 +1023,7 @@ const details = reactive({
   /** 分页参数 */
   page: {
     currentPage: 1,
-    pageSize: 2,
+    pageSize: 30,
     total: 0,
   },
 
@@ -2494,25 +2494,25 @@ const exportReport = () => {
       if (details.selectionList.length) {
         dataID.ids = details.selectionList.map(item => item.id).join(',');
       }
-      JExportAll(dataID);
-      // switch (TabPermissions.value) {
-      //   case 0:
-      //     ExportAll(dataID); //全部
-      //     break;
-      //   case 1:
-      //     ExportingDuringProcessing(dataID);
-      //     break;
-      //   case 2:
-      //     ProcessedExported(dataID);
-      //     break;
-      //   case 4:
-      //     // 理赔金额未出
-      //     ExportClaimAmount(dataID);
-      //     break;
-      //   default:
-      //     ExportAll(dataID);
-      //     break;
-      // }
+      // JExportAll(dataID);
+      switch (TabPermissions.value) {
+        case 0:
+          ExportAll(dataID); //全部
+          break;
+        case 1:
+          ExportingDuringProcessing(dataID);
+          break;
+        case 2:
+          ProcessedExported(dataID);
+          break;
+        case 4:
+          // 理赔金额未出
+          ExportClaimAmount(dataID);
+          break;
+        default:
+          ExportAll(dataID);
+          break;
+      }
     })
     .catch(() => {});
 };
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index f7ec5bcb..379331c2 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -6,15 +6,26 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query" class="header_search">
           <el-form-item label="订单自编号:">
-            <el-input
-              v-model="query.orderCodeNum"
-              placeholder="请输入订单自编号"
-              clearable
-            ></el-input>
+            <div class="el_div_input">
+              <el-input
+                v-model="query.orderCodeNum"
+                placeholder="请输入订单自编号"
+                clearable
+              ></el-input>
+              <el-icon class="el_dy_icon" @click="openDialog('订单自编号搜索', query.orderCodeNum)"
+                ><CirclePlusFilled
+              /></el-icon>
+            </div>
           </el-form-item>
 
           <el-form-item label="运单:">
-            <el-input v-model="query.waybillNum" placeholder="请输入运单编号" clearable />
+            <div class="el_div_input">
+              <el-input v-model="query.waybillNum" placeholder="请输入运单编号" clearable />
+              <el-icon class="el_dy_icon" @click="openDialog('运单编号搜索', query.orderCodeNum)"
+                ><CirclePlusFilled
+              /></el-icon>
+              </div>
+   
           </el-form-item>
 
           <el-form-item label="入库时间:" class="el-times">
@@ -675,6 +686,13 @@
         </div>
       </template>
     </el-dialog>
+
+  <multi-condition-search
+  v-model:modelValue="dialogVisible"
+    :title="popupTitle"
+    v-model:inputValue="searchInput"
+    @dialogSearchSubmit="handleSearchSubmit"
+  />
   </basic-container>
   <edittablehead
     @closce="showdrawer"
@@ -714,11 +732,18 @@ import { downloadXls, getObjType, handleClearTableQuery, isNumber } from '@/util
 import { columnList } from '@/option/distribution/distributionStockArticleSelf';
 import { deepClone, setNodeHeight, hanleTextLineFeed } from '@/utils/util.js';
 import { ElMessage, ElMessageBox } from 'element-plus';
+import MultiConditionSearch from '@/components/MultiConditionSearch/MultiConditionSearch.vue';
 const _newCol = deepClone(columnList);
 
 export default {
+  components: {
+    MultiConditionSearch
+  },
   data() {
     return {
+      dialogVisible: false,
+      popupTitle: '',
+      searchInput: '',
       excelForm: {},
       excelBox: false,
       tcloading: false,
@@ -1479,6 +1504,26 @@ export default {
         callback();
       }
     },
+
+    openDialog(title, input) {
+      this.popupTitle = title;
+      console.log(input, 'input');
+      if (input) {
+        const formattedInput = input.split(',').join('\n');
+        this.searchInput = formattedInput; // 赋值给 inputAll
+      } else {
+        this.searchInput = '';
+      }
+      this.dialogVisible = true;
+    },
+    handleSearchSubmit(value) {
+      if (this.popupTitle == '订单自编号搜索') {
+        this.query.orderCodeNum = value; //搜索框值
+      }else if(this.popupTitle == '运单编号搜索'){
+        this.query.waybillNum = value; //搜索框值
+      }
+      this.dialogVisible = false;
+    },
     // 拆单
     Splittheorder(row) {
       console.log(row);
@@ -2394,4 +2439,12 @@ export default {
 .el_textBtn {
   font-weight: bold;
 }
+.el_div_input {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  .el_dy_icon {
+    font-size: 1.5em;
+  }
+}
 </style>
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index 655791f0..58552a90 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -13,11 +13,16 @@
           </el-form-item> -->
 
           <el-form-item label="运单号:" class="el-times">
-            <el-input
-              v-model="query.waybillNoList"
-              clearable
-              placeholder="支持多运单查询,逗号拼接"
-            ></el-input>
+            <div class="el_div_input">
+              <el-input
+                v-model="query.waybillNoList"
+                clearable
+                placeholder="支持多运单查询,逗号拼接"
+              ></el-input>
+              <el-icon class="el_dy_icon" @click="openDialog('运单号搜索', query.waybillNoList)"
+                ><CirclePlusFilled
+              /></el-icon>
+            </div>
           </el-form-item>
 
           <el-form-item label="目的仓:">
@@ -279,7 +284,13 @@
     :html="details.html"
     width="fit-content"
   />
-
+  <MultiConditionSearch
+    v-model:modelValue="dialogVisible"
+    :title="popupTitle"
+    v-model:inputValue="searchInput"
+    @dialogSearchSubmit="handleSearchSubmit"
+  >
+  </MultiConditionSearch>
   <!-- 列表配置显示 -->
   <edittablehead
     @closce="showdrawer"
@@ -306,6 +317,7 @@ import {
   postExport,
 } from '@/api/waybill/WaybillOrderList.js';
 import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
+import MultiConditionSearch from '@/components/MultiConditionSearch/MultiConditionSearch.vue';
 import {
   downloadXls,
   setNodeHeight,
@@ -458,7 +470,26 @@ const permissionObj = reactive({
     return $store.getters.permission.WaybillOrderList_uploadReceipt;
   }),
 });
-
+const dialogVisible = ref(false);
+const popupTitle = ref('搜索弹窗');
+const searchInput = ref('');
+const openDialog = (title, input) => {
+  popupTitle.value = title;
+  console.log(input, 'input');
+  if (input) {
+    const formattedInput = input.split(',').join('\n');
+    searchInput.value = formattedInput; // 赋值给 inputAll
+  } else {
+    searchInput.value = '';
+  }
+  dialogVisible.value = true;
+};
+const handleSearchSubmit = value => {
+  if (popupTitle.value == '运单号搜索') {
+    query.value.waybillNoList = value; //搜索框值
+  }
+  dialogVisible.value = false;
+};
 /** 请求页面数据 */
 const onLoad = async (page?: any, params = {}) => {
   try {
@@ -1066,6 +1097,14 @@ getListName({ name: '' }).then(res => {
 :deep(.header_search) {
   align-items: start;
 }
+.el_div_input {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  .el_dy_icon {
+    font-size: 1.5em;
+  }
+}
 </style>
 
 <style>
@@ -1076,4 +1115,5 @@ getListName({ name: '' }).then(res => {
 .imgDialogVisible .el-dialog__body {
   padding: 0;
 }
+
 </style>
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index cd1cd1d8..228d6c6b 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -11,11 +11,18 @@
             :label="item.label"
           >
             <template v-if="item.type === 'input'">
-              <el-input
+              <div class="el_div_input">
+                <el-input
                 v-model.trim="query[item.prop]"
                 :placeholder="`请输入${item.label}`"
                 clearable
               ></el-input>
+              <!-- <el-icon class="el_dy_icon" @click="openDialog('运单号搜索', query.waybillNoList)"
+                ><CirclePlusFilled
+              /></el-icon> -->
+              </div>
+           
+
             </template>
 
             <template v-else-if="item.type === 'time'">
@@ -51,7 +58,7 @@
             <el-button type="primary" icon="Printer" @click="handleBatchBarcode">
               批量打印
             </el-button>
-
+            <el-button @click="openDialog">打开搜索弹窗</el-button>
             <!-- 批量入库 -->
             <el-button
               type="primary"
@@ -273,7 +280,13 @@
     width="780px"
     :html="details.html"
   />
-
+  <MultiConditionSearch
+      v-model:modelValue="dialogVisible"
+      :title="popupTitle"
+      v-model:inputValue="searchInput"
+      @dialogSearchSubmit="handleSearchSubmit"
+  >
+  </MultiConditionSearch> 
   <Tableexportcomponent
     :menuData="details.packageListColumnList"
     :data="details.packageListData"
@@ -298,6 +311,7 @@ import { mapGetters, useStore } from 'vuex';
 /** 获取字典 */
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getopenOrderAdvancePageList } from '@/api/waybill/TemporaryStorageList';
+import MultiConditionSearch from '@/components/MultiConditionSearch/MultiConditionSearch.vue';
 import {
   postFindOrderDetails,
   postFinaPackageTrackLogList,
@@ -325,6 +339,21 @@ const Tableexportcomponent = defineAsyncComponent(
   () => import('@/components/Tableexportcomponent/Tableexportcomponent.vue')
 );
 const tcTableexport = ref(false);
+
+const dialogVisible = ref(false);
+const popupTitle = ref('搜索弹窗');
+const searchInput = ref('');
+
+const openDialog = () => {
+
+  dialogVisible.value = true;
+};
+
+const handleSearchSubmit = value => {
+  console.log('搜索内容:', value);
+  dialogVisible.value = false;
+};
+
 // 获取路由实例
 const $router = useRouter();
 const $store = useStore();
@@ -895,4 +924,12 @@ const handleShowFlowNode = async ({ row }) => {
 :deep(.el-range-editor.el-input__wrapper) {
   height: 100% !important;
 }
+.el_div_input {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  .el_dy_icon {
+    font-size: 1.5em;
+  }
+}
 </style>

From fce765f6b77c28be3c1764076131f00e7c85bfe0 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 15 Nov 2024 17:55:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventory/delivery/distributionStockArticle.vue      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 379331c2..2d451f1d 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -18,10 +18,10 @@
             </div>
           </el-form-item>
 
-          <el-form-item label="运单:">
+          <el-form-item label="运单号:">
             <div class="el_div_input">
               <el-input v-model="query.waybillNum" placeholder="请输入运单编号" clearable />
-              <el-icon class="el_dy_icon" @click="openDialog('运单编号搜索', query.orderCodeNum)"
+              <el-icon class="el_dy_icon" @click="openDialog('运单号搜索', query.waybillNum)"
                 ><CirclePlusFilled
               /></el-icon>
               </div>
@@ -1513,13 +1513,16 @@ export default {
         this.searchInput = formattedInput; // 赋值给 inputAll
       } else {
         this.searchInput = '';
+      
+        
       }
+      console.log(this.searchInput,'输入框值');
       this.dialogVisible = true;
     },
     handleSearchSubmit(value) {
       if (this.popupTitle == '订单自编号搜索') {
         this.query.orderCodeNum = value; //搜索框值
-      }else if(this.popupTitle == '运单编号搜索'){
+      }else if(this.popupTitle == '运单号搜索'){
         this.query.waybillNum = value; //搜索框值
       }
       this.dialogVisible = false;

From d9132197663197af30bb1131321501d6beadaa92 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 15 Nov 2024 18:37:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Tableexportcomponent/Tableexportcomponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Tableexportcomponent/Tableexportcomponent.vue b/src/components/Tableexportcomponent/Tableexportcomponent.vue
index 1bf59d8b..bd35295b 100644
--- a/src/components/Tableexportcomponent/Tableexportcomponent.vue
+++ b/src/components/Tableexportcomponent/Tableexportcomponent.vue
@@ -11,7 +11,7 @@
       <el-tabs v-model="radio" class="el_TablePage_radio">
         <el-tab-pane label="当前页全部导出" name="1"></el-tab-pane>
         <el-tab-pane label="当前页勾选导出" name="2"></el-tab-pane>
-        <el-tab-pane label="全部数据导出" name="3"></el-tab-pane>
+        <!-- <el-tab-pane label="全部数据导出" name="3"></el-tab-pane> -->
       </el-tabs>
 
       <el-transfer