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

shuishen

2021-11-12 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906

 src/views/dispatch/dispatch.vue

@@ -95,7 +95,7 @@
      <!-- <span v-else-if="typeTABS.prop === 'tab3'">选项卡内容3</span> -->
    </div>
  </basic-container>
</template> 
</template>

<script>
import {
@@ -112,6 +112,15 @@
import { mapState } from "vuex";
export default {
  data() {
    var phones = (rule, value, callback) => {
      window.yanzhengphons =
        /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/;
      if (!yanzhengphons.test(value)) {
        callback(new Error("请输入正确电话"));
      } else {
        callback();
      }
    };
    return {
      typeTABS: {}, //标签页
      deptId: "",
@@ -218,15 +227,21 @@
            searchSpan: 4,
            width: 210,
            // span: 12,
            labelWidth: 118,
            labelWidth: 138,
            rules: [
              {
                required: true,
                message: "请输入名称",
                trigger: "click",
              },
            ],
          },
          {
            label: "保安公司",
            prop: "deptId",
            type: "tree",
            overHidden: true,
            dicUrl:
              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
            dicUrl: "",
            props: {
              label: "title",
              value: "id",
@@ -243,7 +258,7 @@
                trigger: "click",
              },
            ],
            labelWidth: 118,
            labelWidth: 138,
            width: 230,
            searchLabelWidth: 80,
            search: true,
@@ -261,7 +276,7 @@
            searchSpan: 4,
            overHidden: true,
            // span: 12,
            labelWidth: 118,
            labelWidth: 138,
          },
          {
            label: "合同生效时间",
@@ -294,7 +309,8 @@
            search: true,
            searchSpan: 4,
            overHidden: true,
            labelWidth: 118,
            labelWidth: 138,
            parent:false,
            type: "tree",
            dicUrl: "/api/jurisdiction/lazy-tree",
            props: {
@@ -320,7 +336,7 @@
            editDisplay: false,
            viewDisplay: false,
            overHidden: true,
            labelWidth: 118,
            labelWidth: 138,
            type: "tree",
            dicUrl: "/api/jurisdiction/lazy-tree",
            props: {
@@ -340,46 +356,105 @@
          // {
          //   label: " 派遣人数",
          //   prop: "num",
          //   labelWidth: 118,
          //   labelWidth: 138,
          // },
          // {
          //   label: "合同生效时间",
          //   prop: "releaseTimeRange",
          //   type: "date",
          //   format: "yyyy-MM-dd",
          //   valueFormat: "yyyy-MM-dd",
          //   searchValue: [this.getStartTime(), this.getEndTime()],
          //   // searchRange: true,
          //   searchSpan: 5,
          //   searchLabelWidth: 110,
          //   hide: true,
          //   value: [this.getStartTime(), this.getEndTime()],
          //   // addDisplay: false,
          //   // editDisplay: false,
          //   // viewDisplay: false,
          //   range: true,
          //   rules: [
          //     {
          //       required: true,
          //       message: "请输入时间",
          //       trigger: "blur",
          //     },
          //   ],
          // },
          {
            label: "合同开始时间",
            prop: "startTime",
            labelWidth: 118,
            labelWidth: 138,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            // search: true,
            rules: [
              {
                required: true,
                message: "请选择开始时间",
                trigger: "click",
              },
            ],
            // searchSpan: 4,
            // overHidden: true
          },
          {
            label: "合同结束时间",
            prop: "endTime",
            labelWidth: 118,
            labelWidth: 138,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            // search: true,
            rules: [
              {
                required: true,
                message: "请选择结束时间",
                trigger: "click",
              },
            ],
            // searchSpan: 4,
            // overHidden: true
          },
          {
            label: " 负责人",
            prop: "linkman",
            labelWidth: 118,
            labelWidth: 138,
            rules: [
              {
                required: true,
                message: "请输入负责人",
                trigger: "click",
              },
            ],
          },
          {
            label: "负责人联系方式",
            prop: "phone",
            labelWidth: 118,
            labelWidth: 138,
            width: 110,
            rules: [
              {
                required: true,
                message: "请输入联系方式",
                trigger: "click",
              },
              {
                validator: phones,
                trigger: ["change", "blur"],
              },
            ],
          },
        ],
      },

      useifid: 266,
    };
  },
  created() {
    var that = this;
    if (this.userInfo.role_name == "保安公司管理员") {
      const deptColumn = this.findObject(this.option.column, "deptId");
      deptColumn.search = false;
@@ -387,6 +462,16 @@
      deptColumn.editDisplay = false;
      deptColumn.viewDisplay = false;
      deptColumn.hide = true;
      this.useifid = this.userInfo.dept_id;
    }
    //公安局进入
    if (this.userInfo.role_name == "公安管理员") {
      that.option.column[1].dicUrl =
        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
        that.userInfo.jurisdiction;
    } else {
      that.option.column[1].dicUrl =
        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
    }
  },
  computed: {
@@ -405,9 +490,9 @@
      });
      return ids1.join(",");
    },
        ...mapState({
    ...mapState({
      userInfo: (state) => state.user.userInfo,
        })
    }),
  },
  methods: {
    handleChangeTABS(column) {
@@ -436,7 +521,10 @@
      //   this.$message.success("页码" + val);
    },
    rowSave(form, done, loading) {
      form["deptId"] = this.userInfo.dept_id;
      // form["deptId"] = this.userInfo.dept_id;
      if (this.useifid != 266) {
        form["deptId"] = this.useifid;
      }
      adddata(form).then(
        (res) => {
          this.onLoad(this.page);
@@ -464,6 +552,9 @@
      this.onLoad(this.page);
    },
    rowUpdate(row, index, done, loading) {
      if (this.useifid != 266) {
        row["deptId"] = this.useifid;
      }
      update(row).then(
        () => {
          this.onLoad(this.page);
@@ -525,7 +616,6 @@
      this.onLoad(this.page, this.query);
    },
    rowClick(row) {
      // console.log(row);
      window.localStorage.setItem("paqiandata", JSON.stringify(row));
      this.$router.push({
        path: "/dispatchChild",
@@ -575,16 +665,18 @@
          ...this.query,
        };
      }

      console.log(values);

      if (this.useifid != 266) {
        values["deptId"] = this.useifid;
      }
      if (this.userInfo.role_name == "公安管理员") {
        values["jurisdiction"] = that.userInfo.jurisdiction;
      }
      getdata(
        page.currentPage,
        page.pageSize,
        // 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;
@@ -634,4 +726,4 @@
.el-collapse-item {
  padding-top: 15px !important;
}
</style>
</style>