XMLWAN 3 vuotta sitten
vanhempi
commit
108156ea72

+ 2 - 19
src/xt_pages/management/components/UserForm.vue Näytä tiedosto

@@ -323,24 +323,7 @@
323 323
                 </template>
324 324
               </el-autocomplete>
325 325
             </el-form-item>
326
-            <!-- <el-autocomplete
327
-                  style="margin:16px 5px"
328
-                  popper-class="my-autocomplete"
329
-                  v-model="value"
330
-                 :fetch-suggestions="querySearchAsync"
331
-                 :trigger-on-focus="false"
332
-                 placeholder="病人名字"
333
-                  @select="handleSelect"
334
-            >
335
-             <i
336
-               class="el-icon-search el-input__icon"
337
-               slot="suffix"
338
-              >
339
-            </i>
340
-           <template slot-scope="{ item }">
341
-              <div class="name">{{ item.name }}</div>
342
-             </template>
343
-            </el-autocomplete>-->
326
+         
344 327
           </el-col>
345 328
           <el-col :span="8">
346 329
             <el-form-item label="传染病:">
@@ -1174,7 +1157,7 @@ export default {
1174 1157
             zone.push({ id: item.id, name: item.name });
1175 1158
           }
1176 1159
           this.zones = zone;
1177
-          //console.log("zones", zones);
1160
+       
1178 1161
           var numbers = response.data.data.numbers;
1179 1162
           var number = [{ id: 0, number: "全部" }];
1180 1163
           for (let index = 0; index < numbers.length; index++) {

+ 21 - 5
src/xt_pages/stock/detail/print.vue Näytä tiedosto

@@ -52,8 +52,11 @@
52 52
              
53 53
               <td style="line-height: 50px">
54 54
                 <span v-if="type == 1"> {{ item.warehousing_count }}</span>
55
-                <!-- <span v-if="type == 2"> {{getStockCount(item.good_id) }}</span> -->
56
-                <span v-if="type == 2">{{item.count}}</span>
55
+                <span v-if="type == 2"> 
56
+                  <span  v-if= "org_id == 3907 || org_id ==9919">{{getStockCount(item.good_id) }}</span>  
57
+                  <span v-else>{{item.count}}</span>
58
+                </span>
59
+               
57 60
                 <span v-if="type == 4"> {{ item.count }}</span>
58 61
               </td>
59 62
               <td style="line-height: 50px">
@@ -67,7 +70,10 @@
67 70
               </td>
68 71
               <td style="line-height:50px">
69 72
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
70
-                <span v-if="type == 2">{{(item.count * item.packing_price).toFixed(2)}}</span>
73
+                <span v-if="type == 2">
74
+                  <span v-if="org_id == 3907 || org_id ==9919">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2) }}</span>
75
+                  <span v-else>{{(item.count * item.packing_price).toFixed(2)}}</span>
76
+                </span>
71 77
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
72 78
               </td>
73 79
               <td style="line-height: 50px">
@@ -86,7 +92,10 @@
86 92
               <td style="line-height: 50px"   width="80"></td>
87 93
               <td style="line-height: 50px"  width="80">
88 94
                 <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span> 
89
-                <span v-if="type == 2">{{getWareOutTotal().toFixed(2)}}</span> 
95
+                <span v-if="type == 2">
96
+                  <span v-if="org_id == 3907 || org_id == 9919">{{getWareOutTotalOne().toFixed(2)}}</span>
97
+                  <span v-else> {{getWareOutTotal().toFixed(2)}}</span>
98
+                 </span> 
90 99
                 <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span> 
91 100
               </td>
92 101
               <td style="line-height: 50px" width="80">
@@ -148,7 +157,7 @@
148 157
         end_time: this.$route.query.end_time,
149 158
         stockTotal:[],
150 159
         wareOutInfo:[],
151
-        org_id:0,
160
+        org_id:this.$store.getters.xt_user.org.id,
152 161
         informationList:[]
153 162
       }
154 163
     },
@@ -391,6 +400,13 @@
391 400
          total+= this.stockDatas[i].count * this.stockDatas[i].packing_price
392 401
        }
393 402
        return total
403
+     },
404
+     getWareOutTotalOne(){
405
+       var total = 0
406
+       for(let i=0;i<this.stockDatas.length;i++){
407
+         total+= this.getStockCount(this.stockDatas[i].good_id) * this.stockDatas[i].packing_price
408
+       }
409
+       return total
394 410
      }
395 411
     },
396 412
     created() {

+ 3 - 2
src/xt_pages/stock/drugs/drugStockInOrder.vue Näytä tiedosto

@@ -826,6 +826,7 @@ export default {
826 826
       }
827 827
       console.log("hhhh2323",this.exportList)
828 828
       for(let i=0;i<this.exportList.length;i++){
829
+        this.exportList[i].index = i+1
829 830
         this.exportList[i].unit = this.exportList[i].dose + this.exportList[i].dose_unit + "*" + this.exportList[i].min_number + this.exportList[i].min_unit + "/"+this.exportList[i].max_unit
830 831
 
831 832
         this.exportList[i].total_price = (this.exportList[i].warehousing_count * this.exportList[i].price).toFixed(2)
@@ -859,8 +860,8 @@ export default {
859 860
            }
860 861
          }
861 862
               
862
-        const tHeader = ['药品名称','药品类型','规格&单位', '批号','入库数量','进货价','总价','生产厂家','生产日期','有效日期','经销商','批注文号','备注']
863
-        const filterVal = ['drug_name', 'drug_type','unit','batch_number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
863
+        const tHeader = ['序号','药品名称','药品类型','规格&单位', '批号','入库数量','进货价','总价','生产厂家','生产日期','有效日期','经销商','批注文号','备注']
864
+        const filterVal = ['index','drug_name', 'drug_type','unit','batch_number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
864 865
          
865 866
      
866 867
         console.log("table",this.exportList)