From bc2685acbe0455847449b009cf932d65b1f512bf Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 27 Aug 2021 11:11:02 +0800
Subject: [PATCH] 许可  备案 审批

---
 src/views/licenseApproval/cancellationOfFiling.vue |  239 +++-------
 src/views/licenseApproval/securityTraining.vue     |  108 ++--
 src/views/licenseApproval/securityGuard.vue        |  261 ++++++++----
 src/views/licenseApproval/securityPermit.vue       |  108 ++--
 src/views/licenseApproval/crossRegion.vue          |  274 ++++--------
 src/views/licenseApproval/branchOffice.vue         |  213 ++++-----
 6 files changed, 565 insertions(+), 638 deletions(-)

diff --git a/src/views/licenseApproval/branchOffice.vue b/src/views/licenseApproval/branchOffice.vue
index 565b270..cfcb80a 100644
--- a/src/views/licenseApproval/branchOffice.vue
+++ b/src/views/licenseApproval/branchOffice.vue
@@ -1,8 +1,8 @@
 /*
  * @Author: liu
  * @Date: 2021-08-26 17:00:55 
- * @Last Modified by: mikey.zhaopeng
- * @Last Modified time: 2021-08-27 08:53:38
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-08-27 11:05:53
  */
 
 
@@ -58,14 +58,6 @@
             @click.stop="rowDel(row)"
             >备案审批
           </el-button>
-          <el-button
-            icon="el-icon-edit"
-            :size="size"
-            :type="type"
-            v-show="row.type == 0"
-            @click.stop="rowPrint(row)"
-            >回执打印
-          </el-button>
         </template>
         <template class="tdtype" slot-scope="{ row }" slot="type">
           <el-tag class="dtype">
@@ -80,59 +72,6 @@
       </avue-crud>
     </basic-container>
 
-    <div
-      v-if="dialogVisible"
-      class="dialogVisibles"
-      :class="classStyle == 'print' ? 'printstyle' : ''"
-    >
-      <div
-        id="licence_box"
-        :class="classStyle == 'print' ? 'printstyle' : ''"
-        ref="licence"
-      >
-        <div class="licence" id="licence" v-if="dialogVisible">
-          <div class="licence-head">保安服务许可证</div>
-          <div class="head-tid">
-            洪公保服务
-            <span class="fontStyle">{{
-              licenceData.row.organizationcode
-            }}</span>
-            号
-          </div>
-          <div class="licence-main">
-            <div
-              class="l-m-once"
-              v-for="(item, index, key) in licenceData.chiden"
-              :key="key"
-            >
-              <span class="l-m-o-title"> {{ index }}: </span>
-              <span class="l-m-r-once">{{ item }}</span>
-            </div>
-          </div>
-          <div class="licence-bottom">发证机关(南昌市公安局)</div>
-          <div class="l-bottom">
-            发证日期
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(0, 4)
-            }}</span
-            >年
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(5, 7)
-            }}</span>
-            月
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(8, 10)
-            }}</span>
-            日
-          </div>
-        </div>
-        <span slot="footer" class="dialog-footer no-print PrintBut">
-          <el-button type="primary" @click="Print">打 印</el-button>
-          <el-button type="primary" @click="closePrint"> 取 消 </el-button>
-        </span>
-      </div>
-    </div>
-
     <el-dialog
       title=""
       :visible.sync="dialogVisiblecc"
@@ -140,7 +79,7 @@
       :modal-append-to-body="false"
     >
       <div class="flots">
-        <span class="f_title">是否通过审批?</span>
+        <span class="f_title">是否通过备案审批?</span>
         <span class="f_body">请输入修改意见:</span>
         <textarea
           name="reworkmes"
@@ -288,6 +227,44 @@
             ],
           },
           {
+            label: "单位许可证编号",
+            prop: "perid",
+            // labelWidth: 160,
+            // span: 12,
+            hide: true,
+            rules: [
+              {
+                required: true,
+                message: "单位许可证编号",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "许可证发证机关",
+            prop: "offices",
+            // labelWidth: 160,
+            // span: 12,
+            hide: true,
+            rules: [
+              {
+                required: true,
+                message: "许可证发证机关",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "发证时间",
+            prop: "officetime",
+            // labelWidth: 160,
+            // span: 12,
+            hide: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+          },
+          {
             label: "注册时间",
             hide: true,
             prop: "establishtime",
@@ -337,30 +314,30 @@
               },
             ],
           },
-          {
-            label: "纳税人识别号",
-            prop: "identificationnumber",
-            hide: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入纳税人识别号",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "企业类型",
-            hide: true,
-            prop: "enterprises",
-            rules: [
-              {
-                required: true,
-                message: "请输入企业类型",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "纳税人识别号",
+          //   prop: "identificationnumber",
+          //   hide: true,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入纳税人识别号",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          // {
+          //   label: "企业类型",
+          //   hide: true,
+          //   prop: "enterprises",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入企业类型",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "注册地址",
             prop: "address",
@@ -373,18 +350,18 @@
               },
             ],
           },
-          {
-            label: "所属地区",
-            hide: true,
-            prop: "region",
-            rules: [
-              {
-                required: true,
-                message: "请输入所属地区",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "所属地区",
+          //   hide: true,
+          //   prop: "region",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入所属地区",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "登记机关",
             prop: "registration",
@@ -409,17 +386,29 @@
               },
             ],
           },
+          // {
+          //   label: "所属机构",
+          //   prop: "deptid",
+          //   addDisplay: false,
+          //   type: "select",
+          //   hide: true,
+          //   dicUrl: "/api/blade-system/dept/selectIn",
+          //   props: {
+          //     label: "deptname",
+          //     value: "deptid",
+          //   },
+          // },
           {
-            label: "所属机构",
-            prop: "deptid",
-            addDisplay: false,
-            type: "select",
-            hide: true,
-            dicUrl: "/api/blade-system/dept/selectIn",
+            label: "所属辖区",
+            prop: "jurisdiction",
+            type: "tree",
+            dicUrl: "/api/jurisdiction/lazy-trees",
             props: {
-              label: "deptname",
-              value: "deptid",
+              label: "title",
+              value: "id",
             },
+            // labelWidth: 160,
+            // span: 12,
           },
           {
             label: "许可类型",
@@ -430,12 +419,8 @@
             searchSpan: 4,
             dicData: [
               {
-                label: "保安服务许可",
-                value: "0",
-              },
-              {
-                label: "保安培训许可",
-                value: "1",
+                label: "设立分公司备案",
+                value: "2",
               },
             ],
           },
diff --git a/src/views/licenseApproval/cancellationOfFiling.vue b/src/views/licenseApproval/cancellationOfFiling.vue
index f23e9d7..3103796 100644
--- a/src/views/licenseApproval/cancellationOfFiling.vue
+++ b/src/views/licenseApproval/cancellationOfFiling.vue
@@ -1,8 +1,8 @@
 /*
  * @Author: liu
  * @Date: 2021-08-26 17:00:04 
- * @Last Modified by: mikey.zhaopeng
- * @Last Modified time: 2021-08-26 20:11:41
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-08-27 11:09:27
  */
 
 
@@ -56,15 +56,7 @@
             :type="type"
             @click.stop="rowDel(row)"
             v-if="row.type == '2'"
-            >许可审批
-          </el-button>
-          <el-button
-            icon="el-icon-edit"
-            :size="size"
-            :type="type"
-            @click.stop="viewLicense(row)"
-            v-if="row.type == '0'"
-            >打印许可证
+            >撤销备案审批
           </el-button>
         </template>
         <template class="tdtype" slot-scope="{ row }" slot="type">
@@ -80,110 +72,6 @@
       </avue-crud>
     </basic-container>
 
-    <!-- <el-dialog
-      :visible.sync="dialogVisible"
-      :before-close="handleClose"
-      :modal-append-to-body="false"
-      width="1005px"
-      top="10vh"
-      class="printstyle"
-    >
-      <div id="licence_box">
-        <div class="licence" id="licence" v-if="dialogVisible">
-          <div class="licence-head">保安服务许可证</div>
-          <div class="head-tid">
-            洪公保服务
-            <span class="fontStyle">{{
-              licenceData.row.organizationcode
-            }}</span>
-            号
-          </div>
-          <div class="licence-main">
-            <div
-              class="l-m-once"
-              v-for="(item, index, key) in licenceData.chiden"
-              :key="key"
-            >
-              <span class="l-m-o-title"> {{ index }}: </span>
-              <span class="l-m-r-once">{{ item }}</span>
-            </div>
-          </div>
-          <div class="licence-bottom">发证机关(南昌市公安局)</div>
-          <div class="l-bottom">
-            发证日期
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(0, 4)
-            }}</span
-            >年
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(5, 7)
-            }}</span>
-            月
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(8, 10)
-            }}</span>
-            日
-          </div>
-        </div>
-      </div>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="Print">打 印</el-button>
-      </span>
-    </el-dialog> -->
-    <div
-      v-if="dialogVisible"
-      class="dialogVisibles"
-      :class="classStyle == 'print' ? 'printstyle' : ''"
-    >
-      <div
-        id="licence_box"
-        :class="classStyle == 'print' ? 'printstyle' : ''"
-        ref="licence"
-      >
-        <div class="licence" id="licence" v-if="dialogVisible">
-          <div class="licence-head">保安服务许可证</div>
-          <div class="head-tid">
-            洪公保服务
-            <span class="fontStyle">{{
-              licenceData.row.organizationcode
-            }}</span>
-            号
-          </div>
-          <div class="licence-main">
-            <div
-              class="l-m-once"
-              v-for="(item, index, key) in licenceData.chiden"
-              :key="key"
-            >
-              <span class="l-m-o-title"> {{ index }}: </span>
-              <span class="l-m-r-once">{{ item }}</span>
-            </div>
-          </div>
-          <div class="licence-bottom">发证机关(南昌市公安局)</div>
-          <div class="l-bottom">
-            发证日期
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(0, 4)
-            }}</span
-            >年
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(5, 7)
-            }}</span>
-            月
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(8, 10)
-            }}</span>
-            日
-          </div>
-        </div>
-        <span slot="footer" class="dialog-footer no-print PrintBut">
-          <el-button type="primary" @click="Print">打 印</el-button>
-          <el-button type="primary" @click="closePrint"> 取 消 </el-button>
-        </span>
-      </div>
-    </div>
-
     <el-dialog
       title=""
       :visible.sync="dialogVisiblecc"
@@ -191,7 +79,7 @@
       :modal-append-to-body="false"
     >
       <div class="flots">
-        <span class="f_title">是否通过审核?</span>
+        <span class="f_title">是否通过撤销备案审批?</span>
         <span class="f_body">请输入修改意见:</span>
         <textarea
           name="reworkmes"
@@ -388,30 +276,30 @@
               },
             ],
           },
-          {
-            label: "纳税人识别号",
-            prop: "identificationnumber",
-            hide: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入纳税人识别号",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "企业类型",
-            hide: true,
-            prop: "enterprises",
-            rules: [
-              {
-                required: true,
-                message: "请输入企业类型",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "纳税人识别号",
+          //   prop: "identificationnumber",
+          //   hide: true,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入纳税人识别号",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          // {
+          //   label: "企业类型",
+          //   hide: true,
+          //   prop: "enterprises",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入企业类型",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "注册地址",
             prop: "address",
@@ -424,18 +312,18 @@
               },
             ],
           },
-          {
-            label: "所属地区",
-            hide: true,
-            prop: "region",
-            rules: [
-              {
-                required: true,
-                message: "请输入所属地区",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "所属地区",
+          //   hide: true,
+          //   prop: "region",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入所属地区",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "登记机关",
             prop: "registration",
@@ -460,17 +348,29 @@
               },
             ],
           },
+          // {
+          //   label: "所属机构",
+          //   prop: "deptid",
+          //   addDisplay: false,
+          //   type: "select",
+          //   hide: true,
+          //   dicUrl: "/api/blade-system/dept/selectIn",
+          //   props: {
+          //     label: "deptname",
+          //     value: "deptid",
+          //   },
+          // },
           {
-            label: "所属机构",
-            prop: "deptid",
-            addDisplay: false,
-            type: "select",
-            hide: true,
-            dicUrl: "/api/blade-system/dept/selectIn",
+            label: "所属辖区",
+            prop: "jurisdiction",
+            type: "tree",
+            dicUrl: "/api/jurisdiction/lazy-trees",
             props: {
-              label: "deptname",
-              value: "deptid",
+              label: "title",
+              value: "id",
             },
+            // labelWidth: 160,
+            // span: 12,
           },
           {
             label: "许可类型",
@@ -483,10 +383,6 @@
               {
                 label: "保安服务许可",
                 value: "0",
-              },
-              {
-                label: "保安培训许可",
-                value: "1",
               },
             ],
           },
@@ -535,6 +431,21 @@
               },
             ],
           },
+          {
+            label: "撤销原因",
+            prop: "reason",
+            // labelWidth: 160,
+            // span: 24,
+            hide: true,
+            type: "textarea",
+            rules: [
+              {
+                required: true,
+                message: "请输入撤销原因",
+                trigger: "blur",
+              },
+            ],
+          },
         ],
       },
       data: [],
diff --git a/src/views/licenseApproval/crossRegion.vue b/src/views/licenseApproval/crossRegion.vue
index 2ca10fc..eee2ed9 100644
--- a/src/views/licenseApproval/crossRegion.vue
+++ b/src/views/licenseApproval/crossRegion.vue
@@ -1,8 +1,8 @@
 /*
  * @Author:liu
  * @Date: 2021-08-26 16:59:35 
- * @Last Modified by: mikey.zhaopeng
- * @Last Modified time: 2021-08-26 20:11:42
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-08-27 11:10:21
  */
 
 
@@ -56,15 +56,7 @@
             :type="type"
             @click.stop="rowDel(row)"
             v-if="row.type == '2'"
-            >许可审批
-          </el-button>
-          <el-button
-            icon="el-icon-edit"
-            :size="size"
-            :type="type"
-            @click.stop="viewLicense(row)"
-            v-if="row.type == '0'"
-            >打印许可证
+            >备案审批
           </el-button>
         </template>
         <template class="tdtype" slot-scope="{ row }" slot="type">
@@ -80,110 +72,6 @@
       </avue-crud>
     </basic-container>
 
-    <!-- <el-dialog
-      :visible.sync="dialogVisible"
-      :before-close="handleClose"
-      :modal-append-to-body="false"
-      width="1005px"
-      top="10vh"
-      class="printstyle"
-    >
-      <div id="licence_box">
-        <div class="licence" id="licence" v-if="dialogVisible">
-          <div class="licence-head">保安服务许可证</div>
-          <div class="head-tid">
-            洪公保服务
-            <span class="fontStyle">{{
-              licenceData.row.organizationcode
-            }}</span>
-            号
-          </div>
-          <div class="licence-main">
-            <div
-              class="l-m-once"
-              v-for="(item, index, key) in licenceData.chiden"
-              :key="key"
-            >
-              <span class="l-m-o-title"> {{ index }}: </span>
-              <span class="l-m-r-once">{{ item }}</span>
-            </div>
-          </div>
-          <div class="licence-bottom">发证机关(南昌市公安局)</div>
-          <div class="l-bottom">
-            发证日期
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(0, 4)
-            }}</span
-            >年
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(5, 7)
-            }}</span>
-            月
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(8, 10)
-            }}</span>
-            日
-          </div>
-        </div>
-      </div>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="Print">打 印</el-button>
-      </span>
-    </el-dialog> -->
-    <div
-      v-if="dialogVisible"
-      class="dialogVisibles"
-      :class="classStyle == 'print' ? 'printstyle' : ''"
-    >
-      <div
-        id="licence_box"
-        :class="classStyle == 'print' ? 'printstyle' : ''"
-        ref="licence"
-      >
-        <div class="licence" id="licence" v-if="dialogVisible">
-          <div class="licence-head">保安服务许可证</div>
-          <div class="head-tid">
-            洪公保服务
-            <span class="fontStyle">{{
-              licenceData.row.organizationcode
-            }}</span>
-            号
-          </div>
-          <div class="licence-main">
-            <div
-              class="l-m-once"
-              v-for="(item, index, key) in licenceData.chiden"
-              :key="key"
-            >
-              <span class="l-m-o-title"> {{ index }}: </span>
-              <span class="l-m-r-once">{{ item }}</span>
-            </div>
-          </div>
-          <div class="licence-bottom">发证机关(南昌市公安局)</div>
-          <div class="l-bottom">
-            发证日期
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(0, 4)
-            }}</span
-            >年
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(5, 7)
-            }}</span>
-            月
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(8, 10)
-            }}</span>
-            日
-          </div>
-        </div>
-        <span slot="footer" class="dialog-footer no-print PrintBut">
-          <el-button type="primary" @click="Print">打 印</el-button>
-          <el-button type="primary" @click="closePrint"> 取 消 </el-button>
-        </span>
-      </div>
-    </div>
-
     <el-dialog
       title=""
       :visible.sync="dialogVisiblecc"
@@ -191,7 +79,7 @@
       :modal-append-to-body="false"
     >
       <div class="flots">
-        <span class="f_title">是否通过审核?</span>
+        <span class="f_title">是否通过备案审批?</span>
         <span class="f_body">请输入修改意见:</span>
         <textarea
           name="reworkmes"
@@ -339,6 +227,44 @@
             ],
           },
           {
+            label: "单位许可证编号",
+            prop: "perid",
+            // labelWidth: 160,
+            // span: 12,
+            hide: true,
+            rules: [
+              {
+                required: true,
+                message: "单位许可证编号",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "许可证发证机关",
+            prop: "offices",
+            // labelWidth: 160,
+            // span: 12,
+            hide: true,
+            rules: [
+              {
+                required: true,
+                message: "许可证发证机关",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "发证时间",
+            prop: "officetime",
+            // labelWidth: 160,
+            // span: 12,
+            hide: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+          },
+          {
             label: "注册时间",
             hide: true,
             prop: "establishtime",
@@ -388,30 +314,30 @@
               },
             ],
           },
-          {
-            label: "纳税人识别号",
-            prop: "identificationnumber",
-            hide: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入纳税人识别号",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "企业类型",
-            hide: true,
-            prop: "enterprises",
-            rules: [
-              {
-                required: true,
-                message: "请输入企业类型",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "纳税人识别号",
+          //   prop: "identificationnumber",
+          //   hide: true,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入纳税人识别号",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          // {
+          //   label: "企业类型",
+          //   hide: true,
+          //   prop: "enterprises",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入企业类型",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "注册地址",
             prop: "address",
@@ -424,18 +350,18 @@
               },
             ],
           },
-          {
-            label: "所属地区",
-            hide: true,
-            prop: "region",
-            rules: [
-              {
-                required: true,
-                message: "请输入所属地区",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "所属地区",
+          //   hide: true,
+          //   prop: "region",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入所属地区",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "登记机关",
             prop: "registration",
@@ -460,18 +386,30 @@
               },
             ],
           },
-          {
-            label: "所属机构",
-            prop: "deptid",
-            addDisplay: false,
-            type: "select",
-            hide: true,
-            dicUrl: "/api/blade-system/dept/selectIn",
-            props: {
-              label: "deptname",
-              value: "deptid",
-            },
-          },
+          // {
+          //   label: "所属机构",
+          //   prop: "deptid",
+          //   addDisplay: false,
+          //   type: "select",
+          //   hide: true,
+          //   dicUrl: "/api/blade-system/dept/selectIn",
+          //   props: {
+          //     label: "deptname",
+          //     value: "deptid",
+          //   },
+          // },
+          // {
+          //   label: "所属辖区",
+          //   prop: "jurisdiction",
+          //   type: "tree",
+          //   dicUrl: "/api/jurisdiction/lazy-trees",
+          //   props: {
+          //     label: "title",
+          //     value: "id",
+          //   },
+          //   // labelWidth: 160,
+          //   // span: 12,
+          // },
           {
             label: "许可类型",
             search: true,
@@ -481,12 +419,8 @@
             searchSpan: 4,
             dicData: [
               {
-                label: "保安服务许可",
-                value: "0",
-              },
-              {
-                label: "保安培训许可",
-                value: "1",
+                label: "设立分公司备案",
+                value: "2",
               },
             ],
           },
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index fc82dae..0ce32f4 100644
--- a/src/views/licenseApproval/securityGuard.vue
+++ b/src/views/licenseApproval/securityGuard.vue
@@ -1,8 +1,8 @@
 /*
  * @Author: liu
  * @Date: 2021-08-26 16:57:58 
- * @Last Modified by: mikey.zhaopeng
- * @Last Modified time: 2021-08-26 20:11:44
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-08-27 11:06:59
  */
 
 
@@ -58,6 +58,14 @@
             @click.stop="rowDel(row)"
             >备案审批
           </el-button>
+          <el-button
+            icon="el-icon-edit"
+            :size="size"
+            :type="type"
+            v-show="row.type == 0"
+            @click.stop="viewLicense(row)"
+            >回执打印
+          </el-button>
         </template>
         <template class="tdtype" slot-scope="{ row }" slot="type">
           <el-tag class="dtype">
@@ -71,6 +79,7 @@
         </template>
       </avue-crud>
     </basic-container>
+
     <div
       v-if="dialogVisible"
       class="dialogVisibles"
@@ -81,40 +90,23 @@
         :class="classStyle == 'print' ? 'printstyle' : ''"
         ref="licence"
       >
-        <div class="licence" id="licence" v-if="dialogVisible">
-          <div class="licence-head">保安服务许可证</div>
-          <div class="head-tid">
-            洪公保服务
-            <span class="fontStyle">{{
-              licenceData.row.organizationcode
-            }}</span>
-            号
-          </div>
-          <div class="licence-main">
-            <div
-              class="l-m-once"
-              v-for="(item, index, key) in licenceData.chiden"
-              :key="key"
-            >
-              <span class="l-m-o-title"> {{ index }}: </span>
-              <span class="l-m-r-once">{{ item }}</span>
-            </div>
-          </div>
-          <div class="licence-bottom">发证机关(南昌市公安局)</div>
-          <div class="l-bottom">
-            发证日期
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(0, 4)
-            }}</span
-            >年
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(5, 7)
-            }}</span>
-            月
-            <span class="l-b-t">{{
-              licenceData.row.permitime.slice(8, 10)
-            }}</span>
-            日
+        <div class="licence exam-box" id="licence" v-if="dialogVisible">
+          <h3>回执单</h3>
+          <p>
+            南昌市公安局已收到
+            <span>{{ rowData == null ? "" : rowData.enterprisename }}</span>
+            的相关备案申请!
+          </p>
+
+          <div class="examine-bottom">
+            <ul>
+              <li>审批单位:<span>南昌市公安局</span></li>
+              <li>
+                日期:<span>{{
+                  rowData == null ? "" : rowData.examinetime
+                }}</span>
+              </li>
+            </ul>
           </div>
         </div>
         <span slot="footer" class="dialog-footer no-print PrintBut">
@@ -131,7 +123,7 @@
       :modal-append-to-body="false"
     >
       <div class="flots">
-        <span class="f_title">是否通过审核?</span>
+        <span class="f_title">是否通过备案审批?</span>
         <span class="f_body">请输入修改意见:</span>
         <textarea
           name="reworkmes"
@@ -279,6 +271,44 @@
             ],
           },
           {
+            label: "单位许可证编号",
+            prop: "perid",
+            // labelWidth: 160,
+            // span: 12,
+            hide: true,
+            rules: [
+              {
+                required: true,
+                message: "单位许可证编号",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "许可证发证机关",
+            prop: "offices",
+            // labelWidth: 160,
+            // span: 12,
+            hide: true,
+            rules: [
+              {
+                required: true,
+                message: "许可证发证机关",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "发证时间",
+            prop: "officetime",
+            // labelWidth: 160,
+            // span: 12,
+            hide: true,
+            type: "date",
+            format: "yyyy-MM-dd",
+            valueFormat: "yyyy-MM-dd",
+          },
+          {
             label: "注册时间",
             hide: true,
             prop: "establishtime",
@@ -328,30 +358,30 @@
               },
             ],
           },
-          {
-            label: "纳税人识别号",
-            prop: "identificationnumber",
-            hide: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入纳税人识别号",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "企业类型",
-            hide: true,
-            prop: "enterprises",
-            rules: [
-              {
-                required: true,
-                message: "请输入企业类型",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "纳税人识别号",
+          //   prop: "identificationnumber",
+          //   hide: true,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入纳税人识别号",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          // {
+          //   label: "企业类型",
+          //   hide: true,
+          //   prop: "enterprises",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入企业类型",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "注册地址",
             prop: "address",
@@ -364,18 +394,18 @@
               },
             ],
           },
-          {
-            label: "所属地区",
-            hide: true,
-            prop: "region",
-            rules: [
-              {
-                required: true,
-                message: "请输入所属地区",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "所属地区",
+          //   hide: true,
+          //   prop: "region",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入所属地区",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "登记机关",
             prop: "registration",
@@ -400,17 +430,29 @@
               },
             ],
           },
+          // {
+          //   label: "所属机构",
+          //   prop: "deptid",
+          //   addDisplay: false,
+          //   type: "select",
+          //   hide: true,
+          //   dicUrl: "/api/blade-system/dept/selectIn",
+          //   props: {
+          //     label: "deptname",
+          //     value: "deptid",
+          //   },
+          // },
           {
-            label: "所属机构",
-            prop: "deptid",
-            addDisplay: false,
-            type: "select",
-            hide: true,
-            dicUrl: "/api/blade-system/dept/selectIn",
+            label: "所属辖区",
+            prop: "jurisdiction",
+            type: "tree",
+            dicUrl: "/api/jurisdiction/lazy-trees",
             props: {
-              label: "deptname",
-              value: "deptid",
+              label: "title",
+              value: "id",
             },
+            // labelWidth: 160,
+            // span: 12,
           },
           {
             label: "许可类型",
@@ -421,12 +463,8 @@
             searchSpan: 4,
             dicData: [
               {
-                label: "保安服务许可",
-                value: "0",
-              },
-              {
-                label: "保安培训许可",
-                value: "1",
+                label: "自招保安单位备案",
+                value: "3",
               },
             ],
           },
@@ -738,10 +776,11 @@
   flex-direction: column;
 }
 .licence {
-  width: 960px;
-  height: 648px;
+  width: 800px;
+  height: 348px;
   background-color: #fff !important;
-  background-image: url("../../static/img/permit/服务许可背景图.png");
+  // background-image: url("../../static/img/permit/服务许可背景图.png");
+  border: 1px solid rgba(#a3a3a3, 0.5);
   background-size: 100% 100%;
   background-repeat: no-repeat;
   box-sizing: border-box;
@@ -812,6 +851,9 @@
   display: flex;
   justify-content: space-between;
   flex-direction: column;
+  span {
+    display: inline-block;
+  }
   .f_title {
     position: absolute;
     top: 15px;
@@ -825,4 +867,43 @@
   align-content: center;
   justify-content: center;
 }
+.exam-box {
+  width: 100%;
+  height: 360px;
+
+  position: relative;
+  padding: 10px;
+  background: #fff !important;
+  color: #000;
+
+  box-sizing: border-box;
+}
+.exam-box h3 {
+  margin: 0;
+  text-align: center;
+  font-size: 28px;
+  letter-spacing: 10px;
+  line-height: 46px;
+}
+
+.exam-box p {
+  text-indent: 2em;
+  font-size: 18px;
+}
+
+.exam-box .examine-bottom {
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+}
+
+.exam-box li {
+  list-style: none;
+  font-size: 18px;
+  line-height: 32px;
+}
+
+.exam-box span {
+  text-decoration: underline;
+}
 </style>
diff --git a/src/views/licenseApproval/securityPermit.vue b/src/views/licenseApproval/securityPermit.vue
index 57d8507..a391e06 100644
--- a/src/views/licenseApproval/securityPermit.vue
+++ b/src/views/licenseApproval/securityPermit.vue
@@ -2,8 +2,8 @@
 /*
  * @Author: liu
  * @Date: 2021-08-26 16:22:20 
- * @Last Modified by: mikey.zhaopeng
- * @Last Modified time: 2021-08-26 20:09:51
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-08-27 11:05:31
  */
 
 <template>
@@ -388,30 +388,30 @@
               },
             ],
           },
-          {
-            label: "纳税人识别号",
-            prop: "identificationnumber",
-            hide: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入纳税人识别号",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "企业类型",
-            hide: true,
-            prop: "enterprises",
-            rules: [
-              {
-                required: true,
-                message: "请输入企业类型",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "纳税人识别号",
+          //   prop: "identificationnumber",
+          //   hide: true,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入纳税人识别号",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          // {
+          //   label: "企业类型",
+          //   hide: true,
+          //   prop: "enterprises",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入企业类型",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "注册地址",
             prop: "address",
@@ -424,18 +424,18 @@
               },
             ],
           },
-          {
-            label: "所属地区",
-            hide: true,
-            prop: "region",
-            rules: [
-              {
-                required: true,
-                message: "请输入所属地区",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "所属地区",
+          //   hide: true,
+          //   prop: "region",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入所属地区",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "登记机关",
             prop: "registration",
@@ -460,17 +460,29 @@
               },
             ],
           },
+          // {
+          //   label: "所属机构",
+          //   prop: "deptid",
+          //   addDisplay: false,
+          //   type: "select",
+          //   hide: true,
+          //   dicUrl: "/api/blade-system/dept/selectIn",
+          //   props: {
+          //     label: "deptname",
+          //     value: "deptid",
+          //   },
+          // },
           {
-            label: "所属机构",
-            prop: "deptid",
-            addDisplay: false,
-            type: "select",
-            hide: true,
-            dicUrl: "/api/blade-system/dept/selectIn",
+            label: "所属辖区",
+            prop: "jurisdiction",
+            type: "tree",
+            dicUrl: "/api/jurisdiction/lazy-trees",
             props: {
-              label: "deptname",
-              value: "deptid",
+              label: "title",
+              value: "id",
             },
+            // labelWidth: 160,
+            // span: 12,
           },
           {
             label: "许可类型",
@@ -483,10 +495,6 @@
               {
                 label: "保安服务许可",
                 value: "0",
-              },
-              {
-                label: "保安培训许可",
-                value: "1",
               },
             ],
           },
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index 3c03004..05436ff 100644
--- a/src/views/licenseApproval/securityTraining.vue
+++ b/src/views/licenseApproval/securityTraining.vue
@@ -1,8 +1,8 @@
 /*
  * @Author: liu
  * @Date: 2021-08-26 16:55:25 
- * @Last Modified by: mikey.zhaopeng
- * @Last Modified time: 2021-08-26 20:11:51
+ * @Last Modified by: liu
+ * @Last Modified time: 2021-08-27 10:53:20
  */
 
 
@@ -388,30 +388,30 @@
               },
             ],
           },
-          {
-            label: "纳税人识别号",
-            prop: "identificationnumber",
-            hide: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入纳税人识别号",
-                trigger: "blur",
-              },
-            ],
-          },
-          {
-            label: "企业类型",
-            hide: true,
-            prop: "enterprises",
-            rules: [
-              {
-                required: true,
-                message: "请输入企业类型",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "纳税人识别号",
+          //   prop: "identificationnumber",
+          //   hide: true,
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入纳税人识别号",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
+          // {
+          //   label: "企业类型",
+          //   hide: true,
+          //   prop: "enterprises",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入企业类型",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "注册地址",
             prop: "address",
@@ -424,18 +424,18 @@
               },
             ],
           },
-          {
-            label: "所属地区",
-            hide: true,
-            prop: "region",
-            rules: [
-              {
-                required: true,
-                message: "请输入所属地区",
-                trigger: "blur",
-              },
-            ],
-          },
+          // {
+          //   label: "所属地区",
+          //   hide: true,
+          //   prop: "region",
+          //   rules: [
+          //     {
+          //       required: true,
+          //       message: "请输入所属地区",
+          //       trigger: "blur",
+          //     },
+          //   ],
+          // },
           {
             label: "登记机关",
             prop: "registration",
@@ -460,17 +460,29 @@
               },
             ],
           },
+          // {
+          //   label: "所属机构",
+          //   prop: "deptid",
+          //   addDisplay: false,
+          //   type: "select",
+          //   hide: true,
+          //   dicUrl: "/api/blade-system/dept/selectIn",
+          //   props: {
+          //     label: "deptname",
+          //     value: "deptid",
+          //   },
+          // },
           {
-            label: "所属机构",
-            prop: "deptid",
-            addDisplay: false,
-            type: "select",
-            hide: true,
-            dicUrl: "/api/blade-system/dept/selectIn",
+            label: "所属辖区",
+            prop: "jurisdiction",
+            type: "tree",
+            dicUrl: "/api/jurisdiction/lazy-trees",
             props: {
-              label: "deptname",
-              value: "deptid",
+              label: "title",
+              value: "id",
             },
+            // labelWidth: 160,
+            // span: 12,
           },
           {
             label: "许可类型",
@@ -480,10 +492,6 @@
             type: "select",
             searchSpan: 4,
             dicData: [
-              {
-                label: "保安服务许可",
-                value: "0",
-              },
               {
                 label: "保安培训许可",
                 value: "1",

--
Gitblit v1.9.3