Merge branch 'dev' into pre-production

package.json

@@ -6,8 +6,7 @@
     "prod": "vite --mode production",
     "build": "vite build",
     "build:prod": "vite build --mode production",
-    "serve": "vite preview --host",
-    "type": "module"
+    "serve": "vite preview --host"
   },
   "dependencies": {
     "@antfu/utils": "^0.7.2",

src/views/Pricesystem/PricesyHome.vue

@@ -248,6 +248,7 @@ const handleClick = (tab, event) => {
   border-bottom: 1px solid #ccc;
   padding: 10px;
   box-shadow: -1px -1px 3px;
+  display: flex;
   .el_Template {
     display: flex;
     align-items: center;
@@ -256,7 +257,6 @@ const handleClick = (tab, event) => {
       margin-right: 10px;
     }
   }
-  display: flex;
   .el_Service {
     margin-left: 30px;
     display: flex;

src/views/aftersales/aftersalesWorkOrderAddCopy.vue

@@ -2013,13 +2013,13 @@ const isShowFormItem4 = computed(() => {
   }
 }
 .ResponsibilityBoxS {
-  .el_packBtn {
-    margin-top: 10px;
-  }
   width: 100%;
   display: flex;
   flex-direction: column;
   margin-bottom: 10px;
+  .el_packBtn {
+    margin-top: 10px;
+  }
   .leftbox {
     display: flex;
     justify-content: space-between;
@@ -2031,11 +2031,9 @@ const isShowFormItem4 = computed(() => {
     align-items: center;
     width: 30%;
     margin-right: 20px;
-
     :deep(.el-form-item) {
       margin: 0;
       margin-right: 10px;
-
       font-size: 12px;
       .el-form-item__label {
         margin: 0;
@@ -2065,8 +2063,6 @@ const isShowFormItem4 = computed(() => {
   margin-bottom: 10px;
   width: 100%;
   border-left: none;
-  .el-tabs__header {
-  }
   .el-tabs__content {
     padding-top: 0;
   }
@@ -2118,9 +2114,7 @@ const isShowFormItem4 = computed(() => {
   align-items: center;
   padding-left: 10px;
 }
-:deep(.el-card__body) {
-  // margin-bottom: 50px;
-}
+
 :deep(.el-upload-dragger) {
   display: flex;
   align-items: center;
@@ -2255,11 +2249,7 @@ const isShowFormItem4 = computed(() => {
   margin-bottom: 0 !important;
   margin: 5px 0 !important;
 }
-:deep(.el_Exception) {
-  .el-form-item__content {
-    // width: 120px !important;
-  }
-}
+
 :deep(.el-form-item.is-required:not(.is-no-asterisk).asterisk-left > .el-form-item__label:before) {
   color: #ff0000;
 }
@@ -2273,7 +2263,5 @@ const isShowFormItem4 = computed(() => {
 .page_loading {
   height: 100%;
 }
-.el_btn_remove {
-  // padding-top: 6px;
-}
+
 </style>

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -10,7 +10,7 @@
         <el-form :model="Indexform" class="IndexFrom" ref="IndexForm" disabled>
           <div class="el_top">
             <el-form-item label="异常类型" class="el_inputTop">
-              <el-select v-model="Indexform.workOrderType">
+              <el-select v-model="Indexform.workOrderType" style="width: 240px;">
                 <el-option
                   v-for="item in IndexException"
                   :key="item.value"
@@ -21,7 +21,7 @@
             </el-form-item>
 
             <el-form-item label="发现节点" class="el_inputTop">
-              <el-select v-model="Indexform.discoveryNode">
+              <el-select v-model="Indexform.discoveryNode" style="width: 240px;">
                 <el-option
                   v-for="item in DiscoveringNodes"
                   :key="item.value"
@@ -1943,18 +1943,15 @@ const ResultDetermination = () => {
       }
     }
     .el_zb {
+      width: 250px;
+      text-align: right;
       :deep(.el-input__inner) {
         text-align: center;
       }
-
-      width: 250px;
-      text-align: right;
-
       :deep(.el-input) {
         margin-left: 10px;
         text-align: right;
       }
-
       :deep(.el-form-item__content) {
         flex-wrap: nowrap;
       }
@@ -2025,9 +2022,7 @@ const ResultDetermination = () => {
     :deep(.el-form-item) {
       margin: 0;
       margin-right: 10px;
-
       font-size: 12px;
-
       .el-form-item__label {
         margin: 0;
       }
@@ -2079,14 +2074,6 @@ const ResultDetermination = () => {
   width: 100%;
   border-left: none;
   border-right: none;
-
-  .el-tabs__header {
-  }
-
-  .el-tabs__content {
-    // padding-right: 0;
-  }
-
   .is-active {
     font-weight: bold;
   }

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -10,7 +10,7 @@
         <el-form :model="endFrom">
           <div class="el_top">
             <el-form-item label="异常类型" class="el_inputTop">
-              <el-select v-model="endFrom.workOrderType" disabled>
+              <el-select v-model="endFrom.workOrderType" disabled style="width: 240px;">
                 <el-option
                   v-for="item in IndexException"
                   :key="item.value"
@@ -21,7 +21,7 @@
             </el-form-item>
 
             <el-form-item label="发现节点" class="el_inputTop">
-              <el-select v-model="endFrom.discoveryNode" disabled>
+              <el-select v-model="endFrom.discoveryNode" disabled style="width: 240px;">
                 <el-option
                   v-for="item in DiscoveringNodes"
                   :key="item.value"

src/views/basicdata/brand/basicZonePriceFrom.vue

@@ -837,12 +837,12 @@ export default {
 }
 .el_chexk_item{
   width: 20%;
-  .el-checkbox__label{
+  margin-right: 12%;
+    .el-checkbox__label{
       width: 100%;
       .el-input{
       width: 100%;
     }
     }
-    margin-right: 12%;
 }
 </style>

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@@ -11,6 +11,7 @@
         class=""
         placeholder="请选择仓库"
         @change="checkcso"
+        style="width: 200px"
       >
         <el-option
           v-for="(item, index) in arrlist"
@@ -25,6 +26,7 @@
         v-model="checkregionselect"
         class="regionsele"
         placeholder="请选择区域"
+           style="width: 200px"
         @change="checkregion"
       >
         <el-option
@@ -2833,6 +2835,7 @@ const {
 .el-sel {
   display: flex !important;
   align-items: center;
+  width: 50%;
   :deep(.el-select) {
     height: 32px;
     .el-input {
@@ -2843,12 +2846,13 @@ const {
 .el-sel-title {
   font-size: 17px;
   margin-right: 10px;
+  width:10%;
 }
 .el-sel-title:nth-of-type(2) {
   margin-left: 20px;
 }
 .el-exp {
-  width: 110px;
+  width:200px;
   height: 32px;
   border: 1px solid #d3832a;
   display: flex;

src/views/distribution/checkInventoryTask/createTask.vue

@@ -87,6 +87,7 @@
                 v-model="item.values"
                 :placeholder="`请输入${item.label}`"
               />
+              <span v-else></span>
             </template>
 
             <template #default="props">

src/views/distribution/reservation/reservationAddFrom.vue

@@ -3594,11 +3594,12 @@ input[type='number'] {
   height: 60px;
 }
 .el_sumS {
+  display: flex;
+  width: 200px;
+  height: 20px;
   span {
     width: 100px;
   }
-  display: flex;
-  height: 20px;
-  width: 200px;
+
 }
 </style>

src/views/distribution/signdetail/distributionSigndetail.vue

@@ -7,7 +7,7 @@
           <div class="fr-fo">
 
             <el-form-item label="类型:">
-              <el-select  v-model="searchType" placeholder="请选择搜索类型" @change="changetypesof">
+              <el-select  v-model="searchType" placeholder="请选择搜索类型" @change="changetypesof" style="width:200px">
                 <el-option
                         v-for="item in searchTypeDate"
                         :key="item.value"

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -818,6 +818,8 @@ const VehicleInformationCopy=ref([]);//拷贝司机信息
 const StockInfo = ref({
   createDate: new Date(), //默认日期
   radio: 1,
+  Cl:[],
+  Sj:[],
   //司机信息
   DriverInformation: [
     {
@@ -1757,9 +1759,7 @@ const wrap = ref([
   },
 ]);
 // 获取表格数据
-function onLoad() {
-  loading.value = true; //开启加载效果
-}
+
 
 statisticsList.value = menuData.value.filter(item => item.statistics); //筛选出要统计的
 console.log(statisticsList.value, '需要统计的字段');
@@ -1808,8 +1808,8 @@ onMounted(() => {
             driverName: item.driverName, //司机姓名
             driverPhone: item.driverPhone, //司机电话
           });
+          console.log(DriverTemporaryStorage.value,'处理好的司机');
           chooseDriverIds.value.push(item.driverId);
-
           VehicleTemporaryStorage.value.push({
             vehicleId: item.vehicleId, //车辆ID
             vehicleNub: item.vehicleNub, //车牌号
@@ -1817,17 +1817,20 @@ onMounted(() => {
           chooseCarIds.value.push(item.vehicleId);
           // 配送司机
           StockInfo.value.Sj.push(item.driverId);    
+          
           // 配送车辆
           StockInfo.value.Cl.push(item.vehicleId);
           if (item.isMaster == 2) {
             DataSubmit.value.masterDriverName = item.driverName; //主司机名称
             DataSubmit.value.masterVehicleNub = item.vehicleNub; //司机车牌号
           }
+
         });
+
         }
 
       }
-      console.log(res.data.data,'123');
+
       
       wrapDataInfo.value = res.data.data.stockArticleList||''; // 订单包件
       dataInfo.value = res.data.data.stockArticleList||''; //订单列表
@@ -1840,7 +1843,7 @@ onMounted(() => {
       if(!res.data.data.stockupInfo){
         return 
       }
-      DataSubmit.value.stockup.forkliftName = res.data.data.stockupInfo.forkliftName||''; //备货人员名称
+      DataSubmit.value.stockup.forkliftName = res.data.data.stockupInfo.forkliftId||''; //备货人员名称
       DataSubmit.value.stockup.forkliftId = res.data.data.stockupInfo.forkliftId||''; //备货人员ID
       // DataSubmit.value.stockup.goodsAreaId = res.data.data.stockupInfo.goodsAreaId||''; //备货区域ID
       DataSubmit.value.stockup.goodsAreaName = res.data.data.stockupInfo.stockupArea||''; //备货区域名称
@@ -1852,7 +1855,7 @@ onMounted(() => {
     }).catch(()=>{
 
     }).finally(()=>{
-      editLoading.value = false; //开启加载
+      editLoading.value = false; //关闭加载
     });
   }
 });
@@ -3327,7 +3330,7 @@ sjInput.value=''
 <style lang="scss" scoped>
 .orderPage,
 .orderPageS {
-  height: 100%;
+  height: auto;
   :deep(.el-form) {
     display: flex;
     align-items: flex-start;

src/views/financialsector/FinanceHome.vue

@@ -337,6 +337,7 @@ const handleChange = () => {
   border-bottom: 1px solid #ccc;
   padding: 10px;
   box-shadow: -1px -1px 3px;
+  display: flex;
   .el_Template {
     display: flex;
     align-items: center;
@@ -345,7 +346,7 @@ const handleChange = () => {
       margin-right: 10px;
     }
   }
-  display: flex;
+
   .el_Service {
     margin-left: 30px;
     display: flex;

src/views/mail/order/list.vue

@@ -1341,6 +1341,11 @@ export default {
       this.query.typeService = 2;
       $_clientList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
         res => {
+          console.log(res,'res');
+          if(!res.data){
+            this.loading = false;
+            return;
+          }
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;