修改个人生平

src/api/common/template.js

@@ -37,6 +37,17 @@ export function allPersonalModel(query) {
   })
 }
 
+// 根据类型查询个人页 留言模板列表
+export function getPersonalModel(type) {
+  return request({
+    headers:  {
+      'isToken': false,
+    },
+    url: '/template/getModel/'+type,
+    method: 'get'
+  })
+}
+
 // 新增个人页留言
 export function addMessage(data) {
   return request({

src/views/system/family/index.vue

@@ -217,7 +217,8 @@
               <el-input v-model="form.name" placeholder="请输入姓氏" />
             </el-form-item>
             <el-form-item label="家族地址" prop="address">
-              <area-cascader
+              <el-input v-model="form.address" type="textarea" placeholder="请输入地址" />
+              <!-- <area-cascader 不用级联
                 v-if="pshow"
                 :level="1"
                 type="all"
@@ -225,7 +226,7 @@
                 v-model="addressCode"
                 placeholder="请选择地址"
                 @change="getChangeVal"
-              ></area-cascader>
+              ></area-cascader> -->
             </el-form-item>
           </el-col>
 

src/views/system/personalModel/index.vue

@@ -10,10 +10,10 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="是否启用 Y是 N否" prop="enable">
+      <el-form-item label="启用" prop="enable">
         <el-input
           v-model="queryParams.enable"
-          placeholder="请输入是否启用 Y是 N否"
+          placeholder="请输入是否启用"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -70,7 +70,8 @@
     <el-table v-loading="loading" :data="modelList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键id" align="center" prop="id" v-if="false"/>
-      <el-table-column label="留念内容" align="center" prop="contents" />
+      <el-table-column label="留念内容" prop="contents" />
+      <el-table-column label="类型" align="center" prop="type" :formatter="typeFormat" />
       <el-table-column label="启用" align="center" prop="enable" :formatter="enableFormat" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -106,6 +107,11 @@
         <el-form-item label="留念内容" prop="contents">
           <el-input type="textarea" :rows="3" v-model="form.contents" placeholder="请输入留念内容" />
         </el-form-item>
+        <el-form-item label="类型">
+          <el-select v-model="form.type" placeholder="请选择">
+            <el-option v-for="dict in typeOptions" :key="dict.dictValue" :label="dict.dictLabel" :value="dict.dictValue"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="启用" prop="enable">
           <el-radio-group v-model="form.enable">
             <el-radio v-for="dict in enableOptions" :key="dict.dictValue" :label="dict.dictValue">{{dict.dictLabel}}</el-radio>
@@ -153,6 +159,7 @@ export default {
         enable: null
       },
       enableOptions: [],
+      typeOptions: [],
       // 表单参数
       form: {},
       // 表单校验
@@ -162,6 +169,9 @@ export default {
   },
   created() {
     this.getList();
+    this.getDicts('personal_message_type').then(response => {
+      this.typeOptions = response.data;
+    });
     this.getDicts('common_state').then(response => {
       this.enableOptions = response.data;
     });
@@ -176,6 +186,10 @@ export default {
         this.loading = false;
       });
     },
+    // 类型 字典翻译
+    typeFormat(row, column) {
+      return this.selectDictLabel(this.typeOptions, row.type);
+    },
     // 启用 字典翻译
     enableFormat(row, column) {
       return this.selectDictLabel(this.enableOptions, row.enable);

src/views/template/t1.vue

@@ -80,11 +80,11 @@
             <el-input v-model="messageForm.name" placeholder="请输入您的姓名" />
             </el-col>
           </el-form-item>
-          <el-form-item :label-width="'40px'">
-            <el-radio-group v-model="messageForm.type">
-              <el-radio :label="1">留言语</el-radio>
-              <el-radio :label="2">留念语</el-radio>
-              <el-radio :label="3">缅怀语</el-radio>
+          <el-form-item :label-width="'80px'">
+            <el-radio-group size="small" v-model="messageForm.type" @change="tepyChange">
+              <el-radio-button :label="1">留言语</el-radio-button>
+              <el-radio-button :label="2">留念语</el-radio-button>
+              <el-radio-button :label="3">缅怀语</el-radio-button>
             </el-radio-group>
           </el-form-item>
 
@@ -97,7 +97,7 @@
               :data="modelOptions" 
               highlight-current-row 
               @current-change="modelCurrentChange">
-              <el-table-column label="选择留言" prop="contents"> </el-table-column>
+              <el-table-column label="选择留言" prop="contents" />
             </el-table>
           </div>
 
@@ -114,7 +114,7 @@
 </template>
 
 <script>
-import { allPersonalImg, getPersonal,allPersonalModel,addMessage,messageList } from "@/api/common/template";
+import { allPersonalImg, getPersonal,allPersonalModel,getPersonalModel,addMessage,messageList } from "@/api/common/template";
 import { setToken } from "@/utils/auth";
 
 export default {
@@ -156,8 +156,9 @@ export default {
     this.personalImg.personalId = this.pid;
     this.getContent(this.pid);
     this.getImgs(this.pid);
-    this.getModels();
+    this.getModels(this.messageForm.type);
     this.getMessageList();
+    this.messageForm.type = 1;
   },
   methods: {
     getContent(id) {
@@ -179,8 +180,8 @@ export default {
         }
       });
     },
-    getModels(){
-      allPersonalModel().then((res) => {
+    getModels(type){
+      getPersonalModel(type).then((res) => {
         this.modelOptions = res.data;
       });
     },
@@ -222,6 +223,9 @@ export default {
     },
     handleClose (){
       this.drawer = false;
+    },
+    tepyChange(label){
+      this.getModels(label);
     }
   },
 };