Merge branch 'xf_dev' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into xf_dev

src/views/plan/order/index.vue

@@ -513,6 +513,9 @@ option.value = {
           trigger: "trigger",
         },
       ],
+      disabledDate(time) {
+        return time.getTime() < new Date().setDate(new Date().getDate() - 1);
+      },
     },
     /* {
       label: "所属公司",

src/views/plan/workOrder/index.vue

@@ -354,9 +354,7 @@ const showSeqPage = (workOrderCode) => {
 const distribute = (id) => {
   ElMessageBox.confirm("当前操作不可逆,确定下发工单吗?")
     .then(() => {
-      loading.value = true;
       distributeWorkOrder(id).then((data) => {
-        loading.value = false;
         ElMessage.success(data.msg);
         dataList();
       });
@@ -479,7 +477,11 @@ const lineInfo = (value) => {
   dialog3.visible = false;
 };
 const workShopInfo = (value) => {
-  if(form.value.workshopCode && value.code && form.value.workshopCode !== value.code){
+  if (
+    form.value.workshopCode &&
+    value.code &&
+    form.value.workshopCode !== value.code
+  ) {
     form.value.productLineId = "";
     form.value.productLineName = "";
   }

src/views/quality/faultHandle/components/fault-page.vue

@@ -265,7 +265,7 @@ const faultHandle=ref({});
     }else{
       row.enabled = true
     }
-    row.reworkProcessId = undefined
+    //row.reworkProcessId = undefined
   }
   const option2=ref(null);
   const value=ref([]);

src/views/system/user/index.vue

@@ -608,7 +608,7 @@ const handleSubmit = useThrottleFn(() => {
       return false;
     }
     importUser(importData?.deptId, importData?.file).then((response) => {
-      ElMessage.success(response.data);
+      ElMessage.success(response.msg);
       closeDialog();
       resetQuery();
     });