From 26c14f0c6defe02f2b6f15b498bcd454461ee7a8 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 05 一月 2024 14:01:43 +0800
Subject: [PATCH] yxh
---
src/api/project/donorcharge.js | 4
src/views/project/fund/applyDetail/index.vue | 10
src/views/project/donateorgan/index.vue | 5
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 2
src/views/project/donorcharge/donorchargedetail/index.vue | 83 ++++-----
src/views/project/organallocation/index.vue | 46 ++---
src/views/project/donatefinish/index.vue | 382 ++++++++----------------------------------
7 files changed, 138 insertions(+), 394 deletions(-)
diff --git a/src/api/project/donorcharge.js b/src/api/project/donorcharge.js
index 963a0a4..7807379 100644
--- a/src/api/project/donorcharge.js
+++ b/src/api/project/donorcharge.js
@@ -38,7 +38,7 @@
// 鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒�
export function delDonorcharge(id) {
return request({
- url: '/project/donorcharge/remove' + id,
+ url: '/project/donorcharge/remove/' + id,
method: 'get'
})
}
@@ -91,7 +91,7 @@
// 鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼
export function delDonorchargeorgan(id) {
return request({
- url: '/project/donorchargeorgan/remove' + id,
+ url: '/project/donorchargeorgan/remove/' + id,
method: 'get'
})
}
diff --git a/src/views/project/donatefinish/index.vue b/src/views/project/donatefinish/index.vue
index 08e21c7..08d64fe 100644
--- a/src/views/project/donatefinish/index.vue
+++ b/src/views/project/donatefinish/index.vue
@@ -1,48 +1,24 @@
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- :inline="true"
- v-show="showSearch"
- label-width="70px"
- >
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
<el-row :gutter="8">
-
+
<el-col :span="6">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item
- align="left"
- label="鍖荤枟鏈烘瀯"
- prop="treatmenthospitalno"
- >
- <org-selecter
- ref="orgSelecter"
- :org-type="'3'"
- v-model="form.treatmenthospitalno"
- />
+ <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalno">
+ <org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.treatmenthospitalno" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎹愮尞鍦板競">
<el-select v-model="queryParams.city" placeholder="璇烽�夋嫨鍦板競">
- <el-option
- v-for="item in provinceData"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
+ <el-option v-for="item in provinceData" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
@@ -50,18 +26,9 @@
<el-col :span="6">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
- <el-select
- v-model="queryParams.recordstate"
- placeholder="璇烽�夋嫨璁板綍鐘舵��"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_DonationStatus"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.recordstate" placeholder="璇烽�夋嫨璁板綍鐘舵��" clearable size="small">
+ <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
@@ -70,12 +37,7 @@
<el-col :span="6">
<el-form-item label="鎶ュ憡浜�">
<el-select v-model="queryParams.reporterno" placeholder="璇烽�夋嫨鎶ュ憡浜�">
- <el-option
- v-for="item in reportlist"
- :key="item.index"
- :label="item.reportername"
- :value="item.reporterno"
- >
+ <el-option v-for="item in reportlist" :key="item.index" :label="item.reportername" :value="item.reporterno">
</el-option>
</el-select>
</el-form-item>
@@ -83,32 +45,16 @@
<el-col :span="12">
<el-form-item label="鎶ュ憡鏃ユ湡">
- <el-date-picker
- style="width: 100%"
- v-model="selecttime"
- type="monthrange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫湀浠�"
- end-placeholder="缁撴潫鏈堜唤"
- value-format="yyyy-MM-dd"
- @change="getTimeList"
- >
+ <el-date-picker style="width: 100%" v-model="selecttime" type="monthrange" range-separator="鑷�"
+ start-placeholder="寮�濮嬫湀浠�" end-placeholder="缁撴潫鏈堜唤" value-format="yyyy-MM-dd" @change="getTimeList">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-col>
@@ -129,77 +75,36 @@
</el-row> -->
</el-form>
- <el-table
- v-loading="loading"
- border
- :default-sort="{ prop: 'completetime', order: 'descending' }"
- :data="donatebaseinfoList"
- >
- <el-table-column
- label="鎶ュ憡鏃堕棿"
- align="center"
- prop="reporttime"
- width="120"
- >
+ <el-table v-loading="loading" border :default-sort="{ prop: 'completetime', order: 'descending' }"
+ :data="donatebaseinfoList">
+ <el-table-column label="妗堜緥鏃堕棿" align="center" prop="donatetime" width="120">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.donatetime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
-
<el-table-column label="濮撳悕" align="center" prop="name" width="100" />
-
<el-table-column label="鎬у埆" align="center" prop="sex" width="100">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_user_sex"
- :value="parseInt(scope.row.sex)"
- />
+ <dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" />
</template>
</el-table-column>
<el-table-column label="骞撮緞" align="center" prop="age" width="100" />
- <el-table-column
- label="鍖荤枟鏈烘瀯"
- align="center"
- prop="treatmenthospitalname"
- />
- <el-table-column
- label="瀹屾垚鏃堕棿"
- align="center"
- prop="completetime"
- width="200"
- >
- <template slot-scope="scope">
+ <el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" />
+ <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="completetime" width="200">
+ <template slot-scope="scope">
<span>{{ parseTime(scope.row.createtime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="韬唤璇佸彿" prop="idcardno" width="180" /> -->
- <el-table-column
- label="鎶ュ憡浜�"
- align="center"
- prop="reportername"
- width="100"
- />
+ <el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="100" />
- <el-table-column
- label="鎹愮尞杩涘害"
- align="center"
- prop="recordstate"
- >
+ <el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_DonationStatus"
- :value="scope.row.recordstate"
- />
+ <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
</template>
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- class-name="small-padding fixed-width"
- width="200"
- fixed="right"
- >
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
<template slot-scope="scope">
<!-- <el-button
size="mini"
@@ -208,93 +113,42 @@
@click="updatedonorno(scope.row)"
>鏇存柊缂栧彿</el-button
> -->
- <el-button
- v-if="scope.row.dcid == undefined"
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleAdd(scope.row)"
- >鐧昏</el-button
- >
+ <el-button v-if="scope.row.dcid == undefined" size="mini" type="text" icon="el-icon-edit"
+ @click="handleAdd(scope.row)">鐧昏</el-button>
- <el-button
- v-if="scope.row.dcid > 0"
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleAdd(scope.row)"
- v-hasPermi="['project:donatebaseinfo:edit']"
- >淇敼</el-button
- >
+ <el-button v-if="scope.row.dcid > 0" size="mini" type="text" icon="el-icon-edit" @click="handleAdd(scope.row)"
+ v-hasPermi="['project:donatebaseinfo:edit']">淇敼</el-button>
- <el-button
- v-if="scope.row.dcid > 0"
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleReport(scope.row)"
- >涓婃姤</el-button
- >
- <el-button
- v-if="scope.row.dcid > 0"
- size="mini"
- type="text"
- icon="el-icon-refrigerator"
- @click="handledownload(scope.row)"
- >涓嬭浇</el-button
- >
+ <el-button v-if="scope.row.dcid > 0" size="mini" type="text" icon="el-icon-edit"
+ @click="handleReport(scope.row)">涓婃姤</el-button>
+ <el-button v-if="scope.row.dcid > 0" size="mini" type="text" icon="el-icon-refrigerator"
+ @click="handledownload(scope.row)">涓嬭浇</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
<!-- 娣诲姞鎴栦慨鏀规崘鐚畬鎴愬璇濇 -->
- <el-dialog
- :title="title"
- align="center"
- :visible.sync="open"
- width="1100px"
- :close-on-click-modal="false"
- append-to-body
- >
+ <el-dialog :title="title" align="center" :visible.sync="open" width="1100px" :close-on-click-modal="false"
+ append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input
- disabled
- v-model="curCase.donorno"
- placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�"
- />
+ <el-input disabled v-model="curCase.donorno" placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- disabled
- v-model="curCase.name"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- />
+ <el-input disabled v-model="curCase.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="瀹屾垚鏃堕棿" prop="completetime">
- <el-date-picker
- style="width: 167px"
- clearable
- size="small"
- v-model="form.completetime"
- type="date"
- value-format="yyyy-MM-dd hh:mm:ss"
- placeholder="閫夋嫨瀹屾垚鏃堕棿"
- >
+ <el-date-picker style="width: 167px" clearable size="small" v-model="form.completetime" type="date"
+ value-format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨瀹屾垚鏃堕棿">
</el-date-picker>
</el-form-item>
</el-col>
@@ -302,12 +156,7 @@
<el-row>
<el-form-item label="鍣ㄥ畼缁勭粐">
<el-checkbox-group align="left" v-model="form.donateorganList">
- <el-checkbox
- v-for="dict in dict.type.sys_Organ"
- :key="dict.value"
- :label="dict.value"
- disabled
- >
+ <el-checkbox v-for="dict in dict.type.sys_Organ" :key="dict.value" :label="dict.value" disabled>
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -315,96 +164,40 @@
</el-row>
<el-row style="margin-bottom: 22px">
<el-table v-loading="loading" border :data="tableData">
- <el-table-column
- label="鍣ㄥ畼鍚嶇О"
- align="center"
- prop="organname"
- width="100"
- />
- <el-table-column
- label="绉绘鍖婚櫌锛堟帴鏀跺崟浣嶏級"
- align="center"
- prop="transplanthospitalno"
- width="240"
- >
+ <el-table-column label="鍣ㄥ畼鍚嶇О" align="center" prop="organname" width="100" />
+ <el-table-column label="绉绘鍖婚櫌锛堟帴鏀跺崟浣嶏級" align="center" prop="transplanthospitalno" width="240">
<template slot-scope="scope">
- <org-selecter
- ref="transplanthosselect"
- :org-type="'4'"
- v-model="scope.row.transplanthospitalno"
- />
+ <org-selecter ref="transplanthosselect" :org-type="'4'" v-model="scope.row.transplanthospitalno" />
</template>
</el-table-column>
- <el-table-column
- label="绉绘璐熻矗浜�"
- align="center"
- prop="transplantdoct"
- width="120"
- >
+ <el-table-column label="绉绘璐熻矗浜�" align="center" prop="transplantdoct" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.transplantdoct"
- placeholder="璇疯緭鍏ヨ礋璐ｄ汉"
- ></el-input>
+ <el-input v-model="scope.row.transplantdoct" placeholder="璇疯緭鍏ヨ礋璐ｄ汉"></el-input>
</template>
</el-table-column>
- <el-table-column
- label="绉绘鏃ユ湡"
- align="center"
- prop="transplanttime"
- width="230"
- >
+ <el-table-column label="绉绘鏃ユ湡" align="center" prop="transplanttime" width="230">
<template slot-scope="scope">
<el-row>
- <el-date-picker
- clearable
- size="small"
- style="width: 90%"
- v-model="scope.row.transplanttime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍣ㄥ畼绉绘鏃堕棿"
- >
+ <el-date-picker clearable size="small" style="width: 90%" v-model="scope.row.transplanttime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍣ㄥ畼绉绘鏃堕棿">
</el-date-picker>
</el-row>
</template>
</el-table-column>
- <el-table-column
- prop="abandonreason"
- label="寮冪敤鍘熷洜"
- align="center"
- width="260"
- >
+ <el-table-column prop="abandonreason" label="寮冪敤鍘熷洜" align="center" width="260">
<template slot-scope="scope">
<el-row>
- <el-input
- clearable
- v-model="scope.row.abandonreason"
- placeholder="璇疯緭鍏ュ純鐢ㄥ師鍥�"
- />
+ <el-input clearable v-model="scope.row.abandonreason" placeholder="璇疯緭鍏ュ純鐢ㄥ師鍥�" />
</el-row>
</template>
</el-table-column>
- <el-table-column
- label="鍣ㄥ畼鐘舵��"
- align="center"
- prop="organstate"
- width="130"
- >
+ <el-table-column label="鍣ㄥ畼鐘舵��" align="center" prop="organstate" width="130">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.organstate"
- placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
- value-key="value"
- @change="selectOrganstate(scope.row)"
- >
- <el-option
- v-for="dict in dict.type.sys_organstate"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="scope.row.organstate" placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��" value-key="value"
+ @change="selectOrganstate(scope.row)">
+ <el-option v-for="dict in dict.type.sys_organstate" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</template>
</el-table-column>
@@ -415,21 +208,14 @@
<el-col :span="7">
<el-form-item align="left" label="閬椾綋鎹愮尞" prop="isbodydonation">
<el-radio-group v-model="form.isbodydonation">
- <el-radio
- v-for="dict in dict.type.sys_0_1"
- :key="dict.value"
- :label="dict.value"
- >{{ dict.label }}</el-radio
- >
+ <el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="dict.value">{{ dict.label
+ }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item align="left" label="鎺ユ敹鍗曚綅" prop="receivingunit">
- <el-input
- v-model="form.receivingunit"
- placeholder="璇疯緭鍏ユ帴鍙楀崟浣�"
- />
+ <el-input v-model="form.receivingunit" placeholder="璇疯緭鍏ユ帴鍙楀崟浣�" />
</el-form-item>
</el-col>
</el-row>
@@ -438,12 +224,8 @@
<el-col :span="7">
<el-form-item label="璐熻矗浜�" prop="responsibleuserid">
<el-select v-model="form.responsibleuserid" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in leaderlist"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportNo"
- >
+ <el-option v-for="item in leaderlist" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportNo">
</el-option>
</el-select>
</el-form-item>
@@ -451,12 +233,8 @@
<el-col :span="7">
<el-form-item label="鍗忚皟鍛樹竴" prop="coordinateduserido">
<el-select v-model="form.coordinateduserido" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in coordinatorlist1"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportNo"
- >
+ <el-option v-for="item in coordinatorlist1" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportNo">
</el-option>
</el-select>
</el-form-item>
@@ -464,12 +242,8 @@
<el-col :span="7">
<el-form-item label="鍗忚皟鍛樹簩" prop="coordinateduseridt">
<el-select v-model="form.coordinateduseridt" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in coordinatorlist1"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportNo"
- >
+ <el-option v-for="item in coordinatorlist1" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportNo">
</el-option>
</el-select>
</el-form-item>
@@ -483,13 +257,8 @@
</el-row> -->
<el-row>
<el-form-item label="闄勪欢" align="left" prop="annexfile">
- <annex-upload
- ref="finishannex"
- :infoid="curCase.id"
- :donorno="curCase.donorno"
- :flowname="flowname"
- :annexno="annexno"
- />
+ <annex-upload ref="finishannex" :infoid="curCase.id" :donorno="curCase.donorno" :flowname="flowname"
+ :annexno="annexno" />
</el-form-item>
</el-row>
</el-form>
@@ -500,8 +269,7 @@
</el-dialog>
</div>
</template>
-<style scoped>
-</style>
+<style scoped></style>
<script>
import {
listOrganization,
@@ -1206,10 +974,10 @@
this.form.coordinatedusernamet =
this.coordinatorlist1[coordinatedusernametIndex].reportName;
}
-
+
if (this.form.id != null) {
console.log("鏇存柊form", this.form);
-
+
updateDonatecompletioninfo(this.form).then((response) => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.loading = false;
@@ -1247,7 +1015,7 @@
});
} else {
addDonatecompletioninfo(this.form).then((response) => {
- this.loading=false
+ this.loading = false
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
@@ -1278,7 +1046,7 @@
});
}
}
- else{
+ else {
this.loading = false;
}
});
diff --git a/src/views/project/donateorgan/index.vue b/src/views/project/donateorgan/index.vue
index 99301b5..d9bedd0 100644
--- a/src/views/project/donateorgan/index.vue
+++ b/src/views/project/donateorgan/index.vue
@@ -633,9 +633,6 @@
queryParams.endtransplanttime = queryParams.transplanttime[1]+ " 23:59:59"
queryParams.transplanttime = null
}
- console.log("鎼滅储鏌ヨ鍟�", this.queryParams);
-
-
listnewDonateorgan(queryParams).then((response) => {
console.log("鍣ㄥ畼鏁版嵁:", response);
@@ -706,10 +703,8 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
- console.log("淇敼褰撳墠鐨剅ow", row);
const id = row.doid || this.ids;
getDonateorgan(id).then((response) => {
- console.log("褰撳墠鏁版嵁:", response);
this.form = response.data;
this.form.organstate = this.form.organstate + "";
this.open = true;
diff --git a/src/views/project/donorcharge/donorchargedetail/index.vue b/src/views/project/donorcharge/donorchargedetail/index.vue
index cda6d51..0030fae 100644
--- a/src/views/project/donorcharge/donorchargedetail/index.vue
+++ b/src/views/project/donorcharge/donorchargedetail/index.vue
@@ -47,9 +47,9 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="5">
- <el-form-item label="搴旀敹閲戦" prop="chargeamount">
- <el-input v-model="form.chargeamount" placeholder="璇疯緭鍏ュ簲鏀堕噾棰�" :disabled="true" />
+ <el-col :span="10">
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -57,9 +57,9 @@
<el-input v-model="form.chargeamounted" placeholder="璇疯緭鍏ュ疄鏀堕噾棰�" :disabled="true" />
</el-form-item>
</el-col>
- <el-col :span="10">
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
+ <el-col :span="5">
+ <el-form-item label="搴旀敹閲戦" prop="chargeamount">
+ <el-input v-model="form.chargeamount" placeholder="璇疯緭鍏ュ簲鏀堕噾棰�" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
@@ -774,7 +774,7 @@
//鍣ㄥ畼璐圭敤淇℃伅
this.organParams.donorchargeid = this.curId;
- console.log("this.organParams", this.organParams);
+ console.log("this.organParams", this.organParams);
listDonorchargeorgan(this.organParams).then(res => {
console.log("listDonorchargeorgan", res);
this.donorchargeorgans = res.rows;
@@ -812,6 +812,27 @@
submitForm: debounce(function (data) {
this.$refs["form"].validate(valid => {
if (valid) {
+ //鏍￠獙銆佽垂鐢ㄥ悎璁�
+ let ChargeSum = 0;
+ let ChargeamountSum = 0;
+ let organname="";
+
+ try {
+ for (let i = 0; i < this.donorchargeorgans.length; i++) {
+ organname += this.donorchargeorgans[i].organname+",";
+ if (!isNaN(parseFloat(this.donorchargeorgans[i].organcharge))) {
+ ChargeSum += parseFloat(this.donorchargeorgans[i].organcharge);
+ }
+ if (!isNaN(parseFloat(this.donorchargeorgans[i].amount))) {
+ ChargeamountSum += parseFloat(this.donorchargeorgans[i].amount);
+ }
+ }
+ this.form.donateorgan = organname.substring(0,organname.lastIndexOf(","));
+ this.form.chargeamount = ChargeSum.toFixed(2);
+ this.form.chargeamounted = ChargeamountSum.toFixed(2);
+ } catch { }
+
+ //淇濆瓨
if (this.form.id != null) {
for (let k = 0; k < this.donorchargeorgans.length; k++) {
this.donorchargeorgans[k].donorchargeID = this.form.id;
@@ -849,51 +870,23 @@
}, 500),
//璁＄畻璐圭敤鍚堣
- sumTotalFee() {
- let allSum = 0;
+ chargeSum() {
+ let ChargeSum = 0;
+ let ChargeamountSum = 0;
- //鎹愮尞鑰呭灞炶垂鐢�
- if (!isNaN(parseFloat(this.form.donoramount))) {
- allSum += parseFloat(this.form.donoramount);
- }
-
- //鎶ラ攢鏄庣粏璐圭敤
+ //璐圭敤鍚堣
try {
for (let i = 0; i < this.donorchargeorgans.length; i++) {
- /*
- let totalFee = 0;
- //璁＄畻褰撳墠鎶ラ攢鍐呭璐圭敤鍚堣
- if (!isNaN(parseFloat(this.donorchargeorgans[i].total))) {
- totalFee += parseFloat(this.donorchargeorgans[i].total);
+ if (!isNaN(parseFloat(this.donorchargeorgans[i].organcharge))) {
+ ChargeSum += parseFloat(this.donorchargeorgans[i].organcharge);
}
- if (!isNaN(parseFloat(this.donorchargeorgans[i].cityfee))) {
- totalFee += parseFloat(this.donorchargeorgans[i].cityfee);
- }
- if (!isNaN(parseFloat(this.donorchargeorgans[i].hotelexpense))) {
- totalFee += parseFloat(this.donorchargeorgans[i].hotelexpense);
- }
- if (!isNaN(parseFloat(this.donorchargeorgans[i].otherexpense))) {
- totalFee += parseFloat(this.donorchargeorgans[i].otherexpense);
- }
- if (!isNaN(parseFloat(this.donorchargeorgans[i].foodexpenses))) {
- totalFee += parseFloat(this.donorchargeorgans[i].foodexpenses);
- }
- if (!isNaN(parseFloat(this.donorchargeorgans[i].foodallowance))) {
- totalFee += parseFloat(this.donorchargeorgans[i].foodallowance);
- }
- if (!isNaN(parseFloat(this.donorchargeorgans[i].otherfeeamount))) {
- totalFee += parseFloat(this.donorchargeorgans[i].otherfeeamount);
- }
- this.donorchargeorgans[i].total = parseFloat(totalFee).toFixed(2);
- this.$set(this.donorchargeorgans, i, this.donorchargeorgans[i]);
- */
-
- if (!isNaN(parseFloat(this.donorchargeorgans[i].total))) {
- allSum += parseFloat(this.donorchargeorgans[i].total);
+ if (!isNaN(parseFloat(this.donorchargeorgans[i].amount))) {
+ ChargeamountSum += parseFloat(this.donorchargeorgans[i].amount);
}
}
- this.form.amountrequested = allSum.toFixed(2);
+ this.form.chargeamount = ChargeSum.toFixed(2);
+ this.form.chargeamounted = ChargeamountSum.toFixed(2);
} catch { }
},
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index a0d22ba..9310d30 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -338,7 +338,7 @@
<el-row style="margin-top: 25px; margin-bottom: 5px"
v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'">
<el-col :span="20">
- <el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
+ <el-form-item label="棰勫鏉愭枡" prop="infoid">
<el-radio-group v-model="form.checkstatus" align="left">
<el-radio :label="1">寰呯敵璇锋潗鏂�</el-radio>
<el-radio :label="2">瀹℃牳閫氳繃绛夊緟閭瘎绾歌川鏉愭枡</el-radio>
@@ -1632,11 +1632,11 @@
return;
}
}
- else if (this.checkObj.flowlevelone == 2) {
+ else if (this.checkObj.flowlevelone == 1) {
if (this.userprofile.nickName == "闄堟厱鍗�") {
//妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
- this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒");
+ this.$modal.msgError("璇峰厛纭鎶ラ攢鐨勭焊璐ㄦ潗鏂欐槸鍚﹀凡缁忔敹鍒帮紒");
return;
}
@@ -2308,10 +2308,6 @@
rowfeeblocks: [],
annexfiles: null
};
- // if (this.Reminderquantity >= 5) {
- // this.Savereminder = true;
- // return;
- // }
if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
this.rbDetails.push(rowData);
} else {
diff --git a/src/views/project/organallocation/index.vue b/src/views/project/organallocation/index.vue
index 0a37df7..a6586ab 100644
--- a/src/views/project/organallocation/index.vue
+++ b/src/views/project/organallocation/index.vue
@@ -67,35 +67,27 @@
<el-col :span="24">
<el-card shadow="never">
<!-- 鎹愮尞妗堜緥鍒楄〃 -->
- <el-table v-loading="loading" border :data="donationCaseTableData" >
- <el-table-column label="濮撳悕" align="center" prop="name" />
-
- <el-table-column label="鎬у埆" align="center" prop="sex">
+ <el-table v-loading="loading" border :data="donationCaseTableData">
+ <el-table-column label="妗堜緥鏃堕棿" align="center" prop="donatetime" width="150">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
+ <span>{{ parseTime(scope.row.donatetime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="妗堜緥褰掑睘" align="center" prop="deptname" />
-
- <el-table-column label="鍖荤枟鏈烘瀯" width="200px" align="center" prop="treatmenthospitalname" />
- <el-table-column
- label="鎿嶄綔"
- align="center"
- class-name="small-padding fixed-width"
- width="200"
- fixed="right"
- >
- <template slot-scope="scope">
-
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="selectDonotor(scope.row)"
- >鎹愮尞璇︽儏</el-button
- >
- </template>
- </el-table-column>
+ <el-table-column label="濮撳悕" align="center" prop="name" width="120" />
+ <el-table-column label="鎬у埆" align="center" prop="sex" width="100">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" />
+ </template>
+ </el-table-column>
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
+ <el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="120" />
+ <el-table-column label="妗堜緥褰掑睘" align="center" width="200px" prop="deptname" />
+ <el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" />
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
+ <template slot-scope="scope">
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="selectDonotor(scope.row)">鎹愮尞璇︽儏</el-button>
+ </template>
+ </el-table-column>
</el-table>
<!-- hide-on-single-page -->
<pagination v-show="total > 0" small layout="prev, pager, next" :total="total" :page.sync="queryParams.pageNum"
@@ -556,7 +548,7 @@
// this.queryParams.residencetown = this.$refs.areaSelect.getQu();
listDonatebaseinfo(this.queryParams).then((response) => {
this.donationCaseTableData = response.rows;
- console.log(this.donationCaseTableData,"Donation");
+ console.log(this.donationCaseTableData, "Donation");
this.total = response.total;
this.loading = false;
});
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index ac6f13d..6926eea 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -474,7 +474,7 @@
<el-row style="margin-top: 25px; margin-bottom: 5px"
v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'">
<el-col :span="12">
- <el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
+ <el-form-item label="棰勫鏉愭枡" prop="infoid">
<el-radio-group v-model="form.checkstatus" align="left">
<el-radio label="1">寰呯敵璇锋潗鏂�</el-radio>
<el-radio label="2">瀹℃牳閫氳繃绛夊緟閭瘎绾歌川鏉愭枡</el-radio>
--
Gitblit v1.9.3