11月14日 库存扣减更新

src/router/modules/dialysis.js

@@ -122,6 +122,17 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/allsummarydialog_print',
+      component: () => import('@/xt_pages/dialysis/allSummaryDialog_print'),
+      hidden: true,
+      is_menu: false,
+      name: 'allSummaryDialog_print',
+      meta: {
+        title: 'allSummaryDialog_print',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/record/:id',
       component: () => import('@/xt_pages/dialysis/dialysisPage'),

src/xt_pages/data/components/addInspection.vue

@@ -158,7 +158,7 @@
           //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
           //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
           price: [{ required: true, message: '请填写价格', trigger: 'change' }],
-          team_type: [{ required: true, message: '请填写组套类型', trigger: 'change' }]
+          //team_type: [{ required: true, message: '请填写组套类型', trigger: 'change' }]
         },
         tableData: [],
         projectList: [],
@@ -232,16 +232,16 @@
           saveTeam(data, params).then(response => {
             if (response.data.state == 1) {
               var projectTeam = response.data.data.projectTeam
-              console.log('projectTeam', projectTeam)
+              // console.log('projectTeam', projectTeam)
               this.$message.success('保存成功')
               this.visible = false
               this.form.project_team = '',
-                this.form.price = '',
-                this.form.pinyin = '',
-                this.form.wubi = '',
-                this.form.tube_color = '',
-                this.form.team_type = '',
-                this.form.remark = ''
+              this.form.price = '',
+              this.form.pinyin = '',
+              this.form.wubi = '',
+              this.form.tube_color = '',
+              this.form.team_type = '',
+              this.form.remark = ''
               this.tableData = []
               this.form.number = ''
               this.$parent.getlist()
@@ -254,14 +254,14 @@
       getlist() {
         let params = {
           keyword: ''
-
         }
         getAllProjectList(params).then(response => {
           if (response.data.state == 1) {
             var projectList = response.data.data.projectList
             var goodInfos = response.data.data.good_info
-
+            
             for (let i = 0; i < projectList.length; i++) {
+
               let obj = {
                 id: projectList[i].id,
                 statistical_classification: projectList[i].statistical_classification,
@@ -270,10 +270,10 @@
                 unit: projectList[i].unit,
                 price: projectList[i].price,
                 type: 2,
-                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1)),
               }
               this.projectList.push(obj)
-
+             
             }
 
             for (let i = 0; i < goodInfos.length; i++) {
@@ -281,22 +281,18 @@
                 id: goodInfos[i].id,
                 statistical_classification: goodInfos[i].statistical_classification,
                 number: '1',
-                project_name: goodInfos[i].good_name,
+                project_name: goodInfos[i].good_name + " " + goodInfos[i].specification_name,
                 unit: goodInfos[i].good_unit,
                 price: goodInfos[i].retail_price,
                 type: 3,
-                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1))
-
+                new_id: Math.floor((Math.random() + Math.floor(Math.random() * 9 + 1)) * Math.pow(10, 10 - 1)),
               }
               this.projectList.push(obj)
+              
             }
 
-            console.log(this.projectList)
+            console.log("项目2323332",this.projectList)
 
-            // this.projectList = projectList
-            //    var hisprojectlist = response.data.data.hisprojectlist
-            //    console.log("hisprojectlist",hisprojectlist)
-            //    this.tableData = hisprojectlist
           }
         })
       },
@@ -304,7 +300,7 @@
       getId(id) {
         var name = ''
         var statistics_category = getDictionaryDataConfig('system', 'statistics_category')
-        console.log('2235', statistics_category)
+       
         for (let i = 0; i < statistics_category.length; i++) {
           if (id == statistics_category[i].id) {
             name = statistics_category[i].name
@@ -316,42 +312,24 @@
         getProjectDetail(id).then(response => {
           if (response.data.state == 1) {
             var projectdetail = response.data.data.projecDetail
-            console.log('projectdetail', projectdetail)
+        
             this.tableData.push(projectdetail)
           }
         })
       },
       addProjectList() {
-        console.log(this.projectList)
+        
         for (let i = 0; i < this.projectList.length; i++) {
           if (this.form.project_detail == this.projectList[i].new_id) {
             this.projectList[i].number = this.form.number
             this.projectList[i].number = this.projectList[i].number.toString()
+            
             this.tableData.push(this.projectList[i])
             this.form.project_detail = ''
             this.form.number = 1
           }
         }
-        // console.log("33333",this.tableData)
-        //
-        //
-        //    const params = {
-        //      id:this.form.project_detail,
-        //      number:parseInt(this.form.number)
-        //    }
-        //   console.log("params",params)
-        //  addProjectList(params).then(response=>{
-        //     if(response.data.state == 1){
-        //       var projectList = response.data.data.projectList
-        //       var item = response.data.data.item
-        //       console.log("item22222",item)
-        //       this.itemList.push(item.id)
-        //       this.$message.success("保存成功")
-        //       this.form.project_detail = ""
-        //       this.form.number = ""
-        //    //    this.getlist()
-        //     }
-        //  })
+       
       },
       DeleteProject(id, index) {
         this.$confirm('确认删除此项目吗?', '删除', {
@@ -363,7 +341,8 @@
         })
           .catch(() => {
           })
-      }
+      },
+     
     },
     created() {
       //获取所以的项目
@@ -376,8 +355,7 @@
         for (let i = 0; i < this.tableData.length; i++) {
           let a = parseFloat(this.tableData[i].number).toFixed(2)
           let b = parseFloat(this.tableData[i].price).toFixed(2)
-          console.log(a)
-          console.log(b)
+         
 
 
           c = c + this.form.price + (a * b)

src/xt_pages/data/components/consumables.vue

@@ -7,7 +7,7 @@
         <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search"
                    @click="searchAction">搜索
         </el-button>
-        <label class="title"><span class="name">是否启用</span> : </label>
+        <label class="title"><span class="name">是否停用</span> : </label>
         <el-select v-model="is_use" style="width:140px;margin-right:10px;" placeholder="请选择" @change="changeUser">
           <el-option
             v-for="(item,z) in options"

src/xt_pages/data/components/editInspection.vue

@@ -161,7 +161,7 @@
           //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
           //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
           price: [{ required: true, message: '请填写价格', trigger: 'change' }],
-          team_type: [{ required: true, message: '请填写组套类型', trigger: 'change' }]
+          //team_type: [{ required: true, message: '请填写组套类型', trigger: 'change' }]
         },
         tableData: [],
         item_id: [],
@@ -200,14 +200,13 @@
         this.formTitle = '编辑'
         this.getlist(id)
         this.getProjectTeamDetail(id)
-
-      }, getlist(id) {
+        this.projectList = []
+      }, 
+      getlist(id) {
 
         getAllProjectList().then(response => {
           if (response.data.state == 1) {
-            console.log(id)
-            console.log('!~~~~')
-
+         
             var projectList = response.data.data.projectList
             var goodInfos = response.data.data.good_info
 
@@ -233,7 +232,7 @@
                 id: goodInfos[i].id,
                 statistical_classification: goodInfos[i].statistical_classification,
                 number: '1',
-                project_name: goodInfos[i].good_name,
+                project_name:goodInfos[i].good_name + " " + goodInfos[i].specification_name,
                 unit: goodInfos[i].good_unit,
                 price: goodInfos[i].retail_price,
                 type: 3,
@@ -244,7 +243,7 @@
               }
               this.projectList.push(obj)
             }
-
+             console.log("编辑项目23332232323",this.projectList)
           }
         })
       },
@@ -259,9 +258,6 @@
             var projectTeamDetail = response.data.data.projectTeamDetail
             var hisList = response.data.data.hisList
 
-            console.log(this.projectList)
-            console.log(hisList)
-
             for (let i = 0; i < hisList.length; i++) {
 
               let obj = {
@@ -330,6 +326,7 @@
                 // var projectTeam = response.data.data.projectTeam
                 this.$message.success('保存成功')
                 this.visible = false
+                this.projectList = []
                 // this.$parent.getlist()
               }
             })

src/xt_pages/data/components/inspection.vue

@@ -139,7 +139,7 @@ export default {
           getProjectTeamList(params).then(response=>{
              if(response.data.state == 1){
                var projectTeamList =  response.data.data.projectTeamList
-               console.log("projectteamlist",projectTeamList)
+            //    console.log("projectteamlist",projectTeamList)
                
                this.tableData = projectTeamList
                var total  =  response.data.data.total

src/xt_pages/dialysis/components/allSummary.vue

@@ -485,13 +485,16 @@ export default {
        return shouji
      },
      getAnticoagulantWeichi(id){
+   
         var weichi = ""
         for(let i=0;i<this.prescriptionList.length;i++){
-         if(this.prescriptionList[i].patient_id == id && this.prescriptionList[i].anticoagulant_weichi!=0){
-            weichi = "("+this.prescriptionList[i].anticoagulant_weichi
+         
+          if(id == this.prescriptionList[i].patient_id){
+             weichi =  "(" + this.prescriptionList[i].anticoagulant_weichi
+          } 
         }
-       return weichi
-      }
+        return weichi
+     
      },
      getAnticoagulantZongliang(id){
        var zongliang = ""

src/xt_pages/dialysis/components/consumablesDialog.vue

@@ -113,6 +113,7 @@
                 this.tableData.push(obj)
               }
             }
+            console.log("表格23322332232323",response.data.data.stock_out)
           }
         })
       },
@@ -121,7 +122,7 @@
         done()
       },
       show() {
-        // this.GetDialysisGoodStatistics()
+       
         this.getlist()
         this.visible = true
       },
@@ -129,14 +130,15 @@
       selectStartime() {
         this.start_time = parseTime(this.startTime, '{y}-{m}-{d}')
         this.query.start_time = parseTime(this.startTime, '{y}-{m}-{d}')
-        this.GetDialysisGoodStatistics()
+       // this.GetDialysisGoodStatistics()
+        this.getlist()
 
       },
       selectEndtime() {
         this.end_time = parseTime(this.endTime, '{y}-{m}-{d}')
         this.query.end_time = parseTime(this.endTime, '{y}-{m}-{d}')
-        this.GetDialysisGoodStatistics()
-
+       // this.GetDialysisGoodStatistics()
+        this.getlist()
       },
        getlist(){
           var params = {
@@ -144,11 +146,10 @@
             end_time:this.endTime,
             type:3
           }
-          console.log("param2222222",params)
           getPrintStockGood(params).then(response=>{
             var stockTotal = response.data.data.stockTotal
-            console.log("stocktOTl",stockTotal)
             this.stockTotal = stockTotal
+            this.tableData = []
             for (let i = 0; i < response.data.data.list.length; i++) {
                if (response.data.data.list[i].query_warehouseout_info.length > 0) {
                   this.tableData.push(response.data.data.list[i])

src/xt_pages/dialysis/components/dialysisParameters.vue

@@ -98,7 +98,7 @@
             </el-table-column>
              <el-table-column align="center" label="抗凝剂(首剂)(维持)(总量)">
                 <template slot-scope="scope">
-                   <span v-if="getAnticoagulant(scope.row.patient_id) == 0"></span>
+                    <span v-if="getAnticoagulant(scope.row.patient_id) == 0"></span>
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 1">无肝素</span>
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 2">普通肝素</span>
                     <span v-if="getAnticoagulant(scope.row.patient_id) == 3">低分子肝素</span>
@@ -152,7 +152,8 @@
             </el-table-column>
              <el-table-column align="center" label="透析器/灌流器" width="120">
                <template slot-scope="scope">
-                 {{getDialyzerPerfusionApparatus(scope.row.patient_id)?getDialyzerPerfusionApparatus(scope.row.patient_id):""}}
+                   {{getDialyzerPerfusionApparatus(scope.row.patient_id)?getDialyzerPerfusionApparatus(scope.row.patient_id):""}}
+                   {{getDialysisDialyzers(scope.row.patient_id)}} {{getDialysisIrrigation(scope.row.patient_id)}}
                </template>
             </el-table-column>
         </el-table>
@@ -208,7 +209,8 @@ export default {
             start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
             selecting_schs: [],
             prescriptionList:[],
-            dialysisBefor:[]
+            dialysisBefor:[],
+            list:[],
         }
     },
     created(){
@@ -323,6 +325,33 @@ export default {
                   if(patient[i].mode_id == 19){
                      patient[i].mode_id = "IUF+HD"
                   }
+                  if(patient[i].mode_id == 20){
+                     patient[i].mode_id = "UF"
+                  }
+                  if(patient[i].mode_id == 21){
+                     patient[i].mode_id = "HD+"
+                  }
+                  if(patient[i].mode_id == 22){
+                     patient[i].mode_id = "血浆胆红素吸附+HDF"
+                  }
+                  if(patient[i].mode_id == 23){
+                     patient[i].mode_id = "血浆胆红素吸附"
+                  }
+                  if(patient[i].mode_id == 24){
+                     patient[i].mode_id = "I-HDF"
+                  }
+                  if(patient[i].mode_id == 25){
+                     patient[i].mode_id = "HD高通"
+                  }
+                  if(patient[i].mode_id == 26){
+                     patient[i].mode_id = "CVVH"
+                  }
+                  if(patient[i].mode_id == 27){
+                     patient[i].mode_id = "CVVHD"
+                  }
+                  if(patient[i].mode_id == 28){
+                     patient[i].mode_id = "CVVHDF"
+                  }
                 }
                 this.tableData = patient
                 console.log("patient2222",patient)
@@ -338,14 +367,7 @@ export default {
           // 把时间日期转成时间戳
           return new Date(time).getTime() / 1000;
          },
-        getlist(){
-            // if(this.selected_date==""){
-            //   this.start_time = moment(new Date()).add('year',0).format("YYYY-MM-DD")
-            // }
-            // if(this.selected_date!=''){
-            //   this.start_time = parseTime(this.selected_date, '{y}-{m}-{d}')
-            // }
-            
+        getlist(){   
             const params ={
               start_time:this.start_time,
               keyword:this.search_input,
@@ -359,11 +381,10 @@ export default {
              if(response.data.state == 1){
                 var schedule = response.data.data.schedule
               
-                // this.tableData = schedule
                 var total = response.data.data.total
                 this.total = total
                 var prescription =  response.data.data.prescription
-            
+                console.log("处方233223233233223232323",prescription)
                 this.prescriptionList = prescription
                 var dialysbefor = response.data.data.dialysbefor
                 this.dialysisBefor = dialysbefor
@@ -427,8 +448,35 @@ export default {
                   if(patient[i].mode_id == 19){
                      patient[i].mode_id = "IUF+HD"
                   }
+                  if(patient[i].mode_id == 20){
+                     patient[i].mode_id = "UF"
+                  }
+                  if(patient[i].mode_id == 21){
+                     patient[i].mode_id = "HD+"
+                  }
+                  if(patient[i].mode_id == 22){
+                     patient[i].mode_id = "血浆胆红素吸附+HDF"
+                  }
+                  if(patient[i].mode_id == 23){
+                     patient[i].mode_id = "血浆胆红素吸附"
+                  }
+                  if(patient[i].mode_id == 24){
+                     patient[i].mode_id = "I-HDF"
+                  }
+                  if(patient[i].mode_id == 25){
+                     patient[i].mode_id = "HD高通"
+                  }
+                  if(patient[i].mode_id == 26){
+                     patient[i].mode_id = "CVVH"
+                  }
+                  if(patient[i].mode_id == 27){
+                     patient[i].mode_id = "CVVHD"
+                  }
+                  if(patient[i].mode_id == 28){
+                     patient[i].mode_id = "CVVHDF"
+                  }
                 }
-                console.log("patient",patient)
+                console.log("patient99999999999",patient)
                 this.tableData = patient
              }
           })
@@ -538,16 +586,20 @@ export default {
             shouji = "("+this.prescriptionList[i].anticoagulant_shouji
           }
         }
+       
        return shouji
      },
      getAnticoagulantWeichi(id){
+   
         var weichi = ""
         for(let i=0;i<this.prescriptionList.length;i++){
-         if(this.prescriptionList[i].patient_id == id && this.prescriptionList[i].anticoagulant_weichi!=0 ){
-            weichi = "("+this.prescriptionList[i].anticoagulant_weichi
+         
+          if(id == this.prescriptionList[i].patient_id){
+             weichi =  "(" + this.prescriptionList[i].anticoagulant_weichi
+          } 
         }
-       return weichi
-      }
+        return weichi
+     
      },
      getAnticoagulantZongliang(id){
        var zongliang = ""
@@ -557,6 +609,24 @@ export default {
           }
         }
        return zongliang
+     },
+     getDialysisDialyzers(id){
+       var dialysis_dialyszers = ""
+       for(let i=0;i<this.prescriptionList.length;i++){
+         if(id == this.prescriptionList[i].patient_id){
+          dialysis_dialyszers = this.prescriptionList[i].dialysis_dialyszers
+         }
+       }
+       return dialysis_dialyszers
+     },
+     getDialysisIrrigation(id){
+        var dialysis_irrigation = ""
+        for(let i=0;i<this.prescriptionList.length;i++){
+          if(id == this.prescriptionList[i].patient_id){
+             dialysis_irrigation = this.prescriptionList[i].dialysis_irrigation
+          }
+        }
+        return dialysis_irrigation
      }
     }
 }

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -318,9 +318,9 @@
         </li>
       </ul>
     </div>
-    <div class="note">
+    <!-- <div class="note">
       备注 : <span>{{ this.record.remark }}</span>
-    </div>
+    </div> -->
     <div class="middleLine"></div>
   </div>
 </template>

src/xt_pages/management/components/ManageForm.vue

@@ -601,12 +601,6 @@ export default {
       var machine_statuss = parseInt(machine_status);
       this.form.machine_status = machine_statuss;
 
-      // if (this.form.bed_number === '') {
-      //  this.form.bed_number = 0
-      // }
-      // var bed_numbers = this.form.bed_number
-      // var bed_numberss = parseInt(bed_numbers)
-      // this.form.bed_number = bed_numberss
       console.log("购买日期", this.form.buy_date);
 
       if (this.form.Disinfection_mode === "") {

src/xt_pages/management/components/MultipleForm.vue

@@ -34,7 +34,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="设备类型:">
-              <el-select style="width: 110px;" v-model="form.device_type">
+              <el-select style="width: 110px;" v-model="form.device_type" @change="changeEquitmentType">
                 <el-option
                   v-for="item in this.EquitmentType"
                   :key="item.id"
@@ -46,11 +46,11 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="设备型号:">
-              <el-select style="width: 110px;" v-model="form.device_model">
+              <el-select style="width: 110px;" v-model="form.device_model" @change="changeDevicemode">
                 <el-option
-                  v-for="item in this.EquitmentName"
+                  v-for="item in this.deviceMode"
                   :key="item.id"
-                  :label="item.equitment_name"
+                  :label="item.device_mode"
                   :value="item.id"
                 ></el-option>
               </el-select>
@@ -326,6 +326,7 @@ export default {
       DeviceType: [{ id: 0, name: "不限" }],
       Numbers: [{ id: 0, number: "不限" }],
       EquitmentName: [{ id: 0, equitment_name: "全部" }],
+      deviceMode:[{id:0,device_mode:"全部"}],
       runOptions: [{ value: "1", label: "正常" }, { value: "2", label: "故障" }]
     };
   },
@@ -358,15 +359,31 @@ export default {
       getAllEquimentName().then(response => {
         if (response.data.state == 1) {
           var equit = response.data.data.equit;
+          console.log("equit23233232",equit)
+          var list = response.data.data.list
+          console.log("list23323000000000000000000",list)
+          var devices = [{id:0,device_mode:"全部"}]
           var equits = [{ id: 0, equitment_name: "全部" }];
           for (let index = 0; index < equit.length; index++) {
             const item = equit[index];
             equits.push({ id: item.id, equitment_name: item.equitment_name });
           }
+          for(let index = 0;index<list.length;index++){
+            const item = list[index]
+            devices.push({id:item.id,device_mode:item.device_mode})
+          }
           this.EquitmentName = equits;
+          this.deviceMode = devices
         }
       });
     },
+   changeDevicemode(){
+     this.getComprehensive()
+   },
+   changeEquitmentType(){
+     console.log("hh233223",this.form.device_type)
+    this.getComprehensive()
+   },
     getComprehensive() {
       const params = {
         zone: this.form.zone,
@@ -374,8 +391,10 @@ export default {
         devicetype: this.form.device_type,
         year: this.form.user_year,
         starttime: this.form.start_time,
-        endtime: this.form.end_time
+        endtime: this.form.end_time,
+        device_mode:this.form.device_model,
       };
+      console.log("param23332323233223322323",params)
       getComprehensive(params).then(response => {
         if (response.data.state === 1) {
           var macher = response.data.data.macher;

src/xt_pages/management/components/UserForm.vue

@@ -1010,7 +1010,17 @@ export default {
         { id: 15, name: "HD前置换" },
         { id: 16, name: "HD后置换" },
         { id: 17, name: "HDF前置换" },
-        { id: 18, name: "HDF后置换" }
+        { id: 18, name: "HDF后置换" },
+        { id:19, name:"IUF+HD"},
+        { id:20, name:"UF"},
+        { id:21, name:"HD+"},
+        { id:22, name:"血浆胆红素吸附+HDF"},
+        { id:23, name:"血浆胆红素吸附"},
+        { id:24, name:"I-HDF"},
+        { id:25, name:"HD高通"},
+        { id:26, name:"CVVH"},
+        { id:27, name:"CVVHD"},
+        { id:28, name:"CVVHDF"},
       ],
       // 基表消毒方式
       disinfectType: [
@@ -1237,6 +1247,43 @@ export default {
             if (information[index].dialysis_mode === 18) {
               information[index].dialysis_mode = "HDF后置换";
             }
+            if (information[index].dialysis_mode === 19) {
+              information[index].dialysis_mode = "IUF+HD";
+            }
+            
+            if (information[index].dialysis_mode === 20) {
+              information[index].dialysis_mode = "UF";
+            }
+            if (information[index].dialysis_mode === 21) {
+              information[index].dialysis_mode = "HD+";
+            }
+
+            if (information[index].dialysis_mode === 22) {
+              information[index].dialysis_mode = "血浆胆红素吸附+HDF";
+            }
+
+            if (information[index].dialysis_mode === 23) {
+              information[index].dialysis_mode = "血浆胆红素吸附";
+            }
+
+            if (information[index].dialysis_mode === 24) {
+              information[index].dialysis_mode = "I-HDF";
+            }
+
+            if (information[index].dialysis_mode === 25) {
+              information[index].dialysis_mode = "HD高通";
+            }
+
+            if (information[index].dialysis_mode === 26) {
+              information[index].dialysis_mode = "CVVH";
+            }
+            if (information[index].dialysis_mode === 27) {
+              information[index].dialysis_mode = "CVVHD";
+            }
+
+            if (information[index].dialysis_mode === 28) {
+              information[index].dialysis_mode = "CVVHDF";
+            }
 
             if (information[index].move === 0) {
               information[index].move = "";
@@ -1690,7 +1737,7 @@ export default {
       ).then(response => {
         if (response.data.state === 1) {
           var information = response.data.data.infor;
-          // console.log("information", information);
+        //  console.log("information", information);
           for (let index = 0; index < information.length; index++) {
             if (information[index].class === 0) {
               information[index].class = "";
@@ -1764,6 +1811,48 @@ export default {
               information[index].dialysis_mode = "HDF后置换";
             }
 
+            if (information[index].dialysis_mode === 19) {
+              information[index].dialysis_mode = "IUF+HD";
+            }
+
+           if (information[index].dialysis_mode === 20) {
+              information[index].dialysis_mode = "UF";
+            }
+
+            if (information[index].dialysis_mode === 21) {
+              information[index].dialysis_mode = "HD+";
+            }
+
+            if (information[index].dialysis_mode === 22) {
+              information[index].dialysis_mode = "血浆胆红素吸附+HDF";
+            }
+
+            if (information[index].dialysis_mode === 23) {
+              information[index].dialysis_mode = "血浆胆红素吸附";
+            }
+
+            if (information[index].dialysis_mode === 24) {
+              information[index].dialysis_mode = "I-HDF";
+            }
+
+            if (information[index].dialysis_mode === 25) {
+              information[index].dialysis_mode = "HD高通";
+            }
+            
+            if (information[index].dialysis_mode === 26) {
+              information[index].dialysis_mode = "CVVH";
+            }
+
+            if (information[index].dialysis_mode === 27) {
+              information[index].dialysis_mode = "CVVHD";
+            }
+
+            if (information[index].dialysis_mode === 28) {
+              information[index].dialysis_mode = "CVVHDF";
+            }
+
+           
+ 
             if (information[index].move === 0) {
               information[index].move = "";
             }
@@ -1935,7 +2024,7 @@ export default {
               information[index].clean = "";
             }
           }
-          // console.log('消毒时间', information)
+
           this.tableData = information;
           var total = response.data.data.total;
           // console.log('total是什么', total)
@@ -1985,6 +2074,9 @@ export default {
           var addmacher = response.data.data.addmacher;
           console.log("addmacher",addmacher)
           for (let index = 0; index < information.length; index++) {
+            if(information[index].class === 0){
+              information[index].class = "";
+            }
             if (information[index].class === 1) {
               information[index].class = "上午";
             }
@@ -2053,6 +2145,46 @@ export default {
               information[index].dialysis_mode = "HDF后置换";
             }
 
+            if (information[index].dialysis_mode === 19) {
+              information[index].dialysis_mode = "IUF+HD";
+            }
+
+            if (information[index].dialysis_mode === 20) {
+              information[index].dialysis_mode = "UF";
+            }
+
+           if (information[index].dialysis_mode === 21) {
+              information[index].dialysis_mode = "HD+";
+            }
+
+           if (information[index].dialysis_mode === 22) {
+              information[index].dialysis_mode = "血浆胆红素吸附+HDF";
+            }
+
+            if (information[index].dialysis_mode === 23) {
+              information[index].dialysis_mode = "血浆胆红素吸附";
+            }
+
+           if (information[index].dialysis_mode === 24) {
+              information[index].dialysis_mode = "I-HDF";
+            }
+
+            if (information[index].dialysis_mode === 25) {
+              information[index].dialysis_mode = "HD高通";
+            }
+            
+           if (information[index].dialysis_mode === 26) {
+              information[index].dialysis_mode = "CVVH";
+            }
+
+            if (information[index].dialysis_mode === 27) {
+              information[index].dialysis_mode = "CVVHD";
+            }
+
+            if (information[index].dialysis_mode === 28) {
+              information[index].dialysis_mode = "CVVHDF";
+            }
+
             if (information[index].move === 0) {
               information[index].move = "";
             }
@@ -2173,6 +2305,9 @@ export default {
             if (information[index].disinfectant === 9) {
               information[index].disinfectant = "5%次氯酸钠";
             }
+            if (information[index].disinfection_status === 0) {
+              information[index].disinfection_status = "";
+            }
             if (information[index].disinfection_status === 1) {
               information[index].disinfection_status = "已消毒";
             }

src/xt_pages/management/home.vue

@@ -3012,7 +3012,17 @@ export default {
           { id: 15, name: 'HD前置换' },
           { id: 16, name: 'HD后置换' },
           { id: 17, name: 'HDF前置换' },
-          { id: 18, name: 'HDF后置换' }
+          { id: 18, name: 'HDF后置换' },
+          { id:19, name:"IUF+HD"},
+          { id:20, name:"UF"},
+          { id:21, name:"HD+"},
+          { id:22, name:"血浆胆红素吸附+HDF"},
+          { id:23, name:"血浆胆红素吸附"},
+          { id:24, name:"I-HDF"},
+          { id:25, name:"HD高通"},
+          { id:26, name:"CVVH"},
+          { id:27, name:"CVVHD"},
+          { id:28, name:"CVVHDF"},
         ],
         disinfection: [
           { id: 0, name: '请选择' },

src/xt_pages/management/index.vue

@@ -18,7 +18,7 @@
           style="width: 400px;"
           v-model.trim="listQuery.searchKey"
           class="filter-item"
-          placeholder="输入序列号/设备名/型号搜索"
+          placeholder="输入序列号/设备名/设备类型搜索"
           size="small"
           @keyup.enter.native='seahcerMacherInfo'
         />

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -68,6 +68,7 @@
              <span v-if="scope.row.consumable_type == 2">手动出库</span>
              <span v-if="scope.row.consumable_type == 3">自动出库</span>
              <span v-if="scope.row.consumable_type == 4">手动退库</span>
+             <span v-if="scope.row.consumable_type == 7">自动退库</span>
              <span v-if="scope.row.consumable_type == 5">报损数量</span>
              <span v-if="scope.row.consumable_type == 10">盘盈</span>
             <span v-if="scope.row.consumable_type == 11">盘亏</span>
@@ -77,7 +78,7 @@
            <template slot-scope="scope">
              <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
               <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>
-              <span v-if="scope.row.consumable_type == 4">{{scope.row.cancel_order_number}}</span>
+              <span v-if="scope.row.consumable_type == 4 || scope.row.consumable_type == 7">{{scope.row.cancel_order_number}}</span>
               <span v-if="scope.row.consumable_type == 5">{{scope.row.warehouse_out_order_number}}</span>
               <span v-if="scope.row.consumable_type == 10 || scope.row.consumable_type == 11">{{scope.row.warehousing_order}}</span>
            </template>

src/xt_pages/stock/stockFlow.vue

@@ -65,6 +65,7 @@
              <span v-if="scope.row.consumable_type == 2">手动出库</span>
              <span v-if="scope.row.consumable_type == 3">自动出库</span>
              <span v-if="scope.row.consumable_type == 4">手动退库</span>
+             <span v-if="scope.row.consumable_type == 7">自动退库</span>
              <span v-if="scope.row.consumable_type == 10">盘盈</span>
              <span v-if="scope.row.consumable_type == 11">盘亏</span>
            </template>
@@ -74,7 +75,7 @@
             <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
             <span v-if="scope.row.consumable_type == 2">{{scope.row.warehouse_out_order_number}}</span>  
             <span v-if="scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>  
-            <span v-if="scope.row.consumable_type == 4">{{scope.row.cancel_order_number}}</span>  
+            <span v-if="scope.row.consumable_type == 4 || scope.row.consumable_type == 7">{{scope.row.cancel_order_number}}</span>  
             <span v-if="scope.row.consumable_type == 10">{{scope.row.warehouse_out_order_number}}</span>
             <span v-if="scope.row.consumable_type == 11">{{scope.row.warehouse_out_order_number}}</span>
            </template>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -589,7 +589,7 @@
                 if(response.data.data.msg == 1){
                   this.$message.success('保存成功')
                   this.$router.back(-1)
-                   loading.close()
+                  loading.close()
                 }
 
                 if(response.data.data.msg == 5){
@@ -602,11 +602,11 @@
                   var str = good_name +"*" + specification_name +"无库存,请入库"
                 
                   if(msg == 7){
-                      this.$message.error(str)
+                    this.$message.error(str)
                   }
 
                 if(response.data.data.msg == 6){
-                  this.$message.error("该耗材的退库数量大于入库数量,无法出库,请新增出库另一个批次")
+                  this.$message.error("该耗材的出库数量大于入库数量,无法出库")
                 }
                 loading.close()
               }

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -361,21 +361,28 @@ export default {
         }
 
         var now_time = parseInt(this.week_type) * 86400 + this.start_time
-
-        const params = {
-          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
-          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
-          week_type:this.week_type,
-          week_time:this.week_time,
-          zone:str,
-          record_date:this.getTime(now_time)
-        }
+        
+        let weekOfDay = parseInt(moment().format('E'))
+        let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
+        console.log("卡 is h2323233232",new Date(next_monday))
+        let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
+        console.log("下周日",next_sunday.valueOf())
         // const params = {
-        //   start_time:1609603200,
-        //   end_time:1610208000,
+        //   start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+        //   end_time:moment().week(moment().week() + 1).endOf('week').unix(),
         //   week_type:this.week_type,
         //   week_time:this.week_time,
+        //   zone:str,
+        //   record_date:this.getTime(now_time)
         // }
+       const params = {
+          start_time:next_monday,
+          end_time:next_sunday,
+          week_type:this.week_type,
+          week_time:this.week_time,
+          zone:str,
+          record_date:this.getTime(now_time)
+       }
       console.log("params0000000000",params)
       getNextScheduleWeekDay(params).then(response => {
         this.scheduleData = [];
@@ -683,12 +690,6 @@ export default {
   created() {
     this.modeOptions = this.$store.getters.treatment_mode;
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit;
-    // this.week_type = new Date().getDay();
-    // console.log("hhhh23232332",this.week_type)
-    // if (this.week_type == 0) {
-    //   this.week_type = 7;
-    // }
-
     this.getAllZoneList()
     this.org_id = this.$store.getters.xt_user.org.id
 

src/xt_pages/workforce/next_remind_print.vue

@@ -19,13 +19,13 @@
       <div id="print_content">
         <div class="print_main_content">
           <div class="order_title_panl">
-            <!-- <span class="main_title">{{day}}排班提醒（{{ currentDate }}）</span> -->
-            <span class="main_title">{{day}}排班提醒（{{ getTime(now_time) }}）</span>
+            <span class="main_title" v-if="scheduleData.length >0">{{day}}排班提醒（{{getTime(scheduleData[0].schedule_date) }}）</span>
           </div>
           <div class="table_panel">
             <table class="table">
               <thead>
                 <tr>
+                  <td width="50">序号</td>
                   <td width="100" v-if="printObj.week == 1">星期</td>
                   <td width="100" v-if="printObj.name == 1">姓名</td>
                   <td width="70" v-if="printObj.zone == 1">分区</td>
@@ -40,6 +40,7 @@
               </thead>
               <tbody>
               <tr v-for="(main_collection, index) in scheduleData" :key="index">
+                <td :width="td_1_width">{{index + 1}}</td>
                 <td :width="td_1_width" v-if="printObj.week == 1">
                   <span v-if="main_collection.schedule_week == 0">周日</span>
                   <span v-if="main_collection.schedule_week == 1">周一</span>
@@ -146,42 +147,37 @@
       BreadCrumb
     },
     created() {
-     var now_time = parseInt(this.week_type) * 86400 + this.start_time
-     this.now_time = now_time
-     this.getPrintList()
-     this.org_id = this.$store.getters.xt_user.org.id
-     this.currentDate = this.getCurrentDate()
+   
+      this.getPrintList()
+      this.org_id = this.$store.getters.xt_user.org.id
+      this.currentDate = this.getCurrentDate()
 
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
+      var now_time = parseInt(this.week_type) * 86400 + this.start_time
+      console.log("now_time23233232322323",now_time)
+      this.now_time = now_time
       this.week_time  = this.$route.query.week_time
       this.zone = this.$route.query.zone
       this.pre_status = this.$route.query.prestatus
       this.loading = true;
+      let weekOfDay = parseInt(moment().format('E'))
+      let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
+      let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
       const params = {
           week_type:this.week_type,
           week_time:this.week_time,
-          start_time:this.start_time,
-          end_time:this.end_time,
+          start_time:next_monday,
+          end_time:next_sunday,
           zone:this.zone,
           record_date:this.getTime(now_time)
         }
-     console.log("prarms23232323",params)
-        //  const params = {
-        //   week_type:this.week_type,
-        //   week_time:this.week_time,
-        //   start_time:1609603200,
-        //   end_time:1610208000,
-        // }
-      // console.log("打印下周",params)
-
-      // console.log("start",this.start_time)
+     console.log("下周打印时间",params)
       getNextScheduleWeekDay(params).then(rs => {
         var resp = rs.data
         console.log(resp)
         if (resp.state == 1) {
-        this.loading = false
          var scheduleData = resp.data.schedule
 
           if(this.pre_status == 0){
@@ -189,7 +185,7 @@
               scheduleData[i].sort = scheduleData[i].number.sort
             }
             var arr =   scheduleData.sort(this.compare('sort'))
-            // console.log("打印",arr)
+           
             this.scheduleData = arr
           }
           if(this.pre_status == 1){
@@ -200,7 +196,7 @@
               }
             }
             var arr =   newList.sort(this.compare('sort'))
-            console.log("打印",arr)
+           
             this.scheduleData = arr
           }
 
@@ -212,10 +208,11 @@
               }
             }
             var arr =   newList.sort(this.compare('sort'))
-            console.log("打印",arr)
-            this.scheduleData = arr
            
+            this.scheduleData = arr
+            
           }
+          this.loading = false
         } else {
           this.$message.error(resp.msg)
         }
@@ -396,12 +393,12 @@
       }
      },
      getTime(val) {
-         if(val == ""){
-          return ""
-         }else {
-          return uParseTime(val, '{y}-{m}-{d}')
-         }
-      },
+        if(val == ""){
+        return ""
+        }else {
+         return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
      getPrintList(){
       getPrintList().then(response=>{
          if(response.data.state == 1){
@@ -432,9 +429,19 @@
 
           }
         }
-        console.log('name', name)
+      
         return name
       },
+      getTimeOne(type){
+        console.log("typ323232232323",type)
+        var nowdate = ""
+        for(let i=0;i<this.scheduleData.length;i++){
+          if(type == this.scheduleData[i].schedule_week){
+             nowdate = this.getTime(this.scheduleData[i].schedule_date)
+          } 
+        }
+        return nowdate
+      }
     }
   }
 </script>

src/xt_pages/workforce/remind_print.vue

@@ -24,6 +24,7 @@
             <table class="table">
               <thead>
                 <tr>
+                  <td width="50">序号</td>
                   <td width="100" v-if="printObj.week == 1">星期</td>
                   <td width="100" v-if="printObj.name == 1">姓名</td>
                   <td width="70" v-if="printObj.zone == 1">分区</td>
@@ -38,6 +39,7 @@
               </thead>
               <tbody>
               <tr v-for="(main_collection, index) in scheduleData" :key="index">
+                <td :width="td_1_width">{{index + 1}}</td>
                 <td :width="td_1_width" v-if="printObj.week == 1">
                   <span v-if="main_collection.schedule_week == 0">周日</span>
                   <span v-if="main_collection.schedule_week == 1">周一</span>