瀏覽代碼

完善需求

Tang 2 年之前
父節點
當前提交
c42778f555

+ 1 - 1
src/components/Comon/pictureList.vue

@@ -46,7 +46,7 @@ export default {
       return require(`@/assets/images/${name}@2x.png`);
     },
     formatPrice(price) {
-      return price.toLocaleString(
+      return price?.toLocaleString(
         "zh-CN",
         (undefined, { minimumFractionDigits: 2, maximumFractionDigits: 2 })
       );

+ 2 - 2
src/utils/request.js

@@ -7,9 +7,9 @@ import { paramMate } from "@/utils/common";
 
 axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
-// export const baseURL = process.env.VUE_APP_BASE_API
+export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-export const baseURL = "http://192.168.1.24:7077/";
+// export const baseURL = "http://192.168.1.24:7077/";
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API;
 const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分

+ 18 - 2
src/views/financed/arap/index.vue

@@ -106,7 +106,15 @@
             "
             @click="openDialog(props.scope.row, 1)"
           >
-            点击支付
+            {{
+              type == 1
+                ? "分成支付"
+                : type == 2
+                ? "提成支付"
+                : type == 3
+                ? "佣金支付"
+                : ""
+            }}
           </el-button>
           <el-button
             v-else
@@ -114,7 +122,15 @@
             :disabled="props.scope.row.checkStatus !== 0"
             @click="openDialog(props.scope.row, 1)"
           >
-            点击审核
+            {{
+              type == 1
+                ? "分成审核"
+                : type == 2
+                ? "提成审核"
+                : type == 3
+                ? "佣金审核"
+                : ""
+            }}
           </el-button>
           <el-button
             type="text"

+ 26 - 2
src/views/financed/components/audit/dislogSet.vue

@@ -4,7 +4,7 @@
       :disabledBtn="disabledBtn"
       width="600px"
       :isShow.sync="isShow"
-      title="付款审核"
+      :title="titleComputers(info.checkFrom, info.orderSn)"
       @close="close"
       @submit="submitForm"
       :confirmName="info.orderSn ? '确定' : '确定支付'"
@@ -19,7 +19,9 @@
         </p>
         <div class="bgc_pink">
           <p>
-            待付账款:<span class="color_red">¥{{ form.divideCompanyMoney }}</span>
+            待付账款:<span class="color_red"
+              >¥{{ form.divideCompanyMoney }}</span
+            >
           </p>
         </div>
         <el-form
@@ -174,6 +176,28 @@ export default {
   mounted() {},
 
   methods: {
+    titleComputers(checkFrom, orderSn) {
+      var a = "";
+      switch (checkFrom) {
+        case 2:
+          a = "机构分成";
+          break;
+        case 3:
+          a = "业务员提成";
+          break;
+        case 4:
+          a = "佣金结算";
+          break;
+        default:
+          break;
+      }
+      if (orderSn) {
+        a += "审核";
+      } else {
+        a += "支付";
+      }
+      return a;
+    },
     fastInput(item) {
       this.formPay = {
         toBankAcount: item.proceedsAccount,

+ 30 - 3
src/views/financed/orderManageList/index.vue

@@ -31,10 +31,23 @@
             {{ item.label }}:
             <span
               v-if="item.label === '盈亏' && statisticsData[item.prop] !== 0"
-              >【{{ statisticsData[item.prop] > 0 ? "盈" : "亏" }}】</span
+              ><span
+                :style="
+                  statisticsData[item.prop] > 0
+                    ? 'color:rgb(99,93,247)'
+                    : 'color:red'
+                "
+                >【{{ statisticsData[item.prop] > 0 ? "盈" : "亏" }}】</span
+              ></span
             >
           </h4>
-          <p>{{ statisticsData[item.prop] }}{{ item.ch }}</p>
+          <p>
+            {{
+              item.ch === "元"
+                ? formatPrice(statisticsData[item.prop])
+                : statisticsData[item.prop]
+            }}{{ item.ch }}
+          </p>
         </div>
       </div>
     </div>
@@ -73,7 +86,15 @@
         <div>成本(元):{{ props.scope.row["orderCost"] }}</div>
         <div>盈亏(元):{{ props.scope.row["orderProfit"] }}</div>
         <div v-if="props.scope.row['orderProfit']">
-          【{{ props.scope.row["orderProfit"] > 0 ? "盈" : "亏" }}】
+          <span
+            :style="
+              props.scope.row['orderProfit'] > 0
+                ? 'color:rgb(99,93,247)'
+                : 'color:red'
+            "
+          >
+            【{{ props.scope.row["orderProfit"] > 0 ? "盈" : "亏" }}】</span
+          >
         </div>
       </template>
       <template slot="statusRoles" slot-scope="props">
@@ -503,6 +524,12 @@ export default {
     this.getStatistics();
   },
   methods: {
+    formatPrice(price) {
+      return price?.toLocaleString(
+        "zh-CN",
+        (undefined, { minimumFractionDigits: 2, maximumFractionDigits: 4 })
+      );
+    },
     //退款状态
     refundStatus(i) {
       var str = "";