From acd7802beaa570c6811ed7227e441e39e8c5e37e Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 21 三月 2023 16:07:23 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/smartor-web

---
 ruoyi-ui/src/smartor/dataobject/dw_svytopic_maint.vue |   94 +++++++++++++++-------------------------------
 1 files changed, 31 insertions(+), 63 deletions(-)

diff --git a/ruoyi-ui/src/smartor/dataobject/dw_svytopic_maint.vue b/ruoyi-ui/src/smartor/dataobject/dw_svytopic_maint.vue
index 59aa1a9..88ad3b1 100644
--- a/ruoyi-ui/src/smartor/dataobject/dw_svytopic_maint.vue
+++ b/ruoyi-ui/src/smartor/dataobject/dw_svytopic_maint.vue
@@ -1,71 +1,39 @@
 <template>
   <div>
     <!-- 娣诲姞鎴栦慨鏀归棶鍗烽鐩璇濇 -->
-    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label=" 鑰佺増鏈琁D " prop="oldid">
-        <el-input v-model="form.oldid" placeholder="璇疯緭鍏� 鑰佺増鏈琁D " />
-      </el-form-item>
-      <el-form-item label=" 闂嵎ID " prop="svyid">
-        <el-input v-model="form.svyid" placeholder="璇疯緭鍏� 闂嵎ID " />
-      </el-form-item>
-      <el-form-item label=" 棰樼洰Code " prop="topiccode">
-        <el-input v-model="form.topiccode" placeholder="璇疯緭鍏� 棰樼洰Code " />
-      </el-form-item>
-      <el-form-item label=" 棰樼洰 " prop="topic">
-        <el-input v-model="form.topic" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
-      </el-form-item>
-      <el-form-item label=" 鎺掑簭 " prop="sort">
-        <el-input v-model="form.sort" placeholder="璇疯緭鍏� 鎺掑簭 " />
-      </el-form-item>
-      <el-form-item label=" 鏄惁蹇呭~ " prop="ismandatory">
-        <el-select v-model="form.ismandatory" placeholder="璇烽�夋嫨 鏄惁蹇呭~ ">
-          <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-            :value="parseInt(dict.value)"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label=" 鏄惁闅愯棌 " prop="ishide">
-        <el-select v-model="form.ishide" placeholder="璇烽�夋嫨 鏄惁闅愯棌 ">
-          <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-            :value="parseInt(dict.value)"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label=" 鍒犻櫎鏍囪 " prop="delFlag">
-        <el-select v-model="form.delFlag" placeholder="璇烽�夋嫨 鍒犻櫎鏍囪 ">
-          <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-            :value="dict.value"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label=" 鏈烘瀯ID " prop="orgid">
-        <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鏈烘瀯ID " />
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏍囪 " prop="isupload">
-        <el-select v-model="form.isupload" placeholder="璇烽�夋嫨 涓婁紶鏍囪 ">
-          <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
-            :value="parseInt(dict.value)"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label=" 涓婁紶鏃堕棿 " prop="uploadTime">
-        <el-date-picker clearable v-model="form.uploadTime" type="date" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨 涓婁紶鏃堕棿 ">
-        </el-date-picker>
-      </el-form-item>
+    <el-form ref="form" :model="form" size="small" :rules="rules" label-width="120px">
+      <el-row>
+        <el-col :span="6"><el-form-item label=" 涓婚缂栧彿 " prop="topiccode">
+            <el-input v-model="form.topiccode" 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="ismandatory">
+            <el-select v-model="form.ismandatory" placeholder="璇烽�夋嫨 鏄惁蹇呭~ ">
+              <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                :value="parseInt(dict.value)"></el-option>
+            </el-select>
+          </el-form-item></el-col>
+        <el-col :span="6"><el-form-item label=" 鏄惁闅愯棌 " prop="ishide">
+            <el-select v-model="form.ishide" placeholder="璇烽�夋嫨 鏄惁闅愯棌 ">
+              <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+                :value="parseInt(dict.value)"></el-option>
+            </el-select>
+          </el-form-item></el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12"><el-form-item label=" 涓婚鍐呭 " prop="topic">
+            <el-input v-model="form.topic" placeholder="璇疯緭鍏ヤ富棰樺唴瀹�" />
+          </el-form-item></el-col>
+        <el-col :span="12"><el-form-item label=" 鎵�灞為櫌鍖� " prop="orgid">
+            <el-input v-model="form.orgid" placeholder="璇疯緭鍏� 鎵�灞為櫌鍖� " />
+          </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>
+      <el-button type="primary" @click="submitForm">淇� 瀛�</el-button>
     </div>
-    <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
-      <el-form-item label="涓嬫媺閫夋嫨" prop="field101">
-        <el-select v-model="formData.field101" placeholder="璇烽�夋嫨涓嬫媺閫夋嫨" clearable :style="{ width: '100%' }">
-          <el-option v-for="(item, index) in field101Options" :key="index" :label="item.label" :value="item.value"
-            :disabled="item.disabled"></el-option>
-        </el-select>
-        <el-input placeholder="閫夐」鍐呭"></el-input>
-      </el-form-item>
-      <el-form-item size="large">
-        <el-button type="primary" @click="submitForm1">鎻愪氦</el-button>
-        <el-button @click="resetForm1">閲嶇疆</el-button>
-      </el-form-item>
-    </el-form>
   </div>
 </template>
 <script>
@@ -118,7 +86,7 @@
       };
       this.resetForm("form");
     },
-     /** 淇敼鎸夐挳鎿嶄綔 */
+    /** 淇敼鎸夐挳鎿嶄綔 */
     Retrieve(topicid) {
       this.reset();
       getSvytopic(topicid).then(response => {

--
Gitblit v1.9.3