朱鑫波 2 سال پیش
والد
کامیت
15ca6056e3

+ 2 - 2
src/utils/request.js

@@ -18,8 +18,8 @@ const service = axios.create({
   // http://ruixuan.api.tjyourong.com.cn 线上
   // http://ruixuan.api.tjyourong.com.cn 线上
   // http://192.168.0.195:9003 测试
   // http://192.168.0.195:9003 测试
   // http://192.168.1.143:9003 西安
   // http://192.168.1.143:9003 西安
-  // http://192.168.1.22:9003 蒙蒙
-  baseURL: 'http://192.168.1.180:9003',
+  // http://192.168.1.180:9003 蒙蒙
+  baseURL: 'http://ruixuan.api.tjyourong.com.cn',
   // 超时
   // 超时
   timeout: 300000
   timeout: 300000
 })
 })

+ 30 - 3
src/views/goodsManagement/goodslist.vue

@@ -148,6 +148,14 @@
             prop="ruleName"
             prop="ruleName"
             width="150"
             width="150"
           >
           >
+            <template slot-scope="scope">
+              <div v-if="!!scope.row.ruleName">
+                <el-button size="mini" type="text" @click="lookDetail(scope.row)"
+                  >{{ scope.row.ruleName }}
+                </el-button>
+              </div>
+              <div v-else>-</div>
+            </template>
           </el-table-column>
           </el-table-column>
           <el-table-column
           <el-table-column
             label="服务费率"
             label="服务费率"
@@ -519,7 +527,7 @@
           </el-input>
           </el-input>
         </el-form-item>
         </el-form-item>
 
 
-        <el-form-item label="规则" prop="ruleId">
+        <el-form-item label="结算规则" prop="ruleId">
           <el-select
           <el-select
             filterable
             filterable
             v-model="formBroadcast.ruleId"
             v-model="formBroadcast.ruleId"
@@ -670,6 +678,16 @@
         </el-table-column>
         </el-table-column>
       </el-table>
       </el-table>
     </el-dialog>
     </el-dialog>
+    <!-- 结算规则列表 -->
+    <el-dialog title="结算规则" :visible.sync="ruleVisible" width="800px">
+      <el-table :data="ruleList" style="width: 100%">
+        <el-table-column label="序号" align="center" prop="sortCount"> </el-table-column>
+        <el-table-column label="起始单数" align="center" prop="startItemCount"> </el-table-column>
+        <el-table-column label="结束单数" align="center" prop="endItemCount"> </el-table-column>
+        <el-table-column label="主播奖励金额" align="center" prop="anchorAmount"> </el-table-column>
+        <el-table-column label="推荐人奖励金额" align="center" prop="referenceAmount"> </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -690,6 +708,7 @@ import {
   editRelateByItemId,
   editRelateByItemId,
   getListByRelateId,
   getListByRelateId,
   getRuleListNoPage,
   getRuleListNoPage,
+  getRuleDetailByRuleId,
 } from "@/api/goodsManagement/goods";
 } from "@/api/goodsManagement/goods";
 import selectTree from "./selectTree.vue";
 import selectTree from "./selectTree.vue";
 import textEditor from "./textEditor.vue";
 import textEditor from "./textEditor.vue";
@@ -903,8 +922,8 @@ export default {
           },
           },
         ],
         ],
         ruleId: {
         ruleId: {
-          required: true,
-          message: "规则必选",
+          required: false,
+          message: "",
           trigger: "change",
           trigger: "change",
         },
         },
       },
       },
@@ -920,6 +939,8 @@ export default {
       associationListVisible: false,
       associationListVisible: false,
       associationList: null,
       associationList: null,
       associationItemId: null,
       associationItemId: null,
+      ruleVisible: false,
+      ruleList: [],
     };
     };
   },
   },
   created() {
   created() {
@@ -948,6 +969,12 @@ export default {
     },
     },
   },
   },
   methods: {
   methods: {
+    lookDetail(item) {
+      getRuleDetailByRuleId({ ruleId: item.ruleId }).then((res) => {
+        this.ruleVisible = true;
+        this.ruleList = res.data;
+      });
+    },
     showItemList(item) {
     showItemList(item) {
       getListByRelateId({ relateId: item.relateId })
       getListByRelateId({ relateId: item.relateId })
         .then((res) => {
         .then((res) => {

+ 18 - 13
src/views/goodsManagement/ruleConfig.vue

@@ -79,7 +79,7 @@
           <el-button size="mini" type="text" @click="lookDetail(scope.row)"
           <el-button size="mini" type="text" @click="lookDetail(scope.row)"
             >详情
             >详情
           </el-button>
           </el-button>
-          <el-button size="mini" type="text" @click="removeRule(scope.row)"
+          <el-button size="mini" type="text" @click="removeRule(scope.row)" :disabled="scope.row.id == '1'"
             >删除
             >删除
           </el-button>
           </el-button>
         </template>
         </template>
@@ -152,6 +152,7 @@
             placeholder="请选择规则类型"
             placeholder="请选择规则类型"
             clearable
             clearable
             style="width: 240px"
             style="width: 240px"
+            disabled
           >
           >
             <el-option label="常规规则" value="1"> </el-option>
             <el-option label="常规规则" value="1"> </el-option>
             <el-option label="冲量规则" value="2"> </el-option>
             <el-option label="冲量规则" value="2"> </el-option>
@@ -163,6 +164,7 @@
             plain
             plain
             icon="el-icon-document-add"
             icon="el-icon-document-add"
             size="mini"
             size="mini"
+            :disabled="ids == '1'"
             @click="
             @click="
               formBroadcast.ruleDetails.push({
               formBroadcast.ruleDetails.push({
                 startItemCount: undefined,
                 startItemCount: undefined,
@@ -197,10 +199,17 @@
                 icon="el-icon-close"
                 icon="el-icon-close"
                 size="mini"
                 size="mini"
                 v-if="!item.id"
                 v-if="!item.id"
+                :disabled="ids == '1'"
                 @click="formBroadcast.ruleDetails.splice(index, 1)"
                 @click="formBroadcast.ruleDetails.splice(index, 1)"
                 >删除</el-button
                 >删除</el-button
               >
               >
-              <el-button type="error" plain size="mini" @click="addOrEdit(item, index)" v-if="!!ids"
+              <el-button
+                type="error"
+                plain
+                size="mini"
+                @click="addOrEdit(item, index)"
+                v-if="!!ids"
+                :disabled="ids == '1'"
                 >确定</el-button
                 >确定</el-button
               >
               >
             </div>
             </div>
@@ -228,6 +237,7 @@
                 placeholder="请输入起始单数"
                 placeholder="请输入起始单数"
                 style="width: 240px"
                 style="width: 240px"
                 v-model.number="item.startItemCount"
                 v-model.number="item.startItemCount"
+                :disabled="ids == '1'"
               >
               >
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
@@ -246,6 +256,7 @@
                 placeholder="请输入结束单数"
                 placeholder="请输入结束单数"
                 style="width: 240px"
                 style="width: 240px"
                 v-model.number="item.endItemCount"
                 v-model.number="item.endItemCount"
+                :disabled="ids == '1'"
               >
               >
               </el-input>
               </el-input>
             </el-form-item>
             </el-form-item>
@@ -267,6 +278,7 @@
                 :step="0.1"
                 :step="0.1"
                 :min="0"
                 :min="0"
                 placeholder="请输入主播奖励金额"
                 placeholder="请输入主播奖励金额"
+                :disabled="ids == '1'"
               ></el-input-number>
               ></el-input-number>
             </el-form-item>
             </el-form-item>
             <el-form-item
             <el-form-item
@@ -282,6 +294,7 @@
                 :step="0.1"
                 :step="0.1"
                 :min="0"
                 :min="0"
                 placeholder="请输入推荐人奖励金额"
                 placeholder="请输入推荐人奖励金额"
+                :disabled="ids == '1'"
               ></el-input-number>
               ></el-input-number>
             </el-form-item>
             </el-form-item>
           </div>
           </div>
@@ -368,6 +381,7 @@ export default {
       form: {},
       form: {},
       formBroadcast: {
       formBroadcast: {
         ruleDetails: [],
         ruleDetails: [],
+        ruleType: "1",
       },
       },
       //上传报表下拉数据
       //上传报表下拉数据
       formList: {},
       formList: {},
@@ -521,18 +535,9 @@ export default {
         this.$refs.formBroadcast.clearValidate();
         this.$refs.formBroadcast.clearValidate();
       }, 0);
       }, 0);
       this.$set(this.formBroadcast, "ruleDetails", []);
       this.$set(this.formBroadcast, "ruleDetails", []);
+      this.$set(this.formBroadcast, "ruleType", '1');
     },
     },
-    /** 编辑地址 新增达人*/
-    handleAddbroadcast(item) {
-      this.ids = item.id;
-      this.edit = true;
-      this.openAllocation = true;
-      this.$set(this.formBroadcast, "consignee", item.consignee);
-      this.$set(this.formBroadcast, "phone", item.phone);
-      this.$set(this.formBroadcast, "promoterAddress", item.promoterAddress);
-      this.$set(this.formBroadcast, "ruleName", item.ruleName);
-      this.$set(this.formBroadcast, "promoterId", item.promoterId);
-    },
+
     /** 修改按钮操作 */
     /** 修改按钮操作 */
     handleUpdate(row) {
     handleUpdate(row) {
       this.reset();
       this.reset();

+ 8 - 2
src/views/goodsManagement/settlement.vue

@@ -53,7 +53,13 @@
     </el-form>
     </el-form>
 
 
     <el-table v-loading="loading" :data="typeList" ref="multipleTable">
     <el-table v-loading="loading" :data="typeList" ref="multipleTable">
-      <el-table-column label="达人ID" align="center" prop="promoterId"> </el-table-column>
+      <el-table-column label="达人ID" align="center" prop="promoterId">
+        <template slot-scope="scope">
+          <a style="text-align: center" @click="toDetail(scope.row)"
+            >{{ scope.row.promoterId }}
+          </a>
+        </template>
+      </el-table-column>
       <el-table-column label="达人名称" align="center" prop="promoterName">
       <el-table-column label="达人名称" align="center" prop="promoterName">
         <template slot-scope="scope">
         <template slot-scope="scope">
           <a style="text-align: center" @click="toDetail(scope.row)"
           <a style="text-align: center" @click="toDetail(scope.row)"
@@ -546,7 +552,7 @@ export default {
         let downloadElement = document.createElement("a");
         let downloadElement = document.createElement("a");
         let href = window.URL.createObjectURL(blob); //创建下载的链接
         let href = window.URL.createObjectURL(blob); //创建下载的链接
         downloadElement.href = href;
         downloadElement.href = href;
-        downloadElement.download = "基地结算.xlsx"; //下载后文件名
+        downloadElement.download = "激励结算.xlsx"; //下载后文件名
         document.body.appendChild(downloadElement);
         document.body.appendChild(downloadElement);
         downloadElement.click(); //点击下载
         downloadElement.click(); //点击下载
         document.body.removeChild(downloadElement); //下载完成移除元素
         document.body.removeChild(downloadElement); //下载完成移除元素

+ 2 - 2
src/views/goodsManagement/settlementDetails.vue

@@ -50,7 +50,7 @@
       </el-table-column>
       </el-table-column>
       <el-table-column label="达人归属人" align="center" prop="promoterCreateName"  width="150">
       <el-table-column label="达人归属人" align="center" prop="promoterCreateName"  width="150">
       </el-table-column>
       </el-table-column>
-      <el-table-column label="单量" align="center" prop="orderNum"> </el-table-column  width="100">
+      <el-table-column label="单量" align="center" prop="orderNum"> </el-table-column>
       <el-table-column label="有效单量" align="center" prop="validOrderNum"  width="100">
       <el-table-column label="有效单量" align="center" prop="validOrderNum"  width="100">
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column
@@ -550,7 +550,7 @@ export default {
         let downloadElement = document.createElement("a");
         let downloadElement = document.createElement("a");
         let href = window.URL.createObjectURL(blob); //创建下载的链接
         let href = window.URL.createObjectURL(blob); //创建下载的链接
         downloadElement.href = href;
         downloadElement.href = href;
-        downloadElement.download = "基地结算详情.xlsx"; //下载后文件名
+        downloadElement.download = "激励结算详情.xlsx"; //下载后文件名
         document.body.appendChild(downloadElement);
         document.body.appendChild(downloadElement);
         downloadElement.click(); //点击下载
         downloadElement.click(); //点击下载
         document.body.removeChild(downloadElement); //下载完成移除元素
         document.body.removeChild(downloadElement); //下载完成移除元素