Merge branch 'zhengwenfeng/modify-style' into dev

yangfeng

2023-10-25 0fe07c82aaf1d81511e524647cf2bc473b5ec298

 src/views/sales/salesDetails/AddSalesDetailsDialog.vue

@@ -28,16 +28,14 @@
                  <el-input
                    v-if="
                      editConfig.title == '编辑' ||
                      (editConfig.title == '新建' &&
                        codenumer &&
                        (explain != '' || isIdDisabled))
                      (editConfig.title == '新建' && codenumer && (explain != '' || isIdDisabled))
                    "
                    :disabled="editConfig.title == '编辑'"
                    v-model="editConfig.infomation.number"
                    placeholder="请输入编码"
                  >
                  </el-input>
                  <span  v-else-if="editConfig.title == '新建'" style="color: #f56c6c"
                  <span v-else-if="editConfig.title == '新建'" style="color: #f56c6c"
                    >请优先配置编码规范 <el-button type="text" @click="numberClick"> 配置规范 </el-button></span
                  >
                  <!-- <WordInput
@@ -88,7 +86,7 @@
              </el-col>

              <el-col :span="12">
                <el-form-item label="销售机会" prop="saleChanceId">
                <el-form-item label="销售机会" prop="sale_chance_name">
                  <div class="custom-name">
                    <el-autocomplete
                      style="width: 100%"
@@ -151,19 +149,39 @@
                  </div>
                </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-col :span="12">
                <el-form-item label="销售报价单" prop="quotation_number">
                  <div class="custom-name">
                    <el-autocomplete
                      v-model="editConfig.infomation.quotation_number"
                      :fetch-suggestions="
                        (queryString, callback) => {
                          querySearchAsync(queryString, callback, 'quotation')
                        }
                      "
                      value-key="number"
                      @select="handleSelectClient('quotation', $event)"
                      style="width: 100%"
                      placeholder="请先选择销售机会"
                      :disabled="isAddQuatation"
                    ></el-autocomplete>
                    <div v-if="!isAddQuatation" class="common-select-btn" @click="selClientClick('quotation')">
                      <i class="el-icon-circle-plus-outline" title="选择"></i>
                    </div>
                    <div
                      v-if="
                        editConfig.infomation.quotation_number &&
                        editConfig.infomation.quotation_number.length > 0 &&
                        !isAddQuatation
                      "
                      class="common-select-btn"
                      @click="clearupClient('quotation')"
                    >
                    </el-option>
                  </el-select>
                      <i class="el-icon-remove-outline" title="清除"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col> -->
              </el-col>
              <el-col :span="12">
                <el-form-item label="签约日期" prop="signTime">
                  <el-date-picker
@@ -201,29 +219,19 @@
                  </el-date-picker>
                </el-form-item>
              </el-col>
              <!-- <el-col :span="12">
                <el-form-item label="微信订单状态" prop="wechatOrderStatus">
                  <div class="common-select">
                    <el-select
                      v-model="editConfig.infomation.wechatOrderStatus"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
                    >
                      <el-option
                        v-for="item in wechatOrderStatusOptions"
                        :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-col :span="12">
                <el-form-item label="交付类型" prop="deliverType">
                  <el-select
                    v-model="editConfig.infomation.deliverType"
                    placeholder="请选择"
                    size="mini"
                    style="width: 100%"
                  >
                    <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col> -->
              </el-col>
            </el-row>
          </div>
          <!-- 收货信息 -->
@@ -345,14 +353,14 @@
          </div>
          <div class="product-view">
            <CommonFormTableView
              ref="commonFormTableView"
              :detail-enter="true"
              :select-box="true"
              :show-summary="showSummary"
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
              @emptyProductClick="emptyProductClick"
              @recalculateProductClick="recalculateProductClick"
              @clearupProduct="clearupProduct"
            />
              @getSelectArray="getSelectArray"
            ></CommonFormTableView>
          </div>
          <!-- 选择审批流程 -->
          <!-- <div v-if="editConfig.title === '新建'" class="basic-info-title">选择审批流程</div>
@@ -441,8 +449,9 @@
import { getSaleChanceList } from "@/api/sales/salesOpportunity"
import { getSubOrderList } from "@/api/sales/subOrder"
import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"

import { getDataByType } from "@/api/data"
import { mapActions } from "vuex"
import { getQuotationList } from "@/api/sales/quotation"

export default {
  name: "AddSalesDetailsDialog",
@@ -478,9 +487,11 @@
      rules: {
        client_name: [{ required: true, message: "请选择客户名称", trigger: "change" }],
        // subbill_name: [{ required: true, message: "请选择销售子单", trigger: "change" }],
        number: [{ required: true,validator: this.validateCheckCode, trigger: ["blur",'change'] }],
        number: [{ required: true, validator: this.validateCheckCode, trigger: ["blur", "change"] }],
        signTime: [{ required: true, message: "请选择签约日期", trigger: "change" }],
        memberId: [{ required: true, message: "请选择销售负责人", trigger: "change" }]
        memberId: [{ required: true, message: "请选择销售负责人", trigger: "change" }],
        sale_chance_name: [{ required: true, message: "请选择销售机会", trigger: "change" }],
        quotation_number: [{ required: true, message: "请选择销售报价单", trigger: "change" }]
        // approvalOpinion: [{ required: true, message: "请输入", trigger: "blur" }]
      },
      memberOptions: [],
@@ -522,30 +533,38 @@
        infomation: {}
      },
      amountTotal: 0,
      isNameChanceEdit: false
      isNameChanceEdit: false,
      isAddQuatation: true,
      // 交付类型
      deliveryTypeList: getDataByType("deliveryType"),
      quotationList: [],
      quotationId: this.editCommonConfig.infomation.quotationId,
      tableData: [],
      selProductData: []
    }
  },
  created() {
    if (this.editConfig.title !== "新建") {
      this.isAddQuatation = false
    }
    this.$store.dispatch("geClient")
    // this.$store.dispatch("geChance")
    // this.$store.dispatch("getSubunit")
    this.setTableForm()
    this.getCommonData()
    this.formInfo()
    // if (this.editConfig.title === "新建" && this.editConfig.infomation.client_name.length > 0) {
    //   this.isNameChanceEdit = true
    // }
    // else {

    // }
    if (this.editConfig.title === "编辑") {
      this.productTableList.tableData = this.editConfig.infomation.products
    }
  },
  watch: {
    "editClientManageConfig.visible"(val) {
      if (val) {
        this.formInfo()
      }
    },
    }
  },
  // beforeUpdate() {
  //   this.$refs.commonFormTableView.toggleSelection(this.tableData)
  // },
  methods: {
    ...mapActions(["getChanceFilter", "getSubunitFliter"]),
    formInfo() {
@@ -586,7 +605,7 @@
            }
          }
          if (this.isNoProduct) {
            this.$message.error("产品名称不能为空")
            this.$message.error("请选择产品")
          } else {
            const params = this.saveParams()
            console.log(params)
@@ -633,7 +652,7 @@
        memberId: data.memberId || 0,
        number: data.number || "",
        phone: data.phone || "",
        products: this.tableData,
        products: this.selProductData,
        remark: data.remark || "",
        saleChanceId: this.saleChanceId || 0,
        saleType: data.saleType || 0,
@@ -642,6 +661,8 @@
        logisticCompany: data.logisticCompany || "",
        logisticCost: data.logisticCost || 0,
        logisticNumber: data.logisticNumber || "",
        quotationId: this.quotationId,
        deliverType: data.deliverType || 0
      }
      let params = {}
      if (this.editConfig.title === "新建") {
@@ -660,6 +681,39 @@
    handleClose() {
      this.editConfig.visible = false
    },
    // 获取报价单
    getQuotation(id, value) {
      getQuotationList({
        page: 0,
        pageSize: 0,
        search_map: {
          sale_chance_id: id
        }
      }).then((res) => {
        if (res.code == 200) {
          console.log(res)
          this.quotationList = res.data.list
          if (value === "全部产品") {
            this.quotationList.map((item) => {
              if (item.id === this.editConfig.infomation.quotationId) {
                this.tableData = item.products
                this.tableData.map((item, index) => {
                  item.productId = index + 1
                })
                this.productTableList.tableData = item.products
                this.selProductData.forEach((key) => {
                  this.tableData.forEach((row) => {
                    if (key.number === row.number) {
                      this.$refs.commonFormTableView.$refs.fromTable.toggleRowSelection(row, true)
                    }
                  })
                })
              }
            })
          }
        }
      })
    },
    // 选择客户相关方法
    querySearchAsync(queryString, cb, value) {
      var restaurants = []
@@ -670,13 +724,15 @@
        restaurants = this.saleChancelist
      } else if (value === "subbill") {
        restaurants = this.subOrderList
      } else if (value === "quotation") {
        restaurants = this.quotationList
      }
      var results = queryString ? restaurants.filter(this.createStateFilter(queryString, value)) : restaurants
      cb(results)
    },
    createStateFilter(queryString, value) {
      return (state) => {
        if (value === "subbill") {
        if (value === "subbill" || value === "quotation") {
          return state.number.toLowerCase().indexOf(queryString.toLowerCase()) === 0
        } else {
          return state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
@@ -710,8 +766,8 @@
    },
    handleSelectClient(value, item) {
      if (value === "client") {
        this.editConfig.infomation.subbill_name =""
        this.editConfig.infomation.sale_chance_name=""
        this.editConfig.infomation.subbill_name = ""
        this.editConfig.infomation.sale_chance_name = ""
        this.clientId = item.id
        this.editConfig.infomation.client_name = item.name
        this.getSaleChanceList(item)
@@ -719,10 +775,17 @@
      } else if (value === "chance") {
        this.saleChanceId = item.id
        this.editConfig.infomation.sale_chance_name = item.name
        this.isAddQuatation = false
        this.getQuotation(item.id)
      } else if (value === "subbill") {
        console.log("下拉框点击", item)
        this.subbillId = item.id
        this.editConfig.infomation.subbill_name = item.number
      } else if (value === "quotation") {
        this.productTableList.tableData = item.products
        // this.tableData = item.products
        this.editConfig.infomation.quotation_number = item.number
        this.quotationId = item.id
      }
    },
    selClientClick(value) {
@@ -735,12 +798,17 @@
        this.editSelCommonConfig.title = "销售子单"
        this.editSelCommonConfig.editVisible = true
        this.editSelCommonConfig.clientId = this.clientId
      } else if (value === "quotation") {
        this.editSelCommonConfig.title = "报价单"
        this.editSelCommonConfig.editVisible = true
        this.editSelCommonConfig.clientId = this.clientId
        this.editSelCommonConfig.tableInfomation = [...this.quotationList]
      }
    },
    selClient(row, value) {
      if (value === "client") {
        this.editConfig.infomation.sale_chance_name=""
        this.editConfig.infomation.subbill_name=""
        this.editConfig.infomation.sale_chance_name = ""
        this.editConfig.infomation.subbill_name = ""
        this.editConfig.infomation.client_name = row.name
        this.clientId = row.id
        this.getSaleChanceList(row)
@@ -748,21 +816,33 @@
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = row.name
        this.saleChanceId = row.id
        this.isAddQuatation = false
        this.getQuotation(row.id)
      } else if (value === "subbill") {
        this.editConfig.infomation.subbill_name = row.number
        this.subbillId = row.id
      } else if (value === "quotation") {
        this.productTableList.tableData = row.products
        // this.tableData = row.products
        this.editConfig.infomation.quotation_number = row.number
        this.quotationId = row.id
      }
    },
    // 清除已选择用户
    clearupClient(value) {
      if (value === "client") {
        this.editConfig.infomation.sale_chance_name=""
        this.editConfig.infomation.sale_chance_name = ""
        this.editConfig.infomation.client_name = ""
        this.editConfig.infomation.subbill_name =""
        this.editConfig.infomation.subbill_name = ""
        this.clientId = 0
        this.saleChanceId = 0
        this.subbillId = 0
      } else if (value === "chance") {
        this.editConfig.infomation.sale_chance_name = ""
        this.saleChanceId = 0
        this.isAddQuatation = true
        this.editConfig.infomation.quotation_number = ""
        this.quotationId = 0
      } else if (value === "subbill") {
        this.editConfig.infomation.subbill_name = ""
        this.subbillId = 0
@@ -774,33 +854,21 @@
    setFormatClick() {},
    setTableForm() {
      if (this.editConfig.title === "新建" || this.editConfig.infomation.products.length === 0) {
        this.tableData = [
          {
            productId: this.productId,
            id: 0,
            amount: 0,
            desc: "",
            name: "",
            number: "",
            price: 0,
            total: 0
          }
        ]
        this.tableData = []
      } else {
        this.tableData = this.editConfig.infomation.products
        this.tableData.map((item, index) => {
          item.productId = index + 1
        })
        this.selProductData = this.editConfig.infomation.products
        this.getQuotation(this.editConfig.infomation.saleChanceId, "全部产品")
      }
      // let productData = this.quotationList.products
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: [
          { label: "#", prop: "productId", width: 40 },
          { label: "产品名称", prop: "name", productName: true, isRequird: true },
          { label: "产品名称", prop: "name", isRequird: true },
          { label: "产品编号", prop: "number" },
          { label: "数量", prop: "amount", inputNumber: true, isRequird: true },
          { label: "销售单价", prop: "price", inputFloat: true },
          { label: "价税合计", prop: "total", inputFloat: true }
          { label: "销售单价", prop: "price" },
          { label: "价税合计", prop: "total" }
        ]
      }
    },
@@ -813,43 +881,9 @@
        }
      })
    },
    // 产品新增
    addProductClick() {
      this.productId++
      this.tableData.push({
        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
    // 选择产品
    getSelectArray(val) {
      this.selProductData = val
    }
  }
}