From 37a2927cb8ee5aa4c171fc38939d5f1d91174b77 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 08:35:25 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E9=A6=96=E9=A1=B5+=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                          |   1 +
 src/locales/zh-CN.ts                          |   2 +-
 src/views/home/components/supplierIndex.vue   | 179 ------
 ...��空白页，暂时去掉部分模块.vue | 510 ++++++++++++++++++
 src/views/home/index.vue                      |   4 +-
 .../purchasePlanMain/purchasePlanMain.data.ts |  20 +
 6 files changed, 534 insertions(+), 182 deletions(-)
 create mode 100644 src/views/home/components/supplierIndex供应商发票空白页，暂时去掉部分模块.vue

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index d24ed744a..88b4bc3f5 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1122,6 +1122,7 @@ export default {
     忘记密码:'Forget  Password',
     用户名:'User Name',
     邮箱:'Mail',
+    今日:'Today'
   },
   
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index f42aae706..5f15f2fec 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1122,7 +1122,7 @@ export default {
     忘记密码:'忘记密码',
     用户名:'用户名',
     邮箱:'邮箱',
-
+    今日:'今日'
 
 
   },
diff --git a/src/views/home/components/supplierIndex.vue b/src/views/home/components/supplierIndex.vue
index 9fc7345e5..731a44cfe 100644
--- a/src/views/home/components/supplierIndex.vue
+++ b/src/views/home/components/supplierIndex.vue
@@ -70,185 +70,6 @@
         <Echart :options="pieOptions" :height="280" :key="lineIndex" />
       </div>
     </div>
-    <div class="two-row mt-14px">
-      <div class="data1 w-[47.3%]">
-        <div class="title">{{t('home.latest_news')}}</div>
-        <el-table :data="notaicList" style="width: 100%" stripe height="240px">
-          <el-table-column :label="t('home.number')" align="center" prop="id" />
-          <el-table-column :label="t('home.user_type')" align="center" prop="userType">
-            <template #default="scope">
-              <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('home.user_number')" align="center" prop="userId" width="80" />
-          <el-table-column :label="t('home.template_coding')" align="center" prop="templateCode" width="80" />
-          <el-table-column :label="t('home.sender_number')" align="center" prop="templateNickname" width="180" />
-          <el-table-column
-            :label="t('home.template_content')"
-            align="center"
-            prop="templateContent"
-            width="200"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            :label="t('home.template_parameters')"
-            align="center"
-            prop="templateParams"
-            width="180"
-            show-overflow-tooltip
-          >
-            <template #default="scope"> {{ scope.row.templateParams }}</template>
-          </el-table-column>
-          <el-table-column :label="t('home.template_type')" align="center" prop="templateType" width="120">
-            <template #default="scope">
-              <dict-tag
-                :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE"
-                :value="scope.row.templateType"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column :label="t('home.read')" align="center" prop="readStatus" width="100">
-            <template #default="scope">
-              <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus" />
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="t('home.read_time')"
-            align="center"
-            prop="readTime"
-            width="180"
-            :formatter="dateFormatter"
-          />
-          <el-table-column
-            :label="t('home.create_time')"
-            align="center"
-            prop="createTime"
-            width="180"
-            :formatter="dateFormatter"
-          />
-          <!-- <el-table-column label="操作" align="center"  fixed="right" width="120">
-        <template #default="scope">
-          <el-button link type="primary" @click="openDetail(scope.row)" v-hasPermi="['system:notify-message:query']">
-            <Icon icon="ep:document-copy" />
-            详情
-          </el-button>
-        </template>
-      </el-table-column> -->
-        </el-table>
-      </div>
-      <div class="data1 w-[47.3%]">
-        <div class="title">{{ t('home.latest_deduction_details')}}</div>
-        <el-table :data="tableData" style="width: 100%" stripe height="240px">
-          <el-table-column prop="title" :label="t('home.title')" />
-          <el-table-column prop="name" :label="t('home.publisher')" />
-          <el-table-column prop="date" :label="t('home.publish_date')" />
-        </el-table>
-      </div>
-    </div>
-    <div class="two-row mt-14px">
-      <div class="data1 w-[47.3%]">
-        <!-- 本月退货明细 -->
-        <div class="title">{{t('home.month_return_detials')}}</div>
-        <el-table
-          :data="purchasereturnRecordMonth"
-          style="width: 100%"
-          stripe
-          height="240px"
-        >
-          <el-table-column prop="number" :label="t('home.document_number')" width="180" />
-          <el-table-column prop="fromPackingNumber" :label="t('home.source_package_number')" width="180" />
-          <el-table-column prop="toPackingNumber" :label="t('home.destination_package_number')" width="180" />
-          <el-table-column prop="fromContainerNumber" :label="t('home.source_appliance_number')" width="120" />
-          <el-table-column prop="toContainerNumber" :label="t('home.destination_appliance_number')" width="120" />
-          <el-table-column prop="fromBatch" :label="t('home.source_batch')" width="120" />
-          <el-table-column prop="toBatch" :label="t('home.destination_batch')" width="120" />
-          <el-table-column prop="altBatch" :label="t('home.replace_batch')" width="120" />
-          <el-table-column prop="fromLocationCode" :label="t('home.source_location_code')" width="120" />
-          <el-table-column prop="toLocationCode" :label="t('home.destination_location_code')" width="120" />
-          <el-table-column prop="fromLocationGroupCode" :label="t('home.source_location_group_code')" width="120" />
-          <el-table-column prop="toLocationGroupCode" :label="t('home.destination_location_group_code')" width="120" />
-          <el-table-column prop="fromAreaCode" :label="t('home.source_location_area_code')" width="120" />
-          <el-table-column prop="toAreaCode" :label="t('home.destination_location_area_code')" width="120" />
-          <el-table-column prop="fromOwnerCode" :label="t('home.source_shipper_code')" width="120" />
-          <el-table-column prop="toOwnerCode" :label="t('home.destination_shipper_code')" width="120" />
-          <el-table-column prop="inventoryStatus" :label="t('home.inventory_state')" width="120">
-            <template #default="scope">
-              {{ formatter(scope.row.inventoryStatus,DICT_TYPE.INVENTORY_STATUS) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="poNumber" :label="t('home.order_number')" width="120" />
-          <el-table-column prop="poline" :label="t('home.order_line')" width="120" />
-          <el-table-column prop="reason" :label="t('home.cause')" width="120" />
-          <el-table-column prop="singlePrice" :label="t('home.unit_price')" width="120" />
-          <el-table-column prop="amount" :label="t('home.money')" width="120" />
-          <el-table-column prop="itemCode" :label="t('home.material_code')" width="160" />
-          <el-table-column prop="itemName" :label="t('home.material_name')" width="120" />
-          <el-table-column prop="itemDesc1" :label="t('home.material_description1')" width="120" />
-          <el-table-column prop="itemDesc2" :label="t('home.material_description2')" width="120" />
-          <el-table-column prop="qty" :label="t('home.amount')" width="120" />
-          <el-table-column prop="uom" :label="t('home.measuring_unit')" width="120">
-            <template #default="scope">
-              {{ formatter(scope.row.uom,DICT_TYPE.UOM) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="projectCode" :label="t('home.item_code')" width="120" />
-          <el-table-column prop="remark" :label="t('home.comment')" width="120" />
-          <el-table-column prop="createTime" :label="t('home.create_time')" width="170">
-            <template #default="scope">
-              <span>{{ formatDate(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="creator" :label="t('home.creater')" width="120" />
-        </el-table>
-        <el-pagination style="margin-top:10px"
-          v-model:current-page="currentPage_purchasereturn"
-          v-model:page-size="pageSize_purchasereturn"
-          :page-sizes="[10, 20, 30, 50, 100]"
-          :small="true"
-          :background="false"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total_purchasereturn"
-          @size-change="getPurchasereturnRecordMonth"
-          @current-change="getPurchasereturnRecordMonth"
-        />
-      </div>
-      <div class="data1 w-[47.3%]">
-        <!-- 本月索赔明细 -->
-        <div class="title">{{t('home.claim_details_month')}}</div>
-        <el-table
-          :data="purchaseclaimRecordMonth"
-          style="width: 100%"
-          stripe
-          height="240px"
-        >
-          <el-table-column prop="number" :label="t('home.document_number')" width="180" />
-          <el-table-column prop="fromBatch" :label="t('home.batch')" width="120" />
-          <el-table-column prop="poNumber" :label="t('home.order_number')" width="120" />
-          <el-table-column prop="poline" :label="t('home.order_line')" width="120" />
-          <el-table-column prop="reason" :label="t('home.cause')" width="120" />
-          <el-table-column prop="singlePrice" :label="t('home.unit_price')" width="120" />
-          <el-table-column prop="amount" :label="t('home.money')" width="120" />
-          <el-table-column prop="code" label="代码" width="160" />
-          <el-table-column prop="createTime" :label="t('home.create_time')" width="170">
-            <template #default="scope">
-              <span>{{ formatDate(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="creator" :label="t('home.creater')" width="120" />
-        </el-table>
-        <el-pagination style="margin-top:10px"
-          v-model:current-page="currentPage_purchaseclaim"
-          v-model:page-size="pageSize_purchaseclaim"
-          :page-sizes="[10, 20, 30, 50, 100]"
-          :small="true"
-          :background="false"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total_purchaseclaim"
-          @size-change="getPurchaseclaimRecordMonth"
-          @current-change="getPurchaseclaimRecordMonth"
-        />
-      </div>
-    </div>
   </div>
 </template>
 <script lang="ts" setup>
diff --git a/src/views/home/components/supplierIndex供应商发票空白页，暂时去掉部分模块.vue b/src/views/home/components/supplierIndex供应商发票空白页，暂时去掉部分模块.vue
new file mode 100644
index 000000000..9fc7345e5
--- /dev/null
+++ b/src/views/home/components/supplierIndex供应商发票空白页，暂时去掉部分模块.vue
@@ -0,0 +1,510 @@
+<!-- 供应商首页 -->
+<template>
+  <div class="one-row">
+    <div class="data">
+      <div class="data-item">
+        <div class="small-title">{{ t('home.number_orders') }}</div>
+        <div class="small-data">
+          <div class="small-data-item small-data-item1">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.openPurchaseCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{ t('home.number_open') }}</div>
+            </div>
+            <img src="../../../assets/imgs/icon1.png" alt="" class="img" />
+          </div>
+          <div class="small-data-item small-data-item2 ml-14px">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.allPurchaseCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{ t('home.number_total_order') }}</div>
+            </div>
+            <img src="../../../assets/imgs/icon5.png" alt="" class="img" />
+          </div>
+        </div>
+      </div>
+      <div class="data-item ml-14px">
+        <div class="small-title">{{t('home.number_planned_shipments')}}</div>
+        <div class="small-data">
+          <div class="small-data-item small-data-item3">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.openPurchasePlanCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{t('home.number_open_plans')}}</div>
+            </div>
+            <img src="../../../assets/imgs/icon6.png" alt="" class="img" />
+          </div>
+          <div class="small-data-item small-data-item4 ml-14px">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.allPurchasePlanCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{t('home.number_all_plans')}}</div>
+            </div>
+            <img src="../../../assets/imgs/icon3.png" alt="" class="img" />
+          </div>
+        </div>
+      </div>
+      <div class="data-item ml-14px">
+        <div class="small-title">{{t('home.number_invoices')}}</div>
+        <div class="small-data">
+          <div class="small-data-item small-data-item5">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.notTakeSupplierdeliverCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{t('home.number_unreceived_orders')}}</div>
+            </div>
+            <img src="../../../assets/imgs/icon4.png" alt="" class="img" />
+          </div>
+          <div class="small-data-item small-data-item6 ml-14px">
+            <div class="small-data-item-txt">
+              <div>{{ supplierData?.takeSupplierdeliverCount || 0 }}<span>{{ t('home.single') }}</span></div>
+              <div>{{t('home.number_orders_received')}}</div>
+            </div>
+            <img src="../../../assets/imgs/icon2.png" alt="" class="img" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[65%]">
+        <div class="title">{{t('home.invoice_trend_month')}}</div>
+        <Echart :options="lineOptions" :height="280" :key="lineIndex" />
+      </div>
+      <div class="data1 w-[35%] ml-14px">
+        <div class="title">{{t('home.TOP10_parts_shipped_month')}}</div>
+        <Echart :options="pieOptions" :height="280" :key="lineIndex" />
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <div class="title">{{t('home.latest_news')}}</div>
+        <el-table :data="notaicList" style="width: 100%" stripe height="240px">
+          <el-table-column :label="t('home.number')" align="center" prop="id" />
+          <el-table-column :label="t('home.user_type')" align="center" prop="userType">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('home.user_number')" align="center" prop="userId" width="80" />
+          <el-table-column :label="t('home.template_coding')" align="center" prop="templateCode" width="80" />
+          <el-table-column :label="t('home.sender_number')" align="center" prop="templateNickname" width="180" />
+          <el-table-column
+            :label="t('home.template_content')"
+            align="center"
+            prop="templateContent"
+            width="200"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            :label="t('home.template_parameters')"
+            align="center"
+            prop="templateParams"
+            width="180"
+            show-overflow-tooltip
+          >
+            <template #default="scope"> {{ scope.row.templateParams }}</template>
+          </el-table-column>
+          <el-table-column :label="t('home.template_type')" align="center" prop="templateType" width="120">
+            <template #default="scope">
+              <dict-tag
+                :type="DICT_TYPE.SYSTEM_NOTIFY_TEMPLATE_TYPE"
+                :value="scope.row.templateType"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column :label="t('home.read')" align="center" prop="readStatus" width="100">
+            <template #default="scope">
+              <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.readStatus" />
+            </template>
+          </el-table-column>
+          <el-table-column
+            :label="t('home.read_time')"
+            align="center"
+            prop="readTime"
+            width="180"
+            :formatter="dateFormatter"
+          />
+          <el-table-column
+            :label="t('home.create_time')"
+            align="center"
+            prop="createTime"
+            width="180"
+            :formatter="dateFormatter"
+          />
+          <!-- <el-table-column label="操作" align="center"  fixed="right" width="120">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row)" v-hasPermi="['system:notify-message:query']">
+            <Icon icon="ep:document-copy" />
+            详情
+          </el-button>
+        </template>
+      </el-table-column> -->
+        </el-table>
+      </div>
+      <div class="data1 w-[47.3%]">
+        <div class="title">{{ t('home.latest_deduction_details')}}</div>
+        <el-table :data="tableData" style="width: 100%" stripe height="240px">
+          <el-table-column prop="title" :label="t('home.title')" />
+          <el-table-column prop="name" :label="t('home.publisher')" />
+          <el-table-column prop="date" :label="t('home.publish_date')" />
+        </el-table>
+      </div>
+    </div>
+    <div class="two-row mt-14px">
+      <div class="data1 w-[47.3%]">
+        <!-- 本月退货明细 -->
+        <div class="title">{{t('home.month_return_detials')}}</div>
+        <el-table
+          :data="purchasereturnRecordMonth"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="number" :label="t('home.document_number')" width="180" />
+          <el-table-column prop="fromPackingNumber" :label="t('home.source_package_number')" width="180" />
+          <el-table-column prop="toPackingNumber" :label="t('home.destination_package_number')" width="180" />
+          <el-table-column prop="fromContainerNumber" :label="t('home.source_appliance_number')" width="120" />
+          <el-table-column prop="toContainerNumber" :label="t('home.destination_appliance_number')" width="120" />
+          <el-table-column prop="fromBatch" :label="t('home.source_batch')" width="120" />
+          <el-table-column prop="toBatch" :label="t('home.destination_batch')" width="120" />
+          <el-table-column prop="altBatch" :label="t('home.replace_batch')" width="120" />
+          <el-table-column prop="fromLocationCode" :label="t('home.source_location_code')" width="120" />
+          <el-table-column prop="toLocationCode" :label="t('home.destination_location_code')" width="120" />
+          <el-table-column prop="fromLocationGroupCode" :label="t('home.source_location_group_code')" width="120" />
+          <el-table-column prop="toLocationGroupCode" :label="t('home.destination_location_group_code')" width="120" />
+          <el-table-column prop="fromAreaCode" :label="t('home.source_location_area_code')" width="120" />
+          <el-table-column prop="toAreaCode" :label="t('home.destination_location_area_code')" width="120" />
+          <el-table-column prop="fromOwnerCode" :label="t('home.source_shipper_code')" width="120" />
+          <el-table-column prop="toOwnerCode" :label="t('home.destination_shipper_code')" width="120" />
+          <el-table-column prop="inventoryStatus" :label="t('home.inventory_state')" width="120">
+            <template #default="scope">
+              {{ formatter(scope.row.inventoryStatus,DICT_TYPE.INVENTORY_STATUS) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="poNumber" :label="t('home.order_number')" width="120" />
+          <el-table-column prop="poline" :label="t('home.order_line')" width="120" />
+          <el-table-column prop="reason" :label="t('home.cause')" width="120" />
+          <el-table-column prop="singlePrice" :label="t('home.unit_price')" width="120" />
+          <el-table-column prop="amount" :label="t('home.money')" width="120" />
+          <el-table-column prop="itemCode" :label="t('home.material_code')" width="160" />
+          <el-table-column prop="itemName" :label="t('home.material_name')" width="120" />
+          <el-table-column prop="itemDesc1" :label="t('home.material_description1')" width="120" />
+          <el-table-column prop="itemDesc2" :label="t('home.material_description2')" width="120" />
+          <el-table-column prop="qty" :label="t('home.amount')" width="120" />
+          <el-table-column prop="uom" :label="t('home.measuring_unit')" width="120">
+            <template #default="scope">
+              {{ formatter(scope.row.uom,DICT_TYPE.UOM) }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="projectCode" :label="t('home.item_code')" width="120" />
+          <el-table-column prop="remark" :label="t('home.comment')" width="120" />
+          <el-table-column prop="createTime" :label="t('home.create_time')" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="creator" :label="t('home.creater')" width="120" />
+        </el-table>
+        <el-pagination style="margin-top:10px"
+          v-model:current-page="currentPage_purchasereturn"
+          v-model:page-size="pageSize_purchasereturn"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :small="true"
+          :background="false"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_purchasereturn"
+          @size-change="getPurchasereturnRecordMonth"
+          @current-change="getPurchasereturnRecordMonth"
+        />
+      </div>
+      <div class="data1 w-[47.3%]">
+        <!-- 本月索赔明细 -->
+        <div class="title">{{t('home.claim_details_month')}}</div>
+        <el-table
+          :data="purchaseclaimRecordMonth"
+          style="width: 100%"
+          stripe
+          height="240px"
+        >
+          <el-table-column prop="number" :label="t('home.document_number')" width="180" />
+          <el-table-column prop="fromBatch" :label="t('home.batch')" width="120" />
+          <el-table-column prop="poNumber" :label="t('home.order_number')" width="120" />
+          <el-table-column prop="poline" :label="t('home.order_line')" width="120" />
+          <el-table-column prop="reason" :label="t('home.cause')" width="120" />
+          <el-table-column prop="singlePrice" :label="t('home.unit_price')" width="120" />
+          <el-table-column prop="amount" :label="t('home.money')" width="120" />
+          <el-table-column prop="code" label="代码" width="160" />
+          <el-table-column prop="createTime" :label="t('home.create_time')" width="170">
+            <template #default="scope">
+              <span>{{ formatDate(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="creator" :label="t('home.creater')" width="120" />
+        </el-table>
+        <el-pagination style="margin-top:10px"
+          v-model:current-page="currentPage_purchaseclaim"
+          v-model:page-size="pageSize_purchaseclaim"
+          :page-sizes="[10, 20, 30, 50, 100]"
+          :small="true"
+          :background="false"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="total_purchaseclaim"
+          @size-change="getPurchaseclaimRecordMonth"
+          @current-change="getPurchaseclaimRecordMonth"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import { set } from 'lodash-es'
+import { EChartsOption } from 'echarts'
+import { lineOptions, pieOptions } from '../echarts-data'
+import { formatDate,dateFormatter } from '@/utils/formatTime'
+
+import * as NotifyMessageApi from '@/api/system/notify/message'
+import * as IndexApi from '@/api/home'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+const { t } = useI18n()
+const tableData = [
+  {
+    date: '2016-05-03',
+    name: 'Tom',
+    title: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-02',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-04',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-01',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-01',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  },
+  {
+    date: '2016-05-01',
+    title: 'Tom',
+    name: 'Tom',
+    text: 'No. 189, Grove St, Los Angeles'
+  }
+]
+const supplierData = ref()
+const lineIndex = ref(0)
+// 本月发货单趋势
+const lineOptionsData = reactive<EChartsOption>(lineOptions) as EChartsOption
+const getInvoiceCharts = async () => {
+  set(
+    lineOptionsData,
+    'xAxis.data',
+    supplierData.value.supplierdeliverMonthCount.map((v) => v.date)
+  )
+  set(lineOptionsData, 'legend.data', [t('home.invoice_trend_month')])
+  set(lineOptionsData, 'series', [
+    {
+      name: t('home.invoice_trend_month'),
+      smooth: true,
+      type: 'line',
+      itemStyle: {},
+      animationDuration: 2800,
+      animationEasing: 'quadraticOut',
+      data: supplierData.value.supplierdeliverMonthCount.map((v) => v.count)
+    }
+  ])
+  lineIndex.value++
+}
+//本月发货零件TOP10
+const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
+const getPartTOPCharts = async () => {
+  const data = [
+    { value: 335, name: 'analysis.directAccess' },
+    { value: 310, name: 'analysis.mailMarketing' },
+    { value: 234, name: 'analysis.allianceAdvertising' },
+    { value: 135, name: 'analysis.videoAdvertising' },
+    { value: 1548, name: 'analysis.searchEngines' }
+  ]
+  console.log(supplierData.value.supplierdeliverItemMonthTop)
+  set(
+    pieOptionsData,
+    'legend.data',
+    supplierData.value.supplierdeliverItemMonthTop.map((v) => v.itemCode)
+  )
+  pieOptionsData!.series![0].data = supplierData.value.supplierdeliverItemMonthTop.map((v) => {
+    return {
+      name: v.itemCode,
+      value: v.qty
+    }
+  })
+  lineIndex.value++
+}
+// 获取供应商数据
+const getSupplierData = async () => {
+  IndexApi.getSupplierData().then((res) => {
+    supplierData.value = res
+    getInvoiceCharts()
+    getPartTOPCharts()
+  })
+}
+// 最新消息
+const notaicList = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userType: undefined,
+  userId: undefined,
+  templateCode: undefined,
+  templateType: undefined,
+  createTime: []
+})
+/** 查询列表 */
+const getList = async () => {
+  try {
+    const data = await NotifyMessageApi.getNotifyMessagePage(queryParams)
+    notaicList.value = data.list
+  } finally {
+  }
+}
+const formatter = (type,dict) => {
+  let str = getStrDictOptions(dict).filter((item) => type == item.value)[0]?.label
+  return str
+}
+
+// 本月退货明细
+const currentPage_purchasereturn = ref(1)
+const pageSize_purchasereturn = ref(10)
+const total_purchasereturn= ref(100)
+const purchasereturnRecordMonth = ref([])
+const getPurchasereturnRecordMonth = ()=>{
+    IndexApi.getPurchasereturnRecordMonth({
+      pageNo: currentPage_purchasereturn.value,
+      pageSize: pageSize_purchasereturn.value
+    }).then((res) => {
+      console.log('getPurchasereturnRecordMonth',res)
+      purchasereturnRecordMonth.value = res.list
+      total_purchasereturn.value = res.total
+    })
+}
+// 本月索赔明细
+const currentPage_purchaseclaim = ref(1)
+const pageSize_purchaseclaim = ref(10)
+const total_purchaseclaim= ref(100)
+const purchaseclaimRecordMonth = ref([])
+const getPurchaseclaimRecordMonth = ()=>{
+    IndexApi.getPurchaseclaimRecordMonth({
+      pageNo: currentPage_purchaseclaim.value,
+      pageSize: pageSize_purchaseclaim.value
+    }).then((res) => {
+      console.log('getPurchaseclaimRecordMonth',res)
+      purchaseclaimRecordMonth.value = res.list
+      total_purchaseclaim.value = res.total
+    })
+}
+onMounted( () => {
+  getSupplierData()
+  getList()
+  // 本月索赔明细
+  Promise.all([getPurchaseclaimRecordMonth(),getPurchasereturnRecordMonth()])
+})
+</script>
+<style scoped lang="scss">
+.title {
+  padding-bottom: 10px;
+  border-bottom: 1px solid #dedede;
+  position: relative;
+  padding-left: 10px;
+  &::after {
+    content: '';
+    position: absolute;
+    width: 4px;
+    height: 16px;
+    background: #3c7adf;
+    left: 0px;
+    top: 3px;
+    border-radius: 8px;
+  }
+}
+.data {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .data-item {
+    width: calc(100% / 3);
+    padding: 10px 0px;
+    background: white;
+    .small-title {
+      padding: 0px 14px 10px;
+    }
+    .small-data {
+      display: flex;
+      align-content: center;
+      justify-content: space-between;
+      padding: 0px 14px;
+      .small-data-item {
+        width: 50%;
+        height: 70px;
+        display: flex;
+        align-items: center;
+        border-radius: 6px;
+        color: white;
+        padding: 0px 20px;
+        .small-data-item-txt {
+          flex: 1;
+          div {
+            &:nth-child(1) {
+              font-size: 20px;
+              span {
+                font-size: 12px;
+                padding-left: 6px;
+              }
+            }
+            &:nth-child(2) {
+              font-size: 12px;
+            }
+          }
+        }
+        .img {
+          width: 30px;
+          opacity: 0.5;
+        }
+      }
+      .small-data-item1 {
+        background: linear-gradient(to left, #fd817d, #fcad80);
+      }
+      .small-data-item2 {
+        background: linear-gradient(to left, #46c6fa, #336bfe);
+      }
+      .small-data-item3 {
+        background: linear-gradient(to left, #96a6cc, #595f82);
+      }
+      .small-data-item4 {
+        background: linear-gradient(to left, #08dcd5, #46e2bb);
+      }
+      .small-data-item5 {
+        background: linear-gradient(to left, #f4c46b, #ffb313);
+      }
+      .small-data-item6 {
+        background: linear-gradient(to left, #6eccf8, #02acfd);
+      }
+    }
+  }
+}
+.two-row {
+  display: flex;
+  align-content: center;
+  justify-content: space-between;
+  .data1 {
+    background: white;
+    padding: 14px;
+  }
+}
+</style>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 57e140dcb..39f28f658 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -5,10 +5,10 @@
     <product  v-hasRole="['super_admin']"/>
     <produce  v-hasRole="['super_admin']"/> -->
     <supplierIndex />
-    <material/>
+    <!-- <material/> -->
     <!-- 和 material 中四个table重复了，先去掉了 -->
     <!-- <product/> --> 
-    <produce/>
+    <!-- <produce/> -->
   </div>
 </template>
 <script lang="ts" setup>
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
index c73ed0ee3..33d42c12c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@@ -110,6 +110,26 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  //仅是主列表页面的筛选搜索条件
+  {
+    label: '送达日期',
+    field: 'deliveryDate',
+    sort: 'custom',
+    isDetail:false,
+    isTable: false,
+    isForm:false,
+    isTableForm:false,
+    isSearch:true,
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD',
+        type: 'daterange',
+        defaultTime: [new Date('1 '), new Date('1 ')]
+      }
+    },
+  },
   {
     label: '送达日期',
     field: 'deliveryDate',

From e37348f00ed5177894e767adae84be6b75d12169 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 09:15:54 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E4=B8=8B=E6=9E=B6=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../strategy/downShelfStrategy/AddForm.vue    | 295 +++++++++++-------
 1 file changed, 186 insertions(+), 109 deletions(-)

diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
index 4b075a056..d78685b60 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue
@@ -9,13 +9,14 @@
         label-width="120px"
         label-position="left"
       >
+
         <!-- 规则 -->
         <div class="item">
           <div class="title">规则</div>
           <el-row gutter="10">
             <el-col :span="24">
               <el-form-item label="代码" prop="strategyCode">
-                <el-input
+                <el-input key="strategyCode"
                   v-model="formData.strategyCode"
                   placeholder="请输入代码"
                   clearable
@@ -25,22 +26,22 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="名称" prop="name">
-                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+                <el-input key="name" v-model="formData.name" placeholder="请输入名称" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="描述" prop="description">
-                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+                <el-input key="description" v-model="formData.description" placeholder="请输入描述" clearable />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="优先级" prop="priority">
-                <el-input-number v-model="formData.priority" :min="0" />
+                <el-input-number key="priority" v-model="formData.priority" :min="0" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="状态" prop="status">
-                <el-switch v-model="formData.status" />
+                <el-switch key="status" v-model="formData.status" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -48,13 +49,13 @@
 
         <!-- 规则条件 -->
 
-        <div class="item mt-20px">
-          <div class="title">规则条件</div>
-          <el-row gutter="10">
-            <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
+        <div key="规则条件" class="item mt-20px">
+          <div key="规则条件title" class="title">规则条件</div>
+          <el-row key="规则条件row" :gutter="10">
+            <el-col key="供应商和客户col" :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 选择供应商和客户 -->
-              <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
-                <el-select
+              <el-form-item key="供应商和客户formItem" label="" label-width="0" class="err-240" v-if="index == 0">
+                <el-select key="供应商和客户"
                   v-model="item.ParamCode"
                   placeholder=""
                   style="width: 110px; margin-right: 10px"
@@ -64,10 +65,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="(cur, index) in options.typeOptions"
-                    :key="index"
+                    :key="'供应商和客户'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="供应商和客户Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -76,28 +77,30 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="cur.value"
+                    :key="'供应商和客户Operator'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="供应商和客户Value"
                   v-model="item.Value"
                   :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
                   style="flex: 1"
                   clearable
                   multiple
                   collapse-tags
+                  filterable
+                  :filter-method="filterMethod"
                 >
                   <el-option
                     v-for="cur in options.supplierList"
-                    :key="cur.code"
+                    :key="'供应商和客户Value'+cur.code"
                     :label="cur.name"
                     :value="cur.code"
                   />
                 </el-select>
               </el-form-item>
               <!-- 选择物料类型 -->
-              <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
-                <el-select
+              <el-form-item key="物料类型formItem" label="" label-width="0" class="err-240" v-if="index == 1">
+                <el-select key="物料类型"
                   v-model="item.ParamCode"
                   placeholder=""
                   @change="changeItemsType"
@@ -107,10 +110,10 @@
                     :label="item.label"
                     :value="item.value"
                     v-for="item in options.itemTypeOptions"
-                    :key="item.value"
+                    :key="'物料类型'+item.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="物料类型Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -119,10 +122,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="cur.value"
+                    :key="'物料类型Operator'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="物料类型Value"
                   v-model="item.Value"
                   placeholder="请选择物料类型"
                   style="flex: 1"
@@ -133,12 +136,12 @@
                 >
                   <el-option
                     v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
-                    :key="cur.value"
+                    :key="'物料类型Value'+cur.value"
                     :label="cur.label"
                     :value="cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="ABC类"
                   v-model="item.Value"
                   placeholder="请选择ABC类"
                   style="flex: 1"
@@ -149,26 +152,26 @@
                 >
                   <el-option
                     v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
-                    :key="cur.value"
+                    :key="'ABC类'+cur.value"
                     :label="cur.label"
                     :value="cur.value"
                   />
                 </el-select>
-                <el-input
+                <el-input key="物料分组"
                   v-model="item.Value"
                   placeholder="请输入物料分组，多个物料分组以逗号分隔"
                   clearable
                   style="flex: 1"
                   v-else-if="item.ParamCode == 'ItemGroup'"
                 />
-                <el-input
+                <el-input key="项目"
                   v-model="item.Value"
                   placeholder="请输入项目，多个项目以逗号分隔"
                   clearable
                   style="flex: 1"
                   v-else-if="item.ParamCode == 'Project'"
                 />
-                <el-input
+                <el-input key="物料"
                   v-model="item.Value"
                   placeholder="请输入物料，多个物料以逗号分隔"
                   clearable
@@ -177,8 +180,8 @@
                 />
               </el-form-item>
               <!-- 选择重量体积还是面积 -->
-              <el-form-item label="" label-width="0" class="err-240" v-if="index == 2">
-                <el-select
+              <el-form-item key="重量体积或面积formItem" label="" label-width="0" class="err-240" v-if="index == 2">
+                <el-select key="重量体积或面积"
                   v-model="item.ParamCode"
                   placeholder=""
                   @change="changeCalculation"
@@ -188,10 +191,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.calculationTypeOptions"
-                    :key="cur.value"
+                    :key="'重量体积或面积'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="重量体积或面积Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -200,10 +203,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions2"
-                    :key="cur.value"
+                    :key="'重量体积或面积Operator'+cur.value"
                   />
                 </el-select>
-                <el-input
+                <el-input key="重量体积或面积Value"
                   v-model="item.Value"
                   :placeholder="`请输入${
                     item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'
@@ -213,8 +216,8 @@
                 />
               </el-form-item>
               <!-- 库存状态 -->
-              <el-form-item label="库存状态" class="err-120" v-if="index == 3">
-                <el-select
+              <el-form-item key="库存状态formItem" label="库存状态" class="err-120" v-if="index == 3">
+                <el-select key="库存状态Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -223,10 +226,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="cur.value"
+                    :key="'库存状态Operator'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="库存状态Value"
                   v-model="item.Value"
                   placeholder="请选择库存状态"
                   style="flex: 1"
@@ -236,15 +239,15 @@
                 >
                   <el-option
                     v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
-                    :key="cur.value"
+                    :key="'库存状态Value'+cur.value"
                     :label="cur.label"
                     :value="cur.value"
                   />
                 </el-select>
               </el-form-item>
               <!-- 存储类型 -->
-              <el-form-item label="存储类型" class="err-120" v-if="index == 4">
-                <el-select
+              <el-form-item key="存储类型formItem" label="存储类型" class="err-120" v-if="index == 4">
+                <el-select key="存储类型Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -253,10 +256,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="cur.value"
+                    :key="'存储类型Operator'+cur.value"
                   />
                 </el-select>
-                <el-select
+                <el-select key="存储类型Value"
                   v-model="item.Value"
                   placeholder="请选择存储类型"
                   style="flex: 1"
@@ -266,15 +269,15 @@
                 >
                   <el-option
                     v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
-                    :key="cur.value"
+                    :key="'存储类型Value'+cur.value"
                     :label="cur.label"
                     :value="cur.value"
                   />
                 </el-select>
               </el-form-item>
               <!-- 库存事务 -->
-              <el-form-item label="库存事务" class="err-120" v-if="index == 5">
-                <el-select
+              <el-form-item key="库存事务formItem" label="库存事务" class="err-120" v-if="index == 5">
+                <el-select key="库存事务Operator"
                   v-model="item.Operator"
                   placeholder="请选择范围"
                   style="width: 110px; margin-right: 10px"
@@ -283,10 +286,10 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="cur in options.rangeOptions1"
-                    :key="cur.value"
+                    :key="'库存事务Operator'+cur.value"
                   />
                 </el-select>
-                <el-input
+                <el-input key="库存事务Value"
                   v-model="item.Value"
                   placeholder="请输入库存事务，多个库存事务以逗号分隔"
                   clearable
@@ -298,12 +301,12 @@
         </div>
 
         <!-- 规则配置 -->
-        <div class="item mt-20px">
-          <div class="title">规则配置</div>
-          <el-row gutter="10">
-            <el-col :span="24">
-              <el-form-item label="" label-width="0" prop="warehouse" class="err-120">
-                <el-select
+        <div key="规则配置" class="item mt-20px">
+          <div key="规则配置title" class="title">规则配置</div>
+          <el-row key="规则配置row" :gutter="10">
+            <el-col key="仓库col" :span="24">
+              <el-form-item key="仓库formItem" label="" label-width="0" prop="warehouse" class="err-120">
+                <el-select key="仓库"
                   v-model="warehouseType"
                   placeholder=""
                   style="width: 110px; margin-right: 10px"
@@ -313,19 +316,22 @@
                     :label="cur.label"
                     :value="cur.value"
                     v-for="(cur, index) in options.warehouseTypeOptions"
-                    :key="index"
+                    :key="'仓库'+cur.value"
                   />
                 </el-select>
                 <el-select
                   v-model="formData.configuration.WarehouseCode"
                   v-if="warehouseType == 'WarehouseCode'"
                   placeholder="请选择仓库"
+                  key="请选择仓库"
                   clearable
                   style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.code"
+                    :key="'请选择仓库WarehouseCode'+index+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
@@ -334,12 +340,15 @@
                   v-model="formData.configuration.AreaCode"
                   v-if="warehouseType == 'AreaCode'"
                   placeholder="请选择库区"
+                  key="请选择库区"
                   clearable
                   style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.code"
+                    :key="'请选择库区AreaCode'+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
@@ -348,12 +357,15 @@
                   v-model="formData.configuration.LocationGroupCode"
                   v-if="warehouseType == 'LocationGroupCode'"
                   placeholder="请选择库位组"
+                  key="请选择库位组"
                   clearable
                   style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.code"
+                    :key="'请选择库位组LocationGroupCode'+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
@@ -363,12 +375,15 @@
                   v-model="formData.configuration.LocationCode"
                   v-if="warehouseType == 'LocationCode'"
                   placeholder="请选择库位"
+                  key="请选择库位"
                   clearable
                   style="flex: 1"
+                  filterable
+                  :filter-method="filterMethodWarehouseList"
                 >
                   <el-option
                     v-for="cur in options.warehouseList"
-                    :key="cur.code"
+                    :key="'请选择库位LocationCode'+cur.code"
                     :label="cur.code"
                     :value="cur.code"
                   />
@@ -376,14 +391,14 @@
               </el-form-item>
             </el-col>
             <!-- 数量排序方向 -->
-            <el-col :span="24">
-              <el-form-item label="数量排序方向" class="flex-top">
+            <el-col key="数量排序方向col" :span="24">
+              <el-form-item key="数量排序方向formItem" label="数量排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.QtyOrderDirection">
+                  <el-radio-group key="数量排序方向" v-model="formData.configuration.QtyOrderDirection">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
-                      :key="cur.value"
+                      :key="'数量排序方向'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -391,14 +406,14 @@
               </el-form-item>
             </el-col>
             <!-- 巷道排序方向 -->
-            <el-col :span="24">
-              <el-form-item label="巷道排序方向" class="flex-top">
+            <el-col key="巷道排序方向col" :span="24">
+              <el-form-item key="巷道排序方向formItem" label="巷道排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.AisleOrder">
+                  <el-radio-group key="巷道排序方向" v-model="formData.configuration.AisleOrder">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
-                      :key="cur.value"
+                      :key="'巷道排序方向'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -406,14 +421,14 @@
               </el-form-item>
             </el-col>
             <!-- 货架排序方向 -->
-            <el-col :span="24">
-              <el-form-item label="货架排序方向" class="flex-top">
+            <el-col key="货架排序方向col" :span="24">
+              <el-form-item key="货架排序方向formItem" label="货架排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.ShelfOrder">
+                  <el-radio-group key="货架排序方向" v-model="formData.configuration.ShelfOrder">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
-                      :key="cur.value"
+                      :key="'货架排序方向'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -421,14 +436,14 @@
               </el-form-item>
             </el-col>
             <!-- 行排序方向 -->
-            <el-col :span="24">
-              <el-form-item label="行排序方向" class="flex-top">
+            <el-col key="行排序方向col" :span="24">
+              <el-form-item key="行排序方向formItem" label="行排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.RowOrder">
+                  <el-radio-group  key="行排序方向" v-model="formData.configuration.RowOrder">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
-                      :key="cur.value"
+                      :key="'行排序方向'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -436,14 +451,14 @@
               </el-form-item>
             </el-col>
             <!-- 列排序方向 -->
-            <el-col :span="24">
-              <el-form-item label="列排序方向" class="flex-top">
+            <el-col key="列排序方向col" :span="24">
+              <el-form-item key="列排序方向formItem" label="列排序方向" class="flex-top">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.ColumOrder">
+                  <el-radio-group key="列排序方向" v-model="formData.configuration.ColumOrder">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in options.sortOptions"
-                      :key="cur.value"
+                      :key="'列排序方向'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -452,8 +467,8 @@
             </el-col>
             <!-- 优先整包 -->
             <el-col :span="24">
-              <el-form-item label="优先整包">
-                <el-switch
+              <el-form-item key="优先整包formItem" label="优先整包">
+                <el-switch key="优先整包"
                   v-model="formData.configuration.EntirePackageFirst"
                   active-value="TRUE"
                   inactive-value="FALSE"
@@ -461,14 +476,14 @@
               </el-form-item>
             </el-col>
             <!-- 发料包装类型 -->
-            <el-col :span="24">
-              <el-form-item label="发料包装类型">
+            <el-col key="发料包装类型col" :span="24">
+              <el-form-item key="发料包装类型formItem" label="发料包装类型">
                 <div class="checkbox">
-                  <el-radio-group v-model="formData.configuration.IssueStorageType">
+                  <el-radio-group key="发料包装类型" v-model="formData.configuration.IssueStorageType">
                     <el-radio
                       :label="cur.value"
                       v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
-                      :key="cur.value"
+                      :key="'发料包装类型'+cur.value"
                       >{{ cur.label }}</el-radio
                     >
                   </el-radio-group>
@@ -476,9 +491,9 @@
               </el-form-item>
             </el-col>
             <!-- 多次发料 -->
-            <el-col :span="7">
-              <el-form-item label="多次发料">
-                <el-switch
+            <el-col key="多次发料col" :span="7">
+              <el-form-item key="多次发料formItem" label="多次发料">
+                <el-switch  key="多次发料"
                   v-model="formData.configuration.IsSplit"
                   active-value="TRUE"
                   inactive-value="FALSE"
@@ -486,9 +501,9 @@
               </el-form-item>
             </el-col>
             <!-- 拆分次数 -->
-            <el-col :span="8">
-              <el-form-item label="拆分次数" label-width="70px">
-                <el-input-number
+            <el-col key="拆分次数col" :span="8">
+              <el-form-item key="拆分次数formItem" label="拆分次数" label-width="70px">
+                <el-input-number key="拆分次数"
                   v-model="formData.configuration.EachTimeQty"
                   :min="0"
                   controls-position="right"
@@ -496,9 +511,9 @@
               </el-form-item>
             </el-col>
             <!-- 时间间隔 -->
-            <el-col :span="9">
-              <el-form-item label="时间间隔" label-width="70px">
-                <el-input-number
+            <el-col key="时间间隔col" :span="9">
+              <el-form-item key="时间间隔formItem" label="时间间隔" label-width="70px">
+                <el-input-number key="时间间隔"
                   v-model="formData.configuration.TimeInterval"
                   :min="0"
                   style="flex: 1; margin-right: 10px"
@@ -507,9 +522,9 @@
               </el-form-item>
             </el-col>
             <!-- 使用整理库位-->
-            <el-col :span="24">
-              <el-form-item label="使用整理库位">
-                <el-switch
+            <el-col key="使用整理库位col" :span="24">
+              <el-form-item key="使用整理库位formItem" label="使用整理库位">
+                <el-switch key="使用整理库位"
                   v-model="formData.configuration.UseOrganizeLocation"
                   active-value="TRUE"
                   inactive-value="FALSE"
@@ -517,9 +532,9 @@
               </el-form-item>
             </el-col>
             <!-- 使用在途库位 -->
-            <el-col :span="24">
-              <el-form-item label="使用在途库位">
-                <el-switch
+            <el-col key="使用在途库位col" :span="24">
+              <el-form-item key="使用在途库位formItem"  label="使用在途库位">
+                <el-switch key="使用在途库位"
                   v-model="formData.configuration.UseTransportLocation"
                   active-value="TRUE"
                   inactive-value="FALSE"
@@ -527,9 +542,9 @@
               </el-form-item>
             </el-col>
             <!-- 生成接收任务 -->
-            <el-col :span="24">
-              <el-form-item label="生成接收任务">
-                <el-switch
+            <el-col key="生成接收任务col" :span="24">
+              <el-form-item key="生成接收任务formItem" label="生成接收任务">
+                <el-switch key="生成接收任务"
                   v-model="formData.configuration.CreateReceiptJob"
                   active-value="TRUE"
                   inactive-value="FALSE"
@@ -672,6 +687,7 @@ const options = reactive({
   ],
   //供应商列表
   supplierList: [],
+  originSupplierList: [],
   // 物料类型列表
   itemTypeOptions: [
     { value: 'ItemType', label: '物料类型' },
@@ -694,6 +710,7 @@ const options = reactive({
     { value: 'LocationCode', label: '库位' }
   ],
   warehouseList: [],
+  originWarehouseList: [],
   // 排列方式
   sortOptions: [
     { value: 'ASC', label: '从小到大' },
@@ -719,11 +736,26 @@ const buttonBaseClick = (val, item) => {
 
 // 获取供应商列表
 const getFormSupplierList = async () => {
-  options.supplierList = await getSupplierList()
+  options.originSupplierList = await getSupplierList(null)
+  options.supplierList = [...options.originSupplierList]
 }
 // 获取客户列表
 const getFormCustomerList = async () => {
-  options.supplierList = await getCustomerList()
+  options.originSupplierList = await getCustomerList(null)
+  options.supplierList = [...options.originSupplierList]
+}
+const filterMethod = (query: string) => {
+  if (query) {
+    options.supplierList = options.originSupplierList.filter((item) => {
+      if(!item.name||item.name==''){
+        return item.code.includes(query)
+      }else{
+        return item.name.includes(query)
+      }
+    })
+  } else {
+    options.supplierList = [...options.originSupplierList]
+  }
 }
 // 选择客户还是承运商
 const changeSupplierCustomer = (e) => {
@@ -745,19 +777,64 @@ const changeCalculation = () => {
 }
 // 获取仓库列表
 const getFormWarehouseList = async () => {
-  options.warehouseList = await getWarehouseList()
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList = await getWarehouseList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
 }
 // 获取库区列表
 const getFormAreaList = async () => {
-  options.warehouseList = await getAreaList()
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList = await getAreaList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
 }
 // 获取库位组列表
 const getFormLocationgrouList = async () => {
-  options.warehouseList = await getLocationgroupList()
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList = await getLocationgroupList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
 }
 // 获取库位列表
 const getFormLocationList = async () => {
-  options.warehouseList = await getLocationList()
+  const loading = ElLoading.service({
+    lock: true,
+    text: t('ts.加载中'),
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  options.originWarehouseList =  await getLocationList()
+  options.warehouseList = [...options.originWarehouseList]
+  nextTick(()=>{
+    loading.close()
+  })
+}
+const filterMethodWarehouseList = (query: string) => {
+  if (query) {
+    options.warehouseList = options.originWarehouseList.filter((item) => {
+      return item.code.includes(query)
+    })
+  } else {
+    options.warehouseList = options.originWarehouseList
+  }
 }
 getFormWarehouseList()
 // 选择仓库/库位/库位组/库区

From 3ee35adc946f5a8c0ba90b98fa4f563b20ef0de3 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 09:33:47 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E5=85=A8=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SearchTable/src/SearchTable.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/SearchTable/src/SearchTable.vue b/src/components/SearchTable/src/SearchTable.vue
index e3790bca0..c7f7cd534 100644
--- a/src/components/SearchTable/src/SearchTable.vue
+++ b/src/components/SearchTable/src/SearchTable.vue
@@ -63,7 +63,7 @@ const HeadButttondata = ref(multipleBol.value?
 [
   defaultButtons.defaultWhenPageBtn(null), // 选择当页
   defaultButtons.defaultUnselectPageBtn(null), // 反选当页
-  defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+  // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
   defaultButtons.defaultFilterBtn(null), // 筛选
 ]:[
   defaultButtons.defaultFilterBtn(null) // 筛选
@@ -90,7 +90,7 @@ const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any
   HeadButttondata.value = multiple?[
     defaultButtons.defaultWhenPageBtn(null), // 选择当页
     defaultButtons.defaultUnselectPageBtn(null), // 反选当页
-    defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+    // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
     defaultButtons.defaultFilterBtn(null), // 筛选
   ]:[
     defaultButtons.defaultFilterBtn(null), // 筛选
@@ -108,7 +108,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   HeadButttondata.value = multiple?[
     defaultButtons.defaultWhenPageBtn(null), // 选择当页
     defaultButtons.defaultUnselectPageBtn(null), // 反选当页
-    defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+    // defaultButtons.defaultDeselectAllBtn(null), // 取消全选
     defaultButtons.defaultFilterBtn(null), // 筛选
   ]:
   [

From b7b7314c05d4c104510bd76ac4d0cf1968c77f43 Mon Sep 17 00:00:00 2001
From: zhaoyiran <zhaoyrd@yonyou.com>
Date: Thu, 6 Jun 2024 10:33:22 +0800
Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inventoryinitRequestMain.data.ts          | 55 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
index caf35f2c8..dd1a97c83 100644
--- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts
@@ -893,8 +893,53 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'balancePackUnit',
     sort: 'custom',
     table: {
-      width: 150
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
     },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'itemCode',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPage,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isTableRowValue: true,
+          isMainValue:false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
   },
   {
     label: '备注',
@@ -1018,4 +1063,10 @@ export const InventoryinitRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+  packUnit:[
+    { required: true, message: '请选择包装规格', trigger: 'change' }
+  ],
+  balancePackUnit:[
+    { required: true, message: '请选择入库存包装规格', trigger: 'change' }
+  ],
+})

From fcba1385f0ef1820ad68db3d1abec1c7d49c9dd9 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 10:47:48 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts | 5 ++++-
 src/locales/zh-CN.ts | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 88b4bc3f5..9b78379e3 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1122,7 +1122,10 @@ export default {
     忘记密码:'Forget  Password',
     用户名:'User Name',
     邮箱:'Mail',
-    今日:'Today'
+    今日:'Today',
+    请输入驳回原因:'Please enter the reason for rejection',
+    '驳回原因不能为空，且不超过60字':'The reason for rejection cannot be empty and cannot exceed 60 words'
+
   },
   
 
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 5f15f2fec..d0efaf74e 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1122,7 +1122,9 @@ export default {
     忘记密码:'忘记密码',
     用户名:'用户名',
     邮箱:'邮箱',
-    今日:'今日'
+    今日:'今日',
+    请输入驳回原因:'请输入驳回原因',
+    '驳回原因不能为空，且不超过60字':'驳回原因不能为空，且不超过60字'
 
 
   },

From 5bfde1eb89a3ecfcf3f811d677a4568a8ecc19d7 Mon Sep 17 00:00:00 2001
From: lidm0086 <lidm0086@163.com>
Date: Thu, 6 Jun 2024 10:48:02 +0800
Subject: [PATCH 06/10] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=94=B6=E6=96=99?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=E4=BF=AE=E6=94=B9=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20=E4=BB=8E=E5=8C=85=E8=A3=85=E5=8F=B7=20?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=20=E5=8C=85=E8=A3=85=E5=8F=B7=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20=E5=88=B0?=
 =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionreceiptRecordMain.data.ts        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
index 80498d31c..6f37534b6 100644
--- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
+++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts
@@ -257,7 +257,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  
+
   {
     label: '到仓库代码',
     field: 'toWarehouseCode',
@@ -402,7 +402,7 @@ export const ProductionreceiptRecordMainRules = reactive({
  */
 export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '从包装号',
+    label: '包装号',
     field: 'fromPackingNumber',
     sort: 'custom',
     table: {
@@ -418,7 +418,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
     hiddenInMain: true
   },
   {
@@ -596,7 +596,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     sortSearchDefault:2,
     sortTableDefault:4,
   },
-  
+
   {
     label: '物料名称',
     field: 'itemName',
@@ -746,7 +746,7 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
     isTable: false,
     hiddenInMain:true,
   },
-  
+
   // {
   //   label: '任务明细ID',
   //   field: 'jobDetailId',
@@ -755,9 +755,9 @@ export const ProductionreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[
   //     width: 150
   //   },
   // },
-  
-  
-  
+
+
+
 ]))
 
 //表单校验
@@ -807,4 +807,4 @@ export const ProductionreceiptRecordDetailRules = reactive({
   creator: [
     { required: true, message: '请输入创建者', trigger: 'blur' }
   ],
-})
\ No newline at end of file
+})

From 97648d4fdaaa5669c15e6bac75b9c243d9fbfc99 Mon Sep 17 00:00:00 2001
From: lidm0086 <lidm0086@163.com>
Date: Thu, 6 Jun 2024 10:48:37 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E5=8A=A0=E5=A4=87=E6=B3=A8=20=E5=A4=87?=
 =?UTF-8?q?=E6=96=99=E8=AE=A1=E5=88=92>=E6=96=B0=E5=A2=9E=20=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E8=AE=A1=E5=88=92=E5=8D=95=E5=8F=B7=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=EF=BC=9Apage=20=E5=92=8C=20senior=20=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=8D=E4=B8=80=E8=87=B4=20senior=20?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=BF=A1=E6=81=AF=20search?=
 =?UTF-8?q?Condition=20=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=20planType=20=3D=20predict?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preparetoissueMain/preparetoissueMain.data.ts               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
index 7203d1460..5eb6c75f2 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts
@@ -240,7 +240,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
           value: 'TRUE',
           isMainValue: false
         },
-        {
+        {//备料计划>新增 生产计划单号选择：page 和 senior 查询条件不一致 senior 生产计划信息 searchCondition 添加查询条件 planType = predict
           key: 'planType',
           value: 'predict',
           isMainValue: false

From c9da71e7ab62578ab91ac42dccbdaab871f24d01 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 11:39:10 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en-US.ts                          |  3 +-
 src/locales/zh-CN.ts                          |  3 +-
 src/utils/disposition/defaultButtons.ts       |  2 +-
 .../supplierdeliver/purchaseMain/index.vue    | 50 +++++++++++++++++--
 4 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index 9b78379e3..3c66794e2 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1124,7 +1124,8 @@ export default {
     邮箱:'Mail',
     今日:'Today',
     请输入驳回原因:'Please enter the reason for rejection',
-    '驳回原因不能为空，且不超过60字':'The reason for rejection cannot be empty and cannot exceed 60 words'
+    '驳回原因不能为空，且不超过60字':'The reason for rejection cannot be empty and cannot exceed 60 words',
+    批量发布:'Batch release'
 
   },
   
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index d0efaf74e..d31022a59 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1124,7 +1124,8 @@ export default {
     邮箱:'邮箱',
     今日:'今日',
     请输入驳回原因:'请输入驳回原因',
-    '驳回原因不能为空，且不超过60字':'驳回原因不能为空，且不超过60字'
+    '驳回原因不能为空，且不超过60字':'驳回原因不能为空，且不超过60字',
+    批量发布:'批量发布'
 
 
   },
diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts
index 1bf11445b..25cb20558 100644
--- a/src/utils/disposition/defaultButtons.ts
+++ b/src/utils/disposition/defaultButtons.ts
@@ -559,7 +559,7 @@ export function mainListOrderPubBtn(option:any) {
 // 主列表-订单流程-批量发布按钮
 export function mainListSelectionOrderPubBtn(option:any) {
   return __defaultBtnOption(option,{
-    label: t(`ts.发布`).replace('ts.', ''),
+    label: t(`ts.批量发布`).replace('ts.', ''),
     name: 'mainOrderSelectionPub',
     hide: false,
     type: 'primary',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
index 5664f6f56..780e58776 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...PurchaseMain.allSchemas.searchSchema,...PurchaseDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PurchaseMain.allSchemas.searchSchema,...PurchaseDetail.allSchemas.searchSchema]" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -9,10 +9,12 @@
     @updataTableColumns="updataTableColumns" @searchFormClick="searchFormClick" :allSchemas="PurchaseMain.allSchemas" :detailAllSchemas="PurchaseDetail.allSchemas" />
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable ref="elTableRef"  :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table v-clientTable ref="elTableRef"
+    :selection="true"
+    :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
-      v-model:sort="tableObject.sort" >
+      v-model:sort="tableObject.sort" @getSelectionRows="getSelectionRows">
     <!-- <Table ref="elTableRef"  :expand="true" :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
         total: tableObject.total
       }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
@@ -227,6 +229,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
     defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-main:create' }), // 新增
     defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-main:import' }), // 导入
     defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-main:export' }), // 导出
+    defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -256,6 +259,8 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
     } else {
       getList()
     }
+    } else if (val=='mainOrderSelectionPub'){// 批量发布
+      handleSelectionPublish()
     } else if (val == 'filtrate') { // 筛选
     } else { // 其他按钮
       console.log('其他按钮', item)
@@ -403,7 +408,44 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc
       tableObject.loading = false
     }
   }
-
+  const searchList = (model)=>{
+    selectionRows.value = []
+    setSearchParams(model)
+  }
+  const selectionRows = ref<any>([])
+  const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+    console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+    const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+    if(currentRows){
+      currentRows.selectionRows = currentPageSelectionRows
+    }else{
+      selectionRows.value.push({
+        currentPage,
+        selectionRows:currentPageSelectionRows
+      })
+    }
+  }
+  // 批量发布
+  const handleSelectionPublish = async ()=>{
+  // 发布的二次确认
+  await message.confirm(t('ts.是否发布所选中数据？'))
+  tableObject.loading = true
+  let rows:any = []
+  selectionRows.value.map(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.masterId)]
+  })
+  tableObject.loading = true
+  Promise.all( rows.map(item=>PurchaseMainApi.publishPurchaseMain(item))).then((res) => {
+    console.log('发布',res)
+    if(res.every(item=>item==true)){
+      message.success(t('ts.发布成功!'))
+    }
+  }).finally(()=>{
+    tableObject.loading = false
+    // 刷新列表
+    getList()
+  })
+}
   /** 发布按钮操作 */
   const handlePublish = async (id : number) => {
     try {

From 006c7998d1c4809930c62ba498650fe205b3ae2f Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 6 Jun 2024 11:41:36 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/inventoryManage/balance/index.vue     | 22 +++++++++----------
 .../inventorychangeRequestMain.data.ts        |  6 ++++-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index bc9a950bc..d7fd2b8da 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{
 }
 // 列表-操作按钮
 const butttondata = [
-  // {
-  //   label: '标签信息',
-  //   name: 'bqxx',
-  //   hide: false,
-  //   type: 'primary',
-  //   icon: '',
-  //   color: '',
-  //   link: true,
-  //   float:'right',
-  //   hasPermi: ''
-  // },
+  {
+    label: '标签信息',
+    name: 'bqxx',
+    hide: false,
+    type: 'primary',
+    icon: '',
+    color: '',
+    link: true,
+    float:'right',
+    hasPermi: ''
+  },
   defaultButtons.mainListPointBtn(null), // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除
diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
index b29734a9b..b105b47c0 100644
--- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts
@@ -19,15 +19,19 @@ const queryParams = {
 const businessTypeQueryParams = {
   pageSize:10,
   pageNo:1,
-  code:'Change'
+  code:'Change',
+  name:'库存修改'
 }
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
  const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams)
  const businessTypeData =businessTypeValue?.list[0]||{}
+ console.log(businessTypeData.code);
+ 
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
+import { log } from 'console'
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到

From 03d7b9d1f9c4a65209023cdee51f0b7baa35eb2a Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 6 Jun 2024 11:42:26 +0800
Subject: [PATCH 10/10] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/inventoryManage/balance/index.vue     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue
index d7fd2b8da..bc9a950bc 100644
--- a/src/views/wms/inventoryManage/balance/index.vue
+++ b/src/views/wms/inventoryManage/balance/index.vue
@@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{
 }
 // 列表-操作按钮
 const butttondata = [
-  {
-    label: '标签信息',
-    name: 'bqxx',
-    hide: false,
-    type: 'primary',
-    icon: '',
-    color: '',
-    link: true,
-    float:'right',
-    hasPermi: ''
-  },
+  // {
+  //   label: '标签信息',
+  //   name: 'bqxx',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: '',
+  //   color: '',
+  //   link: true,
+  //   float:'right',
+  //   hasPermi: ''
+  // },
   defaultButtons.mainListPointBtn(null), // 标签打印
   // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑
   // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除