返利类型和钱包余额调整等

src/api/finance/change_list.js

@@ -1,43 +1,50 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 获取列表
 export function getChangeList(params) {
   return request({
-    url: '/finance/transfer/list',
-    method: 'get',
-    params
-  })
+    url: "/finance/transfer/list",
+    method: "get",
+    params,
+  });
 }
 //列表详情
 export function getChangeListDetail(params) {
-    return request({
-      url: '/finance/transfer/detail',
-      method: 'get',
-      params
-    })
-  }
+  return request({
+    url: "/finance/transfer/detail",
+    method: "get",
+    params,
+  });
+}
 //返利互转-审核
 export function getChangeListExamine(params) {
-    return request({
-      url: '/finance/transfer/examine',
-      method: 'post',
-      params
-    })
-  }
+  return request({
+    url: "/finance/transfer/examine",
+    method: "post",
+    params,
+  });
+}
 //返利互转-提审
 export function getTransferSubmit(params) {
   return request({
-    url: '/finance/transfer/apply',
-    method: 'post',
-    params
-  })
+    url: "/finance/transfer/apply",
+    method: "post",
+    params,
+  });
 }
 //返利互转-修改
 export function getTransferEdit(params) {
   return request({
-    url: '/finance/transfer/update',
-    method: 'post',
-    params
-  })
+    url: "/finance/transfer/update",
+    method: "post",
+    params,
+  });
+}
+//取消审核
+export function getRebateOrderCancel(params) {
+  return request({
+    url: "/rebate/order/cancel",
+    method: "post",
+    params,
+  });
 }
-

src/views/basic_data/wallet/wallet_list.vue

@@ -54,7 +54,7 @@
         <el-button type="primary" v-if="false" size="small">更新</el-button>
       </div>
       <div class="fr">
-        <el-button type="primary" size="small">导出</el-button>
+        <el-button type="primary" v-if="false" size="small">导出</el-button>
       </div>
     </div>
     <!-- 列表 -->

src/views/dashboard/index.vue

@@ -285,6 +285,7 @@ import {
   confirmCheck,
   getRebateOrderList,
 } from "@/api/dashboard";
+import { getFileUrl } from "@/api/common";
 import { mapGetters } from "vuex";
 import { getInfo, getOrder, getGoodsRank } from "@/api/dashboard";
 import { dateFormat } from "@/utils/util";
@@ -318,6 +319,12 @@ export default {
   },
 
   methods: {
+    // 打开链接
+    openLink(url) {
+      getFileUrl({ key: url }).then((res) => {
+        window.open(res.data);
+      });
+    },
     //复核
     secondFn(id) {
       this.$router.push({

src/views/finance/change_list.vue

@@ -203,7 +203,7 @@
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               align="center"
               label="复核人"
               prop="secondExamineBy"
@@ -216,7 +216,7 @@
               prop="secondExamineTime"
               min-width="160"
               show-overflow-tooltip
-            ></el-table-column>
+            ></el-table-column> -->
             <el-table-column
               align="center"
               label="状态"
@@ -256,16 +256,27 @@
               <template slot-scope="scope">
                 <el-button
                   @click="submitFn(scope.row.id)"
-                  v-if="$checkBtnRole('apply', $route.meta.roles)"
+                  v-if="
+                    $checkBtnRole('apply', $route.meta.roles) &&
+                    isCustomer &&
+                    scope.row.examineStatus == 'SAVE'
+                  "
                   type="text"
                   class="textColor"
                   slot="reference"
                   >提审</el-button
                 >
                 <el-button
+                  v-if="isCustomer && scope.row.examineStatus == 'WAIT'"
+                  type="text"
+                  class="textColor"
+                  slot="reference"
+                  >撤回</el-button
+                >
+                <el-button
                   v-if="
-                    (scope.row.examineStatus == 'WAIT' ||
-                      scope.row.examineStatus == 'OK_ONE') &&
+                    scope.row.examineStatus == 'WAIT' &&
+                    !isCustomer &&
                     $checkBtnRole('examine', $route.meta.roles)
                   "
                   @click="examineFn(scope.row.id)"
@@ -276,7 +287,7 @@
                 >
                 <el-button
                   v-if="
-                    (scope.row.examineStatus == 'WAIT' ||
+                    (scope.row.examineStatus == 'FAIL_ONE' ||
                       scope.row.examineStatus == 'SAVE') &&
                     $checkBtnRole('edit', $route.meta.roles)
                   "
@@ -343,6 +354,7 @@ export default {
   },
   data() {
     return {
+      isCustomer: null,
       currentPage: 1, // 当前页码
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
@@ -359,6 +371,8 @@ export default {
     };
   },
   created() {
+    const res = JSON.parse(localStorage.getItem("supply_user"));
+    this.isCustomer = res.isCustomer;
     this.getDataList({ pageSize: this.pageSize, pageNum: this.currentPage });
   },
   methods: {

src/views/finance/components/change_list-detail.vue

@@ -16,7 +16,7 @@
               <el-input
                 disabled
                 v-model="detailList.id"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -25,13 +25,17 @@
               <el-input
                 disabled
                 v-model="detailList.theTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="制单人" prop="">
-              <el-input disabled placeholder="请输入"></el-input>
+              <el-input
+                v-model="detailList.createBy"
+                disabled
+                placeholder=""
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
@@ -39,7 +43,7 @@
               <el-input
                 disabled
                 v-model="detailList.customerNumber"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -48,7 +52,7 @@
               <el-input
                 disabled
                 v-model="detailList.customerName"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -57,7 +61,7 @@
               <el-input
                 disabled
                 v-model="detailList.remark"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -66,7 +70,7 @@
               <el-input
                 disabled
                 v-model="detailList.examineBy"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -75,11 +79,11 @@
               <el-input
                 disabled
                 v-model="detailList.examineTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
+          <!-- <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="关闭人" prop="">
               <el-input disabled placeholder="请输入"></el-input>
             </el-form-item>
@@ -88,7 +92,7 @@
             <el-form-item label="关闭日期" prop="">
               <el-input disabled placeholder="请输入"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
     </div>
@@ -175,5 +179,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

src/views/finance/components/change_list-examine.vue

@@ -13,27 +13,24 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="返利互转单号" prop="">
-              <el-input v-model="detailList.id" placeholder="请输入"></el-input>
+              <el-input v-model="detailList.id" placeholder=""></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据日期" prop="">
-              <el-input
-                v-model="detailList.theTime"
-                placeholder="请输入"
-              ></el-input>
+              <el-input v-model="detailList.theTime" placeholder=""></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="制单人" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input placeholder=""></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商编号" prop="">
               <el-input
                 v-model="detailList.customerNumber"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -41,23 +38,20 @@
             <el-form-item label="经销商名称" prop="">
               <el-input
                 v-model="detailList.customerName"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="备注信息" prop="">
-              <el-input
-                v-model="detailList.remark"
-                placeholder="请输入"
-              ></el-input>
+              <el-input v-model="detailList.remark" placeholder=""></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
+          <!-- <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="审核人" prop="">
               <el-input
                 v-model="detailList.examineBy"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
@@ -65,10 +59,10 @@
             <el-form-item label="审核日期" prop="">
               <el-input
                 v-model="detailList.examineTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
     </div>
@@ -196,6 +190,7 @@ export default {
         examineStatus: this.examineStatus,
       });
       this.$message.success("已审核");
+      this.goBack();
     },
     goBack() {
       this.$emit("refresh");
@@ -206,5 +201,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

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

@@ -19,63 +19,73 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="返利互转单号" prop="">
-              <el-input v-model="detailList.id" placeholder="请输入"></el-input>
+              <el-input
+                disabled
+                v-model="detailList.id"
+                placeholder=""
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="单据日期" prop="">
               <el-input
+                disabled
                 v-model="detailList.theTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="制单人" prop="">
-              <el-input placeholder="请输入"></el-input>
+              <el-input
+                disabled
+                v-model="detailList.createBy"
+                placeholder=""
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商编号" prop="">
               <el-input
+                disabled
                 v-model="detailList.customerNumber"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="经销商名称" prop="">
               <el-input
+                disabled
                 v-model="detailList.customerName"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="备注信息" prop="">
-              <el-input
-                v-model="detailList.remark"
-                placeholder="请输入"
-              ></el-input>
+              <el-input v-model="detailList.remark" placeholder=""></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="审核人" prop="">
               <el-input
+                disabled
                 v-model="detailList.examineBy"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="审核日期" prop="">
               <el-input
+                disabled
                 v-model="detailList.examineTime"
-                placeholder="请输入"
+                placeholder=""
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
+          <!-- <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="复核人" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
@@ -84,7 +94,7 @@
             <el-form-item label="复核日期" prop="">
               <el-input placeholder="请输入"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
       </el-form>
     </div>
@@ -238,6 +248,7 @@ export default {
         amount: amount * 1,
       });
       this.$message.success("修改成功");
+      this.goBack();
     },
     goBack() {
       this.$emit("refresh");
@@ -247,5 +258,4 @@ export default {
 };
 </script>
 
-<style>
-</style>
+<style></style>

src/views/finance/wallet.vue

@@ -80,13 +80,6 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            label="钱包类型"
-            prop="mainName"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
             label="钱包"
             prop="name"
             min-width="160"
@@ -153,13 +146,6 @@
           ></el-table-column>
           <el-table-column
             align="center"
-            label="返利比例"
-            prop="rebateRate"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-          <el-table-column
-            align="center"
             label="钱包余额"
             prop="amount"
             min-width="160"

src/views/sales_rebate/rebate_list.vue

@@ -52,6 +52,7 @@
               </el-select>
             </el-form-item>
           </el-col>
+
           <el-col :xs="24" :ms="18" :lg="18">
             <el-form-item>
               <el-button
@@ -80,7 +81,11 @@
                   >批量删除</el-button
                 >
               </el-popconfirm>
-              <el-button type="primary" size="small" @click="submitScreenForm"
+              <el-button
+                icon="el-icon-search"
+                type="primary"
+                size="small"
+                @click="submitScreenForm"
                 >查询</el-button
               >
               <el-button type="primary" size="small" @click="resetScreenForm"
@@ -174,7 +179,7 @@
     <div>
       <el-dialog
         :visible.sync="dialogVisible"
-        width="50%"
+        width="30%"
         @close="hanelclose"
         title="返利类型"
       >
@@ -223,6 +228,15 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="返利折扣比例" prop="rebateRate">
+            <el-input
+              type="number"
+              placeholder="例如0.1=1折"
+              :disabled="type == 3"
+              @change="handleNumber"
+              v-model.number="dialogForm.rebateRate"
+            ></el-input>
+          </el-form-item>
           <!-- <el-form-item label="销售类型编码" prop="saleTypeCode">
             <el-input
               v-model="dialogForm.saleTypeCode"
@@ -288,8 +302,9 @@ export default {
       },
       dialogForm: {
         walletRebateId: "",
-
+        rebateRate: "",
         saleTypeId: "",
+        status: "",
       },
       dataList: [],
       columns: [
@@ -364,9 +379,9 @@ export default {
           { required: true, message: "请选择销售类型", trigger: "blur" },
         ],
 
-        // rebateRate: [
-        //   { required: true, message: "请输入比例", trigger: "blur" },
-        // ],
+        rebateRate: [
+          { required: true, message: "请输入比例", trigger: "blur" },
+        ],
       },
     };
   },
@@ -400,7 +415,7 @@ export default {
       const params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        mainName: this.screenForm.mainName,
+        // mainName: this.screenForm.mainName,
         saleTypeCode: this.screenForm.saleTypeCode,
         saleTypeName: this.screenForm.saleTypeName,
         status: this.screenForm.status,
@@ -411,12 +426,12 @@ export default {
         this.listTotal = res.data.total;
         this.listLoading = false;
       });
-      getProductList({
-        productCategoryName: "",
-        productCategoryNumber: "",
-      }).then((res) => {
-        this.productList = res.data;
-      });
+      // getProductList({
+      //   productCategoryName: "",
+      //   productCategoryNumber: "",
+      // }).then((res) => {
+      //   this.productList = res.data;
+      // });
     },
 
     handleChange(e) {
@@ -455,7 +470,7 @@ export default {
         // adminCompanyId: item.adminCompanyId,
 
         name: item.name,
-        // rebateRate: item.rebateRate,
+        rebateRate: item.rebateRate,
         // rabateSort: item.rabateSort,
         // saleTypeCode: item.saleTypeCode,
         saleTypeId: item.saleTypeId,

src/views/sales_rebate/rebate_list_type.vue

@@ -5,20 +5,21 @@
         ref="screenForm"
         :model="screenForm"
         size="small"
+        label-width="100px"
         label-position="left"
       >
         <el-row :gutter="20">
           <el-col :xs="24" :ms="6" :lg="6">
-            <el-form-item label="" prop="mainName">
+            <el-form-item label="返利类型" prop="name">
               <el-input
                 v-model="screenForm.name"
-                placeholder="返利类型"
+                placeholder="请输入返利类型"
                 size="small"
               ></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :xs="24" :ms="6" :lg="6">
+          <!-- <el-col :xs="24" :ms="6" :lg="6">
             <el-form-item prop="status">
               <el-select
                 v-model="screenForm.status"
@@ -34,18 +35,23 @@
                 </el-option>
               </el-select>
             </el-form-item>
-          </el-col>
-          <el-col :xs="24" :ms="18" :lg="18">
+          </el-col> -->
+          <el-col :xs="24" :ms="18" :lg="24">
             <el-form-item>
               <el-button
                 type="primary"
                 size="small"
+                icon="el-icon-plus"
                 v-if="$checkBtnRole('add', $route.meta.roles)"
                 @click="(dialogVisible = true), (type = 1), getDictList()"
                 >新增</el-button
               >
 
-              <el-button type="primary" size="small" @click="submitScreenForm"
+              <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-search"
+                @click="submitScreenForm"
                 >查询</el-button
               >
               <el-button type="primary" size="small" @click="resetScreenForm"
@@ -136,7 +142,7 @@
     <div>
       <el-dialog
         :visible.sync="dialogVisible"
-        width="50%"
+        width="30%"
         @close="hanelclose"
         title="返利类型"
       >
@@ -159,7 +165,7 @@
             <el-input v-model="dialogForm.mainName" :readonly="true"></el-input>
           </el-form-item> -->
 
-          <el-form-item label="返利折扣比例" prop="rebateRate">
+          <!-- <el-form-item label="返利折扣比例" prop="rebateRate">
             <el-input
               type="number"
               placeholder="例如0.1=1折"
@@ -167,8 +173,8 @@
               @change="handleNumber"
               v-model.number="dialogForm.rebateRate"
             ></el-input>
-          </el-form-item>
-
+          </el-form-item> -->
+          <!-- 
           <el-form-item label="状态" prop="status">
             <el-switch
               v-model="dialogForm.status"
@@ -178,7 +184,7 @@
               :active-text="dialogForm.status ? '启用' : ''"
             >
             </el-switch>
-          </el-form-item>
+          </el-form-item> -->
         </el-form>
         <template v-if="type !== 3">
           <span slot="footer" class="dialog-footer">
@@ -217,12 +223,12 @@ export default {
       },
       dialogForm: {
         name: "",
-        mainName: "",
-        mainId: "",
-        saleTypeCode: "",
-        saleTypeName: "",
-        rebateRate: "",
-        status: "",
+        // mainName: "",
+        // mainId: "",
+        // saleTypeCode: "",
+        // saleTypeName: "",
+        // rebateRate: "",
+        // status: "",
       },
       dataList: [],
       columns: [
@@ -231,16 +237,16 @@ export default {
           lable: "返利类型",
           widht: 160,
         },
-        {
-          prop: "rebateRate",
-          lable: "返利折扣比例",
-          widht: 160,
-        },
-        {
-          prop: "status",
-          lable: "状态",
-          widht: 160,
-        },
+        // {
+        //   prop: "rebateRate",
+        //   lable: "返利折扣比例",
+        //   widht: 160,
+        // },
+        // {
+        //   prop: "status",
+        //   lable: "状态",
+        //   widht: 160,
+        // },
         {
           prop: "createBy",
           lable: "创建人",
@@ -280,13 +286,13 @@ export default {
       typeList: [],
       rules: {
         name: [{ required: true, message: "请输入名称", trigger: "blur" }],
-        saleTypeCode: [
-          { required: true, message: "请选择编码", trigger: "blur" },
-        ],
+        // saleTypeCode: [
+        //   { required: true, message: "请选择编码", trigger: "blur" },
+        // ],
 
-        rebateRate: [
-          { required: true, message: "请输入比例", trigger: "blur" },
-        ],
+        // rebateRate: [
+        //   { required: true, message: "请输入比例", trigger: "blur" },
+        // ],
       },
     };
   },
@@ -307,12 +313,12 @@ export default {
         this.listTotal = res.data.total;
         this.listLoading = false;
       });
-      getProductList({
-        productCategoryName: "",
-        productCategoryNumber: "",
-      }).then((res) => {
-        this.productList = res.data;
-      });
+      // getProductList({
+      //   productCategoryName: "",
+      //   productCategoryNumber: "",
+      // }).then((res) => {
+      //   this.productList = res.data;
+      // });
     },
 
     handleChange(e) {
@@ -349,8 +355,8 @@ export default {
       console.log(item);
       this.dialogForm = {
         adminCompanyId: item.adminCompanyId,
-        mainId: "",
-        mainName: "",
+        // mainId: "",
+        // mainName: "",
         name: item.name,
         rebateRate: item.rebateRate,
         rabateSort: item.rabateSort,
@@ -402,6 +408,7 @@ export default {
             const params = {
               ...this.dialogForm,
             };
+
             addWallet(params).then((res) => {
               console.log(res);
               this.$successMsg("添加成功");
@@ -425,8 +432,8 @@ export default {
     hanleReset() {
       this.dialogForm = {
         name: "",
-        mainId: "",
-        mainName: "",
+        // mainId: "",
+        // mainName: "",
         saleTypeCode: "",
         saleTypeName: "",
         rabateRate: "",