WXL
2024-11-27 a520895c5b01934a7210917d52cbe98455cba33b
档案页详情优化
已添加1个文件
已修改5个文件
160 ■■■■■ 文件已修改
dist (2).zip 补丁 | 查看 | 原始文档 | blame | 历史
src/components/Address/index.vue 126 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/getters.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/modules/user.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donationdetails/index.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/indexstatistics/index.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
dist (2).zip
Binary files differ
src/components/Address/index.vue
@@ -50,18 +50,20 @@
<script>
// 使用说明:v-model时,必须传带有带有省,市,区拼音的字段
import request from '@/utils/request'
import request from "@/utils/request";
import store from "@/store";
export default {
  name: "li_area_select",
  //通过 model 选项配置子组件接收的 prop 名以及派发的事件名
  model: {
    prop: "caddress",
    event: "change",
    event: "change"
  },
  props: {
    caddress: {
      type: Object,
    },
      type: Object
    }
  },
  data() {
    return {
@@ -69,7 +71,7 @@
      //areaJson: './../address.json',
      addressArray: [], //所有数据
      cityArray: [],
      areaArray: [],
      areaArray: []
    };
  },
  created() {
@@ -78,34 +80,58 @@
  methods: {
    getAddressData() {
      var that = this;
      request({
        url: that.areaJson,
        method: "get",
      }).then(function (response) {
        if (response.code === 200) {
          //获取地址
      console.log(store.getters.addressArray,'addressArray');
          that.addressArray = response.data;
          //默认值赋值获取城市数组
          if (that.caddress.sheng) {
            for (let ad of that.addressArray) {
              if (ad.areaname === that.caddress.sheng) {
                that.cityArray = ad.subarea;
                //---
                //默认赋值获取区域数组
                if (that.caddress.shi) {
                  for (let area of that.cityArray) {
                    if (area.areaname === that.caddress.shi) {
                      that.areaArray = area.subarea;
                      break;
                    }
      if (store.getters.addressArray.length) {
        that.addressArray = store.getters.addressArray.length;
        //默认值赋值获取城市数组
        if (that.caddress.sheng) {
          for (let ad of that.addressArray) {
            if (ad.areaname === that.caddress.sheng) {
              that.cityArray = ad.subarea;
              //---
              //默认赋值获取区域数组
              if (that.caddress.shi) {
                for (let area of that.cityArray) {
                  if (area.areaname === that.caddress.shi) {
                    that.areaArray = area.subarea;
                    break;
                  }
                }
              }
            }
          }
        }
      });
      } else {
        request({
          url: that.areaJson,
          method: "get"
        }).then(function(response) {
          if (response.code === 200) {
            //获取地址
            that.addressArray = response.data;
            //默认值赋值获取城市数组
            if (that.caddress.sheng) {
              for (let ad of that.addressArray) {
                if (ad.areaname === that.caddress.sheng) {
                  that.cityArray = ad.subarea;
                  //---
                  //默认赋值获取区域数组
                  if (that.caddress.shi) {
                    for (let area of that.cityArray) {
                      if (area.areaname === that.caddress.shi) {
                        that.areaArray = area.subarea;
                        break;
                      }
                    }
                  }
                }
              }
            }
          }
        });
      }
    },
    //选择省份
    getCityData(val) {
@@ -137,41 +163,39 @@
      this.$forceUpdate();
    },
    getSheng(){
      let list= this.addressArray.filter(r=>r.areaname ==  this.caddress.sheng);
      if(list.length>0){
    getSheng() {
      let list = this.addressArray.filter(
        r => r.areaname == this.caddress.sheng
      );
      if (list.length > 0) {
        return list[0].areacode;
      }
      else{
        return '';
      } else {
        return "";
      }
    },
     getShi(){
      let list= this.cityArray.filter(r=>r.areaname ==  this.caddress.shi);
      if(list.length>0){
    getShi() {
      let list = this.cityArray.filter(r => r.areaname == this.caddress.shi);
      if (list.length > 0) {
        return list[0].areacode;
      }
      else{
        return '';
      } else {
        return "";
      }
    },
     getQu(){
      let list= this.areaArray.filter(r=>r.areaname ==  this.caddress.qu);
      if(list.length>0){
    getQu() {
      let list = this.areaArray.filter(r => r.areaname == this.caddress.qu);
      if (list.length > 0) {
        return list[0].areacode;
      } else {
        return "";
      }
      else{
        return '';
      }
    },
    clean(){
      this.caddress.sheng="";
      this.caddress.shi="";
      this.caddress.qu="";
    clean() {
      this.caddress.sheng = "";
      this.caddress.shi = "";
      this.caddress.qu = "";
    }
  },
  }
};
</script>
<style scoped>
</style>
<style scoped></style>
src/store/getters.js
@@ -6,6 +6,7 @@
  cachedViews: state => state.tagsView.cachedViews,
  token: state => state.user.token,
  avatar: state => state.user.avatar,
  addressArray: state => state.user.addressArray,
  name: state => state.user.name,
  organization: state => state.user.organization,
  introduction: state => state.user.introduction,
src/store/modules/user.js
@@ -15,6 +15,7 @@
    roles: [],
    permissions: [],
    organization:[],
    addressArray:[],
  },
  mutations: {
@@ -36,6 +37,9 @@
    SET_ROLES: (state, roles) => {
      state.roles = roles
    },
     SET_addressArray: (state, addressArray) => {
      state.addressArray = addressArray
    },
    SET_PERMISSIONS: (state, permissions) => {
      state.permissions = permissions
    },
src/views/project/donationdetails/index.vue
@@ -2024,7 +2024,7 @@
                    align="center"
                    width="220"
                    prop="hospitalno"
                    v-if="actives == 6"
                  >
                    <template slot-scope="scope">
                      <org-selecter
@@ -2796,6 +2796,7 @@
        }
      });
      // 表单数据
      getDonatebaseinfo(this.infoid).then(response => {
        this.form = response.data;
@@ -2804,10 +2805,14 @@
        } else {
          this.showTerminationBtn = 0;
        }
        this.actives = response.data.workflow;
        this.workflow = response.data.workflow;
        response.data.sex = parseInt(response.data.sex);
        this.form.id = response.data.id;
        this.form.diseasetype = this.form.diseasetype.split(",");
        this.form.infectious = this.form.infectious.split(",");
        this.form.selfwill = this.form.selfwill.split(",");
@@ -2815,6 +2820,8 @@
        this.form.infosources = this.form.infosources.split(",");
        this.form.kinship = this.form.kinship.split(",");
        this.form.patientstate = this.form.patientstate.split(",");
        this.open = true;
        this.title = "人体器官潜在捐献者登记表";
        this.registerAddresss.sheng = response.data.registerprovincename;
@@ -2823,6 +2830,8 @@
        this.residenceAddresss.shi = response.data.residencecityname;
        this.residenceAddresss.qu = response.data.residencetownname;
        this.registerAddresss.qu = response.data.registertownname;
        // 获取二级表
        this.GetAttacheddata();
      });
@@ -2958,6 +2967,7 @@
        if (this.transplantdata[0] && !this.istb) {
          return;
        }
        console.log("完成登记");
        listDonatecomporgan(searchParam).then(res => {
          if (res.code == 200) {
src/views/project/indexstatistics/index.vue
@@ -602,6 +602,7 @@
import { listOrganallocation } from "@/api/project/organallocation";
import RankChart from "./components/rankbarchart";
import request from '@/utils/request'
import OrganNumChart from "./components/organnumchart";
import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
import dayjs from "dayjs";
@@ -649,6 +650,7 @@
      year: "选择年份",
      isloading: false,
      maxHeight: 0,
      areaJson: "/project/dict/treeselect", // 提前存储地址数据接口
      CommonOrgan: null,
      provinceData: [
        { label: "全部地市", value: "" },
@@ -914,6 +916,7 @@
      this.value = "杭州市";
      this.GetOrgDonateNumNew();
      this.GetOrgDonateNum();
      this.getAddressData();
    });
  },
  methods: {
@@ -938,6 +941,20 @@
        }
      });
    },
    // 提前缓存数据
    getAddressData() {
      var that = this;
      request({
        url: that.areaJson,
        method: "get",
      }).then(function (response) {
        if (response.code === 200) {
          //获取地址
          let addressArray = response.data;
          this.$store.commit('updateMyData', addressArray);
        }
      });
    },
    // 确定已读
    clickMessageDetailed(item) {
      let data = item;