bugfix

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/components/tableList.vue

@@ -1935,8 +1935,9 @@ export default {
     selectAll(value) {
       this.allCheckData = value;
     },
-    select(value) {
+    select(value, row) {
       this.allCheckData = value;
+      this.$emit("check", value, row);
     },
     load(tree, treeNode, resolve) {
       this.$emit("load", tree, treeNode, resolve);

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.7:7077/";
+// export const baseURL = "http://192.168.1.7: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,8 +30,8 @@
       :tableData="tableData"
       :navText="navText"
       :loading="loading"
-      :setIndex="setIndex"
       @load="load"
+      @check="check"
     >
       <template slot="customize">
         <el-button v-if="type !== 0" @click="exportSH" type="success">
@@ -81,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"
@@ -454,6 +464,13 @@ export default {
           prop: "tenantName",
           hidden: true,
         },
+        {
+          label: "实际订单金额(元)",
+          prop: "orderPrice",
+          scope: "solt",
+          soltName: "price",
+          hidden: true,
+        },
         {
           label: "角色名称",
           prop: "roleName",
@@ -553,6 +570,13 @@ export default {
           prop: "tenantName",
           hidden: true,
         },
+        {
+          label: "实际订单金额(元)",
+          prop: "orderPrice",
+          scope: "solt",
+          soltName: "price",
+          hidden: true,
+        },
         {
           label: "角色名称",
           prop: "roleName",
@@ -637,6 +661,13 @@ export default {
           prop: "tenantName",
           hidden: true,
         },
+        {
+          label: "实际订单金额(元)",
+          prop: "orderPrice",
+          scope: "solt",
+          soltName: "price",
+          hidden: true,
+        },
         {
           label: "角色名称",
           prop: "roleName",
@@ -690,15 +721,39 @@ export default {
       countInfo: {},
       spanData: {},
       maps: new Map(),
+      expandList: [],
     };
   },
   created() {
     this.init();
   },
   methods: {
+    check(value, row) {
+      return;
+      if (row.oId) return;
+      const index = this.tableData.findIndex((e) => e.id == row.id);
+      if (this.expandList[index] === true) {
+        this.expandList[index] = false;
+        this.$refs.tableList.$refs.pagerset.clearSelection();
+        return;
+      }
+      this.expandList[index] = true;
+      const box = document.querySelectorAll(".el-table__row--level-0")[index];
+      const btn = box.querySelector(".el-table__expand-icon");
+      btn.onclick = () => {
+        //
+      };
+      const event = new MouseEvent("click", {
+        view: window,
+        bubbles: true,
+        cancelable: true,
+      });
+      btn.dispatchEvent(event);
+    },
     getRoles(roleId) {
-      if (this.$store.state.user.rolesId?.length > 0 &&
-        this.$store.state.user.rolesId.includes(roleId) ||
+      if (
+        (this.$store.state.user.rolesId?.length > 0 &&
+          this.$store.state.user.rolesId.includes(roleId)) ||
         this.$store.state.user.rolesId.includes(1)
       ) {
         return false;
@@ -798,9 +853,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);
@@ -812,8 +864,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}");
             });
@@ -826,7 +877,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) => {
@@ -838,7 +894,10 @@ export default {
               e.divideCompanyMoney =
                 this.type == 2 ? e.divideSellerMoney : e.brokerage;
             }
+            // this.$refs.tableList.$refs.pagerset.toggleRowSelection(e);
           });
+          // let allCheckData = this.$refs.tableList.allCheckData;
+          // allCheckData.push(...res.data);
           resolve(res.data);
         })
         .catch(() => {
@@ -958,6 +1017,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] }}
@@ -148,6 +155,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" },