Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-10 5d0120d2e8a6e5cd2e1e95d4c5ffeecf5fc1c4a6

 src/views/sales/refundForm/AddRefundFormDialog.vue

@@ -13,7 +13,7 @@
        :model="editConfig.infomation"
        :rules="rules"
        label-position="right"
        label-width="308px"
        label-width="30%"
        size="mini"
        style="height: 60vh; overflow-x: hidden"
      >
@@ -27,45 +27,72 @@
                <el-form-item label="客户名称" prop="client_name">
                  <div class="custom-name">
                    <el-autocomplete
                    style="width:100%"
                      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">
                      <i class="el-icon-edit-outline" title="清除"></i>
                    <div
                      v-if="editConfig.infomation.client_name && editConfig.infomation.client_name.length > 0"
                      class="common-select-btn"
                      @click="clearupClient('client')"
                    >
                      <i class="el-icon-remove-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-input v-model="editConfig.infomation.number" 
                    style="width:100%"></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-col :span="12">
                <el-form-item label="销售退货单" prop="sale_return_nunber">
                  <div class="custom-name">
                    <el-autocomplete
                    
                    style="width:100%"
                      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
                      v-if="
                        editConfig.infomation.sale_return_nunber && editConfig.infomation.sale_return_nunber.length > 0
                      "
                      class="common-select-btn"
                      @click="clearupClient('salesReturn')"
                    >
                    </el-option>
                  </el-select>
                      <i class="el-icon-remove-outline"></i>
                    </div>
                  </div>
                </el-form-item>
              </el-col> -->
              </el-col>
              <el-col :span="12">
                <el-form-item label="销售负责人" prop="memberId">
                  <el-select
                  style="width:100%"
                    v-model="editConfig.infomation.memberId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    </el-option>
@@ -75,6 +102,7 @@
              <el-col :span="12">
                <el-form-item label="退款日期" prop="refundDate">
                  <el-date-picker
                  style="width:100%"
                    v-model="editConfig.infomation.refundDate"
                    value-format="yyyy-MM-dd"
                    type="date"
@@ -87,12 +115,18 @@
                <el-form-item label="付款方式" prop="paymentTypeId">
                  <div class="common-select">
                    <el-select
                    style="width:100%"
                      v-model="editConfig.infomation.paymentTypeId"
                      placeholder="请选择"
                      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 +134,11 @@
                </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"
                    style="width:100%"
                      v-model="editConfig.infomation.bankAccountId"
                      placeholder="请选择"
                      class="common-select-sel"
                      size="mini"
@@ -119,6 +154,7 @@
                <el-form-item label="是否开票" prop="isInvoice">
                  <div class="common-select">
                    <el-select
                    style="width:100%"
                      v-model="editConfig.infomation.isInvoice"
                      placeholder="请选择"
                      class="common-select-sel"
@@ -137,8 +173,9 @@
          <div class="basic-info-view">
            <el-row>
              <el-col :span="24">
                <el-form-item label="退款原因" prop="reason">
                <el-form-item label="退款原因" prop="reason" label-width="15%">
                  <el-input
                  style="width:100%"
                    type="textarea"
                    :autosize="{ minRows: 2 }"
                    v-model="editConfig.infomation.reason"
@@ -188,6 +225,7 @@
          <div class="product-view">
            <CommonFormTableView
              :show-summary="showSummary"
              :detail-enter="detailEnter"
              :product-table-list="productTableList"
              @inputContent="inputContent"
              @addProductClick="addProductClick"
@@ -248,6 +286,12 @@
        :edit-common-config="editSelectClientConfig"
        @selClient="selClient"
      />
      <!-- 选择销售退货单 -->
      <SelectCommonDialog
        v-if="editSelCommonConfig.editVisible"
        :edit-common-config="editSelCommonConfig"
        @selClient="selClient"
      />
    </el-dialog>
  </div>
</template>
@@ -257,6 +301,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,26 +317,29 @@
      }
    }
  },
  components: { CommonFormTableView, SelectClientDialog },
  components: { CommonFormTableView, SelectClientDialog, SelectCommonDialog },
  computed: {
    clientList() {
      return this.$store.state.getClientName.clientList
    },
    salesReturnList() {
      return this.$store.state.getClientName.salesReturnList
    }
  },
  data() {
    return {
      dialogWidth: "80%",
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        clientId: [{ required: true, message: "请输入", trigger: "blur" }],
        number: [{ required: true, message: "请输入", trigger: "blur" }],
        refundDate: [{ required: true, message: "请选择", trigger: "change" }],
        memberId: [{ required: true, message: "请选择", trigger: "change" }],
        account: [{ required: true, message: "请选择", trigger: "change" }]
        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" }],
        sale_return_nunber: [{ required: true, message: "请选择销售退货单", trigger: "change" }]
      },
      memberOptions: [],
      // selSourceOrderOptions: [{ value: "1", label: "销售退货单" }], // 选择源单
      refundMethodOptions: [], // 付款方式
      paymentTypeListOptions: [], // 付款方式
      accountOptions: [], // 账户
      isInvoiceOptions: ["是", "否"], // 是否开票
      currencyOptions: [{ id: 1, name: "人民币" }], // 币种
@@ -299,37 +348,46 @@
      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) => {
        if (res.data.code === 200) {
          this.paymentTypeListOptions = res.data.data.data
        }
      })
    },
    // 保存
    saveClick(formName) {
@@ -380,15 +438,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 +457,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 +542,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 },