Merge branch 'pre-production'

src/option/reportforms/AuditTimelinessRatioReport.js

@@ -142,6 +142,17 @@ export const columnList = [
     head: false,
     isshowSummary: false, //开启统计
   },
+  {
+    prop: 'hoursTime',
+    label: '标准时效(小时)',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
 ];
 
 export const columnListDetails = [
@@ -1205,7 +1216,7 @@ export const columnListDetails = [
   {
     prop: 'isOverTimeName',
     label: '是否超时',
-    type: 1,
+    type: 3,
     values: '',
     width: '150',
     checkarr: [

src/option/reportforms/CreateOrderTimelinessRatioReport.js

@@ -227,6 +227,17 @@ export const columnList = [
     head: false,
     isshowSummary: true, //开启统计
   },
+  {
+    prop: 'hoursTime',
+    label: '标准时效(小时)',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: false,
+  },
 ];
 
 export const columnListDetails = [

src/option/reportforms/OrderAllTime.js

@@ -96,7 +96,6 @@ export const columnList = [
     fixed: false,
     sortable: true,
     head: false,
-    isshowSummary: true, //开启统计
   },
   {
     prop: 'departureWarehouseName',

src/option/reportforms/PackageStartTimePageReport.js

@@ -448,7 +448,7 @@ export const columnListDetails = [
   },
   {
     prop: 'startHours',
-    label: '实际发运时效',
+    label: '实际发运时效(小时)',
     type: 1,
     values: '',
     width: '150',
@@ -459,7 +459,7 @@ export const columnListDetails = [
   },
   {
     prop: 'hoursTime',
-    label: '标准发运时效',
+    label: '标准发运时效(小时)',
     type: 1,
     values: '',
     width: '150',

src/option/reportforms/UpdateWaybillQualityPageReport.js

@@ -291,11 +291,11 @@ export const columnListDetails = [
     width: '130',
     checkarr: [
       {
-        label: '有数据',
+        label: '定制品',
         value: '1',
       },
       {
-        label: '无数据',
+        label: '零担',
         value: '2',
       },
     ],
@@ -352,16 +352,6 @@ export const columnListDetails = [
     fixed: false,
     sortable: true,
   },
-  {
-    prop: 'agent',
-    label: '申请人',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
   {
     prop: 'updateReson',
     label: '修改原因',

src/views/distribution/artery/VehicleArrivalManagement.vue

@@ -306,7 +306,9 @@
             <el-text
               v-if="
                 permissionObj.VehicleArrivalManagement_zeroAdditionalRecording &&
-                Number(slotProps.scope.row.loadStatus) !== 80
+                Number(slotProps.scope.row.loadStatus) !== 80 &&
+                slotProps.scope.row.carsLoadLineList.find(val => val.nodeName === Mydata.name)
+                  .nodeStatus === '20'
               "
               @click="handleShowzeroAdditionalRecording(slotProps.scope)"
             >

src/views/distribution/artery/VehicleNodeImgs.vue

@@ -495,7 +495,7 @@ const initImgList = async () => {
         _obj.nodeId = carsLoadLineEntity.nodeId;
         _obj.nowWarehouseId = nowWarehouseId;
 
-        if (details.myWarehouseId === _obj.nodeId) details.activeIndex = i;
+        // if (details.myWarehouseId === _obj.nodeId) details.activeIndex = i;
 
         if (nowWarehouseId === _obj.nodeId) details.nowWarehoseIndex = i;
       } else {
@@ -675,7 +675,14 @@ const handleEditSubmit = async () => {
   }
 };
 
-watch(() => $route.fullPath, initImgList, { immediate: true });
+watch(
+  () => $route.fullPath,
+  () => {
+    details.activeIndex = 0;
+    initImgList();
+  },
+  { immediate: true }
+);
 </script>
 
 <style lang="scss" scoped>

src/views/distribution/artery/VehicleStowage.vue

@@ -274,7 +274,8 @@
               <el-text
                 v-if="
                   permissionObj.VehicleStowage_zeroAdditionalRecording &&
-                  Number(slotProps.scope.row.loadStatus) !== 80
+                  Number(slotProps.scope.row.loadStatus) !== 80 &&
+                  Number(slotProps.scope.row.loadStatus) !== 0
                 "
                 @click="handleShowzeroAdditionalRecording(slotProps.scope)"
               >

src/views/reportforms/PackageTransferTimePageReport.vue

@@ -76,6 +76,25 @@
             </el-select>
           </el-form-item>
 
+          <el-form-item label="中转仓">
+            <el-select
+              class="w100"
+              v-model="query.warehouseIds"
+              filterable
+              placeholder="请选择"
+              default-first-option
+              multiple
+              clearable
+            >
+              <el-option
+                v-for="value in details.warehouseOption"
+                :key="value.dictKey"
+                :label="value.dictValue"
+                :value="value.dictKey"
+              />
+            </el-select>
+          </el-form-item>
+
           <el-form-item label="目的仓">
             <el-select
               class="w100"

src/views/reportforms/SalesDepartmentIncomeReport.vue

@@ -620,15 +620,30 @@ const handleJumpDetail = (row, column) => {
 
   // 年
   console.log('details.query.year :>> ', details.query.year);
-  if (getObjType(details.query.year) === 'array' && details.query.year.length > 0) {
-    // query.startTimeStr =
+  if (details.query.year) {
+    query.startTimeStr = details.query.year + '-01-01';
+    query.endTimeStr = details.query.year + '-12-31';
+  } else if (details.query.month) {
+    const formatDate = date => {
+      console.log('date :>> ', date);
+      const y = date.getFullYear();
+      const m = String(date.getMonth() + 1).padStart(2, '0'); // 月份补零
+      const d = String(date.getDate()).padStart(2, '0'); // 日期补零
+      return `${y}-${m}-${d}`;
+    };
+
+    const month = details.query.month.split('-');
+    console.log('month :>> ', month);
+    query.startTimeStr = details.query.month + '-01';
+    query.endTimeStr = formatDate(new Date(month[0], Number(month[1]), 0));
+    console.log('query.endTimeStr :>> ', query.endTimeStr);
   }
 
-  // $store.commit('DEL_ONCE_TAG', '/reportforms/SalesDepartmentIncomeReportDetails');
-  // $router.push({
-  //   path: '/reportforms/SalesDepartmentIncomeReportDetails',
-  //   query,
-  // });
+  $store.commit('DEL_ONCE_TAG', '/reportforms/SalesDepartmentIncomeReportDetails');
+  $router.push({
+    path: '/reportforms/SalesDepartmentIncomeReportDetails',
+    query,
+  });
 };
 </script>
 

src/views/reportforms/SalesDepartmentIncomeReportDetails.vue

@@ -232,9 +232,6 @@ const onLoad = async (params = {}) => {
 
       const start = new Date(submitData.startTimeStr).getTime();
       const end = new Date(submitData.endTimeStr).getTime();
-
-      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
-        return ElMessage.warning('时间不能大于31天');
     }
 
     if (getObjType(submitData.timeArr) !== 'array' || submitData.timeArr.length === 0) {
@@ -382,9 +379,6 @@ const ExportData = async () => {
       console.log('start :>> ', start);
       console.log('end :>> ', end);
       console.log('end - start :>> ', end - start);
-
-      if (end - start + 1000 * 60 * 60 * 24 > 1000 * 60 * 60 * 24 * 31)
-        return ElMessage.warning('时间不能大于31天');
     }
 
     delete submitData.timeArr;

src/views/waybill/CreateZeroOrder.vue

@@ -1564,33 +1564,6 @@ const details = reactive<any>({
     /** 打印弹窗 */
     WaybillPrintTemplate: false,
   },
-  itemRules: {
-    /** 计价方式 */
-    chargeType: [
-      {
-        required: true,
-        message: '请填写运单号',
-        trigger: 'blur',
-      },
-    ],
-    /** 收货人地址 */
-    goodsName: [
-      {
-        required: true,
-        message: '请填写运单号',
-        trigger: 'blur',
-      },
-    ],
-
-    /** 收货人地址 */
-    num: [
-      {
-        required: true,
-        message: '请填写运单号',
-        trigger: 'blur',
-      },
-    ],
-  },
   /** 页面loading */
   loadingObj: {
     loading: false,