From 444955f503fb09730393cecc21edc2638dc6ff93 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 13 五月 2024 15:50:13 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 4 +
src/views/system/user/index.vue | 21 ++++++++++
src/api/system/user.js | 7 +++
src/views/project/fund/applyDetail/index.vue | 11 +++--
src/views/project/tallage/computingBill/index.vue | 39 ++++++++++++-------
5 files changed, 60 insertions(+), 22 deletions(-)
diff --git a/src/api/system/user.js b/src/api/system/user.js
index c012a1c..bb8a61a 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -133,6 +133,13 @@
method: 'get'
})
}
+// 鏌ヨ鎺堟潈瑙掕壊
+export function handleunlock(userName ) {
+ return request({
+ url: '/system/user/cleanErrorNums/' + userName ,
+ method: 'get',
+ })
+}
// 淇濆瓨鎺堟潈瑙掕壊
export function updateAuthRole(data) {
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 1d437d8..18256b8 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -3313,7 +3313,9 @@
// }
// });
// });
-
+ this.transplantdata.forEach(item=>{
+ item.donorname=this.form.name
+ })
// 淇濆瓨纭淇℃伅
if (this.accomplishform.id) {
updateDonatecompletioninfo(this.accomplishform).then(response => {
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 234955f..0643097 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -56,7 +56,7 @@
</el-col>
</el-row>
<el-row>
- <!--
+ <!--
<el-col :span="7">
<el-form-item label="宸ヤ綔鍗曚綅" prop="unitno">
<org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
@@ -113,7 +113,7 @@
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
</el-col>
- <!--
+ <!--
<el-col :span="5">
<el-form-item label="鐢宠鐘舵��" prop="recordstatus">
<el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true">
@@ -657,11 +657,12 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="12" v-if="businessType==1">
<el-form-item label="绠楃◣鐘舵��" prop="infoid">
<el-radio-group v-model="form.istax" align="left">
- <el-radio :label="2">寰呯畻绋�</el-radio>
- <el-radio :label="1">宸茬畻绋�</el-radio>
+ <el-radio :label="0">瀹℃牳涓�</el-radio>
+ <el-radio :label="1">鍏佽绠楃◣</el-radio>
+ <el-radio :label="2">宸茬畻绋�</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
diff --git a/src/views/project/tallage/computingBill/index.vue b/src/views/project/tallage/computingBill/index.vue
index bc2a741..3bab12a 100644
--- a/src/views/project/tallage/computingBill/index.vue
+++ b/src/views/project/tallage/computingBill/index.vue
@@ -306,7 +306,7 @@
>
<el-form-item label="鎹愮尞妗堜緥" prop="status">
<el-select
- v-model="patientqueryParams.donorno"
+ v-model="patientqueryParams.donorname"
filterable
placeholder="璇烽�夋嫨"
>
@@ -314,11 +314,19 @@
v-for="item in donorchargeanlList"
:key="item.id"
:label="item.name"
- :value="item.id"
+ :value="item.name"
>
</el-option>
- </el-select> </el-form-item
- ><el-form-item label="绠楃◣鐘舵��" prop="status">
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐢宠浜�" prop="name">
+ <el-input
+ v-model="patientqueryParams.pausername"
+ placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕"
+ @keyup.enter.native="handleAddpatient"
+ />
+ </el-form-item>
+ <!-- <el-form-item label="绠楃◣鐘舵��" prop="status">
<el-select
v-model="patientqueryParams.istax"
filterable
@@ -332,7 +340,7 @@
>
</el-option>
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item>
<el-button
@@ -594,9 +602,10 @@
overallCase: [],
patientqueryParams: {
paApplyType: 1,
- pacheckno: "047",
- checkstatus: 0,
- istax: 0,
+ // pacheckno: "047",
+ // checkstatus: 0,
+ pfundtaxid: 0,
+ departid: 0,
pageNum: 1,
pageSize: 10
},
@@ -783,8 +792,8 @@
},
handleQuery() {},
resetQuery() {
- this.patientqueryParams.donorno = null;
- this.patientqueryParams.donorchargeid = null;
+ this.patientqueryParams.pausername = null;
+ this.patientqueryParams.donorname = null;
this.handleAddpatient();
},
handleUploadError() {},
@@ -970,11 +979,11 @@
});
},
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.resetForm("queryForm");
- this.handleQuery();
- },
+ // /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ // resetQuery() {
+ // this.resetForm("queryForm");
+ // this.handleQuery();
+ // },
// 鍙栨秷鎸夐挳
cancel() {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e7e14e2..a3c0426 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -172,6 +172,14 @@
<el-button
size="mini"
type="text"
+ class="el-xg"
+ icon="el-icon-help"
+ @click="handleunlock(scope.row)"
+ v-hasPermi="['system:user:edit']"
+ >瑙ｉ攣</el-button>
+ <el-button
+ size="mini"
+ type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
@@ -347,7 +355,7 @@
</template>
<script>
-import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, exportUser,handleunlock, resetUserPwd, changeUserStatus, importTemplate } from "@/api/system/user";
import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
@@ -593,6 +601,12 @@
this.form.password = "";
});
},
+ // 瑙ｉ攣
+ handleunlock(row){
+ handleunlock(row.userName).then(response => {
+ this.$modal.msgSuccess("瑙ｉ攣鎴愬姛");
+ });
+ },
/** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
handleResetPwd(row) {
this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
@@ -703,3 +717,8 @@
}
};
</script>
+<style lang="scss" scoped>
+.el-xg{
+ color: rgb(40, 194, 91);
+}
+</style>
--
Gitblit v1.9.3