From 7fac76af0b3c0f320c0478e8150cc4ec943d4a0f Mon Sep 17 00:00:00 2001
From: qianxj <qianxj15@sina.com>
Date: 星期二, 21 三月 2023 11:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/smartor-web
---
ruoyi-ui/src/views/smartor/patarchive/index0.vue | 7 +--
ruoyi-ui/src/views/smartor/svytopicoption/index.vue | 100 ++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 100 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/smartor/patarchive/index0.vue b/ruoyi-ui/src/views/smartor/patarchive/index0.vue
index c77fd4a..d2f1dd6 100644
--- a/ruoyi-ui/src/views/smartor/patarchive/index0.vue
+++ b/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">
diff --git a/ruoyi-ui/src/views/smartor/svytopicoption/index.vue b/ruoyi-ui/src/views/smartor/svytopicoption/index.vue
index 6dfe0e4..4d15767 100644
--- a/ruoyi-ui/src/views/smartor/svytopicoption/index.vue
+++ b/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 {
// 閬僵灞�
--
Gitblit v1.9.3