Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

shuishen

2021-11-12 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906

 src/views/securityGuard/securityGuard.vue

@@ -66,6 +66,15 @@
              @click="handleSecurityApply"
              >上岗证制证申请
            </el-button>
            <el-button
              type="primary"
              size="small"
              plain
              v-if="permission.securityGuard_security_paper_apply"
              icon="el-icon-collection-tag"
              @click="handleSecurityPaperApply"
              >证书制证申请
            </el-button>

            <el-button
              type="danger"
@@ -911,15 +920,15 @@
                prop: "address",
              },
              {
                label: "住址",
                label: "身份证住址",
                prop: "registered",
                // rules: [
                //   {
                //     required: true,
                //     message: "请输入住址",
                //     trigger: "click",
                //   },
                // ],
                rules: [
                  {
                    required: true,
                    message: "请输入身份证住址",
                    trigger: "click",
                  },
                ],
              },
              {
                label: "所属辖区",
@@ -947,13 +956,13 @@
                type: "date",
                format: "yyyy-MM-dd",
                valueFormat: "yyyy-MM-dd",
                // rules: [
                //   {
                //     required: true,
                //     message: "请输入入职时间",
                //     trigger: "click",
                //   },
                // ],
                rules: [
                  {
                    required: true,
                    message: "请输入入职时间",
                    trigger: "click",
                  },
                ],
              },
              {
                label: "性别",
@@ -1453,7 +1462,7 @@
        this.certificateObj.registered == "" ||
        this.certificateObj.registered == null
      ) {
        this.$message({ message: "请完善住址信息", type: "warning" });
        this.$message({ message: "请完善身份证住址信息", type: "warning" });
        return;
      }
      //更新发证时间
@@ -1575,6 +1584,45 @@
          const data = {
            ids: str,
            createUser: this.userInfo.user_id,
            type:1
          };
          return securityApply(data);
        })
        .then(() => {
          // this.$refs.crud.toggleSelection();
          this.$message({
            type: "success",
            message: "操作成功!",
          });
        });
    },
    //证书制证申请
    handleSecurityPaperApply() {
      if (this.choiceList.length === 0) {
        this.$message.warning("请勾选至少一位持证保安员");
        return;
      }
      this.$confirm(
        "共选择制证申请人数" + this.choiceList.length + "人,确定申请制证?",
        {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning",
        }
      )
        .then(() => {
          let cho = this.choiceList;
          let str = "";
          for (let k in cho) {
            str += cho[k].id;
            if (k != cho.length - 1) {
              str += ",";
            }
          }
          const data = {
            ids: str,
            createUser: this.userInfo.user_id,
            type:2
          };
          return securityApply(data);
        })