瀏覽代碼

批准文号

huangyw 2 年之前
父節點
當前提交
f8d5b2d18a

+ 5 - 0
src/xt_pages/data/components/drugs.vue 查看文件

@@ -118,6 +118,11 @@
118 118
           <div>{{scope.row.medical_insurance_number}}</div>
119 119
         </template>
120 120
       </el-table-column>
121
+      <el-table-column prop="date" label="批准文号" width="100" align="center">
122
+        <template slot-scope="scope">
123
+          <div></div>
124
+        </template>
125
+      </el-table-column>
121 126
       <el-table-column prop="date" label="药品本位码" width="100" align="center">
122 127
         <template slot-scope="scope">
123 128
           <div>{{scope.row.code}}</div>

+ 21 - 0
src/xt_pages/stock/detail/print.vue 查看文件

@@ -445,6 +445,27 @@
445 445
     //       }
446 446
     //   })
447 447
     // },
448
+    getWarehouseOut(good_id){
449
+      var total = 0
450
+      for(let i=0;i<this.wareOutList.length;i++){
451
+         if(this.wareOutList[i].good_id == good_id){
452
+            total += this.wareOutList[i].count
453
+         }
454
+      }
455
+      return total
456
+    },
457
+    
458
+     getPrintStockGood(){
459
+
460
+      getPrintStockGood(this.queryParams).then(response=>{
461
+          if(response.data.state == 1){
462
+            var list =  response.data.data.list
463
+            console.log("list23323232323232",list)
464
+            this.wareOutList = list
465
+
466
+          }
467
+      })
468
+    },
448 469
     getWarehouseOut(good_id){
449 470
       var total = 0
450 471
       for(let i=0;i<this.wareOutList.length;i++){

+ 86 - 80
src/xt_pages/stock/drugs/components/drugOutDetail.vue 查看文件

@@ -8,15 +8,15 @@
8 8
       type="primary"
9 9
       >打印
10 10
     </el-button>
11
-     <el-button
12
-      style="float: right;margin-right:10px"
11
+    <el-button
12
+      style="float: right; margin-right: 10px"
13 13
       size="small"
14 14
       @click="exportListDetai"
15 15
       type="primary"
16 16
       >明细导出
17 17
     </el-button>
18
-     <el-button
19
-      style="float: right;margin-right:10px"
18
+    <el-button
19
+      style="float: right; margin-right: 10px"
20 20
       size="small"
21 21
       @click="exportList"
22 22
       type="primary"
@@ -24,18 +24,26 @@
24 24
     </el-button>
25 25
 
26 26
     <div class="cell clearfix">
27
-       <label class="title"><span class="name">仓库</span> :</label>
28
-      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
29
-          <el-option
30
-            v-for="(option, index) in houseList"
31
-            :key="index"
32
-            :label="option.storehouse_name"
33
-            :value="option.id">
34
-          </el-option>
27
+      <label class="title"><span class="name">仓库</span> :</label>
28
+      <el-select
29
+        size="small"
30
+        v-model="storehouse_id"
31
+        filterable
32
+        placeholder="请选择仓库"
33
+        style="width: 200px"
34
+        @change="changeHouseList"
35
+      >
36
+        <el-option
37
+          v-for="(option, index) in houseList"
38
+          :key="index"
39
+          :label="option.storehouse_name"
40
+          :value="option.id"
41
+        >
42
+        </el-option>
35 43
       </el-select>
36 44
       <el-input
37 45
         size="small"
38
-        style="width: 200px;"
46
+        style="width: 200px"
39 47
         class="filter-item"
40 48
         v-model.trim="searchKey"
41 49
         placeholder="单据编码/制单人/药品名称"
@@ -48,38 +56,36 @@
48 56
         @click="search"
49 57
         >搜索</el-button
50 58
       >
51
-        <label class="title"><span class="name">日期查询</span> : </label>
52
-        <el-date-picker
53
-          size="small"
54
-          v-model="start_time"
55
-          prefix-icon="el-icon-date"
56
-          :editable="false"
57
-          style="width: 150px;"
58
-          type="date"
59
-          placeholder="选择日期时间"
60
-          align="right"
61
-          format="yyyy-MM-dd"
62
-          value-format="yyyy-MM-dd"
63
-          @change="startTimeChange"
64
-        ></el-date-picker>
65
-        <span class="cellLine"> - </span>
66
-        <el-date-picker
67
-          size="small"
68
-          v-model="end_time"
69
-          prefix-icon="el-icon-date"
70
-          :editable="false"
71
-          style="width: 150px;"
72
-          type="date"
73
-          placeholder="选择日期时间"
74
-          align="right"
75
-          format="yyyy-MM-dd"
76
-          value-format="yyyy-MM-dd"
77
-          @change="endTimeChange"
78
-        ></el-date-picker>
79
-
59
+      <label class="title"><span class="name">日期查询</span> : </label>
60
+      <el-date-picker
61
+        size="small"
62
+        v-model="start_time"
63
+        prefix-icon="el-icon-date"
64
+        :editable="false"
65
+        style="width: 150px"
66
+        type="date"
67
+        placeholder="选择日期时间"
68
+        align="right"
69
+        format="yyyy-MM-dd"
70
+        value-format="yyyy-MM-dd"
71
+        @change="startTimeChange"
72
+      ></el-date-picker>
73
+      <span class="cellLine"> - </span>
74
+      <el-date-picker
75
+        size="small"
76
+        v-model="end_time"
77
+        prefix-icon="el-icon-date"
78
+        :editable="false"
79
+        style="width: 150px"
80
+        type="date"
81
+        placeholder="选择日期时间"
82
+        align="right"
83
+        format="yyyy-MM-dd"
84
+        value-format="yyyy-MM-dd"
85
+        @change="endTimeChange"
86
+      ></el-date-picker>
80 87
     </div>
81 88
 
82
-
83 89
     <el-row :gutter="12" style="margin-top: 10px">
84 90
       <el-table
85 91
         :data="tableData"
@@ -91,7 +97,7 @@
91 97
         :row-style="{ color: '#303133' }"
92 98
         :header-cell-style="{
93 99
           backgroundColor: 'rgb(245, 247, 250)',
94
-          color: '#606266'
100
+          color: '#606266',
95 101
         }"
96 102
       >
97 103
         <el-table-column label="单据编号" align="center" width="200">
@@ -109,66 +115,73 @@
109 115
           </template>
110 116
         </el-table-column>
111 117
 
112
-         <el-table-column label="药品名称" align="center">
118
+        <el-table-column label="药品名称" align="center">
113 119
           <template slot-scope="scope">
114
-            {{scope.row.drug_name}}
120
+            {{ scope.row.drug_name }}
115 121
           </template>
116 122
         </el-table-column>
117 123
 
118 124
         <el-table-column label="规格型号" align="center">
119 125
           <template slot-scope="scope">
120
-           <!-- {{scope.row.drug_spec}} -->
121
-           {{scope.row.specification_name}}
126
+            <!-- {{scope.row.drug_spec}} -->
127
+            {{ scope.row.specification_name }}
122 128
           </template>
123 129
         </el-table-column>
124 130
 
125
-
126 131
         <el-table-column label="操作时间" align="center">
127 132
           <template slot-scope="scope">
128
-           <span>{{getTime(scope.row.ctime)}}</span>
133
+            <span>{{ getTime(scope.row.ctime) }}</span>
129 134
           </template>
130 135
         </el-table-column>
131 136
         <el-table-column label="制单人" align="center">
132 137
           <template slot-scope="scope">
133
-           {{getAdminUser(scope.row.creater)}}
138
+            {{ getAdminUser(scope.row.creater) }}
134 139
           </template>
135 140
         </el-table-column>
136 141
         <el-table-column label="仓库名称" align="center">
137 142
           <template slot-scope="scope">
138
-           {{getStorehouseName(scope.row.storehouse_id)}}
143
+            {{ getStorehouseName(scope.row.storehouse_id) }}
139 144
           </template>
140 145
         </el-table-column>
141 146
         <el-table-column label="出货价" align="center">
142 147
           <template slot-scope="scope">
143
-           <span v-if="org_id == 9919">{{scope.row.last_price}} </span>
144
-           <span v-else>
145
-             <span v-if="scope.row.price >0"> {{scope.row.price}}</span>
146
-            <span v-if="scope.row.price  == 0"> {{getPrice(scope.row.drug_id)}}</span>
147
-           </span>
148
+            <span v-if="org_id == 9919">{{ scope.row.last_price }} </span>
149
+            <span v-else>
150
+              <span v-if="scope.row.price > 0"> {{ scope.row.price }}</span>
151
+              <span v-if="scope.row.price == 0">
152
+                {{ getPrice(scope.row.drug_id) }}</span
153
+              >
154
+            </span>
148 155
           </template>
149 156
         </el-table-column>
150 157
         <el-table-column label="数量" align="center">
151 158
           <template slot-scope="scope">
152
-            {{scope.row.count}}
159
+            {{ scope.row.count }}
153 160
           </template>
154 161
         </el-table-column>
155
-         <el-table-column label="单位" align="center">
162
+        <el-table-column label="单位" align="center">
156 163
           <template slot-scope="scope">
157
-            {{scope.row.count_unit}}
164
+            {{ scope.row.count_unit }}
158 165
           </template>
159 166
         </el-table-column>
160 167
         <el-table-column label="总价" align="center">
161 168
           <template slot-scope="scope">
162
-            <span v-if="scope.row.is_total !=1">
163
-              <span v-if="org_id == 9919">{{(scope.row.last_price * scope.row.count).toFixed(2)}} </span>
164
-              <span v-if="org_id == 10210 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
165
-              <span v-if="org_id == 9671 ">{{(scope.row.price * scope.row.count).toFixed(2)}} </span>
166
-              <span v-if ="org_id!=9919 && org_id!=10210 && org_id!=9671">
167
-                 {{scope.row.total_price}}
168
-               </span>
169
+            <span v-if="scope.row.is_total != 1">
170
+              <span v-if="org_id == 9919"
171
+                >{{ (scope.row.last_price * scope.row.count).toFixed(2) }}
172
+              </span>
173
+              <span v-if="org_id == 10210"
174
+                >{{ (scope.row.price * scope.row.count).toFixed(2) }}
175
+              </span>
176
+              <span v-if="org_id == 9671"
177
+                >{{ (scope.row.price * scope.row.count).toFixed(2) }}
178
+              </span>
179
+              <span v-if="org_id != 9919 && org_id != 10210 && org_id != 9671">
180
+                {{ scope.row.total_price }}
181
+              </span>
169 182
             </span>
170 183
             <span v-if="scope.row.is_total == 1">
171
-              {{scope.row.total_price}}
184
+              {{ scope.row.total_price }}
172 185
             </span>
173 186
           </template>
174 187
         </el-table-column>
@@ -177,10 +190,10 @@
177 190
       <el-pagination
178 191
         @size-change="handleSizeChange"
179 192
         @current-change="handleCurrentChange"
180
-        :page-sizes="[10, 50, 100,1000]"
193
+        :page-sizes="[10, 50, 100, 1000]"
181 194
         :page-size="10"
182 195
         background
183
-        style="margin-top:20px;float: right"
196
+        style="margin-top: 20px; float: right"
184 197
         layout="total, sizes, prev, pager, next, jumper"
185 198
         :total="total"
186 199
       >
@@ -463,11 +476,8 @@ export default {
463 476
                 }
464 477
                 total_price +=order[i].total_price
465 478
                }
466
-
467 479
              }
468
-
469 480
           }
470
-           console.log("toal_p3232332332233232",total_price)
471 481
            order.push({
472 482
             warehouse_out_order_number: "合计",
473 483
             is_total: 1,
@@ -479,8 +489,6 @@ export default {
479 489
           for(let i=0;i<order.length;i++){
480 490
             order[i].total_price = order[i].total_price.toFixed(2)
481 491
           }
482
-
483
-          console.log("233223322323322332232323",order)
484 492
           this.tableData = order
485 493
 
486 494
            let objInfo = {}
@@ -534,8 +542,6 @@ export default {
534 542
               }
535 543
             })
536 544
           }
537
-
538
-
539 545
           for(let i=0;i<list.length;i++){
540 546
             for(let j=0;j<list[i].child.length;j++){
541 547
               if(list[i].child[j].count!=null || list[i].child[j].count != "" || list[i].child[j].count!=0){
@@ -551,8 +557,8 @@ export default {
551 557
           this.tableList = list
552 558
           var total = response.data.data.total
553 559
           this.total = total
554
-        }
555
-      })
560
+          }}
561
+  )}
556 562
     },
557 563
 
558 564
    select(){
@@ -876,7 +882,7 @@ export default {
876 882
        this.houseList = []
877 883
        this.getlist()
878 884
      }
879
-  }
885
+  
880 886
 };
881 887
 </script>
882 888
 

+ 38 - 32
src/xt_pages/stock/drugs/drugStockInOrder.vue 查看文件

@@ -112,20 +112,27 @@
112 112
         <el-button size="small" type="primary" @click="toExport()"
113 113
           >导出</el-button
114 114
         >
115
+        <div>
116
+          <span>&nbsp;&nbsp;</span>
117
+          <label class="title"><span class="name">审核状态</span> :</label>
118
+          <el-select
119
+            size="small"
120
+            v-model="check_type"
121
+            filterable
122
+            placeholder="请选择仓库"
123
+            style="width: 200px"
124
+            @change="changeCheckType"
125
+          >
126
+            <el-option
127
+              v-for="(option, index) in checkList"
128
+              :key="index"
129
+              :label="option.name"
130
+              :value="option.id"
131
+            >
132
+            </el-option>
133
+          </el-select>
134
+        </div>
115 135
       </div>
116
-      
117
-      <span>&nbsp;&nbsp;</span>
118
-      <label class="title"><span class="name">审核状态</span> :</label>
119
-      <el-select size="small" v-model="check_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeCheckType">
120
-          <el-option
121
-            v-for="(option, index) in checkList"
122
-            :key="index"
123
-            :label="option.name"
124
-            :value="option.id">
125
-          </el-option>
126
-      </el-select>  
127
-     
128
-     
129 136
 
130 137
       <el-table
131 138
         :data="Warehouse.warehouseDate"
@@ -518,12 +525,12 @@ export default {
518 525
       exportList: [],
519 526
       houseList: [],
520 527
       storehouse_id: 0,
521
-      check_type:0,
522
-      checkList:[
523
-       {id:0,name:"全部"},
524
-       {id:1,name:"已审核"},
525
-       {id:2,name:"未审核"},
526
-      ]
528
+      check_type: 0,
529
+      checkList: [
530
+        { id: 0, name: "全部" },
531
+        { id: 1, name: "已审核" },
532
+        { id: 2, name: "未审核" },
533
+      ],
527 534
     };
528 535
   },
529 536
 
@@ -560,7 +567,7 @@ export default {
560 567
         type: this.type,
561 568
         keywords: this.searchKey,
562 569
         storehouse_id: this.storehouse_id,
563
-        check_type:this.check_type,
570
+        check_type: this.check_type,
564 571
       };
565 572
       this.Warehouse.warehouseDate = [];
566 573
       getDrugWarehouseList(Params).then((response) => {
@@ -586,7 +593,7 @@ export default {
586 593
         type: this.type,
587 594
         keywords: this.searchKey,
588 595
         storehouse_id: this.storehouse_id,
589
-        check_type:this.check_type,
596
+        check_type: this.check_type,
590 597
       };
591 598
       this.Warehouse.warehouseDate = [];
592 599
       getDrugWarehouseList(Params).then((response) => {
@@ -748,7 +755,7 @@ export default {
748 755
           type: this.type,
749 756
           supply_warehouse_id: row.supply_warehouse_id,
750 757
           is_sys: row.is_sys,
751
-          is_check:row.is_check,
758
+          is_check: row.is_check,
752 759
         },
753 760
       });
754 761
     },
@@ -788,9 +795,9 @@ export default {
788 795
         this.$message.error("自动入库数据不能删除!");
789 796
         return false;
790 797
       }
791
-      if(row.is_check == 1){
792
-        this.$message.error("已审核的单据不能删除")
793
-        return false
798
+      if (row.is_check == 1) {
799
+        this.$message.error("已审核的单据不能删除");
800
+        return false;
794 801
       }
795 802
       const ids = [];
796 803
       ids.push(row.id);
@@ -853,19 +860,18 @@ export default {
853 860
       const ids = [];
854 861
       const idOne = [];
855 862
       for (let i = 0; i < this.selectedTableData.length; i++) {
856
-        if(this.selectedTableData[i].is_check == 1){
857
-          this.$message.error("已审核单据不能删除!")
858
-          return false
863
+        if (this.selectedTableData[i].is_check == 1) {
864
+          this.$message.error("已审核单据不能删除!");
865
+          return false;
859 866
         }
860 867
         if (this.selectedTableData[i].is_sys == 13) {
861 868
           this.$message.error("调拨入库数据不能删除!");
862 869
           return false;
863 870
         }
864 871
         ids.push(this.selectedTableData[i].id);
865
-        if(this.selectedTableData[i].supply_warehouse_id >0){
872
+        if (this.selectedTableData[i].supply_warehouse_id > 0) {
866 873
           idOne.push(this.selectedTableData[i].supply_warehouse_id);
867 874
         }
868
-      
869 875
       }
870 876
 
871 877
       for (let i = 0; i < idOne.length; i++) {
@@ -1095,9 +1101,9 @@ export default {
1095 1101
     changeStoreHouse() {
1096 1102
       this.GetWarehouse();
1097 1103
     },
1098
-    changeCheckType(){
1104
+    changeCheckType() {
1099 1105
       this.GetWarehouse();
1100
-    }
1106
+    },
1101 1107
   },
1102 1108
 };
1103 1109
 </script>

+ 1 - 0
src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue 查看文件

@@ -157,6 +157,7 @@
157 157
 
158 158
     </div>
159 159
   </div>
160
+  </div>
160 161
 
161 162
 </template>
162 163
 

+ 2 - 1
src/xt_pages/stock/drugs/print.vue 查看文件

@@ -68,7 +68,7 @@ export default {
68 68
             { path: false, name: '耗材管理' },
69 69
             { path: false, name: '耗材盘点打印' },
70 70
           ],
71
-          org_name:"",
71
+          org_name: this.$store.getters.xt_user.org.org_name,
72 72
           ids:"",
73 73
           tableData:[],
74 74
           manufacturerList:[],
@@ -117,6 +117,7 @@ export default {
117 117
         }
118 118
     },
119 119
     created(){
120
+
120 121
       this.getlist()
121 122
     }
122 123
 }

+ 1 - 1
src/xt_pages/stock/print_all.vue 查看文件

@@ -68,7 +68,7 @@ export default {
68 68
             { path: false, name: '耗材管理' },
69 69
             { path: false, name: '耗材盘点打印' },
70 70
           ],
71
-          org_name:"",
71
+          org_name: this.$store.getters.xt_user.org.org_name,
72 72
           ids:"",
73 73
           tableData:[],
74 74
           manufacturerList:[],

+ 6 - 3
src/xt_pages/stock/stockOutOrder.vue 查看文件

@@ -110,6 +110,8 @@
110 110
           >导出</el-button
111 111
         >
112 112
         <span>&nbsp;&nbsp;</span>
113
+        <!-- <el-button size="small" type="primary" @click="toExport">导出</el-button> -->
114
+        <!-- <span>&nbsp;&nbsp;</span> -->
113 115
         <label class="title"><span class="name">出库方式</span> :</label>
114 116
         <el-select size="small" v-model="way_type" filterable placeholder="请选择仓库" style="width:200px" @change="changeWay">
115 117
             <el-option
@@ -870,6 +872,7 @@
870 872
     >
871 873
     </stock-in-dialog>
872 874
   </div>
875
+  </div>
873 876
 </template>
874 877
 
875 878
 <script>
@@ -1366,8 +1369,8 @@ export default {
1366 1369
               }
1367 1370
             }
1368 1371
           });
1369
-        })
1370
-        .catch(() => {});
1372
+      })
1373
+        .catch(() => {})}
1371 1374
     },
1372 1375
 
1373 1376
     handleSearch(val) {
@@ -2039,7 +2042,7 @@ export default {
2039 2042
     changeCheckList(){
2040 2043
       this.GetWarehouseOut();
2041 2044
     }
2042
-  },
2045
+  
2043 2046
 };
2044 2047
 </script>
2045 2048
 

+ 7 - 0
src/xt_pages/stock/stockPrint.vue 查看文件

@@ -46,6 +46,13 @@
46 46
                                    <td>
47 47
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
48 48
                                    </td>
49
+<<<<<<< Updated upstream
50
+=======
51
+                                   <td v-if="end_time == ''"  style="text-align:center">
52
+                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265">
53
+                                      </span>
54
+                                   </td>
55
+>>>>>>> Stashed changes
49 56
                                    <td v-if="end_time == ''">
50 57
                                       <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
51 58
                                         <span>