lrl -2021-12-02

src/views/energyPerformance/components/supplyAnddemand/Project.vue

@@ -216,6 +216,7 @@
                         :row-class-name="rowClassName"
                     >
                         <el-table-column
+                         sortable
                             type="selection"
                             width="40"
                             align="center"
@@ -224,10 +225,10 @@
                         ></el-table-column>
                         <el-table-column
                             sortable
-                            width="80px"
                             prop="showno"
-                            align="排序号"
-                            fixed="left"
+                            label="顺序号"
+                            width="85px"
+                            :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column
                             sortable

src/views/energyPerformance/components/supplyAnddemand/ProjectData.vue

@@ -276,18 +276,17 @@
                         :row-class-name="tableRowClassName"
                         :summary-method="getSummaries">
                         <el-table-column
-                            sortable
+                        sortable
                             type="selection"
                             width="40"
                             align="center"
                             fixed="left"
                         ></el-table-column>
-                        <el-table-column
-                            sortable
-                            width="100px"
+                         <el-table-column
+                        sortable
                             type="index"
                             label="排序号"
-                            fixed="left"
+                            width="80px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
                         <el-table-column

src/views/energyPlan/components/supplyAndDemand/planProjectDataMonth.vue

@@ -162,13 +162,13 @@
                             width="120px"
                             :show-overflow-tooltip="true"
                         ></el-table-column>
-                        <el-table-column
+                        <!-- <el-table-column
                             prop="rxj"
                             label="月计划量"
                             fixed="left"
                             width="100px"
                             :show-overflow-tooltip="true"
-                        ></el-table-column>
+                        ></el-table-column> -->
                         <el-table-column
                             prop="may"
                             label="日期"
@@ -212,7 +212,7 @@
                               <span>{{ nameObj.unitid.obj[scope.row.unit] ? nameObj.unitid.obj[scope.row.unit] : scope.row.unit }}</span>
                          </template>
                         </el-table-column>
-                        <el-table-column
+                        <!-- <el-table-column
                             prop="jxdays"
                             label="检修小时"
                             width="80px"
@@ -237,13 +237,13 @@
                                 </el-form-item>
                                 <span v-else>{{scope.row.jxdays}}</span>
                             </template>
-                        </el-table-column>
-                        <el-table-column
+                        </el-table-column> -->
+                        <!-- <el-table-column
                             prop="sqno"
                             label="序号"
                             width="60px"
                             :show-overflow-tooltip="true"
-                        ></el-table-column>
+                        ></el-table-column> -->
 <!--                        <el-table-column
                             prop="weightMonth"
                             label="目标计划量(月)"
@@ -1254,7 +1254,7 @@ export default {
             let c5 = row.clocke;
             let rowsPan = 1;
             // let adds = this.$refs.singleTable.tableData[rowIndex].realvalue;
-            if (column['property'] === 'workprocid' || column['property'] === 'adds' || column['property'] === 'rxj' || column['property'] === 'yhj') {
+            if (column['property'] === 'adds') {
                 if (rowIndex > 0 && c1 === tableData[rowIndex - 1].workprocid && c2 === tableData[rowIndex - 1].location &&
                 c3 === tableData[rowIndex - 1].workshop && c4 === tableData[rowIndex - 1].clock && c5 === tableData[rowIndex - 1].clocke) {
                     return {