WXL
2 天以前 b6c854df0d7baa3e2f375306102b906eee127f3d
测试完成
已修改3个文件
104 ■■■■ 文件已修改
src/views/login.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/patient/propaganda/Missioncreation.vue 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sfstatistics/percentage/index.vue 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/login.vue
@@ -195,9 +195,12 @@
          // this.loginForm.orgid = '1',
          this.$store
            .dispatch("Login", this.loginForm)
            .then(() => {
              // this.$router.push({ path: this.redirect || "/" }).catch(() => {});
              this.$router.push({ path:"/followvisit/discharge" }).catch(() => {});
            .then((res) => {
              if (this.loginForm.username=='admin') {
              this.$router.push({ path:"/index" }).catch(() => {});
              }else{
                this.$router.push({ path:"/followvisit/discharge" }).catch(() => {});
              }
            })
            .catch(() => {
              this.loading = false;
src/views/patient/propaganda/Missioncreation.vue
@@ -124,14 +124,30 @@
                      </el-select> </el-form-item
                  ></el-col>
                </el-row>
                <el-form-item label="发送设置:" v-if="currenttype != 2">
                    <el-form-item label="执行周期" prop="longTask">
                  <el-radio-group v-model="form.longTask">
                    <el-radio :label="0">自定义周期</el-radio>
                    <el-radio :label="1">长期任务</el-radio>
                  </el-radio-group>
                </el-form-item>
                <el-row :gutter="20" v-if="form.longTask">
                  <el-col :span="8">
                    <el-form-item label="周期时间" prop="name">
                      <el-input
                        v-model="form.sendDay"
                        placeholder="默认5天后"
                      ></el-input>
                    </el-form-item>
                  </el-col>
                </el-row>
                <el-form-item label="执行设置" v-if="!form.longTask">
                  <el-radio-group v-model="form.sendType">
                    <el-radio :label="1">时间段发送</el-radio>
                    <el-radio :label="3">时间点发送</el-radio>
                    <el-radio :label="2">即刻发送</el-radio>
                  </el-radio-group>
                </el-form-item>
                <el-form-item label="发送日期:" v-if="form.sendType == 1">
                <el-form-item label="执行日期:" v-if="form.sendType == 1&& !form.longTask">
                  <el-date-picker
                    v-model="daytime"
                    @change="changeTimeday"
@@ -144,7 +160,7 @@
                  </el-date-picker>
                </el-form-item>
                <el-form-item label="发送时间点:" v-if="form.sendType == 3">
                <el-form-item label="执行时间点:" v-if="form.sendType == 3&& !form.longTask">
                  <div style="display: flex">
                    <div style="margin-right: 10px">
                      <el-date-picker
@@ -159,7 +175,7 @@
                  </div>
                </el-form-item>
                <el-form-item label="发送时间段:" v-if="form.sendType == 1">
                <el-form-item label="执行时间段:" v-if="form.sendType == 1&& !form.longTask">
                  <div style="display: flex">
                    <div style="margin-right: 10px">
                      <span style="font-size: 18px; margin-right: 10px">①</span>
@@ -919,6 +935,7 @@
      form: {
        patTaskRelevances: [],
        sendType: 1,
        longTask: 0,
        templatename: "",
        templateid: null,
        libtemplateid: null,
src/views/sfstatistics/percentage/index.vue
@@ -44,16 +44,11 @@
              v-show="showSearch"
              label-width="98px"
            >
              <!-- <el-form-item label="医院" prop="userName">
                <el-select v-model="queryParams.value1" placeholder="请选择">
                  <el-option
                    v-for="item in options"
                    :key="item.value"
                    :label="item.label"
                    :value="item.value"
                  >
                  </el-option>
                </el-select>
              <!-- <el-form-item label="责任医生" prop="userName">
                <el-input
                  v-model="queryParams.drname"
                  placeholder="请输入主治医生"
                ></el-input>
              </el-form-item> -->
              <el-form-item label="统计类型" prop="userName">
                <el-select
@@ -150,7 +145,7 @@
                >
              </el-form-item>
              <el-col :span="19">
              <el-button
                <el-button
                  type="warning"
                  plain
                  icon="el-icon-download"
@@ -158,7 +153,7 @@
                  @click="handleExport"
                  >导出</el-button
                >
          </el-col>
              </el-col>
            </el-form>
            <!-- <right-toolbar
          :showSearch.sync="showSearch"
@@ -708,6 +703,10 @@
      postOptions: [],
      // 角色选项
      roleOptions: [],
      // 存储所有科室代码
      allDeptCodes: [],
      // 存储所有病区代码
      allWardCodes: [],
      // 表单参数
      form: {},
      forms: {
@@ -784,6 +783,8 @@
        serviceType: [2],
        dateRange: [],
        statisticaltype: 1,
        leavehospitaldistrictcodes: ["all"], // 默认选中全部病区
        deptcodes: ["all"], // 默认选中全部科室
      },
      // 列信息
      columns: [
@@ -799,14 +800,30 @@
  },
  watch: {},
  created() {
    this.getList();
    this.getDeptTree();
    this.getList();
  },
  methods: {
    /** 查询标签列表 */
    getList() {
      getSfStatistics(this.queryParams).then((response) => {
      // 处理查询参数
      const params = {
        ...this.queryParams,
        // 如果选择了"全部",则传所有病区/科室代码
        leavehospitaldistrictcodes:
          this.queryParams.leavehospitaldistrictcodes.includes("all")
            ? this.allWardCodes
            : this.queryParams.leavehospitaldistrictcodes,
        deptcodes: this.queryParams.deptcodes.includes("all")
          ? this.allDeptCodes
          : this.queryParams.deptcodes,
      };
      // 移除可能存在的"all"值
      delete params.leavehospitaldistrictcodes.all;
      delete params.deptcodes.all;
      getSfStatistics(params).then((response) => {
        console.log(response);
        // this.total = response.total;
        this.userList = response.data;
@@ -834,17 +851,26 @@
          value: dept.deptCode,
        };
      });
      this.flatArrayhospit = store.getters.belongWards.map((dept) => {
      // 存储所有科室代码
      this.allDeptCodes = store.getters.belongDepts.map(
        (dept) => dept.deptCode
      );
      // 病区列表
      this.flatArrayhospit = store.getters.belongWards.map((ward) => {
        return {
          label: dept.districtName,
          value: dept.districtCode,
          label: ward.districtName,
          value: ward.districtCode,
        };
      });
      // deptTreeSelect().then((response) => {
      //   this.deptOptions = response.data;
      //   console.log(this.deptOptions, " this.deptOptions");
      //   this.flatArray = this.flattenArray(response.data);
      // });
      // 存储所有病区代码
      this.allWardCodes = store.getters.belongWards.map(
        (ward) => ward.districtCode
      );
      this.flatArraydept.push({ label: "全部", value: "all" });
      this.flatArrayhospit.push({ label: "全部", value: "all" });
    },
    flattenArray(multiArray) {
      let result = [];