From 3a82aab402e8cdee192ab47405f2a01973bd4dab Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 11 Apr 2022 11:46:25 +0800
Subject: [PATCH] 文件存储地址修改

---
 src/views/home/column.js | 1014 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 717 insertions(+), 297 deletions(-)

diff --git a/src/views/home/column.js b/src/views/home/column.js
index 3c4fcd3..6736831 100644
--- a/src/views/home/column.js
+++ b/src/views/home/column.js
@@ -1,325 +1,745 @@
 // import store from "@/store/index";
 
 
-// var validatePass = (rule, value, callback) => {
-//     var reg = /^[0-9]+.?[0-9]*$/;
-//     if (!reg.test(value)) {
-//         store.commit('changeyanzhen', false);
-//         callback(new Error('请输入数字'));
-//     } else {
-//         store.commit('changeyanzhen', true);
-//         callback();
-//     }
-// };
+var numbers = (rule, value, callback) => {
+  //   window.yanzhengnumbers = /^[0-9]+.?[0-9]*$/;
+  //   if (!yanzhengnumbers.test(value) && Math.floor(value) !== value) {
+  if (Math.floor(value) === value) {
+    callback();
+  } else {
+    callback(new Error('请输入整数'));
+  }
+};
 
 
-var column = [
-    {
-        label: "企业名称",
-        prop: "enterprisename",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入企业名称",
-                trigger: "blur",
-            },
-        ],
-    },
-    {
-        label: "统一社会信用代码",
-        prop: "creditcode",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入社会信用代码",
-                trigger: "blur",
-            },
-            // {
-            //     validator: validatePass, trigger: 'change'
-            // },
-        ],
-    },
+var phones = (rule, value, callback) => {
+  window.yanzhengphons = /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/;
+  if (!yanzhengphons.test(value)) {
+    callback(new Error('请输入正确电话'));
+  } else {
+    callback();
+  }
+};
 
-    // {
-    //     label: "企业类型",
-    //     prop: "ptype",
-    //     hide: true,
-    //     display: false,
-    // },
-    // {
-    //     label: "所属单位",
-    //     prop: "deptid",
-    //     hide: true,
-    //     display: false,
-    // },
+var columnOLD = [{
+    label: "企业名称",
+    prop: "enterprisename",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "请输入企业名称",
+      trigger: "blur",
+    }, ],
+  },
+  {
+    label: "统一社会信用代码",
+    prop: "creditcode",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入社会信用代码",
+    //         trigger: "blur",
+    //     },
+    //     // {
+    //     //     validator: numbers, trigger: ['change', 'blur']
+    //     // },
+    // ],
+  },
 
-    {
-        label: "法定代表人",
-        prop: "representative",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入法定代表人",
-                trigger: "blur",
-            },
-        ],
-    },
-    {
-        label: "法定代表人电话",
-        prop: "representativecell",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "法定代表人电话",
-                trigger: "blur",
-            },
-            // {
-            //     validator: validatePass, trigger: 'change'
-            // },
-        ],
-    },
-    {
-        label: "联系人",
-        prop: "contacts",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "联系人",
-                trigger: "blur",
-            },
-        ],
-    },
-    {
-        label: "联系人电话",
-        prop: "contactscell",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "联系人电话",
-                trigger: "blur",
-            },
-            // {
-            //     validator: validatePass, trigger: 'change'
-            // },
-        ],
-    },
-    {
-        label: "单位许可证编号",
-        prop: "perid",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "单位许可证编号",
-                trigger: "blur",
-            },
-        ],
-    }, {
-        label: "许可证发证机关",
-        prop: "offices",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "许可证发证机关",
-                trigger: "blur",
-            },
-        ],
-    }, {
-        label: "发证时间",
-        prop: "officetime",
-        labelWidth: 160,
-        span: 12,
-        type: "date",
-        format: "yyyy-MM-dd",
-        valueFormat: "yyyy-MM-dd",
-    },
-    {
-        label: "注册时间",
-        prop: "establishtime",
-        labelWidth: 160,
-        span: 12,
-        type: "date",
-        format: "yyyy-MM-dd",
-        valueFormat: "yyyy-MM-dd",
-    },
-    {
-        label: "注册资本(万元人民币)",
-        prop: "registeredcapital",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入注册资本",
-                trigger: "blur",
-            },
-        ],
-    },
-    {
-        label: "组织机构代码",
-        prop: "organizationcode",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入组织机构代码",
-                trigger: "blur",
-            },
-        ],
-    },
-    {
-        label: "工商注册号",
-        prop: "registrationnumber",
+  // {
+  //     label: "企业类型",
+  //     prop: "ptype",
+  //     hide: true,
+  //     display: false,
+  // },
+  // {
+  //     label: "所属单位",
+  //     prop: "deptid",
+  //     hide: true,
+  //     display: false,
+  // },
 
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入工商注册号",
-                trigger: "blur",
-            },
-        ],
+  {
+    label: "法定代表人",
+    prop: "representative",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "请输入法定代表人",
+      trigger: "blur",
+    }, ],
+  },
+  {
+    label: "法定代表人电话",
+    prop: "representativecell",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+        required: true,
+        message: "法定代表人电话",
+        trigger: "blur",
+      },
+      {
+        validator: phones,
+        trigger: ['change', 'blur']
+      },
+    ],
+  },
+  {
+    label: "联系人",
+    prop: "contacts",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "联系人",
+      trigger: "blur",
+    }, ],
+  },
+  {
+    label: "联系人电话",
+    prop: "contactscell",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+        required: true,
+        message: "联系人电话",
+        trigger: "blur",
+      },
+      {
+        validator: phones,
+        trigger: ['change', 'blur']
+      },
+    ],
+  },
+  {
+    label: "单位许可证编号",
+    prop: "perid",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "单位许可证编号",
+    //         trigger: "blur",
+    //     },
+    // ],
+  }, {
+    label: "许可证发证机关",
+    prop: "offices",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "许可证发证机关",
+    //         trigger: "blur",
+    //     },
+    // ],
+  }, {
+    label: "发证时间",
+    prop: "officetime",
+    labelWidth: 160,
+    span: 12,
+    type: "date",
+    format: "yyyy-MM-dd",
+    valueFormat: "yyyy-MM-dd",
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入发证时间",
+    //         trigger: "blur",
+    //     },
+    // ],
+  },
+  // {
+  //     label: "注册时间",
+  //     prop: "establishtime",
+  //     labelWidth: 160,
+  //     span: 12,
+  //     type: "date",
+  //     format: "yyyy-MM-dd",
+  //     valueFormat: "yyyy-MM-dd",
+  //     rules: [
+  //         {
+  //             required: true,
+  //             message: "请输入注册时间",
+  //             trigger: "blur",
+  //         },
+  //     ],
+  // },
+  // {
+  //     label: "注册资本(万元人民币)",
+  //     prop: "registeredcapital",
+  //     labelWidth: 160,
+  //     span: 12,
+  //     rules: [
+  //         {
+  //             required: true,
+  //             message: "请输入注册资本",
+  //             trigger: "blur",
+  //         },
+  //         {
+  //             validator: numbers, trigger: ['change', 'blur']
+  //         }
+  //     ],
+  // },
+  // {
+  //     label: "组织机构代码",
+  //     prop: "organizationcode",
+  //     labelWidth: 160,
+  //     span: 12,
+  //     rules: [
+  //         {
+  //             required: true,
+  //             message: "请输入组织机构代码",
+  //             trigger: "blur",
+  //         },
+  //     ],
+  // },
+  // {
+  //     label: "工商注册号",
+  //     prop: "registrationnumber",
+  //     labelWidth: 160,
+  //     span: 12,
+  //     rules: [
+  //         {
+  //             required: true,
+  //             message: "请输入工商注册号",
+  //             trigger: "blur",
+  //         },
+  //     ],
+  // },
+  {
+    label: "注册地址",
+    prop: "address",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入注册地址",
+    //         trigger: "blur",
+    //     },
+    // ],
+  },
+  {
+    label: "服务范围",
+    prop: "business",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入经营范围",
+    //         trigger: "blur",
+    //     },
+    // ],
+  },
+  {
+    label: "所属辖区",
+    prop: "jurisdiction",
+    type: "tree",
+    dicUrl: "/api/jurisdiction/lazy-trees",
+    props: {
+      label: "title",
+      value: "id",
     },
-    {
-        label: "注册地址",
-        prop: "address",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入注册地址",
-                trigger: "blur",
-            },
-        ],
-    },
-    {
-        label: "经营范围",
-        prop: "business",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入经营范围",
-                trigger: "blur",
-            },
-        ],
-    },
-    {
-        label: "所属辖区",
-        prop: "jurisdiction",
-        type: "tree",
-        dicUrl: "/api/jurisdiction/lazy-trees",
-        props: {
-            label: "title",
-            value: "id",
-        },
-        labelWidth: 160,
-        span: 12,
-    },
-    {
-        label: "登记机关",
-        prop: "registration",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入登记机关",
-                trigger: "blur",
-            },
-        ],
-    },
-    {
-        label: "所属行业",
-        prop: "industry",
-        labelWidth: 160,
-        span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入所属行业",
-                trigger: "blur",
-            },
-        ],
-    },
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "请输入发证时间",
+      trigger: "blur",
+    }, ],
+  },
+  {
+    label: "登记机关",
+    prop: "registration",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入登记机关",
+    //         trigger: "blur",
+    //     },
+    // ],
+  },
+  {
+    label: "所属行业",
+    prop: "industry",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入所属行业",
+    //         trigger: "blur",
+    //     },
+    // ],
+  }
 ]
+
+var column = [{
+    label: "企业名称",
+    prop: "enterprisename",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "请输入企业名称",
+      trigger: "blur",
+    }, ],
+  },
+  {
+    label: "统一社会信用代码",
+    prop: "creditcode",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入社会信用代码",
+    //         trigger: "blur",
+    //     },
+    //     // {
+    //     //     validator: numbers, trigger: ['change', 'blur']
+    //     // },
+    // ],
+  },
+  {
+    label: "法定代表人",
+    prop: "representative",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "请输入法定代表人",
+      trigger: "blur",
+    }, ],
+  },
+  {
+    label: "法定代表人电话",
+    prop: "representativecell",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+        required: true,
+        message: "法定代表人电话",
+        trigger: "blur",
+      },
+      {
+        validator: phones,
+        trigger: ['change', 'blur']
+      },
+    ],
+  },
+  {
+    label: "联系人",
+    prop: "contacts",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "联系人",
+      trigger: "blur",
+    }, ],
+  },
+  {
+    label: "联系人电话",
+    prop: "contactscell",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+        required: true,
+        message: "联系人电话",
+        trigger: "blur",
+      },
+      {
+        validator: phones,
+        trigger: ['change', 'blur']
+      },
+    ],
+  },
+  {
+    label: "注册地址",
+    prop: "address",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "联系人电话",
+      trigger: "blur",
+    }],
+  },
+  {
+    label: "所属辖区",
+    prop: "jurisdiction",
+    type: "tree",
+    dicUrl: "/api/jurisdiction/lazy-trees",
+    props: {
+      label: "title",
+      value: "id",
+    },
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "请输入发证时间",
+      trigger: "blur",
+    }, ],
+  },
+  // {
+  //     label: "注册地址",
+  //     prop: "address",
+  //     labelWidth: 160,
+  //     span: 12,
+  //     // rules: [
+  //     //     {
+  //     //         required: true,
+  //     //         message: "请输入注册地址",
+  //     //         trigger: "blur",
+  //     //     },
+  //     // ],
+  // },
+  {
+    label: "服务范围",
+    prop: "business",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入经营范围",
+    //         trigger: "blur",
+    //     },
+    // ],
+  },
+  {
+    label: "登记机关",
+    prop: "registration",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入登记机关",
+    //         trigger: "blur",
+    //     },
+    // ],
+  },
+  {
+    label: "所属行业",
+    prop: "industry",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入所属行业",
+    //         trigger: "blur",
+    //     },
+    // ],
+  }
+]
+
+
+var columnzizhao = [{
+    label: "企业名称",
+    prop: "enterprisename",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "请输入企业名称",
+      trigger: "blur",
+    }, ],
+  },
+  {
+    label: "统一社会信用代码",
+    prop: "creditcode",
+    labelWidth: 160,
+    span: 12,
+    // rules: [
+    //     {
+    //         required: true,
+    //         message: "请输入社会信用代码",
+    //         trigger: "blur",
+    //     },
+    //     // {
+    //     //     validator: numbers, trigger: ['change', 'blur']
+    //     // },
+    // ],
+  },
+  {
+    label: "法定代表人",
+    prop: "representative",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "请输入法定代表人",
+      trigger: "blur",
+    }, ],
+  },
+  {
+    label: "法定代表人电话",
+    prop: "representativecell",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+        required: true,
+        message: "法定代表人电话",
+        trigger: "blur",
+      },
+      {
+        validator: phones,
+        trigger: ['change', 'blur']
+      },
+    ],
+  },
+  {
+    label: "联系人",
+    prop: "contacts",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "联系人",
+      trigger: "blur",
+    }, ],
+  },
+  {
+    label: "联系人电话",
+    prop: "contactscell",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+        required: true,
+        message: "联系人电话",
+        trigger: "blur",
+      },
+      {
+        validator: phones,
+        trigger: ['change', 'blur']
+      },
+    ],
+  },
+  {
+    label: "注册地址",
+    prop: "address",
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "联系人电话",
+      trigger: "blur",
+    }],
+  },
+  {
+    label: "所属辖区",
+    prop: "jurisdiction",
+    type: "tree",
+    dicUrl: "/api/jurisdiction/lazy-trees",
+    props: {
+      label: "title",
+      value: "id",
+    },
+    labelWidth: 160,
+    span: 12,
+    rules: [{
+      required: true,
+      message: "请输入发证时间",
+      trigger: "blur",
+    }, ],
+  },
+];
+
 
 
 var columnU = [];
 for (var k in column) {
-    if (column[k].prop == 'perid' ||
-        column[k].prop == 'offices' ||
-        column[k].prop == 'officetime') {
-        continue;
-    }
-    columnU.push(column[k]);
+  if (column[k].prop == 'perid' ||
+    column[k].prop == 'offices' ||
+    column[k].prop == 'officetime') {
+    continue;
+  }
+  columnU.push(column[k]);
 }
+
+
+
+export var securityPermitcolumn = [ //保安服务许可申请
+  ...columnU
+]
+
+
+export var securityTrainingcolumn = [ //保安培训许可申请
+  ...columnU
+]
+
+
+var columnFGS = [];
+for (var k in column) {
+  if (column[k].prop == 'representative') {
+    columnFGS.push({
+      ...column[k],
+      label: "分公司负责人",
+    });
+
+  } else if (column[k].prop == 'representativecell') {
+    columnFGS.push({
+      ...column[k],
+      label: "分公司负责人电话",
+    });
+
+  } else {
+    columnFGS.push(column[k]);
+  }
+}
+
+export var branchOfficecolumn = [ //设立分公司备案
+  ...columnFGS
+]
+
+export var securityGuardcolumn = [ //自招保安单位备案
+  ...columnzizhao
+]
+
+
+export var cancellationOfFilingcolumn = [ //自招保安单位备案撤销
+  ...columnU, {
+    label: "撤销原因",
+    prop: "reason",
+    labelWidth: 160,
+    span: 24,
+    type: 'textarea',
+    rules: [{
+      required: true,
+      message: "请输入撤销原因",
+      trigger: "blur",
+    }, ],
+  },
+]
+
 
 var columnXIAQU = [];
 for (var k in column) {
-    if (column[k].prop == 'jurisdiction') {
-        continue;
-    }
-    columnXIAQU.push(column[k]);
+  // if (column[k].prop == 'jurisdiction') {
+  //     continue;
+  // }
+  columnXIAQU.push(column[k]);
 }
 
-export var securityPermitcolumn = [//保安服务许可申请
-    ...columnU
+export var crossRegioncolumn = [ //跨区域经营备案
+  ...columnXIAQU, {
+    label: "保安人数",
+    prop: "ksecuritys",
+    labelWidth: 160,
+    span: 12,
+    append: '(人)',
+    type: 'number',
+    rules: [{
+      required: true,
+      message: "请输入保安人数",
+      trigger: "blur",
+    }, {
+      validator: numbers,
+      trigger: 'blur'
+    }],
+  }, {
+    label: "拟跨区域经营的保安服务项目",
+    prop: "kproject",
+    labelWidth: 240,
+    // span: 24,
+    rules: [{
+      required: true,
+      message: "请输入拟跨区域经营的保安服务项目",
+      trigger: "blur",
+    }],
+  }, {
+    label: "邮编",
+    prop: "kzipcode",
+    span: 12,
+    labelWidth: 160,
+    rules: [{
+      required: true,
+      message: "请输入邮编",
+      trigger: "blur",
+    }],
+  }, {
+    label: "跨区域经营服务时间(备案有效期)",
+    prop: "kservicetime",
+    format: 'yyyy-MM-dd',
+    labelWidth: 260,
+    type: "daterange",
+    valueFormat: 'yyyy-MM-dd',
+    startPlaceholder: '备案有效期开始',
+    endPlaceholder: '备案有效期结束',
+    rules: [{
+      required: true,
+      message: "请输入跨区域经营服务时间(备案有效期)",
+      trigger: "blur",
+    }],
+  }, {
+    label: "地址",
+    prop: "kaddress",
+    labelWidth: 160,
+    // span: 24,
+    rules: [{
+      required: true,
+      message: "请输入地址",
+      trigger: "blur",
+    }],
+  },
 ]
 
 
-export var securityTrainingcolumn = [//保安培训许可申请
-    ...columnU
+export var armedEscortcolumn = [ //武装押运许可申请
+  ...columnU
 ]
 
+var columnFRBG = [];
+for (var k in column) {
+  if (column[k].prop == 'contacts') {
+    columnFRBG.push({
+      label: "更变后法人",
+      prop: "changecontacts",
+      labelWidth: 160,
+      span: 12,
+      rules: [{
+        required: true,
+        message: "更变后法人",
+        trigger: "blur",
+      }, ],
+    });
+    columnFRBG.push({
+      label: "更变后法人电话",
+      prop: "changecontactscell",
+      labelWidth: 160,
+      span: 12,
+      rules: [{
+          required: true,
+          message: "更变后法人电话",
+          trigger: "blur",
+        },
+        {
+          validator: phones,
+          trigger: ['change', 'blur']
+        },
+      ],
+    }, );
+  }
+  columnFRBG.push(column[k]);
+}
 
-export var branchOfficecolumn = [//设立分公司备案
-    ...column
+export var changeOfLegalPersoncolumn = [ //保安服务公司法人变更
+  ...columnFRBG
 ]
 
-
-export var securityGuardcolumn = [//自招保安单位备案
-    ...column
-]
-
-
-export var cancellationOfFilingcolumn = [//自招保安单位备案撤销
-    ...columnU, {
-        label: "撤销原因",
-        prop: "reason",
-        labelWidth: 160,
-        span: 24,
-        type: 'textarea',
-        rules: [
-            {
-                required: true,
-                message: "请输入撤销原因",
-                trigger: "blur",
-            },
-        ],
-    },
-]
-
-
-export var crossRegioncolumn = [//跨区域经营备案
-    ...columnXIAQU
-]
+//抛出相对于的名称即可

--
Gitblit v1.9.3