|
@@ -322,7 +322,7 @@
|
322
|
322
|
</template>
|
323
|
323
|
</el-table-column>
|
324
|
324
|
|
325
|
|
- <el-table-column label="库存" width="60" v-if="org_id != 10206">
|
|
325
|
+ <el-table-column label="库存" width="60" v-if="org_id != 10206 && org_id != 0">
|
326
|
326
|
<template slot-scope="scope">
|
327
|
327
|
<!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==record_date ||org_id ==10340">
|
328
|
328
|
<span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
|
|
@@ -336,7 +336,7 @@
|
336
|
336
|
</el-table-column>
|
337
|
337
|
|
338
|
338
|
<!-- //针对对接坐标系统的,使用坐标的库存数据-->
|
339
|
|
- <el-table-column label="库存" width="60" v-if="org_id == 10206">
|
|
339
|
+ <el-table-column label="库存" width="60" v-if="org_id == 10206 || org_id == 0">
|
340
|
340
|
<template slot-scope="scope">
|
341
|
341
|
<span>{{scope.row.zuobiao_stock_num}}</span>
|
342
|
342
|
</template>
|
|
@@ -422,10 +422,10 @@
|
422
|
422
|
:header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
|
423
|
423
|
highlight-current-row>
|
424
|
424
|
<el-table-column type="selection" width="40" align="center"></el-table-column>
|
425
|
|
- <el-table-column prop="name" label="名称" v-if="org_id != 10206">
|
|
425
|
+ <el-table-column prop="name" label="名称" v-if="org_id != 10206 && org_id != 0">
|
426
|
426
|
<template slot-scope="scope">{{ scope.row.project_name }}</template>
|
427
|
427
|
</el-table-column>
|
428
|
|
- <el-table-column prop="name" label="名称" v-if="org_id == 10206">
|
|
428
|
+ <el-table-column prop="name" label="名称" v-if="org_id == 10206 || org_id == 0">
|
429
|
429
|
<template slot-scope="scope">{{ scope.row.project_name }}{{scope.row.number}}</template>
|
430
|
430
|
</el-table-column>
|
431
|
431
|
<el-table-column label="规格" width="60">
|
|
@@ -581,6 +581,7 @@ export default {
|
581
|
581
|
},
|
582
|
582
|
data() {
|
583
|
583
|
return {
|
|
584
|
+ drugs:[],
|
584
|
585
|
zuobiao_project:[],
|
585
|
586
|
start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
|
586
|
587
|
end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
|
|
@@ -642,7 +643,7 @@ export default {
|
642
|
643
|
form: {
|
643
|
644
|
name: ''
|
644
|
645
|
},
|
645
|
|
- drugs: [],
|
|
646
|
+
|
646
|
647
|
allDrugs: [],
|
647
|
648
|
advices_template: [],
|
648
|
649
|
additions: [],
|
|
@@ -738,7 +739,7 @@ export default {
|
738
|
739
|
getzuobiao(){
|
739
|
740
|
if(this.org_id == 10206){
|
740
|
741
|
var that = this
|
741
|
|
- axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
|
|
742
|
+ axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystockgood', {
|
742
|
743
|
|
743
|
744
|
})
|
744
|
745
|
.then(function(response) {
|
|
@@ -2232,7 +2233,9 @@ export default {
|
2232
|
2233
|
if(this.org_id == 10206 || this.org_id == 0){
|
2233
|
2234
|
this.departmentValue = 263
|
2234
|
2235
|
this.state1 = 677
|
2235
|
|
- this.diagnose.push(716)
|
|
2236
|
+ if (this.diagnose.length == 0){
|
|
2237
|
+ this.diagnose.push(716)
|
|
2238
|
+ }
|
2236
|
2239
|
}
|
2237
|
2240
|
|
2238
|
2241
|
},
|