客户服务单联调

yangfeng

2023-08-08 37e436a97c6753b38f0c462068122b32a8612a6a

客户服务单联调

 src/api/common/other.js

New file
@@ -0,0 +1,41 @@
import request from "@/common/untils/request.js"

// 获取故障类别
export function getFaultTypeList() {
  return request({
    url: "/api/faultType/list",
    method: "get"
  })
}

// 获取服务方式
export function getServiceTypeList() {
  return request({
    url: "/api/serviceType/list",
    method: "get"
  })
}

// 获取严重程度
export function getSeverityList() {
  return request({
    url: "/api/severity/list",
    method: "get"
  })
}

// 获取优先级别
export function getPriorityLevelList() {
  return request({
    url: "/api/priorityLevel/list",
    method: "get"
  })
}

// 花费时间列表
export function getTimeSpentList() {
  return request({
    url: "/api/timeSpent/list",
    method: "get"
  })
}

 src/api/serviceManage/clientServiceOrder.js

New file
@@ -0,0 +1,32 @@
import request from "@/common/untils/request.js"

// 服务单列表
export function getServiceOrderList() {
  return request({
    url: "/api/serviceOrder/list",
    method: "get"
  })
}
// 添加服务单
export function getAddServiceOrder(data) {
  return request({
    url: "/api/serviceOrder/add",
    method: "post",
    data
  })
}
// 删除服务单
export function getDelServiceOrder(data) {
  return request({
    url: "/api/serviceOrder/delete/" + data.id,
    method: "delete"
  })
}
// 更新服务单
export function getUpdateServiceOrder(data) {
  return request({
    url: "/api/serviceOrder/update",
    method: "put",
    data
  })
}

 src/api/serviceManage/orderManage.js

File was deleted

 src/common/const/commonStatus.js

New file
@@ -0,0 +1,9 @@
const status = {
  processStatus: [
    { id: 1, name: "未处理" },
    { id: 2, name: "处理中" },
    { id: 3, name: "等待回应" },
    { id: 4, name: "成功关闭" }
  ]
}
export default status

 src/store/modules/getClientName.js

@@ -3,6 +3,9 @@
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
import { getSalesLeadsList } from "@/api/client/salesLead"
import { getMasterOrderList } from "@/api/sales/masterOrder"
import { getServiceContractList } from "@/api/serviceManage/serviceContract"
import { getContractList } from "@/api/sales/contractManage"
import { getSalesDetailsList } from "@/api/sales/salesDetails"
import { Message } from "element-ui"

export default {
@@ -11,7 +14,10 @@
    contactNamelist: [], // 联系人
    saleChancelist: [], // 销售机会
    saleLeadlist: [], // 销售线索
    masterOrderList: [] // 销售总单
    masterOrderList: [], // 销售总单
    serviceContractList: [], // 服务合同
    getContractList: [], // 合同订单
    salesDetailsList: [] // 销售明细单
  },
  mutations: {
    clientNameList(state, payload) {
@@ -28,6 +34,15 @@
    },
    masterOrderList(state, payload) {
      state.masterOrderList = payload
    },
    serviceContractList(state, payload) {
      state.serviceContractList = payload
    },
    contractList(state, payload) {
      state.contractList = payload
    },
    salesDetailsList(state, payload) {
      state.salesDetailsList = payload
    }
  },
  actions: {
@@ -75,6 +90,33 @@
          Message.error(res.msg)
        }
      })
    },
    geServiceContract(context) {
      getServiceContractList().then((res) => {
        if (res.code == 200) {
          context.commit("serviceContractList", res.data.list)
        } else {
          Message.error(res.msg)
        }
      })
    },
    geContract(context) {
      getContractList().then((res) => {
        if (res.code == 200) {
          context.commit("contractList", res.data.list)
        } else {
          Message.error(res.msg)
        }
      })
    },
    geSalesDetails(context) {
      getSalesDetailsList().then((res) => {
        if (res.code == 200) {
          context.commit("salesDetailsList", res.data.list)
        } else {
          Message.error(res.msg)
        }
      })
    }
  }
}

 src/views/other/commonDialog/SelectCommonDialog.vue

@@ -32,9 +32,8 @@
</template>

<script>
import { getMasterOrderList } from "@/api/sales/masterOrder"
export default {
  name: "EditSelChanceDialog",
  name: "EditSelCommonDialog",
  props: {
    editCommonConfig: {
      type: Object,
@@ -42,7 +41,7 @@
        return {
          editVisible: false,
          title: "",
          infomation: {}
          tableInfomation: []
        }
      }
    }
@@ -54,7 +53,7 @@
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      queryInput: "",
      select: "1",
      select: "全部字段",
      tableData: [],
      searchSelOptions: [],
      loading: false,
@@ -63,62 +62,60 @@
    }
  },
  created() {
    this.getData()
    this.setTable()
  },
  methods: {
    setTable() {
      if (this.editConfig.title === "销售总单") {
        this.tableList = {
          tableInfomation: [],
          tableInfomation: this.editConfig.tableInfomation,
          tableColumn: [
            { label: "单据编号", prop: "number", isClick: true }, // 单据编号
            { label: "负责人", prop: "member_id" } // 负责人
          ]
        }
      } else if (this.editConfig.title === "服务合同") {
        this.tableList = {
          tableInfomation: this.editConfig.tableInfomation,
          tableColumn: [
            { label: "客户名称", prop: "clientId" }, // 客户名称
            { label: "服务合同编号", prop: "number", isClick: true }, // 服务合同编号
            { label: "负责人", prop: "memberId" }, // 负责人
            { label: "合计", prop: "total" }, // 合计
            { label: "签约日期", prop: "signTime", isTime: true }, // 签约日期
            { label: "合同状态", prop: "serviceContractStatusId" } // 合同状态
          ]
        }
      } else if (this.editConfig.title === "销售明细单") {
        this.tableList = {
          tableInfomation: this.editConfig.tableInfomation,
          tableColumn: [
            { label: "客户名称", prop: "clientId" }, // 客户名称
            { label: "订单编号", prop: "number", isClick: true }, // 订单编号
            { label: "签约日期", prop: "signTime" }, // 签约日期
            { label: "销售负责人", prop: "memberId" }, // 销售负责人
            { label: "合计", prop: "tptal" } // 合计
          ]
        }
      }

      this.commonOptions = [{ value: 1, name: "全部字段" }]
      this.commonOptions = [{ id: 1, name: "全部字段" }]
      for (let i = 1; i < this.tableList.tableColumn.length; i++) {
        const label = this.tableList.tableColumn[i].label
        this.commonOptions.push({ value: (i + 1).toString(), name: label })
        this.commonOptions.push({ id: (i + 1).toString(), name: label })
      }
    },
    handleClose() {
      this.editConfig.editVisible = false
    },
    // 请求数据
    async getData() {
      this.loading = true
      await getMasterOrderList()
        .then((res) => {
          console.log(res)
          if (res.code === 200) {
            if (res.data.list && res.data.list.length > 0) {
              const list = res.data.list.map((item) => {
                return {
                  ...item
                }
              })
              this.tableList.tableInfomation = list.slice(0, 5) || []
            } else {
              this.tableList.tableInfomation = []
            }
          } else {
            this.tableList.tableInfomation = []
          }
          this.loading = false
        })
        .catch((err) => {
          console.log(err)
          this.tableData = []
          this.loading = false
        })
    },
    selNameClick(row) {
      this.editConfig.editVisible = false
      if (this.editConfig.title === "销售总单") {
        this.$emit("selClient", row, "master")
      } else if (this.editConfig.title === "服务合同") {
        this.$emit("selClient", row, "serviceContract")
      } else if (this.editConfig.title === "销售明细单") {
        this.$emit("selClient", row, "contract")
      }
    }
  }

 src/views/sales/subOrder/AddSubOrderDialog.vue

@@ -421,6 +421,7 @@
      } else if (value == "master") {
        this.editSelectMasterConfig.title = "销售总单"
        this.editSelectMasterConfig.editVisible = true
        this.editSelectMasterConfig.tableInfomation = [...this.masterOrderList]
      }
    },
    selClient(row, value) {

 src/views/service/clientServiceOrder/AddCientServiceOrderDialog.vue

@@ -28,52 +28,60 @@
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="querySearchAsync"
                      :fetch-suggestions="
                        (queryString, callback) => {
                          querySearchAsync(queryString, callback, 'client')
                        }
                      "
                      value-key="name"
                      @select="handleSelectClient"
                      @select="handleSelectClient('client', $event)"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick">
                    <div class="common-select-btn" @click="selClientClick('client')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient">
                    <div class="common-select-btn" @click="clearupClient('client')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="服务单编号" prop="number">
                  <el-input v-model="editConfig.infomation.number"></el-input>
                <el-form-item label="服务单编号" prop="serviceNumber">
                  <el-input v-model="editConfig.infomation.serviceNumber"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="服务合同" prop="name">
                <el-form-item label="服务合同">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="querySearchAsync"
                      value-key="name"
                      @select="handleSelectClient"
                      v-model="editConfig.infomation.service_number"
                      :fetch-suggestions="
                        (queryString, callback) => {
                          querySearchAsync(queryString, callback, 'serviceContract')
                        }
                      "
                      value-key="number"
                      @select="handleSelectClient('serviceContract', $event)"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick">
                    <div class="common-select-btn" @click="selClientClick('serviceContract')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient">
                    <div class="common-select-btn" @click="clearupClient('serviceContract')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="故障类别" prop="orderType">
                <el-form-item label="故障类别" prop="faultTypeId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.orderType"
                      v-model="editConfig.infomation.faultTypeId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                    >
                      <el-option v-for="item in orderTypeOptions" :key="item.id" :label="item.name" :value="item.id">
                      <el-option v-for="item in faultTypeOptions" :key="item.id" :label="item.name" :value="item.id">
                      </el-option>
                    </el-select>
                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
@@ -81,38 +89,47 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="主题" prop="contactId">
                  <el-input v-model="editConfig.infomation.contactId"></el-input>
                <el-form-item label="主题" prop="subject">
                  <el-input v-model="editConfig.infomation.subject"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="合同订单" prop="name">
                <el-form-item label="合同订单">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="querySearchAsync"
                      value-key="name"
                      @select="handleSelectClient"
                      v-model="editConfig.infomation.number"
                      :fetch-suggestions="
                        (queryString, callback) => {
                          querySearchAsync(queryString, callback, 'contract')
                        }
                      "
                      value-key="number"
                      @select="handleSelectClient('contract', $event)"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick">
                    <div class="common-select-btn" @click="selClientClick('contract')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient">
                    <div class="common-select-btn" @click="clearupClient('contract')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="产品类别" prop="orderType">
                <el-form-item label="产品类别" prop="productCategory">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.orderType"
                      v-model="editConfig.infomation.productCategory"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                    >
                      <el-option v-for="item in orderTypeOptions" :key="item.id" :label="item.name" :value="item.id">
                      <el-option
                        v-for="item in productCategoryOptions"
                        :key="item.id"
                        :label="item.name"
                        :value="item.id"
                      >
                      </el-option>
                    </el-select>
                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
@@ -120,33 +137,38 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="产品名称" prop="name">
                <el-form-item label="产品名称" prop="product_name">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="querySearchAsync"
                      v-model="editConfig.infomation.product_name"
                      :fetch-suggestions="
                        (queryString, callback) => {
                          querySearchAsync(queryString, callback, 'productName')
                        }
                      "
                      value-key="name"
                      @select="handleSelectClient"
                      @select="handleSelectClient('productName', $event)"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick">
                    <div class="common-select-btn" @click="selClientClick('productName')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient">
                    <div class="common-select-btn" @click="clearupClient('productName')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="服务方式" prop="orderType">
                <el-form-item label="服务方式" prop="serviceTypeId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.orderType"
                      v-model="editConfig.infomation.serviceTypeId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                      @focus="getServiceTypeList"
                    >
                      <el-option v-for="item in orderTypeOptions" :key="item.id" :label="item.name" :value="item.id">
                      <el-option v-for="item in serviceTypeOptions" :key="item.id" :label="item.name" :value="item.id">
                      </el-option>
                    </el-select>
                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
@@ -154,15 +176,20 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="服务人员" prop="orderType">
                <el-form-item label="服务人员" prop="serviceManId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.orderType"
                      v-model="editConfig.infomation.serviceManId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                    >
                      <el-option v-for="item in orderTypeOptions" :key="item.id" :label="item.name" :value="item.id">
                      <el-option
                        v-for="item in serviceManOptions"
                        :key="item.id"
                        :label="item.username"
                        :value="item.id"
                      >
                      </el-option>
                    </el-select>
                  </div>
@@ -172,30 +199,35 @@
                <el-form-item label="联系人姓名" prop="client_name">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="querySearchAsync"
                      v-model="editConfig.infomation.contact_name"
                      :fetch-suggestions="
                        (queryString, callback) => {
                          querySearchAsync(queryString, callback, 'contact')
                        }
                      "
                      value-key="name"
                      @select="handleSelectClient"
                      @select="handleSelectClient('contact', $event)"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick">
                    <div class="common-select-btn" @click="selClientClick('contact')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient">
                    <div class="common-select-btn" @click="clearupClient('contact')">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="严重程度" prop="reportSourceId">
                <el-form-item label="严重程度" prop="severity">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.reportSourceId"
                      v-model="editConfig.infomation.severity"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                      @focus="getSeverityList"
                    >
                      <el-option v-for="item in reportSourceOptions" :key="item.id" :label="item.name" :value="item.id">
                      <el-option v-for="item in severityOptions" :key="item.id" :label="item.name" :value="item.id">
                      </el-option>
                    </el-select>
                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
@@ -203,25 +235,31 @@
                </el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="上门地址" prop="problemDescription">
                <el-form-item label="上门地址" prop="address">
                  <el-input
                    type="textarea"
                    :autosize="{ minRows: 2, maxRows: 4 }"
                    placeholder="请输入内容"
                    v-model="editConfig.infomation.problemDescription"
                    v-model="editConfig.infomation.address"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="优先级别" prop="reportSourceId">
                <el-form-item label="优先级别" prop="priorityLevelId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.reportSourceId"
                      v-model="editConfig.infomation.priorityLevelId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                      @focus="getPriorityLevelList"
                    >
                      <el-option v-for="item in reportSourceOptions" :key="item.id" :label="item.name" :value="item.id">
                      <el-option
                        v-for="item in priorityLevelOptions"
                        :key="item.id"
                        :label="item.name"
                        :value="item.id"
                      >
                      </el-option>
                    </el-select>
                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
@@ -229,8 +267,12 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="预约上门时间" prop="startTime">
                  <el-date-picker v-model="editConfig.infomation.startTime" type="datetime" placeholder="选择日期">
                <el-form-item label="预约上门时间" prop="appointmentTime">
                  <el-date-picker
                    v-model="editConfig.infomation.appointmentTime"
                    type="datetime"
                    placeholder="选择日期"
                  >
                  </el-date-picker>
                </el-form-item>
              </el-col>
@@ -238,16 +280,20 @@
                <el-form-item label="销售机会" prop="client_name">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="querySearchAsync"
                      v-model="editConfig.infomation.sale_chance_name"
                      :fetch-suggestions="
                        (queryString, callback) => {
                          querySearchAsync(queryString, callback, 'chance')
                        }
                      "
                      value-key="name"
                      @select="handleSelectClient"
                      @select="handleSelectClient('chance', $event)"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    <div class="common-select-btn" @click="selClientClick('chance')">
                      <i class="el-icon-circle-plus-outline"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    <div class="common-select-btn" @click="clearupClient('chance')">
                      <i class="el-icon-edit-outline"></i>
                    </div>
                  </div>
                </el-form-item>
@@ -259,37 +305,15 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="希望处理时间" prop="startTime">
                  <el-date-picker v-model="editConfig.infomation.startTime" type="datetime" placeholder="选择日期">
                  </el-date-picker>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="实际处理时间" prop="startTime">
                  <el-date-picker v-model="editConfig.infomation.startTime" type="datetime" placeholder="选择日期">
                  </el-date-picker>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="交通费" prop="reportSourceId">
                  <el-input v-model="editConfig.infomation.problemDescription"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="收费金额" prop="reportSourceId">
                  <el-input v-model="editConfig.infomation.problemDescription"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="花费时间" prop="reportSourceId">
                <el-form-item label="处理状态" prop="status">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.reportSourceId"
                      v-model="editConfig.infomation.status"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                    >
                      <el-option v-for="item in reportSourceOptions" :key="item.id" :label="item.name" :value="item.id">
                      <el-option v-for="item in statusOptions" :key="item.id" :label="item.name" :value="item.id">
                      </el-option>
                    </el-select>
                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
@@ -303,24 +327,48 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="常见问题" prop="problemDescription">
                  <el-input v-model="editConfig.infomation.problemDescription"></el-input>
                <el-form-item label="希望处理时间" prop="expectTime">
                  <el-date-picker v-model="editConfig.infomation.expectTime" type="datetime" placeholder="选择时间">
                  </el-date-picker>
                </el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="问题描述" prop="problemDescription">
                  <el-input
                    type="textarea"
                    :autosize="{ minRows: 2, maxRows: 4 }"
                    placeholder="请输入内容"
                    v-model="editConfig.infomation.problemDescription"
                  ></el-input>
              <el-col :span="12">
                <el-form-item label="实际处理时间" prop="realTime">
                  <el-date-picker v-model="editConfig.infomation.startTime" type="realTime" placeholder="选择时间">
                  </el-date-picker>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="交通费" prop="carFare">
                  <el-input v-model="editConfig.infomation.carFare"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="收费金额" prop="chargeAmount">
                  <el-input v-model="editConfig.infomation.chargeAmount"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="花费时间" prop="timeSpentId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.timeSpentId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                      @focus="getTimeSpentList"
                    >
                      <el-option v-for="item in timeSpentOptions" :key="item.id" :label="item.name" :value="item.id">
                      </el-option>
                    </el-select>
                    <div class="common-select-btn"><i class="el-icon-setting"></i></div>
                  </div>
                </el-form-item>
              </el-col>
            </el-row>
          </div>
          <!-- 定位地址 -->
          <div class="basic-info-title">定位地址</div>
          <!-- <div class="basic-info-title">定位地址</div>
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
@@ -334,23 +382,23 @@
                </el-form-item>
              </el-col>
            </el-row>
          </div>
          </div> -->
          <!-- 问题描述 -->
          <div class="basic-info-title">问题描述</div>
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="常见问题" prop="problemDescription">
                  <el-input v-model="editConfig.infomation.problemDescription"></el-input>
                <el-form-item label="常见问题" prop="faqId">
                  <el-input v-model="editConfig.infomation.faqId"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="问题描述" prop="problemDescription">
                <el-form-item label="问题描述" prop="problemDesc">
                  <el-input
                    type="textarea"
                    :autosize="{ minRows: 2, maxRows: 4 }"
                    placeholder="请输入内容"
                    v-model="editConfig.infomation.problemDescription"
                    v-model="editConfig.infomation.problemDesc"
                  ></el-input>
                </el-form-item>
              </el-col>
@@ -361,22 +409,22 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
                <el-form-item label="解决方法" prop="problemDescription">
                <el-form-item label="解决方法" prop="solution">
                  <el-input
                    type="textarea"
                    :autosize="{ minRows: 2, maxRows: 4 }"
                    placeholder="请输入内容"
                    v-model="editConfig.infomation.problemDescription"
                    v-model="editConfig.infomation.solution"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="24">
                <el-form-item label="内部备注" prop="problemDescription">
                <el-form-item label="内部备注" prop="solutionRemark">
                  <el-input
                    type="textarea"
                    :autosize="{ minRows: 2, maxRows: 4 }"
                    placeholder="请输入内容"
                    v-model="editConfig.infomation.problemDescription"
                    v-model="editConfig.infomation.solutionRemark"
                  ></el-input>
                </el-form-item>
              </el-col>
@@ -387,19 +435,19 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
                <el-form-item label="备注" prop="problemDescription">
                <el-form-item label="备注" prop="remark">
                  <el-input
                    type="textarea"
                    :autosize="{ minRows: 2, maxRows: 4 }"
                    placeholder="请输入内容"
                    v-model="editConfig.infomation.problemDescription"
                    v-model="editConfig.infomation.remark"
                  ></el-input>
                </el-form-item>
              </el-col>
            </el-row>
          </div>
          <!-- 附件信息 -->
          <div class="basic-info-title">附件信息</div>
          <!-- <div class="basic-info-title">附件信息</div>
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
@@ -424,7 +472,7 @@
                </el-form-item>
              </el-col>
            </el-row>
          </div>
          </div> -->
          <!-- 客户服务单历史记录 -->
          <div v-if="editConfig.title === '编辑'" class="basic-info">
            <div class="basic-info-label" @click="expandClick('record')">
@@ -472,15 +520,45 @@
        :edit-common-config="editSelectClientConfig"
        @selClient="selClient"
      />
      <!-- 选择服务合同 -->
      <SelectCommonDialog
        v-if="editSelCommonConfig.editVisible"
        :edit-common-config="editSelCommonConfig"
        @selClient="selClient"
      />
      <!-- 选择联系人 -->
      <SelectContactDialog
        v-if="editSelectContactConfig.editVisible"
        :edit-common-config="editSelectContactConfig"
        @selClient="selClient"
      />
      <!-- 选择销售机会 -->
      <SelectChanceDialog
        v-if="editSelectChanceConfig.editVisible"
        :edit-common-config="editSelectChanceConfig"
        @selClient="selClient"
      />
    </el-dialog>
  </div>
</template>

<script>
import { getAllData } from "@/api/client/client"
import { getAddOrderManage, getUpdateOrderManage } from "@/api/serviceManage/orderManage"
import { getAddServiceOrder, getUpdateServiceOrder } from "@/api/serviceManage/clientServiceOrder"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import SelectContactDialog from "@/views/other/commonDialog/SelectContactDialog"
import SelectChanceDialog from "@/views/other/commonDialog/SelectChanceDialog"
import {
  getFaultTypeList,
  getServiceTypeList,
  getSeverityList,
  getPriorityLevelList,
  getTimeSpentList
} from "@/api/common/other"
import Status from "@/common/const/commonStatus"

export default {
  name: "AddClientServiceOrderDialog",
  mixins: [pageMixin],
@@ -496,13 +574,22 @@
      }
    }
  },
  components: { SelectClientDialog },
  components: { SelectClientDialog, SelectCommonDialog, SelectContactDialog, SelectChanceDialog },
  computed: {
    clientList() {
      return this.$store.state.getClientName.clientList
    },
    searchCommonHeight() {
      return this.$refs.searchCommonView.offsetHeight
    serviceContractList() {
      return this.$store.state.getClientName.serviceContractList
    },
    salesDetailsList() {
      return this.$store.state.getClientName.salesDetailsList
    },
    contactNamelist() {
      return this.$store.state.getClientName.contactNamelist
    },
    saleChancelist() {
      return this.$store.state.getClientName.saleChancelist
    }
  },
  data() {
@@ -510,18 +597,26 @@
      dialogWidth: "80%",
      editConfig: this.editCommonConfig,
      rules: {
        clientId: [{ required: true, message: "请输入客户名称", trigger: "blur" }],
        number: [{ required: true, message: "请输入工单编号", trigger: "blur" }],
        orderType: [{ required: true, message: "请选择", trigger: "change" }],
        problemDescription: [{ required: true, message: "请输入问题描述", trigger: "blur" }]
        serviceNumber: [{ required: true, message: "请输入服务单编号", trigger: "blur" }],
        faultTypeId: [{ required: true, message: "请选择故障类别", trigger: "change" }],
        subject: [{ required: true, message: "请输入主题", trigger: "blur" }],
        productCategory: [{ required: true, message: "请选择产品类别", trigger: "change" }],
        serviceManId: [{ required: true, message: "请选择产品类别", trigger: "change" }],
        status: [{ required: true, message: "请选择故障类别", trigger: "change" }],
        problemDesc: [{ required: true, message: "请输入问题描述", trigger: "blur" }]
      },
      orderTypeOptions: [{ id: 1, name: "类型1" }], // 工单类型
      reportSourceOptions: [], // 报修来源
      // sourceSheetOptions: [
      //   { value: "1", label: "销售明细单" },
      //   { value: "2", label: "服务合同" }
      // ],
      approvalWorkflowOptions: [], // 审批流程
      faultTypeOptions: [{ id: 1, name: "服务回访" }], // 故障类别
      productCategoryOptions: [
        { id: 1, name: "ERP迷你版" },
        { id: 2, name: "ERP专业版-财务模块" }
      ], // 产品类别
      productNameList: [], // 产品名称
      serviceTypeOptions: [], // 服务方式
      serviceManOptions: [], // 服务人员
      severityOptions: [], // 严重程度
      priorityLevelOptions: [], // 优先级别
      statusOptions: Status.processStatus, // 处理状态
      timeSpentOptions: [], // 花费时间
      editSelectClientConfig: {
        editVisible: false,
        title: "",
@@ -540,7 +635,28 @@
        currPage: 1,
        pageSize: 5,
        totalCount: 0
      }
      },
      editSelCommonConfig: {
        editVisible: false,
        title: "",
        infomation: {}
      },
      editSelectContactConfig: {
        editVisible: false,
        title: "",
        infomation: {}
      },
      editSelectChanceConfig: {
        editVisible: false,
        title: "",
        infomation: {}
      },
      clientId: this.editCommonConfig.infomation.clientId,
      contactId: this.editCommonConfig.infomation.contactId,
      serviceContractId: this.editCommonConfig.infomation.contractId,
      contractId: this.editCommonConfig.infomation.orderId,
      productNameId: this.editCommonConfig.infomation.productId,
      saleChanceId: this.editCommonConfig.infomation.saleChanceId
    }
  },
  created() {
@@ -567,7 +683,7 @@
      getAllData()
        .then((res) => {
          this.memberOptions = res.data.member
          this.orderTypeOptions = res.data.orderType
          this.serviceManOptions = res.data.member
          this.reportSourceOptions = res.data.reportSource
        })
        .catch((err) => {
@@ -582,7 +698,7 @@
          const params = this.saveParams()
          console.log(params)
          if (this.editConfig.title === "新建") {
            getAddOrderManage(params)
            getAddServiceOrder(params)
              .then((res) => {
                console.log(res)
                this.editConfig.visible = false
@@ -598,7 +714,7 @@
                console.log(err)
              })
          } else {
            getUpdateOrderManage(params)
            getUpdateServiceOrder(params)
              .then((res) => {
                console.log(res)
                this.editConfig.visible = false
@@ -623,48 +739,151 @@
    saveParams() {
      let data = this.editConfig.infomation
      let params = {
        id: this.editConfig.title === "新建" ? 0 : data.id,
        clientId: parseInt(data.clientId) || 0,
        contactId: data.contactId || 0,
        file: data.file || "",
        name: data.name || "",
        number: data.number || "",
        orderType: data.orderType || 0,
        problemDescription: data.problemDescription || "",
        reportSourceId: data.reportSourceId || 0,
        sourceSheet: data.sourceSheet || 0
        address: data.address || "",
        appointmentTime: data.appointmentTime || "",
        carFare: data.carFare || 0,
        chargeAmount: data.chargeAmount || 0,
        clientId: this.clientId,
        contactId: this.contactId,
        contractId: this.serviceContractId,
        expectTime: data.expectTime || "",
        faqId: data.faqId || 0,
        faultTypeId: data.faultTypeId || 0,
        id: data.id || 0,
        orderId: this.contractId,
        priorityLevelId: data.priorityLevelId || 0,
        problemDesc: data.problemDesc || "",
        productId: this.productNameId,
        realTime: data.realTime || "",
        remark: data.remark || "",
        saleChanceId: this.saleChanceId,
        serviceManId: data.serviceManId || 0,
        serviceNumber: data.serviceNumber || "",
        serviceTypeId: data.serviceTypeId || 0,
        severity: data.severity || 0,
        solution: data.solution || "",
        solutionRemark: data.solutionRemark || "",
        status: data.status || 0,
        subject: data.subject || "",
        timeSpentId: data.timeSpentId || 0
      }
      return params
    },
    handleClose() {
      this.editConfig.visible = false
    },
    // 选择客户相关方法
    querySearchAsync(queryString, cb) {
      var restaurants = this.clientList
      var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
    // 选择用户相关方法
    querySearchAsync(queryString, cb, value) {
      this.$store.dispatch("geServiceContract")
      this.$store.dispatch("geSalesDetails")
      this.$store.dispatch("geContact")
      this.$store.dispatch("geChance")
      var restaurants = []
      if (value === "client") {
        restaurants = this.clientList
      } else if (value === "serviceContract") {
        restaurants = this.serviceContractList
      } else if (value === "contract") {
        restaurants = this.salesDetailsList
      } else if (value === "productName") {
        restaurants = this.productNameList
      } else if (value === "contact") {
        restaurants = this.contactNamelist
      } else if (value === "chance") {
        restaurants = this.saleChancelist
      }
      var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
      cb(results)
    },
    createStateFilter(queryString) {
    createStateFilter(queryString, value) {
      return (state) => {
        return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
        if (value === "serviceContract" || value === "contract") {
          return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
        } else {
          return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
        }
      }
    },
    handleSelectClient(item) {
      this.editConfig.infomation.client_id = item.id
    handleSelectClient(value, item) {
      if (value === "client") {
        this.clientId = item.id
      } else if (value === "serviceContract") {
        this.serviceContractId = item.id
      } else if (value === "contract") {
        this.contractId = item.id
      } else if (value === "productName") {
        this.productCategoryId = item.id
      } else if (value === "contact") {
        this.contactId = item.id
      } else if (value === "chance") {
        this.saleChanceId = item.id
      }
    },
    selClientClick() {
      this.editSelectClientConfig.editVisible = true
    selClientClick(value) {
      console.log(value)
      if (value === "client") {
        this.editSelectClientConfig.editVisible = true
      } else if (value === "serviceContract") {
        this.editSelCommonConfig.title = "服务合同"
        this.editSelCommonConfig.editVisible = true
        this.editSelCommonConfig.tableInfomation = [...this.serviceContractList]
      } else if (value === "contract") {
        this.editSelCommonConfig.title = "销售明细单"
        this.editSelCommonConfig.editVisible = true
        this.editSelCommonConfig.tableInfomation = [...this.salesDetailsList]
      } else if (value === "productName") {
        this.editSelCommonConfig.title = "产品名称"
        this.editSelCommonConfig.editVisible = true
        this.editSelCommonConfig.tableInfomation = [...this.productNameList]
      } else if (value === "contact") {
        this.editSelectContactConfig.editVisible = true
      } else if (value === "chance") {
        this.editSelectChanceConfig.editVisible = true
      }
    },
    selClient(row) {
      console.log(row)
      this.editConfig.infomation.client_name = row.name
      this.editConfig.infomation.client_id = row.id
    selClient(row, value) {
      console.log(row, value)
      if (value === "contact") {
        this.editConfig.infomation.contact_name = row.name
        this.contactId = row.id
      } else if (value === "client") {
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
      } else if (value === "serviceContract") {
        this.editConfig.infomation.service_number = row.number
        this.serviceContractId = row.id
      } else if (value === "contract") {
        this.editConfig.infomation.number = row.number
        this.contractId = row.id
      } else if (value === "productName") {
        this.editConfig.infomation.product_name = row.name
        this.productNameId = row.id
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = row.name
        this.saleChanceId = row.id
      }
    },
    // 清除已选择用户
    clearupClient() {
      this.editConfig.infomation.client_name = ""
      this.editConfig.infomation.client_id = 0
    clearupClient(value) {
      if (value === "client") {
        this.editConfig.infomation.client_name = ""
        this.clientId = 0
      } else if (value === "serviceContract") {
        this.editConfig.infomation.service_number = ""
        this.serviceContractId = 0
      } else if (value === "contract") {
        this.editConfig.infomation.number = ""
        this.contractId = 0
      } else if (value === "productName") {
        this.editConfig.infomation.product_name = ""
        this.productNameId = 0
      } else if (value === "contact") {
        this.editConfig.infomation.contact_name = ""
        this.contactId = 0
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = ""
        this.saleChanceId = 0
      }
    },
    // 添加附件
    addAnnexClick() {},
@@ -678,6 +897,63 @@
      } else if (value === "contract") {
        this.isConttractExpand = !this.isConttractExpand
      }
    },
    // 故障类别
    async getFaultTypeList(e) {
      if (e) {
        await getFaultTypeList()
          .then((res) => {
            console.log(res)
            this.faultTypeOptions = res.data.data
          })
          .catch((err) => {
            console.log(err)
          })
      }
    },
    // 服务方式
    async getServiceTypeList() {
      await getServiceTypeList()
        .then((res) => {
          console.log(res)
          this.serviceTypeOptions = res.data.data
        })
        .catch((err) => {
          console.log(err)
        })
    },
    // 严重程度
    async getSeverityList() {
      await getSeverityList()
        .then((res) => {
          console.log(res)
          this.severityOptions = res.data.data
        })
        .catch((err) => {
          console.log(err)
        })
    },
    // 优先级别
    async getPriorityLevelList() {
      await getPriorityLevelList()
        .then((res) => {
          console.log(res)
          this.priorityLevelOptions = res.data.data
        })
        .catch((err) => {
          console.log(err)
        })
    },
    // 花费时间
    async getTimeSpentList() {
      await getTimeSpentList()
        .then((res) => {
          console.log(res)
          this.timeSpentOptions = res.data.data
        })
        .catch((err) => {
          console.log(err)
        })
    }
  }
}

 src/views/service/clientServiceOrder/DetailClientServiceOrder.vue

@@ -38,11 +38,11 @@
                <li v-for="(item, i) in basicInfoList" :key="i">
                  <div class="left">
                    <div class="content-title">{{ item.leftStr + "：" }}</div>
                    <div class="content-data">{{ item.leftValue }}</div>
                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                  </div>
                  <div class="right">
                    <div class="content-title">{{ item.rightStr }}</div>
                    <div class="content-data">{{ item.rightValue }}</div>
                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                  </div>
                </li>
              </ul>
@@ -60,11 +60,11 @@
                <li v-for="(item, i) in dynamicInfoList" :key="i">
                  <div class="left">
                    <div class="content-title">{{ item.leftStr + "：" }}</div>
                    <div class="content-data">{{ item.leftValue }}</div>
                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                  </div>
                  <div class="right">
                    <div class="content-title">{{ item.rightStr }}</div>
                    <div class="content-data">{{ item.rightValue }}</div>
                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                  </div>
                </li>
              </ul>
@@ -82,11 +82,11 @@
                <li v-for="(item, i) in timeAmountList" :key="i">
                  <div class="left">
                    <div class="content-title">{{ item.leftStr + "：" }}</div>
                    <div class="content-data">{{ item.leftValue }}</div>
                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                  </div>
                  <div class="right">
                    <div class="content-title">{{ item.rightStr }}</div>
                    <div class="content-data">{{ item.rightValue }}</div>
                    <div class="content-data">{{ item.rightValue ? item.rightValue : "--" }}</div>
                  </div>
                </li>
              </ul>
@@ -122,7 +122,7 @@
                <li v-for="(item, i) in issueList" :key="i">
                  <div class="all">
                    <div class="content-title">{{ item.leftStr + "：" }}</div>
                    <div class="content-data">{{ item.leftValue }}</div>
                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                  </div>
                </li>
              </ul>
@@ -140,7 +140,7 @@
                <li v-for="(item, i) in solutionList" :key="i">
                  <div class="all">
                    <div class="content-title">{{ item.leftStr + "：" }}</div>
                    <div class="content-data">{{ item.leftValue }}</div>
                    <div class="content-data">{{ item.leftValue ? item.leftValue : "--" }}</div>
                  </div>
                </li>
              </ul>
@@ -335,48 +335,49 @@
      }
    },
    setData() {
      const data = this.detailConfig.infomation
      this.basicInfoList = [
        {
          leftStr: "客户名称",
          leftValue: "",
          leftValue: data.Client.name,
          rightStr: "服务单编号",
          rightValue: ""
          rightValue: data.serviceNumber
        },
        {
          leftStr: "服务合同",
          leftValue: "",
          leftValue: data.Contract.number,
          rightStr: "故障类别",
          rightValue: ""
          rightValue: data.FaultType.name
        },
        {
          leftStr: "主题",
          leftValue: "",
          leftValue: data.subject,
          rightStr: "合同订单",
          rightValue: ""
          rightValue: data.OrderManage.number
        },
        {
          leftStr: "产品类别",
          leftValue: "",
          rightStr: "产品名称",
          rightValue: ""
          rightValue: data.Product.name
        },
        {
          leftStr: "服务方式",
          leftValue: "",
          leftValue: data.ServiceType.name,
          rightStr: "服务人员",
          rightValue: ""
          rightValue: data.serviceManId
        },
        {
          leftStr: "上门地址",
          leftValue: "",
          leftValue: data.address,
          rightStr: "优先级别",
          rightValue: ""
          rightValue: data.PriorityLevel.name
        },
        {
          leftStr: "预约上门时间",
          leftValue: "",
          leftValue: data.appointmentTime,
          rightStr: "销售机会",
          rightValue: ""
          rightValue: data.SaleChance.name
        },
        {
          leftStr: "签到",
@@ -394,7 +395,7 @@
      this.dynamicInfoList = [
        {
          leftStr: "处理状态",
          leftValue: "",
          leftValue: data.status,
          rightStr: "最新分配时间",
          rightValue: ""
        },
@@ -408,19 +409,19 @@
      this.timeAmountList = [
        {
          leftStr: "希望处理时间",
          leftValue: "",
          leftValue: data.expectTime,
          rightStr: "实际处理时间",
          rightValue: ""
          rightValue: data.realTime
        },
        {
          leftStr: "交通费",
          leftValue: "",
          leftValue: data.carFare,
          rightStr: "收费金额",
          rightValue: ""
          rightValue: data.chargeAmount
        },
        {
          leftStr: "花费时间",
          leftValue: "",
          leftValue: data.TimeSpent.name,
          rightStr: "",
          rightValue: ""
        }
@@ -428,67 +429,21 @@
      this.issueList = [
        {
          leftStr: "常见问题",
          leftValue: ""
          leftValue: data.Faq.name
        },
        {
          leftStr: "问题描述",
          leftValue: ""
          leftValue: data.problemDesc
        }
      ]
      this.solutionList = [
        {
          leftStr: "解决办法",
          leftValue: ""
          leftValue: data.solution
        },
        {
          leftStr: "内容备注",
          leftValue: ""
        }
      ]
      this.businessInfoList = [
        {
          leftStr: "所属行业",
          leftValue: "",
          rightStr: "法定代表人",
          rightValue: ""
        },
        {
          leftStr: "注册时间",
          leftValue: "",
          rightStr: "注册资金",
          rightValue: ""
        },
        {
          leftStr: "公司性质",
          leftValue: "",
          rightStr: "客户规模",
          rightValue: ""
        },
        {
          leftStr: "经营范围",
          leftValue: "",
          rightStr: "",
          rightValue: ""
        }
      ]
      this.addressInfoList = [
        {
          leftStr: "国家",
          leftValue: "",
          rightStr: "省份",
          rightValue: ""
        },
        {
          leftStr: "城市",
          leftValue: "",
          rightStr: "区域",
          rightValue: ""
        },
        {
          leftStr: "详细地址",
          leftValue: "",
          rightStr: "",
          rightValue: ""
          leftValue: data.solutionRemark
        }
      ]
    },

 src/views/service/clientServiceOrder/index.vue

@@ -42,7 +42,7 @@

<script>
import AddClientServiceOrderDialog from "@/views/service/clientServiceOrder/AddCientServiceOrderDialog"
import { getOrderManageList, getDelOrderManage } from "@/api/serviceManage/orderManage"
import { getServiceOrderList, getDelServiceOrder } from "@/api/serviceManage/clientServiceOrder"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import DetailClientServiceOrder from "@/views/service/clientServiceOrder/DetailClientServiceOrder"

@@ -105,14 +105,14 @@
      this.tableList = {
        tableInfomation: [],
        tableColumn: [
          { label: "服务单编号", prop: "number", min: 100, isCommonClick: true }, // 服务单编号
          { label: "主题", prop: "name" }, // 主题
          { label: "客户名称", prop: "clientId", min: 130, isClientClick: true }, // 客户名称
          { label: "实际处理时间", prop: "contactName" }, // 实际处理时间
          { label: "服务人员", prop: "name" }, // 服务人员
          { label: "服务方式", prop: "orderType" }, // 服务方式
          { label: "服务单编号", prop: "serviceNumber", min: 100, isCommonClick: true }, // 服务单编号
          { label: "主题", prop: "subject" }, // 主题
          { label: "客户名称", prop: "client_name", min: 130, isClientClick: true }, // 客户名称
          { label: "实际处理时间", prop: "realTime" }, // 实际处理时间
          { label: "服务人员", prop: "serviceManId" }, // 服务人员
          { label: "服务方式", prop: "serviceType_name" }, // 服务方式
          { label: "产品类别", prop: "reportSourceId" }, // 产品类别
          { label: "故障类别", prop: "orderType" } // 故障类别
          { label: "故障类别", prop: "faultType_name" } // 故障类别
        ]
      }
      this.searchOptions = []
@@ -124,18 +124,17 @@
    // 请求数据
    async getData() {
      this.loading = true
      await getOrderManageList({
        keyword: "",
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      })
      await getServiceOrderList()
        .then((res) => {
          console.log(res)
          if (res.code === 200) {
            if (res.data.list && res.data.list.length > 0) {
              const list = res.data.list.map((item) => {
            if (res.data.data && res.data.data.length > 0) {
              const list = res.data.data.map((item) => {
                return {
                  ...item
                  ...item,
                  client_name: item.Client.name,
                  serviceType_name: item.ServiceType.name,
                  faultType_name: item.FaultType.name
                }
              })
              this.tableList.tableInfomation = list || []
@@ -179,7 +178,7 @@
        type: "warning"
      })
        .then(function () {
          return getDelOrderManage({ id: id })
          return getDelServiceOrder({ id: id })
        })
        .then((response) => {
          if (response.code === 200) {

 src/views/service/serviceContract/index.vue

@@ -115,7 +115,7 @@
          { label: "客户名称", prop: "clientId", min: 120, isClientClick: true }, // 客户名称
          { label: "签约日期", prop: "signTime" }, // 签约日期
          { label: "合同类型", prop: "typeId" }, // 合同类型
          { label: "合同状态", prop: "statusId" }, // 合同状态
          { label: "合同状态", prop: "serviceContractStatusId" }, // 合同状态
          { label: "负责人", prop: "memberId" }, // 负责人
          { label: "产品名称", prop: "productName" }, // 产品名称
          { label: "服务开始日", prop: "startTime" }, // 服务开始日