From a0790a6e191672cdebee9fdf776e3cafd16b4daa Mon Sep 17 00:00:00 2001
From: juzi <819872918@qq.com>
Date: Tue, 28 Nov 2023 16:42:40 +0800
Subject: [PATCH] 11.28

---
 src/api/base/delivery.js                                 | 9 +++++++++
 src/styles/index.scss                                    | 6 +++++-
 .../delivery/deliveryLog/components/addOrUpdate.vue      | 9 ++++-----
 .../energyPlcConnect/components/energyPlcConnectAdd.vue  | 2 +-
 .../energyPlcConnect/components/energyPlcParamAdd.vue    | 2 +-
 .../monitoring/energyLimit/components/energyLimitAdd.vue | 2 +-
 .../energyStatistics/components/energyStatisticsAdd.vue  | 2 +-
 .../group/base/groupTeam/components/groupTeamAdd.vue     | 2 +-
 .../order/base/orderManage/components/addWorkOrder.vue   | 2 +-
 src/views/order/base/orderManage/components/orderAdd.vue | 6 +++---
 .../order/monitoring/orderCompletionMonitoring/index.vue | 7 +++++--
 11 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/api/base/delivery.js b/src/api/base/delivery.js
index 82c371c3..d04fd210 100644
--- a/src/api/base/delivery.js
+++ b/src/api/base/delivery.js
@@ -18,6 +18,15 @@ export function deliveryProgressPage(data) {
   })
 }
 
+// 获取订单列表
+export function listOrderList(query) {
+  return request({
+    url: '/extend/delivery-log/listOrderList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 获取发货进度分页
 export function deliveryLogDetPage(data) {
   return request({
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 6b3ebaee..d162abed 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -196,4 +196,8 @@ input, textarea{
   margin-right: 8px;
   vertical-align: middle;
 }
-// 抽屉head区域---end
\ No newline at end of file
+// 抽屉head区域---end
+// 弹出框，上下分布，去掉label的padding-bottom
+.el-form--label-top .el-form-item__label {
+  padding: 0;
+}
\ No newline at end of file
diff --git a/src/views/delivery/deliveryLog/components/addOrUpdate.vue b/src/views/delivery/deliveryLog/components/addOrUpdate.vue
index 45f3f48f..15c43943 100644
--- a/src/views/delivery/deliveryLog/components/addOrUpdate.vue
+++ b/src/views/delivery/deliveryLog/components/addOrUpdate.vue
@@ -3,7 +3,7 @@
     <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="订单名" prop="orderId">
-          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.orderId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in orderList"
               :key="item.id"
@@ -39,7 +39,7 @@
     <el-row :gutter="20">
       <el-col :span='6'>
         <el-form-item label="发货负责人" prop="deliveryPersonId">
-          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.deliveryPersonId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in personList"
               :key="item.id"
@@ -75,9 +75,8 @@
   </el-form>
 </template>
 <script>
-import { orderList } from '@/api/base/orderManage'
 import { getWorkerList } from '@/api/base/worker'
-import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog } from '@/api/base/delivery'
+import { deliveryLogCreate, deliveryLogUpdate, getDeliveryLog, listOrderList } from '@/api/base/delivery'
 export default {
   name: 'AddOrUpdate',
   data() {
@@ -116,7 +115,7 @@ export default {
       }
     },
     getSelectList() {
-      orderList().then(res => {
+      listOrderList().then(res => {
         this.orderList = res.data || []
       })
       getWorkerList().then(res => {
diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
index 412e649d..1ccd2a15 100644
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
+++ b/src/views/energy/base/energyPlcConnect/components/energyPlcConnectAdd.vue
@@ -1,7 +1,7 @@
 <template>
   <el-form ref="form" :rules="rules" label-width="100px" :model="form">
     <el-form-item label="关联表名" prop="plcId">
-      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;">
+      <el-select v-model="form.plcId" placeholder="请选择" style="width: 100%;" filterable>
         <el-option
           v-for="item in plcList"
           :key="item.id"
diff --git a/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue b/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
index 1e14ce35..6eed9ca8 100644
--- a/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
+++ b/src/views/energy/base/energyPlcConnect/components/energyPlcParamAdd.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="typeId">
-          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.typeId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in energyListType"
               :key="item.id"
diff --git a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
index 667e1711..f963e713 100644
--- a/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
+++ b/src/views/energy/monitoring/energyLimit/components/energyLimitAdd.vue
@@ -15,7 +15,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="energyTypeId">
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" @change="toggleType">
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable @change="toggleType">
             <el-option
               v-for="item in this.energyTypeList"
               :key="item.id"
diff --git a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue
index 0326ec95..2d9c8440 100644
--- a/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue
+++ b/src/views/energy/monitoring/energyStatistics/components/energyStatisticsAdd.vue
@@ -27,7 +27,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="能源类型" prop="energyTypeId">
-          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.energyTypeId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in energyListType"
               :key="item.id"
diff --git a/src/views/group/base/groupTeam/components/groupTeamAdd.vue b/src/views/group/base/groupTeam/components/groupTeamAdd.vue
index 249facd2..750e063f 100644
--- a/src/views/group/base/groupTeam/components/groupTeamAdd.vue
+++ b/src/views/group/base/groupTeam/components/groupTeamAdd.vue
@@ -15,7 +15,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item label="班组组长" prop="leaderId">
-          <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" @change="selectLeader">
+          <el-select v-model="form.leaderId" placeholder="请选择" style="width: 100%;" filterable @change="selectLeader">
             <el-option
               v-for="item in workerList"
               :key="item.id"
diff --git a/src/views/order/base/orderManage/components/addWorkOrder.vue b/src/views/order/base/orderManage/components/addWorkOrder.vue
index 100fd955..45f2a62e 100644
--- a/src/views/order/base/orderManage/components/addWorkOrder.vue
+++ b/src/views/order/base/orderManage/components/addWorkOrder.vue
@@ -6,7 +6,7 @@
           <el-input v-model="form.name"></el-input>
         </el-form-item>
         <el-form-item label="工单名称" prop="workOrderId"  v-if='isBind'>
-          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" @change="getWorkOrderMsg">
+          <el-select v-model="form.workOrderId" placeholder="请选择" style="width: 100%;" filterable @change="getWorkOrderMsg">
             <el-option
               v-for="item in workOrderList"
               :key="item.id"
diff --git a/src/views/order/base/orderManage/components/orderAdd.vue b/src/views/order/base/orderManage/components/orderAdd.vue
index 4ef85ec2..df871a9e 100644
--- a/src/views/order/base/orderManage/components/orderAdd.vue
+++ b/src/views/order/base/orderManage/components/orderAdd.vue
@@ -18,7 +18,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="产品名称" prop="planProductId">
-          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;">
+          <el-select v-model="form.planProductId" placeholder="请选择" style="width: 100%;" filterable>
             <el-option
               v-for="item in productList"
               :key="item.id"
@@ -39,7 +39,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="客户" prop="customerId">
-          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable>
+          <el-select v-model="form.customerId" placeholder="请选择" style="width: 100%;" clearable filterable>
             <el-option
               v-for="item in customerList"
               :key="item.id"
@@ -82,7 +82,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="关联工艺" prop="processFlowId">
-          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable @change="processFlowIdChange">
+          <el-select v-model="form.processFlowId" placeholder="请选择" style="width: 100%;" clearable filterable @change="processFlowIdChange">
             <el-option
               v-for="item in processFlowList"
               :key="item.id"
diff --git a/src/views/order/monitoring/orderCompletionMonitoring/index.vue b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
index 81ef0549..b2a469cd 100644
--- a/src/views/order/monitoring/orderCompletionMonitoring/index.vue
+++ b/src/views/order/monitoring/orderCompletionMonitoring/index.vue
@@ -154,7 +154,7 @@ export default {
       },
       tableProps,
       list: [],
-      tableH: this.tableHeight(315),
+      tableH: this.tableHeight(305),
       total: 0,
       tableBtn: [
       this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
@@ -215,7 +215,7 @@ export default {
   components: { MonitoringRingCharts },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(315)
+      this.tableH = this.tableHeight(305)
     })
     let start = moment().subtract(30, 'days').format('yyyy-MM-DD')
     let end = moment().format('yyyy-MM-DD')
@@ -347,6 +347,9 @@ export default {
   .el-tabs__item {
     color: rgba(0, 0, 0, 0.45);
   }
+  .searchBarBox {
+    margin-bottom: 0;
+  }
   .boxTitle {
     display: inline-block;
     font-size: 16px;
-- 
2.45.2