Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/data/components/addInspection.vue

@@ -45,8 +45,7 @@
                 </el-form-item>
   
                  <el-form-item label="组套明细" style="width:50%;">
-                    <el-select v-model="form.project_detail" placeholder="请选择"
-                     @change="chagneInspection">
+                    <el-select v-model="form.project_detail" placeholder="请选择">
                         <el-option
                         v-for="item in projectList"
                         :key="item.id"
@@ -137,8 +136,8 @@ export default {
             radio:'1',
             rules: {
               project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
-              pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
-              wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+            //   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' }]
            },
@@ -215,6 +214,7 @@ export default {
              if(response.data.state == 1){
                var projectList = response.data.data.projectList
                console.log('projectlist33333',projectList)
+              
                this.projectList = projectList
             //    var hisprojectlist = response.data.data.hisprojectlist
             //    console.log("hisprojectlist",hisprojectlist)
@@ -244,29 +244,30 @@ export default {
            })
         },
        addProjectList(){
-          for(let i=0;i<this.tabList.length;i++){
-            if(this.form.project_detail == this.tabList[i].id){
-                this.tabList[i].number = this.form.number
+          for(let i=0;i<this.projectList.length;i++){
+            if(this.form.project_detail == this.projectList[i].id){
+                this.projectList[i].number = this.form.number
+                this.tableData.push(this.projectList[i])
             }
          }
-         this.tableData = []
-         this.tableData = this.tabList
+         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
-        //        this.$message.success("保存成功")
-        //        this.form.project_detail = ""
-        //        this.form.number = ""
-        //        this.getlist()
-        //      }
-        //   })
+            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
+               this.$message.success("保存成功")
+               this.form.project_detail = ""
+               this.form.number = ""
+            //    this.getlist()
+             }
+          })
         },
         DeleteProject(id,index){
            this.$confirm("确认删除此项目吗?", "删除", {

src/xt_pages/data/components/addProject.vue

@@ -256,8 +256,6 @@ export default {
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
-                pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
-                wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
                 price: [{ required: true, message: '请填写价格', trigger: 'change' }],
                 unit: [{ required: true, message: '请填写单位',trigger: 'blur' }],
                 cost_classify: [{ required: true, message: '请填写费用类别',trigger: 'blur' }],

src/xt_pages/data/components/editInspection.vue

@@ -139,8 +139,8 @@ export default {
             radio:'1',
             rules: {
               project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
-              pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
-              wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+            //   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' }]
            },
@@ -175,6 +175,33 @@ export default {
            getProjectTeamDetail(id).then(response=>{
               if(response.data.state == 1){
                  var projectTeamDetail =  response.data.data.projectTeamDetail
+                 console.log("projectTeamDetail",projectTeamDetail)
+                 var str  = projectTeamDetail.project_id
+                 var arr = str.split(",")
+                 console.log("Arr33333",arr)
+                 var list = response.data.data.list
+                 console.log("list",list)
+                 var hisList = response.data.data.hisList
+                 console.log("histList",hisList)
+                 for(let i=0;i<list.length;i++){
+                   for(let j=0;j<hisList.length;j++){
+                       if(list[i].id == hisList[j].project_id){
+                           list[i].number = hisList[j].number
+                       }
+                   }
+                 }
+                 console.log("数据222222",list)
+                 var strArr = []
+                 for(let i=0;i<arr.length;i++){
+                   for(let j=0;j<list.length;j++){
+                      if((arr[i]== list[j].id)){
+                          strArr.push(list[j])
+                      }
+                   }
+                 }
+                 this.tableData = strArr
+               
+               
                  this.form.id = projectTeamDetail.id
                  this.form.project_team = projectTeamDetail.project_team
                  this.form.price = projectTeamDetail.price
@@ -183,7 +210,7 @@ export default {
                  this.form.tube_color = projectTeamDetail.tube_color
                  this.form.team_type = projectTeamDetail.team_type
                  this.form.remark = projectTeamDetail.remark
-                 console.log("project",projectTeamDetail)
+                //  console.log("project",projectTeamDetail)
               }
            }) 
         },
@@ -193,7 +220,7 @@ export default {
                 for(let i=0;i<this.tableData.length;i++){
                     arr.push(this.tableData[i].id)
                 }
-               console.log("arr",arr)
+             
                var ids = arr.join(",")
                if(valid){
                 var params = {
@@ -207,7 +234,7 @@ export default {
                     remark:this.form.remark,
                     ids:ids,
                 }
-                console.log("params",params)
+                // console.log("params",params)
                  updatedProjectTeam(params).then(response=>{
                    if(response.data.state == 1){
                      var projectTeam = response.data.data.projectTeam
@@ -227,15 +254,14 @@ export default {
                console.log('projectlist33333',projectList)
                this.projectList = projectList
                var hisprojectlist = response.data.data.hisprojectlist
-               console.log("hisprojectlist",hisprojectlist)
-               this.tableData = hisprojectlist
+            //    console.log("hisprojectlist",hisprojectlist)
+            //    this.tableData = hisprojectlist
              }
           })   
         },
         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
@@ -244,6 +270,8 @@ export default {
           return name
         },
        addProjectList(){
+           
+           console.log("表格",this.tableData)
             const params = {
               id:this.form.project_detail,
               number:parseInt(this.form.number)
@@ -252,6 +280,9 @@ export default {
           addProjectList(params).then(response=>{
              if(response.data.state == 1){
                var projectList = response.data.data.projectList
+               projectList.number = parseInt(this.form.number)
+               this.tableData.push(projectList)
+               console.log("23333",this.tableData)
                this.$message.success("保存成功")
                this.form.project_detail = ""
                this.form.number = ""

src/xt_pages/data/components/editProject.vue

@@ -260,8 +260,8 @@ export default {
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
-                pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
-                wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
+                // pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
+                // wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
                 price: [{ required: true, message: '请填写价格', trigger: 'change' }],
                 unit: [{ required: true, message: '请填写单位',trigger: 'blur' }],
                 cost_classify: [{ required: true, message: '请填写费用类别',trigger: 'blur' }],
@@ -295,7 +295,7 @@ export default {
           return getDictionaryDataConfig(module, filed_name)
        },
        getProjectDetail(id){
-           console.log("id",id)
+        
          getProjectDetail(id).then(response=>{
             if(response.data.state == 1){
               var projecDetail =  response.data.data.projecDetail
@@ -310,10 +310,10 @@ export default {
               this.form.executive_section = projecDetail.executive_section
               this.form.medical_coverage = projecDetail.medical_coverage
               this.form.statistical_classification =projecDetail.statistical_classification
-              this.form.disease_directory = projecDetail.disease_directory
-              this.form.is_record = projecDetail.is_record
+              this.form.disease_directory = projecDetail.disease_directory?projecDetail.disease_directory:""
+              this.form.is_record = projecDetail.is_record?projecDetail.is_record:""
               this.form.medical_code = projecDetail.medical_code
-              this.form.tube_color = projecDetail.tube_color
+              this.form.tube_color = projecDetail.tube_color?projecDetail.tube_color:""
               this.form.medical_status = projecDetail.medical_status
               this.form.remark = projecDetail.remark
               this.form.sign = projecDetail.sign

src/xt_pages/data/components/inspection.vue

@@ -140,6 +140,7 @@ export default {
              if(response.data.state == 1){
                var projectTeamList =  response.data.data.projectTeamList
                console.log("projectteamlist",projectTeamList)
+               
                this.tableData = projectTeamList
                var total  =  response.data.data.total
                this.total = total

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -341,36 +341,27 @@
             </el-form-item>
           </el-col>
 
-          <!--          <el-col :span="8" v-if="isShows('透析器/灌流器')">-->
-          <!--            <el-form-item label="透析器/灌流器：">-->
-          <!--              <el-input-->
-          <!--                v-model="dialysisPrescription.dialyzer_perfusion_apparatus"-->
-          <!--              ></el-input>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
+      
 
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
             <el-form-item label="透析器/灌流器">
-
               <el-input v-model="dialysisPrescription.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
-
-              <!--<el-select-->
-                <!--v-model="dialysisPrescription.dialyzer_perfusion_apparatus"-->
-                <!--placeholder="请选择"-->
-                <!--style="width:100%;"-->
-              <!--&gt;-->
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
-
-                <!--<el-option-->
-                  <!--v-for="(item, index) in dialyzerPerfusionApparatus"-->
-                  <!--:label="item.name"-->
-                  <!--:key="index+'r'"-->
-                  <!--:value="item.id"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
             </el-form-item>
           </el-col>
 
+          <!-- <el-col :span="8" v-if="isShows('透析器')">
+             <el-form-item label="透析器:">
+                  <el-input v-model="dialysisPrescription.dialyzers" @focus="showInnerDialog('7')"></el-input>
+             </el-form-item>
+          </el-col>
+
+ß
+          <el-col :span="8" v-if="isShows('灌流器')">
+             <el-form-item label="灌流器:">
+                  <el-input v-model="dialysisPrescription.irrigation" @focus="showInnerDialog('8')"></el-input>
+             </el-form-item>
+          </el-col> -->
+
           <el-col :span="8" v-if="isShows('体液过多症状')">
             <el-form-item label="体液过多症状：">
               <el-select
@@ -1271,6 +1262,7 @@
           nucleoprotamine:"",//鱼精蛋白
           no_heparin_remarks:"",
           blood:"",
+          irrigation:""
         },
 
         anticoagulant: {
@@ -1291,7 +1283,9 @@
 
         doctorAdvices: [],
         dialyzerPerfusionApparatus: [],
-        bloods:[]
+        bloods:[],
+        irrigation:[],
+        dialyzers:[],
       }
     },
     methods: {
@@ -1333,32 +1327,10 @@
             this.InnerDialogProps.titles = '抽血'
             this.InnerDialogProps.type = 'blood'
             this.InnerDialogProps.selected = this.dialysisPrescription.blood
-            this.InnerDialogProps.isShowTextArea = false
-            // if(this.dialysisPrescription.blood !="" || dialysisPrescription.blood !=undefined ){
-            //     var arr = this.dialysisPrescription.blood
-            //     var newArr =  arr.split(",")
-            //     console.log("抽血",newArr)
-            //     var Arr = []
-            //     for(let i=0;i<newArr.length;i++){
-            //       for(let j=0;j<this.bloods.length;j++){
-            //         var newarr = newArr[i].toUpperCase()
-
-            //         var dialy = this.bloods[j].name.toUpperCase()
-
-            //         if(newarr == dialy){
-            //             Arr.push(this.bloods[j].name)
-            //         }
-            //       }
-            //     }
-            //     var arrtwo = Arr.join(",")
-            //     console.log("Arr",arrtwo)
-            //     this.InnerDialogProps.values = this.bloods
-            //     this.InnerDialogProps.titles = '抽血'
-            //     this.InnerDialogProps.type = 'blood'
-            //     this.InnerDialogProps.selected = arrtwo
-            //     this.InnerDialogProps.isShowTextArea = false
-            //     break
-            // }
+            this.InnerDialogProps.isShowTextArea = false    
+          
+           case '7': // 透析器
+          
         }
       },
       innerDialogComfirm: function(val) {
@@ -1420,7 +1392,6 @@
       },
       setLastRecord: function(schedual,lastAssessmentAfterDislysis,lastPredialysisEvaluation,lastDialysisPrescribe,lastDryWeightDislysis,system_prescribe) {
 
-
         this.treatment_mode = this.$store.getters.treatment_mode
         // console.log("99999",this.treatment_mode)
         this.perfusion_apparatus = getDataConfig(
@@ -1938,7 +1909,7 @@
         this.isVisibility = false
       },
       changeThisAnticoagulant: function(val) {
-        console.log("val-----",val)
+        
         var thismode = val
         if (isNaN(thismode) || thismode <= 0) {
           return false
@@ -1986,8 +1957,6 @@
 
         this.is_pre = 1
 
-        console.log("99999",this.prescription.id)
-        console.log("open",this.is_open)
         if (this.prescription.id == 0) {
           if (this.is_open == 0) {
             if (this.patient.id <= 0) {

src/xt_pages/dialysis/details/index.vue

@@ -675,7 +675,8 @@ export default {
       showView:false,
       curPatient:{},
 
-      queueConfig:{}
+      queueConfig:{},
+      stockType:[]
     }
   },
   created() {
@@ -1120,7 +1121,9 @@ export default {
           console.log(this.his_is_open)
           
           // var stockType =  resp.data.stockType
+          // this.stockType = stockType
           // console.log("stockTYPW",stockType)
+          
           for (let i = 0; i <  this.doctor_advices.length; i++){
             this.doctor_advices[i]['origin'] = 1
           }

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -53,7 +53,7 @@
                  <p>配对：</p>
                  <p>核对：</p>
                  <p>发药：</p>
-                 <p>药费：{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p>
+                 <p>药费：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
           </div>
           <div style="page-break-after:always"></div>
       </div>

src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue

@@ -81,7 +81,7 @@
 
         <div class="actionBar">
             <div>执行医生：{{item.doctor?item.doctor:""}}</div>
-            <div>费用：{{getTotalOne(item.id)?getTotalOne(item.id):''}}元</div>
+            <div>费用：{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):''}}元</div>
         </div>
 
         <table style="width:100%;text-align:center;line-height:25px;border-collapse: collapse;" border="1">