WXL (wul)
26 分钟以前 5a554d0121b2b0491142a18edbcbaa0cebe30ab3
测试完成
已重命名1个文件
已修改4个文件
已添加1个文件
44 ■■■■ 文件已修改
shiyi.zip 补丁 | 查看 | 原始文档 | blame | 历史
src/store/modules/user.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login-ls.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/patient/propaganda/particty.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
shiyi.zip
Binary files differ
src/store/modules/user.js
@@ -128,6 +128,8 @@
      const campusid = userInfo.campusid;
      const orgid = userInfo.orgid;
      console.log(orgid, campusid, "88");
      return new Promise((resolve, reject) => {
        login(username, password, code, orgid, campusid)
          .then((res) => {
@@ -212,7 +214,7 @@
              localStorage.setItem("deptCode", "");
              localStorage.setItem("YongHuID", "");
              localStorage.setItem("YongHuXM", "");
            } else if (orgid == "2"&&campusid==2) {
            } else if (orgid == "1" && campusid == 2) {
              localStorage.setItem("orgname", "杭州市第一人民医院吴山院区");
              localStorage.setItem("ZuHuID", "");
              localStorage.setItem("deptCode", "");
src/views/login-ls.vue
ÎļþÃû´Ó src/views/login-sy.vue ÐÞ¸Ä
@@ -37,10 +37,10 @@
        </el-input>
      </el-form-item>
      <!-- ä¸½===================æ°´ -->
      <el-form-item prop="medicalCode">
      <el-form-item prop="orgid">
        <el-select
          style="width: 100%"
          v-model="loginForm.medicalCode"
          v-model="loginForm.orgid"
          placeholder="请选择院区"
        >
          <el-option
@@ -168,8 +168,7 @@
      getorganization().then((res) => {
        if (res.code == 200) {
          this.options = res.rows.map((item) => ({
            value: item.medicalCode,
            // value: item.medicalCode,
            value: item.orgid,
            label: item.organizationName,
          }));
        }
@@ -206,19 +205,14 @@
      }
      // åŠ¨æ€è®¾ç½® campusid å‚æ•°
      const selectedOrg = this.options.find(item => item.value === this.loginForm.medicalCode);
      console.log(selectedOrg);
      const selectedOrg = this.options.find(item => item.value === this.loginForm.orgid);
      if (selectedOrg) {
        if (selectedOrg.label.includes('湖滨')) {
          this.loginForm.campusid = 1;
          this.loginForm.orgid = 1;
        } else if (selectedOrg.label.includes('吴山')) {
          this.loginForm.campusid = 2;
          this.loginForm.orgid = 1;
        } else {
          this.loginForm.campusid = 1; // é»˜è®¤å€¼æˆ–其他处理
          this.loginForm.orgid = 1;
        }
      }
src/views/login.vue
@@ -37,10 +37,10 @@
        </el-input>
      </el-form-item>
      <!-- ä¸½===================æ°´ -->
      <el-form-item prop="orgid">
      <el-form-item prop="medicalCode">
        <el-select
          style="width: 100%"
          v-model="loginForm.orgid"
          v-model="loginForm.medicalCode"
          placeholder="请选择院区"
        >
          <el-option
@@ -168,7 +168,8 @@
      getorganization().then((res) => {
        if (res.code == 200) {
          this.options = res.rows.map((item) => ({
            value: item.orgid,
            value: item.medicalCode,
            // value: item.medicalCode,
            label: item.organizationName,
          }));
        }
@@ -205,14 +206,19 @@
      }
      // åŠ¨æ€è®¾ç½® campusid å‚æ•°
      const selectedOrg = this.options.find(item => item.value === this.loginForm.orgid);
      const selectedOrg = this.options.find(item => item.value === this.loginForm.medicalCode);
      console.log(selectedOrg);
      if (selectedOrg) {
        if (selectedOrg.label.includes('湖滨')) {
          this.loginForm.campusid = 1;
          this.loginForm.orgid = 1;
        } else if (selectedOrg.label.includes('吴山')) {
          this.loginForm.campusid = 2;
          this.loginForm.orgid = 1;
        } else {
          this.loginForm.campusid = 1; // é»˜è®¤å€¼æˆ–其他处理
          this.loginForm.orgid = 1;
        }
      }
src/views/patient/propaganda/particty.vue
@@ -1309,7 +1309,7 @@
      };
      this.currenttype = this.$route.query.type;
      this.title = "随访内容列表";
      this.tableLabel = this.tableLabelwj;
      this.tableLabel = this.tableLabelwj||[];
      if (this.form.serviceType == 1) {
        this.checkboxlist = [
          {
@@ -1478,8 +1478,8 @@
          this.leavehospitaldistrictcodes = [];
        }
        if (this.checkList) {
          this.form.preachform = this.checkList.join(",");
          this.form.preachformList = this.selectedOrder;
          this.form.preachform = this.checkList.join(",")||[];
          this.form.preachformList = this.selectedOrder||[];
        } else {
          this.$modal.msgError("请选择服务类型");
          this.submitLoading = false;
@@ -1937,7 +1937,7 @@
              : [];
            this.overallCase = this.form.patTaskRelevances.concat();
            this.checkList = this.form.preachform.split(",") || [];
            this.selectedOrder = this.form.preachformList;
            this.selectedOrder = this.form.preachformList||[];
            this.overallCase.forEach((item) => {
              if (item.endtime) {
@@ -2284,7 +2284,7 @@
      });
    },
    checkSelectionChange(selectedValues, selectedOrder) {
      this.selectedOrder = selectedValues;
      this.selectedOrder = selectedValues||[];
      console.log("当前选中:", selectedValues);
      console.log("选中顺序:", selectedOrder);
    },
vue.config.js
@@ -36,7 +36,7 @@
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        // target: `https://www.health-y.cn/lssf`,
        // target: `http://192.168.100.10:8096`,
        // target: `http://192.168.100.10:8098`,
        // target: `http://192.168.100.10:8094`,//省立同德
        // target: `http://192.168.100.10:8095`,//新华
        target:`http://localhost:8095`,