Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterpris...

shuishen

2021-09-13 c5673aa43ba66d00915ef592c5a6b4f5ced78566

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises_ys

 src/views/dispatch/dispatch.vue

@@ -3,7 +3,8 @@
        <div class="dispatch">
            <!-- <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs>
    <span v-if="typeTABS.prop === 'tab1'"> -->
            <avue-crud :option="option"
      <avue-crud
        :option="option"
                       :data="data"
                       :page.sync="page"
                       ref="crudrec"
@@ -16,39 +17,46 @@
                       @row-del="rowDel"
                       @selection-change="selectionChange"
                       @refresh-change="refreshChange"
                       @row-click="rowClick">
        @row-click="rowClick"
      >
                <template slot="menuLeft">
                    <el-button type="danger"
          <el-button
            type="danger"
                               size="small"
                               plain
                               icon="el-icon-delete"
                               @click="handleDelete">删 除
            @click="handleDelete"
            >删 除
                    </el-button>

                    <el-button type="success"
          <el-button
            type="success"
                               size="small"
                               plain
                               icon="el-icon-upload2"
                               @click="handleImport">批量导入
            @click="handleImport"
            >批量导入
                    </el-button>
                </template>

                <template slot-scope="{ row }"
                          slot="jurisdiction">
        <template slot-scope="{ row }" slot="jurisdiction">
                    {{ row.jurisdiction == -1 ? "" : row.jurisdiction }}
                </template>
            </avue-crud>

            <el-dialog title="派遣单位导入"
      <el-dialog
        title="派遣单位导入"
                       append-to-body
                       :visible.sync="excelBox"
                       width="555px">
                <avue-form :option="excelOption"
        width="555px"
      >
        <avue-form
          :option="excelOption"
                           v-model="excelForm"
                           :upload-after="uploadAfter">
          :upload-after="uploadAfter"
        >
                    <template slot="excelTemplate">
                        <el-button type="primary"
                                   @click="handleTemplate">
            <el-button type="primary" @click="handleTemplate">
                            点击下载<i class="el-icon-download el-icon--right"></i>
                        </el-button>
                    </template>
@@ -226,12 +234,9 @@
                        // span: 12,
                        labelWidth: 118,
                    },



                    {
                        label: "保安公司",
                        prop: "deptId",
            prop: "deptName",
                        type: "tree",
                        overHidden: true,
                        dicUrl:
@@ -262,6 +267,40 @@
                        // hide: true,
                        // span: 11,
                    },
          //备用  不删 ↑针对没有depid的公司名字转换
          //   {
          //     label: "保安公司",
          //     prop: "deptId",
          //     type: "tree",
          //     overHidden: true,
          //     dicUrl:
          //       "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
          //     props: {
          //       label: "title",
          //       value: "id",
          //     },
          //     // hide: true,
          //     // hide: !website.tenantMode,
          //     // addDisplay: website.tenantMode,
          //     // editDisplay: website.tenantMode,
          //     // viewDisplay: website.tenantMode,
          //     rules: [
          //       {
          //         required: true,
          //         message: "请选择保安公司",
          //         trigger: "click",
          //       },
          //     ],
          //     labelWidth: 118,
          //     width: 230,
          //     searchLabelWidth: 80,
          //     search: true,
          //     searchSpan: 4,
          //     // editDisplay: false,
          //     // addDisplay: false,
          //     // hide: true,
          //     // span: 11,
          //   },
                    {
                        label: "保安服务类型",
                        prop: "serveType",
@@ -383,7 +422,7 @@
                                trigger: "click",
                            },
                        ],
                    }
          },
                ],
            },
        };
@@ -416,7 +455,7 @@
        },
        ...mapState({
            userInfo: (state) => state.user.userInfo,
        })
    }),
    },
    methods: {
        handleChangeTABS (column) {
@@ -463,6 +502,11 @@
            // }
        },
        searchChange (params, done) {
      if (params.deptName) {
        params.deptId = params.deptName;
      }
      delete params.deptName;
      //   console.log(params);
            this.query = params;
            this.page.currentPage = 1;
            this.onLoad(this.page, params);
@@ -585,7 +629,7 @@
                };
            }

            console.log(values);
      // console.log(values);

            getdata(
                page.currentPage,
@@ -593,10 +637,10 @@
                // Object.assign(params, this.query)
                values
            ).then((res) => {
                // console.log(res);
                const data = res.data.data;
                this.page.total = data.total;
                this.data = data.records;
        console.log(this.data);
                for (var k in this.data) {
                    // this.data[k]["deptId"] = that.userInfo.dept_id;
                    this.data[k]["tenantName"] = that.userInfo.user_name;

 src/views/dispatch/dispatchChildoperable.vue

@@ -1,11 +1,12 @@
<template>
    <basic-container>
        <div class="dispatchChildoperable">
            <avue-crud :option="option1"
      <avue-crud
        :option="option1"
                       :data="data1"
                       :page.sync="page1"
                       ref="crudrec1"
                       v-model="form"
        v-model="form1"
                       :table-loading="loading1"
                       :before-open="beforeOpen"
                       @row-save="rowSave1"
@@ -14,9 +15,54 @@
                       @row-update="rowUpdate1"
                       @row-del="rowDel1"
                       @selection-change="selectionChange1"
                       @refresh-change="refreshChange1">
        @refresh-change="refreshChange1"
      >
        <template slot-scope="{ type, row }" slot="menu">
          <el-button
            icon="el-icon-check"
            size="small"
            :type="type"
            @click="openClick(row, page2)"
            >派遣轨迹</el-button
          >
        </template>
            </avue-crud>
        </div>
    <el-dialog
      title="提示"
      :visible.sync="dialogVisible"
      width="80%"
      top="10vh"
      append-to-body
    >
      <avue-crud
        :option="option2"
        :data="data2"
        :page.sync="page2"
        ref="crudrec2"
        v-model="form2"
        :table-loading="loading2"
        @selection-change="selectionChange2"
        @search-change="searchChange2"
        @row-save="rowSave2"
        @search-reset="searchReset2"
        @row-update="rowUpdate2"
        @row-del="rowDel2"
        @refresh-change="refreshChange2"
      >
        <!-- :before-open="beforeOpen"
        -->
        <!-- <template slot-scope="{ type, row }" slot="menu">
          <el-button
            icon="el-icon-check"
            size="small"
            :type="type"
            @click="openClick(row)"
            >派遣轨迹</el-button
          >
        </template> -->
      </avue-crud>
    </el-dialog>
    </basic-container>
</template>

@@ -35,6 +81,10 @@
export default {
    data () {
        return {
      dialogVisible: false,
      dialogId: "",
      dialogData: [],

            deptCategory: "",
            deptId: "",

@@ -45,7 +95,7 @@
                currentPage: 1,
                total: 0,
            },
            form: {},
      form1: {},
            query1: {},
            data1: [],
            option1: {
@@ -62,7 +112,7 @@
                addTitle: "记录添加",
                addBtnText: "记录添加",
                // addBtn: false,
                // menuWidth: 160,
        menuWidth: 256,
                align: "center",
                selection: true,
                column: [
@@ -272,7 +322,243 @@
                            },
                        ],
                    },
        ],
      },
      loading2: true, //单个人派遣记录
      vals: [],
      selectionList2: [],
      page2: {
        pageSize: 10,
        currentPage: 1,
        total: 0,
      },
      form2: {},
      query2: {},
      data2: [],
      option2: {
        // card: true,
        tip: false,
        index: true,
        // menu: false,
        searchSize: "mini",
        searchMenuSpan: 8,
        height: 450,
        cellBtn: false,
        delBtnText: "结束派遣",
        editBtnText: "更改派遣",
        addTitle: "记录添加",
        addBtnText: "记录添加",
        // addBtn: false,
        menuWidth: 256,
        align: "center",
        selection: true,
        column: [
          // },
          {
            label: "派遣单位",
            prop: "dispatcherCompany",
            // addDisplay: false,
            // editDisplay: false,
            // search: true,
            // labelWidth: 120,
            // searchSpan: 4,
            minWidth: 210,
            addDisplay: false,
            editDisplay: false,
          },
          {
            label: "保安公司",
            prop: "deptId",
            search: true,
            labelWidth: 120,
            type: "tree",
            searchSpan: 4,
            cascaderItem: ["userIds"],
            props: {
              label: "title",
              value: "id",
            },
            width: 180,
            dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
            rules: [
              {
                required: true,
                message: "请输入保安公司",
                trigger: "blur",
              },
            ],
          },
          {
            label: "派遣单位",
            prop: "dispatcherUnitId",
            labelWidth: 120,
            searchLabelWidth: 80,
            // dicUrl: "/api/dispatcherUnit/page-tree?deptId={{key}}",
            props: {
              label: "name",
              value: "id",
            },
            hide: true,
            searchSpan: 4,
            search: true,
            overHidden: true,
            type: "tree",
            rules: [
              {
                required: true,
                message: "请输入派遣单位",
                trigger: "blur",
              },
            ],
          },
          {
            label: "保安员",
            prop: "userIds",
            type: "tree",
            width: 70,
            labelWidth: 120,
            searchSpan: 3,
            // search: true,
            hide: true,
            props: {
              label: "realName",
              value: "id",
            },
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
            dicData: [],
            rules: [
              {
                required: true,
                message: "请选择保安",
                trigger: "blur",
              },
            ],
          },
          {
            label: "保安员",
            prop: "securityName",
            type: "tree",
            width: 70,
            labelWidth: 120,
            addDisplay: false,
            editDisplay: false,
            // hide: true,
            // props: {
            //   label: "realName",
            //   value: "id",
            // },
            // dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
            dicData: [],
            rules: [
              {
                required: true,
                message: "请选择保安",
                trigger: "blur",
              },
            ],
          },

          {
            label: "身份证",
            prop: "idCardNo",
            labelWidth: 120,
            overHidden: true,
            addDisplay: false,
            editDisplay: false,
            rules: [
              {
                required: true,
                message: "请输入身份证",
                trigger: "click",
              },
            ],
            // search: true,
            // searchSpan: 4,
            // overHidden: true
          },
          // {
          //     label: "派遣人",
          //     prop: "dispatcher",
          //     // search: true,
          //     // searchSpan: 4,
          //     // overHidden: true
          // },
          {
            label: "派遣地址",
            prop: "dispatcheraddress",
            labelWidth: 120,
            rules: [
              {
                required: true,
                message: "请输入派遣地址",
                trigger: "click",
              },
            ],
            // search: true,
            // searchSpan: 4,
            // overHidden: true
          },
          {
            label: "开始时间",
            prop: "dispatchertime",
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            labelWidth: 120,
            searchSpan: 5,
            // search: true,
            overHidden: true,
            rules: [
              {
                required: true,
                message: "请输入派遣时间",
                trigger: "click",
              },
            ],
            // overHidden: true
          },
          {
            label: "结束时间",
            prop: "endTime",
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            labelWidth: 120,
            overHidden: true,
            rules: [
              {
                required: true,
                message: "请输入结束时间",
                trigger: "click",
              },
            ],
            // search: true,
            // searchSpan: 4,
            // overHidden: true
          },
          {
            label: "派遣时间",
            prop: "releaseTimeRange",
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            searchValue: [this.getStartTime(), this.getEndTime()],
            searchRange: true,
            searchSpan: 5,
            hide: true,
            addDisplay: false,
            editDisplay: false,
            viewDisplay: false,
            search: true,
            rules: [
              {
                required: true,
                message: "请输入时间",
                trigger: "blur",
              },
            ],
          },
                ],
            },
        };
@@ -308,6 +594,138 @@
    },

    methods: {
    openClick(val, page, params = {}) {
      this.vals = val;
      this.dialogVisible = true;
      params["userIds"] = val.userIds;
      //默认查询已派遣的，派遣结束，未派遣的不显示
      params["dispatch"] = 0;
      var values;
      const { releaseTimeRange } = this.query1;
      if (releaseTimeRange) {
        values = {
          ...params,
          beginTime: releaseTimeRange[0],
          overTime: releaseTimeRange[1],
          ...this.query,
        };
        values.releaseTimeRange = null;
      } else {
        values = {
          ...params,
          ...this.query,
        };
      }

      if (this.userInfo.role_name == "保安公司管理员") {
        // const deptColumn = this.findObject(this.option1.column, "deptId");
        // deptColumn.disabled = true;
        // // deptColumn.search = false; //会报错
        // deptColumn.value = this.userInfo.dept_id;
        this.option2.column[1].search = false;
        this.option2.column[1].value = this.userInfo.dept_id;
        this.option2.column[1].disabled = true;
        // this.option2.column[3].disabled = true;
        this.option2.column[3].value = val.userIds;
        this.initData(2, 2);
      } else {
        this.option2.column[1].search = true;
        // deptColumn.disabled = false;
        this.initData(1, 2);
      }
      getdata1(
        page.currentPage,
        page.pageSize,
        // Object.assign(params, this.query2)
        values
      ).then((res) => {
        const data = res.data.data;
        this.page2.total = data.total;
        this.data2 = data.records;
        this.loading2 = false;
        //     // this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
        //     // console.log(this.form, 111111);
      });
      //   console.log(val);
    },
    refreshChange2() {
      // console.log(4534)
      this.openClick(this.vals, this.page2, this.query2);
    },
    searchChange2(params, done) {
      this.query2 = params;
      this.page2.currentPage = 1;
      this.refreshChange2();
      done();
    },
    rowSave2(form, done, loading) {
      // if(this.userInfo.role_name=="保安公司管理员"){
      //   const userColumn = this.findObject(this.option1.column, "userIds");
      //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
      // }

      adddata1(form).then(
        (res) => {
          this.refreshChange2();
          this.onLoad1(this.page1);
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          done();
        },
        (error) => {
          window.console.log(error);
          loading();
        }
      );
      // }
    },
    searchReset2() {
      this.query2 = {};
      this.refreshChange2();
    },
    rowUpdate2(row, index, done, loading) {
      // if(this.userInfo.role_name=="保安公司管理员"){
      //   const userColumn = this.findObject(this.option1.column, "userIds");
      //   userColumn.dicUrl = "/api/blade-user/page-security-units?deptId="+this.userInfo.dept_id;
      // }
      update1(row).then(
        () => {
          this.refreshChange2();
          this.onLoad1(this.page1);
          this.$message({
            type: "success",
            message: "操作成功!",
          });
          done();
        },
        (error) => {
          window.console.log(error);
          loading();
        }
      );
    },
    rowDel2(row) {
      this.$confirm("确定结束当前派遣?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      })
        .then(() => {
          console.log(row);
          return overDispatcher(row);
        })
        .then(() => {
          this.refreshChange2();
          this.onLoad1(this.page1);
          this.$message({
            type: "success",
            message: "操作成功!",
          });
        });
    },

        handleChangeTABS (column) {
            this.typeTABS = column;
            if (column.prop == "tab1") {
@@ -511,31 +929,34 @@
                this.data1 = data.records;
                this.loading1 = false;
                // this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
                console.log(this.form, 111111);
        // console.log(this.form, 111111);
            });
        },
        initData (type) {
    initData(type, d = 1) {
            var that = this;
            if (type == 1) {
                getDispatcherUnitByDeptId(null).then((res) => {
                    const dispatcherUnitIdColumn = that.findObject(
                        this.option1.column,
            this["option" + d].column,
                        "dispatcherUnitId"
                    );
                    console.log(res.data.data, 111);
          //   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,
            this["option" + d].column,
                        "dispatcherUnitId"
                    );
                    dispatcherUnitIdColumn.dicData = res.data.data;
                });
                getListByDeptId(that.userInfo.dept_id, 1).then((res) => {
                    const userIdsColumn = that.findObject(this.option1.column, "userIds");
          const userIdsColumn = that.findObject(
            this["option" + d].column,
            "userIds"
          );
                    userIdsColumn.dicData = res.data.data;
                });
            }

 src/views/securityAnalysis/child/assignment.vue

@@ -274,7 +274,7 @@
      if (this.card.jurisdiction == 1123598813738675201) {
        this.card.jurisdiction = "";
      }
      console.log(this.query1);
      // console.log(this.query1);
      const releaseTimeRange = this.query1.releaseTimeRange;
      if (releaseTimeRange) {
        params = {
@@ -316,7 +316,7 @@
      this.query1 = {};
      this.page1.currentPage = 1;
      this.refreshChange();
      console.log(212);
      // console.log(212);
    },
  },
};

 src/views/securityAnalysis/child/certificate.vue

@@ -200,7 +200,7 @@
      this.query1 = {};
      this.page1.currentPage = 1;
      this.refreshChange();
      console.log(212);
      // console.log(212);
    },
  },
};

 src/views/securityAnalysis/child/dispatch.vue

@@ -75,15 +75,13 @@
            // span: 12,
            labelWidth: 118,
          },

          {
            label: "保安公司",
            prop: "deptId",
            prop: "deptName",
            type: "tree",
            overHidden: true,
            dicUrl:
              "/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
              jurisdiction,
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
            props: {
              label: "title",
              value: "id",
@@ -110,6 +108,41 @@
            // hide: true,
            // span: 11,
          },
          //备用  不删 ↑针对没有depid的公司名字转换
          // {
          //   label: "保安公司",
          //   prop: "deptId",
          //   type: "tree",
          //   overHidden: true,
          //   dicUrl:
          //     "/api/blade-system/dept/security_lazy-tree?jurisdiction=" +
          //     jurisdiction,
          //   props: {
          //     label: "title",
          //     value: "id",
          //   },
          //   // hide: true,
          //   // hide: !website.tenantMode,
          //   // addDisplay: website.tenantMode,
          //   // editDisplay: website.tenantMode,
          //   // viewDisplay: website.tenantMode,
          //   rules: [
          //     {
          //       required: true,
          //       message: "请选择保安公司",
          //       trigger: "click",
          //     },
          //   ],
          //   labelWidth: 118,
          //   width: 230,
          //   searchLabelWidth: 80,
          //   search: true,
          //   searchSpan: 4,
          //   // editDisplay: false,
          //   // addDisplay: false,
          //   // hide: true,
          //   // span: 11,
          // },
          {
            label: "保安服务类型",
            prop: "serveType",
@@ -274,7 +307,7 @@
      if (this.card.jurisdiction == 1123598813738675201) {
        this.card.jurisdiction = "";
      }
      console.log(this.query1);
      // console.log(this.query1);
      const releaseTimeRange = this.query1.releaseTimeRange;
      if (releaseTimeRange) {
        params = {
@@ -307,6 +340,10 @@
      this.getPractitionersPageInfo(this.page1, this.query1);
    },
    searchChange(params, done) {
      if (params.deptName) {
        params.deptId = params.deptName;
      }
      delete params.deptName;
      this.query1 = params;
      this.page1.currentPage = 1;
      this.refreshChange();
@@ -316,7 +353,7 @@
      this.query1 = {};
      this.page1.currentPage = 1;
      this.refreshChange();
      console.log(212);
      // console.log(212);
    },
  },
};

 src/views/securityAnalysis/child/examination.vue

@@ -78,7 +78,7 @@
  methods: {
    getPractitionersPageInfo(page, params = {}) {
      // this.data1 = this.czdata;
      console.log(page);
      // console.log(page);
      params = {
        ...params,
        ...this.card,

 src/views/securityAnalysis/child/situation.vue

@@ -196,7 +196,7 @@
      this.query1 = {};
      this.page1.currentPage = 1;
      this.refreshChange();
      console.log(212);
      // console.log(212);
    },
  },
};