默认更改列表

wang-hao-jie

2022-08-25 2b506494d7c73a3978004bd0b32a5d0783b25efa

 src/views/your/area-manage/areaManage.vue

@@ -66,9 +66,16 @@
        <FormItem label="片区描述" prop="description">
          <Input v-model="areaForm.description" />
        </FormItem>
        <FormItem label="配送员" prop="userId">
          <Select v-model="areaForm.userId" filterable>
            <Option v-for="item in userList" :value="item.id">{{ item.nickname }}</Option>
        <!--<FormItem label="配送员" prop="userId">-->
          <!--<Select v-model="areaForm.userId" filterable>-->
            <!--<Option :value="0" :key="0" selected>请选择</Option>-->
            <!--<Option v-for="item in userList" :value="item.id">{{ item.nickname }}</Option>-->
          <!--</Select>-->
        <!--</FormItem>-->
        <FormItem label="配送车辆" prop="carId">
          <Select v-model="areaForm.carId" filterable>
            <Option value="" key="" selected>请选择</Option>
            <Option v-for="item in carList" :value="item.id">{{ item.carNo }}</Option>
          </Select>
        </FormItem>
      </Form>
@@ -84,39 +91,36 @@
        <Button @click="addEquipment" type="primary" icon="md-add">添加片区段</Button>
        <Button @click="init" icon="md-refresh">刷新</Button>
      </Row>
      <Table :loading="loading" border :columns="columns2" :data="data2" ref="table"
             sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">


      <Table :loading="loading" border :columns="columns2" :data="data2" ref="table" style="height: 400px" >
             sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect" >
      </Table>
    </Modal>05
    </Modal>
    <Modal :title="modalTitle3" v-model="customerVisible" :mask-closable="false" :width="1050">
      <Row class="operation" style="padding-bottom: 20px">
        <Button @click="addCustomer" type="primary" icon="md-add">添加</Button>
        <Button @click="init" icon="md-refresh">刷新</Button>
        <Input v-model="searchForm.name" suffix="ios-search" @on-change="getCustList" placeholder="输入商户名称搜索" clearable style="width: 250px"
        <Input v-model="searchForm.customerName" suffix="ios-search" @on-change="getCustList" placeholder="输入商户名称搜索" clearable style="width: 250px"
        />
      </Row>
      <Table :loading="loading" border :columns="columns3" :data="data3" ref="table"
             sortable="custom" @on-sort-change="changeSort" @on-selection-change="changeSelect">
      </Table>
      <Row type="flex" justify="end" class="page">
        <Page :current="searchForm.pageNumber" :total="total2"
        <Page :current.sync="searchForm.pageNumber" :total="total2"
                :page-size="searchForm.pageSize"
                @on-change="changePage"
                @on-change="changePage1"
                @on-page-size-change="changePageSize"
                :page-size-opts="[10, 20, 50]"
                size="small"
                show-total
                show-elevator
                show-sizer
        ></Page>
      </Row>
    </Modal>
    <Modal :title="modalTitle" v-model="addEquipmentVisible" :mask-closable="false" :width="500">
    <Modal :title="modalTitle" v-model="addEquipmentVisible" :mask-closable="false" :width="500" >
      <Form ref="areaSectionForm" :model="areaSectionForm" :label-width="80" :rules="areaSectionFormValidate">
        <FormItem label="片区名称" prop="code">
          <Input v-model="areaSectionForm.code" />
          <Input v-model="areaSectionForm.name" />
        </FormItem>

      </Form>
@@ -128,36 +132,50 @@
      </div>
    </Modal>
    <Modal :title="modalTitle" v-model="addCustomerVisible" :mask-closable="false" :width="550">
      <Form ref="customerForm" :model="customerForm" :label-width="80" :rules="areaSectionFormValidate">
      <Form ref="customerForm" :model="customerForm" :label-width="120" :rules="areaSectionFormValidate">
        <FormItem label="商户名称" prop="name">
          <Input v-model="customerForm.name" />
        </FormItem>
        <FormItem label="商户编号" prop="code">
          <Input v-model="customerForm.code" />
        </FormItem>
        <FormItem label="联系方式" prop="phone">
          <Input v-model="customerForm.phone" />
        </FormItem>
        <FormItem label="经度" prop="lng">
          <Input v-model="customerForm.lng" />
        </FormItem>
        <FormItem label="纬度" prop="lat">
          <Input v-model="customerForm.lat" />
        </FormItem>
        <Form-item label="上次配送日期" prop="lastTime">
          <Row>
            <Col>
              <Date-picker @on-change="change1" type="date" value="yyyy-MM-dd" placeholder="选择日期" v-model="customerForm.lastTime"></Date-picker>
            </Col>
          </Row>
        </Form-item>
        <!--<FormItem label="商户编号" prop="code">-->
          <!--<Input v-model="customerForm.code" />-->
        <!--</FormItem>-->

        <Row :gutter="0">
          <Col span="12">
            <FormItem label="经度" prop="lng">
              <Input v-model="customerForm.lng" />
            </FormItem>
          </Col>
          <Col span="12">
            <FormItem label="纬度" prop="lat">
              <Input v-model="customerForm.lat" />
            </FormItem>
          </Col>
        </Row>
        <Row :gutter="0">
          <!--<Col span="12">-->
            <!--<Form-item label="上次配送日期" prop="lastTime">-->
              <!--<Row>-->
                <!--<Col>-->
                  <!--<Date-picker @on-change="change1" type="date" value="yyyy-MM-dd" placeholder="选择日期" v-model="customerForm.lastTime"></Date-picker>-->
                <!--</Col>-->
              <!--</Row>-->
            <!--</Form-item>-->
          <!--</Col>-->
          <Col span="12">
            <FormItem label="联系方式" prop="phone">
              <Input v-model="customerForm.phone"/>
            </FormItem>
          </Col>
        </Row>

        <FormItem label="商户注册地址" prop="registeredAddress">
          <Input v-model="customerForm.registeredAddress" />
        </FormItem>
        <FormItem label="联系人" prop="linker">
          <Input v-model="customerForm.linker" />
        </FormItem>
        <FormItem label="零售许可证信息" prop="licence">
        <FormItem label="零售许可证信息" prop="licence" >
          <Input v-model="customerForm.licence" />
        </FormItem>
      </Form>
@@ -265,6 +283,7 @@
  addCar,
  getCarList,
  getUser,
  getDriver,
  addArea,
  deleteArea,
  getAreaSection,
@@ -303,6 +322,7 @@
      modalTitle: "",
      modalTitle2: "",
      modalTitle3: "",
      carList:[],
      searchForm: {
        // 搜索框初始化对象
        pageNumber: 1, // 当前页数
@@ -314,7 +334,6 @@
      areaForm: {
      },
      customerForm: {
        kstatus : 1
      },
      areaSectionForm: {
      },
@@ -348,10 +367,13 @@
          title: "片区描述",
          key: "description",
          width: 442,
          render: (h, params) => {
            return h("div",params.row.description=="undefined" ? '':params.row.description);
          }
        },
        {
          title: "配送人",
          key: "nickName",
          title: "配送车辆",
          key: "carNo",
          width: 200,
        },
        {
@@ -420,14 +442,13 @@
          align: "center",
        },
        {
          title: "分段编号或名称",
          key: "code",
          title: "分段名称",
          key: "name",
        },
        {
          title: "操作",
          key: "action",
          align: "center",

          render: (h, params) => {
            return h("div", [
              h(
@@ -491,56 +512,46 @@
        {
          title: "商户名称",
          key: "name",
          width: 100,
          tooltip:true,
          width: 200,
        },
        {
          title: "商户编号",
          key: "code",
          minWidth: 120,
          key: "licence",
          minWidth: 140,
        },
        {
          title: "联系方式",
          key: "phone",
          width: 140,
          width: 135,
        },
        {
          title: "状态",
          key: "status",
          width:100,
          sortable: true,
          render: (h, params) => {
            let re = "";
            if (params.row.status == 0) {
              return h("div", [
                h("Badge", {
                  props: {
                    status: "success",
                    text: "正常",
                  },
                }),
              ]);
            } else if (params.row.status == 1) {
              return h("div", [
                h("Badge", {
                  props: {
                    status: "error",
                    text: "不活跃",
                  },
                }),
              ]);
            }
          },
        },
        {
          title: "上次配送日期",
          key: "lastTime",
          width: 150,
        },
        {
          title: "商户注册地址",
          key: "registeredAddress",
          width: 180,
        },
        // {
        //   title: "状态",
        //   key: "status",
        //   width:100,
        //   render: (h, params) => {
        //     let re = "";
        //     if (params.row.status == 0) {
        //       return h("div", [
        //         h("Badge", {
        //           props: {
        //             status: "success",
        //             text: "正常",
        //           },
        //         }),
        //       ]);
        //     } else if (params.row.status == 1) {
        //       return h("div", [
        //         h("Badge", {
        //           props: {
        //             status: "error",
        //             text: "不活跃",
        //           },
        //         }),
        //       ]);
        //     }
        //   },
        // },
        {
          title: "联系人",
          key: "linker",
@@ -588,7 +599,9 @@
      data2: [],
      data3: [],
      total: 0,

      type: {
        type : 1
      },
      total2: 0,
      permData: [],
      editRolePermId: "",
@@ -661,6 +674,10 @@
      this.getDataList();
      this.clearSelectAll();
    },
    changePage1(v) {
      this.searchForm.pageNumber = v;
      this.getCustomerList(this.areaSectionId);
    },
    changePageSize(v) {
      this.searchForm.pageSize = v;
      this.getDataList();
@@ -685,6 +702,7 @@
    },
    getCustList() {
      this.loading = true;
      this.searchForm.pageNumber=1;
      getCustomer(this.searchForm).then((res) => {
        this.loading = false;
        if (res.success) {
@@ -692,11 +710,19 @@
          this.total2 = res.result.total;
        }
      });
      this.$emit('update:current',this.searchForm.pageNumber);
    },
    getAllUser(){
      getUser().then((res)=>{
      getDriver({type:1}).then((res)=>{
        if (res.success){
          this.userList=res.result;
        }
      });
    },
    getAllCar(){
      getAll().then((res)=>{
        if (res.success){
          this.carList=res.result;
        }
      });
    },
@@ -749,6 +775,15 @@
      this.roleModalVisible = false;
    },
    submitArea() {
      if(this.areaForm.userId==undefined){
        this.areaForm.userId=0;
      }
      if(this.areaForm.description==undefined){
        this.areaForm.description="";
      }
      if(this.areaForm.carId==undefined){
        this.areaForm.carId="";
      }
      this.$refs.areaForm.validate((valid) => {
        if (valid) {
          if (this.modalType == 0) {
@@ -760,16 +795,19 @@
                this.$Message.success("操作成功");
                this.getDataList();
                this.roleModalVisible = false;
                this.areaForm={};
              }
            });
          } else {
            this.submitLoading = true;
            this.$delete(this.areaForm,'children')
            addArea(this.areaForm).then((res) => {
              this.submitLoading = false;
              if (res.success) {
                this.$Message.success("操作成功");
                this.getDataList();
                this.roleModalVisible = false;
                this.areaForm={};
              }
            });
          }
@@ -778,14 +816,16 @@
    },
    submitCustomer() {
      this.$refs.areaSectionForm.validate((valid) => {
        this.customerForm.lastTime = this.lastTime;
        //this.customerForm.lastTime = this.lastTime;
        this.customerForm.areaSectionId = this.areaSectionId;
        this.customerForm.areaId = this.areaId;
        this.customerForm.kstatus = 1;

        if (valid) {
            this.$delete(this.customerForm,'receives')
          if (this.modalType == 0) {
            // 添加
            this.submitLoading = true;
            this.customerForm.kstatus = 0;
            addCustomer(this.customerForm).then((res) => {
              this.submitLoading = false;
              if (res.success) {
@@ -871,9 +911,11 @@
      this.$refs.areaForm.resetFields();
      delete this.areaForm.id;
      this.customerVisible = true;
      console.log(this.areaSectionId);
    },
    addCar() {
      this.getAllUser();
      //this.getAllUser();
      this.getAllCar();
      this.modalType = 0;
      this.modalTitle = "添加";
      this.$refs.areaForm.resetFields();
@@ -897,7 +939,8 @@
      this.addCustomerVisible = true;
    },
    edit(v) {
      this.getAllUser();
      //this.getAllUser();
      this.getAllCar()
      this.modalType = 1;
      this.modalTitle = "编辑";
      this.$refs.areaForm.resetFields();
@@ -910,6 +953,7 @@
      let str = JSON.stringify(v);
      let roleInfo = JSON.parse(str);
      this.areaForm = roleInfo;
      console.log(this.areaForm);
      this.roleModalVisible = true;
    },
    editEquipment(v) {