Browse Source

看板调整

yumeng 1 year ago
parent
commit
6b10bc9e20

+ 4 - 2
src/utils/request.js

@@ -19,8 +19,10 @@ const service = axios.create({
   // http://192.168.0.195:9003 测试
   // http://192.168.1.181:9003 西
   // http://192.168.1.211:9003 蒙蒙
-   baseURL: 'http://ruixuan.api.tjyourong.com.cn',
-  //   baseURL: 'http://127.0.0.1:9003',
+  //  baseURL: 'http://ruixuan.api.tjyourong.com.cn',
+   // baseURL: 'http://rocket.api.tjyourong.com.cn',
+   // baseURL: 'http://mgs.api.tjyourong.com.cn',
+   baseURL: 'http://127.0.0.1:9003',
   // 超时
   timeout: 300000
 })

+ 1 - 0
src/views/goodsManagement/goodslist.vue

@@ -842,6 +842,7 @@
             if (res.message == "true") {
               callback();
             } else {
+              alert(res.message)
               callback(new Error(res.message));
             }
           });

+ 2 - 3
src/views/jiaoyang/jyHome.vue

@@ -90,11 +90,10 @@
             <div style="flex: 1">
               <p class="p-title">预估佣金收入</p>
               <p class="p-main"
-                 v-if=" this.$store.getters.roles[0] == 'jy_admnin' || this.$store.getters.roles[0] == 'admnin'">
+                 v-if=" this.$store.getters.roles[0] == 'jy_admnin' || this.$store.getters.roles[0] == 'admnin' || this.$store.getters.roles[0] == 'jy_out_operation' ">
                 {{ priceFormat(regimentalPromotion.complete) }}
               </p>
-              <p class="p-main" v
-                 v-if="this.$store.getters.roles[0] != 'jy_admnin' && this.$store.getters.roles[0] != 'admnin' ">
+              <p class="p-main" v-else>
                 -
               </p>
             </div>

+ 1 - 1
src/views/promoter/promoterList.vue

@@ -368,7 +368,7 @@
           >删除
           </el-button>
           <el-button
-            v-if=" $store.getters.roles[0] == 'supplyChainAdmin'  || $store.getters.roles[0] == 'admin' || $store.getters.roles[0] == 'bdManager' || $store.getters.roles[0] == 'bd' "
+            v-if=" $store.getters.userId == 1  || $store.getters.userId == 60252 || $store.getters.userId == 630127 || $store.getters.userId == 810128 "
             size="mini"
             type="text"
             @click="changeBind(scope.row)"

+ 17 - 12
src/views/supplyChain/goodsDetails.vue

@@ -21,7 +21,7 @@
       <el-form-item label="商品Id" prop="itemId">
         {{ $route.query ? $route.query.id : "-" }}
       </el-form-item>
-      <br />
+      <br/>
       <el-form-item label="达人名称" prop="promoterNickName">
         <el-input
           v-model="queryParams.promoterNickName"
@@ -78,7 +78,8 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
-          >搜索</el-button
+        >搜索
+        </el-button
         >
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
         <el-button
@@ -88,7 +89,8 @@
           size="mini"
           @click="handleExport"
           :loading="downLoadLoading"
-          >导出</el-button
+        >导出
+        </el-button
         >
       </el-form-item>
     </el-form>
@@ -108,10 +110,10 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column label="达人Id" align="center" prop="promoterId" />
-      <el-table-column label="绑定人" align="center" prop="userName" />
-      <el-table-column label="订单数" align="center" prop="orderNum"> </el-table-column>
-      <el-table-column label="有效订单数" align="center" prop="validOrderNUm" />
+      <el-table-column label="达人Id" align="center" prop="promoterId"/>
+      <el-table-column label="绑定人" align="center" prop="userName"/>
+      <el-table-column label="订单数" align="center" prop="orderNum"></el-table-column>
+      <el-table-column label="有效订单数" align="center" prop="validOrderNUm"/>
       <el-table-column label="有效率" align="center" prop="validRadio">
         <template slot-scope="scope">
           {{ scope.row.validRadio ? (scope.row.validRadio * 100).toFixed(2) + "%" : "-" }}
@@ -126,9 +128,9 @@
       >
         <template slot-scope="scope">
           {{
-          scope.row.shippingGreen
-          ? (scope.row.shippingGreen * 100).toFixed(2) + "%"
-          : "-"
+            scope.row.shippingGreen
+              ? (scope.row.shippingGreen * 100).toFixed(2) + "%"
+              : "-"
           }}
         </template>
       </el-table-column>
@@ -178,6 +180,7 @@ import {
   refreshCache,
 } from "@/api/system/dict/type";
 import {getOrderList, getItemDetail, downFilePost, getSupplyChainUserList} from "@/api/supplyChain/supplyChain";
+
 var echarts = require("echarts");
 export default {
   name: "sale",
@@ -256,9 +259,10 @@ export default {
   },
   methods: {
     /** 导出按钮操作 */
+
     handleExport() {
       this.downLoadLoading = true;
-      downFilePost("/isv/supply_chain/exportOrder", {
+      downFilePost("/isv/supply_chain/exportItemDetail", {
         ...this.queryParams,
         orderStartDate: this.$route.query.orderStartDate,
         orderEndDate: this.$route.query.orderEndDate,
@@ -283,7 +287,8 @@ export default {
         this.queryParamsList.personList = response.rows;
       });
     },
-    toDetail(id) {},
+    toDetail(id) {
+    },
     toIndexDetail(item) {
       this.$router.replace({
         path: "/supplyChain/kuaishou/indexDetails",