Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_masterPlatform into dev

src/api/financed/index.js

@@ -253,6 +253,14 @@ export function categoryList(query) {
     params: query,
   });
 }
+// // 成本类别
+// export function categoryList(query) {
+//   return request({
+//     url: "/top/category/list",
+//     method: "get",
+//     params: query,
+//   });
+// }
 // 供应商状态
 export function instDefaultStatus(data) {
   return request({

src/views/financed/accountsPayable/components/dislogDividePay.vue

@@ -125,6 +125,7 @@ export default {
             type: 1,
             divideLogId: this.info.id,
             tenantId: this.info.tenantId,
+            payType: 5,
             ...this.formPay,
           };
           this.$api

src/views/financed/accountsPayable/components/dislogOrderList.vue

@@ -229,14 +229,14 @@ export default {
           // width: 100,
           scope: "formatPrice",
         },
-        {
-          label: "审核状态",
-          prop: "divideCheckStatus",
-          hidden: true,
-          // width: 100,
-          scope: "solt",
-          soltName: "divideCheckStatus",
-        },
+        // {
+        //   label: "审核状态",
+        //   prop: "divideCheckStatus",
+        //   hidden: true,
+        //   // width: 100,
+        //   scope: "solt",
+        //   soltName: "divideCheckStatus",
+        // },
       ],
       tableData: [],
       total: 0,

src/views/financed/accountsPayable/institutionDivide/index.vue

@@ -371,7 +371,8 @@ export default {
           payMoneyTotal,
         } = res.data;
         this.statisticsList[0].value = payMoneyTotal + unPayMoneyTotal;
-        this.statisticsList[1].value = payMoneyTotal + unDeductMoneyTotal;
+        this.statisticsList[1].value =
+          payMoneyTotal + unPayMoneyTotal + unDeductMoneyTotal;
         this.statisticsList[2].value = deductMoneyTotal + unDeductMoneyTotal;
       });
     },

src/views/financed/accountsPayable/operationsReceivable/index.vue

@@ -88,7 +88,7 @@ import pictureList from "@/components/Comon/pictureList.vue";
 import dislogBadBill from "../components/dislogBadBill.vue";
 import dislogOrderDetails from "../../components/dislogOrderDetails.vue";
 import dislogTip from "../components/dislogTip.vue";
-import { orderList } from "@/api/financed/index";
+import { orderList, countOrderNum } from "@/api/financed/index";
 export default {
   name: "SaasMasterPlatformIndex",
 
@@ -99,10 +99,11 @@ export default {
           label: "未收账款",
           prop: "orderUncollectedTotal",
           img: "未收款",
+          value: 0,
         },
       ],
       navText: {
-        title: "应收应付",
+        title: "代运应收",
         index: 0,
         ch: "条",
         num: true,
@@ -265,6 +266,7 @@ export default {
           pageNum: 1,
         };
       }
+      this.getCountOrderNum();
       this.getDataList();
     },
     init() {
@@ -281,6 +283,14 @@ export default {
           this.loading = false;
         });
     },
+    getCountOrderNum() {
+      var data = JSON.parse(JSON.stringify(this.formData));
+      delete data.pageNum;
+      delete data.pageSize;
+      countOrderNum({ totalType: 1, ...data }).then((res) => {
+        this.showTabList[0].value = res.data.orderUncollectedTotal;
+      });
+    },
     backText(row) {
       const type = row.noteType;
       if (type == 2) {

src/views/financed/costSet/dislogOrganSet.vue

@@ -71,9 +71,13 @@
             :prop="'itemList.' + index + '.itemCategory'"
             :rules="rules['itemCategory']"
           >
-            <el-select v-model="item.itemCategory" placeholder="请选择成本类型">
-              <el-option label="分成成本" :value="1"></el-option>
-              <el-option label="其他成本" :value="2"></el-option>
+            <el-select v-model="item.itemCategory" placeholder="请选择成本类别">
+              <el-option
+                :label="item.categoryName"
+                :value="item.categoryId"
+                v-for="item in categoryList"
+                :key="item.categoryId"
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item
@@ -126,12 +130,8 @@
             :rules="rules['itemType']"
           >
             <el-select v-model="item.itemType" placeholder="请选择成本类型">
-              <el-option
-                :label="item.categoryName"
-                :value="item.categoryId"
-                v-for="item in categoryList"
-                :key="item.categoryId"
-              ></el-option>
+              <el-option label="百分比" :value="1"></el-option>
+              <el-option label="固定" :value="2"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item
@@ -328,7 +328,6 @@ export default {
             e.educationTypeId == educationTypeId &&
             e.itemCategory == itemCategory
         );
-        console.log(levelList, 666);
         const len = levelList.length;
         if (len > 1) {
           const len1 = levelList.filter((e) => e.businessId == -1).length;
@@ -395,9 +394,8 @@ export default {
       this.getEduList();
     },
     getCategoryList() {
-      categoryList().then((res) => {
+      categoryList({ status: "0,1" }).then((res) => {
         this.categoryList = res.rows;
-        console.log(this.categoryList, "this.categoryList");
       });
     },
     getOrderCostDetail() {