保安监管系统-验收版本
zhengpz
2021-12-06 74314fda7855201f467f35dc2aecda2cd9b4d799
Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory_ys
4 files modified
73 ■■■■ changed files
src/router/axios.js 2 ●●● patch | view | raw | blame | history
src/views/licenseApproval/securityGuard.vue 11 ●●●● patch | view | raw | blame | history
src/views/licenseApproval/securityPermit.vue 56 ●●●●● patch | view | raw | blame | history
src/views/workreport/workreport.vue 4 ●●●● patch | view | raw | blame | history
src/router/axios.js
@@ -17,7 +17,7 @@
import 'nprogress/nprogress.css';
//默认超时时间
axios.defaults.timeout = 10000;
axios.defaults.timeout = 120000;
//返回其他状态码
axios.defaults.validateStatus = function (status) {
  return status >= 200 && status <= 500;
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-12-04 10:23:21
 * @Last Modified time: 2021-12-06 10:39:11
 */
@@ -85,9 +85,9 @@
            v-if="
              row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
            "
            >打印备案证
            >备案回执
          </el-button>
          <el-button
          <!-- <el-button
            icon="el-icon-brush"
            :size="size"
            :type="type"
@@ -96,7 +96,7 @@
            "
            @click.stop="viewLicensehuizhi(row)"
            >回执打印
          </el-button>
          </el-button> -->
        </template>
        <template class="tdtype" slot-scope="{ row }" slot="papprove">
          <el-tag class="dtype">
@@ -506,8 +506,9 @@
      this.licenceData.row = row;
      this.licenceData.chiden = {};
      this.licenceData.chiden["名称"] = row.enterprisename;
      this.licenceData.chiden["信用代码号"] = row.creditcode;
      this.licenceData.chiden["地址"] = row.address;
      this.licenceData.chiden["服务区域"] = row.industry;
      this.licenceData.chiden["许可服务范围"] = row.industry;
      this.licenceData.chiden["法定代表人"] = row.representative;
      this.licenceData.chiden["备案时间"] = row.officetime;
      this.licenceData.chiden["备案内容"] = "自招保安单位备案";
src/views/licenseApproval/securityPermit.vue
@@ -3,7 +3,7 @@
 * @Author: liu
 * @Date: 2021-08-26 16:22:20 
 * @Last Modified by: liu
 * @Last Modified time: 2021-12-04 10:40:46
 * @Last Modified time: 2021-12-06 10:48:37
 */
<template>
@@ -498,15 +498,63 @@
    //   update(this.xukezData);
    //   this.textareaShenpi = "";
    // },
    viewLicense(row) {
      //查看许可证
      // function strrev(str) {
      //   if (!str) return "";
      //   var revstr = "";
      //   for (i = str.length - 1; i >= 0; i--) {
      //     revstr += str.charAt(i);
      //   }
      //   return revstr;
      // }
      // //查看许可证
      // function completed_number(prefix, length) {
      //   var ccnumber = prefix;
      //   // generate digits
      //   while (ccnumber.length < length - 1) {
      //     ccnumber += Math.floor(Math.random() * 10);
      //   }
      //   // reverse number and convert to int
      //   var reversedCCnumberString = strrev(ccnumber);
      //   var reversedCCnumber = new Array();
      //   for (var i = 0; i < reversedCCnumberString.length; i++) {
      //     reversedCCnumber[i] = parseInt(reversedCCnumberString.charAt(i));
      //   }
      //   // calculate sum
      //   var sum = 0;
      //   var pos = 0;
      //   while (pos < length - 1) {
      //     odd = reversedCCnumber[pos] * 2;
      //     if (odd > 9) {
      //       odd -= 9;
      //     }
      //     sum += odd;
      //     if (pos != length - 2) {
      //       sum += reversedCCnumber[pos + 1];
      //     }
      //     pos += 2;
      //   }
      //   // calculate check digit
      //   var checkdigit = ((Math.floor(sum / 10) + 1) * 10 - sum) % 10;
      //   ccnumber += checkdigit;
      //   return ccnumber;
      // }
      // function credit_card_number(prefixList, length, howMany) {
      //   var result = new Array();
      //   for (var i = 0; i < howMany; i++) {
      //     var randomArrayIndex = Math.floor(Math.random() * prefixList.length);
      //     var ccnumber = prefixList[randomArrayIndex];
      //     result.push(completed_number(ccnumber, length));
      //   }
      //   return result;
      // }
      this.licenceData.row = row;
      this.licenceData.chiden = {};
      this.licenceData.chiden["名称"] = row.enterprisename;
      this.licenceData.chiden["信用代码号"] = row.creditcode;
      this.licenceData.chiden["住所"] = row.address;
      this.licenceData.chiden["法定代表人"] = row.representative;
      this.licenceData.chiden["服务范围"] = row.industry;
      this.licenceData.chiden["许可经营范围"] = row.industry;
      this.licenceData.chiden["注册资本"] = row.registeredcapital;
      this.licenceData.chiden["批准文号"] = row.registrationnumber;
src/views/workreport/workreport.vue
@@ -91,7 +91,7 @@
        menuWidth: 320,
        dialogClickModal: false,
        column:[{
                  label: "汇报时间",
                  label: "上报时间",
                  prop: "reportTime",
                  type: "datetime",
                  format: "yyyy-MM-dd HH:mm:ss",
@@ -103,7 +103,7 @@
                  search: false,
                  rules: [{
                      required: true,
                      message: "请输入时间",
                      message: "请选择上报时间",
                      trigger: "blur"
                  }]
              },