测试完成

WXL

11 小时以前 4cf6b258a3b390bb89ef4f02d3bb6a7a4d261e85

测试完成

 src/components/SFtable/index.vue

@@ -33,6 +33,22 @@
      key="id"
      prop="id"
    />
    <el-table-column
    v-if="agenumber"
      label="年龄"
      align="center"
      key="age"
      prop="age"
      width="160"
    >
      <template slot-scope="scope">
        <span v-if="scope.row.age"
          >{{ scope.row.age }}{{ scope.row.ageUnit }}</span
        ><span v-if="scope.row.age2"
          >{{ scope.row.age2 }}{{ scope.row.ageUnit2 }}</span
        >
      </template>
    </el-table-column>
    <div v-for="(item, index) in tableLabel">
      <el-table-column
        v-if="item.label == '出院日期'"
@@ -197,6 +213,10 @@
      type: Boolean,
      default: true,
    },
    agenumber: {
      type: Boolean,
      default: false,
    },
    // 1模板列表 2选中患者 3患者列表
    typeinfo: {
      type: Number,

 src/views/patient/patient/index.vue

@@ -209,11 +209,15 @@
                key="age"
                prop="age"
                width="160"
              >   <template slot-scope="scope">
              <span v-if="scope.row.age">{{ scope.row.age }}{{scope.row.ageUnit }}</span><span v-if="scope.row.age2">{{ scope.row.age2 }}{{scope.row.ageUnit2 }}</span>

            </template>
          </el-table-column>
              >
                <template slot-scope="scope">
                  <span v-if="scope.row.age"
                    >{{ scope.row.age }}{{ scope.row.ageUnit }}</span
                  ><span v-if="scope.row.age2"
                    >{{ scope.row.age2 }}{{ scope.row.ageUnit2 }}</span
                  >
                </template>
              </el-table-column>
              <el-table-column
                label="出生年月"
                align="center"
@@ -968,7 +972,7 @@
        allhosp: "1",
        pageSize: 10,
        searchscope: 2,
        notrequiredFlag:0,
        notrequiredFlag: 0,
        tagname: "",
        idcardno: undefined,
        name: undefined,

 src/views/patient/propaganda/QuestionnaireTask.vue

@@ -202,7 +202,7 @@
                    <el-radio :label="1">病区关联</el-radio>
                  </el-radio-group>
                </el-form-item> -->
                <el-row >
                <el-row>
                  <el-col :span="20"
                    ><el-form-item label="适用科室" prop="region">
                      <el-select
@@ -225,7 +225,7 @@
                      </el-select> </el-form-item
                  ></el-col>
                </el-row>
                <el-row >
                <el-row>
                  <el-col :span="20"
                    ><el-form-item label="适用病区" prop="region">
                      <el-select
@@ -436,6 +436,7 @@
                    :currentList="overallCase"
                    :tableLabel="tableLabelhzwb"
                    :serialnumber="false"
                    :agenumber="true"
                    :searchTrue="true"
                    :multiplechoice="false"
                    :controlxz="false"
@@ -528,6 +529,7 @@
              :currentList="patientuserList"
              :tableLabel="tableLabelhz"
              :heights="600"
              :agenumber="true"
              :serialnumber="false"
              :center="false"
              :typeinfo="3"
@@ -536,6 +538,8 @@
          <pagination
            v-show="patienttotal > 0 && this.patientqueryParams.allhosp != 6"
            :total="patienttotal"
            :page.sync="patientqueryParams.pageNum"
            :limit.sync="patientqueryParams.pageSize"
            @pagination="handleAddpatient"
          />
        </div>
@@ -800,6 +804,7 @@
              :serialnumber="false"
              :controlsc="false"
              :multiplechoice="false"
              :agenumber="true"
              :typeinfo="1"
            />
            <pagination
@@ -887,7 +892,6 @@
        { label: "患者", width: "", prop: "name" },
        { label: "身份证", width: "200", prop: "idcardno" },
        { label: "性别", width: "", prop: "sex" },
        { label: "年龄", width: "", prop: "age" },
        { label: "患者标签", width: "", prop: "tag" },
        { label: "责任护士", width: "", prop: "nurseName" },
        { label: "主治医生", width: "", prop: "drname" },
@@ -900,7 +904,6 @@
        { label: "患者", width: "", prop: "name" },
        { label: "身份证", width: "200", prop: "sfzh" },
        { label: "性别", width: "", prop: "sex" },
        { label: "年龄", width: "", prop: "age" },
        { label: "出院天数", width: "", prop: "endDay" },
        { label: "责任护士", width: "", prop: "nurseName" },
        { label: "主治医生", width: "", prop: "drname" },
@@ -1302,6 +1305,8 @@
          // },
        ];
      }
      console.log(this.topqueryParams, "this.topqueryParams");

      getQtemplatelist(this.topqueryParams).then((response) => {
        this.userList = response.rows;
        this.total = response.total;
@@ -1424,7 +1429,7 @@
    },
    // 预览
    previewfnmb() {
      console.log(this.form.templateid,'this.form.templateid');
      console.log(this.form.templateid, "this.form.templateid");

      getTaskQuestioncomit(this.form.templateid).then((res) => {
        if (res.code == 200) {
@@ -1501,7 +1506,6 @@
          { label: "患者", width: "", prop: "name" },
          { label: "身份证", width: "200", prop: "idcardno" },
          { label: "性别", width: "", prop: "sex" },
          { label: "年龄", width: "", prop: "age" },
          { label: "患者标签", width: "200", prop: "tag" },
          { label: "出院天数", width: "", prop: "endDay" },
          { label: "责任护士", width: "", prop: "nurseName" },
@@ -1515,7 +1519,6 @@
          { label: "患者", width: "", prop: "name" },
          { label: "身份证", width: "200", prop: "idcardno" },
          { label: "性别", width: "", prop: "sex" },
          { label: "年龄", width: "", prop: "age" },
          { label: "患者标签", width: "200", prop: "tag" },
          { label: "出院天数", width: "", prop: "endDay" },
          { label: "责任护士", width: "", prop: "nurseName" },
@@ -1677,7 +1680,6 @@
        { label: "患者", width: "", prop: "name" },
        { label: "身份证", width: "200", prop: "idcardno" },
        { label: "性别", width: "", prop: "sex" },
        { label: "年龄", width: "", prop: "age" },
        { label: "出院天数", width: "", prop: "endDay" },
      ];
      this.patientqueryParams.pageSize = 1000;
@@ -2024,10 +2026,10 @@
            this.objyl.svyTaskTemplateScriptVOS =
              this.objyl.svyTemplateLibScripts;
            this.form.svyTaskTemplateVO = this.objyl;
            this.form.templatename=this.objyl.svyname;
            this.form.templatename = this.objyl.svyname;
            this.$modal.msgSuccess("暂存成功保存任务后模板失效");
            this.drawermb=false;
            this.previewtf=false;
            this.drawermb = false;
            this.previewtf = false;
          });
      } else {
        setTimeout(() => {