Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/user/components/PatientDetail.vue

@@ -1030,6 +1030,22 @@
        </el-col>
       </el-row>
 
+      <el-row>
+        <el-col>
+            <el-form-item label="病历图册:" prop="gallery">
+             <div style="display: flex;">
+              <div v-for="item in fileList" style="margin-left: 10px;">
+                <el-image 
+                  style="width: 100px; height: 100px"
+                  :src="item" 
+                  :preview-src-list="fileList">
+               </el-image>
+              </div>
+             </div>
+            </el-form-item>
+        </el-col>
+      </el-row>
+
     </el-form>
     <!-- 打印预览 style="display: none"-->
     <div style="display: none">
@@ -1669,6 +1685,7 @@ const defaultForm = {
   print_date:"",
   famality_record:"",
   patient_type:"",
+  org_logo:"",
 };
 
 export default {
@@ -1776,6 +1793,8 @@ export default {
       liuAddresslist:[],
       patientVascularAccessOne:{},
       patientType: [{ value: 1, label: "血透患者" }, { value: 2, label: "慢病患者" }, { value: 3, label: "会员患者" },{ value: 4, label: "腹透患者" },{ value: 5, label: "CKD患者" },{ value: 6, label: "其他患者" }],
+      fileList:[],
+      guploading:false,
     };
   },
   computed: {
@@ -1916,6 +1935,7 @@ export default {
         }
       });
     },
+   
     fetchPatient(id) {
       fetchPatient(id)
         .then((response) => {
@@ -2062,6 +2082,19 @@ export default {
             this.form.tell_phone = patietInfo.tell_phone;
             this.form.dialysis_age = patietInfo.dialysis_age;
             this.form.record_number = patietInfo.record_number
+            this.fileList = []
+            var arrNew = []
+            if(patietInfo.org_logo!=""){
+              arrNew = patietInfo.org_logo.split(",")
+            }
+            if(arrNew!=null){
+              for(let i=0;i<arrNew.length;i++){
+                if(arrNew[i]!=""){
+                  this.fileList.push(arrNew[i])
+                }
+              }
+            }
+            console.log("----------------------------",this.fileList)
             if (patietInfo.expense_kind == 0) {
               this.form.expense_kind = "";
             } else {

src/xt_pages/user/components/PatientForm.vue

@@ -1075,6 +1075,26 @@
           </el-form-item>
        </el-col>
       </el-row>
+
+      <el-row>
+        <el-col>
+            <el-form-item label="病历图册:" prop="gallery">
+                <el-upload
+                    v-loading="guploading"
+                    :data="uploadData"
+                    action="https://upload.qiniup.com"
+                    list-type="picture-card"
+                    :file-list="fileList"
+                    :on-remove="handleRemove"
+                    :on-error="handleGalleryError"
+                    :on-success="handleGallerySuccess"
+                    :before-upload="beforeGalleryUpload">
+                    <i class="el-icon-plus"></i>
+                </el-upload>
+                
+            </el-form-item>
+        </el-col>
+      </el-row>
       
        <el-row>
           <el-col :span="24" align="right" class="newCol">
@@ -1140,7 +1160,6 @@ import {
 import { fetchAllAdminUsers } from "@/api/doctor";
 // import { fetchAllDoctorAndNurse } from "@/api/doctor";
 import { getDataConfig } from "@/utils/data";
-
 const defaultForm = {
   avatar: "https://images.shengws.com/201809182128111.png",
   name: "",
@@ -1205,6 +1224,7 @@ const defaultForm = {
   allergic_history:"",
   print_date:"",
   famality_record:"",
+  org_logo:"",
   formItem: [
     {
       id: 0,
@@ -1355,6 +1375,7 @@ const defaultForm = {
   dbp: "",
   showOne:true,
   treatment_plan:"",
+  
 };
 
 export default {
@@ -1540,7 +1561,13 @@ export default {
       },
       adminUserOptions:[],
       org_id:0,
-      liuAddresslist:[]
+      liuAddresslist:[],
+      formloading:false,
+      uploading:false,
+      guploading:false,
+      formsubmit:false,
+      loadingText:'',
+      fileList:[],
     };
   },
   components: {
@@ -1636,6 +1663,105 @@ export default {
     // }
   },
   methods: {
+    handleAvatarSuccessOne(res, file) {
+            this.form.org_logo = this.qiniuDomain + res.url;
+            this.uploading = false;
+        },
+        beforeAvatarUploadOne(file) {
+            var fileType = file.type
+            const isJPG = fileType.indexOf('image') > -1
+            const isLt2M = file.size / 1024 / 1024 < 5
+
+            if (!isJPG) {
+                this.$message.error('只能上传图片')
+                return false
+            }
+            if (!isLt2M) {
+                this.$message.error('上传头像图片大小不能超过 5MB!')
+                return false
+            }
+
+            var date = new Date()
+            var ext = getFileExtension(file.name)
+            var key = "" + date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_o_' + file.uid + '.' + ext;
+            this.uploading = true;
+            this.loadingText = '机构头像上传中'
+
+            const _self = this
+            return new Promise((resolve, reject) => {
+                getToken().then(response => {
+                    const token = response.data.data.uptoken
+                    _self._data.uploadData.token = token
+                    _self._data.uploadData.key = key
+                    resolve(true)
+                }).catch(err => {
+                    reject(false)
+                    this.uploading = false;
+                })
+            })
+        },
+        handleGalleryError(err, file, fileList) {
+            this.$message.error(err);
+            this.guploading = false;
+            return false
+        },
+        handleGallerySuccess(res, file) {
+            var data = {type:1, url: this.qiniuDomain + res.url};
+            // this.fileList.push(data.url)
+            // if(this.fileList!=null){
+            //   for(let i=0;i<this.fileList.length;i++){
+            //      this.form.org_logo += this.fileList[i].url+","
+            //   }
+            // }
+           console.log("hahahahhwoowowo",this.form.org_logo)
+           this.form.org_logo += data.url+","
+
+            this.guploading = false;
+        },
+    beforeGalleryUpload(file) {
+        var fileType = file.type
+        const isJPG = fileType.indexOf('image') > -1
+        const isLt100M = file.size / 1024 / 1024 < 100
+
+        if (!isJPG) {
+            this.$message.error('只能上传图片')
+            return false
+        }
+        if (!isLt100M) {
+            this.$message.error('上传图片大小不能超过 100MB!')
+            return false
+        }
+
+        var date = new Date()
+        var ext = getFileExtension(file.name)
+        var key = ""+date.getFullYear() + (date.getMonth() + 1) + date.getDate() + date.getHours()  + date.getMinutes()  + date.getSeconds()  +'_g_' + file.uid + '.' + ext;
+        this.guploading = true;
+        this.loadingText = '机构图册上传中'
+
+        const _self = this
+        return new Promise((resolve, reject) => {
+            getToken().then(response => {
+                const token = response.data.data.uptoken
+                _self._data.uploadData.token = token
+                _self._data.uploadData.key = key
+                resolve(true)
+            }).catch(err => {
+                reject(false)
+                this.guploading = false;
+            })
+        })
+    },
+
+    handleRemove(file, fileList) {
+      console.log("fileList--------------",fileList)
+      var log_str = ""
+      for(let i=0;i<fileList.length;i++){
+          log_str +=fileList[i].url+","
+      }
+      this.form.org_logo = ""
+      this.form.org_logo = log_str
+    
+    },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then((response) => {
         if (response.data.state === 1) {
@@ -1735,10 +1861,9 @@ export default {
             if(this.form.patient_type >0){
                this.form.patient_type = parseInt(this.form.patient_type)
             }
-
-            editPatient(this.patientID, this.form)
-
-              .then(response => {
+            console.log("form===============",this.form)
+            
+            editPatient(this.patientID, this.form).then(response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg);
                   this.formSubmit = true;
@@ -1938,6 +2063,20 @@ export default {
           if (response.data.state == 1) {
             this.$emit("tran-patient-info", response.data.data.patient);
             var patietInfo = response.data.data.patient;
+            this.fileList = []
+            var arrNew = []
+            if(patietInfo.org_logo!=""){
+              arrNew = patietInfo.org_logo.split(",")
+            }
+            if(arrNew!=null){
+              for(let i=0;i<arrNew.length;i++){
+                if(arrNew[i]!=""){
+                  var image = { name:i+1, url:arrNew[i]+'?vframe/jpg/offset/0/w/100/h/100'};
+                  this.fileList.push(image)
+                }
+              }
+            }
+            console.log("---------------------",this.fileList)
             console.log("9999999",response.data.data.patient)
             this.form.avatar = patietInfo.avatar;
             this.form.name = patietInfo.name;