列表斑马线 行高

src/views/financialManagement/billDetails/billDetails.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"
@@ -104,7 +105,7 @@
       rowStyle(data){
         if(_.subtract(data.row.settlementAmount, data.row.amount) < 0){
           return  {
-            background: "rgba(248,203,203,0.56)"
+            color: "rgba(220,0,0,0.56)"
           }
         }
       },
@@ -170,6 +171,9 @@
         }
         this.$refs.crud.getTableHeight()
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

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

@@ -15,6 +15,7 @@
   "editBtn": false,
   "delBtn": false,
   "menuWidth": 80,
+  "stripe": true,
   "dialogClickModal": false,
   "searchLabelWidth": 120,
   "searchIcon": true,
@@ -161,6 +162,75 @@
       "overHidden": true,
       "index": 15,
       "width": 200
+    },
+    {
+      "label": "结算状态",
+      "prop": "accSysNo",
+      "search": true,
+      "overHidden": true,
+      "hide": true,
+      "index": 2,
+      "type": "select",
+      "dicData": [
+        {
+          "label": "全部",
+          "value": "全部"
+        },
+        {
+          "label": "已结算",
+          "value":"已结算"
+        },
+        {
+          "label": "未结算",
+          "value":"未结算"
+        }
+      ]
+    },
+    {
+      "label": "对账状态",
+      "prop": "accSysNo",
+      "search": true,
+      "overHidden": true,
+      "hide": true,
+      "index": 2,
+      "type": "select",
+      "dicData": [
+        {
+          "label": "全部",
+          "value": "全部"
+        },
+        {
+          "label": "已对账",
+          "value":"已对账"
+        },
+        {
+          "label": "未对账",
+          "value":"未对账"
+        }
+      ]
+    },
+    {
+      "label": "发票状态",
+      "prop": "accSysNo",
+      "search": true,
+      "overHidden": true,
+      "hide": true,
+      "index": 2,
+      "type": "select",
+      "dicData": [
+        {
+          "label": "全部",
+          "value": "全部"
+        },
+        {
+          "label": "已开票",
+          "value":"已开票"
+        },
+        {
+          "label": "未开票",
+          "value":"未开票"
+        }
+      ]
     }
   ]
 }

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

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

src/views/financialManagement/incomeInvoice/incomeInvoice.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"
@@ -211,6 +212,9 @@
         this.show = true;
         this.onLoad(this.page,this.search)
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

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

@@ -19,6 +19,7 @@
   "searchLabelWidth": 120,
   "searchIcon": true,
   "searchIndex": 2,
+  "stripe": true,
   "addBtn":false,
   "headerAlign": "center",
   "showSummary": false,

src/views/financialManagement/outputInvoice/outputInvoice.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"
@@ -217,6 +218,9 @@
         this.show = true;
         this.onLoad(this.page,this.search)
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

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

@@ -20,6 +20,7 @@
   "searchLabelWidth": 120,
   "searchIcon": true,
   "searchIndex": 2,
+  "stripe": true,
   "addBtn":false,
   "expand": false,
   "expandWidth": 38,

src/views/financialManagement/paymentRequest/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"
@@ -221,6 +222,9 @@
         this.show = true;
         this.onLoad(this.page,this.search)
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

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

@@ -20,6 +20,7 @@
   "searchIcon": true,
   "searchIndex": 2,
   "addBtn":false,
+  "stripe": true,
   "headerAlign": "center",
   "showSummary": true,
   "summaryText": "合计",

src/views/financialManagement/paymentSettle/paymentSettle.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"
@@ -230,6 +231,9 @@
         this.show = true;
         this.onLoad(this.page,this.search)
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

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

@@ -20,6 +20,7 @@
   "searchIcon": true,
   "searchIndex": 2,
   "addBtn":false,
+  "stripe": true,
   "headerAlign": "center",
   "showSummary": true,
   "summaryText": "合计",

src/views/financialManagement/receiptSettle/receiptSettle.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"
@@ -214,6 +215,9 @@
         this.show = true;
         this.onLoad(this.page,this.search)
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

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

@@ -22,6 +22,7 @@
   "addBtnText": "创建单据",
   "dialogClickModal": false,
   "searchLabelWidth": 120,
+  "stripe": true,
   "showSummary": true,
   "summaryText": "合计",
   "sumColumnList": [

src/views/importTrade/invoice/index.vue

@@ -10,6 +10,7 @@
                @row-del="rowDel"
                :before-open="beforeOpen"
                :before-close="beforeClose"
+               :cell-style="cellStyle"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -277,6 +278,9 @@ export default {
       }
       this.$refs.crud.getTableHeight()
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //列保存触发
     async saveColumn() {
       const inSave = await this.saveColumnData(

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

@@ -22,6 +22,7 @@
   "addBtnText": "创建单据",
   "dialogClickModal": false,
   "searchLabelWidth": 120,
+  "stripe": true,
   "showSummary": true,
   "summaryText": "合计",
   "sumColumnList": [

src/views/importTrade/receipt/index.vue

@@ -10,6 +10,7 @@
                @row-del="rowDel"
                :before-open="beforeOpen"
                :before-close="beforeClose"
+               :cell-style="cellStyle"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -287,6 +288,9 @@ export default {
       this.show = true;
       this.onLoad(this.page,this.search)
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //列保存触发
     async saveColumn() {
       const inSave = await this.saveColumnData(

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

@@ -26,6 +26,7 @@
   "expandWidth": 38,
   "selectionWidth": 50,
   "showSummary": true,
+  "stripe": true,
   "summaryText": "合计",
   "sumColumnList": [
     {

src/views/purchase/contract/index.vue

@@ -11,6 +11,7 @@
                  @row-del="rowDel"
                  :before-open="beforeOpen"
                  :before-close="beforeClose"
+                 :cell-style="cellStyle"
                  @search-change="searchChange"
                  @search-reset="searchReset"
                  @selection-change="selectionChange"
@@ -309,6 +310,9 @@ export default {
       this.show = true;
       this.onLoad(this.page, this.search)
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //列保存触发
     async saveColumn() {
       const inSave = await this.saveColumnData(

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

@@ -21,6 +21,7 @@
   "searchIcon": true,
   "searchIndex": 2,
   "searchLabelWidth": 100,
+  "stripe": true,
   "showSummary": true,
   "summaryText": "合计",
   "sumColumnList": [

src/views/purchase/stockBill/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"
@@ -149,6 +150,9 @@
         }
         this.$refs.crud.getTableHeight()
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

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

@@ -25,6 +25,7 @@
   "expandWidth": 38,
   "addBtnText": "创建单据",
   "expand": true,
+  "stripe": true,
   "rowKey": "id",
   "showSummary": true,
   "summaryText": "合计",

src/views/salesManagement/salesContract/index.vue

@@ -10,6 +10,7 @@
                @row-del="rowDel"
                :before-open="beforeOpen"
                :before-close="beforeClose"
+               :cell-style="cellStyle"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -288,6 +289,9 @@ export default {
       }
       this.$refs.crud.getTableHeight()
     },
+    cellStyle() {
+      return "padding:0;height:40px;";
+    },
     //列保存触发
     async saveColumn() {
       const inSave = await this.saveColumnData(

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

@@ -22,6 +22,7 @@
   "searchIndex": 2,
   "addBtn":false,
   "menu": false,
+  "stripe": true,
   "headerAlign": "center",
   "showSummary": true,
   "summaryText": "合计",

src/views/statisticAnalysis/profit/index.vue

@@ -15,6 +15,7 @@
                @size-change="sizeChange"
                @refresh-change="refreshChange"
                @saveColumn="saveColumn"
+               :cell-style="cellStyle"
                @resetColumn="resetColumn"
                @on-load="onLoad">
       <template slot="menuLeft">
@@ -176,6 +177,9 @@
           this.loading = false;
         })
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

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

@@ -22,6 +22,7 @@
   "searchIndex": 2,
   "addBtn":false,
   "menu": false,
+  "stripe": true,
   "headerAlign": "center",
   "showSummary": true,
   "summaryText": "合计",
@@ -65,22 +66,6 @@
     {
       "name": "invoiceAmount",
       "type": "sum"
-    },
-    {
-      "name": "unitPrice",
-      "type": "sum"
-    },
-    {
-      "name": "costAmount",
-      "type": "sum"
-    },
-    {
-      "name": "deliverMoney",
-      "type": "sum"
-    },
-    {
-      "name": "profit",
-      "type": "sum"
     }
   ],
   "column": [
@@ -143,8 +128,13 @@
       "search": true
     },
     {
+      "label": "序号",
+      "prop": "serialId",
+      "width": 50
+    },
+    {
       "label": "姓名",
-      "prop": "name",
+      "prop": "userName",
       "width": 170
     },
     {
@@ -152,28 +142,28 @@
       "children": [
         {
           "label": "第一月",
-          "prop": "corpName",
+          "prop": "firstMonth",
           "overHidden": true,
           "width": 170,
           "index": 1
         },
         {
           "label": "第二月",
-          "prop": "orderNo",
+          "prop": "secondMonth",
           "width": 170,
           "index": 2,
           "overHidden": true
         },
         {
           "label": "第三月",
-          "prop": "invoiceWeight",
+          "prop": "thirdMonth",
           "width": 170,
           "index": 3,
           "overHidden": true
         },
         {
           "label": "合计",
-          "prop": "customDutyMoney",
+          "prop": "totalBillWeight",
           "width": 170,
           "index": 4,
           "overHidden": true
@@ -182,14 +172,12 @@
     },
     {
       "label": "提成单价",
-      "prop": "name",
-      "search": true,
+      "prop": "commissionRate",
       "width": 170
     },
     {
       "label": "提成金额",
-      "prop": "name",
-      "search": true,
+      "prop": "commissionAmount",
       "width": 170
     },
     {
@@ -197,7 +185,7 @@
       "children": [
         {
           "label": "60%",
-          "prop": "saleCorpName",
+          "prop": "receivedAmount",
           "overHidden": true,
           "width": 170,
           "index": 10
@@ -209,14 +197,14 @@
       "children": [
         {
           "label": "已领金额",
-          "prop": "createUserName",
+          "prop": "receivedAmount",
           "width": 170,
           "index": 17,
           "overHidden": true
         },
         {
           "label": "留存金额",
-          "prop": "createUserName",
+          "prop": "retainedAmount",
           "width": 170,
           "index": 17,
           "overHidden": true

src/views/statisticAnalysis/royalty/index.vue

@@ -8,6 +8,7 @@
                :search.sync="search"
                :table-loading="loading"
                :span-method="spanMethod"
+               :cell-style="cellStyle"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -95,9 +96,9 @@
       },
       rowspan() {
         //记录原始
-        let oldList = [this.dataList[0].name]
+        let oldList = [this.dataList[0].userName]
         this.dataList.forEach((item,index)=>{
-          let newList = [item.name]
+          let newList = [item.userName]
           if(index===0){
             this.spanArr.push(1)
             this.position=0;
@@ -116,7 +117,7 @@
         })
       },
       spanMethod({ row, column, rowIndex, columnIndex }) {
-        if (column.property === "name") {
+        if (column.property === "userName") {
           const _row=this.spanArr[rowIndex];
           const _col=_row>0?1:0;
           return {
@@ -170,6 +171,9 @@
           this.loading = false;
         })
       },
+      cellStyle() {
+        return "padding:0;height:40px;";
+      },
       //列保存触发
       async saveColumn() {
         const inSave = await this.saveColumnData(

src/views/statisticAnalysis/salesProfit/index.vue

@@ -8,6 +8,7 @@
         :before-open="beforeOpen"
         :page.sync="page"
         :search.sync="search"
+        :cell-style="cellStyle"
         @search-change="searchChange"
         @current-change="currentChange"
         @size-change="sizeChange"
@@ -16,7 +17,6 @@
         :table-loading="loading"
         @saveColumn="saveColumn"
         @resetColumn="resetColumn"
-        :cell-style="cellStyle"
       >
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>

src/views/system/application/config/detailsPage.json

@@ -36,7 +36,7 @@
       ]
     },
     {
-      "label": "版本号",
+      "label": "最低版本",
       "prop": "versionCode",
       "overHidden": true,
       "cell":true,
@@ -51,26 +51,18 @@
       ]
     },
     {
-      "label": "最低版本",
-      "prop": "versionCode",
-      "overHidden": true,
-      "cell": true,
-      "width": 80,
-      "index": 3
-    },
-    {
       "label": "最新版本",
       "prop": "lastVersionCode",
       "overHidden": true,
       "cell": true,
-      "width": 80,
+      "width": 180,
       "index": 4
     },
     {
       "label": "下载地址",
       "prop": "downloadUrl",
       "overHidden": true,
-      "width": 500,
+      "width": 430,
       "index": 5
     },
     {
@@ -84,7 +76,6 @@
       "label": "是否发布",
       "prop": "isRelease",
       "type": "select",
-      "value": 1,
       "dicData": [
         {
         "label": "是",

src/views/system/application/detailsPage.vue

@@ -66,7 +66,7 @@
                       v-if="row.$cellEdit"
                       v-model="row.versionDesc"
                       size="small"
-                      autocomplete="off"
+                      autosize
                       placeholder="">
             </el-input>
             <span v-else>{{ row.versionDesc }}</span>