From 7371c0ff4d7aef9e5984acb4f82cdb41966b4646 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Thu, 21 Dec 2023 20:57:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=8D=95?=
 =?UTF-8?q?=E5=BD=95=E5=8D=95=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tablecmt/tablecmt.vue          |  6 +++++
 .../distribution/inventory/CreateOrder.vue    | 27 +++++++++++--------
 src/views/waybill/CreateZeroOrder.vue         | 27 +++++++++++--------
 vite.config.js                                |  4 +--
 4 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue
index 1ceb2ba6..b678a093 100644
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@@ -785,4 +785,10 @@ defineExpose({ handleCheckSelect });
 .el-input {
   // width: 200px !important;
 }
+
+.el-table__footer {
+  tr {
+    background-color: var(--el-fill-color-light) !important;
+  }
+}
 </style>
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index bcdbbb29..c5cf28f6 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -195,7 +195,7 @@
               </el-row>
             </div>
           </div>
-          <div>
+          <div class="border-left">
             <div class="flex-c table-row-title">收货方</div>
             <div>
               <el-row>
@@ -516,7 +516,7 @@
           </div>
 
           <!-- 付款方式 -->
-          <div>
+          <div class="border-left">
             <div style="flex: 1">
               <div class="table-row-title" style="margin-bottom: 10px">
                 <div class="table-row-title-item">付款方式</div>
@@ -1729,6 +1729,11 @@ $borderColor: #172e60;
 :deep(.el-input__wrapper) {
   box-shadow: none;
   border-bottom: 1px solid $borderColor;
+  border-radius: 0;
+}
+
+.border-left {
+  border-left: 1px dashed $borderColor;
 }
 
 // 页面字体大小
@@ -1741,21 +1746,21 @@ $borderColor: #172e60;
 }
 
 .border-top {
-  border-top: 1px solid $borderColor;
+  border-top: 1px dashed $borderColor;
 }
 
 .table-row {
   width: 100%;
   display: flex;
-  // border-top: 1px solid $borderColor;
-  border-left: 1px solid $borderColor;
+  // border-top: 1px dashed  $borderColor;
+  border-left: 1px dashed $borderColor;
   border-bottom: none;
   box-sizing: border-box;
 
   &:first-child {
     display: block;
-    border-top: 1px solid $borderColor;
-    border-left: 1px solid $borderColor;
+    border-top: 1px dashed $borderColor;
+    border-left: 1px dashed $borderColor;
 
     > div {
       width: 100%;
@@ -1765,8 +1770,8 @@ $borderColor: #172e60;
 
   &:last-child {
     display: block;
-    border-bottom: 1px solid $borderColor;
-    border-right: 1px solid $borderColor;
+    border-bottom: 1px dashed $borderColor;
+    border-right: 1px dashed $borderColor;
     box-sizing: border-box;
 
     > div {
@@ -1778,8 +1783,8 @@ $borderColor: #172e60;
   > div {
     flex: 1;
     padding: 5px;
-    border-bottom: 1px solid $borderColor;
-    border-right: 1px solid $borderColor;
+    border-bottom: 1px dashed $borderColor;
+    border-right: 1px dashed $borderColor;
     display: inline-flex;
     box-sizing: border-box;
   }
diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue
index 7dd3d312..b9e2b30b 100644
--- a/src/views/waybill/CreateZeroOrder.vue
+++ b/src/views/waybill/CreateZeroOrder.vue
@@ -159,7 +159,7 @@
               </el-row>
             </div>
           </div>
-          <div>
+          <div class="border-left">
             <div class="flex-c table-row-title">收货方</div>
             <div>
               <el-row>
@@ -505,7 +505,7 @@
           </div>
 
           <!-- 付款方式 -->
-          <div style="zoom: 0.9">
+          <div style="zoom: 0.9" class="border-left">
             <div style="flex: 1">
               <div class="table-row-title" style="margin-bottom: 10px">
                 <div class="table-row-title-item">付款方式</div>
@@ -1587,6 +1587,7 @@ $borderColor: #172e60;
 :deep(.el-input__wrapper) {
   box-shadow: none;
   border-bottom: 1px solid #777;
+  border-radius: 0;
 }
 
 // 页面字体大小
@@ -1599,21 +1600,21 @@ $borderColor: #172e60;
 }
 
 .border-top {
-  border-top: 1px solid $borderColor;
+  border-top: 1px dashed $borderColor;
 }
 
 .table-row {
   width: 100%;
   display: flex;
-  // border-top: 1px solid $borderColor;
-  border-left: 1px solid $borderColor;
+  // border-top: 1px dashed  $borderColor;
+  border-left: 1px dashed $borderColor;
   border-bottom: none;
   box-sizing: border-box;
 
   &:first-child {
     display: block;
-    border-top: 1px solid $borderColor;
-    border-left: 1px solid $borderColor;
+    border-top: 1px dashed $borderColor;
+    border-left: 1px dashed $borderColor;
 
     > div {
       width: 100%;
@@ -1623,8 +1624,8 @@ $borderColor: #172e60;
 
   &:last-child {
     display: block;
-    border-bottom: 1px solid $borderColor;
-    border-right: 1px solid $borderColor;
+    border-bottom: 1px dashed $borderColor;
+    border-right: 1px dashed $borderColor;
     box-sizing: border-box;
 
     > div {
@@ -1636,13 +1637,17 @@ $borderColor: #172e60;
   > div {
     flex: 1;
     padding: 5px;
-    border-bottom: 1px solid $borderColor;
-    border-right: 1px solid $borderColor;
+    border-bottom: 1px dashed $borderColor;
+    border-right: 1px dashed $borderColor;
     display: inline-flex;
     box-sizing: border-box;
   }
 }
 
+.border-left {
+  border-left: 1px dashed $borderColor;
+}
+
 .table-row-title {
   background: #f5f7fa;
   margin-right: 10px;
diff --git a/vite.config.js b/vite.config.js
index f18c7559..6353e045 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -14,7 +14,7 @@ export default ({ mode, command }) => {
         '/api': {
           // target: 'http://192.168.10.126:8889',
           // hy
-          // target: 'http://192.168.10.48:13000',
+          target: 'http://192.168.10.48:13000',
           // lmy
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
@@ -25,7 +25,7 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.57:13000',
-          target: 'http://192.168.6.122:8777',
+          // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.6.116:8777',
           // tjj
           // sst

From 218fd27d44cf8de2d58cbc0455c26febd88f4096 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Fri, 22 Dec 2023 10:18:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/website.js                         |  2 +-
 .../delivery/distributionStockArticle.vue     | 13 +-------
 .../distributionStockArticleDiscuss.vue       | 27 ++--------------
 .../distributionStockArticleMarket.vue        | 11 -------
 .../delivery/distributionStockArticleSelf.vue | 31 +++----------------
 vite.config.js                                |  2 +-
 6 files changed, 11 insertions(+), 75 deletions(-)

diff --git a/src/config/website.js b/src/config/website.js
index 5ce28c18..3b87363c 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -5,7 +5,7 @@ export default {
   title: '货无忧物流信息平台',
   logo: 'S',
   key: 'TWMS', //配置主键,目前用于存储
-  indexTitle: '货无优 Admin',
+  indexTitle: '货无忧 Admin',
   clientId: 'saber', // 客户端id
   clientSecret: 'saber_secret', // 客户端密钥
   tenantMode: true, // 是否开启租户模式
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index b152eead..f8b4d34c 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -101,7 +101,7 @@
               v-if="handler"
               >修改服务类型</el-button
             >
-            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
+            <el-button type="danger" icon="Download" @click="handleExport" plain
               >导 出</el-button
             >
 
@@ -626,17 +626,6 @@ export default {
           isshowSummary: true,
           sortable: true,
         },
-        {
-          prop: 'availableQuantity',
-          label: '可用数量',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          isshowSummary: true,
-          sortable: true,
-        },
         {
           prop: 'notReceived',
           label: '未入库数量',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 85ba35c8..727a3fe6 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -80,23 +80,13 @@
             >
             <!--            <el-button type="danger" icon="el-icon-delete" @click="handleMoke" v-if = "handler">转预约单</el-button>-->
             <!--            <el-button type="primary" icon="el-icon-plus" @click="handleStockList" v-if = "handler">批量加配转库存品</el-button>-->
-            <el-button
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleCallDelivery('3')"
-              v-if="handler"
+            <el-button type="danger" icon="Edit" @click="handleCallDelivery('3')" v-if="handler"
               >修改客户信息</el-button
             >
-            <el-button
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleCallDelivery('2')"
-              v-if="handler"
+            <el-button type="danger" icon="Edit" @click="handleCallDelivery('2')" v-if="handler"
               >修改服务类型</el-button
             >
-            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
-              >导 出</el-button
-            >
+            <el-button type="danger" icon="Download" @click="handleExport" plain>导 出</el-button>
           </div>
           <!--   <div class="avue-crud__left">
             <el-button type="primary" icon="el-icon-plus" @click="handlebill"  v-if = "!handler">创建提货单</el-button>
@@ -539,17 +529,6 @@ export default {
           isshowSummary: true,
           sortable: true,
         },
-        {
-          prop: 'availableQuantity',
-          label: '可用数量',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          isshowSummary: true,
-          sortable: true,
-        },
         {
           prop: 'notReceived',
           label: '未入库数量',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index d5bfa64c..89abc7fa 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -555,17 +555,6 @@ export default {
           isshowSummary: true,
           sortable: true,
         },
-        {
-          prop: 'availableQuantity',
-          label: '可用数量',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          isshowSummary: true,
-          sortable: true,
-        },
         {
           prop: 'notReceived',
           label: '未入库数量',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index f1d2bcd4..9d0033cd 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -80,32 +80,22 @@
             <el-button type="primary" icon="el-icon-plus" @click="handlebill" v-if="handler"
               >创建提货单</el-button
             >
-            <el-button type="primary" icon="el-icon-plus" @click="handleStockList" v-if="handler"
+            <el-button type="primary" icon="Position" @click="handleStockList" v-if="handler"
               >批量转库存品</el-button
             >
-            <el-button
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleCallDelivery('3')"
-              v-if="handler"
+            <el-button type="danger" icon="Edit" @click="handleCallDelivery('3')" v-if="handler"
               >修改客户信息</el-button
             >
-            <el-button
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleCallDelivery('2')"
-              v-if="handler"
+            <el-button type="danger" icon="Edit" @click="handleCallDelivery('2')" v-if="handler"
               >修改服务类型</el-button
             >
             <el-button type="primary" icon="el-icon-plus" @click="handleCallDelivery('1', '1')"
               >通知提货</el-button
             >
-            <el-button type="danger" icon="el-icon-delete" @click="handleCallDelivery('1', '2')"
+            <el-button type="danger" icon="Plus" @click="handleCallDelivery('1', '2')"
               >再次通知</el-button
             >
-            <el-button type="danger" icon="el-icon-plus" @click="handleExport" plain
-              >导 出</el-button
-            >
+            <el-button type="danger" icon="Download" @click="handleExport" plain>导 出</el-button>
           </div>
           <div class="avue-crud__left">
             <!--            <el-button type="primary" icon="el-icon-plus" @click="handlebill"  >创建提货单</el-button>-->
@@ -684,17 +674,6 @@ export default {
           isshowSummary: true,
           sortable: true,
         },
-        {
-          prop: 'availableQuantity',
-          label: '可用数量',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          isshowSummary: true,
-          sortable: true,
-        },
         {
           prop: 'notReceived',
           label: '未入库数量',
diff --git a/vite.config.js b/vite.config.js
index 497d3d30..6353e045 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -23,7 +23,7 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          target: 'http://192.168.10.25:13000',
+          // target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.57:13000',
           // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.6.116:8777',