| ruoyi-ui/src/views/clean/cleanInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/collection/collectionInfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/marry/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/self/show.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| ruoyi-ui/src/views/travel/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
ruoyi-ui/src/views/clean/cleanInfo.vue
@@ -14,15 +14,19 @@ <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="120px"> <el-form-item label="类型" prop="kind"> <template v-if="dsb"> <!-- <template v-if="dsb"> <el-input v-model="formData.kind === 1 ? '收纳':'保洁'" :disabled="true"></el-input> </template> <template v-else> <el-select v-model="formData.kind" placeholder="请选择保洁/收纳" clearable :style="{width: '100%'}"> <el-option label="收纳" value="1"></el-option> <el-option label="保洁" value="0"></el-option> <el-option label="保洁" value='0'></el-option> <el-option label="收纳" value='1'></el-option> </el-select> </template> </template> --> <el-select v-model="formData.kind" placeholder="请选择保洁/收纳 " clearable :style="{width: '100%'}" :disabled="dsb" > <el-option v-for="(item, index) in typeOptions" :key="index" :label="item.label" :value="item.value" ></el-option> </el-select> </el-form-item> <el-form-item label="类别" prop="type"> <el-input v-model="formData.type" placeholder="请输入类别" clearable :style="{width: '100%'}" :disabled="dsb"></el-input> @@ -281,11 +285,11 @@ }, typeOptions: [{ value: '0', value: '保洁', label: '保洁', }, { value: '1', value: '收纳', label: '收纳', }], } @@ -316,6 +320,10 @@ this.loading = true; getCLeanInfo(id).then((response) => { this.formData = response.data; if(this.formData.kind==1) this.formData.kind = '收纳' else this.formData.kind = '保洁' let paths = response.data.url.split(","); for(let i = 0; i < paths.length; i++) { @@ -358,6 +366,10 @@ this.loading = true; getCLeanInfo(id).then((response) => { this.formData = response.data; if(this.formData.kind==1) this.formData.kind = '收纳' else this.formData.kind = '保洁' let paths = response.data.url.split(","); for(let i = 0; i < paths.length; i++) { @@ -432,16 +444,27 @@ // this.formData.url = ul+","+uls this.$refs['elForm'].validate(valid => { if(this.formData.kind=='收纳') this.formData.kind = 1 else this.formData.kind = 0 if (valid) { if (this.formData.id != undefined) { updateClean(this.formData).then(response => { this.$modal.msgSuccess("修改成功"); if(this.formData.kind==1) this.formData.kind = '收纳' else this.formData.kind = '保洁' // this.open = false; this.btn=false }); } else { this.$modal.msgSuccess("修改失败"); if(this.formData.kind==1) this.formData.kind = '收纳' else this.formData.kind = '保洁' } } @@ -515,8 +538,16 @@ this.formData.url = ul+","+uls; // alert(this.formData.url) if(res==true){ if(this.formData.kind=='收纳') this.formData.kind = 1 else this.formData.kind = 0 updateClean(this.formData).then(response => { this.$modal.msgSuccess("删除成功"); if(this.formData.kind==1) this.formData.kind = '收纳' else this.formData.kind = '保洁' // this.open = false; }); @@ -560,8 +591,16 @@ }) this.formData.url = ul+","+uls; if(res==true){ if(this.formData.kind=='收纳') this.formData.kind = 1 else this.formData.kind = 0 updateClean(this.formData).then(response => { this.$modal.msgSuccess("删除成功"); if(this.formData.kind==1) this.formData.kind = '收纳' else this.formData.kind = '保洁' }); } @@ -617,6 +656,11 @@ console.log(this.uploadFileList1) let _this = this if(this.formData.kind=='收纳') this.formData.kind = 1 else this.formData.kind = 0 this.uploading = true; uploadPic(formData).then(response => { _this.uploadFileList1 = [] @@ -626,6 +670,10 @@ // this.open = false; this.getData() this.fileListOther1=[] if(this.formData.kind==1) this.formData.kind = '收纳' else this.formData.kind = '保洁' }); }) @@ -646,7 +694,10 @@ }) let _this = this if(this.formData.kind=='收纳') this.formData.kind = 1 else this.formData.kind = 0 uploadPic(formData).then(response => { // console.log(response.originalFilenames) // console.log(response.urls) @@ -672,6 +723,10 @@ // alert(87) updateClean(_this.formData).then(response => { _this.$modal.msgSuccess("图片上传成功"); if(this.formData.kind==1) this.formData.kind = '收纳' else this.formData.kind = '保洁' // this.open = false; }); ruoyi-ui/src/views/collection/collectionInfo.vue
@@ -60,7 +60,7 @@ </el-col> <el-col > <el-form-item label="价值" prop="price" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;"> <el-input v-model="formData.price" placeholder="请输入价值" clearable :style="{width: '100%'}" :disabled="dsb"> <el-input v-model="formData.price" type="number" placeholder="请输入价值" clearable :style="{width: '100%'}" :disabled="dsb"> </el-input> </el-form-item> </el-col> ruoyi-ui/src/views/marry/index.vue
@@ -570,6 +570,7 @@ limitCountImg:1,//上传图片的最大数量 //个人信息数据 marryList:{ id:undefined, name:undefined, sex:undefined, birthday:undefined, @@ -602,6 +603,7 @@ activeNames:['1'], // 弹出层标题 title: "", iddd:undefined, // 是否显示弹出层 open: false, // open:true, @@ -672,13 +674,13 @@ }, // 表单校验 rules: { id: [{ required: true, idNo: [{ // required: true, message: '请输入身份证号码', trigger: 'blur' }], name: [{ required: true, // required: true, message: '请输入姓名', trigger: 'blur' }], @@ -688,7 +690,7 @@ trigger: 'change' }], marryStatus: [{ required: true, // required: true, message: '请选择婚姻状况', trigger: 'change' }], @@ -753,6 +755,7 @@ cancelData() { this.open = false; this.reset(); }, //下拉 handleChange(val) { @@ -782,7 +785,9 @@ this.oldSpouseList = this.marryList.oldSpouseList; console.log(111) console.log("信息") console.log(this.marryList); 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; @@ -969,7 +974,10 @@ 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 => { @@ -980,6 +988,7 @@ this.dsb = true this.isShow_2=false this.isShow = true this.getList() }).catch(error => { console.error(error); @@ -991,6 +1000,7 @@ } } }) this.getList() // 刷新页面 // window.location.reload(); }, ruoyi-ui/src/views/self/show.vue
@@ -1106,6 +1106,21 @@ }, // 表单校验 rules: { happenTime: [{ required: true, message: '请选择时间', trigger: 'blur' }], people: [{ required: true, message: '请输入人物', trigger: 'blur' }], title: [{ required: true, message: '请输入事件标题', trigger: 'blur' }], //基本信息 nickName: [{ // required: true, ruoyi-ui/src/views/travel/index.vue
@@ -78,7 +78,7 @@ icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete1" @click="handleDelete" v-hasPermi="['system:role:remove']" >删除</el-button> </el-col> @@ -88,6 +88,7 @@ <!-- 序号、基金/台账、时间、收入/支出、用途、使用人、现金/自动扣划、余额、电子文件、备注 操作--> <!-- 这里有个familyList数组 是在data()中定义的 --> <el-table v-loading="loading" :data="travelpriceList" @row-click="getRowId" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;"> <el-table-column type="selection" :reserve-selection="true" width="55" align="center" /> <el-table-column type="expand" :cell-class-name="expandRowClassName"> <template slot-scope="props"> <div > @@ -829,7 +830,7 @@ this.travelpriceList = response.data.data; //alert(this.travelpriceList.url) console.log("0000") console.log(this.travelpriceList) console.log(this.travelpriceList,'1111111111111111111111111') this.total = response.data.total; this.loading = false;
