修改

jwtech-admin-page/src/views/building/projectInfo/projectProcess/peasantWorkerSystem/options/marginAccount.vue

@@ -317,12 +317,9 @@
       <el-row :gutter="15">
         <el-form ref="form" :model="form" :rules="rules" label-width="210px">
           <!-- ==============共有============= -->
+          <el-row :gutter="15">
             <el-col :span="12">
               <el-form-item label="收取方式" prop="incomeExpenditureMethods">
-              <!-- <el-input
-                v-model="form.incomeExpenditureMethods"
-                placeholder="请输入收取方式"
-              /> -->
                 <el-select
                   v-model="form.incomeExpenditureMethods"
                   placeholder="请选择收取方式"
@@ -353,7 +350,8 @@
                 </el-input>
               </el-form-item>
             </el-col>
-
+          </el-row>
+          <el-row :gutter="15">
             <el-col :span="12">
               <el-form-item label="应缴金额" prop="amountPayable">
                 <el-input
@@ -374,6 +372,8 @@
                 </el-input>
               </el-form-item>
             </el-col>
+          </el-row>
+
           <el-col :span="12">
             <el-form-item
               label="工资保证金开户银行"

jwtech-admin-page/src/views/project/report/index.vue

@@ -405,6 +405,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择上报时间"
+                :picker-options="pickerOptions"
               >
               </el-date-picker>
             </el-form-item>
@@ -419,6 +420,7 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="选择审批时间"
+                :picker-options="pickerOptions"
               >
               </el-date-picker>
             </el-form-item>
@@ -634,6 +636,12 @@ export default {
   name: "Feasibility",
   data() {
     return {
+      // 禁选当前时间之后的时间
+      pickerOptions: {
+        disabledDate: (time) => {
+          return time.getTime() > new Date().getTime();
+        },
+      },
       areasOptionProps: {
         emitPath: false,
         checkStrictly: true, //选择任意一级
@@ -726,9 +734,14 @@ export default {
       rules: {
         reportTime: [
           {
-            message: "上报时间不能晚于审批时间",
             trigger: "blur",
-            validate: this.compareTime,
+            validator: this.compareTime,
+          },
+        ],
+        approvalTime: [
+          {
+            trigger: "blur",
+            validator: this.compareTime,
           },
         ],
         compilingUnit: [
@@ -775,16 +788,19 @@ export default {
     });
   },
   methods: {
-    compareTime() {
+    compareTime(rule, value, callback) {
       if (this.form.reportTime && this.form.approvalTime) {
         //  dateStr = dateStr.substring(0,19);
         let dateStr1 = this.form.reportTime.replace(/-/g, "/");
         let dateStr2 = this.form.approvalTime.replace(/-/g, "/");
         let timeTamp1 = new Date(dateStr1).getTime();
         let timeTamp2 = new Date(dateStr2).getTime();
-        console.log(1111, timeTamp1, timeTamp2);
-        if (timeTamp1 > timeTamp2) return false;
-        return true;
+        // console.log(1111, timeTamp1, timeTamp2);
+        if (timeTamp1 <= timeTamp2) {
+          callback();
+        } else {
+          callback(new Error("上报时间不能晚于审批时间"));
+        }
       }
     },
     formatAdcd(row) {