新分支

src/api/advice.js

     method:"get",
     params:params,
   })
-}
+}

src/api/dialysis.js

     method:"Get",
     params:params
   })
+}
+
+
+export function getDialysisProject(params){
+  
+  return request({
+    url:"/api/schedule/getdialysisproject",
+    method:"Get",
+    params:params
+  })
 }

src/api/pharmacy.js

     params: params
   })
 }
+
+export function getGoodInventoryList(params){
+  
+  return request({
+    url:"/api/pharmacy/getgoodinventorylist",
+    method:"Get",
+    params:params,
+  })
+}
+
+export function getGoodInventoryByGoodId(id,params){
+  
+  return request({
+    url:"/api/pharmacy/getgoodinventorybygoodid?id="+id,
+    method:"get",
+    params:params,
+  })
+}
+
+export function updateInventoryWarehouseInfo(params){
+  
+  return request({
+    url:"/api/pharmacy/updateInventoryWarehouseInfo",
+    method:"get",
+    params:params,
+  })
+} 

src/router/modules/dialysis.js

       }
     },
 
+    {
+      path: '/dialysis/doctorNewProjectStaticPrint',
+      component: () => import('@/xt_pages/dialysis/doctorNewProjectStaticPrint'),
+      name: '透析耗材统计打印',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: '透析耗材统计打印',
+        noCache: true
+      }
+    },
+
     {
       path: '/dialysis/signPrint',
       component: () => import('@/xt_pages/dialysis/signPrint'),

src/xt_pages/dialysis/details/BasicInfor.vue

   },
   watch:{
     dialysis_date:function(){
-      console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh我爱中国",this.dialysis_date)
+      // console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh我爱中国",this.dialysis_date)
       this.dialysis_time = this.dialysis_date
     }
   }

src/xt_pages/dialysis/newDoctorAdvice.vue

       </div> -->
 
       <div style="margin-top: 10px;margin-bottom:10px">
-        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340">统计</el-button>
+        <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=9671  && org_id!=10340">药品统计</el-button>
 
-        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">统计</el-button>
+        <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id == 9671 || org_id==10340">药品统计</el-button>
+
+        <el-button type="primary" size="small" @click="toStaticTwo">耗材统计</el-button>
+
+        
       </div>
 
 
         <el-button type="primary" @click="startdialogVisibleOne = false">确 定</el-button>
       </span>
     </el-dialog>
+
+
+    <el-dialog
+      title="耗材统计表"
+      :visible.sync="startdialogVisibleTwo"
+      width="60%">
+      <span>
+        <div class="cell clearfix" style="margin-bottom:10px">
+          <label class="title"> <span class="name">排班班次</span> : </label>
+           <el-select v-model="schedule_type" placeholder="请选择" @change="changeScheduleTypeTwo" >
+            <el-option
+              v-for="item in schedulArr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+           </el-select>
+           <label class="title"> <span class="name">病区选择</span> : </label>
+           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionTypeTwo" multiple >
+            <el-option
+              v-for="item in partitionArr"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+           </el-select>
+           <el-button size="small" icon="el-icon-printer"  @click="toPrintThree" type="primary">打印</el-button>
+           <el-button size="small"  @click="toExportListTwo" type="primary">导出</el-button>
+        </div>
+
+      <el-table
+        :data="tableProjectList"
+        border
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+         <el-table-column  align="center"  label="序号">
+           <template slot-scope="scope">
+              {{scope.$index+1}}
+           </template>
+        </el-table-column>
+        <el-table-column  align="center"   label="耗材名称">
+         <template slot-scope="scope">
+            {{scope.row.good_name}}
+          </template>
+        </el-table-column>
+        <el-table-column  align="center"  label="规格">
+           <template slot-scope="scope">
+             {{scope.row.specification_name}}
+           </template>
+        </el-table-column>
+
+        <el-table-column  align="center"   label="数量">
+           <template slot-scope="scope">
+              {{scope.row.count}}
+           </template>
+        </el-table-column>
+
+
+
+      </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="startdialogVisibleTwo = false">取 消</el-button>
+        <el-button type="primary" @click="startdialogVisibleTwo = false">确 定</el-button>
+      </span>
+    </el-dialog>
     </div>
 
 
 
 <script>
 const moment = require('moment')
-import { getSchedualPatient, GetAllZone,getDialysisAdviceToday } from "@/api/dialysis";
+import { getSchedualPatient, GetAllZone,getDialysisAdviceToday,getDialysisProject } from "@/api/dialysis";
 import { parseTime } from "@/utils";
 import { uParseTime } from '@/utils/tools'
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
       tableList:[],
       startdialogVisible:false,
       startdialogVisibleOne:false,
+      startdialogVisibleTwo:false,
       schedule_type:0,
       partion_type:0,
       druglist:[],
       zoneIdList:[],
       partion_str:"",
       keyword:"",
+      tableProjectList:[],
     };
   },
   created() {
                 this.tableList = hisarr
               }
 
-              console.log("中国人民解放军",this.tableList)
+             
              }
           }
         })
 
               if(doctorList!=null && doctorList.length > 0){
 
-                let dataInfo = {}
+                  let dataInfo = {}
                   doctorList.forEach((item, index) => {
                   item.advice_name = item.advice_name.replace(/\s/g,"")
                   let { advice_name } = item
         })
 
       },
+      toStaticTwo(){
+        var str = ""
+         if(this.partion_type==0){
+            str = this.zoneIdList.join(",")
+         }
+         if(this.partion_type!=0){
+            str = this.partion_type.join(",")
+         }
+         this.partion_str = ""
+         this.partion_str = str  
+         this.tableList = []
+          var params = {
+            schedule_type:this.schedule_type,
+            partion_type:str,
+            selected_date: moment(this.time).format('YYYY-MM-DD'),
+          }
+         getDialysisProject(params).then(response=>{
+           if(response.data.state ==1){
+             var list = response.data.data.list
+             var newArr = []
+             if(list!=null && list.length>0){
+               for(let i=0;i<list.length;i++){
+                 for(let j=0;j<list[i].his_doctor_project.length;j++){
+                    newArr.push(list[i].his_doctor_project[j])
+                 }
+               }
+             }
+             
+             let dataInfo = {}
+              newArr.forEach((item, index) => {
+              let { project_id } = item
+              if (!dataInfo[project_id]) {
+                dataInfo[project_id] = {
+                  project_id:item.project_id,
+                  good_name:item.good.good_name,
+                  specification_name:item.good.specification_name,
+                  child: [],
+                  count:0,
+                }
+              }
+            })
+            let arr = Object.values(dataInfo)
+            
+            if(arr!=null && arr.length >0){
+              for(let i =0;i<arr.length;i++){
+                for(let j=0;j<newArr.length;j++){
+                   if(arr[i].project_id == newArr[j].project_id){
+                      arr[i].child.push(newArr[i])
+                   }
+                } 
+              }
+              for(let i =0;i<arr.length;i++){
+                for(let j=0;j<arr[i].child.length;j++){
+                   arr[i].count += parseInt(arr[i].child[j].count)
+                }
+              }
+
+              console.log("arr0000000000000000000000",arr)
+
+              this.startdialogVisibleTwo = true
+              this.tableProjectList = []
+              this.tableProjectList = arr
+
+            }
+           }
+         })
+      },
       getDrugAdviceCount(advice_name,zone_name){
         var str = ""
         var arr =[]
         var schedule_date = moment(this.time).format('YYYY-MM-DD')
         this.$router.push({path:"/dialysis/doctorNewAdviceStaticPrint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_str+"&schedule_date="+schedule_date+"&is_open="+this.config.is_open})
       },
+      toPrintThree(){
+        var schedule_date = moment(this.time).format('YYYY-MM-DD')
+        this.$router.push({path:"/dialysis/doctorNewProjectStaticPrint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_str+"&schedule_date="+schedule_date+"&is_open="+this.config.is_open})
+      },
       toExportListOne(){
         import('@/vendor/Export2Excel').then(excel => {
 
             this.downloadLoading = false
           })
       },
+      toExportListTwo(){
+        import('@/vendor/Export2Excel').then(excel => {
+
+          if(this.tableProjectList!=null && this.tableProjectList.length > 0){
+            for(let i=0;i<this.tableProjectList.length;i++){
+              this.tableProjectList[i].index = i+1
+            }
+          }
+          const tHeader = ['序号','耗材名称','规格','数量']
+          const filterVal = ['index','good_name','specification_name','count']
+
+          const data = this.formatJson(filterVal, this.tableProjectList)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '耗材统计'
+          })
+            this.downloadLoading = false
+          })
+      },
       formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]));
       },
         this.tableDataList = []
         this.toStaticOne()
       },
+      changeScheduleTypeTwo(){
+        this.tableProjectList = []
+        this.toStaticTwo()
+      },
+      changePartionTypeTwo(){
+        this.tableProjectList=[]
+        this.toStaticTwo()
+      },
       getModeId(val){
         if(val!=null && val.length > 0){
           let dataInfo = {}
              if(hisNewArr[i].mode_id == 32){
                 hisNewArr[i].mode_id = "HDP"
              }
+             if(hisNewArr[i].mode_id == 33){
+                hisNewArr[i].mode_id = "HFD"
+             }
+             if(hisNewArr[i].mode_id == 34){
+                hisNewArr[i].mode_id = "HDF100"
+             }
+             if(hisNewArr[i].mode_id == 35){
+                hisNewArr[i].mode_id = "HDF600"
+             }
+             if(hisNewArr[i].mode_id == 36){
+                hisNewArr[i].mode_id = "HDF800"
+             }
+             if(hisNewArr[i].mode_id == 37){
+                hisNewArr[i].mode_id = "HDF1000"
+             }
              str += hisNewArr[i].mode_id +"("+hisNewArr[i].child.length+")" +"\n"
            }
 

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$message({ message: '预核验成功', type: 'success', duration: 5000 })
+                // that.order.is_upload_diagnose = 1
               }
 
             }
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$message({ message: '签名成功', type: 'success', duration: 5000 })
               }
 
             }
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$message({ message: '处方上传成功', type: 'success', duration: 5000 })
               }
 
             }
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$message({ message: '撤销成功', type: 'success', duration: 5000 })
               }
 
             }
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$confirm(response.data.data.info, '医保信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+
+                })
+
               }
 
             }
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$confirm(response.data.data.info, '医保信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+
+                })
               }
 
             }
                 })
 
               } else {
-                that.$message({ message: '上传成功', type: 'success', duration: 5000 })
-                that.order.is_upload_diagnose = 1
+                that.$confirm(response.data.data.info, '医保信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+
+                })
               }
 
             }

src/xt_pages/stock/drugs/inventory.vue

                   //  }else{
                   //    list[i].type = 6
                   //   }
+                   list[i].last_stock_max_number = 0
+                   list[i].last_stock_max_number = list[i].stock_max_number
+                   list[i].last_stock_min_number = 0
+                   list[i].last_stock_min_number = list[i].stock_min_number
                    list[i].type = 6
                    for(let j=0;j<this.manufacturerList.length;j++){
                      if(list[i].manufacturer == this.manufacturerList[j].id){

src/xt_pages/stock/inventory.vue

               //   list[i].type = 6
               // }
               list[i].type =6
+
+              list[i].last_stock_count = 0
+              list[i].last_stock_count = list[i].stock_count
               
               list[i].good_name = list[i].GoodInfo.good_name
               list[i].specification_name = list[i].GoodInfo.specification_name
               }
             }
         
-          
+          console.log("hahhahahahah",newList)
           this.tableData = newList
           this.showSearch = false
           this.showTable = true

src/xt_pages/stock/stockInventory.vue

             <el-tab-pane label="耗材盘点(模式二)" name="four">
                 <new-inventory ref="childFour"></new-inventory>
             </el-tab-pane>
+            <el-tab-pane label="耗材盘点(模式三)" name="five">
+                <history-inventory ref="childFive"></history-inventory>
+            </el-tab-pane>
             <el-tab-pane label="盘点列表" name="second">
                 <inventory-details ref="child"></inventory-details>
             </el-tab-pane>
 import BreadCrumb from "../components/bread-crumb";
 import inventory from './inventory.vue'
 import newInventory from './newInventory.vue'
+import historyInventory from './historyInventory.vue'
 import inventoryDetails from './inventoryDetails.vue'
 import stockDamaged from "./stockDamaged.vue"
 export default {
         inventory,
         inventoryDetails,
         stockDamaged,
-        newInventory
+        newInventory,
+        historyInventory
     },
     data() {
         return{
         if(this.activeName =="three"){
           this.$refs.childOne.getlist()
         }
+        if(this.activeName == "five"){
+          this.$refs.childFive.getGoodInventoryList()
+        }
       }
     },
     created(){