Browse Source

Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

see999 3 years ago
parent
commit
f79acee4d5

+ 1 - 1
src/api/his/his.js View File

41
 }
41
 }
42
 
42
 
43
 export function createHisPrescription(data, params) {
43
 export function createHisPrescription(data, params) {
44
-  console.log('param2323232323233223233223332322323', params)
44
+  console.log('param2323232323233223233223332322323', data, params)
45
   return request({
45
   return request({
46
     url: '/api/hisprescription/create',
46
     url: '/api/hisprescription/create',
47
     method: 'post',
47
     method: 'post',

+ 4 - 4
src/xt_pages/hospitalStation/components/deskPrescription.vue View File

288
                     <el-table-column label="库存" width="60">
288
                     <el-table-column label="库存" width="60">
289
                       <template slot-scope="scope">
289
                       <template slot-scope="scope">
290
                                           <span
290
                                           <span
291
-                                              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 == 10188 || 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 == 10191 ">
291
+                                              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 == 10188 || 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 == 10191 || org_id == 10278">
292
                                               <span
292
                                               <span
293
                                                   v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
293
                                                   v-if="scope.row.count/scope.row.min_number>0">{{ Math.floor(scope.row.count / scope.row.min_number) }}{{ scope.row.max_unit }}</span>
294
                                               <span
294
                                               <span
387
                     <el-table-column label="库存" width="40">
387
                     <el-table-column label="库存" width="40">
388
                       <template slot-scope="scope">
388
                       <template slot-scope="scope">
389
                                                 <span
389
                                                 <span
390
-                                                    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 == 10191">
390
+                                                    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 == 10191 || org_id == 10278">
391
                                                     {{ scope.row.stock_count }}
391
                                                     {{ scope.row.stock_count }}
392
                                                 </span>
392
                                                 </span>
393
                         <span v-else> {{ scope.row.total }}</span>
393
                         <span v-else> {{ scope.row.total }}</span>
2666
       this.$refs.additionalCharges.show()
2666
       this.$refs.additionalCharges.show()
2667
     },
2667
     },
2668
     selectDrugs(selection, row) {
2668
     selectDrugs(selection, row) {
2669
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191) {
2669
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10188 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
2670
         if (row.count <= 0) {
2670
         if (row.count <= 0) {
2671
           if (selection) {
2671
           if (selection) {
2672
             selection.forEach(row => {
2672
             selection.forEach(row => {
2940
     },
2940
     },
2941
     selectChange(selection, row) {
2941
     selectChange(selection, row) {
2942
       console.log('row', row)
2942
       console.log('row', row)
2943
-      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191) {
2943
+      if (this.org_id == 10138 || this.org_id == 9671 || this.org_id == 9675 || this.org_id == 4 || this.org_id == 3877 || this.org_id == 10028 || this.org_id == 10243 || this.org_id == 10088 || this.org_id == 10245 || this.org_id == 9919 || this.org_id == 10106 || this.org_id == 9504 || this.org_id == 10215 || this.org_id == 10088 || this.org_id == 10265 || this.org_id == 10164 || this.org_id == 10188  || this.org_id == 9956 || this.org_id == 10191 || this.org_id == 10278) {
2944
         if (row.stock_count <= 0) {
2944
         if (row.stock_count <= 0) {
2945
           if (row.type == 3) {
2945
           if (row.type == 3) {
2946
             if (selection) {
2946
             if (selection) {

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

309
         keywords: this.searchKey
309
         keywords: this.searchKey
310
       };
310
       };
311
       this.cancelStockDate = [];
311
       this.cancelStockDate = [];
312
+      this.tableData = []
312
       getStockDetail(Params).then(response => {
313
       getStockDetail(Params).then(response => {
313
         if (response.data.state == 0) {
314
         if (response.data.state == 0) {
314
 
315
 
317
         } else {
318
         } else {
318
 
319
 
319
           this.total = response.data.data.total;
320
           this.total = response.data.data.total;
321
+          var total = 0
320
           for (let i = 0; i < response.data.data.list.length; i++) {
322
           for (let i = 0; i < response.data.data.list.length; i++) {
321
             this.tableData.push(response.data.data.list[i])
323
             this.tableData.push(response.data.data.list[i])
324
+            
322
             var obj = response.data.data.list[i];
325
             var obj = response.data.data.list[i];
326
+            total += response.data.data.list[i].price * response.data.data.list[i].count
323
             obj["is_total"] = 0;
327
             obj["is_total"] = 0;
324
             this.cancelStockDate.push(obj);
328
             this.cancelStockDate.push(obj);
325
-
329
+       
326
           }
330
           }
327
           this.cancelStockDate.push({
331
           this.cancelStockDate.push({
328
             warehouse_out_order_number: "合计",
332
             warehouse_out_order_number: "合计",
329
             is_total: 1,
333
             is_total: 1,
330
-            total: response.data.data.total_price,
334
+            total:total.toFixed(2),
331
             WarehouseOut: {
335
             WarehouseOut: {
332
               warehouse_out_time: 0
336
               warehouse_out_time: 0
333
             }
337
             }
334
           });
338
           });
339
+          console.log("cancelstockdate2332323322332332",this.cancelStockDate)
335
         }
340
         }
336
       });
341
       });
337
     },
342
     },