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,6 +27,7 @@
                <el-form-item label="客户名称" prop="client_name">
                  <div class="custom-name">
                    <el-autocomplete
                    style="width:100%"
                      v-model="editConfig.infomation.client_name"
                      :fetch-suggestions="
                        (queryString, callback) => {
@@ -39,21 +40,28 @@
                    <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('client')">
                      <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="sale_return_nunber">
                  <div class="custom-name">
                    <el-autocomplete
                    
                    style="width:100%"
                      v-model="editConfig.infomation.sale_return_nunber"
                      :fetch-suggestions="
                        (queryString, callback) => {
@@ -66,8 +74,14 @@
                    <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
                      v-if="
                        editConfig.infomation.sale_return_nunber && editConfig.infomation.sale_return_nunber.length > 0
                      "
                      class="common-select-btn"
                      @click="clearupClient('salesReturn')"
                    >
                      <i class="el-icon-remove-outline"></i>
                    </div>
                  </div>
                </el-form-item>
@@ -75,10 +89,10 @@
              <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>
@@ -88,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"
@@ -100,6 +115,7 @@
                <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"
@@ -121,6 +137,7 @@
                <el-form-item label="账户" prop="bankAccountId">
                  <div class="common-select">
                    <el-select
                    style="width:100%"
                      v-model="editConfig.infomation.bankAccountId"
                      placeholder="请选择"
                      class="common-select-sel"
@@ -137,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"
@@ -155,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"
@@ -309,14 +328,14 @@
  },
  data() {
    return {
      dialogWidth: "80%",
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        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" }]
        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: "销售退货单" }], // 选择源单
@@ -365,8 +384,6 @@
    },
    async getPaymentTypeList() {
      await getPaymentTypeList().then((res) => {
        console.log("支付方式")
        console.log(res.data)
        if (res.data.code === 200) {
          this.paymentTypeListOptions = res.data.data.data
        }