2 Commits 86a03ca0a3 ... 1543076769

Tác giả SHA1 Thông báo Ngày
  17767204043 1543076769 Merge branch 'master' of http://121.41.102.225:3000/chen/tianma 2 năm trước cách đây
  17767204043 9501227aee 优化: 2 năm trước cách đây

+ 1 - 1
src/components/footer/index.vue

@@ -30,7 +30,7 @@ export default {
     },
     computed:{
         computed_page_opt(){
-            const array = [10,20,30,40,50,100]
+            const array = [10,20,30,40,50,100,1000]
             return array
         }
     },

+ 1 - 0
src/views/BasicSettings/Stock/classify.vue

@@ -180,6 +180,7 @@
             :pageIndex='pageIndex'
             :total='total'
             @changeSize='changeSize'
+            :page-size-opts="[10, 20, 30, 40,100,1000]"
             @change='changePage' />
     <Modal v-model="showModal"
            title="请选择时间段"

+ 19 - 1
src/views/BusinessProcessing/BomProject/edit.vue

@@ -333,6 +333,10 @@
         </vxe-toolbar> -->
         <vxe-table
           border
+<<<<<<< HEAD
+          :row-class-name="colorTableRowClassName"
+=======
+>>>>>>> 86a03ca0a37388eb26f2044b29005e1070c45553
           resizable
           header-align="center"
           ref="xTree"
@@ -572,6 +576,16 @@ export default {
     }
   },
   methods: {
+<<<<<<< HEAD
+    colorTableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 0) {
+        return "statistics-warning-row";
+      } else {
+        return "";
+      }
+    },
+=======
+>>>>>>> 86a03ca0a37388eb26f2044b29005e1070c45553
     getTree(records) {
       console.log(records);
       let tableResult = JSON.parse(JSON.stringify(records));
@@ -1430,7 +1444,11 @@ export default {
   },
 };
 </script>
-
+<style>
+.statistics-warning-row {
+  background: #84cbec !important;
+}
+</style>
 <style lang="scss" scoped>
 span {
   display: inline-block;

+ 15 - 3
src/views/BusinessProcessing/PlanMannage/productionPlan/edit.vue

@@ -171,6 +171,7 @@
         :data="showData"
         :height="height"
         use-virtual
+        :row-class-name="colorTableRowClassName"
         :data-changes-scroll-top="false"
         :row-height="rowHeight"
         :summary-method="summaryMethod"
@@ -296,8 +297,7 @@
             </div>
           </template>
         </u-table-column>
-        <u-table-column prop="price" label="单价" width="135">
-        </u-table-column>
+        <u-table-column prop="price" label="单价" width="135"> </u-table-column>
         <u-table-column prop="total_price" label="价格合计" width="135">
         </u-table-column>
         <u-table-column prop="img_number" label="工程图号" width="135">
@@ -1560,6 +1560,13 @@ export default {
   //     document.getElementsByClassName('ivu-table-body')[0].removeEventListener('scroll',this.tableListener,true)
   // },
   methods: {
+    colorTableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 0) {
+        return "statistics-warning-row";
+      } else {
+        return "";
+      }
+    },
     remarkBlur(e) {
       // const tableResult = this.showData[index];
       // const val = e.target.value;
@@ -2138,8 +2145,13 @@ export default {
   },
 };
 </script>
-
+<style>
+.statistics-warning-row {
+  background: #84cbec !important;
+}
+</style>
 <style lang="scss" scoped>
+
 .m-add {
   display: flex;
   justify-content: space-between;

+ 13 - 1
src/views/BusinessProcessing/ProcurementMannage/PurchaseOrder/edit.vue

@@ -307,6 +307,7 @@
         :data="postInfo.children"
         :height="height"
         use-virtual
+        :row-class-name="colorTableRowClassName"
         :data-changes-scroll-top="false"
         :row-height="rowHeight"
         :summary-method="summaryMethod"
@@ -1372,6 +1373,13 @@ export default {
     this.getStateData();
   },
   methods: {
+    colorTableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 0) {
+        return "statistics-warning-row";
+      } else {
+        return "";
+      }
+    },
     tooltipRender(h, params) {
       debugger;
     },
@@ -2091,7 +2099,11 @@ export default {
   },
 };
 </script>
-
+<style>
+.statistics-warning-row {
+  background: #84cbec !important;
+}
+</style>
 <style lang="scss" scoped>
 .m-add {
   display: flex;