XMLWAN 3 years ago
parent
commit
77c409e60d

+ 15 - 0
src/api/drug/drug_stock.js View File

@@ -454,3 +454,18 @@ export function getBatchOrderDetail(params) {
454 454
   })
455 455
 }
456 456
 
457
+export function getStockInList(params) {
458
+  return request({
459
+    url: '/api/stock/getstocklistbyid',
460
+    method: 'Get',
461
+    params: params
462
+  })
463
+}
464
+
465
+export function getStockOutList(params) {
466
+  return request({
467
+    url: '/api/stock/getstockoutlist',
468
+    method: 'get',
469
+    params: params
470
+  })
471
+}

+ 19 - 0
src/router/modules/drugs.js View File

@@ -157,6 +157,7 @@ export default {
157 157
       is_menu: false,
158 158
       meta: { title: 'drugStockFlow', noCache: true }
159 159
     },
160
+
160 161
     {
161 162
       path: '/drugstock/in/drugbatchnumber',
162 163
       component: () => import('@/xt_pages/stock/drugs/drugBatchNumber'),
@@ -180,6 +181,24 @@ export default {
180 181
       hidden: true,
181 182
       is_menu: false,
182 183
       meta: { title: 'stockInOrderEdit' }
184
+    },
185
+
186
+    {
187
+      path: '/stock/in/stockflow',
188
+      component: () => import('@/xt_pages/stock/stockFlow'),
189
+      name: 'stockFlow',
190
+      hidden: true,
191
+      is_menu: false,
192
+      meta: { title: 'stockFlow' }
193
+    },
194
+
195
+    {
196
+      path: '/stock/in/stockbatchnumber',
197
+      component: () => import('@/xt_pages/stock/stockBatchNumber'),
198
+      name: 'stockBatchNumber',
199
+      hidden: true,
200
+      is_menu: false,
201
+      meta: { title: 'stockBatchNumber' }
183 202
     }
184 203
 
185 204
   ]

+ 2 - 2
src/xt_pages/data/components/addDrugs.vue View File

@@ -166,10 +166,10 @@
166 166
                             </el-select>
167 167
                         </el-form-item>
168 168
 
169
-                        <el-form-item label="单位换算 : ">
169
+                        <!-- <el-form-item label="单位换算 : ">
170 170
                             <el-input v-model="form.unit_matrixing" style="width:160px;" placeholder=""
171 171
                                       maxlength="30"></el-input>
172
-                        </el-form-item>
172
+                        </el-form-item> -->
173 173
                         <el-form-item label="拆零零售价(元) : " prop="min_price">
174 174
                             <el-input v-model="form.min_price" style="width:160px;" placeholder=""
175 175
                                       maxlength="30"></el-input>

+ 2 - 2
src/xt_pages/data/components/consumables.vue View File

@@ -100,11 +100,11 @@
100 100
         </template>
101 101
       </el-table-column>
102 102
 
103
-      <el-table-column label="最小单位" width="60" align="center">
103
+      <!-- <el-table-column label="最小单位" width="60" align="center">
104 104
         <template slot-scope="scope">
105 105
           {{ getGoodUnit(scope.row.good_unit) }}
106 106
         </template>
107
-      </el-table-column>
107
+      </el-table-column> -->
108 108
       <el-table-column label="零售价" width="60" align="center">
109 109
         <template slot-scope="scope">
110 110
           {{ scope.row.retail_price }}

+ 3 - 5
src/xt_pages/data/components/drugs.vue View File

@@ -87,7 +87,7 @@
87 87
           <div>{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}</div>
88 88
         </template>
89 89
       </el-table-column>
90
-      <el-table-column prop="date" label="最大单位" width="60" align="center">
90
+      <!-- <el-table-column prop="date" label="最大单位" width="60" align="center">
91 91
         <template slot-scope="scope">
92 92
           <div>{{scope.row.max_unit}}</div>
93 93
         </template>
@@ -96,7 +96,7 @@
96 96
         <template slot-scope="scope">
97 97
           <div>{{scope.row.min_unit}}</div>
98 98
         </template>
99
-      </el-table-column>
99
+      </el-table-column> -->
100 100
       <el-table-column prop="date" label="进货价" width="60" align="center">
101 101
         <template slot-scope="scope">
102 102
           <div>{{scope.row.last_price}}</div>
@@ -491,9 +491,8 @@
491 491
         if (val.id > 0) {
492 492
           //修改
493 493
           val['id'] = this.current_id;
494
-          console.log("9999999999999999999",val.min_number)
494
+          
495 495
           val.min_number =  parseInt(val.min_number)
496
-          console.log("min_22222222",val)
497 496
          
498 497
           editBaseDrugLib(val,untit).then(response => {
499 498
             if (response.data.state == 0) {
@@ -507,7 +506,6 @@
507 506
           })
508 507
         } else if (val.id == 0) {
509 508
           //新增
510
-          console.log("val2222222",val)
511 509
          
512 510
           createBaseDrugLib(val).then(response => {
513 511
             if (response.data.state == 0) {

+ 317 - 0
src/xt_pages/stock/stockBatchNumber.vue View File

@@ -0,0 +1,317 @@
1
+<template>
2
+  <div class="main-contain">
3
+    <div class="position">
4
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
5
+    </div>
6
+    <div class="app-container ">
7
+      <div class="cell clearfix">
8
+       耗材名称:{{this.$route.query.good_name}}
9
+       <!-- 库存:
10
+       厂家: -->
11
+      </div>
12
+      <div class="cell clearfix">
13
+        <span>日期查询:</span>
14
+        <el-date-picker
15
+            size="small"
16
+            v-model="start_time"
17
+            prefix-icon="el-icon-date"
18
+            :editable="false"
19
+            style="width: 196px;"
20
+            type="date"
21
+            placeholder="选择日期时间"
22
+            align="right"
23
+            format="yyyy-MM-dd"
24
+            value-format="yyyy-MM-dd"
25
+            @change="startTimeChange"
26
+           ></el-date-picker>-
27
+            <el-date-picker
28
+              size="small"
29
+              v-model="end_time"
30
+              prefix-icon="el-icon-date"
31
+              :editable="false"
32
+              style="width: 196px;margin-right:10px;"
33
+              type="date"
34
+              placeholder="选择日期时间"
35
+              align="right"
36
+              format="yyyy-MM-dd"
37
+              value-format="yyyy-MM-dd"
38
+              @change="endTimeChange"
39
+          ></el-date-picker>
40
+
41
+        <span>出入库方式:</span>
42
+        <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
43
+            <el-option
44
+              v-for="(item,index) in stockType"
45
+              :key="index"
46
+              :label="item.name"
47
+              :value="item.id">
48
+            </el-option>
49
+        </el-select>
50
+        
51
+        
52
+      </div>
53
+      
54
+       <el-table
55
+        :data="tableList"
56
+        border
57
+        style="width: 100%">
58
+        <el-table-column prop="date" label="序号" width="180" align="center">
59
+           <template  slot-scope="scope" >
60
+              {{scope.$index + 1}}
61
+           </template>
62
+        </el-table-column>
63
+        <el-table-column prop="drug_name" label="入库单据编码" align="center">
64
+           <template slot-scope="scope" >
65
+             <span v-if="scope.row.stock_way == 2"> {{scope.row.warehouse_out_order_number}}</span>
66
+             <span v-if="scope.row.stock_way == 4">{{scope.row.warehousing_order}}</span>
67
+           </template>
68
+        </el-table-column>
69
+        <el-table-column prop="drug_name" label="操作日期" align="center">
70
+           <template slot-scope="scope" >
71
+             {{getTime(scope.row.ctime)}}
72
+           </template>
73
+        </el-table-column>
74
+         <el-table-column prop="drug_name" label="有效期" align="center">
75
+           <template slot-scope="scope">
76
+             <span v-if="scope.row.stock_way == 4 && scope.row.warehousing_count!=0"> {{scope.row.warehousing_count}}</span>
77
+             <span v-if="scope.row.stock_way == 2 && scope.row.count!=0">{{scope.row.count}}</span>
78
+           </template>
79
+        </el-table-column>
80
+         <el-table-column prop="drug_name" label="批号" align="center">
81
+           <template slot-scope="scope" >
82
+             <span v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span>
83
+           </template>
84
+        </el-table-column>
85
+        <el-table-column prop="drug_name" label="入库数量" align="center">
86
+           <template slot-scope="scope">
87
+             <span v-if="scope.row.stock_way == 4"> {{scope.row.price}}</span>
88
+             <span v-if="scope.row.stock_way == 2">{{scope.row.price}}</span>
89
+           </template>
90
+        </el-table-column>
91
+         <el-table-column prop="drug_name" label="进货单价" align="center">
92
+           <template slot-scope="scope">
93
+             <span v-if="scope.row.stock_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
94
+             <span v-if="scope.row.stock_way == 2">{{getTime(scope.row.expiry_date)}}</span>
95
+           </template>
96
+        </el-table-column>
97
+       </el-table>
98
+       
99
+      <el-pagination
100
+        @size-change="handleSizeChange"
101
+        @current-change="handleCurrentChange"
102
+        :page-sizes="[10, 50, 100,500,1000]"
103
+        :page-size="10"
104
+        background
105
+        align="right"
106
+        style="margin-top:20px;"
107
+        layout="total, sizes, prev, pager, next, jumper"
108
+        :total="total"
109
+      >
110
+      </el-pagination>
111
+    </div>
112
+  </div>
113
+</template>
114
+<script>
115
+  import { uParseTime } from '@/utils/tools'
116
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
117
+  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
118
+  export default {
119
+    name: 'stockIn',
120
+    created() {
121
+      this.getlist()
122
+    //   this.getOutList()
123
+    },
124
+    components: {
125
+      BreadCrumb
126
+    },
127
+    data() {
128
+      return {
129
+        crumbs: [
130
+          { path: false, name: '库存管理' },
131
+          { path: '/stock/drugs/stock/query', name: '药品库存查询' },
132
+          { path:'/drugstock/in/drugstockflow',name:'库存流水'}
133
+        ],
134
+        keywords: '',
135
+        total: 0,
136
+        multipleSelection: [],
137
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
138
+        start_time: '',
139
+        end_time: '',
140
+        page: 1,
141
+        limit: 10,
142
+        goodType: [],
143
+        goodInfo: [],
144
+        tempArr: [],
145
+        sameRowArr: [],
146
+        WarehouseInfo: {
147
+          loading: false,
148
+          warehouseInfoDate: []
149
+        },
150
+        tableData:[],
151
+        drug_category:0,
152
+        stock_type:0,
153
+        drugCategory:[
154
+          {id:0,name:"全部"}
155
+        ],
156
+        drugTypeList:[],
157
+        tableList:[],
158
+        manufacturerList:[],
159
+        stockType:[
160
+          {id:0,name:"全部"},
161
+          {id:1,name:"手动出库"},
162
+          {id:2,name:"自动出库"},
163
+          {id:3,name:"入库"},
164
+        ],
165
+      
166
+      }
167
+    },
168
+    methods:{
169
+    
170
+     
171
+       handleSizeChange(val) {
172
+        this.limit = val
173
+        this.GetAllDrugStockQueryList()
174
+      },
175
+      handleCurrentChange(val) {
176
+        this.page = val
177
+        this.GetAllDrugStockQueryList()
178
+      },
179
+        
180
+    startTimeChange: function(val) {
181
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
182
+      
183
+      if (time > 0) {
184
+        this.$message.error("开始时间不能大于结束时间");
185
+        this.start_time = "";
186
+      } else {
187
+        this.GetAllDrugStockQueryList();
188
+      }
189
+    },
190
+    endTimeChange: function(val) {
191
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
192
+      if (time < 0) {
193
+        this.$message.error("结束时间不能小于开始时间");
194
+        this.end_time = "";
195
+      } else {
196
+        this.GetAllDrugStockQueryList();
197
+      }
198
+     },
199
+     changeDrug(){},
200
+     getManufacturer(id){
201
+       var name = ""
202
+       for(let i=0;i<this.manufacturerList.length;i++){
203
+         if(id == this.manufacturerList[i].id){
204
+            name = this.manufacturerList[i].name
205
+         }
206
+       }
207
+       return name
208
+     },
209
+    getTime(val) {
210
+      if(val < 0){
211
+          return ""
212
+      }
213
+      if(val == ""){
214
+        return ""
215
+      }else {
216
+        return uParseTime(val, '{y}-{m}-{d}')
217
+      }
218
+     },
219
+     //入库详情
220
+     getlist(){
221
+        var params= {
222
+          limit:this.limit,
223
+          page:this.page,
224
+          id:this.$route.query.id,
225
+          start_time:this.start_time,
226
+          end_time:this.end_time, 
227
+        } 
228
+      getStockInList(params).then(response=>{
229
+         if(response.data.state == 1){
230
+           var list = response.data.data.list
231
+           console.log("入库数据",list)
232
+           this.tableList = list
233
+           var total = response.data.data.total
234
+           this.total = total
235
+           console.log("入库数据",this.tableList)
236
+           var manufacturerList = response.data.data.manufacturerList
237
+           this.manufacturerList = manufacturerList
238
+         }
239
+      })
240
+     },
241
+    //  getOutList(){
242
+    //   var params= {
243
+    //       limit:this.limit,
244
+    //       page:this.page,
245
+    //       id:this.$route.query.id,
246
+    //       start_time:this.start_time,
247
+    //       end_time:this.end_time, 
248
+    //     } 
249
+    //    getStockOutList(params).then(response=>{
250
+    //       if(response.data.state == 1){
251
+    //          var outlist = response.data.data.outList
252
+    //          console.log("出库数据",outlist)
253
+    //          for(let i=0;i<outlist.length;i++){
254
+    //            outlist[i].stock_way = 2
255
+    //            this.tableList.push(outlist[i])
256
+    //          }
257
+    //          console.log("hhhhhhhhhhh",this.tableList)
258
+    //       }
259
+    //    })  
260
+    //  }
261
+    }
262
+  }
263
+</script>
264
+<style rel="stylesheet/css" lang="scss" scoped>
265
+  .information {
266
+    border: 1px #dcdfe6 solid;
267
+    padding: 30px 20px 30px 20px;
268
+
269
+  .border {
270
+    border-bottom: 1px #dcdfe6 solid;
271
+    margin: 0px 0 20px 0;
272
+  }
273
+
274
+  }
275
+
276
+  .title {
277
+    background: #409eff;
278
+    height: 44px;
279
+    line-height: 44px;
280
+    padding: 0 0 0 10px;
281
+    color: #fff;
282
+    margin: 0 0 10px 0;
283
+  }
284
+
285
+  .edit_separater {
286
+    border-top: 1px solid rgb(233, 233, 233);
287
+    margin-top: 15px;
288
+    margin-bottom: 15px;
289
+  }
290
+</style>
291
+
292
+<style>
293
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
294
+    font-size: 12px;
295
+  }
296
+
297
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
298
+    background: #6fb5fa;
299
+  }
300
+
301
+  .count {
302
+    color: #bd2c00;
303
+  }
304
+
305
+  .el-table td,
306
+  .el-table th.is-leaf,
307
+  .el-table--border,
308
+  .el-table--group {
309
+    border-color: #d0d3da;
310
+  }
311
+
312
+  .el-table--border::after,
313
+  .el-table--group::after,
314
+  .el-table::before {
315
+    background-color: #d0d3da;
316
+  }
317
+</style>

+ 341 - 0
src/xt_pages/stock/stockFlow.vue View File

@@ -0,0 +1,341 @@
1
+<template>
2
+  <div class="main-contain">
3
+    <div class="position">
4
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
5
+    </div>
6
+    <div class="app-container ">
7
+      <div class="cell clearfix">
8
+       耗材名称:{{this.$route.query.good_name}}
9
+       <!-- 库存:
10
+       厂家: -->
11
+      </div>
12
+      <div class="cell clearfix">
13
+        <span>日期查询:</span>
14
+        <el-date-picker
15
+            size="small"
16
+            v-model="start_time"
17
+            prefix-icon="el-icon-date"
18
+            :editable="false"
19
+            style="width: 196px;"
20
+            type="date"
21
+            placeholder="选择日期时间"
22
+            align="right"
23
+            format="yyyy-MM-dd"
24
+            value-format="yyyy-MM-dd"
25
+            @change="startTimeChange"
26
+           ></el-date-picker>-
27
+            <el-date-picker
28
+              size="small"
29
+              v-model="end_time"
30
+              prefix-icon="el-icon-date"
31
+              :editable="false"
32
+              style="width: 196px;margin-right:10px;"
33
+              type="date"
34
+              placeholder="选择日期时间"
35
+              align="right"
36
+              format="yyyy-MM-dd"
37
+              value-format="yyyy-MM-dd"
38
+              @change="endTimeChange"
39
+          ></el-date-picker>
40
+
41
+        <span>出入库方式:</span>
42
+        <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
43
+            <el-option
44
+              v-for="(item,index) in stockType"
45
+              :key="index"
46
+              :label="item.name"
47
+              :value="item.id">
48
+            </el-option>
49
+        </el-select>
50
+        
51
+        
52
+      </div>
53
+      
54
+       <el-table
55
+        :data="tableList"
56
+        border
57
+        style="width: 100%">
58
+        <el-table-column prop="date" label="序号" width="180"  align="center">
59
+           <template  slot-scope="scope">
60
+              {{scope.$index + 1}}
61
+           </template>
62
+        </el-table-column>
63
+        <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
64
+           <template slot-scope="scope">
65
+             <span v-if="scope.row.stock_way == 4">入库</span>
66
+             <span v-if="scope.row.stock_way == 2">出库</span>
67
+           </template>
68
+        </el-table-column>
69
+        <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
70
+           <template slot-scope="scope">
71
+             <span v-if="scope.row.stock_way == 2"> {{scope.row.warehouse_out_order_number}}</span>
72
+             <span v-if="scope.row.stock_way == 4">{{scope.row.warehousing_order}}</span>
73
+            
74
+           </template>
75
+        </el-table-column>
76
+        <el-table-column prop="drug_name" label="操作日期" align="center">
77
+           <template slot-scope="scope">
78
+             {{getTime(scope.row.ctime)}}
79
+           </template>
80
+        </el-table-column>
81
+         <el-table-column prop="drug_name" label="出入库数量"  align="center">
82
+           <template slot-scope="scope">
83
+             <span v-if="scope.row.stock_way == 4 && scope.row.warehousing_count!=0"> {{scope.row.warehousing_count}}</span>
84
+             <span v-if="scope.row.stock_way == 2 && scope.row.count!=0">{{scope.row.count}}</span>
85
+           </template>
86
+        </el-table-column>
87
+         <el-table-column prop="drug_name" label="库存剩余量"  align="center">
88
+           <template slot-scope="scope">
89
+             <span v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span>
90
+           </template>
91
+        </el-table-column>
92
+        <el-table-column prop="drug_name" label="进/出货单价"  align="center">
93
+           <template slot-scope="scope">
94
+             <span v-if="scope.row.stock_way == 4"> {{scope.row.price}}</span>
95
+             <span v-if="scope.row.stock_way == 2">{{scope.row.price}}</span>
96
+           </template>
97
+        </el-table-column>
98
+         <el-table-column prop="drug_name" label="有效期" align="center">
99
+           <template slot-scope="scope" >
100
+             <span v-if="scope.row.stock_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
101
+             <span v-if="scope.row.stock_way == 2">{{getTime(scope.row.expiry_date)}}</span>
102
+           </template>
103
+        </el-table-column>
104
+        <el-table-column prop="drug_name" label="批号" align="center">
105
+           <template slot-scope="scope" >
106
+             <span v-if="scope.row.stock_way == 2"> {{scope.row.number}}</span>
107
+             <span v-if="scope.row.stock_way == 4">{{scope.row.number}}</span>
108
+           </template>
109
+        </el-table-column>
110
+        <el-table-column prop="drug_name" label="供应商" align="center">
111
+           <template slot-scope="scope">
112
+             <span v-if="scope.row.stock_way == 4"> {{getManufacturer(scope.row.manufacturer)}}</span>
113
+             <span v-if="scope.row.stock_way == 2">{{getManufacturer(scope.row.manufacturer)}}</span>
114
+           </template>
115
+        </el-table-column>
116
+       </el-table>
117
+       
118
+      <el-pagination
119
+        @size-change="handleSizeChange"
120
+        @current-change="handleCurrentChange"
121
+        :page-sizes="[10, 50, 100,500,1000]"
122
+        :page-size="10"
123
+        background
124
+        align="right"
125
+        style="margin-top:20px;"
126
+        layout="total, sizes, prev, pager, next, jumper"
127
+        :total="total"
128
+      >
129
+      </el-pagination>
130
+    </div>
131
+  </div>
132
+</template>
133
+<script>
134
+  import { uParseTime } from '@/utils/tools'
135
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
136
+  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
137
+  export default {
138
+    name: 'stockIn',
139
+    created() {
140
+    //   var drugCategory = getDictionaryDataConfig('system','drug_category')
141
+    //   this.drugCategory.push(...drugCategory)
142
+    //   this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
143
+      this.getlist()
144
+      this.getOutList()
145
+    },
146
+    components: {
147
+      BreadCrumb
148
+    },
149
+    data() {
150
+      return {
151
+        crumbs: [
152
+          { path: false, name: '库存管理' },
153
+          { path: '/stock/drugs/stock/query', name: '药品库存查询' },
154
+          { path:'/drugstock/in/drugstockflow',name:'库存流水'}
155
+        ],
156
+        keywords: '',
157
+        total: 0,
158
+        multipleSelection: [],
159
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
160
+        start_time: '',
161
+        end_time: '',
162
+        page: 1,
163
+        limit: 10,
164
+        goodType: [],
165
+        goodInfo: [],
166
+        tempArr: [],
167
+        sameRowArr: [],
168
+        WarehouseInfo: {
169
+          loading: false,
170
+          warehouseInfoDate: []
171
+        },
172
+        tableData:[],
173
+        drug_category:0,
174
+        stock_type:0,
175
+        drugCategory:[
176
+          {id:0,name:"全部"}
177
+        ],
178
+        drugTypeList:[],
179
+        tableList:[],
180
+        manufacturerList:[],
181
+        stockType:[
182
+          {id:0,name:"全部"},
183
+          {id:1,name:"手动出库"},
184
+          {id:2,name:"自动出库"},
185
+          {id:3,name:"入库"},
186
+        ],
187
+      
188
+      }
189
+    },
190
+    methods:{
191
+    
192
+     
193
+       handleSizeChange(val) {
194
+        this.limit = val
195
+        this.GetAllDrugStockQueryList()
196
+      },
197
+      handleCurrentChange(val) {
198
+        this.page = val
199
+        this.GetAllDrugStockQueryList()
200
+      },
201
+        
202
+    startTimeChange: function(val) {
203
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
204
+      
205
+      if (time > 0) {
206
+        this.$message.error("开始时间不能大于结束时间");
207
+        this.start_time = "";
208
+      } else {
209
+        this.GetAllDrugStockQueryList();
210
+      }
211
+    },
212
+    endTimeChange: function(val) {
213
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
214
+      if (time < 0) {
215
+        this.$message.error("结束时间不能小于开始时间");
216
+        this.end_time = "";
217
+      } else {
218
+        this.GetAllDrugStockQueryList();
219
+      }
220
+     },
221
+     changeDrug(){},
222
+     getManufacturer(id){
223
+       var name = ""
224
+       for(let i=0;i<this.manufacturerList.length;i++){
225
+         if(id == this.manufacturerList[i].id){
226
+            name = this.manufacturerList[i].name
227
+         }
228
+       }
229
+       return name
230
+     },
231
+    getTime(val) {
232
+      if(val < 0){
233
+          return ""
234
+      }
235
+      if(val == ""){
236
+        return ""
237
+      }else {
238
+        return uParseTime(val, '{y}-{m}-{d}')
239
+      }
240
+     },
241
+     //入库详情
242
+     getlist(){
243
+        var params= {
244
+          limit:this.limit,
245
+          page:this.page,
246
+          id:this.$route.query.id,
247
+          start_time:this.start_time,
248
+          end_time:this.end_time, 
249
+        } 
250
+      getStockInList(params).then(response=>{
251
+         if(response.data.state == 1){
252
+           var list = response.data.data.list
253
+           for(let i=0;i<list.length;i++){
254
+             list[i].stock_way = 4
255
+             this.tableList.push(list[i])
256
+           }
257
+           var total = response.data.data.total
258
+           this.total = total
259
+           console.log("入库数据",this.tableList)
260
+           var manufacturerList = response.data.data.manufacturerList
261
+           this.manufacturerList = manufacturerList
262
+         }
263
+      })
264
+     },
265
+    //  getOutList(){
266
+    //   var params= {
267
+    //       limit:this.limit,
268
+    //       page:this.page,
269
+    //       id:this.$route.query.id,
270
+    //       start_time:this.start_time,
271
+    //       end_time:this.end_time, 
272
+    //     } 
273
+    //    getStockOutList(params).then(response=>{
274
+    //       if(response.data.state == 1){
275
+    //          var outlist = response.data.data.outList
276
+    //          console.log("出库数据",outlist)
277
+    //          for(let i=0;i<outlist.length;i++){
278
+    //            outlist[i].stock_way = 2
279
+    //            this.tableList.push(outlist[i])
280
+    //          }
281
+    //          console.log("hhhhhhhhhhh",this.tableList)
282
+    //       }
283
+    //    })  
284
+    //  }
285
+    }
286
+  }
287
+</script>
288
+<style rel="stylesheet/css" lang="scss" scoped>
289
+  .information {
290
+    border: 1px #dcdfe6 solid;
291
+    padding: 30px 20px 30px 20px;
292
+
293
+  .border {
294
+    border-bottom: 1px #dcdfe6 solid;
295
+    margin: 0px 0 20px 0;
296
+  }
297
+
298
+  }
299
+
300
+  .title {
301
+    background: #409eff;
302
+    height: 44px;
303
+    line-height: 44px;
304
+    padding: 0 0 0 10px;
305
+    color: #fff;
306
+    margin: 0 0 10px 0;
307
+  }
308
+
309
+  .edit_separater {
310
+    border-top: 1px solid rgb(233, 233, 233);
311
+    margin-top: 15px;
312
+    margin-bottom: 15px;
313
+  }
314
+</style>
315
+
316
+<style>
317
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
318
+    font-size: 12px;
319
+  }
320
+
321
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
322
+    background: #6fb5fa;
323
+  }
324
+
325
+  .count {
326
+    color: #bd2c00;
327
+  }
328
+
329
+  .el-table td,
330
+  .el-table th.is-leaf,
331
+  .el-table--border,
332
+  .el-table--group {
333
+    border-color: #d0d3da;
334
+  }
335
+
336
+  .el-table--border::after,
337
+  .el-table--group::after,
338
+  .el-table::before {
339
+    background-color: #d0d3da;
340
+  }
341
+</style>

+ 9 - 1
src/xt_pages/stock/stockQuery.vue View File

@@ -207,6 +207,7 @@
207 207
                 size="small"
208 208
                 type="primary"
209 209
                 icon="el-icon-edit-outline"
210
+                @click="toClick(scope.row)"
210 211
               >
211 212
               </el-button>
212 213
             </el-tooltip>
@@ -219,8 +220,9 @@
219 220
             >
220 221
               <el-button
221 222
                 size="small"
222
-                type="danger"
223
+                type="primary"
223 224
                 icon="el-icon-edit-outline"
225
+                @click="toClickOne(scope.row)"
224 226
               >
225 227
               </el-button>
226 228
             </el-tooltip>
@@ -542,6 +544,12 @@ export default {
542 544
          }
543 545
        }
544 546
        return name
547
+    },
548
+    toClick(val){
549
+      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name})
550
+    },
551
+    toClickOne(val){
552
+      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name})
545 553
     }
546 554
   }
547 555
 };