计划管理 plan

libs/henq.js

@@ -342,18 +342,12 @@ henq.dirCode = (code, v) => {
   }
   return items
 }
-var valideTel = (rule, value, callback) => {
-  var re = /^1[3-9]{1}[0-9]{9}/;
-  if (value === "" || value === null) {
-      callback(new Error("请输入手机号"));
-  } else if (!re.test(value)) {
-      callback(new Error("请输入正确手机号"));
-  } else {
-      callback();
-  }
-}
+
+
 henq.makeRules = (list, api) => {
-  list = [{
+
+  //测试数据start
+  list = [{ //普通输入框
       columnDescription: "测试列1", // 中文名称
       dbColumnName: "colums1", // 字段名称
       dataType: "varchar", // 数据库中字段类型
@@ -371,57 +365,113 @@ henq.makeRules = (list, api) => {
       uniqueness: 0, // 唯一性  0 不限制 1 表内唯一 2 表内某条件下唯一
       ruleType: "", // 邮箱 ，电话，等
     },
-    {
-      columnDescription: "测试列2", // 中文名称
-      dbColumnName: "colums2", // 字段名称
-      dataType: "int32", // 数据库中字段类型
-      propertyName: "colums2", //程序中的字段名称
-      propertyType: "int", // 程序中的字段类型
-      code: "aps.plan.status", // 数据字典编码
-      isNullable: false, // 是否可空
-      isKey: false, // 是否主键
-      unit: "", // 单位
-      length: 50, //
-      decimalDigits: 0, // 精度
-      link: 0, //外键 表的
-      defaultValue: "", // 默认值 
+    { //数据字典项
+      columnDescription: "测试列2",
+      dbColumnName: "colums2",
+      dataType: "int32",
+      propertyName: "colums2",
+      propertyType: "int",
+      code: "aps.plan.status",
+      isNullable: false,
+      isKey: false,
+      unit: "",
+      length: 50,
+      decimalDigits: 0,
+      link: 0,
+      defaultValue: "",
       control: 0,
-      uniqueness: 0, // 唯一性  0 不限制 1 表内唯一 2 表内某条件下唯一
-      ruleType: "", // 邮箱 ，电话，等
+      uniqueness: 0,
+      ruleType: "",
     },
-    {
-      columnDescription: "测试列3", // 中文名称
-      dbColumnName: "colums3", // 字段名称
-      dataType: "varchar", // 数据库中字段类型
-      propertyName: "colums3", //程序中的字段名称
-      propertyType: "int", // 程序中的字段类型
-      code: "", // 数据字典编码
-      isNullable: false, // 是否可空
-      isKey: false, // 是否主键
-      unit: "", // 单位
-      length: 50, //
-      decimalDigits: 0, // 精度
-      link: 0, //外键 表的
-      defaultValue: "", // 默认值 
+    { //手机号码
+      columnDescription: "测试列3",
+      dbColumnName: "colums3",
+      dataType: "varchar",
+      propertyName: "colums3",
+      propertyType: "int",
+      code: "",
+      isNullable: false,
+      isKey: false,
+      unit: "",
+      length: 50,
+      decimalDigits: 0,
+      link: 0,
+      defaultValue: "",
       control: 0,
-      uniqueness: 0, // 唯一性  0 不限制 1 表内唯一 2 表内某条件下唯一
-      ruleType: "phone", // 邮箱 ，电话，等
+      uniqueness: 0,
+      ruleType: "phone",
+    },
+    { //电子邮件
+      columnDescription: "测试列4",
+      dbColumnName: "colums4",
+      dataType: "varchar",
+      propertyName: "colums4",
+      propertyType: "String",
+      code: "",
+      isNullable: false,
+      isKey: false,
+      unit: "",
+      length: 50,
+      decimalDigits: 0,
+      link: 0,
+      defaultValue: "",
+      control: 0,
+      uniqueness: 0,
+      ruleType: "email",
     }
   ]
+  //测试数据end
+
+  //手机号验证
+  const valideTel = (rule, value, callback) => {
+    var re = /^1[3-9]{1}[0-9]{9}/;
+    if (value === "" || value === null) {
+      callback(new Error("请输入手机号"));
+    } else if (!re.test(value)) {
+      callback(new Error("请输入正确手机号"));
+    } else {
+      callback();
+    }
+  }
   let rules = {}
+
   list.forEach(el => {
     if (!el.isNullable) {
       let objInfo = {}
-      //不能为空，必填文本或数字类型
-      if (el.code == '' && (el.propertyType == 'String' || el.propertyType == 'int')) {
-        objInfo = {
-          required: true,
-          message: "必填",
-          trigger: "blur"
+      rules[el.propertyName] = []
+      if (el.code == '') { //不能为空，必填文本或数字类型
+        if (el.ruleType == '') {
+          objInfo = {
+            required: true,
+            message: "必填",
+            trigger: "blur"
+          }
+        } else if (el.ruleType == 'email') {
+          objInfo = {
+            required: true,
+            message: '必填',
+            trigger: 'blur',
+            type: 'email'
+          }
+        }
+        else if(el.ruleType == 'phone')
+        {
+          objInfo = {
+            required: true,
+            message: "必填",
+            trigger: "blur"
+          }
+          let valInfoPhone = {
+            validator: valideTel,
+            required: true,
+            trigger: "blur"
+          }
+          rules[el.propertyName].push(valInfoPhone)
         }
+
       }
-      //不能为空，根据数据字典，必选
-      else if (el.code != '' && el.propertyType == 'int') {
+      else
+      {//数据字典
         objInfo = {
           required: true,
           message: "必选",
@@ -429,18 +479,8 @@ henq.makeRules = (list, api) => {
           type: "number",
         }
       }
-
-      rules[el.propertyName] = []
       rules[el.propertyName].push(objInfo)
 
-      if (el.ruleType == "phone") {
-        let valInfoPhone = {
-          validator: valideTel,
-          required: true,
-          trigger: "blur"
-      }
-        rules[el.propertyName].push(valInfoPhone)
-      } 
     }
   })
   return rules

pages/aps/plan/index.vue

@@ -322,9 +322,9 @@ export default {
                                             this.goMethod(params.row) : null,
                                     },
                                 },
-                                params.row.mainRoutingSetStatus == 0 ?
+                                params.row.mainRoutingSetStatus == 0 && params.row.isPreschedule == 0 ?
                                 "工艺派发" :
-                                params.row.mainRoutingSetStatus == 1 ?
+                                params.row.mainRoutingSetStatus == 1 && params.row.isPreschedule == 0 ?
                                 "移入排产" :
                                 ""
                             ),