From 8900951225b5379dc6b444678d9cebcbca271347 Mon Sep 17 00:00:00 2001
From: 13208366016 <47278630@qq.com>
Date: Sat, 11 Nov 2023 15:53:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=AD=97=E6=AE=B5=EF=BC=8C=E6=90=9C=E7=B4=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionDeliveryListmar.vue           | 14 ++++++++++++-
 .../reservation/reservationAddFrom.vue        | 14 +++++++++++--
 .../stockup/distributionStockupMarket.vue     | 21 ++++++++++++++++++-
 vite.config.js                                |  4 ++--
 4 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
index db2d437c..dd64bb0b 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue
@@ -6,6 +6,9 @@
         <el-form :inline="true" :model="query" class="fr-fo">
           <el-form-item label="配送车次:">
             <el-input v-model="query.trainNumber" placeholder="请输入配送车次"></el-input>
+          </el-form-item>
+            <el-form-item label="客户名称:">
+            <el-input v-model="query.clineName" placeholder="请客户名称"></el-input>
           </el-form-item>
           <el-form-item label="配送日期:" class="el-times">
             <el-date-picker v-model="query.taskTime" type="date" placeholder="选择日期">
@@ -413,7 +416,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-
+        {
+          prop: 'clineName',
+          label: '客户名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'kindName',
           label: '配送种类',
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 8ef46d18..f68746c7 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -124,7 +124,7 @@
 
             <el-tabs type="border-card">
                 <el-tab-pane label="订单">
-                    <el-button type="primary" link @click="handleAddOrder">新 增</el-button>
+                    <el-button  class='el-btn-xz' type="primary" link @click="handleAddOrder">新 增</el-button>
                     <tablecmt
                             :columnList="columnList"
                             :tableData="orderData"
@@ -199,7 +199,7 @@
                 </el-tab-pane>
 
                 <el-tab-pane label="库存品">
-                    <el-button link @click="handleAddInventory">新 增</el-button>
+                    <el-button class='el-btn-xz' link @click="handleAddInventory">新 增</el-button>
                     <tablecmt
                             :columnList="stockcolumnList"
                             :tableData="inventoryData"
@@ -2930,3 +2930,13 @@
         -moz-appearance: textfield;
     }
 </style>
+
+<style lang='scss' scoped>
+.el-btn-xz{
+      width: 68px;
+    height: 26px;
+    border: 1px solid;
+    margin-bottom: 8px;
+    border-radius: 4px;
+}
+</style>
diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue
index 36015aa8..8a0711fb 100644
--- a/src/views/distribution/stockup/distributionStockupMarket.vue
+++ b/src/views/distribution/stockup/distributionStockupMarket.vue
@@ -13,7 +13,8 @@
           <el-form-item label="指派状态;1-未指派、2-已指派:">
             <el-input v-model="query.assignStatus" placeholder="请输入指派状态;1-未指派、2-已指派"></el-input>
           </el-form-item>-->
-          <el-form-item label="备货时间:" class="el-times">
+          <div class='el-input-so'>
+           <el-form-item label="备货时间:" class="el-times">
             <el-date-picker
               v-model="stockupDate"
               type="datetimerange"
@@ -24,6 +25,10 @@
               :shortcuts="shortcuts"
             />
           </el-form-item>
+           <el-form-item style="margin-left: 24px;"  label="客户名称">
+            <el-input v-model="query.consignee" placeholder="请输入客户名称" />
+          </el-form-item> 
+          </div>
           <!-- 查询按钮 -->
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
@@ -340,6 +345,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'consignee',
+          label: '客户名称',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'stockupDate',
           label: '备货时间',
@@ -1142,5 +1158,8 @@ export default {
   flex: 1;
   display: flex;
  align-items: flex-end;
+}
+.el-input-so{
+
 }
 </style>
diff --git a/vite.config.js b/vite.config.js
index c695de61..1dd07766 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -18,9 +18,9 @@ export default ({ mode, command }) => {
           // lmy
           // target: 'http://192.168.10.123:8889',
           // cyz
-          target: 'http://192.168.10.75:8777',
+          // target: 'http://192.168.10.75:8777',
           // tjj
-          // target: 'http://192.168.10.29:13000',
+          target: 'http://192.168.10.29:13000',
           // sst
           // target: 'http://192.168.10.94:8888',
           // target: 'http://192.168.10.29:13000',