合并

src/xt_pages/stock/stockInOrder.vue

@@ -1,39 +1,35 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-
-    <div class="filter-container">
-
-
-      <el-row style="float:right;">
-        <el-button @click="handleWarehouse" type="primary">新增</el-button>
-      </el-row>
+  <div class="main-contain">
+    <div class="position">
+      <!--<bread-crumb :crumbs='crumbs'></bread-crumb>-->
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button size="small"  @click="handleWarehouse" class="filter-item" style="float:right;" type="primary" icon="el-icon-circle-plus-outline" >新增</el-button>
     </div>
 
-    <div class="filter-container" style="margin-top:20px">
+    <div class="app-container">
+
+    <div class="cell">
       <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
     </div>
 
-    <div class="filter-container">
-      <span>入库时间:</span>
-      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-      <span class="">-</span>
-      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
-    </div>
-
-    <div class="filter-container" style="margin-top: 10px">
-      <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
-      <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
-
-    </div>
+      <div class="cell">
+        <span>入库时间:</span>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+      <div class="cell clearfix">
+        <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+      </div>
 
-    <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="Warehouse.warehouseDate"
         :class="signAndWeighBoxPatients"
@@ -42,14 +38,17 @@
         v-loading="Warehouse.loading"
         ref="multipleTable"
         @selection-change="select"
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
+
 
       >
         <el-table-column
+          align="center"
           type="selection"
           width="55">
         </el-table-column>
 
-        <el-table-column label="单据日期" align="center">
+        <el-table-column label="单据日期"  align="center">
           <template slot-scope="scope">
             {{ scope.row.warehousing_time | parseTime('{y}-{m}-{d}')}}
           </template>
@@ -111,8 +110,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total">
       </el-pagination>
-
-    </el-row>
+    </div>
   </div>
 </template>
 
@@ -127,9 +125,11 @@
     getWarehouseInfoList,
     getWarehouseList
   } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
     name: 'stockIn',
+    components: { BreadCrumb },
     created() {
       var year = new Date().getFullYear()
       var month = new Date().getMonth() + 1
@@ -160,6 +160,10 @@
     },
     data() {
       return {
+        crumbs:[
+          {path:false, name:'库存管理'},
+          {path:'/stock/out', name:'入库单'},
+        ],
         page: 1,
         limit: 7,
         checked: false,

src/xt_pages/stock/stockOutOrder.vue

@@ -1,47 +1,42 @@
 <template>
 
-  <div class="app-container sign-and-weigh-box">
-
-
-    <div class="filter-container">
-
-
-      <el-row style="float:right;">
-        <el-button @click="AddNewOrder" type="primary">新增</el-button>
-      </el-row>
-    </div>
-
-    <div class="filter-container" style="margin-top:20px">
-      <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs='crumbs'></bread-crumb>
+      <el-button size="small"  @click="AddNewOrder" class="filter-item" style="float:right;" type="primary" icon="el-icon-circle-plus-outline" >新增</el-button>
     </div>
+    <div class="app-container">
+      <div class="cell">
+        <el-input style="width: 300px;" class="filter-item" placeholder="单据日期/单据编码/制单人/供应商"/>
+        <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </div>
+
+
+      <div class="cell">
+        <span>出库时间:</span>
+        <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
+        <span class="">-</span>
+        <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
+                        type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
+                        value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
+      </div>
+
+      <div class="cell clearfix">
+        <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
+        <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
+      </div>
 
-    <div class="filter-container">
-      <span>入库时间:</span>
-      <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-      <span class="">-</span>
-      <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
-                      type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
-                      value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>
-    </div>
-
-    <div class="filter-container" style="margin-top: 10px">
-      <el-checkbox style="width: 30px" v-model="checked" @change="changeAllSelected">全选</el-checkbox>
-      <el-button size="small" icon="el-icon-delete" @click="batchDelete">删除</el-button>
-
-    </div>
-
-    <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="warehouseOutDate"
         :class="signAndWeighBoxPatients"
         style="width: 100%" border
         highlight-current-row
         ref="multipleTable"
+        
         @selection-change="select"
-
+        :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
       >
         <el-table-column
           type="selection"
@@ -65,8 +60,6 @@
             {{getXuserName(scope.row.creater)}}
           </template>
         </el-table-column>
-
-
         <el-table-column label="厂家" align="center">
           <template slot-scope="scope">
             {{getManufactuerName(scope.row.manufacturer)}}
@@ -94,12 +87,9 @@
               icon="el-icon-delete"
               @click="handleDelete(scope.$index, scope.row)">
             </el-button>
-
           </template>
         </el-table-column>
-
       </el-table>
-
       <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
@@ -111,21 +101,30 @@
         :total="total">
       </el-pagination>
 
-    </el-row>
+
+    </div>
   </div>
+
+
+
+
+
 </template>
 
 <script>
   import { uParseTime } from '@/utils/tools'
   import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from '@/api/doctor'
+
   import {
     deleteWarehouseOut,
     GetAllConfig,
     getWarehouseOutList,
   } from '@/api/stock'
+  import BreadCrumb from '../components/bread-crumb'
 
   export default {
     name: 'salesReturnOrder',
+    components: { BreadCrumb },
     created() {
       var year = new Date().getFullYear()
       var month = new Date().getMonth() + 1
@@ -156,6 +155,10 @@
     },
     data() {
       return {
+        crumbs:[
+          {path:false, name:'库存管理'},
+          {path:'/stock/out', name:'出库单'},
+        ],
         page: 1,
         limit: 7,
         checked: false,
@@ -361,48 +364,121 @@
   }
 </script>
 
-<style rel="stylesheet/css" lang="scss" scoped>
-  .information {
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .app-container {
+  // margin: 20px;
+    font-size: 15px;
+  .filter-container {
+    padding-bottom: 5px;
+  }
+  .search-component {
+    width: 500px;
+  .searchBox {
+    width: 300px;
+    height: 36px;
+    line-height: 36px;
+    padding-left: 15px;
     border: 1px #dcdfe6 solid;
-    padding: 30px 20px 30px 20px;
-
-  .border {
-    border-bottom: 1px #dcdfe6 solid;
-    margin: 0px 0 20px 0;
+    border-right: none;
+    outline: none;
+    float: left;
+    border-radius: 6px 0 0 6px;
+    font-size: 14px;
+    color: #333;
+    background: #fff;
+    box-shadow: 3px 3px 4px rgba(135, 135, 135, 0.05);
   }
-
+  .searchBtn {
+    background-color: #409eff;
+    color: #fff;
+    font-size: 15px;
+    text-align: center;
+    height: 36px;
+    line-height: 36px;
+    float: left;
+    outline: none;
+    width: 70px;
+    border: none;
+    border-radius: 0 6px 6px 0;
+    font-family: "Microsoft Yahei";
+    cursor: pointer;
   }
-
+  }
+  .cell {
+    margin: 0px 0 15px 0;
+    -moz-box-sizing: border-box;
+    -webkit-box-sizing: border-box;
+    -o-box-sizing: border-box;
+    -ms-box-sizing: border-box;
+    box-sizing: border-box;
+    display: -webkit-box;
+    display: -ms-flexbox;
+  // display: flex;
+    -webkit-box-align: flex-start;
+    -ms-flex-align: flex-start;
+    align-items: flex-start;
+    text-align: left;
+    justify-content: flex-start;
+    color: #333;
   .title {
+    width: 80px;
+    display: inline-block;
+    font-weight: normal;
+    color: #909399;
+    padding: 6px 0;
+    font-weight: 700;
+  .name {
+    width: 60px;
+    text-align: justify;
+    text-justify: distribute-all-lines;
+    text-align-last: justify;
+    -moz-text-align-last: justify;
+    -webkit-text-align-last: justify;
+    display: inline-block;
+  }
+  }
+  .time {
+    -webkit-box-flex: 1;
+    -ms-flex: 1;
+    flex: 1;
+  ul {
+    padding: 0;
+    margin: 0;
+  li {
+    float: left;
+    list-style: none;
+    cursor: pointer;
+    padding: 3px 0;
+    width: 70px;
+    color: #606266;
+    border-radius: 4px;
+    margin: 0 10px 0 0;
+    color: #409eff;
+    border: 1px #409eff solid;
+    text-align:center;
+  &:hover {
+     background: #409eff;
+     color: #fff;
+   }
+  }
+  .active {
     background: #409eff;
-    height: 44px;
-    line-height: 44px;
-    padding: 0 0 0 10px;
     color: #fff;
-    margin: 0 0 10px 0;
-
   }
-
-  .edit_separater {
-    border-top: 1px solid rgb(233, 233, 233);
-    margin-top: 15px;
-    margin-bottom: 15px;
   }
-
-</style>
-
-<style>
-  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
-    font-size: 12px;
   }
-
-  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
-    background: #6fb5fa;
   }
-
-  .count {
-    color: #bd2c00;
-
+  .amount {
+    font-weight: normal;
+    padding: 10px 0 0 0;
+    color: #606266;
+    font-size: 14px;
+  span {
+    color: #ef2525;
+    font-family: "Arial";
+    padding: 0 2px;
+  }
+  }
   }
-
 </style>
+