From 76bd95ca79b03b84f6d011a81794aabcdeef169b Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 21 三月 2023 10:35:46 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/smartor-web
---
ruoyi-ui/src/views/smartor/svytopicoption/index.vue | 186 +++++++++++++++-------------------------------
1 files changed, 61 insertions(+), 125 deletions(-)
diff --git a/ruoyi-ui/src/views/smartor/svytopicoption/index.vue b/ruoyi-ui/src/views/smartor/svytopicoption/index.vue
index a796792..4d15767 100644
--- a/ruoyi-ui/src/views/smartor/svytopicoption/index.vue
+++ b/ruoyi-ui/src/views/smartor/svytopicoption/index.vue
@@ -5,7 +5,7 @@
<el-input v-model="queryParams.optioncontent" placeholder="璇疯緭鍏� 閫夐」鍐呭 " clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label=" 褰掑鏈烘瀯 " prop="orgid">
+ <el-form-item label=" 褰掑睘鏈烘瀯 " prop="orgid">
<el-input v-model="queryParams.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
@@ -67,38 +67,22 @@
<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=" 閫夐」缂栫爜 " prop="optioncode">
- <el-input v-model="form.optioncode" placeholder="璇疯緭鍏� 閫夐」缂栫爜 " />
- </el-form-item></el-col><el-col :span="6"><el-form-item label=" 閫傜敤棰樼洰绫诲瀷 " prop="topictype">
- <el-select v-model="form.topictype" placeholder="璇烽�夋嫨 閫傜敤棰樼洰绫诲瀷 ">
- <el-option v-for="dict in dict.type.svy_topictype" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
- </el-select>
+ <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="12"><el-form-item label=" 鎵�灞為櫌鍖� " 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-option>
- </el-select>
+ <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-row>
+ <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-input v-model="form.optioncontent" placeholder="璇疯緭鍏� 閫夐」鍐呭 " />
</el-form-item>
- </el-row>
- <el-row>
- <el-form-item label=" 閫夐」鎻愮ず " prop="prompt">
- <el-input v-model="form.prompt" placeholder="璇疯緭鍏� 閫夐」鎻愮ず淇℃伅 " />
- </el-form-item></el-row>
- <el-row> <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="score">
- <el-input v-model="form.score" placeholder="璇疯緭鍏� 鍒嗘暟 " />
- </el-form-item></el-col><el-col :span="12"><el-form-item label=" 楠岃瘉瑙勫垯 " prop="verifyrule">
- <el-input v-model="form.verifyrule" placeholder="璇疯緭鍏� 楠岃瘉瑙勫垯 " />
- </el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="6"><el-form-item label=" 鏄惁瀛樺湪鏄庣粏 " prop="isexistdetail">
@@ -107,25 +91,47 @@
<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=" 鐖堕�夐」ID " prop="parentoptionid">
- <el-input v-model="form.parentoptionid" placeholder="璇疯緭鍏� 鐖堕�夐」ID " />
- </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-row>
- <el-row> <el-col :span="6"><el-form-item label=" 鏄惁寮傚父椤圭洰 " prop="isexceptionitem">
+ <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-row>
- <el-row><el-col :span="6"><el-form-item label=" 鏄惁闄愬埗鑼冨洿 " prop="isrange">
+ <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>
@@ -134,6 +140,9 @@
</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>
@@ -147,6 +156,7 @@
<script>
import { listSvytopicoption, getSvytopicoption, delSvytopicoption, addSvytopicoption, updateSvytopicoption } from "@/api/smartor/svytopicoption";
+import maintdlg from "@/smartor/dataobject/dw_svytopicoption_maint.vue";
export default {
name: "Svytopicoption",
@@ -167,11 +177,7 @@
total: 0,
// 闂嵎闂閫夐」琛ㄦ牸鏁版嵁
svytopicoptionList: [],
- // 寮瑰嚭灞傛爣棰�
- title: "",
- // 鏄惁鏄剧ず寮瑰嚭灞�
- open: false,
- // 鏌ヨ鍙傛暟
+ // 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -201,21 +207,17 @@
isupload: null,
uploadTime: null
},
- // 琛ㄥ崟鍙傛暟
- form: {},
- // 琛ㄥ崟鏍￠獙
- rules: {
- delFlag: [
- { required: true, message: " 鍒犻櫎鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
- ],
- isupload: [
- { required: true, message: " 涓婁紶鏍囪 涓嶈兘涓虹┖", trigger: "blur" }
- ],
- }
};
},
+ components:
+ {
+ maintdlg: maintdlg //()=>import("@/smartor/dataobject/dw_svytopicoption_maint")
+ },
created() {
- this.getList();
+ this.getList();
+ },
+ mounted() {
+
},
methods: {
/** 鏌ヨ闂嵎闂閫夐」鍒楄〃 */
@@ -226,48 +228,6 @@
this.total = response.total;
this.loading = false;
});
- },
- // 鍙栨秷鎸夐挳
- cancel() {
- this.open = false;
- this.reset();
- },
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- optionid: null,
- topicid: null,
- svyid: null,
- topictype: null,
- optioncode: null,
- optioncontent: null,
- isexistdetail: null,
- detailismandatory: null,
- isexceptionitem: null,
- istrack: null,
- score: null,
- prompt: null,
- jump: null,
- parentoptionid: null,
- ismutex: null,
- verifyrule: null,
- sort: null,
- verificationtype: null,
- isrange: null,
- minrange: null,
- maxrange: null,
- rangelength: null,
- orgid: null,
- oldid: null,
- delFlag: null,
- createBy: null,
- createTime: null,
- updateBy: null,
- updateTime: null,
- isupload: null,
- uploadTime: null
- };
- this.resetForm("form");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -287,40 +247,16 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- this.reset();
- this.open = true;
- this.title = "娣诲姞闂嵎闂閫夐」";
+ this.$refs["maint"].handleUpdate(null)
+ return
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- this.reset();
const optionid = row.optionid || this.ids
- getSvytopicoption(optionid).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "淇敼闂嵎闂閫夐」";
- });
+ this.$refs["maint"].handleUpdate(optionid)
+ return
},
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- if (this.form.optionid != null) {
- updateSvytopicoption(this.form).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addSvytopicoption(this.form).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- }
- }
- });
- },
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const optionids = row.optionid || this.ids;
--
Gitblit v1.9.3