Browse Source

import

master
pengjun 2 years ago
parent
commit
58dda1df7d
  1. 4
      src/assets/css/global_dialog.css
  2. 2
      src/components/common/MedicalPackageAsbitem.vue
  3. 2
      src/components/patientRegister/PatientRegisterList.vue
  4. 2
      src/components/report/CusOrgOCX.vue
  5. 855
      src/views/customerOrg/patientRegisterImport.vue

4
src/assets/css/global_dialog.css

@ -18,7 +18,7 @@
} }
.el-dialog__body { .el-dialog__body {
padding: 10px 10px 20px; /*原始: 30px 20px;*/
padding: 10px 10px; /*原始: 30px 20px;*/
/* /*
color: #606266; color: #606266;
font-size: 14px; font-size: 14px;
@ -28,7 +28,7 @@
.el-dialog__footer { .el-dialog__footer {
padding: 0px 10px 20px; /*原始: 10px 20px 20px*/
padding: 0px 10px 10px; /*原始: 10px 20px 20px*/
/* /*
text-align: right; text-align: right;
box-sizing: border-box; box-sizing: border-box;

2
src/components/common/MedicalPackageAsbitem.vue

@ -744,7 +744,7 @@ export default {
this.medicalPackageAsbitems.forEach(e =>{ this.medicalPackageAsbitems.forEach(e =>{
body.details.push({ body.details.push({
medicalPackageId:this.formData.id, medicalPackageId:this.formData.id,
asbitemId:e.id, //e.asbitemId
asbitemId:e.id||e.asbitemId,
price:e.medicalPackageDetailPrice, price:e.medicalPackageDetailPrice,
amount:e.medicalPackageDetailAmount amount:e.medicalPackageDetailAmount
}) })

2
src/components/patientRegister/PatientRegisterList.vue

@ -472,7 +472,7 @@ export default {
return { return {
peisid:null, peisid:null,
startPoint: -1, // -1 startPoint: -1, // -1
endPoint: -1, // -1
endPoint: -1, // -1
multipleSelection: [], // multipleSelection: [], //
dialogVisible: false, dialogVisible: false,

2
src/components/report/CusOrgOCX.vue

@ -278,7 +278,7 @@ export default {
}, },
//
//
getCustGroup(index, groupId) { getCustGroup(index, groupId) {
///api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=3fa85f64-5717-4562-b3fc-2c963f66afa6 ///api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=3fa85f64-5717-4562-b3fc-2c963f66afa6
getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${groupId}`).then(res => { getapi(`/api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${groupId}`).then(res => {

855
src/views/customerOrg/patientRegisterImport.vue
File diff suppressed because it is too large
View File

Loading…
Cancel
Save