Pārlūkot izejas kodu

Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!506
黄梓星 1 gadu atpakaļ
vecāks
revīzija
74341fc20a

+ 7 - 2
src/views/purchase/purchase-order/edit/index.vue

@@ -954,11 +954,16 @@ export default {
                 <!-- max-height="500px"
                   show-summary
                   :summary-method="getSummaries" -->
-                  <el-table-column label="序号">
+                  <virtual-column label="序号" type="index">
                     <template slot-scope="scope">
                       {{ scope.$index + 1 }}
                     </template>
-                  </el-table-column>
+                  </virtual-column>
+                  <!-- <el-table-column label="序号">
+                    <template slot-scope="scope">
+                      {{ scope.$index + 1 }}
+                    </template>
+                  </el-table-column> -->
                   <el-table-column 
                     v-for="(cColumn, cIndex) in column.tableColumns" 
                     :key="cIndex" 

+ 4 - 3
src/views/purchase/purchase-order/see/index.vue

@@ -390,13 +390,14 @@ export default {
                   :data="tableData" 
                   style="width: 100%"  
                   :row-key="column.key === 'puOrderItemList' ? 'rowNo' :'rowno'"
-                  
                   :headerCellStyle="headerCellFixedStyle"
                   :cellStyle="cellFixedStyle"
+                  :height="tabHeight"
+                >
+                <!-- 
                   max-height="500px"
                   show-summary
-                  :summary-method="getSummaries"
-                >
+                  :summary-method="getSummaries" -->
                   <el-table-column label="序号">
                     <template slot-scope="scope">
                       {{ scope.$index + 1 }}

+ 2 - 2
src/views/purchase/task/xie-yi-zhi-cai/index.vue

@@ -185,8 +185,8 @@ export default {
           :columns="tableColumns"
           :size="$attrs.size"
           :dict="dict"
-          showSummary
-        >
+          >
+          <!-- showSummary -->
           <template slot="purchaseQuantity" slot-scope="scope">
             <component
               v-bind="scope.attr"