11月14日 库存扣减更新

src/api/schedule.js

     params: params
   })
 }
+
+export function getPatientScheduleTemplate(params) {
+  return request({
+    url: '/api/schedule/getpatientscheduletemplate',
+    method: 'get',
+    params: params
+  })
+}

src/xt_pages/hospitalStation/components/deskPrescription.vue

                                         </el-table-column>
                                         <el-table-column label="库存" width="60">
                                             <template slot-scope="scope">
-                         <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 ">
-                             <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>
-                             <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
-                          </span>
+                                          <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 ">
+                                              <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>
+                                              <span v-if="scope.row.count%scope.row.min_number>0"> {{scope.row.count%scope.row.min_number}}{{scope.row.min_unit}}</span>
+                                            </span>
                                                 <span v-else> {{scope.row.total}}{{scope.row.total?scope.row.min_unit:''}}</span>
                                             </template>
                                         </el-table-column>
                                         </el-table-column>
                                         <el-table-column label="库存" width="40">
                                             <template slot-scope="scope">
-                         <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 == 10088">
-                            {{scope.row.stock_count}}
-                        </span>
+                                                <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 == 10088">
+                                                    {{scope.row.stock_count}}
+                                                </span>
                                                 <span v-else> {{ scope.row.total }}</span>
                                             </template>
                                         </el-table-column>

src/xt_pages/stock/detail/print.vue

                 {{index+1}}
               </td>
               <td style="line-height: 50px">
-                <!-- <span>{{item.GoodInfo.good_name}}</span> -->
                 {{item.good_name}}
               </td>
               <td style="line-height: 50px">
-                <!-- <span>{{item.GoodInfo.specification_name}}</span> -->
                 {{item.specification_name}}
               </td>
              
                 <span v-if="type == 4"> {{ item.count }}</span>
               </td>
               <td style="line-height: 50px">
-                <!-- <span>{{item.GoodInfo.packing_unit}}</span> -->
                 {{item.packing_unit}}
               </td>
               <td style="line-height:50px">
                 <span v-if="type == 1"> {{ item.price }}</span>
-                <span v-if="type == 2"> {{ item.packing_price }}</span>
+                <span v-if="type == 2"> 
+                  <span v-if="org_id == 9919 || org_id == 9671">{{ item.buy_price }}</span>  
+                  <span v-else>
+                    {{ item.packing_price }} 
+                  </span>  
+                </span>
                  <span v-if="type == 4"> {{ item.price }}</span>
               </td>
               <td style="line-height:50px">
                 <span v-if="type == 1">{{(item.warehousing_count * item.price).toFixed(2)}}</span>
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id ==9919">{{(getStockCount(item.good_id) * item.packing_price).toFixed(2) }}</span>
+                  <span v-if="org_id == 3907 || org_id ==9919 || org_id == 9671">
+                     {{(getStockCount(item.good_id) * item.buy_price).toFixed(2) }}
+                  </span>
                   <span v-else>{{(item.count * item.packing_price).toFixed(2)}}</span>
                 </span>
                 <span v-if="type == 4">{{(item.count * item.price).toFixed(2)}}</span>
               <td style="line-height: 50px"  width="80">
                 <span v-if="type == 1">{{getWareInfoTotal().toFixed(2)}}</span> 
                 <span v-if="type == 2">
-                  <span v-if="org_id == 3907 || org_id == 9919">{{getWareOutTotalOne().toFixed(2)}}</span>
+                  <span v-if="org_id == 3907 || org_id == 9919 || org_id == 9671">{{getWareOutTotalOne().toFixed(2)}}</span>
                   <span v-else> {{getWareOutTotal().toFixed(2)}}</span>
                  </span> 
                 <span v-if="type == 4">{{getWareOutTotal().toFixed(2)}}</span> 
        return total
      },
      getWareOutTotalOne(){
+       console.log("数据23332323",this.stockDatas)
        var total = 0
        for(let i=0;i<this.stockDatas.length;i++){
-         total+= this.getStockCount(this.stockDatas[i].good_id) * this.stockDatas[i].packing_price
+         total+= this.getStockCount(this.stockDatas[i].good_id) * this.stockDatas[i].buy_price
        }
        return total
      }

src/xt_pages/stock/detail/stockOutDetail.vue

         </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
-            {{ scope.row.price }}
+            <span v-if="scope.row.is_total == 0 && (orgId == 9919 || orgId == 9671)">{{scope.row.GoodInfo.buy_price}}</span>
+            <span v-else> {{ scope.row.price }} </span>
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center">
     }
     window.sessionStorage.removeItem('start')
     window.sessionStorage.removeItem('end')  
+    this.getGoodDetailPrintList()
     this.GetCancelStock();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
     this.goodUnit = this.$store.getters.good_unit
     var org_id = this.$store.getters.xt_user.org.id
     this.orgId = org_id
-    this.getGoodDetailPrintList()
+    
     
   },
   data() {
             total += response.data.data.list[i].price * response.data.data.list[i].count
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-            
           }
+          
           this.tableDataList = response.data.data.list
+           console.log("耗材出库数据323323323232232323232",this.tableDataList)
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
         }
       });
     },
-    getPrintStockGood(){
-      const params = {
-        start_time:this.start_time,
-        end_time:this.end_time,
-        type:3,
-      }
-      getPrintStockGood(params).then(response=>{
-          if(response.data.state == 1){
-            var stockTotal =  response.data.data.stockTotal
+    // getPrintStockGood(){
+    //   const params = {
+    //     start_time:this.start_time,
+    //     end_time:this.end_time,
+    //     type:3,
+    //   }
+    //   getPrintStockGood(params).then(response=>{
+    //       if(response.data.state == 1){
+    //         var stockTotal =  response.data.data.stockTotal
           
-            this.stockTotal = stockTotal
-            var list =  response.data.data.list
-            this.tableList = []
-            for(let i=0;i<list.length;i++){
-              if (list[i].query_warehouseout_info.length > 0) {
-                this.tableList.push(list[i])
-              }
-            }
-          }
-      })
-    },
+    //         this.stockTotal = stockTotal
+    //         var list =  response.data.data.list
+    //         this.tableList = []
+    //         for(let i=0;i<list.length;i++){
+    //           if (list[i].query_warehouseout_info.length > 0) {
+    //             this.tableList.push(list[i])
+    //           }
+    //         }
+    //       }
+    //   })
+    // },
      calCount(stock) {
         let total = 0
         var array = []
         }
         return Math.floor(amountPrice* 100) / 100
       },
-      getStockCount(id){
-        var count = ""
-        for(let i=0;i<this.stockTotal.length;i++){
-            if(id == this.stockTotal[i].good_id){
-              count = this.stockTotal[i].count
-            }
-        }
-        return count
-      },
       getTotal: function(price, total) {
         var m = 0, r1, r2
         var s1 = price.toString()
         this.tableOut[i].good_name = this.tableOut[i].good_name
         this.tableOut[i].specification_name = this.tableOut[i].specification_name
         this.tableOut[i].packing_unit = this.tableOut[i].packing_unit
-        this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].packing_price).toFixed(2)
+        if(this.orgId == 9919 || this.orgId == 9671){
+          this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].buy_price).toFixed(2)
+          this.tableOut[i].packing_price = this.tableOut[i].buy_price
+        }else{
+          this.tableOut[i].total_price = (this.tableOut[i].count * this.tableOut[i].packing_price).toFixed(2)
+        }
+      
         this.tableOut[i].out_count = this.getStockCount(this.tableOut[i].good_id)
        }
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','耗材名称', '规格型号', '单位','数量','出货价','总价','备注']
+
        const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','remark']
 
        const data = this.formatJson(filterVal, this.tableOut)
-       
+       console.log("date2332323232",data)
+        return
         excel.export_json_to_excel({
            header: tHeader,
            data,
           this.tableDataList[i].time = this.getTime(this.tableDataList[i].WarehouseOut.warehouse_out_time)
           this.tableDataList[i].user_name = this.getXuserName(this.tableDataList[i].WarehouseOut.creater)
           this.tableDataList[i].out_count = this.tableDataList[i].count
-          this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
-          total += this.tableDataList[i].count * this.tableDataList[i].price
+          if(this.orgId == 9919 || this.orgId == 9671){
+             this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].GoodInfo.buy_price).toFixed(2)
+             total += this.tableDataList[i].count * this.tableDataList[i].buy_price
+          }else{
+            this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
+            total += this.tableDataList[i].count * this.tableDataList[i].price
+          }
+         
+         
         }
         obj.total_price = total.toFixed(2)
         this.tableDataList.push(obj)
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
+        
           this.tableOut = list
           var stockTotal = response.data.data.stockTotal
+          console.log("list88888888888888888888",stockTotal)
           this.stockTotal = stockTotal
         }
       })
-     } 
+     },
+     getStockCount(id){
+     
+        var count = ""
+        for(let i=0;i<this.stockTotal.length;i++){
+            if(id == this.stockTotal[i].good_id){
+              count = this.stockTotal[i].count
+            }
+        }
+        return count
+    }, 
   }
 };
 </script>

src/xt_pages/stock/drugs/components/drugOutDetail.vue

           </template>
         </el-table-column>
 
-        <!-- <el-table-column label="单据类型" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.type == 1">药品出库单</span>
-            <span v-if="scope.row.type == 2">其他</span>
-          </template>
-        </el-table-column> -->
-
+       
         <el-table-column label="操作时间" align="center">
           <template slot-scope="scope">
            <span>{{getTime(scope.row.ctime)}}</span>
         </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
-           {{scope.row.price}}
+           <span v-if="org_id == 9919 || org_id == 9671">{{scope.row.last_price}} </span> 
+           <span v-else>{{scope.row.price}}</span>
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center">
           for(let i=0;i<order.length;i++){
              order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
              order[i].is_total = 0
-             order[i].total_price = order[i].count * order[i].price
-             total_price += order[i].count * order[i].price
+             if(this.org_id == 9919 || this.org_id == 9671){
+               order[i].total_price = order[i].count * order[i].last_price
+               total_price += order[i].count * order[i].last_price
+             }else{
+                order[i].total_price = order[i].count * order[i].price
+                total_price += order[i].count * order[i].price
+             }
+            
           }
+          console.log("total_price23322332232332323232",order)
            order.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
           for(let i=0;i<order.length;i++){
             order[i].total_price = order[i].total_price.toFixed(2)
           }
-        //  this.drugTypeList = response.data.data.drugTypeList
-          
+       
+          console.log("order232233232232323232332",order)
           this.tableData = order
            let objInfo = {}
           order.forEach((item,index)=>{
              let { drug_id } = item
-             if(!objInfo[drug_id]){
-               objInfo[drug_id] = {
-                 drug_id,
-                 child:[],
-                 drug_name:item.drug_name,
-                 drug_spec:item.drug_spec,
-                 min_unit:item.min_unit,
-                 count:0,
-                 price:item.price,
-                 remark:item.remark,
-                 total_price:0.0,
-                 dose:item.dose,
-                 dose_unit:item.dose_unit,
-                 min_number:item.min_number,
-                 max_unit:item.max_unit
-               }
+             if(this.org_id == 9671 || this.org_id == 9919){
+              if(!objInfo[drug_id]){
+                objInfo[drug_id] = {
+                  drug_id,
+                  child:[],
+                  drug_name:item.drug_name,
+                  drug_spec:item.drug_spec,
+                  min_unit:item.min_unit,
+                  count:0,
+                  price:item.last_price,
+                  remark:item.remark,
+                  total_price:0.0,
+                  dose:item.dose,
+                  dose_unit:item.dose_unit,
+                  min_number:item.min_number,
+                  max_unit:item.max_unit
+                }
+              }
+             }else{
+               if(!objInfo[drug_id]){
+                objInfo[drug_id] = {
+                  drug_id,
+                  child:[],
+                  drug_name:item.drug_name,
+                  drug_spec:item.drug_spec,
+                  min_unit:item.min_unit,
+                  count:0,
+                  price:item.price,
+                  remark:item.remark,
+                  total_price:0.0,
+                  dose:item.dose,
+                  dose_unit:item.dose_unit,
+                  min_number:item.min_number,
+                  max_unit:item.max_unit
+                }
+              }
              }
+            
           })
           let list = Object.values(objInfo);
           
               }
             }
           }
-          for(let i=0;i<list.length;i++){
-             list[i].total_price = list[i].count * list[i].price
-          }
-       
+
+           for(let i=0;i<list.length;i++){
+              list[i].total_price = list[i].count * list[i].price
+            }
+        
           this.tableList = list 
           var total = response.data.data.total
           this.total = total
         }
         for(let i=0;i<this.tablePrint.length;i++){
            if(this.org_id == 9671 || this.org_id == 9919 ){
+             this.tablePrint[i].price = this.tablePrint[i].last_price
              this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
-             this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
+             this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].last_price)
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
-             this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
+             this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].last_price)
            }else{
               this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
               this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].price)
         this.tableData[i].specification_name = this.tableData[i].dose + this.tableData[i].dose_unit +"*" + this.tableData[i].min_number + this.tableData[i].min_unit +  "/" + this.tableData[i].max_unit
         this.tableData[i].time = this.getTime(this.tableData[i].ctime)
         this.tableData[i].user_name = this.getAdminUser(this.tableData[i].creater)
-        this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
-        this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+        if(this.org_id == 9671 || this.org_id == 9919){
+          this.tableData[i].total = (this.tableData[i].count * this.tableData[i].last_price)
+          this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].last_price)
+        }else{
+          this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
+          this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)
+        }
+      
+       
        }
        let obj = {'index':'合计','total_price':0.00}
        for(let i=0;i<this.tableData.length;i++){

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

         return str + min_str
       },
       getCountOne(arr,max_unit,min_unit,min_number){
-        console.log("arr2332332233232",arr)
+       
         var total = 0
         var str = ""
         var min_str = ""
         for(let i=0;i<arr.length;i++){
           total+= parseInt(arr[i].total_count)
         }
-       console.log("total233223232323",total,min_number)
+     
         return total
       },
       getTotalPrice(arr,max_unit,min_number,min_price){

src/xt_pages/stock/stockQuery.vue

        </el-table-column>
        <el-table-column label="出库数量" align="center" v-if="showOne">
          <template slot-scope="scope">
-          <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 == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191">
+          <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 == 10106 || org_id == 9504 || org_id ==  10215 || org_id ==  10088 || org_id == 10191 || org_id == 9919">
             <span>
               {{getWareInfo(scope.row.xt_warehouse_info) - getOverFlushInfo(scope.row.xt_warehouse_info) + getCancelSotckInfo(scope.row.cancel_stock_info) }}
             </span>
 
        <el-table-column label="剩余库存量" align="center" v-if="showThree">
          <template slot-scope="scope">
-          <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 == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191">
+          <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 == 10106 || org_id == 9504 || org_id ==  10215 || org_id == 10088 || org_id == 10191 || org_id == 9919">
             {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
           </span>
           <span v-else>{{getWareInfo(scope.row.xt_warehouse_info) - getAutoCount(scope.row.id) - getOutCount(scope.row.id) + getCancelCount(scope.row.id) }}</span>

src/xt_pages/workforce/template.vue

                           :patients="patients"></template-table>
         </el-tab-pane>
         <el-tab-pane name="first" :disabled="template_mode.mode == 0">
-          <span slot="label"> 第一周 </span>
+          <span slot="label"> 第一周
+             <span v-if="schedule.execute_times%2==0">(本周)</span>
+             <span v-if="schedule.execute_times%2!=0">(下一周)</span>
+          </span>
           <template-table :editable="true" :device_numbers="device_numbers" :template="first_template"
                           :patients="patients" @cancel_sch="refresh"></template-table>
         </el-tab-pane>
 
         <el-tab-pane name="second" :disabled="template_mode.mode != 2">
-          <span slot="label"> 第二周 </span>
+          <span slot="label"> 第二周
+             <span v-if="schedule.execute_times%2==0">(下一周)</span>
+             <span v-if="schedule.execute_times%2!=0">(本周)</span>
+           </span>
           <template-table :editable="true" :device_numbers="device_numbers" :template="second_template"
                           :patients="patients" @cancel_sch="refresh"></template-table>
         </el-tab-pane>
   import TemplateTable from './components/template_table'
   import { getTemplateInitData } from '@/api/schedule_template/patient'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { exportScheduleTemplate, getWeekPanels,initDate,synchroSchedule } from '@/api/schedule'
+  import { exportScheduleTemplate, getWeekPanels,initDate,synchroSchedule,getPatientScheduleTemplate } from '@/api/schedule'
   import ScheduleTemplateUploadExcel from './components/scheduleTemplateUploadExcel/index'
   import { generateLog } from '@/api/config'
 
         },
         rules: {
           copyWeek: [{ required: true, message: "请选择同步时间段", trigger: "blur" }],
-        }
+        },
+        schedule:{},
       }
     },
     created() {
+      this.getPatientScheduleTemplate()
       let year = new Date().getFullYear()
      let month = new Date().getMonth() + 1
      let date = new Date().getDate()
      this.weekNum = this.getYearWeek(year,month,date)
      this.todayDate=this.formatDate(new Date())
-     this.setDate(new Date())
+     this.setDate(new Date(new Date().setDate((new Date().getDate()-7))))
 
      for (var i = 0; i <= 9; i++) {
        this.setDate1(this.addDate(this.currentDate, 7))
           }
         })
  
+      },
+      getPatientScheduleTemplate(){
+        getPatientScheduleTemplate().then(response=>{
+           if(response.data.state == 1){
+             var schedule = response.data.data.schedule 
+             console.log("schedule",schedule)
+             this.schedule = schedule
+           }
+        })
       }
     }
   }