From a5a81efad512d32da6d1027fe8ab5cc29a3b6af4 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 01 三月 2024 20:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/marry/index.vue | 93 ++++++++++++++++++++++++----------------------
1 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 5a69ee0..727b98b 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -11,7 +11,7 @@
<el-divider />
<!-- 鍩烘湰淇℃伅-->
- <h2 style="font-size:21px">鍩烘湰鎯呭喌</h2>
+ <!-- <h2 style="font-size:21px">鍩烘湰鎯呭喌</h2>
<el-container>
<div style="padding-left:0px;width: 28%;" >
<el-container >
@@ -26,8 +26,7 @@
</el-row>
<el-row :span="16">
<el-form-item label="鍑虹敓鏃ユ湡" prop="birthday" label-width="75px">
- <!-- <el-input v-model="marryList.birthday" placeholder="" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input> -->
+
<el-date-picker v-model="marryList.birthday"
type="date"
placeholder="璇烽�夋嫨鏃ユ湡"
@@ -119,47 +118,8 @@
- <div style="padding-left:400px;padding-top:30px" >
- <el-container >
-
- <el-row :gutter="10" class="mb8">
- <el-col >
- <el-button
- plain
- @click="handleEdit()"
- style="width: 80px;height: 32px;background: #E0EEFE;"
- v-if="isShow"
- v-hasPermi="['system:role:edit']"
- >缂栬緫</el-button>
- <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">瀹屾垚</el-button>
- <br>
-
- </el-col>
-
- <el-col style="padding-top: 10px;">
- <el-button
- plain
- style="width: 80px;height: 32px;background: #D2F3E0;"
- @click="handleExport"
- v-hasPermi="['family:note:export']"
- >瀵煎嚭</el-button></el-col>
-
- <el-col style="padding-top: 10px;">
- <el-button
- plain
- style="width: 80px;height: 32px;background: #FFDDE3;"
- v-print="'#printable-content'"
- v-hasPermi="['family:note:export']"
- >鎵撳嵃</el-button></el-col>
-
-
- </el-row>
-
- </el-container>
- </div>
- <!-- </el-dialog> self:user:export-->
- </el-container>
+ </el-container> -->
<h2 style="font-size:16px " >閰嶅伓鎯呭喌</h2>
<el-container>
<div style="padding-top:15px;width: 28%;" >
@@ -259,7 +219,45 @@
</el-container>
</div>
+ <div style="padding-left:400px;padding-top:30px" >
+ <el-container >
+
+ <el-row :gutter="10" class="mb8">
+ <el-col >
+ <el-button
+ plain
+ @click="handleEdit()"
+ style="width: 80px;height: 32px;background: #E0EEFE;"
+ v-if="isShow"
+ v-hasPermi="['system:role:edit']"
+ >缂栬緫</el-button>
+ <el-button v-if="isShow_2" style="width: 80px;height: 32px;background: #E0EEFE;" @click="submitForm" :disabled="dsb">瀹屾垚</el-button>
+ <br>
+
+ </el-col>
+
+ <el-col style="padding-top: 10px;">
+ <el-button
+ plain
+ style="width: 80px;height: 32px;background: #D2F3E0;"
+ @click="handleExport"
+ v-hasPermi="['family:note:export']"
+ >瀵煎嚭</el-button></el-col>
+
+ <el-col style="padding-top: 10px;">
+ <el-button
+ plain
+ style="width: 80px;height: 32px;background: #FFDDE3;"
+ v-print="'#printable-content'"
+ v-hasPermi="['family:note:export']"
+ >鎵撳嵃</el-button></el-col>
+
+
+ </el-row>
+
+ </el-container>
+ </div>
<div style="padding-left:30px;padding-top:30px" >
<el-container >
@@ -619,7 +617,10 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -923,12 +924,14 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
+ let _this = this
this.$refs["elForm"].validate(valid => {
if (valid) {
-
+ console.log(this.formDat)
addMarryOld(this.formDat).then(response => {
// marryList.oldSpouseList.push(this.formDat);
this.$modal.msgSuccess("鏂板鎴愬姛");
+ _this.formDat = {}
this.open = false;
this.getList();
});
--
Gitblit v1.9.1