XMLWAN 4 vuotta sitten
vanhempi
commit
25ce746f8a

+ 11 - 9
src/xt_pages/data/components/addInspection.vue Näytä tiedosto

45
                 </el-form-item>
45
                 </el-form-item>
46
   
46
   
47
                  <el-form-item label="组套明细" style="width:50%;">
47
                  <el-form-item label="组套明细" style="width:50%;">
48
-                    <el-select v-model="form.project_detail" placeholder="请选择"
49
-                     @change="chagneInspection">
48
+                    <el-select v-model="form.project_detail" placeholder="请选择">
50
                         <el-option
49
                         <el-option
51
                         v-for="item in projectList"
50
                         v-for="item in projectList"
52
                         :key="item.id"
51
                         :key="item.id"
137
             radio:'1',
136
             radio:'1',
138
             rules: {
137
             rules: {
139
               project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
138
               project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
140
-              pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
141
-              wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
139
+            //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
140
+            //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
142
               price: [{ required: true, message: '请填写价格', trigger: 'change' }],
141
               price: [{ required: true, message: '请填写价格', trigger: 'change' }],
143
               team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
142
               team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
144
            },
143
            },
215
              if(response.data.state == 1){
214
              if(response.data.state == 1){
216
                var projectList = response.data.data.projectList
215
                var projectList = response.data.data.projectList
217
                console.log('projectlist33333',projectList)
216
                console.log('projectlist33333',projectList)
217
+              
218
                this.projectList = projectList
218
                this.projectList = projectList
219
             //    var hisprojectlist = response.data.data.hisprojectlist
219
             //    var hisprojectlist = response.data.data.hisprojectlist
220
             //    console.log("hisprojectlist",hisprojectlist)
220
             //    console.log("hisprojectlist",hisprojectlist)
244
            })
244
            })
245
         },
245
         },
246
        addProjectList(){
246
        addProjectList(){
247
-          for(let i=0;i<this.tabList.length;i++){
248
-            if(this.form.project_detail == this.tabList[i].id){
249
-                this.tabList[i].number = this.form.number
247
+          for(let i=0;i<this.projectList.length;i++){
248
+            if(this.form.project_detail == this.projectList[i].id){
249
+                this.projectList[i].number = this.form.number
250
+                this.tableData.push(this.projectList[i])
250
             }
251
             }
251
          }
252
          }
252
-         this.tableData = []
253
-         this.tableData = this.tabList
253
+         console.log("33333",this.tableData)
254
+        //  this.tableData = []
255
+        //  this.tableData = this.tabList
254
          
256
          
255
        
257
        
256
         //     const params = {
258
         //     const params = {

+ 0 - 2
src/xt_pages/data/components/addProject.vue Näytä tiedosto

256
             },
256
             },
257
             rules: {
257
             rules: {
258
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
258
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
259
-                pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
260
-                wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
261
                 price: [{ required: true, message: '请填写价格', trigger: 'change' }],
259
                 price: [{ required: true, message: '请填写价格', trigger: 'change' }],
262
                 unit: [{ required: true, message: '请填写单位',trigger: 'blur' }],
260
                 unit: [{ required: true, message: '请填写单位',trigger: 'blur' }],
263
                 cost_classify: [{ required: true, message: '请填写费用类别',trigger: 'blur' }],
261
                 cost_classify: [{ required: true, message: '请填写费用类别',trigger: 'blur' }],

+ 35 - 4
src/xt_pages/data/components/editInspection.vue Näytä tiedosto

139
             radio:'1',
139
             radio:'1',
140
             rules: {
140
             rules: {
141
               project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
141
               project_team: [{ required: true, message: '请填写组套名称', trigger: 'blur'  }],
142
-              pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
143
-              wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
142
+            //   pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
143
+            //   wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
144
               price: [{ required: true, message: '请填写价格', trigger: 'change' }],
144
               price: [{ required: true, message: '请填写价格', trigger: 'change' }],
145
               team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
145
               team_type: [{ required:true,message:'请填写组套类型',trigger:'change' }]
146
            },
146
            },
175
            getProjectTeamDetail(id).then(response=>{
175
            getProjectTeamDetail(id).then(response=>{
176
               if(response.data.state == 1){
176
               if(response.data.state == 1){
177
                  var projectTeamDetail =  response.data.data.projectTeamDetail
177
                  var projectTeamDetail =  response.data.data.projectTeamDetail
178
+                 console.log("projectTeamDetail",projectTeamDetail)
179
+                 var str  = projectTeamDetail.project_id
180
+                 var arr = str.split(",")
181
+                 console.log("Arr33333",arr)
182
+                 var list = response.data.data.list
183
+                 console.log("list",list)
184
+                 var hisList = response.data.data.hisList
185
+                 console.log("histList",hisList)
186
+                 for(let i=0;i<list.length;i++){
187
+                   for(let j=0;j<hisList.length;j++){
188
+                       if(list[i].id == hisList[j].project_id){
189
+                           list[i].number = hisList[j].number
190
+                       }
191
+                   }
192
+                 }
193
+                 var strArr = []
194
+                 for(let i=0;i<arr.length;i++){
195
+                   for(let j=0;j<list.length;j++){
196
+                      if((arr[i]== list[j].id)){
197
+                          strArr.push(list[j])
198
+                      }
199
+                   }
200
+                 }
201
+                 this.tableData = strArr
202
+                 console.log("str---",strArr)
203
+               
178
                  this.form.id = projectTeamDetail.id
204
                  this.form.id = projectTeamDetail.id
179
                  this.form.project_team = projectTeamDetail.project_team
205
                  this.form.project_team = projectTeamDetail.project_team
180
                  this.form.price = projectTeamDetail.price
206
                  this.form.price = projectTeamDetail.price
227
                console.log('projectlist33333',projectList)
253
                console.log('projectlist33333',projectList)
228
                this.projectList = projectList
254
                this.projectList = projectList
229
                var hisprojectlist = response.data.data.hisprojectlist
255
                var hisprojectlist = response.data.data.hisprojectlist
230
-               console.log("hisprojectlist",hisprojectlist)
231
-               this.tableData = hisprojectlist
256
+            //    console.log("hisprojectlist",hisprojectlist)
257
+            //    this.tableData = hisprojectlist
232
              }
258
              }
233
           })   
259
           })   
234
         },
260
         },
244
           return name
270
           return name
245
         },
271
         },
246
        addProjectList(){
272
        addProjectList(){
273
+           
274
+           console.log("表格",this.tableData)
247
             const params = {
275
             const params = {
248
               id:this.form.project_detail,
276
               id:this.form.project_detail,
249
               number:parseInt(this.form.number)
277
               number:parseInt(this.form.number)
252
           addProjectList(params).then(response=>{
280
           addProjectList(params).then(response=>{
253
              if(response.data.state == 1){
281
              if(response.data.state == 1){
254
                var projectList = response.data.data.projectList
282
                var projectList = response.data.data.projectList
283
+               projectList.number = parseInt(this.form.number)
284
+               this.tableData.push(projectList)
285
+               console.log("23333",this.tableData)
255
                this.$message.success("保存成功")
286
                this.$message.success("保存成功")
256
                this.form.project_detail = ""
287
                this.form.project_detail = ""
257
                this.form.number = ""
288
                this.form.number = ""

+ 6 - 6
src/xt_pages/data/components/editProject.vue Näytä tiedosto

260
             },
260
             },
261
             rules: {
261
             rules: {
262
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
262
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
263
-                pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
264
-                wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
263
+                // pinyin: [{ required: true, message: '请填写拼音' , trigger: 'blur' }],
264
+                // wubi: [{ required: true, message: '请填写五笔' , trigger: 'blur' }],
265
                 price: [{ required: true, message: '请填写价格', trigger: 'change' }],
265
                 price: [{ required: true, message: '请填写价格', trigger: 'change' }],
266
                 unit: [{ required: true, message: '请填写单位',trigger: 'blur' }],
266
                 unit: [{ required: true, message: '请填写单位',trigger: 'blur' }],
267
                 cost_classify: [{ required: true, message: '请填写费用类别',trigger: 'blur' }],
267
                 cost_classify: [{ required: true, message: '请填写费用类别',trigger: 'blur' }],
295
           return getDictionaryDataConfig(module, filed_name)
295
           return getDictionaryDataConfig(module, filed_name)
296
        },
296
        },
297
        getProjectDetail(id){
297
        getProjectDetail(id){
298
-           console.log("id",id)
298
+        
299
          getProjectDetail(id).then(response=>{
299
          getProjectDetail(id).then(response=>{
300
             if(response.data.state == 1){
300
             if(response.data.state == 1){
301
               var projecDetail =  response.data.data.projecDetail
301
               var projecDetail =  response.data.data.projecDetail
310
               this.form.executive_section = projecDetail.executive_section
310
               this.form.executive_section = projecDetail.executive_section
311
               this.form.medical_coverage = projecDetail.medical_coverage
311
               this.form.medical_coverage = projecDetail.medical_coverage
312
               this.form.statistical_classification =projecDetail.statistical_classification
312
               this.form.statistical_classification =projecDetail.statistical_classification
313
-              this.form.disease_directory = projecDetail.disease_directory
314
-              this.form.is_record = projecDetail.is_record
313
+              this.form.disease_directory = projecDetail.disease_directory?projecDetail.disease_directory:""
314
+              this.form.is_record = projecDetail.is_record?projecDetail.is_record:""
315
               this.form.medical_code = projecDetail.medical_code
315
               this.form.medical_code = projecDetail.medical_code
316
-              this.form.tube_color = projecDetail.tube_color
316
+              this.form.tube_color = projecDetail.tube_color?projecDetail.tube_color:""
317
               this.form.medical_status = projecDetail.medical_status
317
               this.form.medical_status = projecDetail.medical_status
318
               this.form.remark = projecDetail.remark
318
               this.form.remark = projecDetail.remark
319
               this.form.sign = projecDetail.sign
319
               this.form.sign = projecDetail.sign

+ 1 - 0
src/xt_pages/data/components/inspection.vue Näytä tiedosto

140
              if(response.data.state == 1){
140
              if(response.data.state == 1){
141
                var projectTeamList =  response.data.data.projectTeamList
141
                var projectTeamList =  response.data.data.projectTeamList
142
                console.log("projectteamlist",projectTeamList)
142
                console.log("projectteamlist",projectTeamList)
143
+               
143
                this.tableData = projectTeamList
144
                this.tableData = projectTeamList
144
                var total  =  response.data.data.total
145
                var total  =  response.data.data.total
145
                this.total = total
146
                this.total = total

+ 23 - 54
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Näytä tiedosto

341
             </el-form-item>
341
             </el-form-item>
342
           </el-col>
342
           </el-col>
343
 
343
 
344
-          <!--          <el-col :span="8" v-if="isShows('透析器/灌流器')">-->
345
-          <!--            <el-form-item label="透析器/灌流器:">-->
346
-          <!--              <el-input-->
347
-          <!--                v-model="dialysisPrescription.dialyzer_perfusion_apparatus"-->
348
-          <!--              ></el-input>-->
349
-          <!--            </el-form-item>-->
350
-          <!--          </el-col>-->
344
+      
351
 
345
 
352
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
346
           <el-col :span="8" v-if="isShows('透析器/灌流器')">
353
             <el-form-item label="透析器/灌流器">
347
             <el-form-item label="透析器/灌流器">
354
-
355
               <el-input v-model="dialysisPrescription.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
348
               <el-input v-model="dialysisPrescription.dialyzer_perfusion_apparatus" @focus="showInnerDialog('5')"></el-input>
356
-
357
-              <!--<el-select-->
358
-                <!--v-model="dialysisPrescription.dialyzer_perfusion_apparatus"-->
359
-                <!--placeholder="请选择"-->
360
-                <!--style="width:100%;"-->
361
-              <!--&gt;-->
362
-                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
363
-
364
-                <!--<el-option-->
365
-                  <!--v-for="(item, index) in dialyzerPerfusionApparatus"-->
366
-                  <!--:label="item.name"-->
367
-                  <!--:key="index+'r'"-->
368
-                  <!--:value="item.id"-->
369
-                <!--&gt;</el-option>-->
370
-              <!--</el-select>-->
371
             </el-form-item>
349
             </el-form-item>
372
           </el-col>
350
           </el-col>
373
 
351
 
352
+          <!-- <el-col :span="8" v-if="isShows('透析器')">
353
+             <el-form-item label="透析器:">
354
+                  <el-input v-model="dialysisPrescription.dialyzers" @focus="showInnerDialog('7')"></el-input>
355
+             </el-form-item>
356
+          </el-col>
357
+
358
359
+          <el-col :span="8" v-if="isShows('灌流器')">
360
+             <el-form-item label="灌流器:">
361
+                  <el-input v-model="dialysisPrescription.irrigation" @focus="showInnerDialog('8')"></el-input>
362
+             </el-form-item>
363
+          </el-col> -->
364
+
374
           <el-col :span="8" v-if="isShows('体液过多症状')">
365
           <el-col :span="8" v-if="isShows('体液过多症状')">
375
             <el-form-item label="体液过多症状:">
366
             <el-form-item label="体液过多症状:">
376
               <el-select
367
               <el-select
1271
           nucleoprotamine:"",//鱼精蛋白
1262
           nucleoprotamine:"",//鱼精蛋白
1272
           no_heparin_remarks:"",
1263
           no_heparin_remarks:"",
1273
           blood:"",
1264
           blood:"",
1265
+          irrigation:""
1274
         },
1266
         },
1275
 
1267
 
1276
         anticoagulant: {
1268
         anticoagulant: {
1291
 
1283
 
1292
         doctorAdvices: [],
1284
         doctorAdvices: [],
1293
         dialyzerPerfusionApparatus: [],
1285
         dialyzerPerfusionApparatus: [],
1294
-        bloods:[]
1286
+        bloods:[],
1287
+        irrigation:[],
1288
+        dialyzers:[],
1295
       }
1289
       }
1296
     },
1290
     },
1297
     methods: {
1291
     methods: {
1333
             this.InnerDialogProps.titles = '抽血'
1327
             this.InnerDialogProps.titles = '抽血'
1334
             this.InnerDialogProps.type = 'blood'
1328
             this.InnerDialogProps.type = 'blood'
1335
             this.InnerDialogProps.selected = this.dialysisPrescription.blood
1329
             this.InnerDialogProps.selected = this.dialysisPrescription.blood
1336
-            this.InnerDialogProps.isShowTextArea = false
1337
-            // if(this.dialysisPrescription.blood !="" || dialysisPrescription.blood !=undefined ){
1338
-            //     var arr = this.dialysisPrescription.blood
1339
-            //     var newArr =  arr.split(",")
1340
-            //     console.log("抽血",newArr)
1341
-            //     var Arr = []
1342
-            //     for(let i=0;i<newArr.length;i++){
1343
-            //       for(let j=0;j<this.bloods.length;j++){
1344
-            //         var newarr = newArr[i].toUpperCase()
1345
-
1346
-            //         var dialy = this.bloods[j].name.toUpperCase()
1347
-
1348
-            //         if(newarr == dialy){
1349
-            //             Arr.push(this.bloods[j].name)
1350
-            //         }
1351
-            //       }
1352
-            //     }
1353
-            //     var arrtwo = Arr.join(",")
1354
-            //     console.log("Arr",arrtwo)
1355
-            //     this.InnerDialogProps.values = this.bloods
1356
-            //     this.InnerDialogProps.titles = '抽血'
1357
-            //     this.InnerDialogProps.type = 'blood'
1358
-            //     this.InnerDialogProps.selected = arrtwo
1359
-            //     this.InnerDialogProps.isShowTextArea = false
1360
-            //     break
1361
-            // }
1330
+            this.InnerDialogProps.isShowTextArea = false    
1331
+          
1332
+           case '7': // 透析器
1333
+          
1362
         }
1334
         }
1363
       },
1335
       },
1364
       innerDialogComfirm: function(val) {
1336
       innerDialogComfirm: function(val) {
1420
       },
1392
       },
1421
       setLastRecord: function(schedual,lastAssessmentAfterDislysis,lastPredialysisEvaluation,lastDialysisPrescribe,lastDryWeightDislysis,system_prescribe) {
1393
       setLastRecord: function(schedual,lastAssessmentAfterDislysis,lastPredialysisEvaluation,lastDialysisPrescribe,lastDryWeightDislysis,system_prescribe) {
1422
 
1394
 
1423
-
1424
         this.treatment_mode = this.$store.getters.treatment_mode
1395
         this.treatment_mode = this.$store.getters.treatment_mode
1425
         // console.log("99999",this.treatment_mode)
1396
         // console.log("99999",this.treatment_mode)
1426
         this.perfusion_apparatus = getDataConfig(
1397
         this.perfusion_apparatus = getDataConfig(
1938
         this.isVisibility = false
1909
         this.isVisibility = false
1939
       },
1910
       },
1940
       changeThisAnticoagulant: function(val) {
1911
       changeThisAnticoagulant: function(val) {
1941
-        console.log("val-----",val)
1912
+        
1942
         var thismode = val
1913
         var thismode = val
1943
         if (isNaN(thismode) || thismode <= 0) {
1914
         if (isNaN(thismode) || thismode <= 0) {
1944
           return false
1915
           return false
1986
 
1957
 
1987
         this.is_pre = 1
1958
         this.is_pre = 1
1988
 
1959
 
1989
-        console.log("99999",this.prescription.id)
1990
-        console.log("open",this.is_open)
1991
         if (this.prescription.id == 0) {
1960
         if (this.prescription.id == 0) {
1992
           if (this.is_open == 0) {
1961
           if (this.is_open == 0) {
1993
             if (this.patient.id <= 0) {
1962
             if (this.patient.id <= 0) {

+ 4 - 1
src/xt_pages/dialysis/details/index.vue Näytä tiedosto

675
       showView:false,
675
       showView:false,
676
       curPatient:{},
676
       curPatient:{},
677
 
677
 
678
-      queueConfig:{}
678
+      queueConfig:{},
679
+      stockType:[]
679
     }
680
     }
680
   },
681
   },
681
   created() {
682
   created() {
1120
           console.log(this.his_is_open)
1121
           console.log(this.his_is_open)
1121
           
1122
           
1122
           // var stockType =  resp.data.stockType
1123
           // var stockType =  resp.data.stockType
1124
+          // this.stockType = stockType
1123
           // console.log("stockTYPW",stockType)
1125
           // console.log("stockTYPW",stockType)
1126
+          
1124
           for (let i = 0; i <  this.doctor_advices.length; i++){
1127
           for (let i = 0; i <  this.doctor_advices.length; i++){
1125
             this.doctor_advices[i]['origin'] = 1
1128
             this.doctor_advices[i]['origin'] = 1
1126
           }
1129
           }

+ 1 - 1
src/xt_pages/outpatientDoctorStation/template/printOne.vue Näytä tiedosto

53
                  <p>配对:</p>
53
                  <p>配对:</p>
54
                  <p>核对:</p>
54
                  <p>核对:</p>
55
                  <p>发药:</p>
55
                  <p>发药:</p>
56
-                 <p>药费:{{getTotalOne(item.id)?getTotalOne(item.id):0}}元</p>
56
+                 <p>药费:{{getTotalOne(item.id).toFixed(2)?getTotalOne(item.id).toFixed(2):0}}元</p>
57
           </div>
57
           </div>
58
           <div style="page-break-after:always"></div>
58
           <div style="page-break-after:always"></div>
59
       </div>
59
       </div>

+ 1 - 1
src/xt_pages/outpatientDoctorStation/treatTemplate/printOne.vue Näytä tiedosto

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