From bb813878bdfeca0318e292fe8292976da86cb57b Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 06 Sep 2021 16:40:22 +0800
Subject: [PATCH] 改许可和备案  公司信息分栏工商信息

---
 src/views/licenseApproval/securityTraining.vue |    4 
 src/views/securityUnitChild/index.vue          |   69 +++
 src/views/licenseApproval/securityGuard.vue    |   23 
 src/views/licenseApproval/crossRegion.vue      |   22 
 src/page/login/codelogin.vue                   |  300 ++++++++-------
 src/views/securityUnitChild/data.js            |  678 ++++++++++++++++++++++-------------
 src/views/licenseApproval/branchOffice.vue     |   23 
 7 files changed, 689 insertions(+), 430 deletions(-)

diff --git a/src/page/login/codelogin.vue b/src/page/login/codelogin.vue
index 92ed3a5..204be74 100644
--- a/src/page/login/codelogin.vue
+++ b/src/page/login/codelogin.vue
@@ -1,109 +1,131 @@
 <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="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 prop="sname">
-      <el-input size="small"
-                @keyup.enter.native="handleLogin"
-                v-model="loginForm.sname"
-                auto-complete="off"
-                :placeholder="$t('login.name')">
-        <i slot="prefix" class="icon-yonghu"/>
+      <el-input
+        size="small"
+        @keyup.enter.native="handleLogin"
+        v-model="loginForm.sname"
+        auto-complete="off"
+        :placeholder="$t('login.name')"
+      >
+        <i slot="prefix" class="icon-yonghu" />
       </el-input>
     </el-form-item>
     <el-form-item prop="cardid">
-      <el-input size="small"
-                v-model="loginForm.cardid"
-                auto-complete="off"
-                :placeholder="$t('login.cardid')">
-        <i slot="prefix" class="icon-shouji"/>
+      <el-input
+        size="small"
+        v-model="loginForm.cardid"
+        auto-complete="off"
+        :placeholder="$t('login.cardid')"
+      >
+        <i slot="prefix" class="icon-shouji" />
       </el-input>
     </el-form-item>
-    <avue-input-tree style="width:580px !important" :defaultExpandAll="loginForm.defaultFlag" v-model="loginForm.deptid" placeholder="请选择部门"
-                     type="tree"
-                     :dic="dic"></avue-input-tree>
+    <avue-input-tree
+      style="width: 580px !important"
+      :defaultExpandAll="loginForm.defaultFlag"
+      v-model="loginForm.deptid"
+      placeholder="请选择部门"
+      type="tree"
+      :dic="dic"
+    ></avue-input-tree>
     <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 {inster} from "@/api/zc/zc";
-import {ss, rs} from "@/api/system/dept";
-import {mapGetters} from "vuex";
+import { isvalidatemobile } from "@/util/validate";
+import { inster } from "@/api/zc/zc";
+import { ss, rs } from "@/api/system/dept";
+import { mapGetters } from "vuex";
 
 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();
       }
     };
     const validateIdNo = (rule, value, callback) => {
-      let id18 = /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
-      let id15 = /^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$/;
-      if (!id18.test(this.loginForm.cardid) && !id15.test(this.loginForm.cardid)) {
+      let id18 =
+        /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/;
+      let id15 =
+        /^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$/;
+      if (
+        !id18.test(this.loginForm.cardid) &&
+        !id15.test(this.loginForm.cardid)
+      ) {
         callback(new Error("请输入正确的身份证号格式"));
       } else {
         callback();
       }
     };
     return {
-
       msgText: "",
       msgTime: "",
       dic: [],
@@ -115,34 +137,38 @@
         username: "",
         sname: "",
         password: "",
-        deptid: '',
-        roleid: '',
-        password2: ""
+        deptid: "",
+        roleid: "",
+        password2: "",
       },
-      value: '',
+      value: "",
       options: [],
       loginRules: {
-        cardid: [{required: true, trigger: "blur", validator: validateIdNo}],
-        password: [{required: true, validator: validatePass, trigger: 'blur'}],
-        password2: [{required: true, validator: validatePass2, trigger: 'blur'}],
+        cardid: [{ required: true, trigger: "blur", validator: validateIdNo }],
+        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() {
     this.msgText = this.config.MSGINIT;
     this.msgTime = this.config.MSGTIME;
-    defaultFlag
+    // defaultFlag
   },
   mounted() {
     var that = this;
-    ss().then(res => {
-      console.log(that.ergodicData(res.data.data), 898989)
-      that.dic = that.ergodicData(res.data.data)
+    ss().then((res) => {
+      console.log(that.ergodicData(res.data.data), 898989);
+      that.dic = that.ergodicData(res.data.data);
     });
   },
   computed: {
@@ -151,69 +177,57 @@
       return {
         MSGINIT: this.$t("login.msgText"),
         MSGSCUCCESS: this.$t("login.msgSuccess"),
-        MSGTIME: 60
+        MSGTIME: 60,
       };
-    }
+    },
   },
   props: [],
   methods: {
     ergodicData(val) {
-      var arr = []
+      var arr = [];
 
       val.forEach((item, index) => {
-
-        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,
+        });
 
         if (item.hasChildren == true) {
-
-          var arrOne = []
+          var arrOne = [];
 
           if (item.children && item.children.length > 0) {
-
             item.children.forEach((childItem, childIndex) => {
-
               arrOne.push({
                 label: childItem.title,
                 value: childItem.value,
                 id: childItem.id,
-                parent_id: childItem.parent_id
-              })
-
+                parent_id: childItem.parent_id,
+              });
 
               if (childItem.hasChildren == true) {
-
-                var arrTwo = []
+                var arrTwo = [];
 
                 if (childItem.children && childItem.children.length > 0) {
-
                   childItem.children.forEach((findItem, findIndex) => {
-
                     arrTwo.push({
                       label: findItem.title,
                       value: findItem.value,
                       id: findItem.id,
-                      parent_id: findItem.parent_id
-                    })
-
-                  })
-
+                      parent_id: findItem.parent_id,
+                    });
+                  });
                 }
 
-                arrOne[childIndex].children = arrTwo
-
+                arrOne[childIndex].children = arrTwo;
               }
-
-            })
-
+            });
           }
 
-          arr[index].children = arrOne
-
+          arr[index].children = arrOne;
         }
-
-
-      })
+      });
 
       return arr;
     },
@@ -222,43 +236,46 @@
       this.$refs[formName].clearValidate();
     },
     async allmedia() {
-      ss().then(res => {
-        console.log(res, 1323)
-        res.data.data.forEach(element => {
-          this.options.push({deptname: element.dept_name, deptid: element.deptid});
-        })
+      ss().then((res) => {
+        console.log(res, 1323);
+        res.data.data.forEach((element) => {
+          this.options.push({
+            deptname: element.dept_name,
+            deptid: element.deptid,
+          });
+        });
       });
     },
     refreshCode(row) {
-      inster(row).then(res => {
-        this.loginForm.cardid = ""
-        this.loginForm.username = ""
-        this.loginForm.sname = ""
-        this.loginForm.password = ""
-        this.loginForm.password2 = ""
-        this.loginForm.deptid = ""
-        this.loginForm.defaultFlag = false
+      inster(row).then((res) => {
+        this.loginForm.cardid = "";
+        this.loginForm.username = "";
+        this.loginForm.sname = "";
+        this.loginForm.password = "";
+        this.loginForm.password2 = "";
+        this.loginForm.deptid = "";
+        this.loginForm.defaultFlag = false;
         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.cardid = ""
-      this.loginForm.username = ""
-      this.loginForm.sname = ""
-      this.loginForm.password = ""
-      this.loginForm.password2 = ""
-      this.loginForm.deptid = ""
-      this.loginForm.defaultFlag = false
-      var zs = document.querySelector('.z');
-      zs.style.display = 'none';
-      this.clearValidate('loginForm')
+      this.loginForm.cardid = "";
+      this.loginForm.username = "";
+      this.loginForm.sname = "";
+      this.loginForm.password = "";
+      this.loginForm.password2 = "";
+      this.loginForm.deptid = "";
+      this.loginForm.defaultFlag = false;
+      var zs = document.querySelector(".z");
+      zs.style.display = "none";
+      this.clearValidate("loginForm");
     },
     handleSend() {
       if (this.msgKey) return;
@@ -286,19 +303,18 @@
         : (this.passwordType = "");
     },
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+      this.$refs.loginForm.validate((valid) => {
         if (valid) {
           this.refreshCode(this.loginForm);
-          this.message('dahsiofhiusa');
+          this.message("dahsiofhiusa");
           return Promise.reject(new Error("注册成功,待审核"));
         }
       });
     },
     gbs() {
       this.gb();
-    }
-  }
-
+    },
+  },
 };
 </script>
 
@@ -329,12 +345,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/views/licenseApproval/branchOffice.vue b/src/views/licenseApproval/branchOffice.vue
index 4c89b6c..5dafefe 100644
--- a/src/views/licenseApproval/branchOffice.vue
+++ b/src/views/licenseApproval/branchOffice.vue
@@ -2,7 +2,7 @@
  * @Author: liu
  * @Date: 2021-08-26 17:00:55 
  * @Last Modified by: liu
- * @Last Modified time: 2021-08-27 19:26:20
+ * @Last Modified time: 2021-09-06 08:52:18
  */
 
 
@@ -91,13 +91,13 @@
         ref="licence"
       >
         <div class="licence" id="licence" v-if="dialogVisible">
-          <div class="licence-head">备案证</div>
+          <div class="licence-head">备案回执</div>
           <div class="head-tid">
-            洪公保服务
+            编号
             <span class="fontStyle">{{
               licenceData.row.organizationcode
             }}</span>
-            号
+            <!-- 号 -->
           </div>
           <div class="licence-main">
             <div
@@ -109,9 +109,9 @@
               <span class="l-m-r-once">{{ item }}</span>
             </div>
           </div>
-          <div class="licence-bottom">发证机关(南昌市公安局)</div>
+          <div class="licence-bottom">(公安机关印章)</div>
           <div class="l-bottom">
-            发证日期
+            <!-- 发证日期 -->
             <span class="l-b-t">{{
               licenceData.row.permitime.slice(0, 4)
             }}</span
@@ -636,14 +636,17 @@
 
     viewLicense(row) {
       //查看许可证
+      console.log(row, 34);
       this.licenceData.row = row;
       this.licenceData.chiden = {};
       this.licenceData.chiden["名称"] = row.enterprisename;
-      this.licenceData.chiden["住所"] = row.address;
+      this.licenceData.chiden["地址"] = row.address;
+      this.licenceData.chiden["服务区域"] = row.industry;
       this.licenceData.chiden["法定代表人"] = row.representative;
-      this.licenceData.chiden["服务范围"] = row.industry;
-      this.licenceData.chiden["注册资本"] = row.registeredcapital;
-      this.licenceData.chiden["批准文号"] = row.registrationnumber;
+      this.licenceData.chiden["备案时间"] = row.officetime;
+      this.licenceData.chiden["备案内容"] = "设立分公司备案";
+      // this.licenceData.chiden["注册资本"] = row.registeredcapital;
+      // this.licenceData.chiden["批准文号"] = row.registrationnumber;
 
       console.log(this.licenceData);
       this.dialogVisible = true;
diff --git a/src/views/licenseApproval/crossRegion.vue b/src/views/licenseApproval/crossRegion.vue
index 4ef9aaf..e6cfb4b 100644
--- a/src/views/licenseApproval/crossRegion.vue
+++ b/src/views/licenseApproval/crossRegion.vue
@@ -2,7 +2,7 @@
  * @Author:liu
  * @Date: 2021-08-26 16:59:35 
  * @Last Modified by: liu
- * @Last Modified time: 2021-08-27 19:36:17
+ * @Last Modified time: 2021-09-06 09:19:32
  */
 
 
@@ -90,13 +90,13 @@
         ref="licence"
       >
         <div class="licence" id="licence" v-if="dialogVisible">
-          <div class="licence-head">备案证</div>
+          <div class="licence-head">备案回执</div>
           <div class="head-tid">
-            洪公保服务
+            编号
             <span class="fontStyle">{{
               licenceData.row.organizationcode
             }}</span>
-            号
+            <!-- 号 -->
           </div>
           <div class="licence-main">
             <div
@@ -108,9 +108,9 @@
               <span class="l-m-r-once">{{ item }}</span>
             </div>
           </div>
-          <div class="licence-bottom">发证机关(南昌市公安局)</div>
+          <div class="licence-bottom">(公安机关印章)</div>
           <div class="l-bottom">
-            发证日期
+            <!-- 发证日期 -->
             <span class="l-b-t">{{
               licenceData.row.permitime.slice(0, 4)
             }}</span
@@ -628,11 +628,13 @@
       this.licenceData.row = row;
       this.licenceData.chiden = {};
       this.licenceData.chiden["名称"] = row.enterprisename;
-      this.licenceData.chiden["住所"] = row.address;
+      this.licenceData.chiden["地址"] = row.address;
+      this.licenceData.chiden["服务区域"] = row.industry;
       this.licenceData.chiden["法定代表人"] = row.representative;
-      this.licenceData.chiden["服务范围"] = row.industry;
-      this.licenceData.chiden["注册资本"] = row.registeredcapital;
-      this.licenceData.chiden["批准文号"] = row.registrationnumber;
+      this.licenceData.chiden["备案时间"] = row.officetime;
+      this.licenceData.chiden["备案内容"] = "跨区域经营备案";
+      // this.licenceData.chiden["注册资本"] = row.registeredcapital;
+      // this.licenceData.chiden["批准文号"] = row.registrationnumber;
 
       console.log(this.licenceData);
       this.dialogVisible = true;
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index 3919185..9910a0c 100644
--- a/src/views/licenseApproval/securityGuard.vue
+++ b/src/views/licenseApproval/securityGuard.vue
@@ -2,7 +2,7 @@
  * @Author: liu
  * @Date: 2021-08-26 16:57:58 
  * @Last Modified by: liu
- * @Last Modified time: 2021-08-27 19:35:04
+ * @Last Modified time: 2021-09-06 09:10:46
  */
 
 
@@ -98,13 +98,13 @@
         ref="licence"
       >
         <div class="licence" id="licence" v-if="dialogVisible">
-          <div class="licence-head">备案证</div>
+          <div class="licence-head">备案回执</div>
           <div class="head-tid">
-            洪公保服务
+            编号
             <span class="fontStyle">{{
               licenceData.row.organizationcode
             }}</span>
-            号
+            <!-- 号 -->
           </div>
           <div class="licence-main">
             <div
@@ -116,9 +116,9 @@
               <span class="l-m-r-once">{{ item }}</span>
             </div>
           </div>
-          <div class="licence-bottom">发证机关(南昌市公安局)</div>
+          <div class="licence-bottom">(公安机关印章)</div>
           <div class="l-bottom">
-            发证日期
+            <!-- 发证日期 -->
             <span class="l-b-t">{{
               licenceData.row.permitime.slice(0, 4)
             }}</span
@@ -687,14 +687,17 @@
     },
     viewLicense(row) {
       //查看许可证
+      console.log(row, 34);
       this.licenceData.row = row;
       this.licenceData.chiden = {};
       this.licenceData.chiden["名称"] = row.enterprisename;
-      this.licenceData.chiden["住所"] = row.address;
+      this.licenceData.chiden["地址"] = row.address;
+      this.licenceData.chiden["服务区域"] = row.industry;
       this.licenceData.chiden["法定代表人"] = row.representative;
-      this.licenceData.chiden["服务范围"] = row.industry;
-      this.licenceData.chiden["注册资本"] = row.registeredcapital;
-      this.licenceData.chiden["批准文号"] = row.registrationnumber;
+      this.licenceData.chiden["备案时间"] = row.officetime;
+      this.licenceData.chiden["备案内容"] = "自招保安单位备案";
+      // this.licenceData.chiden["注册资本"] = row.registeredcapital;
+      // this.licenceData.chiden["批准文号"] = row.registrationnumber;
 
       console.log(this.licenceData);
       this.dialogVisible = true;
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index cc4d6c1..a2e3827 100644
--- a/src/views/licenseApproval/securityTraining.vue
+++ b/src/views/licenseApproval/securityTraining.vue
@@ -2,7 +2,7 @@
  * @Author: liu
  * @Date: 2021-08-26 16:55:25 
  * @Last Modified by: liu
- * @Last Modified time: 2021-08-27 11:45:56
+ * @Last Modified time: 2021-09-06 09:27:21
  */
 
 
@@ -142,7 +142,7 @@
         ref="licence"
       >
         <div class="licence" id="licence" v-if="dialogVisible">
-          <div class="licence-head">保安服务许可证</div>
+          <div class="licence-head">保安培训许可证</div>
           <div class="head-tid">
             洪公保服务
             <span class="fontStyle">{{
diff --git a/src/views/securityUnitChild/data.js b/src/views/securityUnitChild/data.js
index 3c8388c..1c2f116 100644
--- a/src/views/securityUnitChild/data.js
+++ b/src/views/securityUnitChild/data.js
@@ -8,118 +8,289 @@
 var w = 160,
     s = 12;
 export var column = [{
-        label: "",
-        labelWidth: 20,
-        type: 'title',
-        prop: "title",
-        span: 24,
-        styles: {
-            fontSize: '24px'
-        }
+    label: "",
+    labelWidth: 20,
+    type: 'title',
+    prop: "title",
+    span: 24,
+    styles: {
+        fontSize: '24px'
+    }
+},
+{
+    label: "企业名称",
+    prop: "enterprisename",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+// {
+//     label: "统一社会信用代码",
+//     prop: "creditcode",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+{
+    label: "法定代表人",
+    prop: "representative",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+}, {
+    label: "法定代表人电话",
+    prop: "representativecell",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+{
+    label: "联系人",
+    prop: "contacts",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+}, {
+    label: "联系电话",
+    prop: "contactscell",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+// {
+//     label: "注册时间",
+//     prop: "establishtime",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+// {
+//     label: "注册资本",
+//     prop: "registeredcapital",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+// {
+//     label: "实缴资本",
+//     prop: "capital",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+// {
+//     label: "组织机构代码",
+//     prop: "organizationcode",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+// {
+//     label: "工商注册号",
+//     prop: "registrationnumber",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+// {
+//     label: "纳税人识别号",
+//     prop: "identificationnumber",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+{
+    label: "企业类型",
+    prop: "stats",
+    type: "tree",
+    dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+    props: {
+        label: "dictValue",
+        value: "dictKey"
     },
-    {
-        label: "企业名称",
-        prop: "enterprisename",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+{
+    label: "注册地址",
+    prop: "address",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+    // search: true,
+},
+// {
+//     label: "所属辖区",
+//     prop: "region",
+//     span: 11,
+//     labelWidth: 130,
+//     width: 110,
+//     overHidden: true,
+//     disabled: true,
+// },
+{
+    label: "所属辖区",
+    prop: "region",
+    // multiple: true,
+    type: "tree",
+    dicUrl: "/api/jurisdiction/lazy-tree",
+    props: {
+        label: "title",
+        value: "id",
     },
-    {
-        label: "统一社会信用代码",
-        prop: "creditcode",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "法定代表人",
-        prop: "representative",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    }, {
-        label: "法定代表人电话",
-        prop: "representativecell",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "联系人",
-        prop: "contacts",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    }, {
-        label: "联系电话",
-        prop: "contactscell",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "注册时间",
-        prop: "establishtime",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "注册资本",
-        prop: "registeredcapital",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "实缴资本",
-        prop: "capital",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "组织机构代码",
-        prop: "organizationcode",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "工商注册号",
-        prop: "registrationnumber",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "纳税人识别号",
-        prop: "identificationnumber",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "企业类型",
-        prop: "stats",
-        type: "tree",
-        dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
-        props: {
-            label: "dictValue",
-            value: "dictKey"
-        },
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "注册地址",
-        prop: "address",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-        // search: true,
-    },
+    span: 11,
+    labelWidth: 130,
+    width: 110,
+    overHidden: true,
+    disabled: true,
+    rules: [{
+        required: false,
+        message: "请选择所属辖区",
+        trigger: "click",
+    },],
+},
+{
+    label: "所属行业",
+    prop: "industry",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+{
+    label: "登记机关",
+    prop: "registration",
+    // span: 11,
+    labelWidth: 130,
+    disabled: true,
+    span: 11,
+},
+{
+    label: "经营范围",
+    prop: "business",
+    span: 24,
+    labelWidth: 130,
+    width: 110,
+    // overHidden: true,
+    type: 'textarea',
+    showWordLimit: true,
+    disabled: true,
+}
+]
+export var column11 = [{
+    label: "",
+    labelWidth: 20,
+    type: 'title',
+    prop: "title",
+    span: 24,
+    styles: {
+        fontSize: '24px'
+    }
+},
+// {
+//     label: "企业名称",
+//     prop: "enterprisename",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+{
+    label: "统一社会信用代码",
+    prop: "creditcode",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+// {
+//     label: "法定代表人",
+//     prop: "representative",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+// {
+//     label: "法定代表人电话",
+//     prop: "representativecell",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+// {
+//     label: "联系人",
+//     prop: "contacts",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// }, {
+//     label: "联系电话",
+//     prop: "contactscell",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+{
+    label: "注册时间",
+    prop: "establishtime",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+{
+    label: "注册资本",
+    prop: "registeredcapital",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+// {
+//     label: "实缴资本",
+//     prop: "capital",
+//     span: 11,
+//     labelWidth: 130,
+//     disabled: true,
+// },
+{
+    label: "组织机构代码",
+    prop: "organizationcode",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+{
+    label: "工商注册号",
+    prop: "registrationnumber",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+{
+    label: "纳税人识别号",
+    prop: "identificationnumber",
+    span: 11,
+    labelWidth: 130,
+    disabled: true,
+},
+    // {
+    //     label: "企业类型",
+    //     prop: "stats",
+    //     type: "tree",
+    //     dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
+    //     props: {
+    //         label: "dictValue",
+    //         value: "dictKey"
+    //     },
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "注册地址",
+    //     prop: "address",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    //     // search: true,
+    // },
     // {
     //     label: "所属辖区",
     //     prop: "region",
@@ -129,154 +300,153 @@
     //     overHidden: true,
     //     disabled: true,
     // },
-    {
-        label: "所属辖区",
-        prop: "region",
-        // multiple: true,
-        type: "tree",
-        dicUrl: "/api/jurisdiction/lazy-tree",
-        props: {
-            label: "title",
-            value: "id",
-        },
-        span: 11,
-        labelWidth: 130,
-        width: 110,
-        overHidden: true,
-        disabled: true,
-        rules: [{
-            required: false,
-            message: "请选择所属辖区",
-            trigger: "click",
-        }, ],
-    },
-    {
-        label: "所属行业",
-        prop: "industry",
-        span: 11,
-        labelWidth: 130,
-        disabled: true,
-    },
-    {
-        label: "登记机关",
-        prop: "registration",
-        // span: 11,
-        labelWidth: 130,
-        disabled: true,
-        span: 11,
-    },
-    {
-        label: "经营范围",
-        prop: "business",
-        span: 24,
-        labelWidth: 130,
-        width: 110,
-        // overHidden: true,
-        type: 'textarea',
-        showWordLimit: true,
-        disabled: true,
-    }
-]
-
-export var column1 = [{
-        label: "id",
-        prop: "id",
-        hide: true,
-        addDisplay: false,
-        editDisplay: false,
-
-    }, {
-        label: "股东",
-        prop: "shareholder",
-        searchLabelWidth: 55,
-        search: true,
-        labelWidth: w,
-        span: s,
-    }, {
-        label: "持股比例(%)",
-        prop: "shareholdingratio",
-        labelWidth: w,
-        span: s,
-    },
-    //  {
-    //     label: "最终受益股份",
-    //     prop: "beneficial",
+    // {
+    //     label: "所属辖区",
+    //     prop: "region",
+    //     // multiple: true,
+    //     type: "tree",
+    //     dicUrl: "/api/jurisdiction/lazy-tree",
+    //     props: {
+    //         label: "title",
+    //         value: "id",
+    //     },
+    //     span: 11,
+    //     labelWidth: 130,
+    //     width: 110,
+    //     overHidden: true,
+    //     disabled: true,
+    //     rules: [{
+    //         required: false,
+    //         message: "请选择所属辖区",
+    //         trigger: "click",
+    //     }, ],
     // },
-    {
-        label: "出资金额(万元)",
-        prop: "capital",
-        labelWidth: w,
-        span: s,
-    }, {
-        label: "出资时间",
-        prop: "capitaltime",
-        type: "date",
-        format: "yyyy-MM-dd hh:mm:ss",
-        valueFormat: "timestamp",
-        labelWidth: w,
-        span: s,
-    }, {
-        label: "身份证",
-        prop: "cardid",
-        labelWidth: w,
-        span: s,
-        search: true
-    }, {
-        label: "联系电话",
-        prop: "cell",
-        labelWidth: w,
-        span: s,
-    }, {
-        label: "统一社会信用代码",
-        prop: "creditcode",
-        hide: true,
-        addDisplay: false,
-        editDisplay: false,
-        labelWidth: w,
-        span: s,
-    },
+    // {
+    //     label: "所属行业",
+    //     prop: "industry",
+    //     span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    // },
+    // {
+    //     label: "登记机关",
+    //     prop: "registration",
+    //     // span: 11,
+    //     labelWidth: 130,
+    //     disabled: true,
+    //     span: 11,
+    // },
+    // {
+    //     label: "经营范围",
+    //     prop: "business",
+    //     span: 24,
+    //     labelWidth: 130,
+    //     width: 110,
+    //     // overHidden: true,
+    //     type: 'textarea',
+    //     showWordLimit: true,
+    //     disabled: true,
+    // }
+]
+export var column1 = [{
+    label: "id",
+    prop: "id",
+    hide: true,
+    addDisplay: false,
+    editDisplay: false,
+
+}, {
+    label: "股东",
+    prop: "shareholder",
+    searchLabelWidth: 55,
+    search: true,
+    labelWidth: w,
+    span: s,
+}, {
+    label: "持股比例(%)",
+    prop: "shareholdingratio",
+    labelWidth: w,
+    span: s,
+},
+//  {
+//     label: "最终受益股份",
+//     prop: "beneficial",
+// },
+{
+    label: "出资金额(万元)",
+    prop: "capital",
+    labelWidth: w,
+    span: s,
+}, {
+    label: "出资时间",
+    prop: "capitaltime",
+    type: "date",
+    format: "yyyy-MM-dd hh:mm:ss",
+    valueFormat: "timestamp",
+    labelWidth: w,
+    span: s,
+}, {
+    label: "身份证",
+    prop: "cardid",
+    labelWidth: w,
+    span: s,
+    search: true
+}, {
+    label: "联系电话",
+    prop: "cell",
+    labelWidth: w,
+    span: s,
+}, {
+    label: "统一社会信用代码",
+    prop: "creditcode",
+    hide: true,
+    addDisplay: false,
+    editDisplay: false,
+    labelWidth: w,
+    span: s,
+},
 ]
 
 export var column2 = [{
-        label: "统一社会信用代码",
-        prop: "creditcode",
-        hide: true,
-        addDisplay: false,
-        editDisplay: false,
-        labelWidth: w,
-        span: s,
-    }, {
-        label: "id",
-        prop: "id",
-        hide: true,
-        addDisplay: false,
-        editDisplay: false,
-        labelWidth: w,
-        span: s,
-    }, {
-        label: "姓名",
-        prop: "name",
-        search: true,
-        labelWidth: w,
-        searchLabelWidth: 55,
-        span: s,
-    }, {
-        label: "职务",
-        prop: "post",
-        search: true,
-        labelWidth: w,
-        span: s,
-    }, {
-        label: "身份证",
-        prop: "cardid",
-        labelWidth: w,
-        span: s,
-    }, {
-        label: "联系电话",
-        prop: "cell",
-        labelWidth: w,
-        span: s,
-    }
+    label: "统一社会信用代码",
+    prop: "creditcode",
+    hide: true,
+    addDisplay: false,
+    editDisplay: false,
+    labelWidth: w,
+    span: s,
+}, {
+    label: "id",
+    prop: "id",
+    hide: true,
+    addDisplay: false,
+    editDisplay: false,
+    labelWidth: w,
+    span: s,
+}, {
+    label: "姓名",
+    prop: "name",
+    search: true,
+    labelWidth: w,
+    searchLabelWidth: 55,
+    span: s,
+}, {
+    label: "职务",
+    prop: "post",
+    search: true,
+    labelWidth: w,
+    span: s,
+}, {
+    label: "身份证",
+    prop: "cardid",
+    labelWidth: w,
+    span: s,
+}, {
+    label: "联系电话",
+    prop: "cell",
+    labelWidth: w,
+    span: s,
+}
     //     , {
     //         label: "持股比例(%)",
     //         prop: "shareholdingratio",
diff --git a/src/views/securityUnitChild/index.vue b/src/views/securityUnitChild/index.vue
index 3f8c7dd..d58ac7d 100644
--- a/src/views/securityUnitChild/index.vue
+++ b/src/views/securityUnitChild/index.vue
@@ -42,6 +42,47 @@
         </avue-form>
       </basic-container>
     </span>
+    <span v-if="typeTABS.prop === 'tab11'" class="tab">
+      <!-- <avue-crud
+        :option="option"
+        :data="data"
+        :page.sync="page"
+        ref="crudrec"
+        @on-load="onLoad"
+        :table-loading="loading"
+        @row-save="rowSave"
+        @search-change="searchChange"
+        @search-reset="searchReset"
+        @row-update="rowUpdate"
+        @row-del="rowDel"
+        @selection-change="selectionChange"
+        @refresh-change="refreshChange"
+      >
+        <template slot="menuLeft">
+          <el-button
+            type="danger"
+            size="small"
+            plain
+            icon="el-icon-delete"
+            @click="handleDelete"
+            >删 除
+          </el-button>
+        </template>
+      </avue-crud>-->
+      <!-- 表单组件 -->
+      <basic-container>
+        <avue-form
+          ref="form"
+          v-model="obj0"
+          :option="option01"
+          @submit="submit0"
+        >
+          <!-- <template slot-scope="scope" slot="menuForm">
+          <el-button @click="tip">自定义按钮</el-button>
+        </template> -->
+        </avue-form>
+      </basic-container>
+    </span>
     <span v-else-if="typeTABS.prop === 'tab2'" class="tab">
       <!-- <span v-if="typeTABS.prop === 'tab2'"> -->
       <basic-container>
@@ -183,7 +224,7 @@
 </template> 
 
 <script>
-import { column, column1, column2 } from "./data";
+import { column11, column, column1, column2 } from "./data";
 import {
   getOncedata,
   // getdata,
@@ -311,6 +352,11 @@
           },
           {
             // icon: "el-icon-info",
+            label: "工商信息",
+            prop: "tab11",
+          },
+          {
+            // icon: "el-icon-info",
             label: "保安单位出资人员",
             prop: "tab2",
           },
@@ -364,6 +410,14 @@
         submitText: "保存",
         gutter: 30,
         column: column,
+      },
+
+      option01: {
+        emptyBtn: false,
+        submitBtn: false,
+        submitText: "保存",
+        gutter: 30,
+        column: column11,
       },
 
       loading1: true, //派遣记录
@@ -445,7 +499,7 @@
       update(row).then(
         () => {
           // this.onLoad(this.page);
-          this.onloads();
+          // this.onloads();
           this.$message({
             type: "success",
             message: "操作成功!",
@@ -874,19 +928,30 @@
         getRoleDetail(roleId).then((res) => {
           var roleAlias = res.data.data.roleAlias;
           var d = that.option0.column;
+          var e = that.option01.column;
           // console.log(roleAlias);
           if (roleAlias == "保安公司管理员") {
             that.option0.submitBtn = true;
+            that.option01.submitBtn = true;
             for (var k in d) {
               // if (d[k].label != "企业类型") {
               d[k].disabled = false;
               // }
             }
+            for (var n in e) {
+              // if (d[k].label != "企业类型") {
+              e[n].disabled = false;
+              // }
+            }
           } else {
             that.option0.submitBtn = false;
+            that.option01.submitBtn = false;
             for (var k in d) {
               d[k].disabled = true;
             }
+            for (var n in e) {
+              e[n].disabled = true;
+            }
           }
           getdatas(roleAlias);
         });

--
Gitblit v1.9.3