打印单

src/api/advice.js

@@ -498,6 +498,7 @@ export function GetLastOrNextDoctorAdvice(params) {
 }
 
 export function getSchedualDoctors (params) {
+  console.log("params-----",params)
   return request({
     url: '/api/schedule/advices',
     method: 'get',

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -64,7 +64,23 @@
           </ul>
         </div>
       </div>
-
+     
+     <div class="cell clearfix">
+        <label class="title"> <span class="name">给药途径</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.id == delivery_way ? 'active' : ''"
+              @click="selectDeliveryWay(item.id)"
+              v-for="item in deliveryWay"
+              :key="item.id"
+            >
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+      </div>
+    
       <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
         @selection-change="handleSelectionChange"
         :row-class-name="tableRowClassName"
@@ -353,7 +369,7 @@ export default {
         schedul_type: 0,
         partition_type: 0,
         schedul_time: "",
-        keywords: ""
+        keywords: "",
       },
       selecting_schs: [],
       partitionArr: [],
@@ -361,6 +377,8 @@ export default {
       scheduleMap:[],
       show:true,
       showOne:false,
+      deliveryWay:[],
+      delivery_way:0,
     };
   },
   created() {
@@ -417,6 +435,12 @@ export default {
       this.listQuery.partition_type = partitionType;
       this.requestSchedualDoctors();
     },
+    
+    selectDeliveryWay(val){
+       this.delivery_way = val
+       this.requestSchedualDoctors()
+    },
+
 
     changeTime() {
       this.listQuery.schedul_time = this.time;
@@ -430,16 +454,31 @@ export default {
         } else {
           this.partitionArr = response.data.data.zone;
           this.partitionArr.unshift({ id: 0, name: "全部" });
+          var dics  =  response.data.data.dics
+          var obj = {id:0,name:"全部"}
+          this.deliveryWay.push(obj)
+          this.deliveryWay.push(...dics)
         }
       });
     },
     requestSchedualDoctors (time) {
+        
+        var name = ""
+        for(let i=0;i<this.deliveryWay.length;i++){
+            if(this.delivery_way == this.deliveryWay[i].id){
+              name = this.deliveryWay[i].name
+            }
+        }
+        if(name == '全部'){
+          name = ""
+        }
+
         let newTime =  moment(time).format('YYYY-MM-DD')
         getSchedualDoctors({
         date: newTime,
         patient_type: 0,
-        advice_type: 2
-        }).then(rs => {
+        advice_type: 2,
+        delivery_way:name}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
@@ -609,7 +648,16 @@ export default {
       }
     //   console.log("sch_ids",sch_ids)
       this.$store.dispatch("SetAdviceIDs", sch_ids);
-      this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime()} });
+       var name = ""
+        for(let i=0;i<this.deliveryWay.length;i++){
+            if(this.delivery_way == this.deliveryWay[i].id){
+              name = this.deliveryWay[i].name
+            }
+        }
+        if(name == '全部'){
+          name = ""
+       }
+      this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
 
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -258,6 +258,7 @@ export default {
             time:'',
             show:true,
             showOne:false,
+            delivery_way:""
         }
     },
     methods:{
@@ -277,7 +278,8 @@ export default {
             getSchedualDoctors({
             date: newTime,
             patient_type: 0,
-            advice_type: 2
+            advice_type: 2,
+            delivery_way:this.delivery_way,
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
@@ -741,6 +743,9 @@ export default {
     },
     created(){
       var time = this.$route.query.time
+      var delivery_way = this.$route.query.delivery_way
+      console.log("delivery_Way",delivery_way)
+      this.delivery_way = delivery_way
       this.time = moment(time).format('YYYY-MM-DD')
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)

src/xt_pages/stock/detail/print.vue

@@ -27,11 +27,11 @@
               <td style="line-height: 50px" width="250">规格型号</td>
               <td style="line-height: 50px" width="50">单位</td>
               <!-- <td style="line-height: 50px" width="250">耗材类型</td> -->
-            
-              
+
+
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height:50px" width="80" v-if="type == 1">进货价</td>
-             <td style="line-height:50px" width="80" v-if="type == 3">出货价</td>
+              <td style="line-height:50px" width="80" v-if="type == 3">出货价</td>
               <td style="line-height: 50px" width="80" v-if="type == 1 || type == 3">总价</td>
               <td style="line-height: 50px" width="">备 注</td>
             </tr>
@@ -40,10 +40,10 @@
               <td style="line-height: 50px">&nbsp;
                 {{index+1}}
               </td>
-               <td style="line-height: 50px">
+              <td style="line-height: 50px">
                 <span>{{stock.good_name}}</span>
               </td>
-               <td style="line-height: 50px">
+              <td style="line-height: 50px">
                 <span v-if="stock">{{stock.specification_name}}</span>
               </td>
               <td style="line-height: 50px">
@@ -150,7 +150,7 @@
           style: style,
           scanStyles: false
         })
-      }, 
+      },
       getDialysisRecord() {
         this.loading = true
         getPrintStockGood(this.queryParams).then(response => {
@@ -225,6 +225,8 @@
 
       }, calTotal(stock) {
 
+        console.log(stock)
+
         var array = []
         if (this.type == 1) {
           array = stock.query_warehousing_info
@@ -234,7 +236,12 @@
 
         let total_price = 0.0
         for (let i = 0; i < array.length; i++) {
-          total_price = total_price + array[i].total_price
+          if(this.type == 1) {
+            total_price = total_price + array[i].warehousing_count * array[i].price
+          }else if(this.type == 3){
+            total_price = total_price + array[i].count * array[i].price
+
+          }
         }
         return  Math.floor(total_price * 100) / 100
       }, calTotalPrice() {
@@ -280,9 +287,9 @@
       getUnit(id){
         var name = ""
         for(let i=0;i<this.goodUnit.length;i++){
-           if(this.goodUnit[i].id == id){
-              name = this.goodUnit[i].name
-           }
+          if(this.goodUnit[i].id == id){
+            name = this.goodUnit[i].name
+          }
         }
         return name
       }

src/xt_pages/stock/stockQuery.vue

@@ -310,11 +310,25 @@ export default {
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;
     },
-    startTimeChange: function() {
-      this.GetAllStockQuery();
+    startTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+        this.GetAllStockQuery();
+      }
     },
-    endTimeChange: function() {
-      this.GetAllStockQuery();
+    endTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetAllStockQuery();
+      }
+     
     },
     stockInCount: function(row) {
       let total = 0;
@@ -386,7 +400,12 @@ export default {
            } 
         }
         return name
-      }
+      },
+
+      getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
   }
 };
 </script>