From db3d71b62fcd859bf5e2c75b107c1d28bd977632 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期日, 23 六月 2024 18:23:45 +0800
Subject: [PATCH] 修改了333之前的报错
---
ruoyi-ui/src/api/pet/index.js | 2
ruoyi-ui/src/views/marry/index.vue | 2
ruoyi-ui/src/views/pet/petnote.vue | 22 ++++---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 1
ruoyi-ui/src/views/doctor/doctorInfo.vue | 48 ++++++++++++++--
ruoyi-ui/src/views/economy/index.vue | 35 +++++------
ruoyi-ui/src/views/meeting/approveInfo.vue | 14 +---
ruoyi-ui/src/views/meeting/meetingInfo.vue | 4
ruoyi-ui/src/views/doctor/index.vue | 3
9 files changed, 82 insertions(+), 49 deletions(-)
diff --git a/ruoyi-ui/src/api/pet/index.js b/ruoyi-ui/src/api/pet/index.js
index ef2334a..59aa6d7 100644
--- a/ruoyi-ui/src/api/pet/index.js
+++ b/ruoyi-ui/src/api/pet/index.js
@@ -115,7 +115,7 @@
})
}
//瀵煎叆
-export function enload(pid) {
+export function enload(data,pid) {
return request({
url: '/zfPetNote/importData/' + pid,
method: 'post',
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 794b00e..dfdcc69 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -341,6 +341,7 @@
});
}
console.log(this.fileList,'fileListfilelllllllllllll')
+ console.log(this.fileListOther,'fileListOtherfileListOtherfileListOther')
},
mounted() {},
methods: {
diff --git a/ruoyi-ui/src/views/doctor/doctorInfo.vue b/ruoyi-ui/src/views/doctor/doctorInfo.vue
index 76738a3..ab4028e 100644
--- a/ruoyi-ui/src/views/doctor/doctorInfo.vue
+++ b/ruoyi-ui/src/views/doctor/doctorInfo.vue
@@ -13,11 +13,43 @@
</div>
<div>
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-position="left" label-width="100px">
- <!-- <el-form-item label="id" prop="id">-->
- <!-- <el-input v-model="formData.id" placeholder="璇疯緭鍏d" :maxlength="11" show-word-limit :disabled="true"-->
- <!-- clearable prefix-icon='el-icon-mobile' :style="{width: '100%'}"></el-input>-->
- <!-- </el-form-item>-->
- <el-container>
+ <el-form-item label="绫诲埆" prop="type" label-width="55px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-select v-model="formData.type" 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-input v-model="newOption" v-if="showInput" placeholder="鑻ユ湭鍦ㄤ笂杩伴�夐」涓壘鍒板搴旂被鍒紝璇峰湪姝よ緭鍏ユ柊鐨勭被鍒�" @change="addNewOption"></el-input>
+ </el-form-item>
+ <el-form-item label="鐥囩姸" prop="symptom" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-if="!dsb" v-model="formData.symptom" placeholder="璇疯緭鍏ョ棁鐘�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-if="dsb" v-model="formData.symptom" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+ <el-form-item label="鎸佺画鏃堕棿" prop="duration" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.duration" placeholder="璇疯緭鍏ユ寔缁椂闂�" type="number" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鍔熸晥" prop="effect" label-width="50px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.effect" placeholder="璇疯緭鍏ュ姛鏁�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="閫傜敤浜�" prop="suitable" label-width="65px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.suitable" placeholder="璇疯緭鍏ラ�傜敤浜�" clearable :style="{width: '100%'}" :disabled="dsb">
+ </el-input>
+ </el-form-item>
+ <el-form-item label="涓尰澶勬柟" prop="cmedical" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-model="formData.cmedical" placeholder="璇疯緭鍏ヤ腑鍖诲鏂�" clearable :style="{width: '100%'}" :disabled="dsb" >
+ </el-input>
+ </el-form-item>
+ <el-form-item label="瑗垮尰澶勬柟" prop="wmedical" label-width="68px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-if="!dsb" v-model="formData.wmedical" placeholder="璇疯緭鍏ヨタ鍖诲鏂�" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ <el-input v-if="dsb" v-model="formData.wmedical" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb"></el-input>
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remark" label-width="45px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-input v-if="!dsb" v-model="formData.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" :disabled="dsb" type="textarea"></el-input>
+ <el-input v-if="dsb" v-model="formData.remark" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb" type="textarea"></el-input>
+ </el-form-item>
+
+ <!-- <el-container>
<div>
<el-container>
<el-row>
@@ -81,7 +113,8 @@
</el-row>
</el-container>
</div>
- </el-container>
+ </el-container> -->
+
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
@@ -772,4 +805,7 @@
.form{
background:center/11% no-repeat url('../../assets/icons/form.png') ;
}
+/* /deep/ .el-input__inner{
+ height: 72px;
+ } */
</style>
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 91f1e29..108b993 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -593,7 +593,8 @@
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listDoctor(this.queryParams).then(response => {
// alert(123)
- // console.log(response.data)
+ console.log(this.queryParams,'queryParamsqueryParamsqueryParams')
+ console.log(response.data,'response.dataresponse.dataresponse.data')
if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
{
_this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index dc6316d..5aff8d3 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -812,28 +812,27 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.download('/zfEconomy/export', {
+ this.download('/zfEconomy/model', {
...this.queryParams
}, `zfEconomy_${new Date().getTime()}.xlsx`)
- }
+ },
+ /** 瀵煎叆鎿嶄綔*/
+ handleEnport(params){
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('excelImport', file);
+ let _this = this
+
+ enload(formData).then(response => {
+ _this.getList();
+ Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
+ }).catch(err)
+ {
+ Message({ message: "瀵煎叆澶辫触", type: 'error' })
+ }
+ },
},
- /** 瀵煎叆鎿嶄綔*/
- handleEnport(params){
- var file = params.file;
- var formData = new FormData();
- formData.append('excelImport', file);
- let _this = this
- alert(file)
- enload(formData).then(response => {
- _this.getList();
- Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- }).catch(err)
- {
- Message({ message: "瀵煎叆澶辫触", type: 'error' })
- }
-
- }
};
</script>
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index ae8973d..19720b4 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -778,7 +778,7 @@
getList() {
- this.loading = false;
+ this.loading = true;
//涓汉淇℃伅
listMarry(this.queryParams).then(response => {
diff --git a/ruoyi-ui/src/views/meeting/approveInfo.vue b/ruoyi-ui/src/views/meeting/approveInfo.vue
index 9a19109..19e5435 100644
--- a/ruoyi-ui/src/views/meeting/approveInfo.vue
+++ b/ruoyi-ui/src/views/meeting/approveInfo.vue
@@ -50,14 +50,6 @@
</el-input>
</el-form-item>
</el-cow>
-
- <!-- <el-cow>
- <el-form-item label="浼氳瀹や唬鐮�" prop="meetingID" label-width="90px"
- style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
- <el-input v-model="formData.meetingID" placeholder="璇疯緭鍏ヤ細璁浠ｇ爜" clearable :style="{width: '100%'}">
- </el-input>
- </el-form-item>
- </el-cow> -->
<el-cow>
<el-form-item label="鍙绾充汉鏁�" prop="conPeople" label-width="90px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
@@ -95,7 +87,7 @@
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="鏄惁鎷滆姘寸墝" prop="isPlacebrand" label-width="120px"
+ <el-form-item label="鏄惁鎽嗘斁姘寸墝" prop="isPlacebrand" label-width="120px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-select v-model="formData.isPlacebrand" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}"
:disabled="dsb">
@@ -290,13 +282,13 @@
if (this.formData.id != undefined) {
updateStatu(this.formDat).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.getList();
// this.btn = false
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
+ this.getList();
}
- this.getList();
- this.getList();
},
refuse(row){
this.formDat.id = this.formData.id
diff --git a/ruoyi-ui/src/views/meeting/meetingInfo.vue b/ruoyi-ui/src/views/meeting/meetingInfo.vue
index fda5ce5..eca955a 100644
--- a/ruoyi-ui/src/views/meeting/meetingInfo.vue
+++ b/ruoyi-ui/src/views/meeting/meetingInfo.vue
@@ -95,7 +95,7 @@
</el-form-item>
</el-cow>
<el-cow>
- <el-form-item label="鏄惁鎷滆姘寸墝" prop="isPlacebrand" label-width="120px"
+ <el-form-item label="鏄惁鎽嗘斁姘寸墝" prop="isPlacebrand" label-width="120px"
style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-select v-model="formData.isPlacebrand" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}"
:disabled="dsb">
@@ -248,7 +248,7 @@
}],
isPlacebrand: [{
required: true,
- message: '璇烽�夋嫨鏄惁鎷滆姘寸墝',
+ message: '璇烽�夋嫨鏄惁鎽嗘斁姘寸墝',
trigger: 'blur'
}],
connPerson: [{
diff --git a/ruoyi-ui/src/views/pet/petnote.vue b/ruoyi-ui/src/views/pet/petnote.vue
index 9ecd134..99cddf2 100644
--- a/ruoyi-ui/src/views/pet/petnote.vue
+++ b/ruoyi-ui/src/views/pet/petnote.vue
@@ -749,6 +749,7 @@
...this.queryParams
};
+
if (Object.keys(queryParams).length === 1 && 'pid' in queryParams) {
this.download('/family/zfPetNote/export', queryParams, `zfPetNote_${new Date().getTime()}.xlsx`);
} else {
@@ -772,11 +773,12 @@
var file = params.file;
var formData = new FormData();
formData.append('excelImport', file);
- formData.append('pid', pid); // 娣诲姞瀵煎叆鍒板摢涓� ID 鐨勪俊鎭�
- console.log(this.pid);
+ // formData.append('pid', pid); // 娣诲姞瀵煎叆鍒板摢涓� ID 鐨勪俊鎭�
+ // console.log(formData,'formDataformDataformData')
+ // alert(this.pid);
let _this = this;
- enload(formData)
+ enload(formData,this.pid)
.then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' });
@@ -784,15 +786,17 @@
.catch(error => {
Message({ message: "瀵煎叆澶辫触", type: 'error' });
});
- }
+ },
+ // 寮圭獥
+ handleShow(scope){
+
+ this.openDataScope = true
+ this.getList()
+ },
+
},
- // 寮圭獥
- handleShow(scope){
- this.openDataScope = true
- this.getList()
- }
};
</script>
--
Gitblit v1.9.1