优化部分内容

src/components/tablecmt/tablecmt.vue

@@ -381,7 +381,7 @@ const isHaveSelection = ref(false);
 let selectarr = ref([]);
 /** 设置每行颜色 */
 const tableRowClassName = ({ row, rowIndex }: { row: TableDataType; rowIndex: number }) => {
-  if (props.tableData.length === selectarr.value.length) return 'table-SelectedRow-bgcolor';
+  // if (props.tableData.length === selectarr.value.length) return 'table-SelectedRow-bgcolor';
 
   for (let i = 0; i < selectarr.value.length; i++) {
     if (selectarr.value[i] === row) return 'table-SelectedRow-bgcolor';
@@ -931,4 +931,39 @@ defineExpose({ handleCheckSelect, handleClearSelect });
   font-weight: initial;
   font-size: 12px;
 }
+
+// 表格行样式
+.el-table {
+  tr {
+    // 预警
+    &.WarningTime {
+      color: #e6a23c !important;
+      background-color: #fff3e8;
+
+      .el-text {
+        color: #e6a23c !important;
+        // background-color: #fff3e8;
+      }
+
+      td {
+        border-color: #fff !important;
+      }
+    }
+
+    // 超时
+    &.timeOut {
+      color: #f56c6c !important;
+      background-color: #feeded;
+
+      .el-text {
+        color: #f56c6c !important;
+        // background-color: #feeded;
+      }
+
+      td {
+        border-color: #fff !important;
+      }
+    }
+  }
+}
 </style>

src/option/finance/ReconciliationDepositSlip.js

@@ -245,7 +245,7 @@ export const columnList = [
   },
   {
     prop: 'sysTotalFee',
-    label: '订单开单价',
+    label: '订单预估总价',
     type: 1,
     values: '',
     width: '130',
@@ -268,7 +268,7 @@ export const columnList = [
   },
   {
     prop: 'systemFreightPrice',
-    label: '开单运费',
+    label: '预估运费',
     type: 1,
     values: '',
     width: '130',
@@ -292,7 +292,7 @@ export const columnList = [
   },
   {
     prop: 'systemPickupPrice',
-    label: '开单提货费',
+    label: '预估提货费',
     type: 1,
     values: '',
     width: '130',
@@ -388,7 +388,7 @@ export const columnList = [
   },
   {
     prop: 'systemDeliveryFee',
-    label: '开单配送费',
+    label: '预估配送费',
     type: 1,
     values: '',
     width: '150',
@@ -1017,7 +1017,7 @@ export const columnListB = [
   },
   {
     prop: 'sysTotalFee',
-    label: '订单开单价',
+    label: '订单预估总价',
     type: 1,
     values: '',
     width: '130',
@@ -1041,7 +1041,7 @@ export const columnListB = [
   },
   {
     prop: 'systemFreightPrice',
-    label: '开单运费',
+    label: '预估运费',
     type: 1,
     values: '',
     width: '130',
@@ -1065,7 +1065,7 @@ export const columnListB = [
   },
   {
     prop: 'systemPickupPrice',
-    label: '开单提货费',
+    label: '预估提货费',
     type: 1,
     values: '',
     width: '130',
@@ -1161,7 +1161,7 @@ export const columnListB = [
   },
   {
     prop: 'systemDeliveryFee',
-    label: '开单配送费',
+    label: '预估配送费',
     type: 1,
     values: '',
     width: '130',

src/views/distribution/artery/AddVehicleStowage.vue

@@ -2131,9 +2131,9 @@ const handleSubmitProblemData = () => {
 const handleSetRowClassName = (row, rowIndex) => {
   if (!row.warehouseEntryTimeStart) return 'timeOut';
 
-  // 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期
+  // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期
 
-  // 当前时间 - 创建时间
+  // 当前时间 - 入库时间
   const time = Date.now() - new Date(row.warehouseEntryTimeStart).getTime();
 
   // 预警时间
@@ -2842,25 +2842,4 @@ onActivated(() => {
 :deep(.el-form-item__content) {
   width: 250px !important;
 }
-
-// 表格行样式
-:deep(.el-table) {
-  tr {
-    &.WarningTime {
-      color: #e6a23c !important;
-
-      .el-text {
-        color: #e6a23c !important;
-      }
-    }
-
-    &.timeOut {
-      color: #f56c6c !important;
-
-      .el-text {
-        color: #f56c6c !important;
-      }
-    }
-  }
-}
 </style>

src/views/distribution/artery/addTripartiteTransfer.vue

@@ -1302,9 +1302,9 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
 const handleSetRowClassName = (row, rowIndex) => {
   if (!row.warehouseEntryTimeStart) return 'timeOut';
 
-  // 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期
+  // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期
 
-  // 当前时间 - 创建时间
+  // 当前时间 - 入库时间
   const time = Date.now() - new Date(row.warehouseEntryTimeStart).getTime();
 
   // 预警时间
@@ -1489,25 +1489,4 @@ const handleSetRowClassName = (row, rowIndex) => {
     background: #f5f7fa;
   }
 }
-
-// 表格行样式
-:deep(.el-table) {
-  tr {
-    &.WarningTime {
-      color: #e6a23c !important;
-
-      .el-text {
-        color: #e6a23c !important;
-      }
-    }
-
-    &.timeOut {
-      color: #f56c6c !important;
-
-      .el-text {
-        color: #f56c6c !important;
-      }
-    }
-  }
-}
 </style>

src/views/distribution/inventory/CreateOrder.vue

@@ -565,7 +565,6 @@
                   v-model="item.chargeType"
                   @change="() => handleAssignmentItemPrice(item, false, item.chargeType)"
                   style="display: flex"
-                  :disabled="isDisabled"
                 >
                   <el-radio :label="1">件</el-radio>
                   <el-radio :label="2">方</el-radio>

src/views/distribution/inventory/delivery/OrderInTransit.vue

@@ -428,9 +428,9 @@ const handleView = ({ row }) => {
 const handleSetRowClassName = (row, rowIndex) => {
   if (!row.warehouseEntryTime) return 'timeOut';
 
-  // 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期
+  // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期
 
-  // 当前时间 - 创建时间
+  // 当前时间 - 入库时间
   const time = Date.now() - new Date(row.warehouseEntryTime).getTime();
 
   // 预警时间
@@ -471,25 +471,4 @@ const handleSetRowClassName = (row, rowIndex) => {
 :deep(.el-overlay-dialog) {
   position: absolute;
 }
-
-// 表格行样式
-:deep(.el-table) {
-  tr {
-    &.WarningTime {
-      color: #e6a23c !important;
-
-      .el-text {
-        color: #e6a23c !important;
-      }
-    }
-
-    &.timeOut {
-      color: #f56c6c !important;
-
-      .el-text {
-        color: #f56c6c !important;
-      }
-    }
-  }
-}
 </style>

src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@@ -102,6 +102,7 @@
         :columnList="columnList"
         :tableData="data"
         :loading="loading"
+        :tableRowClassName="handleSetRowClassName"
         @inputTxt="inputsc"
         @timeCheck="timesc"
         @btnCheck="btnsc"
@@ -1415,6 +1416,23 @@ export default {
         console.log('error :>> ', error);
       }
     },
+    handleSetRowClassName(row, rowIndex) {
+      console.log('row.warehouseEntryTime :>> ', row.warehouseEntryTime);
+      if (!row.warehouseEntryTime) return 'timeOut';
+
+      // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期
+
+      // 当前时间 - 入库时间
+      const time = Date.now() - new Date(row.warehouseEntryTime).getTime();
+      // 预警时间
+      const WarningTime = 1000 * 60 * 60 * (24 * 2 - 2);
+
+      // 超时
+      const timeOut = 1000 * 60 * 60 * 24 * 2;
+
+      if (time > timeOut) return 'timeOut';
+      else if (time > WarningTime && time < timeOut) return 'WarningTime';
+    },
   },
 };
 </script>

src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@@ -788,9 +788,9 @@ export default {
       console.log('row.warehouseEntryTime :>> ', row.warehouseEntryTime);
       if (!row.warehouseEntryTime) return 'timeOut';
 
-      // 设置预警 -- 以创建时间为基准, 24小时后为超期, 临近2小时为临期
+      // 设置预警 -- 以入库时间为基准, 24小时后为超期, 临近2小时为临期
 
-      // 当前时间 - 创建时间
+      // 当前时间 - 入库时间
       const time = Date.now() - new Date(row.warehouseEntryTime).getTime();
       // 预警时间
       const WarningTime = 1000 * 60 * 60 * (24 * 2 - 2);
@@ -1844,25 +1844,4 @@ export default {
 .el_textBtn {
   font-weight: bold;
 }
-
-// 表格行样式
-:deep(.el-table) {
-  tr {
-    &.WarningTime {
-      color: #e6a23c !important;
-
-      .el-text {
-        color: #e6a23c !important;
-      }
-    }
-
-    &.timeOut {
-      color: #f56c6c !important;
-
-      .el-text {
-        color: #f56c6c !important;
-      }
-    }
-  }
-}
 </style>

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -108,101 +108,99 @@
         </el-row>
       </div>
 
-      <div style="height: 100%">
-        <!-- 列表模块 -->
-        <tablecmt
-          ref="tableNodeRef"
-          :columnList="columnList"
-          :tableData="data"
-          :loading="loading"
-          @inputTxt="inputsc"
-          @timeCheck="timesc"
-          @btnCheck="btnsc"
-          @selectCheck="selectsc"
-          @selection="selectionsc"
-        >
-          <template #default="slotProps">
-            <template
-              v-if="
-                slotProps.scope.column.label === '配送件数' ||
-                '装车件数' ||
-                '签收数' ||
-                '未签收数' ||
-                '未装车件数' ||
-                '异常装车件数' ||
-                '异常签收件数'
-              "
-            >
-              <el-text @click="InformationViewing(slotProps.scope)">
-                <!-- {{slotProps.scope.row.reservationNum}} -->
-                {{
-                  slotProps.scope.column.label === '计划配送件数'
-                    ? slotProps.scope.row.reservationNum
-                    : slotProps.scope.column.label === '计划装车件数'
-                    ? slotProps.scope.row.loadedNumber
-                    : slotProps.scope.column.label === '计划签收件数'
-                    ? slotProps.scope.row.receivedQuantity
-                    : slotProps.scope.column.label === '计划未签收件数'
-                    ? slotProps.scope.row.unreceivedQuantity
-                    : slotProps.scope.column.label === '计划未装车件数'
-                    ? slotProps.scope.row.unloadedNumber
-                    : slotProps.scope.column.label === '异常装车件数'
-                    ? slotProps.scope.row.abnormalLoadedNumber
-                    : slotProps.scope.column.label === '异常签收件数'
-                    ? slotProps.scope.row.abnormalReceivedQuantity
-                    : ''
-                }}
-              </el-text>
-            </template>
+      <!-- 列表模块 -->
+      <tablecmt
+        ref="tableNodeRef"
+        :columnList="columnList"
+        :tableData="data"
+        :loading="loading"
+        :tableRowClassName="handleSetRowClassName"
+        @inputTxt="inputsc"
+        @timeCheck="timesc"
+        @btnCheck="btnsc"
+        @selectCheck="selectsc"
+        @selection="selectionsc"
+      >
+        <template #default="slotProps">
+          <template
+            v-if="
+              slotProps.scope.column.label === '配送件数' ||
+              '装车件数' ||
+              '签收数' ||
+              '未签收数' ||
+              '未装车件数' ||
+              '异常装车件数' ||
+              '异常签收件数'
+            "
+          >
+            <el-text @click="InformationViewing(slotProps.scope)">
+              <!-- {{slotProps.scope.row.reservationNum}} -->
+              {{
+                slotProps.scope.column.label === '计划配送件数'
+                  ? slotProps.scope.row.reservationNum
+                  : slotProps.scope.column.label === '计划装车件数'
+                  ? slotProps.scope.row.loadedNumber
+                  : slotProps.scope.column.label === '计划签收件数'
+                  ? slotProps.scope.row.receivedQuantity
+                  : slotProps.scope.column.label === '计划未签收件数'
+                  ? slotProps.scope.row.unreceivedQuantity
+                  : slotProps.scope.column.label === '计划未装车件数'
+                  ? slotProps.scope.row.unloadedNumber
+                  : slotProps.scope.column.label === '异常装车件数'
+                  ? slotProps.scope.row.abnormalLoadedNumber
+                  : slotProps.scope.column.label === '异常签收件数'
+                  ? slotProps.scope.row.abnormalReceivedQuantity
+                  : ''
+              }}
+            </el-text>
+          </template>
 
-            <template v-if="slotProps.scope.column.label === '操作'">
-              <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
 
-              <el-text
-                size="small"
-                v-if="slotProps.scope.row.abnormalLoadedNumber > 0"
-                @click="viewAbnormalLoading(slotProps.scope)"
-                >异 常 审 核</el-text
-              >
-              <!-- v-if="
+            <el-text
+              size="small"
+              v-if="slotProps.scope.row.abnormalLoadedNumber > 0"
+              @click="viewAbnormalLoading(slotProps.scope)"
+              >异 常 审 核</el-text
+            >
+            <!-- v-if="
                 slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
                 slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
               " -->
-              <el-text
-                v-if="
-                  slotProps.scope.row.sijiSigningStatus == '已完成' &&
-                  slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
-                "
-                size="small"
-                @click="handleSign(slotProps.scope.row)"
-                >复 核</el-text
-              >
-              <el-text size="small" @click="asurcharge(slotProps.scope.row)">附加费</el-text>
-            </template>
-
-            <!--            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
-            <!--              >Delete</el-button>-->
+            <el-text
+              v-if="
+                slotProps.scope.row.sijiSigningStatus == '已完成' &&
+                slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
+              "
+              size="small"
+              @click="handleSign(slotProps.scope.row)"
+              >复 核</el-text
+            >
+            <el-text size="small" @click="asurcharge(slotProps.scope.row)">附加费</el-text>
           </template>
-        </tablecmt>
+
+          <!--            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
+          <!--              >Delete</el-button>-->
+        </template>
+      </tablecmt>
+
+      <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+        <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+        <!-- 分页模块 -->
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="page.currentPage"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="page.pageSize"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="page.total"
+        >
+        </el-pagination>
       </div>
-      <el-row class="el-fy">
-        <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
-          <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
-          <!-- 分页模块 -->
-          <el-pagination
-            align="right"
-            background
-            @size-change="sizeChange"
-            @current-change="currentChange"
-            :current-page="page.currentPage"
-            :page-sizes="[30, 50, 80, 120]"
-            :page-size="page.pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="page.total"
-          >
-          </el-pagination>
-        </div>
-      </el-row>
 
       <!-- 表单模块 -->
       <el-dialog
@@ -2571,6 +2569,28 @@ export default {
         }
       );
     },
+    /** 设置表格行样式 */
+    handleSetRowClassName(row, rowIndex) {
+      try {
+        if (!row.taskTime) return 'timeOut';
+
+        // 设置预警 -- 以配送时间为基准, 第二天八点后为超期, 前两个小时为预警
+
+        // 当前时间 - 入库时间
+        const time = Date.now() - new Date(row.taskTime).getTime();
+
+        // 预警时间
+        const WarningTime = 1000 * 60 * 60 * (24 - 2);
+
+        // 超时
+        const timeOut = 1000 * 60 * 60 * 24;
+
+        if (time > timeOut) return 'timeOut';
+        else if (time > WarningTime && time < timeOut) return 'WarningTime';
+      } catch (error) {
+        console.log('error :>> ', error);
+      }
+    },
   },
 };
 </script>

src/views/waybill/CreateZeroOrder.vue

@@ -530,7 +530,6 @@
                 v-model="item.chargeType"
                 @change="() => handleAssignmentItemPrice(item, false, item.chargeType)"
                 style="display: flex"
-                :disabled="isDisabled"
               >
                 <el-radio :label="1">件</el-radio>
                 <el-radio :label="2">方</el-radio>

src/views/waybill/TemporaryStorageList.vue

@@ -1718,25 +1718,4 @@ onActivated(() => {
     text-align: left !important;
   }
 }
-
-// 表格行样式
-:deep(.el-table) {
-  tr {
-    &.WarningTime {
-      color: #e6a23c !important;
-
-      .el-text {
-        color: #e6a23c !important;
-      }
-    }
-
-    &.timeOut {
-      color: #f56c6c !important;
-
-      .el-text {
-        color: #f56c6c !important;
-      }
-    }
-  }
-}
 </style>