合并+修复代码

src/components/searchBoxNew.vue

@@ -441,6 +441,32 @@
               "
             ></el-input-number>
           </div>
+          <div v-else-if="item.scope === 'numList1'">
+            <el-input-number
+              :controls="false"
+              v-model="formData[item.prop1]"
+              controls-position="right"
+              :placeholder="item.placeholder1 || ''"
+              :min="0"
+              :size="size"
+              @change="
+                handleChanges(formData[item.prop1], formData[item.prop2])
+              "
+            >
+            </el-input-number>
+            {{ item.ch || "~" }}
+            <el-input-number
+              :controls="false"
+              v-model="formData[item.prop2]"
+              controls-position="right"
+              :placeholder="item.placeholder2 || ''"
+              :min="0"
+              :size="size"
+              @change="
+                handleChanges(formData[item.prop1], formData[item.prop2])
+              "
+            ></el-input-number>
+          </div>
           <el-input-number
             v-else-if="item.scope === 'inputNumber'"
             v-model="formData[item.prop]"

src/utils/request.js

@@ -9,7 +9,7 @@ axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
 // 创建axios实例
 export const baseURL = process.env.VUE_APP_BASE_API
 // export const baseURL = 'https://ptapi.gdzzkj.net/'
-// export const baseURL = "http://192.168.1.222: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公共部分

src/views/financed/arap/index.vue

@@ -30,7 +30,6 @@
       :tableData="tableData"
       :navText="navText"
       :loading="loading"
-      :setIndex="setIndex"
       @load="load"
       @select="selectRow"
     >
@@ -82,6 +81,16 @@
       <template slot="status" slot-scope="props">
         {{ backStatus(props.scope) | formatPrice }}
       </template>
+      <template slot="price" slot-scope="props">
+        <div v-if="props.scope.row.oId">
+          {{
+            $methodsTools.decimalPoint(
+              props.scope.row.orderPrice - props.scope.row.pretaxBrokerage
+            )
+          }}
+        </div>
+        <div v-else>--</div>
+      </template>
       <template slot="btn" slot-scope="props">
         <el-button
           v-if="props.scope.row.oId || type == 0"
@@ -461,6 +470,13 @@ export default {
           prop: "tenantName",
           hidden: true,
         },
+        {
+          label: "实际订单金额(元)",
+          prop: "orderPrice",
+          scope: "solt",
+          soltName: "price",
+          hidden: true,
+        },
         {
           label: "角色名称",
           prop: "roleName",
@@ -560,6 +576,13 @@ export default {
           prop: "tenantName",
           hidden: true,
         },
+        {
+          label: "实际订单金额(元)",
+          prop: "orderPrice",
+          scope: "solt",
+          soltName: "price",
+          hidden: true,
+        },
         {
           label: "角色名称",
           prop: "roleName",
@@ -644,6 +667,13 @@ export default {
           prop: "tenantName",
           hidden: true,
         },
+        {
+          label: "实际订单金额(元)",
+          prop: "orderPrice",
+          scope: "solt",
+          soltName: "price",
+          hidden: true,
+        },
         {
           label: "角色名称",
           prop: "roleName",
@@ -807,9 +837,6 @@ export default {
       let data = row[key].split(",").sort((a, b) => a - b);
       return data;
     },
-    setIndex(index) {
-      return index + 1;
-    },
     changeSearch() {
       this.maps.clear();
       this.search(2);
@@ -821,8 +848,7 @@ export default {
       fn(this.formData)
         .then((res) => {
           this.type != 0 &&
-            res.rows.forEach((e) => {
-              e.children = [];
+            res.rows.forEach((e, i) => {
               e.hasChildren = true;
               e.monthTime = this.parseTime(e.monthTime, "{y}-{m}");
             });
@@ -835,7 +861,12 @@ export default {
         });
     },
     load(tree, treeNode, resolve) {
-      monthOrderList({ divideLogId: tree.id, roleId: this.formData.roleId })
+      monthOrderList({
+        divideLogId: tree.id,
+        roleId: this.formData.roleId,
+        startPrice: this.formData.startPrice,
+        endPrice: this.formData.endPrice,
+      })
         .then((res) => {
           // id冲突会报错
           res.data.forEach((e) => {
@@ -848,9 +879,14 @@ export default {
                 this.type == 2 ? e.divideSellerMoney : e.brokerage;
             }
           });
-          tree.active = true;
           tree.children = res.data;
           resolve(res.data);
+          if (tree.active) {
+            this.$nextTick(() => {
+              this.setChildren(res.data, true);
+            });
+          }
+          tree.active = true;
         })
         .catch(() => {
           resolve([]);
@@ -1031,6 +1067,14 @@ export default {
               { label: "打款中", value: 3 },
               { label: "打款失败", value: 4 },
             ],
+          },
+          {
+            prop1: "startPrice",
+            prop2: "endPrice",
+            ch: "-",
+            scope: "numList1",
+            placeholder1: "起始金额",
+            placeholder2: "结束金额",
           }
         );
       }

src/views/financed/components/dislogOrderDetails.vue

@@ -93,6 +93,13 @@
                   }}）</span
                 >
               </div>
+              <div v-if="desc.type === 'reduce'">
+                {{
+                  $methodsTools.decimalPoint(
+                    detailInfo.orderPrice - detailInfo.pretaxBrokerage
+                  )
+                }}
+              </div>
             </div>
             <div v-else>
               {{ detailInfo[desc.key] }}
@@ -149,6 +156,10 @@ export default {
         { label: "已退账款(元)", key: "orderRefunded", type: "money" },
         { label: "未收账款(元)", key: "orderUncollected", type: "money" },
         { label: "实际账款(元)", key: "orderPractical", type: "money" },
+        {
+          label: "实际订单金额(元)",
+          type: "reduce",
+        },
         { label: "下单企业", key: "tenantName" },
         { label: "转账开户名", key: "openingName" },
         { label: "转账凭证", key: "attachmentList", type: "image" },