From 7c524db9218938da1fb5f09a6b017f7ed9a217a0 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 18 五月 2024 18:23:54 +0800
Subject: [PATCH] css上传
---
ruoyi-ui/src/views/marry/index.vue | 126 ++++++++++++++++++++++++------------------
1 files changed, 72 insertions(+), 54 deletions(-)
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 5a69ee0..c669367 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 >
@@ -572,6 +570,7 @@
limitCountImg:1,//涓婁紶鍥剧墖鐨勬渶澶ф暟閲�
//涓汉淇℃伅鏁版嵁
marryList:{
+ id:undefined,
name:undefined,
sex:undefined,
birthday:undefined,
@@ -604,11 +603,14 @@
activeNames:['1'],
// 寮瑰嚭灞傛爣棰�
title: "",
+ iddd:undefined,
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
// open:true,
// 鏄惁鏄剧ず寮瑰嚭灞傦紙鏁版嵁鏉冮檺锛�
bear:undefined,
+ handsj:undefined,
+ onebear:undefined,
mrs:undefined,
smrs:undefined,
openDataScope: false,
@@ -619,7 +621,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:[
@@ -669,13 +674,13 @@
},
// 琛ㄥ崟鏍￠獙
rules: {
- id: [{
- required: true,
+ idNo: [{
+ // required: true,
message: '璇疯緭鍏ヨ韩浠借瘉鍙风爜',
trigger: 'blur'
}],
name: [{
- required: true,
+ // required: true,
message: '璇疯緭鍏ュ鍚�',
trigger: 'blur'
}],
@@ -685,7 +690,7 @@
trigger: 'change'
}],
marryStatus: [{
- required: true,
+ // required: true,
message: '璇烽�夋嫨濠氬Щ鐘跺喌',
trigger: 'change'
}],
@@ -750,6 +755,7 @@
cancelData() {
this.open = false;
this.reset();
+
},
//涓嬫媺
handleChange(val) {
@@ -779,7 +785,10 @@
this.oldSpouseList = this.marryList.oldSpouseList;
console.log(111)
console.log("淇℃伅")
- console.log(this.marryList.marryStatus);
+ console.log(this.marryList,'1111111111111111111');
+ this.iddd = this.marryList.id
+ console.log(this.iddd,'2222222222222')
+ //alert(this.marryList.bearStatus)
if(this.marryList.marryStatus===3){
this.showOldSpouse = true;
} else{
@@ -829,7 +838,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
@@ -923,12 +932,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();
});
@@ -951,17 +962,22 @@
//淇敼鍚庣殑淇濆瓨
submitForm() {
- if(parseInt(this.mrs))
+ if(this.mrs!=undefined)
this.marryList.marryStatus = parseInt(this.mrs)
- if(parseInt(this.smrs))
+ if(this.smrs!=undefined)
this.marryList.spouseMarryStatus = parseInt(this.smrs)
- if(parseInt(this.bear))
+
+ if(this.bear!=undefined)
this.marryList.bearStatus = parseInt(this.bear)
+
this.marryList.oneBorn = parseInt(this.onebear)
this.marryList.handbookStatus =parseInt(this.handsj)
this.marryList.sex = this.sinds
this.marryList.spouseSex = this.inds
+ console.log(this.marryList,'marryListmarryListmarryListmarryList')
+ // this.marryList.id = this.iddd
this.$refs['elForm'].validate(valid => {
+ // alert(valid)
if (valid) {
if (this.marryList.id !== undefined) {
updateMarry(this.marryList).then(response => {
@@ -972,6 +988,7 @@
this.dsb = true
this.isShow_2=false
this.isShow = true
+ this.getList()
}).catch(error => {
console.error(error);
@@ -983,6 +1000,7 @@
}
}
})
+ this.getList()
// 鍒锋柊椤甸潰
// window.location.reload();
},
--
Gitblit v1.9.1