返利更改

src/api/finance/rebate_list.js

@@ -63,3 +63,11 @@ export function getRebateOrderBatchDel(params) {
     params,
   });
 }
+// 复核前-编辑
+export function getRebateOrderAclUpdate(data) {
+  return request({
+    url: "/rebate/order/ackUpdate",
+    method: "post",
+    data,
+  });
+}

src/views/deposit_commerce/refund_list.vue

@@ -329,42 +329,19 @@
                 <span>{{scope.row.confirmName}}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="金额"
-              prop="totalAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="金额" prop="totalPrice" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.totalAmount | numToFixed}}
-            </template>
+                {{ scope.row.totalPrice | numToFixed}}
+              </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="发货数量"
-              prop="hasSendQty"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="right"
-              label="押金金额"
-              prop="depositAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
-             <template slot-scope="scope">
+            <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
                 {{ scope.row.depositAmount | numToFixed}}
-            </template>
+              </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="上交资料"
-              prop="itemDataQty"
-              min-width="160"
-              show-overflow-tooltip
-            />
+            <el-table-column align="right" label="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-button type="text" class="textColor" v-if="
@@ -675,8 +652,16 @@ export default {
     async getDataList(data) {
       const res = await getDepositManageList(data);
       res.data.records.forEach((item) => {
-        item.sums1 = ['hasSendQty','itemDataQty'];
-        item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount']
+        item.totalPrice = item.itemPrice * item.itemQty;
+        item.sums1 = ["hasSendQty", "itemDataQty"];
+        item.sums2 = [
+          "itemDepositAmount",
+          "diffAmount",
+          "price",
+          "totalAmount",
+          "depositAmount",
+          "totalPrice",
+        ];
       });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;

src/views/deposit_home/refund_list.vue

@@ -262,14 +262,12 @@
                 <span>{{scope.row.refTradeCategory}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="使用单位
-" prop="refUseUnit" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refUseUnit" />
                 <span>{{scope.row.refUseUnit}}</span>
               </template>
             </el-table-column>
-
             <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refRegionWork" />
@@ -328,42 +326,19 @@
                 <span>{{scope.row.confirmName}}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="金额"
-              prop="totalAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column align="right" label="金额" prop="totalPrice" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.totalAmount | numToFixed}}
-            </template>
+                {{ scope.row.totalPrice | numToFixed}}
+              </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="发货数量"
-              prop="hasSendQty"
-              min-width="160"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              align="right"
-              label="押金金额"
-              prop="depositAmount"
-              min-width="160"
-              show-overflow-tooltip
-            >
-             <template slot-scope="scope">
+            <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="160" show-overflow-tooltip />
+            <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
                 {{ scope.row.depositAmount | numToFixed}}
-            </template>
+              </template>
             </el-table-column>
-            <el-table-column
-              align="right"
-              label="上交资料"
-              prop="itemDataQty"
-              min-width="160"
-              show-overflow-tooltip
-            />
+            <el-table-column align="right" label="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-button type="text" class="textColor" v-if="
@@ -674,8 +649,16 @@ export default {
     async getDataList(data) {
       const res = await getDepositManageList(data);
       res.data.records.forEach((item) => {
-        item.sums1 = ['hasSendQty','itemDataQty'];
-        item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount']
+        item.totalPrice = item.itemPrice * item.itemQty;
+        item.sums1 = ["hasSendQty", "itemDataQty"];
+        item.sums2 = [
+          "itemDepositAmount",
+          "diffAmount",
+          "price",
+          "totalAmount",
+          "depositAmount",
+          "totalPrice",
+        ];
       });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;

src/views/finance/components/rebate_list-confirm.vue

@@ -64,12 +64,12 @@
           </el-table-column>
           <el-table-column align="right" label="返利金额" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input class="mountclass" :disabled='isShow' type='number' v-model="scope.row.rebateAmount"></el-input>
+              <el-input class="mountclass" :disabled='show' type='number' v-model="scope.row.rebateAmount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="right" label="折让金额" prop="" min-width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input class="mountclass" :disabled='isShow' type="number" v-model="scope.row.allowanceAmount"></el-input>
+              <el-input class="mountclass" :disabled='show' type="number" v-model="scope.row.allowanceAmount"></el-input>
             </template>
           </el-table-column>
           <el-table-column align="left" label="备注" prop="policyDocNo" min-width="160" show-overflow-tooltip></el-table-column>
@@ -77,7 +77,7 @@
       </div>
     </div>
     <br />
-    <div v-if="!isShow">
+    <div v-if="!show">
       <el-button type="primary" size="small" @click="btnFn">确定</el-button>
       <el-button type="primary" size="small" @click="resetFn">重置</el-button>
     </div>
@@ -88,6 +88,7 @@
 import {
   getRebateOrderDetail,
   getRebateOrderAck,
+  getRebateOrderAclUpdate,
 } from "@/api/finance/rebate_list";
 export default {
   props: {
@@ -102,6 +103,8 @@ export default {
   },
   data() {
     return {
+      state: null,
+      examineStatus: "",
       searchForm: {
         rebateOrderId: "",
         theTime: "",
@@ -114,6 +117,22 @@ export default {
       listLoading: false, // 列表加载loading
     };
   },
+  computed: {
+    show() {
+      if (this.isShow && this.examineStatus == "OK_ONE") {
+        this.state = 1;
+        return false;
+      } else if (!this.isShow) {
+        this.state = 2;
+        return false;
+      } else if (
+        this.isShow &&
+        (this.examineStatus == "OK" || this.examineStatus == "FAIL")
+      ) {
+        return true;
+      }
+    },
+  },
   created() {
     this.getDataList();
   },
@@ -177,9 +196,15 @@ export default {
         };
       });
       // console.log(res, 888);
-      await getRebateOrderAck(res);
+      if (this.state == 1) {
+        await getRebateOrderAclUpdate(res);
+        this.$message.success("编辑成功");
+      } else {
+        await getRebateOrderAck(res);
+        this.$message.success("确认成功");
+      }
+
       this.$emit("updateList");
-      this.$message.success("确认成功");
       this.$parent.showPage = 1;
     },
     //获取详情数据
@@ -195,9 +220,9 @@ export default {
       this.searchForm.secondExamineTime = res.data.secondExamineTime;
       this.searchForm.examineBy = res.data.examineBy;
       this.searchForm.examineTime = res.data.examineTime;
+      this.examineStatus = res.data.items[0].examineStatus;
       this.saveDataList = this.deepCopy(res.data.items);
       this.dataList = res.data.items;
-      this;
     },
     goBack() {
       this.$parent.showPage = 1;

src/views/finance/components/rebate_list-review.vue

@@ -95,8 +95,8 @@
     <el-divider></el-divider>
     <!-- 列表 -->
     <el-radio-group @change="changeRadioFn" v-model="examine" size="mini">
-      <el-radio-button :label="1">已确认</el-radio-button>
       <el-radio-button :label="2">已确认待复核</el-radio-button>
+      <el-radio-button :label="1">已确认已复核</el-radio-button>
       <el-radio-button :label="3">未确认</el-radio-button>
     </el-radio-group>
     <div class="mymain-container">
@@ -195,7 +195,7 @@ export default {
       trueList: [],
       falseList: [],
       trueOKList: [],
-      examine: 1,
+      examine: 2,
       examineRemark: "",
       examineStatus: "OK",
       searchForm: {
@@ -262,14 +262,18 @@ export default {
       this.searchForm.examineBy = res.data.examineBy;
       this.searchForm.examineTime = res.data.examineTime;
       this.dataList = res.data.items;
-      this.trueList = res.data.items.filter((v) => v.customerIsConfirm == true);
+      this.trueList = res.data.items.filter(
+        (v) =>
+          v.customerIsConfirm == true &&
+          (v.examineStatus == "OK" || v.examineStatus == "FAIL")
+      );
       this.falseList = res.data.items.filter(
         (v) => v.customerIsConfirm == false
       );
       this.trueOKList = res.data.items.filter(
         (v) => v.customerIsConfirm == true && v.examineStatus == "OK_ONE"
       );
-      this.dataList2 = this.trueList;
+      this.dataList2 = this.trueOKList;
     },
     goBack() {
       this.$parent.showPage = 1;

src/views/finance/rebate_list.vue

@@ -209,10 +209,11 @@
                   " @click="
                     confirmFn(
                       scope.row.rebateOrderId,
-                      scope.row.customerIsConfirm
+                      scope.row.customerIsConfirm,
+                      
                     )
                   ">{{
-                    scope.row.customerIsConfirm == true ? "详情" : "确认"
+                    scope.row.customerIsConfirm == true && scope.row.examineStatus == 'OK_ONE' ? "编辑" : scope.row.customerIsConfirm == false?'确定':'详情'
                   }}</el-button>
               </template>
             </el-table-column>