Pārlūkot izejas kodu

返利钱包返利使用比例

zhouhao 2 gadi atpakaļ
vecāks
revīzija
4e90fdc833

+ 6 - 0
src/views/finance/components/rebate_list-confirm.vue

@@ -273,6 +273,12 @@ export default {
       this.examineStatus = res.data.items[0].examineStatus
       this.examineStatus = res.data.items[0].examineStatus
       this.saveDataList = this.deepCopy(res.data.items)
       this.saveDataList = this.deepCopy(res.data.items)
       this.dataList = res.data.items
       this.dataList = res.data.items
+
+      if (this.state !=1){
+        this.dataList.forEach(k=>{
+          k.rebateAmount = k.amount
+        })
+      }
     },
     },
     goBack() {
     goBack() {
       this.$parent.showPage = 1
       this.$parent.showPage = 1

+ 12 - 6
src/views/sales_rebate/rebate_list.vue

@@ -163,18 +163,23 @@
               </el-option>
               </el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
-
           <el-form-item label="销售类型名称" prop="saleTypeId">
           <el-form-item label="销售类型名称" prop="saleTypeId">
             <el-select
             <el-select
               v-model="dialogForm.saleTypeId"
               v-model="dialogForm.saleTypeId"
               :disabled="type == 3"
               :disabled="type == 3"
               filterable
               filterable
               @change="handleChange"
               @change="handleChange"
-              placeholder="请选择销售类型编码"
+              placeholder="请选择销售类型名称"
             >
             >
               <el-option v-for="item in typeList" :key="item.id" :label="item.saleName" :value="item.id"> </el-option>
               <el-option v-for="item in typeList" :key="item.id" :label="item.saleName" :value="item.id"> </el-option>
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
+          <el-form-item label="销售类型编码" prop="saleTypeCode">
+          <el-input disabled type="text" v-model="dialogForm.saleTypeCode"
+                    placeholder="选择销售类型自动获取销售编码"
+          />
+          </el-form-item>
+
           <el-form-item label="返利折扣比例" prop="rebateRate">
           <el-form-item label="返利折扣比例" prop="rebateRate">
             <el-input
             <el-input
               type="number"
               type="number"
@@ -247,7 +252,8 @@ export default {
         walletRebateId: '',
         walletRebateId: '',
         rebateRate: '',
         rebateRate: '',
         saleTypeId: '',
         saleTypeId: '',
-        status: ''
+        status: '',
+        saleTypeCode:''
       },
       },
       dataList: [],
       dataList: [],
       columns: [
       columns: [
@@ -386,10 +392,10 @@ export default {
 
 
     handleChange(e) {
     handleChange(e) {
       console.log(e, this.typeList)
       console.log(e, this.typeList)
-
       this.typeList.find(k => {
       this.typeList.find(k => {
-        if (e == k.saleCode) {
+        if (e == k.id) {
           this.dialogForm.saleTypeName = k.saleName
           this.dialogForm.saleTypeName = k.saleName
+          this.dialogForm.saleTypeCode = k.saleCode
           // this.dialogForm.mainId = k.mainId;
           // this.dialogForm.mainId = k.mainId;
           // this.dialogForm.mainName = k.mainName;
           // this.dialogForm.mainName = k.mainName;
         }
         }
@@ -424,7 +430,7 @@ export default {
         name: item.name,
         name: item.name,
         rebateRate: item.rebateRate,
         rebateRate: item.rebateRate,
         // rabateSort: item.rabateSort,
         // rabateSort: item.rabateSort,
-        // saleTypeCode: item.saleTypeCode,
+        saleTypeCode: item.saleTypeCode,
         saleTypeId: item.saleTypeId,
         saleTypeId: item.saleTypeId,
         // saleTypeName: item.saleTypeName,
         // saleTypeName: item.saleTypeName,
         status: item.status,
         status: item.status,