新增销售退款单增加选择退货单及其他bug

yangfeng

2023-08-24 4a63f03516cc177ad60ebbe28a65e80587846b3e

新增销售退款单增加选择退货单及其他bug

 .gitignore

@@ -1,28 +1,21 @@
# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# Commenting this out is preferred by some people, see
# https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
.DS_Store
node_modules
/dist

# Users Environment Variables
.lock-wscript
# local env files
.env.local
.env.*.local

# Log files
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?

 src/components/makepager/CommonFormTableView.vue

@@ -8,6 +8,7 @@
        :span-method="arraySpanMethod"
        style="width: 100%"
      >
        <el-table-column v-if="tableList.isReturn" type="index" label="#" width="50" align="center"></el-table-column>
        <el-table-column
          v-for="(item, i) in tableList.tableColumn"
          :key="i"
@@ -170,6 +171,7 @@
      default: () => {
        return {
          tableData: [], // 接口返回数据
          isReturn: false,
          tableColumn: [
            // table表单
            { label: "", prop: "", min: 200, tooltip: true }

 src/store/modules/getClientName.js

@@ -9,6 +9,7 @@
import { getQuotationList } from "@/api/sales/quotation"
import { getServiceOrderList } from "@/api/serviceManage/clientServiceOrder"
import { getProductList } from "@/api/common/other"
import { getSalesReturnList } from "@/api/sales/salesReturn"
import { Message } from "element-ui"

export default {
@@ -23,7 +24,8 @@
    salesDetailsList: [], // 销售明细单
    quotationList: [], // 报价单
    serviceOrderList: [], // 客户服务单
    productList: [] // 产品列表
    productList: [], // 产品列表
    salesReturnList: [] // 销售退货单
  },
  mutations: {
    clientNameList(state, payload) {
@@ -58,6 +60,9 @@
    },
    productList(state, payload) {
      state.productList = payload
    },
    salesReturnList(state, payload) {
      state.salesReturnList = payload
    }
  },
  actions: {
@@ -160,6 +165,16 @@
          Message.error(res.msg)
        }
      })
    },
    geReturnList(context) {
      getSalesReturnList({ productName: "", productNumber: "", page: 1, pageSize: 10 }).then((res) => {
        if (res.code == 200) {
          console.log(res.data.list)
          context.commit("salesReturnList", res.data.list)
        } else {
          Message.error(res.msg)
        }
      })
    }
  }
}

 src/views/other/commonDialog/SelectClientDialog.vue

@@ -81,8 +81,8 @@
          { label: "客户名称", prop: "name", min: 100, isClientClick: true },
          { label: "客户编号", prop: "number" },
          { label: "客户状态", prop: "client_status" },
          { label: "销售负责人", prop: "member_name" },
          { label: "法定代表人", prop: "representative" },
          { label: "销售负责人", prop: "member_name", min: 100 },
          { label: "法定代表人", prop: "representative", min: 100 },
          { label: "注册时间", prop: "registration_time" },
          { label: "经营范围", prop: "business_scope" },
          { label: "详细地址", prop: "detail_address" },

 src/views/other/commonDialog/SelectCommonDialog.vue

@@ -45,6 +45,7 @@
import { getServiceContractList } from "@/api/serviceManage/serviceContract"
import { getServiceOrderList } from "@/api/serviceManage/clientServiceOrder"
import { getProductList } from "@/api/common/other"
import { getSalesReturnList } from "@/api/sales/salesReturn"
export default {
  name: "EditSelCommonDialog",
  props: {
@@ -150,6 +151,17 @@
          ]
        }
        this.searchSel = { value: "name", label: "产品名称" }
      } else if (this.editConfig.title === "销售退货单") {
        this.tableList = {
          tableInfomation: [],
          tableColumn: [
            { label: "退货单编号", prop: "number", isClick: true },
            { label: "退货日期", prop: "returnDate" },
            { label: "状态", prop: "salesReturnStatus_name" },
            { label: "退入仓库", prop: "repository" }
          ]
        }
        this.searchSel = { value: "number", label: "销售退货单编号" }
      }
      this.searchOptions = []
      for (let i = 0; i < this.tableList.tableColumn.length; i++) {
@@ -173,6 +185,8 @@
        this.getServiceOrderList()
      } else if (this.editConfig.title === "产品名称") {
        this.getProductList()
      } else if (this.editConfig.title === "销售退货单") {
        this.getSalesReturnList()
      }
    },
    // 销售总单
@@ -326,6 +340,29 @@
        this.loading = false
      })
    },
    async getSalesReturnList() {
      await getSalesReturnList({
        keyword: this.keyword,
        keywordType: this.keywordType,
        page: 0,
        pageSize: 0
      }).then((res) => {
        if (res.code === 200) {
          if (res.data.list && res.data.list.length > 0) {
            const list = res.data.list.map((item) => {
              return {
                ...item,
                salesReturnStatus_name: item.SalesReturnStatus.name
              }
            })
            this.tableList.tableInfomation = list.slice(0, 5) || []
          } else {
            this.tableList.tableInfomation = []
          }
        }
        this.loading = false
      })
    },
    handleClose() {
      this.editConfig.editVisible = false
    },
@@ -343,6 +380,8 @@
        this.$emit("selClient", row, "customService")
      } else if (this.editConfig.title === "产品名称") {
        this.$emit("selClient", row, "productName")
      } else if (this.editConfig.title === "销售退货单") {
        this.$emit("selClient", row, "salesReturn")
      }
    },
    // 搜索

 src/views/other/payment/collectionPlan/AddCollectionPlan.vue

@@ -182,7 +182,6 @@
        mergeNumber: 7
      },
      tableData: [],
      productId: 1,
      addProductArr: [],
      memberOptions: [],
      allTerms: 3,

 src/views/other/payment/receipt/addReceipt.vue

@@ -529,52 +529,83 @@
    // 设置允许上传文件格式
    setFormatClick() {},
    setTableForm() {
      if (this.editConfig.title === "新建") {
      if (this.editConfig.title === "新建" || this.editConfig.infomation.products.length === 0) {
        this.tableData = [
          {
            id: 1,
            Amount: 0,
            IsSale: true,
            MaterialMode: "",
            MinInventory: 0,
            Name: "",
            Number: "",
            PurchaseType: "",
            SalePrice: 0,
            Unit: ""
            productId: this.productId,
            id: 0,
            amount: 0,
            desc: "",
            name: "",
            number: "",
            price: 0,
            total: 0
          }
        ]
      } else {
        this.tableData = this.editConfig.infomation.products
        this.tableData.map((item, index) => {
          item.productId = index + 1
        })
      }
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: [
          { label: "#", prop: "id", width: 40 },
          { label: "产品名称", prop: "Name", input: true, isRequird: true },
          { label: "产品编号", prop: "Number" },
          { label: "数量", prop: "Amount", input: true, isRequird: true },
          { label: "销售单价", prop: "Unit", input: true },
          { label: "价税合计", prop: "total", input: true },
          { label: "描述", prop: "other8" }
          { label: "#", prop: "productId", width: 40 },
          { label: "产品名称", prop: "name", productName: true, isRequird: true },
          { label: "产品编号", prop: "number" },
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },
          { label: "销售单价", prop: "price", inputFloat: true },
          { label: "价税合计", prop: "total", inputFloat: true }
        ]
      }
    },
    // 产品列表输入
    inputContent(val, prop, row) {
      this.productId = row.productId
      this.tableData.map((item) => {
        if (item.productId === row.productId) {
          item[prop] = val
        }
      })
    },
    // 产品新增
    addProductClick() {
      this.productId++
      this.tableData.push({
        id: this.productId,
        Amount: 0,
        IsSale: true,
        MaterialMode: "",
        MinInventory: 0,
        Name: "",
        Number: "",
        PurchaseType: "",
        SalePrice: 0,
        Unit: ""
        productId: this.productId,
        id: 0,
        amount: 0,
        desc: "",
        name: "",
        number: "",
        price: 0,
        total: 0
      })
      this.showSummary.show = true
    },
    //  产品清空
    emptyProductClick() {
      this.productId = 1
      this.tableData = [
        {
          productId: this.productId,
          id: 0,
          amount: 0,
          desc: "",
          name: "",
          number: "",
          price: 0,
          total: 0
        }
      ]
      this.productTableList.tableData = this.tableData
    },
    // 产品重算
    recalculateProductClick() {},
    clearupProduct(data) {
      this.tableData = data
      this.productTableList.tableData = this.tableData
    }
  }
}

 src/views/other/payment/receipt/index.vue

@@ -159,6 +159,7 @@
              const list = res.data.data.data.map((item) => {
                return {
                  ...item,
                  client_name: item.client.name,
                  paymentType_name: item.paymentType.name,
                  principal_name: item.principal.username
                }

 src/views/sales/contractManage/AddContractManageDialog.vue

@@ -353,9 +353,9 @@
    },
    selClient(row, value) {
      console.log(value)
      if (value === "contact") {
        this.editConfig.infomation.contact_name = row.name
        this.contactId = row.id
      if (value === "client") {
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
      } else if (value === "quotation") {
        this.editConfig.infomation.quotation_number = row.number
        this.quotationId = row.id

 src/views/sales/refundForm/AddRefundFormDialog.vue

@@ -28,14 +28,18 @@
                  <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>
@@ -46,19 +50,28 @@
                  <el-input v-model="editConfig.infomation.number"></el-input>
                </el-form-item>
              </el-col>
              <!-- <el-col :span="12">
                <el-form-item label="选择源单" prop="selSourceOrder">
                  <el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
                    <el-option
                      v-for="item in selSourceOrderOptions"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value"
                    >
                    </el-option>
                  </el-select>
              <el-col :span="12">
                <el-form-item label="销售退货单" prop="sale_return_nunber">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.sale_return_nunber"
                      :fetch-suggestions="
                        (queryString, callback) => {
                          querySearchAsync(queryString, callback, 'salesReturn')
                        }
                      "
                      value-key="number"
                      @select="handleSelectClient('salesReturn', $event)"
                    ></el-autocomplete>
                    <div class="common-select-btn" @click="selClientClick('salesReturn')">
                      <i class="el-icon-circle-plus-outline"></i>
                    </div>
                    <div class="common-select-btn" @click="clearupClient('salesReturn')">
                      <i class="el-icon-edit-outline"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col> -->
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售负责人" prop="memberId">
                  <el-select
@@ -92,7 +105,12 @@
                      class="common-select-sel"
                      size="mini"
                    >
                      <el-option v-for="item in refundMethodOptions" :key="item.id" :label="item.name" :value="item.id">
                      <el-option
                        v-for="item in paymentTypeListOptions"
                        :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> -->
@@ -100,10 +118,10 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="账户" prop="accountId">
                <el-form-item label="账户" prop="bankAccountId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.accountId"
                      v-model="editConfig.infomation.bankAccountId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
@@ -188,6 +206,7 @@
          <div class="product-view">
            <CommonFormTableView
              :show-summary="showSummary"
              :detail-enter="detailEnter"
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
@@ -248,6 +267,12 @@
        :edit-common-config="editSelectClientConfig"
        @selClient="selClient"
      />
      <!-- 选择销售退货单 -->
      <SelectCommonDialog
        v-if="editSelCommonConfig.editVisible"
        :edit-common-config="editSelCommonConfig"
        @selClient="selClient"
      />
    </el-dialog>
  </div>
</template>
@@ -257,6 +282,8 @@
import { getAllData } from "@/api/client/client"
import { getAddSalesRefund, getUpdateSalesRefund } from "@/api/sales/refundForm"
import SelectClientDialog from "@/views/other/commonDialog/SelectClientDialog"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
import { getPaymentTypeList } from "@/api/common/payment"
export default {
  name: "AddRefundFormDialog",
  props: {
@@ -271,10 +298,13 @@
      }
    }
  },
  components: { CommonFormTableView, SelectClientDialog },
  components: { CommonFormTableView, SelectClientDialog, SelectCommonDialog },
  computed: {
    clientList() {
      return this.$store.state.getClientName.clientList
    },
    salesReturnList() {
      return this.$store.state.getClientName.salesReturnList
    }
  },
  data() {
@@ -282,15 +312,15 @@
      dialogWidth: "80%",
      editConfig: this.editCommonConfig,
      rules: {
        clientId: [{ required: true, message: "请输入", trigger: "blur" }],
        client_name: [{ required: true, message: "请选择", trigger: "change" }],
        number: [{ required: true, message: "请输入", trigger: "blur" }],
        refundDate: [{ required: true, message: "请选择", trigger: "change" }],
        memberId: [{ required: true, message: "请选择", trigger: "change" }],
        account: [{ required: true, message: "请选择", trigger: "change" }]
        sale_return_nunber: [{ required: true, message: "请选择", trigger: "change" }]
      },
      memberOptions: [],
      // selSourceOrderOptions: [{ value: "1", label: "销售退货单" }], // 选择源单
      refundMethodOptions: [], // 付款方式
      paymentTypeListOptions: [], // 付款方式
      accountOptions: [], // 账户
      isInvoiceOptions: ["是", "否"], // 是否开票
      currencyOptions: [{ id: 1, name: "人民币" }], // 币种
@@ -299,37 +329,48 @@
      showSummary: {
        show: true,
        total: true,
        sumProp: ["other1", "other2", "other3", "other4"],
        mergeNumber: 5
        sumProp: ["Amount", "total"],
        mergeNumber: 2
      },
      editSelectClientConfig: {
        editVisible: false,
        title: "",
        infomation: {}
      },
      editSelCommonConfig: {
        editVisible: false,
        title: "",
        infomation: {}
      },
      clientId: this.editCommonConfig.infomation.client_id,
      sourceId: this.editCommonConfig.infomation.sourceId,
      productId: 1,
      isNoProduct: true
      isNoProduct: true,
      detailEnter: true
    }
  },
  created() {
    this.$store.dispatch("geClient")
    this.$store.dispatch("geReturnList")
    this.setTableForm()
    this.getCommonData()
  },
  methods: {
    getCommonData() {
      getAllData()
        .then((res) => {
          this.memberOptions = res.data.member
          this.refundMethodOptions = res.data.refundMethod
          this.accountOptions = res.data.accountId
          // this.isInvoiceOptions = res.data.isInvoice
          // this.currencyOptions = res.data.currency
        })
        .catch((err) => {
          console.log(err)
        })
      getAllData().then((res) => {
        this.memberOptions = res.data.member
        this.accountOptions = res.data.accountId
      })
      this.getPaymentTypeList()
    },
    async getPaymentTypeList() {
      await getPaymentTypeList().then((res) => {
        console.log("支付方式")
        console.log(res.data)
        if (res.data.code === 200) {
          this.paymentTypeListOptions = res.data.data.data
        }
      })
    },
    // 保存
    saveClick(formName) {
@@ -380,15 +421,17 @@
      let params = {
        id: this.editConfig.title === "新建" ? 0 : data.id,
        salesRefund: {
          accountId: data.accountId || 0,
          bankAccountId: data.bankAccountId || 0,
          clientId: this.clientId || 0,
          isInvoice: data.isInvoice || "",
          memberId: data.memberId || 0,
          number: data.number || "",
          paymentTypeId: data.paymentTypeId || 0,
          products: this.tableData,
          reason: data.reason || "",
          refundDate: data.refundDate || "",
          refundMethod: data.refundMethod || ""
          sourceId: this.sourceId || 0,
          sourceType: 1
        }
      }
      return params
@@ -397,31 +440,64 @@
      this.editConfig.visible = false
    },
    // 选择客户相关方法
    querySearchAsync(queryString, cb) {
      var restaurants = this.clientList
      var results = queryString ? restaurants.filter(this.createStateFilter(queryString)) : restaurants
    querySearchAsync(queryString, cb, value) {
      var restaurants = []
      if (value === "client") {
        restaurants = this.clientList
      } else if (value === "salesReturn") {
        restaurants = this.salesReturnList
      }
      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 === "salesReturn") {
          return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
        } else if (value === "productName") {
          return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
        }
      }
    },
    handleSelectClient(item) {
      this.clientId = item.id
    handleSelectClient(value, item) {
      if (value === "client") {
        this.clientId = item.id
      } else if (value === "salesReturn") {
        console.log(item)
        this.editConfig.infomation.sale_return_nunber = item.number
        this.sourceId = item.id
        this.tableData = item.products
        this.productTableList.tableData = item.products
      }
    },
    selClientClick() {
      this.editSelectClientConfig.editVisible = true
    selClientClick(value) {
      if (value === "client") {
        this.editSelectClientConfig.editVisible = true
      } else if (value === "salesReturn") {
        this.editSelCommonConfig.title = "销售退货单"
        this.editSelCommonConfig.editVisible = true
      }
    },
    selClient(row) {
      console.log(row)
      this.editConfig.infomation.client_name = row.name
      this.clientId = row.id
    selClient(row, value) {
      if (value === "client") {
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
      } else if (value === "salesReturn") {
        this.editConfig.infomation.sale_return_nunber = row.number
        this.sourceId = row.id
        this.tableData = row.products
        this.productTableList.tableData = row.products
      }
    },
    // 清除已选择用户
    clearupClient() {
      this.editConfig.infomation.client_name = ""
      this.clientId = 0
    clearupClient(value) {
      if (value === "client") {
        this.editConfig.infomation.client_name = ""
        this.clientId = 0
      } else if (value === "salesReturn") {
        this.editConfig.infomation.sale_return_nunber = ""
        this.sourceId = 0
      }
    },
    // 添加附件
    addAnnexClick() {},
@@ -449,8 +525,9 @@
      }
      this.productTableList = {
        tableData: this.tableData,
        isReturn: true,
        tableColumn: [
          { label: "#", prop: "productId", width: 40 },
          // { label: "#", prop: "productId", width: 40 },
          { label: "产品名称", prop: "name", productName: true, isRequird: true },
          { label: "产品编号", prop: "number" },
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },

 src/views/sales/salesDetails/DetailSpecification.vue

@@ -339,7 +339,7 @@
          leftStr: "创建人",
          leftValue: "",
          rightStr: "创建时间",
          rightValue: ""
          rightValue: item.createTime
        }
      ]
      this.deliveryInfoList = [
@@ -359,7 +359,7 @@
      this.dynamicInfoList = [
        {
          leftStr: "修改时间",
          leftValue: "",
          leftValue: item.updateTime,
          rightStr: "出库状态",
          rightValue: ""
        },

 src/views/sales/salesReturn/AddSalesReturnDialog.vue

@@ -46,28 +46,10 @@
                  <el-input v-model="editConfig.infomation.number"></el-input>
                </el-form-item>
              </el-col>
              <!-- <el-col :span="12">
                <el-form-item label="选择源单" prop="selSourceOrder">
                  <el-select v-model="editConfig.infomation.selSourceOrder" size="mini" style="width: 63%">
                    <el-option
                      v-for="item in selSourceOrderOptions"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col> -->
              <el-col :span="12">
                <el-form-item label="退入仓库" prop="repository">
                  <el-select v-model="editConfig.infomation.repository" size="mini" style="width: 63%">
                    <el-option
                      v-for="item in repositoryOptions"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value"
                    >
                    <el-option v-for="item in repositoryOptions" :key="item.id" :label="item.name" :value="item.name">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -253,7 +235,8 @@
        infomation: {}
      },
      productId: 1,
      isNoProduct: true
      isNoProduct: true,
      clientId: this.editCommonConfig.infomation.clientId
    }
  },
  created() {
@@ -318,10 +301,6 @@
                this.editConfig.visible = false
                if (res.code === 200) {
                  this.$message.success("编辑成功")
                  this.$message({
                    message: "编辑成功",
                    type: "success"
                  })
                  this.$parent.getData()
                }
              })
@@ -338,7 +317,7 @@
      let params = {
        id: this.editConfig.title === "新建" ? 0 : data.id,
        salesReturn: {
          clientId: data.clientId || 0,
          clientId: this.clientId || 0,
          memberId: data.memberId || 0,
          number: data.number || "",
          products: this.tableData,
@@ -365,7 +344,7 @@
      }
    },
    handleSelectClient(item) {
      this.editConfig.infomation.client_id = item.id
      this.clientId = item.id
    },
    selClientClick() {
      this.editSelectClientConfig.editVisible = true
@@ -373,12 +352,12 @@
    selClient(row) {
      console.log(row)
      this.editConfig.infomation.client_name = row.name
      this.editConfig.infomation.client_id = row.id
      this.clientId = row.id
    },
    // 清除已选择用户
    clearupClient() {
      this.editConfig.infomation.client_name = ""
      this.editConfig.infomation.client_id = 0
      this.clientId = 0
    },
    // 添加附件
    addAnnexClick() {},

 src/views/service/clientServiceOrder/DetailClientServiceOrder.vue

@@ -399,7 +399,7 @@
        },
        {
          leftStr: "创建时间",
          leftValue: "",
          leftValue: data.createTime,
          rightStr: "创建人",
          rightValue: ""
        }
@@ -415,7 +415,7 @@
          leftStr: "最新更新人",
          leftValue: "",
          rightStr: "修改时间",
          rightValue: ""
          rightValue: data.updateTime
        }
      ]
      this.timeAmountList = [

 src/views/service/serviceContract/AddServiceContractDialog.vue

@@ -152,10 +152,10 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="合同类型" prop="typeId">
                <el-form-item label="合同类型" prop="serviceContractTypeId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.typeId"
                      v-model="editConfig.infomation.serviceContractTypeId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
@@ -207,10 +207,10 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item label="合同状态" prop="statusId">
                <el-form-item label="合同状态" prop="serviceContractStatusId">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.statusId"
                      v-model="editConfig.infomation.serviceContractStatusId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
@@ -577,9 +577,11 @@
        serviceTimes: data.serviceTimes || 0,
        signTime: data.signTime || "",
        startTime: data.startTime || "",
        statusId: data.statusId || 0,
        statusId: 0,
        terms: data.terms || "",
        typeId: data.typeId || 0
        typeId: 0,
        serviceContractTypeId: data.serviceContractTypeId || 0,
        serviceContractStatusId: data.serviceContractStatusId || 0
      }
      return params
    },

 src/views/service/serviceFollowup/DetailServiceFollowup.vue

@@ -157,9 +157,9 @@
        },
        {
          leftStr: "创建时间",
          leftValue: "",
          leftValue: item.createTime,
          rightStr: "修改时间",
          rightValue: ""
          rightValue: item.updateTime
        }
      ]
    },

 vue.config.js

@@ -13,36 +13,11 @@
  productionSourceMap: false, // 如果你不需要生产环境的source map, 可以将其设置为false 以加速生产环境构建
  devServer: {
    proxy: {
      "/api/base": {
        target: "http://192.168.20.119:8002",
        ws: true,
        changeOrigin: true
      },
      "/api/salesLeads": {
        target: "http://192.168.20.119:8002",
        ws: true,
        changeOrigin: true
      },
      "/api/followRecord": {
        target: "http://192.168.20.119:8002",
        ws: true,
        changeOrigin: true
      },
      "/api-s": {
        target: "http://192.168.20.119:9081",
        ws: true,
        changeOrigin: true
      },
      "/api": {
        target: "http://192.168.20.119:8002",
        target: "http://192.168.20.119:8002", // http://192.168.20.119:8002 http://fai365.com:30150/
        ws: true,
        changeOrigin: true
      }
      // "/api-s": {
      //   target: "http://192.168.20.113:9081",
      //   ws: true,
      //   changeOrigin: true,
      // },
    }
  },
  transpileDependencies: [