From 111689135f165ecb2ea5ce0881784dfc89b58d87 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 05 Nov 2021 17:33:45 +0800
Subject: [PATCH] +增加查看信息 以及修改掐他字段

---
 src/api/system/user.js                     |    3 
 src/api/jurisdiction.js                    |   13 
 src/views/home/column.js                   |  393 +++++++++++++++++++++++---
 src/components/Approval/Approval.vue       |   95 ++++++
 src/components/cardPopup/cardPopuponce.vue |   89 +++++
 src/page/login/codelogin.vue               |  211 ++++++++-----
 src/components/attach/attach.vue           |   10 
 src/styles/element-ui.scss                 |    8 
 src/components/cardPopup/cardPopup.vue     |   26 +
 9 files changed, 700 insertions(+), 148 deletions(-)

diff --git a/src/api/jurisdiction.js b/src/api/jurisdiction.js
new file mode 100644
index 0000000..7b105bf
--- /dev/null
+++ b/src/api/jurisdiction.js
@@ -0,0 +1,13 @@
+import request from '@/router/axios';
+
+export const getjurisdiction = (current, size, params) => {
+    return request({
+        url: '/api/blade-system/dept/list',
+        method: 'get',
+        // params: {
+        //   ...params,
+        //   current,
+        //   size,
+        // }
+    })
+}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 98e08cd..ccc639b 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -119,13 +119,14 @@
   })
 }
 
-export const zc = (username, password) => {
+export const zc = (username, password, phone) => {
   return request({
     url: '/api/blade-user/zc',
     method: 'get',
     params: {
       username,
       password,
+      phone
     }
   })
 }
diff --git a/src/components/Approval/Approval.vue b/src/components/Approval/Approval.vue
index 3b76958..b41e0a8 100644
--- a/src/components/Approval/Approval.vue
+++ b/src/components/Approval/Approval.vue
@@ -33,8 +33,29 @@
             <i class="zc" v-if="row.type == '2'"></i>
           </el-tag>
         </template>
+        <template slot-scope="{ type, size, row }" slot="menu">
+          <el-button
+            icon="icon-zhengjian"
+            :size="size"
+            :type="type"
+            class="zhengJian-icon"
+            @click.stop="handleCredentials(row)"
+            >查看</el-button
+          >
+        </template>
       </avue-crud>
     </basic-container>
+    <div class="seeOnces" v-if="openOnceShow">
+      <i
+        class="el-icon-close openOnceCLoce"
+        style="color: #000 !important"
+        @click="openClose"
+      >
+      </i>
+      <div class="seeOncesMain">
+        <cardPopuponce class="openOnce" :paredData="paredData"></cardPopuponce>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -47,7 +68,11 @@
   getListrev,
 } from "@/api/permit/permit";
 import { mapGetters } from "vuex";
+import cardPopuponce from "../cardPopup/cardPopuponce.vue";
 export default {
+  components: {
+    cardPopuponce,
+  },
   props: {
     visible: {
       type: Boolean,
@@ -78,6 +103,10 @@
   },
   data() {
     return {
+      useWhere: "",
+      paredData: "",
+      openOnceShow: false,
+
       data: [],
       query: {},
       loading: false,
@@ -96,11 +125,12 @@
         searchShow: true,
         searchMenuSpan: 8,
         labelWidth: 130,
+        menuWidth: 100,
         headerAlign: "center",
         align: "center",
         border: true,
         index: true,
-        viewBtn: true,
+        viewBtn: false,
         selection: true,
         dialogClickModal: false,
         column: [
@@ -136,12 +166,32 @@
             valueFormat: "yyyy-MM-dd HH:mm:ss",
           },
           {
-            label: "预计审核时间",
+            label: "截止受理时间",
             prop: "overtime",
             addDisplay: false,
             type: "date",
             format: "yyyy-MM-dd",
             valueFormat: "yyyy-MM-dd",
+          },
+          {
+            label: "所属辖区",
+            prop: "jurisdiction",
+            type: "tree",
+            dicUrl: "/api/jurisdiction/lazy-trees",
+            // hide: true,
+            props: {
+              label: "title",
+              value: "id",
+            },
+            labelWidth: 160,
+            span: 12,
+            rules: [
+              {
+                required: true,
+                message: "请输入发证时间",
+                trigger: "blur",
+              },
+            ],
           },
           {
             label: "审核状态",
@@ -178,6 +228,15 @@
         });
       }
       done();
+    },
+    handleCredentials(val) {
+      this.openOnceShow = true;
+      this.paredData = val;
+      // console.log(val);
+    },
+    openClose() {
+      this.paredData = "";
+      this.openOnceShow = false;
     },
     onLoad(page, params = {}) {
       this.loading = true;
@@ -223,5 +282,35 @@
 };
 </script>
 
-<style>
+<style lang="scss">
+.seeOnces {
+  position: absolute;
+  top: -50px;
+  left: 6px;
+  width: 1251px;
+  height: 850px;
+  background-color: #fff;
+  z-index: 10;
+  border-radius: 4px;
+}
+.openOnce {
+  width: 100%;
+  height: 100%;
+}
+.seeOncesMain {
+  width: 100%;
+  height: 100%;
+  overflow: scroll;
+}
+.openOnceCLoce {
+  position: absolute;
+  top: 17px;
+  font-size: 20px;
+  right: 11px;
+  z-index: 10;
+  color: #fff;
+}
+.openOnceCLoce:hover {
+  color: red;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/attach/attach.vue b/src/components/attach/attach.vue
index 70efcac..d3ff19d 100644
--- a/src/components/attach/attach.vue
+++ b/src/components/attach/attach.vue
@@ -143,7 +143,7 @@
             propsHttp: {
               res: "data",
             },
-            tip: "只能上传jpg/png文件,且不超过500kb",
+            tip: "支持上传jpg/png/doc/docx/xls/xlsx文件,图片不超过500Kb,文档不超过3Mb",
             action:
               // "/api/blade-resource/oss/endpoint/put-file-attach",
               "/api/blade-resource/oss/endpoint/put-file-attach?deptid=&type=" +
@@ -342,16 +342,16 @@
     onLoad(page, params = {}) {
       var that = this;
       var data = [];
-      console.log(this.$store.getters.userInfo.Id);
+      // console.log(this.$store.getters.userInfo.Id);
       // this.data = this.enclosure;
       params["ptype"] = this.ptype;
       getTemplate(params, 1, 50).then((res) => {
         data = res.data.data.records;
-        console.log(data, "::template");
+        // console.log(data, "::template");
         params["userid"] = this.$store.getters.userInfo.Id;
         getUseInfor(params).then((res) => {
           var userInfo = res.data.data.records;
-          console.log(userInfo, "::userInfo");
+          // console.log(userInfo, "::userInfo");
           if (userInfo.length == 0) {
             for (var k in data) {
               data[k]["type"] = 1;
@@ -380,7 +380,7 @@
     seeImages(row) {
       this.imgUrl = "";
       this.imgUrl = "url(" + row.link + ") center center / contain no-repeat";
-      console.log(this.imgUrl);
+      // console.log(this.imgUrl);
       // this.imgUrl = row.link;
 
       this.imgSee = true;
diff --git a/src/components/cardPopup/cardPopup.vue b/src/components/cardPopup/cardPopup.vue
index e614345..fd9f403 100644
--- a/src/components/cardPopup/cardPopup.vue
+++ b/src/components/cardPopup/cardPopup.vue
@@ -53,6 +53,8 @@
                   ref="form1"
                   v-model="obj0"
                   :option="option"
+                  @submit="submit"
+                  class="cardButs"
                 ></avue-form>
               </el-collapse-item>
               <el-collapse-item title="附件上传/查询" name="2">
@@ -117,7 +119,7 @@
       },
       option: {
         emptyBtn: false,
-        submitBtn: false,
+        submitBtn: true,
         gutter: 50,
         column: [],
       },
@@ -147,7 +149,7 @@
           this.OnceChouse = true;
 
           d.push(this.together[i]);
-          console.log("选择");
+          // console.log("选择");
         }
       }
       if (this.OnceChouse) {
@@ -204,20 +206,20 @@
             this.data = this.data.concat(resk.data.data.records);
             getListrev(page.currentPage, page.pageSize, params).then((resv) => {
               this.data = this.data.concat(resv.data.data.records);
-              console.log("已有申请数量:", this.data.length);
-              console.log(val, "当前type");
+              // console.log("已有申请数量:", this.data.length);
+              // console.log(val, "当前type");
               this.changeBut(true, d);
               if (this.data.length == 0) {
-                console.log("一条数据都没有");
+                // console.log("一条数据都没有");
               } else {
                 this.data.forEach((item) => {
                   if (item.ptype == val) {
                     if (item.type == 0 || item.type == 2) {
                       this.changeBut(false, d);
-                      console.log(item, "有数据未审核或者审核通过");
+                      // console.log(item, "有数据未审核或者审核通过");
                     } else {
                       this.changeBut(true, d);
-                      console.log(item, "审核不通过");
+                      // console.log(item, "审核不通过");
                     }
                   }
                 });
@@ -281,8 +283,16 @@
     aa(b) {
       console.log(b);
     },
-    up() {
+    submit() {
+      this.up(0);
+    },
+    up(val = 1) {
       //提交申请
+      // this.submit();
+      if (val == 1) {
+        this.$refs.form1.submit(); //解决点击提交不能显示那个字段输入错误的问题
+        return;
+      }
       var d = {};
       for (var k in this.obj0) {
         for (var i in this.option.column) {
diff --git a/src/components/cardPopup/cardPopuponce.vue b/src/components/cardPopup/cardPopuponce.vue
new file mode 100644
index 0000000..4a0af9c
--- /dev/null
+++ b/src/components/cardPopup/cardPopuponce.vue
@@ -0,0 +1,89 @@
+<template>
+  <basic-container class="openOnceMain">
+    <el-collapse v-model="activeNames" @change="handleChange">
+      <el-collapse-item title="公司基本信息" name="1">
+        <avue-form
+          ref="form1"
+          v-model="obj0"
+          :option="option"
+          class="cardButs"
+        ></avue-form>
+      </el-collapse-item>
+      <el-collapse-item title="附件上传/查询" name="2">
+        <attach
+          v-if="openattach"
+          :type="imgType"
+          :ptype="type"
+          :opens="opens"
+          :enclosure="enclosure"
+        ></attach>
+      </el-collapse-item>
+    </el-collapse>
+  </basic-container>
+</template>
+<script>
+import { ourDatas } from "@/views/home/ourDatas";
+import attach from "@/components/attach/attach";
+import { mapGetters } from "vuex";
+export default {
+  components: {
+    attach,
+  },
+  props: ["useWhere", "paredData"],
+  data() {
+    return {
+      opens: false,
+      openattach: false,
+      enclosure: "",
+      type: "",
+      activeNames: ["1", "2"],
+      imgType: "",
+      obj0: {},
+      option: {
+        emptyBtn: false,
+        submitBtn: true,
+        editDisabled: true,
+        gutter: 50,
+        column: [],
+      },
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo"]),
+  },
+  mounted() {
+    for (let i = 0; i < ourDatas.length; i++) {
+      if (ourDatas[i].menuName == this.paredData.$ptype) {
+        // console.log(ourDatas[i]);
+        this.option.column = ourDatas[i].datas.column;
+        this.imgType = ourDatas[i].imgType;
+        this.openattach = true;
+        this.type = ourDatas[i].type;
+        this.enclosure = ourDatas[i].enclosure;
+      }
+    }
+    let cloum = this.option.column;
+    for (let i in cloum) {
+      if (cloum[i].prop == "jurisdiction") {
+        cloum[i] = {
+          label: "所属辖区",
+          prop: "jurisdiction",
+          labelWidth: 160,
+          span: 12,
+        };
+      }
+      cloum[i]["disabled"] = true;
+    }
+    // console.log(cloum);
+    this.paredData.jurisdiction = this.paredData.$jurisdiction;
+    this.obj0 = this.paredData;
+    // console.log(this.obj0);
+  },
+};
+</script>
+<style lang="scss" scoped>
+.openOnceMain {
+  width: 100%;
+  height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/page/login/codelogin.vue b/src/page/login/codelogin.vue
index b3fdf38..3ddaf3a 100644
--- a/src/page/login/codelogin.vue
+++ b/src/page/login/codelogin.vue
@@ -1,73 +1,93 @@
 <template>
-  <el-form class="login-form"
-           status-icon
-           :rules="loginRules"
-           ref="loginForm"
-           :model="loginForm"
-           label-width="0">
+  <el-form
+    class="login-form"
+    status-icon
+    :rules="loginRules"
+    ref="loginForm"
+    :model="loginForm"
+    label-width="0"
+  >
     <el-form-item prop="username">
-      <el-input size="small"
-                @keyup.enter.native="handleLogin"
-                v-model="loginForm.username"
-                auto-complete="off"
-                :placeholder="$t('login.username')">
-        <i slot="prefix" class="icon-yonghu"/>
+      <el-input
+        size="small"
+        @keyup.enter.native="handleLogin"
+        v-model="loginForm.username"
+        auto-complete="off"
+        :placeholder="$t('login.username')"
+      >
+        <i slot="prefix" class="icon-yonghu" />
+      </el-input>
+    </el-form-item>
+    <el-form-item prop="phone">
+      <el-input
+        size="small"
+        @keyup.enter.native="handleLogin"
+        v-model="loginForm.phone"
+        auto-complete="off"
+        :placeholder="$t('login.phone')"
+      >
+        <i slot="prefix" class="el-icon-phone-outline" />
       </el-input>
     </el-form-item>
     <el-form-item prop="password">
-      <el-input size="small"
-                @keyup.enter.native="handleLogin"
-                v-model="loginForm.password"
-                auto-complete="off"
-                show-password
-                :placeholder="$t('login.password')">
-        <i slot="prefix" class="icon-mima"/>
+      <el-input
+        size="small"
+        @keyup.enter.native="handleLogin"
+        v-model="loginForm.password"
+        auto-complete="off"
+        show-password
+        :placeholder="$t('login.password')"
+      >
+        <i slot="prefix" class="icon-mima" />
       </el-input>
     </el-form-item>
     <el-form-item prop="password2">
-      <el-input size="small"
-                @keyup.enter.native="handleLogin"
-                v-model="loginForm.password2"
-                auto-complete="off"
-                show-password
-                :placeholder="$t('login.password2')">
-        <i slot="prefix" class="icon-mima"/>
+      <el-input
+        size="small"
+        @keyup.enter.native="handleLogin"
+        v-model="loginForm.password2"
+        auto-complete="off"
+        show-password
+        :placeholder="$t('login.password2')"
+      >
+        <i slot="prefix" class="icon-mima" />
       </el-input>
     </el-form-item>
     <el-form-item class="z-login-submit-prv">
-      <el-button size="small"
-                 type="primary"
-                 @click.native.prevent="handleLogin"
-                 class="z-login-submit">{{ $t('login.zc') }}
+      <el-button
+        size="small"
+        type="primary"
+        @click.native.prevent="handleLogin"
+        class="z-login-submit"
+        >{{ $t("login.zc") }}
       </el-button>
-      <el-button size="small"
-                 @click.native.prevent="gbs"
-                 class="z-login-submit">{{ $t('login.gb') }}
+      <el-button size="small" @click.native.prevent="gbs" class="z-login-submit"
+        >{{ $t("login.gb") }}
       </el-button>
     </el-form-item>
   </el-form>
 </template>
 
 <script>
-import {isvalidatemobile} from "@/util/validate";
-import {mapGetters} from "vuex";
-import {zc} from "@/api/system/user"
+import { isvalidatemobile } from "@/util/validate";
+import { mapGetters } from "vuex";
+import { zc } from "@/api/system/user";
 
 export default {
   name: "codelogin",
   data() {
     const validatePass = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请输入密码'));
+      if (value === "") {
+        callback(new Error("请输入密码"));
       } else {
         callback();
       }
     };
     const validatePass2 = (rule, value, callback) => {
-      if (value === '') {
-        callback(new Error('请再次输入密码'));
+      if (value === "") {
+        callback(new Error("请再次输入密码"));
       } else if (value !== this.loginForm.password) {
-        callback(new Error('两次输入密码不一致!'));
+        callback(new Error("两次输入密码不一致!"));
       } else {
         callback();
       }
@@ -93,22 +113,27 @@
       msgKey: false,
       loginForm: {
         username: "",
+        phone: "",
         password: "",
-        password2: ""
+        password2: "",
       },
-      value: '',
+      value: "",
       options: [],
       loginRules: {
-        phone: [{required: true, trigger: "blur", validator: validatePhone}],
-        code: [{required: true, trigger: "blur", validator: validateCode}],
-        password: [{required: true, validator: validatePass, trigger: 'blur'}],
-        password2: [{required: true, validator: validatePass2, trigger: 'blur'}],
+        phone: [{ required: true, trigger: "blur", validator: validatePhone }],
+        code: [{ required: true, trigger: "blur", validator: validateCode }],
+        password: [
+          { required: true, validator: validatePass, trigger: "blur" },
+        ],
+        password2: [
+          { required: true, validator: validatePass2, trigger: "blur" },
+        ],
         username: [
-          {required: true, message: "请输入用户名", trigger: "blur"}
+          { required: true, message: "请输入用户名", trigger: "blur" },
         ],
       },
       passwordType: "password",
-      passwordTypes: "password2"
+      passwordTypes: "password2",
     };
   },
   created() {
@@ -121,15 +146,20 @@
       return {
         MSGINIT: this.$t("login.msgText"),
         MSGSCUCCESS: this.$t("login.msgSuccess"),
-        MSGTIME: 60
+        MSGTIME: 60,
       };
-    }
+    },
   },
   props: [],
   methods: {
     ergodicData(val) {
       var arr = [];
-      arr.push({label: val[0].title, value: val[0].value, id: val[0].id, parent_id: val[0].parent_id});
+      arr.push({
+        label: val[0].title,
+        value: val[0].value,
+        id: val[0].id,
+        parent_id: val[0].parent_id,
+      });
       if (val.length > 1) {
         val.forEach((item, index) => {
           if (index > 0) {
@@ -139,21 +169,36 @@
               if (item.parent_id == it.id) {
                 ind = false;
                 arrInd = i;
-                return
+                return;
               }
-            })
+            });
             if (ind == false) {
               if (arr[arrInd].children && arr[arrInd].children.length > 0) {
-                arr[arrInd].children.push({label: item.title, value: item.value, id: item.id, parent_id: item.parent_id});
+                arr[arrInd].children.push({
+                  label: item.title,
+                  value: item.value,
+                  id: item.id,
+                  parent_id: item.parent_id,
+                });
               } else {
                 arr[arrInd].children = [];
-                arr[arrInd].children.push({label: item.title, value: item.value, id: item.id, parent_id: item.parent_id});
+                arr[arrInd].children.push({
+                  label: item.title,
+                  value: item.value,
+                  id: item.id,
+                  parent_id: item.parent_id,
+                });
               }
             } else {
-              arr.push({label: item.title, value: item.value, id: item.id, parent_id: item.parent_id});
+              arr.push({
+                label: item.title,
+                value: item.value,
+                id: item.id,
+                parent_id: item.parent_id,
+              });
             }
           }
-        })
+        });
       }
 
       return arr;
@@ -163,27 +208,28 @@
       this.$refs[formName].clearValidate();
     },
     refreshCode(row) {
-      zc(row.username,row.password).then(res => {
-        this.loginForm.username = ""
-        this.loginForm.password = ""
-        this.loginForm.password2 = ""
+      zc(row.username, row.password, row.phone).then((res) => {
+        this.loginForm.username = "";
+        this.loginForm.phone = "";
+        this.loginForm.password = "";
+        this.loginForm.password2 = "";
         this.$notify({
-          title: '注册成功',
-          type: 'warning'
+          title: "注册成功",
+          type: "warning",
         });
-      })
-      var z = document.querySelector('.z');
-      z.style.display = 'none';
-      this.clearValidate('loginForm')
-      this.clearValidate('loginForm')
+      });
+      var z = document.querySelector(".z");
+      z.style.display = "none";
+      this.clearValidate("loginForm");
+      this.clearValidate("loginForm");
     },
     gb() {
-      this.loginForm.username = ""
-      this.loginForm.password = ""
-      this.loginForm.password2 = ""
-      var zs = document.querySelector('.z');
-      zs.style.display = 'none';
-      this.clearValidate('loginForm')
+      this.loginForm.username = "";
+      this.loginForm.password = "";
+      this.loginForm.password2 = "";
+      var zs = document.querySelector(".z");
+      zs.style.display = "none";
+      this.clearValidate("loginForm");
     },
     handleSend() {
       if (this.msgKey) return;
@@ -211,20 +257,19 @@
         : (this.passwordType = "");
     },
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
-        console.log(valid)
+      this.$refs.loginForm.validate((valid) => {
+        console.log(valid);
         if (valid) {
           this.refreshCode(this.loginForm);
-          this.message('dahsiofhiusa');
+          this.message("dahsiofhiusa");
           return Promise.reject(new Error("注册成功,待审核"));
         }
       });
     },
     gbs() {
       this.gb();
-    }
-  }
-
+    },
+  },
 };
 </script>
 
@@ -255,12 +300,12 @@
 .z-login-submit {
   flex: 1;
   height: 45px;
-  border: 1px solid #409EFF;
+  border: 1px solid #409eff;
   background: none;
   font-size: 18px;
   letter-spacing: 2px;
   font-weight: 300;
-  color: #409EFF;
+  color: #409eff;
   cursor: pointer;
   font-family: "neo";
   -webkit-transition: 0.25s;
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 97ef0b7..95c861f 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -105,3 +105,11 @@
 .el-upload__tip {
   width: 423px !important;
 }
+
+.cardButs .el-button.el-button--primary.el-button--small {
+  // position: absolute;
+  // top: 0;
+  // left: 0;
+  display: none;
+  width: 100px !important;
+}
diff --git a/src/views/home/column.js b/src/views/home/column.js
index 345d600..02ae9ac 100644
--- a/src/views/home/column.js
+++ b/src/views/home/column.js
@@ -19,7 +19,7 @@
     }
 };
 
-var column = [
+var columnOLD = [
     {
         label: "企业名称",
         prop: "enterprisename",
@@ -33,22 +33,22 @@
             },
         ],
     },
-    // {
-    //     label: "统一社会信用代码",
-    //     prop: "creditcode",
-    //     labelWidth: 160,
-    //     span: 12,
-    //     // rules: [
-    //     //     {
-    //     //         required: true,
-    //     //         message: "请输入社会信用代码",
-    //     //         trigger: "blur",
-    //     //     },
-    //     //     // {
-    //     //     //     validator: numbers, trigger: ['change', 'blur']
-    //     //     // },
-    //     // ],
-    // },
+    {
+        label: "统一社会信用代码",
+        prop: "creditcode",
+        labelWidth: 160,
+        span: 12,
+        // rules: [
+        //     {
+        //         required: true,
+        //         message: "请输入社会信用代码",
+        //         trigger: "blur",
+        //     },
+        //     // {
+        //     //     validator: numbers, trigger: ['change', 'blur']
+        //     // },
+        // ],
+    },
 
     // {
     //     label: "企业类型",
@@ -126,25 +126,25 @@
         prop: "perid",
         labelWidth: 160,
         span: 12,
-        rules: [
-            {
-                required: true,
-                message: "单位许可证编号",
-                trigger: "blur",
-            },
-        ],
+        // rules: [
+        //     {
+        //         required: true,
+        //         message: "单位许可证编号",
+        //         trigger: "blur",
+        //     },
+        // ],
     }, {
         label: "许可证发证机关",
         prop: "offices",
         labelWidth: 160,
         span: 12,
-        rules: [
-            {
-                required: true,
-                message: "许可证发证机关",
-                trigger: "blur",
-            },
-        ],
+        // rules: [
+        //     {
+        //         required: true,
+        //         message: "许可证发证机关",
+        //         trigger: "blur",
+        //     },
+        // ],
     }, {
         label: "发证时间",
         prop: "officetime",
@@ -153,13 +153,13 @@
         type: "date",
         format: "yyyy-MM-dd",
         valueFormat: "yyyy-MM-dd",
-        rules: [
-            {
-                required: true,
-                message: "请输入发证时间",
-                trigger: "blur",
-            },
-        ],
+        // rules: [
+        //     {
+        //         required: true,
+        //         message: "请输入发证时间",
+        //         trigger: "blur",
+        //     },
+        // ],
     },
     // {
     //     label: "注册时间",
@@ -269,28 +269,326 @@
         prop: "registration",
         labelWidth: 160,
         span: 12,
-        rules: [
-            {
-                required: true,
-                message: "请输入登记机关",
-                trigger: "blur",
-            },
-        ],
+        // 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: "请输入所属行业",
+                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 = [];
@@ -325,9 +623,8 @@
     ...column
 ]
 
-
 export var securityGuardcolumn = [//自招保安单位备案
-    ...column
+    ...columnzizhao
 ]
 
 

--
Gitblit v1.9.3