Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

assets/css/base.less

 @import "./custom.less";
 @import "./iview-reset.less";
+
 html body {
   min-width: 1240px;
   color: @body-color;
@@ -879,7 +880,7 @@ textarea::-webkit-input-placeholder {
   display: none;
 }
 
-// 纵横树的样式
+// 树的样式
 .zh-tree {
   // position: relative;
   display: block;
@@ -888,8 +889,8 @@ textarea::-webkit-input-placeholder {
   transform: translateX(0);
   transition: all .2s;
   box-sizing: border-box;
-  border: #E4E6ED solid 1px;
-  background: #fff;
+  border: @left-boder-color solid 1px;
+  background: @left-tree-bg;
   padding: 0px 10px 20px 10px;
   margin-top: 10px;
 
@@ -899,7 +900,7 @@ textarea::-webkit-input-placeholder {
     line-height: 45px;
     text-align: left;
     font-weight: 600;
-    border-bottom: #e4e6ed solid 1px;
+    border-bottom: @left-tree-header-boder-color solid 1px;
   }
 
   .zh-box {
@@ -925,9 +926,9 @@ textarea::-webkit-input-placeholder {
   box-sizing: border-box;
   transition: all .2s;
 
-  background: #fff;
+  background: @right-bg;
   // border-radius:3px; 
-  padding: 0px 10px 10px 0px;
+  padding: 10px;
   margin-top: 10px;
   // box-shadow: 0 0 5px rgba(0, 0, 0, .15);
 }
@@ -1038,12 +1039,12 @@ textarea::-webkit-input-placeholder {
 }
 
 .divIco:hover {
-  background: #F5F6FA;
+  background: @right-icon-color-hover;
 }
 
 .icoListInfo {
   font-weight: bold;
-  color: #515A6E;
+  color: @right-icon-color;
   font-size: 24px;
 }
 
@@ -1397,7 +1398,7 @@ html [type=button] {
   }
 
   .content {
-    background: white;
+    background: @layout-content-bg-color;
     padding: 0 0 0 10px;
     //position: absolute;
     left: 250px;
@@ -1462,9 +1463,9 @@ html [type=button] {
 }
 
 .menu_side {
-  background: #fff !important;
+  // background: #fff !important;
   margin: 5px 0 0 0 !important;
-  border: 1px solid #dcdee2 !important;
+  // border: 1px solid #dcdee2 !important;
 }
 
 .show_menu {

assets/css/custom.less

 //定义变量
 //@import './themes/deepBlank.less';
 // @import './themes/green.less';
-@import './themes/default.less';
+ @import './themes/default.less';

assets/css/iview-reset.less

@@ -95,35 +95,6 @@
   background-color: @primary-color;
 }
 
-.ivu-page-item-active {
-  background-color: @primary-color;
-  color: white;
-}
-
-.ivu-page-item-active:hover {
-  background-color: @primary-color;
-
-  // background-color: #d7e8fb;
-  a {
-    color: white !important;
-  }
-}
-
-.ivu-page-item-active>a {
-  color: white
-}
-
-.ivu-page-item-active>a:hover {
-  color: white
-}
-
-.ivu-page li:hover {
-  color: white
-}
-
-.ivu-page-item-active:hover a {
-  color: #fff;
-}
 
 .ivu-input-search {
   cursor: pointer;
@@ -231,26 +202,6 @@
   background-color: @primary-color;
 }
 
-//鼠标经过table  hover及选择行后的背景色
-.ivu-table-row-hover td {
-  background: #EFF8F7 !important;
-}
-
-.ivu-table-row-highlight td {
-  background-color: #EFF8F7 !important;
-}
-
-.ivu-dropdown-rel:hover {
-  .ivu-btn-text {
-    background-color: @primary-color;
-  }
-
-}
-
-//表格字体颜色
-.ivu-table {
-  color: @table-color  !important;
-}
 
 //校验不通过下面提示红色小字
 .ivu-form-item-error-tip {
@@ -451,6 +402,10 @@
 
 .ivu-tree-title {
   color: @tree-title-color  !important;
+
+  span {
+    color: @tree-title-color  !important;
+  }
 }
 
 .ivu-btn-group>.ivu-btn {
@@ -458,3 +413,124 @@
   opacity: 0.8;
   background: @group-btn-bg-color;
 }
+
+
+
+
+.ivu-layout {
+  height: 100%;
+  background: @layout-content-bg-color  !important;
+}
+
+//分页
+.ivu-page-item-active {
+  background-color: @page-active-bg  !important;
+  color: white;
+}
+
+.ivu-page-item-active:hover {
+  background-color: @page-active-color-hover;
+
+  // background-color: #d7e8fb;
+  a {
+    color: white !important;
+  }
+}
+
+.ivu-page-item-active>a {
+  color: white
+}
+
+.ivu-page-item-active>a:hover {
+  color: white
+}
+
+.ivu-page li:hover {
+  color: white
+}
+
+.ivu-page-item-active:hover a {
+  color: #fff;
+}
+
+.ivu-page-prev,
+.ivu-page-next {
+  background: @page-bg  !important;
+}
+
+.ivu-page-item {
+  background: @page-bg  !important;
+}
+
+.ivu-page.mini .ivu-page-options-elevator input {
+  background: @page-bg;
+  border: 1px solid @page-bg;
+  color: @page-color;
+  opacity: 0.7;
+}
+
+.ivu-select-selected-value {
+  color: @page-color;
+  opacity: 0.7;
+}
+
+//表格
+
+// .ivu-table-header thead tr th {
+//   background: @table-header-bg  !important; //f5f6fa
+//   border: 1px solid @table-header-border  !important;
+// }
+
+// .ivu-table-body {
+//   background-color: @table-body-bg;
+
+// }
+
+// .ivu-table td {
+//   background-color: @table-body-bg  !important;
+// }
+
+// .tableCommon tr td {
+//   background-color: @tableCommon-bg;
+//   border: 1px solid @tableCommon-boder  !important;
+// }
+
+
+// .ivu-table:before {
+//   //表格下边框线
+//   background-color: @table-boder  !important;
+
+// }
+
+// .ivu-table-border:after {
+//   //表格右边框线
+//   background-color: @table-boder  !important;
+
+// }
+
+// .ivu-table-wrapper-with-border {
+//   //表格上，左边框线
+//   // border: 1px solid @table-boder  !important;
+
+// }
+
+// //鼠标经过table  hover及选择行后的背景色
+// .ivu-table-row-hover td {
+//   background: @table-row-hover  !important;
+// }
+
+// .ivu-table-row-highlight td {
+//   background-color: @table-row-hover  !important;
+// }
+
+.ivu-dropdown-rel:hover {
+  .ivu-btn-text {
+    background-color: @primary-color;
+  }
+
+}
+
+//表格字体颜色
+.ivu-table {
+  color: @table-color  !important;
+}

assets/css/themes/deepBlank.less

@@ -55,6 +55,7 @@
 
 
 
+
 //表单的颜色
 @form-color: #fff;
 @form-footer-color: #fff;
@@ -72,7 +73,34 @@
 //左侧列表
 @left-tree-bg: #2F2F57;
 @left-tree-header-bg-color: #2F2F57;
+@left-tree-header-boder-color: #106FFE;
 @left-tree-header-color: #fff;
 @tree-title-color: #fff;
-@group-btn-bg-color:#2F2F57;
-@group-btn-color:#F5F6FA;
+@group-btn-bg-color: #2F2F57;
+@group-btn-color: #F5F6FA;
\ No newline at end of file
+@left-boder-color: #2F2F57;
+
+
+//右侧
+@right-header-bg: #2F2F57;
+@right-bg: #2F2F57;
+@right-icon-color: #fff;
+@right-icon-color-hover: #106FFE;
+
+
+
+//分页
+@page-active-bg: #222341;
+@page-active-color-hover: #fff;
+@page-bg: #222341;
+@page-color:#fff;
+
+
+//表格
+@table-header-bg:#106FFE;
+@table-header-border:#106FFE;
+@table-body-bg:#222341;
+@tableCommon-bg:#222341;
+@tableCommon-boder:#222341;
+@table-boder:#222341;
+@table-row-hover:#2F2F57;
\ No newline at end of file

assets/css/themes/default.less

@@ -12,11 +12,12 @@
 @layout-header: #515A6E;
 @layout-tabs: #f5f7f9;
 @layout-tabs-close: #515A6E;
-@layout-tabs-bg-close:#fff;
+@layout-tabs-bg-close: #fff;
 @tabs-bg-tag: #fff;
 
 //bady颜色
 @layout-content-bg-color: #fff;
+
 @card-bg: #fff;
 @body-color: #515a6e;
 @border-color: #dcdfe6;
@@ -58,9 +59,9 @@
 //表单的颜色
 @form-color: #515a6e;
 @form-footer-color: #fff;
-@form-divider-boder-color:#e8eaec;
-@input-bg-color:#fff;
-@input-boder-color:#dcdee2;
+@form-divider-boder-color: #e8eaec;
+@input-bg-color: #fff;
+@input-boder-color: #dcdee2;
 
 
 
@@ -71,9 +72,34 @@
 
 
 //左侧列表
-@left-tree-bg:#fff;
+@left-tree-bg: #fff;
 @left-tree-header-bg-color: #f5f6fa;
+@left-tree-header-boder-color: #fff;
 @left-tree-header-color: #515a6e;
-@tree-title-color:#515a6e;
-@group-btn-bg-color:#fff;
-@group-btn-color:#515a6e;
+@tree-title-color: #515a6e;
+@group-btn-bg-color: #fff;
+@group-btn-color: #515a6e;
\ No newline at end of file
+@left-boder-color: #dcdee2;
+
+
+//右侧
+@right-header-bg: #fff;
+@right-bg: #fff;
+@right-icon-color: #515A6E;
+@right-icon-color-hover: #F5F6FA;
+
+
+//分页
+@page-active-bg: #fff;
+@page-active-color-hover: #515A6E;
+@page-bg: #fff;
+@page-color: #515A6E;
+
+//表格
+@table-header-bg: #e8eaec;
+@table-header-border: #dcdee2;
+@table-body-bg: #fff;
+@tableCommon-bg: #fff;
+@tableCommon-boder: #fff;
+@table-boder: #e8eaec;
+@table-row-hover: #EFF8F7;

assets/css/themes/green.less

@@ -12,7 +12,7 @@
 @layout-header: #515A6E;
 @layout-tabs: #f5f7f9;
 @layout-tabs-close: #515A6E;
-@layout-tabs-bg-close:#fff;
+@layout-tabs-bg-close: #fff;
 @tabs-bg-tag: #fff;
 
 //bady颜色
@@ -57,9 +57,9 @@
 //表单的颜色
 @form-color: #515a6e;
 @form-footer-color: #fff;
-@form-divider-boder-color:#e8eaec;
-@input-bg-color:#fff;
-@input-boder-color:#dcdee2;
+@form-divider-boder-color: #e8eaec;
+@input-bg-color: #fff;
+@input-boder-color: #dcdee2;
 
 
 
@@ -70,9 +70,35 @@
 
 
 //左侧列表
-@left-tree-bg:#fff;
+@left-tree-bg: #fff;
 @left-tree-header-bg-color: #f5f6fa;
+@left-tree-header-boder-color: #fff;
 @left-tree-header-color: #515a6e;
-@tree-title-color:#515a6e;
-@group-btn-bg-color:#fff;
-@group-btn-color:#515a6e;
+@tree-title-color: #515a6e;
+@group-btn-bg-color: #fff;
+@group-btn-color: #515a6e;
\ No newline at end of file
+@left-boder-color: #dcdee2;
+
+
+//右侧
+@right-header-bg: #fff;
+@right-bg: #fff;
+@right-icon-color: #515A6E;
+@right-icon-color-hover: #F5F6FA;
+
+
+
+//分页
+@page-active-bg: #fff;
+@page-active-color-hover: #515A6E;
+@page-bg: #fff;
+@page-color: #515A6E;
+
+//表格
+@table-header-bg: #e8eaec;
+@table-header-border: #e8eaec;
+@table-body-bg: #fff;
+@tableCommon-bg: #fff;
+@tableCommon-boder: #fff;
+@table-boder: #e8eaec;
+@table-row-hover: #EFF8F7;

components/customTable/mainTable.vue

 <template>
   <Table
     :loading="loading"
-    border
+   
     highlight-row
     ref="table"
     :columns="tcolumn"

components/page/gridNew.vue

@@ -475,6 +475,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+@import "../../assets/css/custom.less";
 //position: relative;
 // height: 100%;
 .tableCommon {
@@ -497,6 +498,7 @@ export default {
 
 .table-tools {
   line-height: 40px;
+  background: @right-header-bg;
   .table-search {
     float: left;
     line-height: 40px;

pages/aps/results/results.less

+@import "../../../assets/css/custom.less";
 .results {
   font-family: Microsoft YaHei;
 
   .ivu-layout-sider {
-    background: rgba(255, 255, 255, 1);
+    background:@layout-content-bg-color;
     margin-right: 10px;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     height: 88vh;
@@ -22,7 +23,7 @@
   h4 {
     height: 45px;
     line-height: 45px;
-    border-bottom: 1px solid #e4e6ed;
+    border-bottom: 1px solid @left-tree-header-boder-color;
     margin-bottom: 15px;
 
     padding-left: 10px;
@@ -64,15 +65,16 @@
 
   .ivu-layout-content {
     margin-left: 5px;
-    background: rgba(255, 255, 255, 1);
+    background: @right-bg;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     height: 88vh;
     overflow: auto;
-position: relative;
+    position: relative;
+
     .i-row {
       height: 45px;
       line-height: 45px;
-      border-bottom: 1px solid #e4e6ed;
+      border-bottom: 1px solid @left-tree-header-boder-color;
       margin-bottom: 15px;
       padding-left: 10px;
 
@@ -102,7 +104,7 @@ position: relative;
 
     .btn {
       position: absolute;
-      top:7px;
+      top: 7px;
       right: 15px;
     }
   }

pages/crm/statistical/costomer/approval.vue

@@ -12,7 +12,7 @@
         <a class="row_more fr" @click="toivew">更多</a>
       </p>
       <div class="row_card_body">
-        <Table border :columns="columns1" :data="data1"></Table>
+        <Table  :columns="columns1" :data="data1"></Table>
       </div>
     </div>
   </div>

pages/demo/Fax/index.vue

@@ -54,7 +54,7 @@
         </Col>
       </Row>
     </Form>
-    <Table border :columns="columns" :data="data"></Table>
+    <Table  :columns="columns" :data="data"></Table>
     <div class="page-v">
       <Page :total="4" size="small" show-elevator show-sizer show-total :page-size="20" />
     </div>

pages/demo/RepairProcess/index.vue

@@ -36,7 +36,7 @@
         </Col>
       </Row>
     </Form>
-    <Table border :columns="columns" :data="data"></Table>
+    <Table  :columns="columns" :data="data"></Table>
      <div class="page-v">
       <Page :total="5" size="small" show-elevator show-sizer show-total :page-size="20" />
     </div>

pages/demo/monitoringWarning/info.vue

@@ -39,7 +39,7 @@
         </Col>
       </Row>
     </Form>
-    <Table border :columns="columns" :data="data"></Table>
+    <Table :columns="columns" :data="data"></Table>
      <div class="page-v">
       <Page :total="14" size="small" show-elevator show-sizer show-total :page-size="20" />
     </div>

pages/demo/operate/index.vue

@@ -48,7 +48,7 @@
         </Col>
       </Row>
     </Form>
-    <Table border :columns="columns" :data="data"></Table>
+    <Table  :columns="columns" :data="data"></Table>
       <div class="page-v">
       <Page :total="11" size="small" show-elevator show-sizer show-total :page-size="20" />
     </div>

pages/demo/plan/index.vue

@@ -48,7 +48,7 @@
         </Col>
       </Row>
     </Form>
-    <Table border :columns="columns" :data="data"></Table>
+    <Table  :columns="columns" :data="data"></Table>
     <div class="page-v">
       <Page :total="11" size="small" show-elevator show-sizer show-total :page-size="20" />
     </div>

pages/demo/trainNumber/index.vue

@@ -53,7 +53,7 @@
         </Col>
       </Row>
     </Form>
-    <Table border :columns="columns" :data="data"></Table>
+    <Table :columns="columns" :data="data"></Table>
      <div class="page-v">
       <Page :total="10" size="small" show-elevator show-sizer show-total :page-size="20" />
     </div>

pages/dncmnc/supplier/index.vue

@@ -39,7 +39,7 @@
         </Col>
       </Row>
     </Form>
-    <Table border :columns="columns" :data="data"></Table>
+    <Table  :columns="columns" :data="data"></Table>
     <div class="page-v">
       <Page :total="6" size="small" show-elevator show-sizer show-total :page-size="20" />
     </div>

pages/home/component/unqualifiedEcharts.vue

@@ -12,7 +12,7 @@
       </Col>
       <Col :span="16">
         <div class="table-b">
-          <Table border :columns="columns1" :data="data1" height="260"></Table>
+          <Table  :columns="columns1" :data="data1" height="260"></Table>
         </div>
       </Col>
     </Row>

pages/implement/components/entryMovie.vue

@@ -14,7 +14,7 @@
     </div>
 
     <div class="table">
-      <Table stripe ref="table" border :columns="moviecolumn" :data="moviedata" class="tableCommon"></Table>
+      <Table stripe ref="table"  :columns="moviecolumn" :data="moviedata" class="tableCommon"></Table>
       <Page
         :total="datatotal"
         :current="pageindex"

pages/implement/components/entryPause.vue

@@ -81,7 +81,7 @@
         </Col>
       </Row>
     </Form>
-    <Table stripe ref="table" border :columns="column1" :data="data1" class="tableCommon">
+    <Table stripe ref="table"  :columns="column1" :data="data1" class="tableCommon">
       <template slot-scope="{ row,index }" slot="title">
         <state code="plan.dispatch.pauseCause" type="text" :value="row.pausecause_id"></state>
       </template>

pages/implement/components/entryrecordMovie.vue

@@ -12,7 +12,7 @@
       />
     </div>
     <div class="table">
-      <Table stripe ref="table" border :columns="moviecolumn" :data="moviedata" class="tableCommon"></Table>
+      <Table stripe ref="table"  :columns="moviecolumn" :data="moviedata" class="tableCommon"></Table>
     </div>
   </div>
 </template>

pages/implement/components/entryrecordfiles.vue

@@ -12,7 +12,7 @@
       />
     </div>
     <div >
-      <Table stripe ref="table" border :columns="moviecolumn" :data="moviedata" class="tableCommon"></Table>
+      <Table stripe ref="table"  :columns="moviecolumn" :data="moviedata" class="tableCommon"></Table>
     </div>
   </div>
 </template>

pages/implement/components/entryrecordlist.vue

@@ -27,7 +27,7 @@
       <Button type="primary" :disabled="ishavzj" @click="SendCheckRecord()" class="title_btn ml10">送检记录</Button>
     </div>
     <div class="table01">
-      <Table ref="table" border class="tableCommon" :height="taHeight" :columns="recordcolumn" :data="recorddata">
+      <Table ref="table"  class="tableCommon" :height="taHeight" :columns="recordcolumn" :data="recorddata">
         <template slot-scope="{ row,index }" slot="selffillin">
           <template v-if="row.selfchecklist.fillinstatus==0||productobj.productstatus==4">
             <Checkbox

pages/implement/components/productReport.vue

@@ -25,7 +25,7 @@
       <Button type="primary" @click="save()" class="title_btn ml10" v-noClick>汇报</Button>
     </div>
     <div class="table01">
-      <Table stripe ref="table" border :columns="moviecolumn" :height="taHeight" :data="data1" class="tableCommon">
+      <Table stripe ref="table"  :columns="moviecolumn" :height="taHeight" :data="data1" class="tableCommon">
         <template slot-scope="{ row,index }" slot="hg">
           <template v-if="row.status==0">
             <template v-if="row.productstatus1==0">

pages/implement/components/sendCheckRecord.vue

 
 <template>
   <div class="new_box">
-    <Table stripe ref="table" border :columns="moviecolumn" :data="moviedata" class="tableCommon"></Table>
+    <Table stripe ref="table"  :columns="moviecolumn" :data="moviedata" class="tableCommon"></Table>
     <Page
       :total="datatotal"
       :current="pageindex"

pages/import/processBack.vue

 <template>
 <div class="content">
     <TablePaste hide-table :input-props="inputProps" @on-success="handleSuccess" @on-error="handleError" v-show="showTablePaste" />
-    <DataGrid border :height="tdHeightExcel" :columns="columnsImport" :data="excelData" :page="false" :set="false">
+    <DataGrid  :height="tdHeightExcel" :columns="columnsImport" :data="excelData" :page="false" :set="false">
         <template slot="easySearch">
             <Form inline>
                 <FormItem>

pages/material/index.vue

@@ -319,7 +319,7 @@ export default {
 .full {
   margin-top: 0;
   .content {
-    margin-top: 10px;
+    margin-top: 6px;
     .ivu-icon-ios-add:before {
       content: "\f341";
     }

pages/materiel/classification/add.vue

@@ -30,7 +30,7 @@
         </Col>
         <Col :span="24">
           <h4>扩展属性</h4>
-          <Table border :columns="columns" :data="checkList">
+          <Table  :columns="columns" :data="checkList">
             <template slot-scope="{ row, index }" slot="title">
               <div v-if="row.fieldType==1||row.fieldType==2">{{row.title}}</div>
               <Input

pages/materiel/classification/index.vue

@@ -379,7 +379,7 @@ export default {
   font-family: Microsoft YaHei;
 
   .ivu-layout-sider {
-    background: rgba(255, 255, 255, 1);
+    background: @layout-content-bg-color;
     margin-right: 10px;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     height: 87vh;
@@ -452,7 +452,7 @@ export default {
 
   .ivu-layout-content {
     // margin-left: 5px;
-    background: rgba(255, 255, 255, 1);
+    background: @right-bg;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     overflow: auto;
     padding: 10px;

pages/materiel/masterData/details.vue

@@ -45,7 +45,7 @@
           </div>
         </div>
         <div v-show="showTable">
-          <Table border :columns="columns" :data="data1" :height="820"></Table>
+          <Table  :columns="columns" :data="data1" :height="820"></Table>
           <!-- <DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="750" :conditions="easySearch"></DataGrid> -->
         </div>
       </Content>

pages/materiel/masterData/index.vue

@@ -48,7 +48,7 @@
           <Icon type="ios-arrow-forward" size="24" />
         </a>
       </div>
-      <Content :class="!showMenu?'con_bord':''">
+      <Content :class="!showMenu?'con_bord':''" class="content">
         <MasterData ref="dataTable" :nodeInfo="nodeInfo" @on-ok="ok" />
       </Content>
     </Layout>
@@ -296,7 +296,7 @@ export default {
   font-family: Microsoft YaHei;
 
   .ivu-layout-sider {
-    background: rgba(255, 255, 255, 1);
+    background:@layout-content-bg-color;
     margin-right: 10px;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     height: 88vh;
@@ -369,7 +369,7 @@ export default {
 
   .ivu-layout-content {
     // margin-left: 5px;
-    background: rgba(255, 255, 255, 1);
+    background:@right-bg;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     overflow: auto;
     padding: 10px;

pages/mesPlan/sendView.vue

 <template>
   <div style="width:100%;margin:0 auto">
-    <Table border :columns="columns1" :data="dataList" class="tableCommon" :height="tbHeight"></Table>
+    <Table  :columns="columns1" :data="dataList" class="tableCommon" :height="tbHeight"></Table>
     <div style="width100%;margin:40px auto">
       <Row>
         <Process ref="userProcess" schemaIdVal="123327da-42b3-41f6-b785-cf933f137a95" />

pages/mordent/Sluggish/placode/inventory.vue

@@ -21,7 +21,7 @@
           <Button type="primary" @click="easySearch">查询</Button>
         </Col>
       </Row>
-      <Table border :columns="columns" :data="list" class="tableCommon mb10" height="300">
+      <Table  :columns="columns" :data="list" class="tableCommon mb10" height="300">
         <template slot-scope="{ row, index }" slot="remainingAmount1">
           <InputNumber v-model="row.remainingAmount1" @on-change="inputOrderCat(row,index)" min="0"></InputNumber>
         </template>

pages/mordent/Sluggish/powder/inventory.vue

@@ -21,7 +21,7 @@
           <Button type="primary" @click="easySearch">查询</Button>
         </Col>
       </Row>
-      <Table border :columns="columns" :data="list" class="tableCommon mb10" height="300">
+      <Table  :columns="columns" :data="list" class="tableCommon mb10" height="300">
         <template slot-scope="{ row, index }" slot="remainingAmount1">
           <InputNumber v-model="row.remainingAmount1" @on-change="inputOrderCat(row,index)" min="0"></InputNumber>
         </template>

pages/mordent/Sluggish/scraper/inventory.vue

@@ -21,7 +21,7 @@
           <Button type="primary" @click="easySearch">查询</Button>
         </Col>
       </Row>
-      <Table border :columns="columns" :data="list" class="tableCommon mb10" height="300">
+      <Table  :columns="columns" :data="list" class="tableCommon mb10" height="300">
         <template slot-scope="{ row, index }" slot="remainingAmount1">
           <InputNumber v-model="row.remainingAmount1" @on-change="inputOrderCat(row,index)" min="0"></InputNumber>
         </template>

pages/mordent/andon/parameter/component/grid.vue

@@ -431,6 +431,7 @@ export default {
 </script>
 
 <style lang="less">
+//  @import "../../../assets/css/custom.less";
 .table-content {
   position: relative;
   // height: 100%;
@@ -454,6 +455,7 @@ export default {
 
   .table-tools {
     line-height: 40px;
+    //  background: @right-header-bg;
     .table-search {
       float: left;
       line-height: 40px;

pages/order/orderManager1.vue

@@ -106,7 +106,7 @@
             <div class="ml10">
                 <Tabs v-model="currTab" @on-click="clickTab">
                     <TabPane label="五二九纵" name="name1">
-                        <Table border highlight-row ref="table1" :columns="column1" :data="data1"></Table>
+                        <Table  highlight-row ref="table1" :columns="column1" :data="data1"></Table>
                     </TabPane>
                     <TabPane label="五二九横" name="name2">五二九横</TabPane>
                     <TabPane label="五二九预" name="name3">五二九预</TabPane>

pages/order/quotation/components/generateQuotation.vue

@@ -22,7 +22,7 @@
         </div>
       </div>
       <div class="table-boxs">
-        <Table border :columns="columns" :data="data" size="small"></Table>
+        <Table  :columns="columns" :data="data" size="small"></Table>
       </div>
       <div class="shenpi">
         <label>审批人：</label>

pages/order/quotation/components/metalQuotation.vue

@@ -29,7 +29,7 @@
         </Row>
       </Form>
       <div class="kuang-boxi">
-        <Table border :columns="columns" :data="gmData" size="small">
+        <Table  :columns="columns" :data="gmData" size="small">
           <template slot-scope="{ row, index }" slot="slot1">
             <InputNumber v-model="row.materialWeight" :min="0" @on-blur="show1(row,index)" />
           </template>

pages/order/quotation/components/metalQuotationGeneration.vue

@@ -71,7 +71,7 @@
         </div>
       </div>
       <div class="table-boxs">
-        <Table border :columns="columns" :data="childData.result" size="small"></Table>
+        <Table  :columns="columns" :data="childData.result" size="small"></Table>
       </div>
       <div class="zong-ji">
         <div class="xiao-ji">总计</div>

pages/order/quotation/components/photosensitive.vue

@@ -29,7 +29,7 @@
         </Row>
       </Form>
       <div class="kuang-boxi">
-        <Table border :columns="columns" :data="gmData" size="small">
+        <Table  :columns="columns" :data="gmData" size="small">
           <template slot-scope="{ row, index }" slot="slot1">
             <Input v-model="row.materialWeight" placeholder="请输入" @on-blur="show1(row, index)" />
           </template>

pages/order/quotation/components/photosensitiveGeneration.vue

@@ -71,7 +71,7 @@
         </div>
       </div>
       <div class="table-boxs">
-        <Table border :columns="columns" :data="childData.result" size="small"></Table>
+        <Table  :columns="columns" :data="childData.result" size="small"></Table>
       </div>
       <div class="zong-ji">
         <div class="xiao-ji">总计</div>

pages/order/quotation/components/quotationBox.vue

@@ -10,7 +10,7 @@
       footer-hide
     >
       <div class="kuang-boxi">
-        <Table border :columns="columns" :data="data" size="small">
+        <Table :columns="columns" :data="data" size="small">
           <template slot-scope="{ row, index }" slot="slot1">
             <Input v-model="row.name9" placeholder="请输入" @on-change="showPrinting(row,index)" />
           </template>
@@ -59,11 +59,11 @@
 import GenerateQuotation from "../components/generateQuotation.vue"; //生成报价单弹框
 export default {
   components: {
-    GenerateQuotation
+    GenerateQuotation,
   },
   name: "",
   props: {
-    bjData: Array
+    bjData: Array,
   },
   data() {
     return {
@@ -76,13 +76,13 @@ export default {
           title: "序号",
           type: "index",
           width: 50,
-          align: "center"
+          align: "center",
         },
         {
           title: "订单编号",
           key: "name",
           align: "center",
-          minWidth: 120
+          minWidth: 120,
         },
         // {
         //   title: '图号',
@@ -94,41 +94,41 @@ export default {
           title: "产品名称",
           key: "name2",
           align: "center",
-          minWidth: 80
+          minWidth: 80,
         },
 
         {
           title: "规格",
           key: "name4",
           align: "center",
-          minWidth: 80
+          minWidth: 80,
         },
         {
           title: "材料牌号",
           key: "name5",
           align: "center",
           minWidth: 80,
-          slot: "slot6"
+          slot: "slot6",
         },
         {
           title: "材料重量",
           key: "name6",
           align: "center",
           minWidth: 80,
-          slot: "slot7"
+          slot: "slot7",
         },
         {
           title: "材料单价",
           key: "name7",
           align: "center",
           minWidth: 80,
-          slot: "slot8"
+          slot: "slot8",
         },
         {
           title: "材料费/件(元)",
           key: "name8",
           align: "center",
-          minWidth: 70
+          minWidth: 70,
         },
         {
           title: "3D打印费",
@@ -146,19 +146,19 @@ export default {
                   h("Input", {
                     props: {
                       value: "1600",
-                      placeholder: "请输入"
+                      placeholder: "请输入",
                     },
                     on: {
-                      "on-change": value => {
+                      "on-change": (value) => {
                         console.log(value);
-                      }
-                    }
+                      },
+                    },
                   }),
-                  h("span", " /H")
+                  h("span", " /H"),
                 ]);
-              }
-            }
-          ]
+              },
+            },
+          ],
         },
         {
           title: "后处理费",
@@ -176,19 +176,19 @@ export default {
                   h("Input", {
                     props: {
                       value: "200",
-                      placeholder: "请输入"
+                      placeholder: "请输入",
                     },
                     on: {
-                      "on-change": value => {
+                      "on-change": (value) => {
                         console.log(value);
-                      }
-                    }
+                      },
+                    },
                   }),
-                  h("span", " /H")
+                  h("span", " /H"),
                 ]);
-              }
-            }
-          ]
+              },
+            },
+          ],
         },
         {
           title: "线切割费",
@@ -206,25 +206,25 @@ export default {
                   h("Input", {
                     props: {
                       value: "100",
-                      placeholder: "请输入"
+                      placeholder: "请输入",
                     },
                     on: {
-                      "on-change": value => {
+                      "on-change": (value) => {
                         console.log(value);
-                      }
-                    }
+                      },
+                    },
                   }),
-                  h("span", " /H")
+                  h("span", " /H"),
                 ]);
-              }
-            }
-          ]
+              },
+            },
+          ],
         },
         {
           title: "加工费单价",
           key: "name12",
           align: "center",
-          minWidth: 60
+          minWidth: 60,
         },
 
         {
@@ -232,39 +232,39 @@ export default {
           key: "name13",
           align: "center",
           minWidth: 80,
-          slot: "slot4"
+          slot: "slot4",
         },
         {
           title: "单价",
           key: "name14",
           align: "center",
-          minWidth: 60
+          minWidth: 60,
         },
         {
           title: "数量",
           key: "name3",
           align: "center",
-          minWidth: 70
+          minWidth: 70,
         },
         {
           title: "热处理",
           key: "name15",
           align: "center",
           minWidth: 80,
-          slot: "slot5"
+          slot: "slot5",
         },
         {
           title: "合计",
           key: "name16",
           align: "center",
-          minWidth: 80
+          minWidth: 80,
         },
         {
           title: "调度",
           key: "name17",
           align: "center",
-          minWidth: 60
-        }
+          minWidth: 60,
+        },
       ],
       data: [
         {
@@ -285,7 +285,7 @@ export default {
           name14: "",
           name15: "",
           name16: "",
-          name17: "小明"
+          name17: "小明",
         },
         {
           name: "a1233",
@@ -305,7 +305,7 @@ export default {
           name14: "",
           name15: "",
           name16: "",
-          name17: "小明"
+          name17: "小明",
         },
         {
           name: "a1233",
@@ -325,9 +325,9 @@ export default {
           name14: "",
           name15: "",
           name16: "",
-          name17: "小明"
-        }
-      ]
+          name17: "小明",
+        },
+      ],
     };
   },
   mounted() {},
@@ -369,10 +369,10 @@ export default {
       return (row.name16 =
         parseInt(row.name14) * parseInt(row.name3) + parseInt(row.name15)); //合计=单价*数量+热处理
     },
-     cancel() {
-      this.$emit('update')
-    }
-  }
+    cancel() {
+      this.$emit("update");
+    },
+  },
 };
 </script>
 <style lang="less" scoped>

pages/qc/certificate/endIssued/index.vue

@@ -147,7 +147,7 @@ export default {
   },
   mounted() {},
   created() {
-    this.tdHeight = window.innerHeight - 200;
+    this.tdHeight = window.innerHeight - 250;
   },
   methods: {
     addOk() {

pages/qc/certificate/waitOpened/index.vue

@@ -137,7 +137,7 @@ export default {
   },
   mounted() {},
   created() {
-    this.tdHeight = window.innerHeight - 200;
+    this.tdHeight = window.innerHeight - 250;
   },
   methods: {
     addOk() {

pages/resource/resource/index.vue

@@ -3,7 +3,7 @@
     <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
       <StoreTree @on-hide="onHide" @on-select="productSearch" />
     </Sider>
-      <Icon type="icon iconfont icondaochu" size="24" />  
+    <!-- <Icon type="icon iconfont icondaochu" size="24" />   -->
     <div v-if="!showMenu" class="show_menu">
       <a class="menu_play fr" @click="showMenuFn" title="展开">
         <Icon type="ios-arrow-forward" size="24" />
@@ -621,8 +621,7 @@ export default {
   margin-top: 0;
 
   .content {
-    margin-top: 10px;
-    padding-top: 10px;
+    margin-top: 6px;
 
     .ivu-icon-ios-add:before {
       content: "\f341";

pages/technology/productMix/index.vue

@@ -59,7 +59,7 @@ export default {
   font-family: Microsoft YaHei;
 
   .ivu-layout-sider {
-    background: rgba(255, 255, 255, 1);
+    background:@layout-content-bg-color;
     margin-right: 10px;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     height: 89vh;
@@ -98,7 +98,7 @@ export default {
   }
   .ivu-layout-content {
     // margin-left: 5px;
-    background: rgba(255, 255, 255, 1);
+    background: @right-bg;
     box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
     overflow: auto;
     padding: 10px;

pages/technology/productMix/product/add.vue

@@ -227,8 +227,9 @@ export default {
 };
 </script>
 <style lang="less">
+@import "../../../../assets/css/custom.less";
 .ivu-layout-sider {
-  background: rgba(255, 255, 255, 1);
+  background: @layout-content-bg-color;
   margin-right: 10px;
   box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
 

pages/technology/productMix/product/bomAdd.vue

@@ -157,8 +157,9 @@ export default {
 };
 </script>
 <style lang="less">
+@import "../../../../assets/css/custom.less";
 .ivu-layout-sider {
-  background: rgba(255, 255, 255, 1);
+  background:@layout-content-bg-color;
   margin-right: 10px;
   box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);