Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

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>

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, // 是否开启租户模式

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;
   }

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: '未入库数量',

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: '未入库数量',

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: '未入库数量',

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: '未入库数量',

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;

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',