修改bug

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

@@ -134,6 +134,15 @@ export default {
       &payEndTime=${this.searchValue.payEndTime}
       &userName=${this.searchValue.userName}`
         });
+      } 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/approveData/configuration/mainList.json

@@ -16,6 +16,7 @@
   "editBtn": false,
   "delBtn": false,
   "menuWidth": 180,
+  "stripe": true,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,

src/views/approveData/index.vue

@@ -7,6 +7,7 @@
                :page.sync="page"
                :search.sync="search"
                :table-loading="loading"
+               :cell-style="cellStyle"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -288,6 +289,9 @@ let previousRouterName = ""
           this.loading = false;
         })
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
     }
   }
 </script>

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/financialManagement/incomeInvoice/configuration/detailsPage.json

@@ -14,6 +14,7 @@
   "delBtn":false,
   "dialogWidth": "60%",
   "tree": true,
+  "stripe": true,
   "border": true,
   "index": true,
   "selection": true,

src/views/financialManagement/incomeInvoice/configuration/invoicepage.json

@@ -15,6 +15,7 @@
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
+  "stripe": true,
   "index": true,
   "selection": false,
   "menuWidth": 150,

src/views/financialManagement/incomeInvoice/incomeInvoiceDetailsPage.vue

@@ -74,6 +74,7 @@
                    :data="dataList"
                    ref="crud"
                    v-model="itemsForm"
+                   :cell-style="cellStyle"
                    @search-reset="searchReset"
                    @row-update="rowUpdate"
                    @selection-change="selectionChange"
@@ -156,6 +157,7 @@
                    :data="dataLists"
                    ref="cruds"
                    v-model="itemsForms"
+                   :cell-style="cellStyle"
                    @search-reset="searchReset"
                    @row-update="rowUpdate"
                    @selection-change="selectionChange"
@@ -886,6 +888,9 @@
           }
         }
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
     }
   }
 </script>

src/views/financialManagement/outputInvoice/configuration/detailsPage.json

@@ -15,6 +15,7 @@
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
+  "stripe": true,
   "index": true,
   "selection": true,
   "menuWidth": 150,

src/views/financialManagement/outputInvoice/configuration/invoicepage.json

@@ -15,6 +15,7 @@
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
+  "stripe": true,
   "index": true,
   "selection": false,
   "menuWidth": 150,

src/views/financialManagement/outputInvoice/outputInvoiceDetailsPage.vue

@@ -74,6 +74,7 @@
                    :data="dataList"
                    ref="crud"
                    v-model="itemsForm"
+                   :cell-style="cellStyle"
                    @search-reset="searchReset"
                    @row-update="rowUpdate"
                    @selection-change="selectionChange"
@@ -156,6 +157,7 @@
                    :data="dataLists"
                    ref="cruds"
                    v-model="itemsForms"
+                   :cell-style="cellStyle"
                    @search-reset="searchReset"
                    @row-update="rowUpdate"
                    @selection-change="selectionChange"
@@ -903,6 +905,9 @@
           }
         }
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
     }
   }
 </script>

src/views/financialManagement/paymentRequest/configuration/detailsPage.json

@@ -15,6 +15,7 @@
   "dialogWidth": "60%",
   "tree": true,
   "border": true,
+  "stripe": true,
   "index": true,
   "selection": false,
   "menuWidth": 150,

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -131,6 +131,7 @@
                    ref="crud"
                    v-model="itemForm"
                    :page.sync="page"
+                   :cell-style="cellStyle"
                    @search-reset="searchReset"
                    @row-update="rowUpdate"
                    @selection-change="selectionChange"
@@ -729,6 +730,9 @@
           this.$refs.crud.$refs.dialogColumn.columnBox = false;
         }
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
     }
   }
 </script>

src/views/financialManagement/paymentSettle/configuration/detailsPage.json

@@ -16,6 +16,7 @@
   "tree": true,
   "border": true,
   "index": true,
+  "stripe": true,
   "selection": false,
   "menuWidth": 150,
   "dialogClickModal": false,

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -86,6 +86,7 @@
                    ref="crud"
                    v-model="itemsForm"
                    :page.sync="page"
+                   :cell-style="cellStyle"
                    @search-reset="searchReset"
                    @row-update="rowUpdate"
                    @selection-change="selectionChange"
@@ -765,6 +766,9 @@
       getGSName(row) {
         this.form.belongCompany = row.cname
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
     }
   }
 </script>

src/views/financialManagement/receiptSettle/configuration/detailsPage.json

@@ -16,6 +16,7 @@
   "tree": true,
   "border": true,
   "index": true,
+  "stripe": true,
   "selection": false,
   "menuWidth": 150,
   "dialogClickModal": false,

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -101,6 +101,7 @@
                    ref="crud"
                    v-model="itemsForm"
                    :page.sync="page"
+                   :cell-style="cellStyle"
                    @search-reset="searchReset"
                    @row-update="rowUpdate"
                    @selection-change="selectionChange"
@@ -794,6 +795,9 @@
       getGSName(row) {
         this.form.belongCompany = row.cname
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
     }
   }
 </script>

src/views/importTrade/invoice/config/customerContact.json

@@ -16,6 +16,7 @@
   "tree": true,
   "border": true,
   "index": true,
+  "stripe": true,
   "selection": false,
   "menuWidth": 150,
   "dialogClickModal": false,

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -100,6 +100,7 @@
             v-model="contactsForm"
             :data="contactsData"
             ref="crudContact"
+            :cell-style="cellStyle"
             @row-save="rowSave"
             @row-click="handleRowClick"
             @row-update="rowUpdate"
@@ -1094,6 +1095,9 @@ export default {
         this.$refs.crudContact.$refs.dialogColumn.columnBox = false;
       }
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
   },
 }
 </script>

src/views/importTrade/receipt/config/customerContact.json

@@ -16,6 +16,7 @@
   "tree": true,
   "border": true,
   "index": true,
+  "stripe": true,
   "selectionFixed": false,
   "selection": false,
   "menuWidth": 150,

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -100,6 +100,7 @@
             v-model="contactsForm"
             :data="contactsData"
             ref="crudContact"
+            :cell-style="cellStyle"
             @row-save="rowSave"
             @row-click="handleRowClick"
             @row-update="rowUpdate"
@@ -952,6 +953,9 @@ export default {
         this.$refs.crudContact.$refs.dialogColumn.columnBox = false;
       }
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
   },
 }
 </script>

src/views/purchase/contract/config/customerContact.json

@@ -16,6 +16,7 @@
   "tree": true,
   "border": true,
   "index": true,
+  "stripe": true,
   "selection": true,
   "menuWidth": 150,
   "dialogClickModal": false,

src/views/purchase/contract/detailsPage.vue

@@ -169,6 +169,7 @@
             v-model="contactsForm"
             :data="contactsData"
             ref="crudContact"
+            :cell-style="cellStyle"
             @row-save="rowSave"
             @selection-change="selectionContact"
             @row-click="handleRowClick"
@@ -1135,6 +1136,15 @@ export default {
         // if(receivableList.length!=0 || copeWithList.length!=0 ){
         //   this.$confirm("有未提交的费用,系统将自动提交,确定要提交吗??", {
         //     confirmButtonText: "确定",
+        // 玛卡巴卡
+        // 阿卡哇卡
+        // 米卡玛卡呣
+        // 玛卡巴卡
+        // 阿巴雅卡
+        // 伊卡阿卡噢
+        // 哈姆达姆阿卡嗙
+        // 咿呀呦
+        // 玛卡巴卡阿卡哇卡
         //     cancelButtonText: "取消",
         //     type: "warning"
         //   }).then(()=>{
@@ -1446,6 +1456,9 @@ export default {
         this.$refs.crudContact.$refs.dialogColumn.columnBox = false;
       }
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
    },
 }
 </script>

src/views/purchase/stockBill/config/mainList.json

@@ -19,6 +19,7 @@
   "menuWidth": 150,
   "menu": false,
   "searchIcon": true,
+  "stripe": true,
   "searchIndex": 2,
   "searchLabelWidth": 100,
   "stripe": true,

src/views/salesManagement/salesContract/config/importInventory.json

@@ -17,6 +17,7 @@
   "index": true,
   "refreshBtn": false,
   "selection": true,
+  "stripe": true,
   "menuWidth": 150,
   "dialogClickModal": false,
   "showSummary": true,

src/views/salesManagement/salesContract/detailsPage.vue

@@ -157,6 +157,7 @@
             v-model="importInventoryForm"
             :data="importInventoryData"
             ref="importInventory"
+            :cell-style="cellStyle"
             @row-save="rowSaveList"
             @row-update="rowUpdateList"
             @row-del="rowDelList"
@@ -1322,6 +1323,9 @@ export default {
         this.$refs.importInventory.$refs.dialogColumn.columnBox = false;
       }
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
   },
 }
 </script>

src/views/statisticAnalysis/profit/config/mainList.json

@@ -15,6 +15,7 @@
   "viewBtn": false,
   "editBtn": false,
   "delBtn": false,
+  "stripe": true,
   "menuWidth": 180,
   "dialogClickModal": false,
   "searchLabelWidth": 120,

src/views/statisticAnalysis/profit/index.vue

@@ -172,6 +172,9 @@
         getProfitList(page.currentPage, page.pageSize,params).then(res=>{
           this.dataList = res.data.data.records
           this.page.total = res.data.data.total
+          if (this.page.total || this.page.total === 0) {
+            this.option.height = window.innerHeight - 230;
+          }
           this.rowspan()
         }).finally(()=>{
           this.loading = false;

src/views/statisticAnalysis/royalty/config/mainList.json

@@ -70,9 +70,17 @@
   ],
   "column": [
     {
+      "label": "商品",
+      "prop": "goodsName",
+      "width": 170,
+      "hide": true,
+      "search": true
+    },
+    {
       "label": "年",
       "prop": "year",
       "width": 170,
+      "searchValue": "2022",
       "hide": true,
       "search": true
     },
@@ -82,6 +90,7 @@
       "width": 170,
       "hide": true,
       "search": true,
+      "searchValue": "1",
       "type": "select",
       "dicData": [
         {
@@ -108,6 +117,7 @@
       "width": 170,
       "hide": true,
       "search": true,
+      "searchValue": "11",
       "type": "select",
       "dicData": [
         {
@@ -118,7 +128,12 @@
           "label": "操作",
           "value": "12"
         }
-      ]
+      ],
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "blur"
+      }]
     },
     {
       "label": "姓名",
@@ -138,12 +153,6 @@
       "width": 170
     },
     {
-      "label": "商品",
-      "prop": "goodsName",
-      "width": 170,
-      "search": true
-    },
-    {
       "label": "销售数量",
       "children": [
         {

src/views/statisticAnalysis/royalty/index.vue

@@ -31,15 +31,28 @@
           style="width: 100%"
         ></user-com>
       </template>
+      <template slot="goodsNameSearch">
+        <goods-select
+          v-model="search.goodsName"
+          @valueName="(value) => valueName(value)"
+          :configuration="configuration"
+        >
+        </goods-select>
+      </template>
       <template slot="menuLeft">
         <el-button size="small"
                    type="primary"
-                   :loading="exportLoading"
-                   @click.stop="downFile"
+                   @click.stop="statement"
         >报表
         </el-button>
       </template>
     </avue-crud>
+    <report-dialog
+      :switchDialog="switchDialog"
+      :searchValue="statementData"
+      :reportName="'进口贸易-提成统计表'"
+      @onClose="onClose()"
+    ></report-dialog>
   </basic-container>
 </template>
 
@@ -47,12 +60,12 @@
   import option from "./config/mainList.json";
   import { getCommission } from "@/api/statisticAnalysis/profit";
   import { contrastList } from "@/util/contrastData";
+  import reportDialog from "@/components/report-dialog/main";
 
   export default {
     data() {
       return {
         loading : false,
-        exportLoading:false,
         form: {},
         search:{},
         show:true,
@@ -62,6 +75,8 @@
         position:0,
         parentId:0,
         dataList: [],
+        statementData:[],
+        switchDialog:false,
         page: {
           pageSize: 10,
           pagerCount: 5,
@@ -80,6 +95,9 @@
         },
       }
     },
+    components:{
+      reportDialog
+    },
     async created() {
       // this.option = await this.getColumnData(this.getColumnName(66), option);
     },
@@ -87,44 +105,47 @@
 
     },
     methods: {
+      valueName(value){
+        this.search.goodsId  = value.id
+      },
       addReceipt(){
         console.log('1')
       },
       editOpen(){
         console.log('1')
       },
-      rowspan() {
-        //记录原始
-        let oldList = [this.dataList[0].userName]
-        this.dataList.forEach((item,index)=>{
-          let newList = [item.userName]
-          if(index===0){
-            this.spanArr.push(1)
-            this.position=0;
-          }else{
-            //如果循环数据与原始数据相等  那么合并
-            if(!contrastList(oldList,newList)){
-              this.spanArr[this.position] +=1;
-              this.spanArr.push(0)
-            }else{
-              //如果不等 更新原始数据  循环在比较
-              oldList = newList
-              this.spanArr.push(1)
-              this.position = index
-            }
-          }
-        })
-      },
-      spanMethod({ row, column, rowIndex, columnIndex }) {
-        if (column.property === "userName") {
-          const _row=this.spanArr[rowIndex];
-          const _col=_row>0?1:0;
-          return {
-            rowspan:_row,
-            colspan:_col
-          }
-        }
-      },
+      // rowspan() {
+      //   //记录原始
+      //   let oldList = [this.dataList[0].userName]
+      //   this.dataList.forEach((item,index)=>{
+      //     let newList = [item.userName]
+      //     if(index===0){
+      //       this.spanArr.push(1)
+      //       this.position=0;
+      //     }else{
+      //       //如果循环数据与原始数据相等  那么合并
+      //       if(!contrastList(oldList,newList)){
+      //         this.spanArr[this.position] +=1;
+      //         this.spanArr.push(0)
+      //       }else{
+      //         //如果不等 更新原始数据  循环在比较
+      //         oldList = newList
+      //         this.spanArr.push(1)
+      //         this.position = index
+      //       }
+      //     }
+      //   })
+      // },
+      // spanMethod({ row, column, rowIndex, columnIndex }) {
+      //   if (column.property === "userName") {
+      //     const _row=this.spanArr[rowIndex];
+      //     const _col=_row>0?1:0;
+      //     return {
+      //       rowspan:_row,
+      //       colspan:_col
+      //     }
+      //   }
+      // },
       //点击搜索按钮触发
       searchChange(params, done) {
         this.query = params;
@@ -147,24 +168,45 @@
       refreshChange() {
         this.onLoad(this.page);
       },
+      statement(){
+        this.statementData = this.paramsAdjustment(this.search)
+        this.switchDialog =! this.switchDialog;
+      },
+      onClose(val) {
+        this.switchDialog = val;
+      },
       paramsAdjustment(params) {
         params = Object.assign({}, this.search);
-        // if (params.createTime &&  params.createTime.length !==0 ) {  //发货
-        //   params.startTime = params.createTime[0]+ " " + "00:00:00";
-        //   params.endTime = params.createTime[1] + " " + "23:59:59";
-        //   this.$delete(params,'createTime')
-        // }
-        if(!params.userType){
-          params.userType = "业务"
+
+        if(params.year && params.year !== '2022'){
+          params.year = params.year.getFullYear()
         }
         return params
       },
       onLoad(page, params) {
-        this.loading = true;
         params = this.paramsAdjustment(params)
+        if(!params.goodsId){
+          this.$message.warning("请先选择商品!")
+          return
+        }
+        if(!params.userType){
+          this.$message.warning("请先选择提成类型!")
+          return
+        }
+        if(!params.quarter){
+          this.$message.warning("请先选择季度!")
+          return
+        }
+        if(!params.year){
+          this.$message.warning("请先选择年份!")
+          return
+        }
+        this.loading = true;
         getCommission(page.currentPage, page.pageSize,params).then(res=>{
-          this.dataList = res.data.data.records
-          this.page.total = res.data.data.total
+          this.dataList = res.data.data
+          if (res.data.data) {
+            this.option.height = window.innerHeight - 240;
+          }
           // this.rowspan()
         }).finally(()=>{
           this.loading = false;