Merge branch 'feature/提货人档案' into dev_v2

src/views/sales/price/commercial_list.vue

@@ -2,7 +2,6 @@
   <template-page
     ref="pageRef"
     :getList="getList"
-    :operation="operation()"
     :optionsEvensGroup="optionsEvensGroup"
     :exportList="exportList"
     :columnParsing="columnParsing"
@@ -108,65 +107,65 @@ export default {
     selectionChange(data) {
       this.recordSelected = data
     },
-    operation() {
-      return (h, { row, index, column }) => {
-        return (
-          <div class="operation-btns">
-            <el-button
-              size="mini"
-              type="text"
-              onClick={async () => {
-                this.seeFn(row)
-              }}
-            >
-              查看
-            </el-button>
+    // operation() {
+    //   return (h, { row, index, column }) => {
+    //     return (
+    //       <div class="operation-btns">
+    //         <el-button
+    //           size="mini"
+    //           type="text"
+    //           onClick={async () => {
+    //             this.seeFn(row)
+    //           }}
+    //         >
+    //           查看
+    //         </el-button>
 
-            {this.$checkBtnRole('del', this.$route.meta.roles) ? (
-              <el-popconfirm
-                onOnConfirm={async () => {
-                  this.deleFn(row.id)
-                }}
-                title="是否确定需要删除该项内容?"
-              >
-                <el-button slot="reference" size="mini" type="text">
-                  删除
-                </el-button>
-              </el-popconfirm>
-            ) : (
-              ''
-            )}
+    //         {this.$checkBtnRole('del', this.$route.meta.roles) ? (
+    //           <el-popconfirm
+    //             onOnConfirm={async () => {
+    //               this.deleFn(row.id)
+    //             }}
+    //             title="是否确定需要删除该项内容?"
+    //           >
+    //             <el-button slot="reference" size="mini" type="text">
+    //               删除
+    //             </el-button>
+    //           </el-popconfirm>
+    //         ) : (
+    //           ''
+    //         )}
 
-            {row.flag === 1 ? (
-              <el-button
-                size="mini"
-                type="text"
-                onClick={async () => {
-                  this.stopFn(row.id)
-                }}
-              >
-                停用
-              </el-button>
-            ) : (
-              ''
-            )}
-            {row.flag === 2 ? (
-              <el-button
-                size="mini"
-                type="text"
-                onClick={async () => {
-                  this.rebuild(row)
-                }}
-              >
-                重建
-              </el-button>
-            ) : (
-              ''
-            )}
-          </div>
-        )
-      }
-    },
+    //         {row.flag === 1 ? (
+    //           <el-button
+    //             size="mini"
+    //             type="text"
+    //             onClick={async () => {
+    //               this.stopFn(row.id)
+    //             }}
+    //           >
+    //             停用
+    //           </el-button>
+    //         ) : (
+    //           ''
+    //         )}
+    //         {row.flag === 2 ? (
+    //           <el-button
+    //             size="mini"
+    //             type="text"
+    //             onClick={async () => {
+    //               this.rebuild(row)
+    //             }}
+    //           >
+    //             重建
+    //           </el-button>
+    //         ) : (
+    //           ''
+    //         )}
+    //       </div>
+    //     )
+    //   }
+    // },
 
     // 更改每页数量
     handleSizeChange(val) {

src/views/sales_rebate/rebate_list.vue

@@ -104,7 +104,8 @@ import {
   getWalletRebateSaletypelist,
   getWalletRebateSaletypeUpdate,
   walletRebateSaletypeListV2,
-  walletRebateSaletypeListV2Export
+  walletRebateSaletypeListV2Export,
+  getWalletRebateSaletypeDetail
 } from '@/api/policy_list'
 
 export default {
@@ -135,14 +136,11 @@ export default {
                   this.$message.error('请选择需要删除的数据')
                   return
                 }
-                let messengerLevelId = this.recordSelected.map(v => {
-                  return v.messengerLevelId
-                })
-                let params = messengerLevelId
-                await levelDel(params)
+                this.delfn()
                 this.$refs.pageRef.refreshList()
                 this.$message.success('批量删除成功')
-              }
+              },
+              isRole: this.$checkBtnRole('del', this.$route.meta.roles)
             }
           ]
         ]
@@ -306,6 +304,11 @@ export default {
     },
 
     //
+    async getDetail(walletRebateSaleTypeId) {
+      return await getWalletRebateSaletypeDetail({ walletRebateSaleTypeId })
+    },
+
+    //
     selectionhangeFn(value) {
       console.log(value)
       this.ids = value.map(v => v.walletRebateSaleTypeId)
@@ -316,11 +319,8 @@ export default {
       //   this.$message.error("请选择列表数据");
       //   return;
       // }
-      let res = this.ids.toString()
+      let res = this.recordSelected.map(v => v.walletRebateSaleTypeId).toString()
       await getWalletRebateSaletypeDelete({ walletRebateSaleTypeIds: res })
-      this.getList()
-      this.$message.success('删除成功')
-      this.ids = []
     },
     //获取钱包列表
     async getWalletList() {
@@ -355,7 +355,6 @@ export default {
     // },
 
     handleChange(e) {
-      console.log(e, this.typeList)
       this.typeList.find(k => {
         if (e == k.id) {
           this.dialogForm.saleTypeName = k.saleName
@@ -386,29 +385,29 @@ export default {
         // this.hanleReset();
       })
     },
-    hanleEdit(item) {
-      console.log(item)
+    async hanleEdit(item) {
+      let { data } = await this.getDetail(item.walletRebateSaleTypeId)
       this.dialogForm = {
         // adminCompanyId: item.adminCompanyId,
 
-        name: item.name,
-        rebateRate: item.rebateRate,
+        // name: item.name,
+        rebateRate: data.rebateRate,
         // rabateSort: item.rabateSort,
-        saleTypeCode: item.saleTypeCode,
-        saleTypeId: item.saleTypeId,
+        // saleTypeCode: item.saleTypeCode,
+        saleTypeId: data.saleTypeId,
         // saleTypeName: item.saleTypeName,
-        status: item.status,
-        walletRebateId: item.walletRebateId,
-        walletRebateSaleTypeId: item.walletRebateSaleTypeId
+        status: data.status,
+        walletRebateId: data.walletRebateId,
+        walletRebateSaleTypeId: data.walletRebateSaleTypeId
       }
-      this.getDictList()
+      await this.getDictList()
+      this.handleChange(data.saleTypeId)
       this.dialogVisible = true
     },
     getDictList() {
       getDictList({
         sysDictEnum: 'PRODUCT_TYPE'
       }).then(res => {
-        console.log(res)
         this.dictListData = res.data
       })
       const params = {
@@ -422,13 +421,22 @@ export default {
         this.typeList = res.data.records
       })
     },
-    hanleDateil(item) {
+    async hanleDateil(item) {
+      let { data } = await this.getDetail(item.walletRebateSaleTypeId)
       this.type = 3
       this.dialogVisible = true
       this.dialogForm = {
-        ...item,
-        saleTypeId: item.saleTypeName
+        // ...res,
+        // saleTypeId: res.saleTypeName
+        walletRebateId: data.walletRebateId,
+        walletRebateSaleTypeId: data.walletRebateSaleTypeId,
+        rebateRate: data.rebateRate,
+        saleTypeId: data.saleTypeId,
+        status: data.status,
+        saleTypeCode: data.saleTypeCode
       }
+      await this.getDictList()
+      this.handleChange(data.saleTypeId)
     },
     hanelclose() {
       this.type = ''
@@ -436,7 +444,6 @@ export default {
       this.$refs.dialogForm.resetFields()
     },
     handelInfo() {
-      console.log(this.$refs.dialogForm)
       this.$refs.dialogForm.validate(valid => {
         if (valid) {
           if (this.type) {
@@ -445,9 +452,9 @@ export default {
               ...this.dialogForm
             }
             getWalletRebateSaletypeAdd(params).then(res => {
-              console.log(res)
               this.$successMsg('添加成功')
               this.hanleReset()
+              this.$refs.pageRef.refreshList()
             })
           } else {
             const upParams = {
@@ -456,6 +463,7 @@ export default {
             getWalletRebateSaletypeUpdate(upParams).then(res => {
               this.$successMsg('修改成功')
               this.hanleReset()
+              this.$refs.pageRef.refreshList()
             })
           }
         } else {
@@ -476,7 +484,7 @@ export default {
       }
       // this.$refs.dialogForm.resetFields()
       this.dialogVisible = false
-      this.getList()
+      // this.getList()
     },
     hanleCancel() {
       this.hanleReset()