账单明细

src/api/statisticAnalysis/profit.js

@@ -16,8 +16,8 @@ export const getProfitList = (current, size,params) => {
 export const getCommission = (current, size,params) => {
   return request({
     url: '/api/blade-deliver-goods/deliveryReport/commission',
-    method: 'get',
-    params: {
+    method: 'post',
+    data: {
       ...params,
       current,
       size

src/components/report-dialog/main.vue

@@ -133,8 +133,18 @@ export default {
       &payStartTime=${this.searchValue.payStartTime}
       &payEndTime=${this.searchValue.payEndTime}
       &userName=${this.searchValue.userName}`
-        });
-      }else if(name == "客户资料-客户资料.ureport.xml"){
+        })
+      }else if(this.reportName == "进口贸易-提成统计表"){
+        this.$router.push({
+          path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}
+          &year=${this.searchValue.year}
+          &quarter=${this.searchValue.quarter}
+           &userType=${this.searchValue.userType}
+      &userId=${this.searchValue.userId}
+      &goodsId=${this.searchValue.goodsId}`
+        })
+      }
+      else if(name == "客户资料-客户资料.ureport.xml"){
         this.$router.push({
           path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}&id=${this.reportId}&tenantId=${tenantId}`
         });

src/views/financialManagement/billDetails/billDetails.vue

@@ -38,6 +38,9 @@
       <template slot-scope="scope" slot="costType">
         <span>{{ scope.row.itemName }}</span>
       </template>
+      <template slot-scope="scope" slot="billType">
+        <span>{{ scope.row.billType == "申请"?"付费":"收费" }}</span>
+      </template>
       <template slot-scope="scope" slot="menu">
         <el-button
           type="text"

src/views/financialManagement/billDetails/configuration/mainList.json

@@ -77,12 +77,12 @@
       "width": 120,
       "dicData": [
         {
-          "label": "申请",
+          "label": "付费",
           "value": "申请"
         },
         {
-          "label": "收款",
-          "value":"收款"
+          "label": "收费",
+          "value":"收费"
         }
       ]
     },
@@ -165,7 +165,7 @@
     },
     {
       "label": "结算状态",
-      "prop": "accSysNo",
+      "prop": "settlementStatus",
       "search": true,
       "overHidden": true,
       "hide": true,
@@ -173,22 +173,18 @@
       "type": "select",
       "dicData": [
         {
-          "label": "全部",
-          "value": "全部"
-        },
-        {
           "label": "已结算",
-          "value":"已结算"
+          "value":1
         },
         {
           "label": "未结算",
-          "value":"未结算"
+          "value":2
         }
       ]
     },
     {
       "label": "对账状态",
-      "prop": "accSysNo",
+      "prop": "checkStatus",
       "search": true,
       "overHidden": true,
       "hide": true,
@@ -196,22 +192,18 @@
       "type": "select",
       "dicData": [
         {
-          "label": "全部",
-          "value": "全部"
-        },
-        {
           "label": "已对账",
-          "value":"已对账"
+          "value":1
         },
         {
           "label": "未对账",
-          "value":"未对账"
+          "value":2
         }
       ]
     },
     {
       "label": "发票状态",
-      "prop": "accSysNo",
+      "prop": "invoiceStatus",
       "search": true,
       "overHidden": true,
       "hide": true,
@@ -219,16 +211,12 @@
       "type": "select",
       "dicData": [
         {
-          "label": "全部",
-          "value": "全部"
-        },
-        {
           "label": "已开票",
-          "value":"已开票"
+          "value":1
         },
         {
           "label": "未开票",
-          "value":"未开票"
+          "value":2
         }
       ]
     }

src/views/purchase/contract/detailsPage.vue

@@ -1136,6 +1136,15 @@ export default {
         // if(receivableList.length!=0 || copeWithList.length!=0 ){
         //   this.$confirm("有未提交的费用,系统将自动提交,确定要提交吗??", {
         //     confirmButtonText: "确定",
+        // 玛卡巴卡
+        // 阿卡哇卡
+        // 米卡玛卡呣
+        // 玛卡巴卡
+        // 阿巴雅卡
+        // 伊卡阿卡噢
+        // 哈姆达姆阿卡嗙
+        // 咿呀呦
+        // 玛卡巴卡阿卡哇卡
         //     cancelButtonText: "取消",
         //     type: "warning"
         //   }).then(()=>{