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

liuyg

2021-08-28 c8e279927a36c755fd78769cfa8e489568192aa4

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

 src/views/applydetailed/index.vue

@@ -39,13 +39,12 @@
                >清册打印
              </el-button>
              <el-button
                style="display:none"
                type="success"
                size="small"
                plain
                icon="el-icon-receiving"
                @click="handleImport"
                >清册打印
                >清册导入
              </el-button>
            </template>

@@ -104,6 +103,7 @@

export default {
  data() {
    var examId = this.$route.query.id;
    return {
      obj: {
        name: "张三",
@@ -462,7 +462,7 @@
              res: "data",
            },
            tip: "请上传 .xls,.xlsx 标准格式文件",
            action: "/api/apply/import-apply",
            action: "/api/apply/import-applys?examId="+examId,
          },
          {
            label: "模板下载",

 src/views/applyexam/index.vue

@@ -76,7 +76,7 @@
                icon="el-icon-folder-checked"
                v-if="permission.applyexam_import"
               @click="handleImport"
                >清册导入
                >批量报名
              </el-button>
            </template>

@@ -131,7 +131,7 @@
          </el-dialog>

          <el-dialog
            title="清册数据导入"
            title="批量报名导入"
            append-to-body
            :visible.sync="excelBox"
            width="555px"

 src/views/desk/notice.vue

@@ -162,14 +162,15 @@
            label: "通知时间",
            prop: "releaseTimeRange",
            type: "datetime",
            format: "yyyy-MM-dd hh:mm:ss",
            valueFormat: "yyyy-MM-dd hh:mm:ss",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            searchRange: true,
            hide: true,
            addDisplay: false,
            editDisplay: false,
            viewDisplay: false,
            search: true,
            searchSpan:6,
            rules: [
              {
                required: true,

 src/views/dispatch/dispatch.vue

@@ -109,7 +109,7 @@
  remove1,
} from "@/api/dispatch/dispatch";
import { mapGetters } from "vuex";

import { mapState } from "vuex";
export default {
  data() {
    return {
@@ -296,7 +296,7 @@
            overHidden: true,
            labelWidth: 118,
            type: "tree",
            dicUrl: "/api/jurisdiction/lazy-tree?parentId=1123598813738675201",
            dicUrl: "/api/jurisdiction/lazy-tree",
            props: {
              label: "title",
              value: "id",
@@ -322,7 +322,7 @@
            overHidden: true,
            labelWidth: 118,
            type: "tree",
            dicUrl: "/api/jurisdiction/lazy-tree?parentId=1123598813738675201",
            dicUrl: "/api/jurisdiction/lazy-tree",
            props: {
              label: "title",
              value: "id",
@@ -379,6 +379,16 @@
      },
    };
  },
  created() {
    if (this.userInfo.role_name == "保安公司管理员") {
      const deptColumn = this.findObject(this.option.column, "deptId");
      deptColumn.search = false;
      deptColumn.addDisplay = false;
      deptColumn.editDisplay = false;
      deptColumn.viewDisplay = false;
      deptColumn.hide = true;
    }
  },
  computed: {
    ...mapGetters(["userInfo"]),
    ids() {
@@ -395,6 +405,9 @@
      });
      return ids1.join(",");
    },
        ...mapState({
      userInfo: (state) => state.user.userInfo,
        })
  },
  methods: {
    handleChangeTABS(column) {
@@ -423,13 +436,7 @@
      //   this.$message.success("页码" + val);
    },
    rowSave(form, done, loading) {
      // var that = this;
      // var form = this.data[0];
      // delete form.id;
      // for (var k = 0; k < 13; k++) {
      form["deptId"] = this.userInfo.dept_id;
      // form["tenantName"] = form.this.userInfo.user_name;

      adddata(form).then(
        (res) => {
          this.onLoad(this.page);
@@ -457,7 +464,6 @@
      this.onLoad(this.page);
    },
    rowUpdate(row, index, done, loading) {
      console.log(row);
      update(row).then(
        () => {
          this.onLoad(this.page);
@@ -603,138 +609,6 @@
      this.refreshChange();
      done();
    },

    //派遣服务公司登记

    //派遣记录
    // sizeChange1(val) {
    //   this.page1.currentPage = 1;
    //   this.page1.pageSize = val;
    //   // this.getData();
    //   this.onLoad1(this.page1, this.query1);
    //   //   this.$message.success("行数" + val);
    // },
    // currentChange1(val) {
    //   this.page1.currentPage = val;
    //   // this.getData();
    //   this.onLoad1(this.page1, this.query1);
    //   //   this.$message.success("页码" + val);
    // },
    // rowSave1(form, done, loading) {
    //   var that = this;
    //   var form = this.data1[0];
    //   delete form.id;
    //   for (var k = 0; k < 13; k++) {
    //     adddata1(form).then(
    //       (res) => {
    //         this.onLoad1(this.page1);
    //         this.$message({
    //           type: "success",
    //           message: "操作成功!",
    //         });
    //         done();
    //       },
    //       (error) => {
    //         window.console.log(error);
    //         loading();
    //       }
    //     );
    //   }
    // },
    // searchChange1(params, done) {
    //   this.query1 = params;
    //   this.page1.currentPage = 1;
    //   this.onLoad1(this.page1, params);
    //   done();
    // },
    // searchReset1() {
    //   this.query = {};
    //   this.onLoad1(this.page1);
    // },
    // rowUpdate1(row, index, done, loading) {
    //   console.log(row);
    //   update1(row).then(
    //     () => {
    //       this.onLoad1(this.page1);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //       done();
    //     },
    //     (error) => {
    //       window.console.log(error);
    //       loading();
    //     }
    //   );
    // },
    // rowDel1(row) {
    //   this.$confirm("确定将选择数据删除?", {
    //     confirmButtonText: "确定",
    //     cancelButtonText: "取消",
    //     type: "warning",
    //   })
    //     .then(() => {
    //       return remove1(row.id);
    //     })
    //     .then(() => {
    //       this.onLoad1(this.page1);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //     });
    // },
    // selectionChange1(list) {
    //   this.selectionList1 = list;
    //   console.log(this.selectionList1.length);
    // },
    // handleDelete1() {
    //   console.log(this.selectionList1);
    //   if (this.selectionList1.length === 0) {
    //     this.$message.warning("请选择至少一条数据");
    //     return;
    //   }
    //   this.$confirm("确定将选择数据删除?", {
    //     confirmButtonText: "确定",
    //     cancelButtonText: "取消",
    //     type: "warning",
    //   })
    //     .then(() => {
    //       return remove1(this.ids1);
    //     })
    //     .then(() => {
    //       this.onLoad1(this.page1);
    //       this.$message({
    //         type: "success",
    //         message: "操作成功!",
    //       });
    //       this.$refs.crudrec1.toggleSelection();
    //     });
    // },
    // refreshChange1() {
    //   // console.log(4534)
    //   this.onLoad1(this.page1, this.query1);
    // },

    // //
    // onLoad1(page, params = {}) {
    //   this.loading1 = true;
    //   // console.log(page);
    //   getdata1(
    //     page.currentPage,
    //     page.pageSize,
    //     Object.assign(params, this.query)
    //   ).then((res) => {
    //     // console.log(res);
    //     const data = res.data.data;
    //     this.page1.total = data.total;
    //     this.data1 = data.records;
    //     console.log(this.data1, 1);
    //     this.loading1 = false;
    //   });
    // },
    //派遣记录
  },
  mounted() {
    this.typeTABS = this.optionTABS.column[0];

 src/views/dispatch/dispatchChildoperable.vue

@@ -23,7 +23,13 @@
</template> 

<script>
import { getdata1, adddata1, update1, remove1,getDispatcherUnitByDeptId} from "@/api/dispatch/dispatch";
import {
  getdata1,
  adddata1,
  update1,
  remove1,
  getDispatcherUnitByDeptId,
} from "@/api/dispatch/dispatch";
import { getListByDeptId } from "@/api/system/user";
import { mapState } from "vuex";

@@ -270,13 +276,12 @@
    };
  },
  created () {


     if(this.userInfo.role_name=="保安公司管理员"){
        const deptColumn = this.findObject(this.option1.column, "deptId");
        
        deptColumn.search = false;
        
    }else{
      const deptColumn = this.findObject(this.option1.column, "dispatcherUnitId");
      deptColumn.search = false;
      }
  },
  computed: {
@@ -291,6 +296,9 @@
    ...mapState({
      userInfo: (state) => state.user.userInfo,
    }),
    deps() {
      return this.form.deptId;
    },
  },
  
  methods: {
@@ -427,7 +435,7 @@
          getListByDeptId(that.userInfo.dept_id).then((res)=>{
            const userColumn = that.findObject(this.option1.column, "userIds");
            userColumn.dicData = res.data.data;
          })
          });
        }
      }
      this.initFlag = true;
@@ -503,22 +511,35 @@
      var that = this;
      if(type==1){
          getDispatcherUnitByDeptId(null).then((res)=>{
            const dispatcherUnitIdColumn = that.findObject(this.option1.column, "dispatcherUnitId");
          const dispatcherUnitIdColumn = that.findObject(
            this.option1.column,
            "dispatcherUnitId"
          );
          console.log(res.data.data,111);
            dispatcherUnitIdColumn.dicData = res.data.data;
           
        })
        });
      }
      if(type==2){
          getDispatcherUnitByDeptId(that.userInfo.dept_id).then((res)=>{
            const dispatcherUnitIdColumn = that.findObject(this.option1.column, "dispatcherUnitId");
          const dispatcherUnitIdColumn = that.findObject(
            this.option1.column,
            "dispatcherUnitId"
          );
            dispatcherUnitIdColumn.dicData = res.data.data;
        })
      }
        });
        getListByDeptId(that.userInfo.dept_id).then((res) => {
          const userIdsColumn = that.findObject(this.option1.column, "userIds");
          userIdsColumn.dicData = res.data.data;
        });
    }
  },
  },
  //  watch: {
  //   "form.deptId"() {
  //     this.initData();
  //   // "form.deptId"() {
  //   //   this.initData();
  //   // }
  //   deps(){
  //     console.log(this.deps,5646646)
  //   }
  // },
  mounted() {

 src/views/exam/performance.vue

@@ -186,7 +186,8 @@
                trigger: "blur",
              },
            ],
            overHidden: true,
            // overHidden: true,
            width:230,
          },
          {
            label: "用户名",
@@ -245,6 +246,7 @@
                trigger: "blur",
              },
            ],
            width:250,
          },
          {
            label: "考试开始时间",

 src/views/exam/singleperformance.vue

@@ -161,7 +161,8 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
            // overHidden:true,
            width:230,
          },
          {
            label: "用户名",
@@ -188,6 +189,7 @@
                trigger: "blur",
              },
            ],
            width:160,
          },
          {
            label: "所属公司",
@@ -219,6 +221,7 @@
                trigger: "blur",
              },
            ],
            width:250,
          },
          {
            label: "考试开始时间",

 src/views/exam/startexam.vue

@@ -54,6 +54,7 @@

            <template slot="menuLeft">
              <el-button
                style="display:none"
                type="danger"
                size="small"
                icon="el-icon-delete"
@@ -108,14 +109,14 @@
      form: {},
      questionBankOption: {
        // 操作栏多余按钮去除
        delBtn: true,
        editBtn: true,
        addBtn: true,
        delBtn: false,
        editBtn: false,
        addBtn: false,
        selection: true,
        menu: true,
        // 导出按钮
        excelBtn: false,
        viewBtn: true,
        viewBtn: false,

        // title: '题库',


 src/views/people/data.js

@@ -83,7 +83,7 @@
    prop: "jurisdiction",
    // multiple: true,
    type: "tree",
    dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
        dicUrl: "/api/jurisdiction/lazy-tree",
    props: {
        label: "title",
        value: "id",

 src/views/securityEquipment/car.js

@@ -1,12 +1,10 @@
var DIC = [
    {
var DIC = [{
        label: '招聘中',
        value: 1,
    }, {
        label: '停止招聘',
        value: 2,
    }
]
}]

export var column = [
    // {
@@ -19,7 +17,7 @@
    {
        label: "车牌号码",
        prop: "carNumber",
        searchSpan: 4,
        searchSpan: 3,
        search: true,
        rules: [{
            required: true,
@@ -30,13 +28,20 @@
    {
        label: "号码种类",
        prop: "numberType",
        searchSpan: 4,
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=carNumberType",
        search: true,
        type: "select",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
        searchSpan: 3,
        rules: [{
            required: true,
            message: "请输入号码种类",
            trigger: "blur"
        }],
        search: true,
    },//上面不显示 
    {
        label: "车辆类型",
@@ -45,17 +50,23 @@
            required: true,
            message: "请输入车辆类型",
            trigger: "blur"
        }]
        // search: true,
    }
    , {
        }],
        dicUrl: "/api/blade-system/dict-biz/dictionary?code=carType",
        search: true,
        searchSpan: 3,
        type: "select",
        props: {
            label: "dictValue",
            value: "dictKey"
        },
        dataType: "number",
    }, {
        label: "车辆型号",
        prop: "mode",
        // search: true,
        searchSpan: 4,
        width: 110,
        overHidden: true,
        search: true,
        // search: true,
        rules: [{
            required: true,
            message: "请输入车辆型号",
@@ -83,13 +94,7 @@
            label: "title",
            value: "id"
        },
        // search: true,
        type: "select",
        // rules: [{
        //     required: true,
        //     message: "请选择学历",
        //     trigger: "blur"
        // }],
    },
    {
        label: "责任人",
@@ -117,7 +122,6 @@
    {
        label: "出厂日期",
        prop: "dateForProduction",
        // search: true,
        type: "date",
        format: "yyyy-MM-dd",
        valueFormat: "yyyy-MM-dd",
@@ -138,7 +142,7 @@
        // search: true,
        rules: [{
            required: true,
            message: "请输入环保标志 ,国IV",
            message: "请输入环保标志(如:国IV)",
            trigger: "blur"
        }],
        searchSpan: 4,

 src/views/securityEquipment/car.vue

@@ -26,6 +26,7 @@
            >删 除
          </el-button>
          <el-button
            style="display:none"
            type="success"
            size="small"
            plain
@@ -113,6 +114,7 @@
        menuWidth: 160,
        align: "center",
        selection: true,
        labelWidth:110,
        column: column,
      },
    };
@@ -257,9 +259,9 @@
    },
    onLoad(page, params = {}) {
      this.loading = true;
      params["deptId"] = this.fromDeptId;
      // console.log(params.deptId);
      if (params.deptId != undefined) {
      if (this.fromDeptId != undefined) {
        params["deptId"] = this.fromDeptId;
        this.option.column[4].search = false;
        this.option.column[4].hide = true;
        this.option.column[4].addDisplay = false;

 src/views/securityEquipment/equipments.js

@@ -1,15 +1,12 @@
var DIC = [
    {
var DIC = [{
        label: '招聘中',
        value: 1,
    }, {
        label: '停止招聘',
        value: 2,
    }
]
}]

export var column = [
    {
export var column = [{
        label: "id",
        prop: "id",
        hide: true,
@@ -29,30 +26,8 @@
        }]
    },
    {
        label: "编号",
        prop: "number",
        searchSpan: 4,
        rules: [{
            required: true,
            message: "请输入编号",
            trigger: "blur"
        }],
        search: true,
    },//上面不显示 
    {
        label: "规格",
        prop: "specifications",
        rules: [{
            required: true,
            message: "请输入规格",
            trigger: "blur"
        }]
        // search: true,
    },
    {
        label: "型号",
        prop: "mode",
        width: 70,
        rules: [{
            required: true,
            message: "请输入型号",
@@ -67,38 +42,30 @@
            required: true,
            message: "请输入数量",
            trigger: "blur"
        }]
        }],
        // search: true,
        width: 70,
    },
    {
        label: "所属保安公司",
        prop: "deptId",
        searchSpan: 4,
        searchSpan: 6,
        searchLabelWidth: 110,
        rules: [{
            required: true,
            message: "请输入组织机构",
            message: "请输入所属保安公司",
            trigger: "blur"
        }],
        hide: false,
        search: true,
        overHidden: true,
        // addDisplay: true,
        // editDisplay: true,
        // viewDisplay: true,
        // searchSpan: 4,
        dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
        props: {
            label: "title",
            value: "id"
        },
        // search: true,
        type: "select",
        // rules: [{
        //     required: true,
        //     message: "请选择学历",
        //     trigger: "blur"
        // }],
        width: 250,
    },
    {
        label: "负责人",

 src/views/securityEquipment/equipments.vue

@@ -26,6 +26,7 @@
            >删 除
          </el-button>
          <el-button
            style="display:none"
            type="success"
            size="small"
            plain
@@ -114,6 +115,7 @@
        align: "center",
        selection: true,
        column: column,
        labelWidth:110,
      },
    };
  },
@@ -180,6 +182,7 @@
      //   }
    },
    searchChange(params, done) {
      params = JSON.parse(JSON.stringify(params));
      this.query = params;
      this.page.currentPage = 1;
      this.onLoad(this.page, params);
@@ -258,9 +261,9 @@
    },
    onLoad(page, params = {}) {
      this.loading = true;
      params["deptId"] = this.fromDeptId;
      // console.log(params.deptId);
      if (params.deptId != undefined) {
      if (this.fromDeptId != undefined) {
        params["deptId"] = this.fromDeptId;
        this.option.column[6].search = false;
        this.option.column[6].hide = true;
        this.option.column[6].addDisplay = false;

 src/views/securityEquipment/gun.js

@@ -1,15 +1,12 @@
var DIC = [
    {
var DIC = [{
        label: '招聘中',
        value: 1,
    }, {
        label: '停止招聘',
        value: 2,
    }
]
}]

export var column = [
    {
export var column = [{
        label: "id",
        prop: "id",
        hide: true,
@@ -58,7 +55,7 @@
    {
        label: "枪型",
        prop: "gunMode",
        searchSpan: 4,
        // searchSpan: 4,
        width: 70,
        labelWidth: 160,
        rules: [{
@@ -66,7 +63,7 @@
            message: "请输入枪型",
            trigger: "blur"
        }],
        search: true,
        // search: true,
    },
    {
        label: "所属保安公司",

 src/views/securityEquipment/gun.vue

@@ -59,6 +59,7 @@
        align: "center",
        border: true,
        selection: true,
        labelWidth:110,
        column: column,
      },
    };
@@ -189,9 +190,9 @@
    },
    onLoad(page, params = {}) {
      this.loading = true;
      params["deptId"] = this.fromDeptId;
      // console.log(params.deptId);
      if (params.deptId != undefined) {
      if (this.fromDeptId != undefined) {
        params["deptId"] = this.fromDeptId;
        this.option.column[5].search = false;
        this.option.column[5].hide = true;
        this.option.column[5].addDisplay = false;

 src/views/securityGuard/data.js

@@ -83,7 +83,7 @@
        prop: "jurisdiction",
        // multiple: true,
        type: "tree",
        dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
        dicUrl: "/api/jurisdiction/lazy-tree",
        props: {
            label: "title",
            value: "id",

 src/views/securityGuard/securityGuard.vue

@@ -617,7 +617,7 @@
                prop: "jurisdiction",
                // multiple: true,
                type: "tree",
                dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
                dicUrl: "/api/jurisdiction/lazy-tree",
                props: {
                  label: "title",
                  value: "id",

 src/views/securityGuard/securityGuardOnce.vue

@@ -516,7 +516,7 @@
                prop: "jurisdiction",
                // multiple: true,
                type: "tree",
                dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
                dicUrl: "/api/jurisdiction/lazy-tree",
                props: {
                  label: "title",
                  value: "id",

 src/views/securityGuard/securityGuardRegistration.vue

@@ -161,7 +161,7 @@
                prop: "jurisdiction",
                // multiple: true,
                type: "tree",
                dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
                dicUrl: "/api/jurisdiction/lazy-tree",
                props: {
                  label: "title",
                  value: "id",

 src/views/securityMan/data.js

@@ -76,7 +76,7 @@
        prop: "jurisdiction",
        // multiple: true,
        type: "tree",
        dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
        dicUrl: "/api/jurisdiction/lazy-tree",
        props: {
            label: "title",
            value: "id",

 src/views/securityUnitChild/data.js

@@ -1,16 +1,13 @@
var DIC = [
    {
var DIC = [{
        label: '招聘中',
        value: 1,
    }, {
        label: '停止招聘',
        value: 2,
    }
]
var w = 160
    , s = 12;
export var column = [
    {
}]
var w = 160,
    s = 12;
export var column = [{
        label: "",
        labelWidth: 20,
        type: 'title',
@@ -137,7 +134,7 @@
        prop: "region",
        // multiple: true,
        type: "tree",
        dicUrl: "/api/jurisdiction/lazy-tree?parentId=0",
        dicUrl: "/api/jurisdiction/lazy-tree",
        props: {
            label: "title",
            value: "id",
@@ -147,13 +144,11 @@
        width: 110,
        overHidden: true,
        disabled: true,
        rules: [
            {
        rules: [{
                required: false,
                message: "请选择所属辖区",
                trigger: "click",
            },
        ],
        }, ],
    },
    {
        label: "所属行业",
@@ -183,8 +178,7 @@
    }
]

export var column1 = [
    {
export var column1 = [{
        label: "id",
        prop: "id",
        hide: true,
@@ -242,8 +236,7 @@
    },
]

export var column2 = [
    {
export var column2 = [{
        label: "统一社会信用代码",
        prop: "creditcode",
        hide: true,

 src/views/trainApply/index.vue

@@ -40,21 +40,20 @@
                                >导出
                            </el-button>
                            <el-button
                                 style="display:none"
                                type="success"
                                size="small"
                                plain
                                icon="el-icon-upload2"
                                @click="handleImport"
                                >导入
                            </el-button>
                            <el-button
                                type="warning"
                                size="small"
                                plain
                                icon="el-icon-download"
                                icon="el-icon-receiving"
                                @click="handleExport"
                                >清册打印
                            </el-button>
                            <el-button
                                type="success"
                                size="small"
                                plain
                                icon="el-icon-download"
                                @click="handleImport"
                                >清册导入
                            </el-button>
                        </template>

@@ -117,7 +116,7 @@

export default {
    data () {

        var examId = this.$route.query.id;
        return {
            excelBox: false,
            questionBankOption: {
@@ -447,7 +446,7 @@
                    res: "data",
                    },
                    tip: "请上传 .xls,.xlsx 标准格式文件",
                    action: "/api/trainingRegistration/import-trainingRegistration",
                    action: "/api/trainingRegistration/import-trainingRegistration?examId="+examId,
                },
                {
                    label: "模板下载",
@@ -658,7 +657,7 @@
        },
        handleTemplate() {
            window.open(
                `/api/apply/export-template`
                `/api/trainingRegistration/export-template`
            );
        },
        uploadAfter(res, done, loading, column) {

 src/views/trainExam/index.vue

@@ -53,6 +53,7 @@

            <template slot="menuLeft">
              <el-button
                style="display:none"
                type="danger"
                size="small"
                icon="el-icon-delete"
@@ -144,8 +145,9 @@
        border: true, //liu
        index: true,
        stripe: true,
        viewBtn: true,
        addBtn: true,
        viewBtn: false,
        addBtn: false,
        editBtn: false,
        selection: true,
        excelBtn: false,
        menuWidth: 230,
@@ -154,14 +156,14 @@
      },
      questionBankOption: {
        // 操作栏多余按钮去除
        delBtn: true,
        editBtn: true,
        addBtn: true,
        delBtn: false,
        editBtn: false,
        addBtn: false,
        selection: true,
        menu: true,
        // 导出按钮
        excelBtn: false,
        viewBtn: true,
        viewBtn: false,

        // title: '题库',


 src/views/trainExam/performance.vue

@@ -151,7 +151,7 @@
            search: true,
            searchSpan: 4,
            slot: true,
            viewDisplay:false,
            viewDisplay:true,
            // 表单新增时是否禁止
            addDisabled: false,
            // 表单新增时是否可见
@@ -159,9 +159,10 @@
            // 表单新增时是否为查看模式
            addDetail: false,
            // 表单编辑时是否禁止
            editDisabled: false,
            editDisabled: true,
            viewDisabled: true,
            // 表单编辑时是否可见
            editDisplay: false,
            editDisplay: true,
            // 表单编辑时是否为查看模式
            editDetail: false,
            rules: [
@@ -171,7 +172,8 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
            width:250,
            // overHidden:true,
          },
          {
            label: "用户名",
@@ -198,6 +200,7 @@
                trigger: "blur",
              },
            ],
             width:160,
          },
          {
            label: "所属公司",
@@ -229,6 +232,7 @@
                trigger: "blur",
              },
            ],
            width:230,
          },
          {
            label: "考试开始时间",

 src/views/trainExam/singleperformance.vue

@@ -149,7 +149,7 @@
            // 表单新增时是否为查看模式
            addDetail: false,
            // 表单编辑时是否禁止
            editDisabled: false,
            editDisabled: true,
            // 表单编辑时是否可见
            editDisplay: false,
            // 表单编辑时是否为查看模式
@@ -161,7 +161,8 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
            // overHidden:true,
             width:250,
          },
          {
            label: "用户名",
@@ -188,6 +189,7 @@
                trigger: "blur",
              },
            ],
             width:160,
          },
          {
            label: "所属公司",
@@ -219,6 +221,7 @@
                trigger: "blur",
              },
            ],
             width:230,
          },
          {
            label: "考试开始时间",

 src/views/trainingRegistration/index.vue

@@ -47,7 +47,7 @@
          icon="el-icon-folder-checked"
          v-if="permission.trainingRegistration_import"
          @click="handleImport"
          >清册导入
          >批量导入
        </el-button>
      </template>
      <template slot-scope="{ type, size, row }" slot="menu">

 src/views/workreport/workreport.vue

@@ -239,20 +239,25 @@
      ).content.user_id;

      var that = this;
      getDept(this.deptId).then((res) => {
        var deptCategory = res.data.data.deptCategory;
        deptCategory == 1
          ? (that.deptCategory = true)
          : (that.deptCategory = false);
      // getDept(this.deptId).then((res) => {
      //   var deptCategory = res.data.data.deptCategory;
      //   deptCategory == 1
      //     ? (that.deptCategory = true)
      //     : (that.deptCategory = false);



        //1:保安公司  2：公安  3：培训公司
        if(deptCategory == 1 || deptCategory == 3){
        if(this.userInfo.role_name=="保安公司管理员" 
        || this.userInfo.role_name=="保安"
        || this.userInfo.role_name=="未持证保安"
        ){
             const column = that.findObject(that.option.column, "category");
             column.dicUrl = "/api/blade-system/dict-biz/dictionary?code=securityWorkReportCategory";
             const columnReceivedIds = that.findObject(that.option.column, "receivedIds");
             columnReceivedIds.dicUrl = "/api/blade-system/dept/lazy-tree-users?type={{key}}&deptId="+that.userInfo.dept_id;
        }
        if(deptCategory == 2){
        if(this.userInfo.role_name=="公安管理员"){
             const column = that.findObject(that.option.column, "category");
             column.dicUrl = "/api/blade-system/dict-biz/dictionary?code=workReportCategory";
             const columnReceivedIds = that.findObject(that.option.column, "receivedIds");
@@ -272,7 +277,7 @@
          this.loading = false;
          this.selectionClear();
        });
      });
      // });
    },
  },
};

 vue.config.js

@@ -28,8 +28,8 @@
      '/api': {
        // 本地服务接口地址
        // target: 'http://localhost:81',
        target: 'http://192.168.0.114:81',//钟日健W
        // target: 'http://localhost:81',//原W
                // target: 'http://192.168.0.114:81',//钟日健W
                target: 'http://localhost:81', //原W
        // target: 'http://192.168.0.108:81',//原W
        // target: 'http://192.168.0.109:81',//唐N
        //远程演示服务地址,可用于直接启动项目