修改提示框

src/lang/zh.js

@@ -136,22 +136,22 @@ export default {
     special_permission_manage: '特殊权限管理',
     schedule_print: '排班打印',
 
-    stockInOrder: '入库单',
-    salesReturnOrder: '退货单',
-    stockOutOrder: '出库单',
-    cancelStockOrder: '出库退库单',
+    stockInOrder: '耗材入库单',
+    salesReturnOrder: '耗材退货单',
+    stockOutOrder: '耗材出库单',
+    cancelStockOrder: '耗材退库单',
     otherStockInOrder: '其他入库单',
     otherSalesReturnOrder: '其他退货单',
     otherStockOutOrder: '其他出库单',
-    otherCancelStockOrder: '其他出库退库单',
+    otherCancelStockOrder: '其他退库单',
     stockInOrderAdd: '新增入库单',
     salesReturnOrderAdd: '新增退货单',
     stockOutOrderAdd: '新增出库单',
-    cancelStockOrderAdd: '新增出库退库单',
+    cancelStockOrderAdd: '新增退库单',
     stockInDetail: '入库单详情',
     salesReturnDetail: '退货单详情',
     stockOutDetail: '出库单详情',
-    cancelStockDetail: '出库退库单详情',
+    cancelStockDetail: '退库单详情',
     stockDetail:'出入库明细查询',
 
   },

src/xt_pages/data/components/table.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="" style="margin-right:20px;">
-    <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row @current-change="handleRowChange"
+    <el-table style="margin-top: 42px;" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row @current-change="handleRowChange"
       >
       <el-table-column  align="center" label="名称">
         <template slot-scope="scope">

src/xt_pages/data/components/tableson.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button style="float: right;margin-right: 20px" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
 
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row

src/xt_pages/dialysis/details/index.vue

@@ -249,7 +249,6 @@ export default {
   data() {
     return {
       crumbs:[
-        {path:false, name:'科室质控'},
         {path:false, name:'透析管理'},
         {path:false, name:'透析记录'},
         {path:false, name:'透析单'},

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -194,11 +194,8 @@
               tempForm['good_type_id'] = val.goodTypeId
               tempForm['good_id'] = val.selectedGoodInfo[i].id
               tempForm['return_count'] = ''
-              // this.recordInfo.recordData.push(tempForm)
               this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
 
-
-
             }
           }
         }

src/xt_pages/stock/cancelStockOrderDetail.vue

@@ -6,18 +6,18 @@
   <div class="app-container">
 
     <div class="filter-container">
-      <span style="font-size: 20px">退库单详情</span>
+      <span style="font-size: 20px;color: #606266">退库单详情</span>
       <el-row style="float:right;">
-        <span>{{CancelStockInfo.cancelStock.order_number}}</span>
+        <span style="color: #606266">{{CancelStockInfo.cancelStock.order_number}}</span>
       </el-row>
     </div>
 
 
 
     <div class="cell clearfix">
-      <span style="width: 300px">单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
-      <span style="width: 300px">厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
-      <span style="width: 300px">经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
+      <span style="width: 300px;color: #606266">单据日期:  {{CancelStockInfo.cancelStock.return_time | parseTime('{y}-{m}-{d}')}} </span>
+      <span style="width: 300px;color: #606266">厂商 {{getManufactuerName(CancelStockInfo.cancelStock.manufacturer)}}</span>
+      <span style="width: 300px;color: #606266">经销商 {{getDealerName(CancelStockInfo.cancelStock.dealer)}}</span>
     </div>
 
     <div class="filter-container" style="margin-top: 10px">

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -2,7 +2,7 @@
   <div class="main-contain">
     <div class="app-container">
       <div class="cell clearfix" >
-        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品类型"/>
+        <el-input style="width: 300px;" class="filter-item" v-model="searchKey" placeholder="单据编码/制单人/商品"/>
         <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
       </div>
 
@@ -59,7 +59,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="商品类型" align="center">
+          <el-table-column label="商品" align="center">
             <template slot-scope="scope">
               {{specificationName(scope.row.good_id)}}
             </template>

src/xt_pages/stock/salesReturnOrderDetail.vue

@@ -7,17 +7,17 @@
     <div class="app-container">
 
       <div class="filter-container">
-        <span style="font-size: 18px">退货单详情</span>
-        <el-row style="float:right;">
-          <span>{{ReturnInfo.salesReturn.order_number}}</span>
+        <span style="font-size: 18px;color: #606266">退货单详情</span>
+        <el-row style="float:right;color: #606266">
+          <span style="color: #606266">{{ReturnInfo.salesReturn.order_number}}</span>
         </el-row>
       </div>
 
 
       <div class="cell clearfix">
-        <span style="width: 300px">单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
-        <span style="width: 300px">厂商: {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
-        <span style="width: 300px">经销商: {{getDealerName(ReturnInfo.salesReturn.dealer)}}</span>
+        <span style="width: 300px;color: #606266">单据日期:  {{ReturnInfo.salesReturn.return_time | parseTime('{y}-{m}-{d}')}} </span>
+        <span style="width: 300px;color: #606266">厂商: {{getManufactuerName(ReturnInfo.salesReturn.manufacturer)}}</span>
+        <span style="width: 300px;color: #606266">经销商: {{getDealerName(ReturnInfo.salesReturn.dealer)}}</span>
       </div>
 
       <div class="filter-container" style="margin-top: 10px">

src/xt_pages/stock/stockInOrderDetail.vue

@@ -5,16 +5,16 @@
     </div>
   <div class="app-container">
     <div class="filter-container">
-      <span style="font-size: 18px">入库单详情</span>
+      <span style="font-size: 18px;color: #606266">入库单详情</span>
       <el-row style="float:right;">
-        <span>入库单号: {{WarehouseInfo.warehouse.warehousing_order}}</span>
+        <span style="color: #606266">入库单号: {{WarehouseInfo.warehouse.warehousing_order}}</span>
       </el-row>
     </div>
 
     <div class="cell clearfix">
-      <span style="width: 300px">单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}}</span>
-      <span style="width: 300px">厂商: {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
-      <span style="width: 300px">经销商: {{getDealerName(WarehouseInfo.warehouse.dealer)}}</span>
+      <span style="width: 300px;color: #606266">单据日期:  {{WarehouseInfo.warehouse.warehousing_time | parseTime('{y}-{m}-{d}')}}</span>
+      <span style="width: 300px;color: #606266">厂商: {{getManufactuerName(WarehouseInfo.warehouse.manufacturer)}}</span>
+      <span style="width: 300px;color: #606266">经销商: {{getDealerName(WarehouseInfo.warehouse.dealer)}}</span>
     </div>
 
     <div class="cell clearfix" style="margin-top: 10px">

src/xt_pages/stock/stockOutOrderDetail.vue

@@ -7,17 +7,17 @@
     <div class="app-container">
 
       <div class="filter-container">
-        <span style="font-size: 18px">出库单详情</span>
+        <span style="font-size: 18px;color: #606266">出库单详情</span>
         <el-row style="float:right;">
-          <span>{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
+          <span style="color: #606266">{{warehousingOutInfo.info.warehouse_out_order_number}}</span>
         </el-row>
       </div>
 
 
       <div class="cell clearfix">
-        <span style="width: 300px;">单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
-        <span style="width: 300px;">厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
-        <span style="width: 300px;">经销商 {{getDealerName(warehousingOutInfo.info.dealer)}}</span>
+        <span style="width: 300px;color: #606266">单据日期:  {{warehousingOutInfo.info.warehouse_out_time | parseTime('{y}-{m}-{d}')}} </span>
+        <span style="width: 300px;color: #606266">厂商 {{getManufactuerName(warehousingOutInfo.info.manufacturer)}}</span>
+        <span style="width: 300px;color: #606266">经销商 {{getDealerName(warehousingOutInfo.info.dealer)}}</span>
       </div>
 
       <div class="filter-container" style="margin-top: 10px">