Browse Source

修改提示框

csx 6 years ago
parent
commit
aa5a9a1cfa

+ 7 - 7
src/lang/zh.js View File

136
     special_permission_manage: '特殊权限管理',
136
     special_permission_manage: '特殊权限管理',
137
     schedule_print: '排班打印',
137
     schedule_print: '排班打印',
138
 
138
 
139
-    stockInOrder: '入库单',
140
-    salesReturnOrder: '退货单',
141
-    stockOutOrder: '出库单',
142
-    cancelStockOrder: '出库退库单',
139
+    stockInOrder: '耗材入库单',
140
+    salesReturnOrder: '耗材退货单',
141
+    stockOutOrder: '耗材出库单',
142
+    cancelStockOrder: '耗材退库单',
143
     otherStockInOrder: '其他入库单',
143
     otherStockInOrder: '其他入库单',
144
     otherSalesReturnOrder: '其他退货单',
144
     otherSalesReturnOrder: '其他退货单',
145
     otherStockOutOrder: '其他出库单',
145
     otherStockOutOrder: '其他出库单',
146
-    otherCancelStockOrder: '其他出库退库单',
146
+    otherCancelStockOrder: '其他退库单',
147
     stockInOrderAdd: '新增入库单',
147
     stockInOrderAdd: '新增入库单',
148
     salesReturnOrderAdd: '新增退货单',
148
     salesReturnOrderAdd: '新增退货单',
149
     stockOutOrderAdd: '新增出库单',
149
     stockOutOrderAdd: '新增出库单',
150
-    cancelStockOrderAdd: '新增出库退库单',
150
+    cancelStockOrderAdd: '新增退库单',
151
     stockInDetail: '入库单详情',
151
     stockInDetail: '入库单详情',
152
     salesReturnDetail: '退货单详情',
152
     salesReturnDetail: '退货单详情',
153
     stockOutDetail: '出库单详情',
153
     stockOutDetail: '出库单详情',
154
-    cancelStockDetail: '出库退库单详情',
154
+    cancelStockDetail: '退库单详情',
155
     stockDetail:'出入库明细查询',
155
     stockDetail:'出入库明细查询',
156
 
156
 
157
   },
157
   },

+ 1 - 1
src/xt_pages/data/components/table.vue View File

1
 <template>
1
 <template>
2
   <div class="" style="margin-right:20px;">
2
   <div class="" style="margin-right:20px;">
3
-    <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"
3
+    <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"
4
       >
4
       >
5
       <el-table-column  align="center" label="名称">
5
       <el-table-column  align="center" label="名称">
6
         <template slot-scope="scope">
6
         <template slot-scope="scope">

+ 1 - 1
src/xt_pages/data/components/tableson.vue View File

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

+ 0 - 1
src/xt_pages/dialysis/details/index.vue View File

249
   data() {
249
   data() {
250
     return {
250
     return {
251
       crumbs:[
251
       crumbs:[
252
-        {path:false, name:'科室质控'},
253
         {path:false, name:'透析管理'},
252
         {path:false, name:'透析管理'},
254
         {path:false, name:'透析记录'},
253
         {path:false, name:'透析记录'},
255
         {path:false, name:'透析单'},
254
         {path:false, name:'透析单'},

+ 0 - 3
src/xt_pages/stock/cancelStockOrderAdd.vue View File

194
               tempForm['good_type_id'] = val.goodTypeId
194
               tempForm['good_type_id'] = val.goodTypeId
195
               tempForm['good_id'] = val.selectedGoodInfo[i].id
195
               tempForm['good_id'] = val.selectedGoodInfo[i].id
196
               tempForm['return_count'] = ''
196
               tempForm['return_count'] = ''
197
-              // this.recordInfo.recordData.push(tempForm)
198
               this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
197
               this.recordInfo.recordData.splice(this.currentIndex+1, 0, tempForm);
199
 
198
 
200
-
201
-
202
             }
199
             }
203
           }
200
           }
204
         }
201
         }

+ 5 - 5
src/xt_pages/stock/cancelStockOrderDetail.vue View File

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

+ 2 - 2
src/xt_pages/stock/detail/cancelStockDetail.vue View File

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

+ 6 - 6
src/xt_pages/stock/salesReturnOrderDetail.vue View File

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

+ 5 - 5
src/xt_pages/stock/stockInOrderDetail.vue View File

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

+ 5 - 5
src/xt_pages/stock/stockOutOrderDetail.vue View File

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