Merge branch 'xf_dev' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into xf_dev

src/views/plan/order/index.vue

@@ -9,6 +9,7 @@
       :option="option"
       :permission="permission"
       :table-loading="loading"
+      :row-style="tableRowClassName"
       @search-change="handleQuery"
       @search-reset="resetChange"
       @size-change="handleQuery"
@@ -304,6 +305,14 @@ const importData = reactive({
   file: undefined,
   fileList: [],
 });
+const tableRowClassName = ({ row, rowIndex }) => {
+  const currentDate = new Date(); // 获取当前日期
+  const compareDate = new Date(row.deliverTime); // 设置要比较的日期
+  if (currentDate > compareDate && row.orderState !== '5') {
+    return { backgroundColor: '#F1BFBFFF'};
+  }
+  return '';
+};
 const materialInfo = (value) => {
   form.value.materialCode = value.materialCode;
   form.value.materialName = value.materialName;
@@ -957,6 +966,9 @@ const onSelectedFinish = (selectedValue) => {
 </script>
 
 <style lang="scss" scoped>
+.warning-row{
+  background-color: rgb(204, 136, 136) !important;
+}
 .scanInfo {
   width: 100%;
 

src/views/plan/schedule/index.vue

@@ -6,6 +6,7 @@
       v-model="form"
       :data="data"
       :option="option"
+      :row-style="tableRowClassName"
       v-model:page="page"
       @row-save="createRow"
       @row-update="updateRow"
@@ -59,7 +60,16 @@ import { queryStationByLineId } from "@/api/station";
 import { useDictionaryStore } from "@/store";
 import { getStatistics } from "@/api/order/index";
 import * as echarts from "echarts";
-
+const tableRowClassName = ({ row, rowIndex }) => {
+  if(row.planStartEnd){
+    const currentDate = new Date(); // 获取当前日期
+    const compareDate = new Date(row.planStartEnd); // 设置要比较的日期
+    if (currentDate > compareDate && row.state !== '2' && row.state !== '3') {
+      return { backgroundColor: '#F1BFBFFF'};
+    }
+  }
+  return '';
+};
 // 数据字典相关
 const { dicts } = useDictionaryStore();
 

src/views/plan/workOrder/index.vue

@@ -9,6 +9,7 @@
       :option="option"
       v-model:page="page"
       :permission="permission"
+      :row-style="tableRowClassName"
       @row-save="createRow"
       @row-update="updateRow"
       @row-del="deleteRow"
@@ -305,6 +306,17 @@ import { checkPerm } from "@/directive/permission";
 import { queryDictDataByType } from "@/api/system/dict";
 import {ElMessage, ElMessageBox} from "element-plus";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
+
+const tableRowClassName = ({ row, rowIndex }) => {
+  if(row.planStartEnd){
+    const currentDate = new Date(); // 获取当前日期
+    const compareDate = new Date(row.planStartEnd); // 设置要比较的日期
+    if (currentDate > compareDate && row.workOrderState !== '6') {
+      return { backgroundColor: '#F1BFBFFF'};
+    }
+  }
+  return '';
+};
 const router = useRouter();
 const test = () => {
   isShowTable.value = true;

src/views/storage/entry/index.vue

@@ -105,7 +105,7 @@ const uploadFinished = () => {
 };
 const importExcelData = () => {
   if (uploadRef.value) {
-    uploadRef.value.show("/api/v1/warehousing/entry");
+    uploadRef.value.show("/api/v1/warehousing/entry/import");
   }
 };
 
@@ -120,6 +120,10 @@ option.value = Object.assign(option.value, {
       prop: "creator",
     },
     {
+      label: "文件名称",
+      prop: "fileName",
+    },
+    {
       label: "操作时间",
       prop: "created",
     },