Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/smartor-web

qianxj

2023-03-21 7fac76af0b3c0f320c0478e8150cc4ec943d4a0f

Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/smartor-web

 ruoyi-ui/src/views/smartor/patarchive/index0.vue

@@ -97,7 +97,8 @@
      @pagination="getList" />

    <!-- 添加或修改患者档案对话框 -->
    <el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true" width="1000px"  append-to-body>
    <el-dialog :title="title" :visible.sync="open" :showclose="true" :close-on-click-modal="false" :inline="true"
      width="1000px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-row>
          <el-col :span="12"><el-form-item label=" 姓名 " prop="name">
@@ -153,9 +154,7 @@
          <el-col :span="12"><el-form-item label=" 机构ID " prop="orgid">
              <el-select v-model="form.orgid" placeholder="请选择 机构ID ">
                <el-option v-for="dict in dict.type.sys_patientfrom" :key="dict.value" :label="dict.label"
                  :value="dict.value"> <el-form-item label=" 微信openid " prop="openid">
                    <el-input v-model="form.openid" placeholder="请输入 微信openid " />
                  </el-form-item></el-option>
                  :value="dict.value"> </el-option>
              </el-select>
            </el-form-item></el-col>
          <el-col :span="12"><el-form-item label=" 删除标记 " prop="delFlag">

 ruoyi-ui/src/views/smartor/svytopicoption/index.vue

@@ -36,13 +36,20 @@

    <el-table v-loading="loading" :data="svytopicoptionList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label=" 题目类型 " width="150" align="center" prop="topictype" />
      <el-table-column label=" 适用题目类型 " width="150" align="center" prop="topictype">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.svy_topictype" :value="scope.row.topictype" />
        </template></el-table-column>
      <el-table-column label=" 选项内容 " width="200" align="center" prop="optioncontent" />
      <el-table-column label=" 提示 " width="200" align="center" prop="prompt" />
      <el-table-column label=" 分数 " width="55" align="center" prop="score" />
      <el-table-column label=" 验证规则 " width="250" align="center" prop="verifyrule" />
      <el-table-column label=" 是否存在明细 " width="150" align="center" prop="isexistdetail" />
      <el-table-column label=" 归属机构 " width="200" align="center" prop="orgid" />
      <el-table-column label=" 所属院区 " width="200" align="center" prop="orgid">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_patientfrom" :value="scope.row.orgid" />
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -57,7 +64,93 @@
      @pagination="getList" />

    <!-- 添加或修改问卷问题选项对话框 -->
    <maintdlg ref="maint"/>
    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-row>
          <el-col :span="6"><el-form-item label=" 题目ID " prop="topicid">
              <el-input v-model="form.topicid" placeholder="请输入 题目ID " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 问卷ID " prop="svyid">
              <el-input v-model="form.svyid" placeholder="请输入 问卷ID " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 选项Code " prop="optioncode">
              <el-input v-model="form.optioncode" placeholder="请输入 选项Code " />
            </el-form-item></el-col>
          <el-col :span="6"></el-col>
        </el-row>>

        <el-row>
          <el-form-item label=" 选项内容 ">
            <el-input v-model="form.optioncontent" placeholder="请输入 选项内容 " />
          </el-form-item>
        </el-row>
        <el-row>
          <el-col :span="6"><el-form-item label=" 是否存在明细 " prop="isexistdetail">
              <el-input v-model="form.isexistdetail" placeholder="请输入 是否存在明细 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 明细是否必填 " prop="detailismandatory">
              <el-input v-model="form.detailismandatory" placeholder="请输入 明细是否必填 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 是否异常项目 " prop="isexceptionitem">
              <el-input v-model="form.isexceptionitem" placeholder="请输入 是否异常项目 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 是否跟进 " prop="istrack">
              <el-input v-model="form.istrack" placeholder="请输入 是否跟进 " />
            </el-form-item></el-col>
        </el-row>

        <el-row>
          <el-col :span="6">
            <el-form-item label=" 分数 " prop="score">
              <el-input v-model="form.score" placeholder="请输入 分数 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 提示 " prop="prompt">
              <el-input v-model="form.prompt" placeholder="请输入 提示 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 跳转 " prop="jump">
              <el-input v-model="form.jump" placeholder="请输入 跳转 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 父选项ID " prop="parentoptionid">
              <el-input v-model="form.parentoptionid" placeholder="请输入 父选项ID " />
            </el-form-item></el-col>
        </el-row>

        <el-row>
          <el-col :span="6"><el-form-item label=" 是否互斥 " prop="ismutex">
              <el-input v-model="form.ismutex" placeholder="请输入 是否互斥 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 验证规则 " prop="verifyrule">
              <el-input v-model="form.verifyrule" placeholder="请输入 验证规则 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 排序 " prop="sort">
              <el-input v-model="form.sort" placeholder="请输入 排序 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 是否限制范围 " prop="isrange">
              <el-input v-model="form.isrange" placeholder="请输入 是否限制范围 " />
            </el-form-item></el-col>
        </el-row>


        <el-row>
          <el-col :span="6"><el-form-item label=" 最小范围 " prop="minrange">
              <el-input v-model="form.minrange" placeholder="请输入 最小范围 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 范围长度;用于小数保留位数 " prop="rangelength">
              <el-input v-model="form.rangelength" placeholder="请输入 范围长度;用于小数保留位数 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 范围长度;用于小数保留位数 " prop="rangelength">
              <el-input v-model="form.rangelength" placeholder="请输入 范围长度;用于小数保留位数 " />
            </el-form-item></el-col>
          <el-col :span="6"><el-form-item label=" 机构ID " prop="orgid">
              <el-input v-model="form.orgid" placeholder="请输入 机构ID " />
            </el-form-item></el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
  </div>
</template>

@@ -67,6 +160,7 @@

export default {
  name: "Svytopicoption",
  dicts: ['svy_topictype'],
  data() {
    return {
      // 遮罩层