修改

src/assets/json/element_css.js

@@ -2328,7 +2328,7 @@ let elementCssJson = {
     
     .el-table td,
     .el-table th.is-leaf {
-      border-bottom: 1px solid #ebeef5
+      border-bottom: 1px solid #000
     }
     
     .el-table th.is-sortable {
@@ -2395,7 +2395,7 @@ let elementCssJson = {
     
     .el-table--border,
     .el-table--group {
-      border: 1px solid #ebeef5
+      border: 1px solid #000
     }
     
     .el-table--border::after,
@@ -2434,7 +2434,7 @@ let elementCssJson = {
     .el-table--border td,
     .el-table--border th,
     .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed {
-      border-right: 1px solid #ebeef5
+      border-right: 1px solid #000
     }
     
     .el-table--border th.gutter:last-of-type {
@@ -2548,6 +2548,7 @@ let elementCssJson = {
     .el-table__header-wrapper tbody td {
       background-color: #f5f7fa;
       color: #606266
+      border:2px,solid,#000
     }
     
     .el-table__body-wrapper {
@@ -2805,7 +2806,8 @@ let elementCssJson = {
       box-sizing: border-box;
       text-align: center;
       cursor: pointer;
-      position: relative
+      position: relative,
+      border:1px,solid,#000
     }
     
     .el-date-table td div {
@@ -2813,6 +2815,7 @@ let elementCssJson = {
       padding: 3px 0;
       -webkit-box-sizing: border-box;
       box-sizing: border-box
+      border:1px,solid,#000
     }
     
     .el-date-table td span {
@@ -2826,6 +2829,7 @@ let elementCssJson = {
       -webkit-transform: translateX(-50%);
       transform: translateX(-50%);
       border-radius: 50%
+      border:1px,solid,#000
     }
     
     .el-month-table td .cell,
@@ -2834,6 +2838,7 @@ let elementCssJson = {
       height: 32px;
       display: block;
       line-height: 32px
+      border:1px,solid,#000
     }
     
     .el-date-table td.next-month,

src/views/inward/components/offsetSteel/saleSteelTruckOrder/saleTruckPreview.vue

@@ -111,6 +111,7 @@
           <!-- 选择发站 -->
           <template slot-scope="scope">
             <el-select
+              disabled
               filterable
               v-model="scope.row.sendStationId"
               @change="updateSendStation($event, scope.row)"

src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -283,6 +283,17 @@
           v-if="!columnNoRoutList.includes('销售订单状态')"
         >
         </el-table-column>
+        <el-table-column
+          prop="flStatus"
+          column-key="flStatus"
+          key="flStatus"
+          label="分录状态"
+          width="110px"
+          align="center"
+          :filters="filterFlStatus"
+          v-if="!columnNoRoutList.includes('分录状态')"
+        >
+        </el-table-column>
         <el-table-column
           prop="consigneeName"
           label="客户"
@@ -2078,11 +2089,22 @@ export default {
       filterTruckRemark: [],
       filterSaleOrderStatus: [
         { text: '关闭', value: '关闭' },
+        { text: '保存', value: '保存' },
         { text: '提交', value: '提交' },
         { text: '审核', value: '审核' },
         { text: '未上报', value: '未上报' },
         { text: '反审批', value: '反审批' }
       ],
+      filterFlStatus: [
+        {
+          text: '关闭',
+          value: '关闭'
+        },
+        {
+          text: '正常',
+          value: '正常'
+        }
+      ],
       filterMap: {
         consigneeNameList: [],
         truckRemarkList: [],
@@ -3653,6 +3675,14 @@ export default {
         this.headColumnList.splice(this.headColumnList.indexOf('spellNum'), 1)
         delete this.filterMap.spellNumList
       }
+      if (typeof obj.flStatus != 'undefined' && obj.flStatus.length > 0) {
+        this.headColumnList.push('flStatus')
+        this.filterMap.flStatusList = obj.flStatus
+      }
+      if (typeof obj.flStatus != 'undefined' && obj.flStatus.length == 0) {
+        this.headColumnList.splice(this.headColumnList.indexOf('flStatus'), 1)
+        delete this.filterMap.flStatusList
+      }
       // if (obj)
       this.onclick(this.filterMap)
     },

src/views/statisticalReport/components/salesLogisticsStatistics/steelTransportReport.vue

@@ -44,7 +44,6 @@
         id="tableRef"
         ref="tableRef"
         border
-        :cell-style="cellStyle"
         :summary-method="getSummaries"
         show-summary
       >
@@ -75,6 +74,33 @@
           key="carrier"
         >
         </el-table-column>
+        <el-table-column
+          prop="noUploadPlanTruckNumber"
+          label="销售未上报计划(车)"
+          align="center"
+          column-key="noUploadPlanTruckNumber"
+          width="120"
+          key="noUploadPlanTruckNumber"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="savePlanTruckNumber"
+          label="销售保存计划(车)"
+          align="center"
+          column-key="savePlanTruckNumber"
+          width="100"
+          key="savePlanTruckNumber"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="submitPlanTruckNumber"
+          label="销售保存计划(车)"
+          align="center"
+          column-key="submitPlanTruckNumber"
+          width="100"
+          key="submitPlanTruckNumber"
+        >
+        </el-table-column>
         <el-table-column
           prop="planTruckNumber"
           label="销售下达计划(车)"
@@ -240,6 +266,9 @@ export default {
       titleTXT: null,
       tableData: [],
       sumList: [
+        'submitPlanTruckNumber',
+        'savePlanTruckNumber',
+        'noUploadPlanTruckNumber',
         'planTruckNumber',
         'arrageTruckNumber',
         'unArragePlanTruckNumber',
@@ -336,14 +365,7 @@ export default {
         })
     },
     cellStyle({ row, column, rowIndex, columnIndex }) {
-      if (
+      return { border: '2px,solid,#000' }
-        column.property == 'arrivalAddress' ||
-        column.property == 'receiptAddress'
-      ) {
-        return { height: '40px' }
-      } else {
-        return { height: '40px' }
-      }
     },
     getSummaries(param) {
       const { columns, data } = param
@@ -399,6 +421,22 @@ export default {
       font-weight: 700;
       color: #000;
     }
+
+    // /deep/ .el-table__body {
+    //   overflow-y: auto;
+    //   position: absolute !important;
+    //   tr:hover > td {
+    //     background-color: #fff;
+    //   }
+    // }
+
+    /deep/ .el-table__row > td {
+      // overflow-y: auto;
+      // position: absolute !important;
+
+      border: 20px, solid, #000 !important;
+    }
+
     .null {
       height: 20px;
     }

static/css/common.css

@@ -507,7 +507,7 @@ input:-webkit-autofill {
 .sui-table td, .sui-table th {
   padding: 6px 12px;
   text-align: left; border-color: #ccc;
-  border-right: 1px solid #ccc; border-bottom: 1px solid #ccc;
+  border-right: 1px solid #000; border-bottom: 1px solid #000;
 }
 .sui-table-small td, .sui-table-small th { padding: 2px 12px; }
 .sui-table-bgg { background-color: #f5f5f5; word-break: break-all;}