Merge branch 'master' of https://git.agilestar.cn/spfm-group/spfm-market-front

src/pages/main/gridDivision/approvalExamination.vue

@@ -1,11 +1,12 @@
 <template>
-  <div class="approvalExamination-container">
+  <div class="simple-container approvalExamination-container">
     <simple-form
       :form="table_form"
       :handle="table_handle"
       @search="handleSearch"
       @track="handleQueryTrack"
       @batch="handleBatch"
+      @turn="handleReturn"
     >
     </simple-form>
     <simple-table
@@ -124,6 +125,10 @@ export default {
       table_loading: false,
       table_handle: [
         {
+          label: "返回",
+          props: "turn",
+        },
+        {
           label: "审批轨迹",
           props: "track",
         },
@@ -202,7 +207,6 @@ export default {
         {
           label: "处理时间",
           props: "opTime",
-          type: "date",
         },
         {
           label: "审批意见",
@@ -248,23 +252,31 @@ export default {
               No: index + 1,
             }))
           : [];
-        // this.table_list[0].sts === "1"
-        //   ? (this.table_handle = [
-        //       {
-        //         label: "审批轨迹",
-        //         props: "track",
-        //       },
-        //     ])
-        //   : this.table_handle = [
-        //       {
-        //         label: "审批轨迹",
-        //         props: "track",
-        //       },
-        //       {
-        //         label: "批量审批",
-        //         props: "batch",
-        //       },
-        //     ];
+        this.table_list && this.table_list[0].sts === "0"
+          ? (this.table_handle = [
+              {
+                label: "返回",
+                props: "turn",
+              },
+              {
+                label: "审批轨迹",
+                props: "track",
+              },
+              {
+                label: "批量审批",
+                props: "batch",
+              },
+            ])
+          : (this.table_handle = [
+              {
+                label: "返回",
+                props: "turn",
+              },
+              {
+                label: "审批轨迹",
+                props: "track",
+              },
+            ]);
         data.forEach((item) => {
           this.adoptIds.push(item.id.toString());
         });
@@ -394,6 +406,9 @@ export default {
 
       this.handleVisible("opinion");
     },
+    handleReturn(){
+      this.$router.go(-1)
+    },
     // 审批轨迹--确定关闭模态框
     handleConsent() {
       this.handleVisible("track");

src/pages/main/gridDivision/workersList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="workersList-container">
+  <div class="simple-container workersList-container">
     <simple-form
       :form="table_form"
       :handle="table_handle"
@@ -33,41 +33,28 @@
     >
       <el-form
         label-width="120px"
+        :rules="rules"
         :model="add_form"
         ref="add_ref"
       >
-        <el-form-item
-          label="提出人"
-          prop="proposer"
-          :rules="{
-            required: true,
-            message: '提出人不能为空',
-            trigger: 'blur',
-          }"
-        >
-          <el-input :disabled="title === '审批' || title === '查看'"  v-model="add_form.proposer"></el-input>
+        <el-form-item label="提出人" prop="proposer">
+          <el-input
+            :disabled="title === '审批' || title === '查看'"
+            v-model="add_form.proposer"
+          ></el-input>
         </el-form-item>
-        <el-form-item
-          label="联系电话"
-          prop="telephone"
-          :rules="{
-            required: true,
-            message: '联系电话不能为空',
-            trigger: 'blur',
-          }"
-        >
-          <el-input :disabled="title === '审批' || title === '查看'" v-model="add_form.telephone"></el-input>
+        <el-form-item label="联系电话" prop="telephone" >
+          <el-input
+            :disabled="title === '审批' || title === '查看'"
+            v-model="add_form.telephone"
+          ></el-input>
         </el-form-item>
-        <el-form-item
-          label="网格划分需求"
-          prop="wanggeText"
-          :rules="{
-            required: true,
-            message: '网格划分需求不能为空',
-            trigger: 'blur',
-          }"
-        >
-          <el-input type="textarea" :disabled="title === '审批' || title === '查看'" v-model="add_form.wanggeText"></el-input>
+        <el-form-item label="网格划分需求" prop="wanggeText">
+          <el-input
+            type="textarea"
+            :disabled="title === '审批' || title === '查看'"
+            v-model="add_form.wanggeText"
+          ></el-input>
         </el-form-item>
         <el-form-item label="附件上传" prop="file">
           <myUpload
@@ -77,9 +64,7 @@
             :fileList="fileInfo.fileList"
           ></myUpload>
           <div v-else>
-            <div v-if="fileInfo.fileList.length === 0">
-              暂无附件
-            </div>
+            <div v-if="fileInfo.fileList.length === 0">暂无附件</div>
             <div
               v-for="(item, index) in fileInfo.fileList"
               :key="index"
@@ -174,7 +159,49 @@ export default {
     simplePagination,
   },
   data() {
+    const chcekPhone = (rule, value, callback) => {
+      const phoneReg = /^1[3|4|5|7|8][0-9]{9}$/;
+      if (!value) {
+        return callback(new Error("联系人为空"));
+      }
+
+      setTimeout(() => {
+        if (!Number.isInteger(+value)) {
+          callback(new Error("请输入数字值"));
+        } else {
+          if (phoneReg.test(value)) {
+            callback();
+          } else {
+            callback(new Error("联系人格式不正确"));
+          }
+        }
+      }, 100);
+    };
     return {
+      rules: {
+        proposer: [
+          {
+            required: true,
+            message: "提出人不能为空",
+            trigger: "blur",
+          },
+        ],
+        telephone: [
+          {
+            required: true,
+            // message: "联系电话不能为空",
+            trigger: "blur",
+            validator: chcekPhone,
+          },
+        ],
+        wanggeText: [
+          {
+            required: true,
+            message: "网格划分需求不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
       // 当前用户标识
       loginNoStr: "",
       fileInfo: {
@@ -306,7 +333,6 @@ export default {
         {
           label: "处理时间",
           props: "opTime",
-          type: "date",
         },
         {
           label: "审批意见",