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

shuishen

2021-11-05 d8cb402b82f93279531be6babbb89400a50a178d

 src/views/securityGuard/securityGuard.vue

@@ -66,7 +66,7 @@
              @click="handleSecurityApply"
              >制证申请
            </el-button>
            

            <el-button
              type="danger"
              style="display: none"
@@ -294,7 +294,7 @@
    </el-col>
  </el-row>
</template>
 

<script>
import {
  getUser,
@@ -789,11 +789,18 @@
              },
              {
                label: "联系地址",
                prop: "address",
                prop: "address"
              },
              {
                label: "户口所在地",
                label: "住址",
                prop: "registered",
                rules: [
                  {
                    required: true,
                    message: "请输入住址",
                    trigger: "click",
                  },
                ],
              },
              {
                label: "所属辖区",
@@ -1512,7 +1519,19 @@
            ColumnDeptUpdate.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
              that.userInfo.jurisdiction;
          } else {
          } else if (roleAlias == "培训公司管理员") {
              //如果是保安公司管理员
              params["trainingUnitId"] = that.userInfo.dept_id;
              var columnDept2 = that.findObject(that.option.column, "deptId");
            columnDept2.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
            var ColumnDeptUpdate2 = that.findObject(
              that.option.group,
              "deptId"
            );
            ColumnDeptUpdate2.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
          }else {
            var columnDept1 = that.findObject(that.option.column, "deptId");
            columnDept1.dicUrl =
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
@@ -1620,7 +1639,7 @@
  },
};
</script>
 

<style lang="scss" scoped>
.box {
  height: 800px;
@@ -1638,4 +1657,4 @@
    cursor: pointer;
  }
}
</style>
</style>