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

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

@@ -100,11 +100,13 @@
       @search="search(3)"
     />
     <!-- 订单列表 -->
-    <dislogOrderList
+    <dislog-order-list
+      divideModel="2"
       :info="activeOrderInfo"
       :dialogVisible.sync="orderDialogVisible"
     />
     <dislog-divide-pay
+      type="2"
       :dialogVisible.sync="examineDialogVisible"
       @search="search"
       :info="activeOrderInfo"

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

@@ -56,7 +56,7 @@
         <el-button
           type="text"
           v-if="
-            props.scope.row.checkStatus === 1 ||
+            props.scope.row.checkStatus === 2 ||
             props.scope.row.checkStatus === 5
           "
           :disabled="getRoles(props.scope.row.roleId)"

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

@@ -52,7 +52,11 @@
       </template>
     </BaseDialog>
     <!-- 订单列表 -->
-    <dislogOrderList :info="info" :dialogVisible.sync="orderDialogVisible" />
+    <dislogOrderList
+      :divideModel="type"
+      :info="info"
+      :dialogVisible.sync="orderDialogVisible"
+    />
   </div>
 </template>
 
@@ -71,6 +75,10 @@ export default {
         return {};
       },
     },
+    type: {
+      type: String,
+      default: "1",
+    },
   },
   data() {
     return {

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

@@ -58,9 +58,6 @@
             >审核不通过</el-button
           >
         </template>
-        <!-- <el-button v-else @click="batchExport" type="info" plain>
-          导出excel
-        </el-button> -->
       </template>
       <template slot="predictPayTime" slot-scope="props">
         <span v-if="props.scope.row.creditStatus == 1">已结清</span>
@@ -75,9 +72,6 @@
           {{ props.scope.row.predictPayDay || "--" }}
         </span>
       </template>
-      <template slot="divideCheckStatus" slot-scope="props">
-        <div>{{ props.scope.row.checkStatus > 0 ? "已通过" : "未通过" }}</div>
-      </template>
       <template slot="btn" slot-scope="props">
         <el-button type="text" @click="handelDetail(props.scope.row)">
           详情
@@ -202,7 +196,6 @@ export default {
           prop: "orderType",
           scope: "type",
           hidden: true,
-          // width: 100,
           values: {
             1: "完单分成",
             2: "退款扣除",
@@ -212,31 +205,23 @@ export default {
           label: "订单金额",
           prop: "orderPrice",
           hidden: true,
-          // width: 100,
           scope: "formatPrice",
         },
         {
           label: "税前佣金",
           prop: "pretaxBrokerage",
           hidden: true,
-          // width: 100,
           scope: "formatPrice",
         },
         {
           label: "应付分成",
-          prop: "payMoney",
+          prop:
+            this.divideModel == "1"
+              ? "divideCompanyMoney"
+              : "divideSellerMoney",
           hidden: true,
-          // width: 100,
           scope: "formatPrice",
         },
-        // {
-        //   label: "审核状态",
-        //   prop: "divideCheckStatus",
-        //   hidden: true,
-        //   // width: 100,
-        //   scope: "solt",
-        //   soltName: "divideCheckStatus",
-        // },
       ],
       tableData: [],
       total: 0,
@@ -355,15 +340,6 @@ export default {
     },
     formList() {
       return [
-        {
-          prop: "checkStatus",
-          placeholder: "审核状态",
-          scope: "select",
-          options: [
-            { label: "待审核", value: 0 },
-            { label: "已通过", value: 1 },
-          ],
-        },
         {
           prop: "orderType",
           placeholder: "分成类型",

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

@@ -296,8 +296,13 @@ export default {
           },
           { label: "订单金额", prop: "orderPrice", scope: "formatPrice" },
           { label: "税前佣金", prop: "pretaxBrokerage", scope: "formatPrice" },
-          { label: "应付分成", prop: "payMoney", scope: "formatPrice" },
+          {
+            label: "应付分成",
+            prop: this.type == 1 ? "divideCompanyMoney" : "divideSellerMoney",
+            scope: "formatPrice",
+          },
         ];
+        console.log(tableSet,789)
         if (this.type == 1) {
           tableSet.splice(3, 2);
         }

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

@@ -103,7 +103,7 @@
       @search="search(3)"
     />
     <!-- 订单列表 -->
-    <dislogOrderList
+    <dislog-order-list
       :info="activeOrderInfo"
       @search="search"
       :dialogVisible.sync="orderDialogVisible"