From 97837d1f683c4c1900a01dc86c1e08e7c90d1de3 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 10 Sep 2021 17:10:02 +0800
Subject: [PATCH] 部分内容的修改整理

---
 src/views/dispatch/dispatchChildoperable.vue | 1078 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 539 insertions(+), 539 deletions(-)

diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index 175a1aa..f8d0fb9 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -1,568 +1,568 @@
 <template>
-  <basic-container>
-    <div class="dispatchChildoperable">
-      <avue-crud
-        :option="option1"
-        :data="data1"
-        :page.sync="page1"
-        ref="crudrec1"
-        v-model="form"
-        :table-loading="loading1"
-        :before-open="beforeOpen"
-        @row-save="rowSave1"
-        @search-change="searchChange1"
-        @search-reset="searchReset1"
-        @row-update="rowUpdate1"
-        @row-del="rowDel1"
-        @selection-change="selectionChange1"
-        @refresh-change="refreshChange1"
-      >
-      </avue-crud>
-    </div>
-  </basic-container>
-</template> 
+    <basic-container>
+        <div class="dispatchChildoperable">
+            <avue-crud :option="option1"
+                       :data="data1"
+                       :page.sync="page1"
+                       ref="crudrec1"
+                       v-model="form"
+                       :table-loading="loading1"
+                       :before-open="beforeOpen"
+                       @row-save="rowSave1"
+                       @search-change="searchChange1"
+                       @search-reset="searchReset1"
+                       @row-update="rowUpdate1"
+                       @row-del="rowDel1"
+                       @selection-change="selectionChange1"
+                       @refresh-change="refreshChange1">
+            </avue-crud>
+        </div>
+    </basic-container>
+</template>
 
 <script>
 import {
-  getdata1,
-  adddata1,
-  update1,
-  remove1,
-  getDispatcherUnitByDeptId,
-  overDispatcher,
+    getdata1,
+    adddata1,
+    update1,
+    remove1,
+    getDispatcherUnitByDeptId,
+    overDispatcher,
 } from "@/api/dispatch/dispatch";
 import { update, getListByDeptId } from "@/api/system/user";
 import { mapState } from "vuex";
 
 export default {
-  data() {
-    return {
-      deptCategory: "",
-      deptId: "",
+    data () {
+        return {
+            deptCategory: "",
+            deptId: "",
 
-      loading1: true, //派遣记录
-      selectionList1: [],
-      page1: {
-        pageSize: 10,
-        currentPage: 1,
-        total: 0,
-      },
-      form: {},
-      query1: {},
-      data1: [],
-      option1: {
-        // card: true,
-        tip: false,
-        index: true,
-        // menu: false,
-        searchSize: "mini",
-        searchMenuSpan: 8,
-        height: 623,
-        cellBtn: false,
-        delBtnText: "结束派遣",
-        editBtnText: "变更派遣",
-        // addBtn: false,
-        // menuWidth: 160,
-        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",
+            loading1: true, //派遣记录
+            selectionList1: [],
+            page1: {
+                pageSize: 10,
+                currentPage: 1,
+                total: 0,
             },
-            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",
+            form: {},
+            query1: {},
+            data1: [],
+            option1: {
+                // card: true,
+                tip: false,
+                index: true,
+                // menu: false,
+                searchSize: "mini",
+                searchMenuSpan: 8,
+                height: 623,
+                cellBtn: false,
+                delBtnText: "结束派遣",
+                editBtnText: "更改派遣",
+                addTitle: "记录添加",
+                addBtnText: "记录添加",
+                // addBtn: false,
+                // menuWidth: 160,
+                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",
+                            },
+                        ],
+                    },
+
+                ],
             },
-            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: "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",
-              },
-            ],
-          },
-          {
-            label: "派遣地址",
-            prop: "dispatcheraddress",
-            labelWidth: 120,
-            rules: [
-              {
-                required: true,
-                message: "请输入派遣地址",
-                trigger: "click",
-              },
-            ],
-            // search: true,
-            // searchSpan: 4,
-            // overHidden: true
-          },
-        ],
-      },
-    };
-  },
-  created() {
-    if (this.userInfo.role_name == "保安公司管理员") {
-      console.log("保安公司管理员登入");
-      const deptColumn = this.findObject(this.option1.column, "deptId");
-      deptColumn.search = false;
-    } else {
-      const deptColumn = this.findObject(
-        this.option1.column,
-        "dispatcherUnitId"
-      );
-      deptColumn.search = false;
-    }
-  },
-  computed: {
-    // },
-    ids1() {
-      let ids1 = [];
-      this.selectionList1.forEach((ele) => {
-        ids1.push(ele.id);
-      });
-      return ids1.join(",");
+        };
     },
-    ...mapState({
-      userInfo: (state) => state.user.userInfo,
-    }),
-    deps() {
-      return this.form.deptId;
-    },
-  },
-
-  methods: {
-    handleChangeTABS(column) {
-      this.typeTABS = column;
-      if (column.prop == "tab1") {
-        this.loading1 = false;
-        // this.onLoad(this.page);
-      } else if (column.prop == "tab2") {
-        // this.loading = false;
-        console.log(document.getElementsByClassName("el-card__body")[0]);
-        this.onLoad1(this.page1); //第二个表格不会自动执行
-      }
-      // this.$message.success(JSON.stringify(column));
-    },
-
-    //派遣记录
-    sizeChange1(val) {
-      this.page1.currentPage = 1;
-      this.page1.pageSize = val;
-      // this.getData();
-      this.onLoad1(this.page1, this.query1);
-    },
-    currentChange1(val) {
-      this.page1.currentPage = val;
-      // this.getData();
-      this.onLoad1(this.page1, this.query1);
-    },
-    rowSave1(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.onLoad1(this.page1);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          done();
-        },
-        (error) => {
-          window.console.log(error);
-          loading();
+    created () {
+        if (this.userInfo.role_name == "保安公司管理员") {
+            console.log("保安公司管理员登入");
+            const deptColumn = this.findObject(this.option1.column, "deptId");
+            deptColumn.search = false;
+        } else {
+            const deptColumn = this.findObject(
+                this.option1.column,
+                "dispatcherUnitId"
+            );
+            deptColumn.search = false;
         }
-      );
-      // }
     },
-    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) {
-      // 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.onLoad1(this.page1);
-          this.$message({
-            type: "success",
-            message: "操作成功!",
-          });
-          done();
+    computed: {
+        // },
+        ids1 () {
+            let ids1 = [];
+            this.selectionList1.forEach((ele) => {
+                ids1.push(ele.id);
+            });
+            return ids1.join(",");
         },
-        (error) => {
-          window.console.log(error);
-          loading();
-        }
-      );
-    },
-    rowDel1(row) {
-      this.$confirm("确定结束当前派遣?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          return overDispatcher(row);
-        })
-        .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);
+        ...mapState({
+            userInfo: (state) => state.user.userInfo,
+        }),
+        deps () {
+            return this.form.deptId;
+        },
     },
 
-    // beforeOpen(done, type) {
-    //   var that = this;
-    //   if (["add", "edit", "view"].includes(type)) {
-    //     if (this.userInfo.role_name == "保安公司管理员") {
-    //       getListByDeptId(that.userInfo.dept_id).then((res) => {
-    //         const userColumn = that.findObject(this.option1.column, "userIds");
-    //         userColumn.dicData = res.data.data;
-    //       });
-    //     }
+    methods: {
+        handleChangeTABS (column) {
+            this.typeTABS = column;
+            if (column.prop == "tab1") {
+                this.loading1 = false;
+                // this.onLoad(this.page);
+            } else if (column.prop == "tab2") {
+                // this.loading = false;
+                console.log(document.getElementsByClassName("el-card__body")[0]);
+                this.onLoad1(this.page1); //第二个表格不会自动执行
+            }
+            // this.$message.success(JSON.stringify(column));
+        },
+
+        //派遣记录
+        sizeChange1 (val) {
+            this.page1.currentPage = 1;
+            this.page1.pageSize = val;
+            // this.getData();
+            this.onLoad1(this.page1, this.query1);
+        },
+        currentChange1 (val) {
+            this.page1.currentPage = val;
+            // this.getData();
+            this.onLoad1(this.page1, this.query1);
+        },
+        rowSave1 (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.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) {
+            // 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.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 overDispatcher(row);
+                })
+                .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);
+        },
+
+        // beforeOpen(done, type) {
+        //   var that = this;
+        //   if (["add", "edit", "view"].includes(type)) {
+        //     if (this.userInfo.role_name == "保安公司管理员") {
+        //       getListByDeptId(that.userInfo.dept_id).then((res) => {
+        //         const userColumn = that.findObject(this.option1.column, "userIds");
+        //         userColumn.dicData = res.data.data;
+        //       });
+        //     }
+        //   }
+        //   this.initFlag = true;
+        //   done();
+        // },
+
+        getStartTime () {
+            if (
+                this.$route.query.startTime != undefined &&
+                this.$route.query.startTime != null &&
+                this.$route.query.startTime != ""
+            ) {
+                return this.$route.query.startTime;
+            }
+            return "";
+        },
+        getEndTime () {
+            if (
+                this.$route.query.endTime != undefined &&
+                this.$route.query.endTime != null &&
+                this.$route.query.endTime != ""
+            ) {
+                return this.$route.query.endTime;
+            }
+            return "";
+        },
+        //
+        onLoad1 (page, params = {}) {
+            this.loading1 = true;
+            var values;
+            //默认查询已派遣的,派遣结束,未派遣的不显示
+            params["dispatch"] = 0;
+            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.initData(2);
+            } else {
+                this.initData(1);
+            }
+
+            getdata1(
+                page.currentPage,
+                page.pageSize,
+                // Object.assign(params, this.query)
+                values
+            ).then((res) => {
+                const data = res.data.data;
+                this.page1.total = data.total;
+                this.data1 = data.records;
+                this.loading1 = false;
+                // this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
+                console.log(this.form, 111111);
+            });
+        },
+        initData (type) {
+            var that = this;
+            if (type == 1) {
+                getDispatcherUnitByDeptId(null).then((res) => {
+                    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"
+                    );
+                    dispatcherUnitIdColumn.dicData = res.data.data;
+                });
+                getListByDeptId(that.userInfo.dept_id, 1).then((res) => {
+                    const userIdsColumn = that.findObject(this.option1.column, "userIds");
+                    userIdsColumn.dicData = res.data.data;
+                });
+            }
+        },
+    },
+    //  watch: {
+    //   // "form.deptId"() {
+    //   //   this.initData();
+    //   // }
+    //   deps(){
+    //     console.log(this.deps,5646646)
     //   }
-    //   this.initFlag = true;
-    //   done();
     // },
-
-    getStartTime() {
-      if (
-        this.$route.query.startTime != undefined &&
-        this.$route.query.startTime != null &&
-        this.$route.query.startTime != ""
-      ) {
-        return this.$route.query.startTime;
-      }
-      return "";
+    mounted () {
+        this.onLoad1(this.page1, this.query1);
     },
-    getEndTime() {
-      if (
-        this.$route.query.endTime != undefined &&
-        this.$route.query.endTime != null &&
-        this.$route.query.endTime != ""
-      ) {
-        return this.$route.query.endTime;
-      }
-      return "";
-    },
-    //
-    onLoad1(page, params = {}) {
-      this.loading1 = true;
-      var values;
-      //默认查询已派遣的,派遣结束,未派遣的不显示
-      params["dispatch"] = 0;
-      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.initData(2);
-      } else {
-        this.initData(1);
-      }
-
-      getdata1(
-        page.currentPage,
-        page.pageSize,
-        // Object.assign(params, this.query)
-        values
-      ).then((res) => {
-        const data = res.data.data;
-        this.page1.total = data.total;
-        this.data1 = data.records;
-        this.loading1 = false;
-        // this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
-        console.log(this.form, 111111);
-      });
-    },
-    initData(type) {
-      var that = this;
-      if (type == 1) {
-        getDispatcherUnitByDeptId(null).then((res) => {
-          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"
-          );
-          dispatcherUnitIdColumn.dicData = res.data.data;
-        });
-        getListByDeptId(that.userInfo.dept_id,1).then((res) => {
-          const userIdsColumn = that.findObject(this.option1.column, "userIds");
-          userIdsColumn.dicData = res.data.data;
-        });
-      }
-    },
-  },
-  //  watch: {
-  //   // "form.deptId"() {
-  //   //   this.initData();
-  //   // }
-  //   deps(){
-  //     console.log(this.deps,5646646)
-  //   }
-  // },
-  mounted() {
-    this.onLoad1(this.page1, this.query1);
-  },
 };
 </script>
 
 <style lang="scss" scoped>
 .dispatch {
-  width: 100%;
-  height: 100%;
-  //   border: 1px solid #000;
-  box-sizing: border-box;
+    width: 100%;
+    height: 100%;
+    //   border: 1px solid #000;
+    box-sizing: border-box;
 }
 .el-collapse-item {
-  padding-top: 15px !important;
+    padding-top: 15px !important;
 }
-</style>
\ No newline at end of file
+</style>

--
Gitblit v1.9.3