From 1a87827fcd9d3f9502903bf54435226c4c680fd8 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 06 三月 2024 13:53:04 +0800
Subject: [PATCH] 11
---
src/views/project/donorcharge/donorcharge/index.vue | 1
src/views/project/donationdetails/index.vue | 100 ++++++---
src/views/project/fund/applyDetail/index.vue | 2
src/api/project/organization.js | 2
src/views/project/donorcharge/donorchargedetail/index.vue | 32 ++
src/views/project/unitCost/particulars.vue | 82 ++++---
src/views/project/unitCost/index.vue | 11 +
src/views/project/organization/index.vue | 363 ++++++++++++++++++++++++++++--------
8 files changed, 426 insertions(+), 167 deletions(-)
diff --git a/src/api/project/organization.js b/src/api/project/organization.js
index a44f002..2bf6d42 100644
--- a/src/api/project/organization.js
+++ b/src/api/project/organization.js
@@ -44,7 +44,7 @@
// 鏂板鏈烘瀯绠＄悊
export function addOrganization(data) {
return request({
- url: '/project/organization',
+ url: '/project/organization/add',
method: 'post',
data: data
})
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 7ac3238..970e871 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -12,18 +12,14 @@
>
<p>
鎻愪氦锛�<span
- >{{ Processdata.donatebaseinfo.createperson
- }} {{
- parseTime(Processdata.donatebaseinfo.createtime)
- }}</span
+ >{{ Processdata.donatebaseinfo.createperson }}
+ {{ parseTime(Processdata.donatebaseinfo.createtime) }}</span
>
</p>
<p>
鏇存柊锛�<span
- >{{ Processdata.donatebaseinfo.updateperson
- }} {{
- parseTime(Processdata.donatebaseinfo.updatetime)
- }}</span
+ >{{ Processdata.donatebaseinfo.updateperson }}
+ {{ parseTime(Processdata.donatebaseinfo.updatetime) }}</span
>
</p>
</template>
@@ -39,16 +35,16 @@
>
<p>
鎻愪氦锛�<span>
- {{ Processdata.medicalevaluation.createperson
- }} {{
+ {{ Processdata.medicalevaluation.createperson }}
+ {{
parseTime(Processdata.medicalevaluation.createtime)
}}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.medicalevaluation.updateperson
- }} {{
+ {{ Processdata.medicalevaluation.updateperson }}
+ {{
parseTime(Processdata.medicalevaluation.updatetime)
}}</span
>
@@ -66,16 +62,16 @@
>
<p>
鎻愪氦锛�<span>
- {{ Processdata.relativesconfirmation.createperson
- }} {{
+ {{ Processdata.relativesconfirmation.createperson }}
+ {{
parseTime(Processdata.relativesconfirmation.createtime)
}}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.relativesconfirmation.updateperson
- }} {{
+ {{ Processdata.relativesconfirmation.updateperson }}
+ {{
parseTime(Processdata.relativesconfirmation.updatetime)
}}</span
>
@@ -93,16 +89,16 @@
>
<p>
鎻愪氦锛�<span>
- {{ Processdata.donateflowcharts.createperson
- }} {{
+ {{ Processdata.donateflowcharts.createperson }}
+ {{
parseTime(Processdata.donateflowcharts.createtime)
}}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.donateflowcharts.updateperson
- }} {{
+ {{ Processdata.donateflowcharts.updateperson }}
+ {{
parseTime(Processdata.donateflowcharts.updatetime)
}}</span
>
@@ -120,16 +116,16 @@
>
<p>
鎻愪氦锛�<span>
- {{ Processdata.donateorgansService.createperson
- }} {{
+ {{ Processdata.donateorgansService.createperson }}
+ {{
parseTime(Processdata.donateorgansService.createtime)
}}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.donateorgansService.updateperson
- }} {{
+ {{ Processdata.donateorgansService.updateperson }}
+ {{
parseTime(Processdata.donateorgansService.updatetime)
}}</span
>
@@ -147,16 +143,16 @@
>
<p>
鎻愪氦锛�<span>
- {{ Processdata.donationwitness.createperson
- }} {{
+ {{ Processdata.donationwitness.createperson }}
+ {{
parseTime(Processdata.donationwitness.createtime)
}}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.donationwitness.updateperson
- }} {{
+ {{ Processdata.donationwitness.updateperson }}
+ {{
parseTime(Processdata.donationwitness.updatetime)
}}</span
>
@@ -174,16 +170,16 @@
>
<p>
鎻愪氦锛�<span>
- {{ Processdata.donatecompletioninfo.createperson
- }} {{
+ {{ Processdata.donatecompletioninfo.createperson }}
+ {{
parseTime(Processdata.donatecompletioninfo.createtime)
}}</span
>
</p>
<p>
鏇存柊锛�<span>
- {{ Processdata.donatecompletioninfo.updateperson
- }} {{
+ {{ Processdata.donatecompletioninfo.updateperson }}
+ {{
parseTime(Processdata.donatecompletioninfo.updatetime)
}}</span
>
@@ -1746,7 +1742,7 @@
<el-form-item label-width="100px" label="鑾峰彇鍣ㄥ畼">
<el-checkbox-group v-model="organList.organprocured">
<el-checkbox
- v-for="dict in dict.type.sys_Organ"
+ v-for="dict in sysOrganlistL"
:key="dict.value"
:label="dict.value"
@change="changeorganprocured(dict.value)"
@@ -1781,7 +1777,7 @@
width="90"
prop="organno"
/>
- <el-table-column
+ <!-- <el-table-column
label="绯荤粺缂栧彿"
align="center"
width="120"
@@ -1793,7 +1789,7 @@
placeholder="绯荤粺缂栧彿"
/>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="鍣ㄥ畼绂讳綋鏃堕棿"
align="center"
@@ -1842,7 +1838,7 @@
/>
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
label="鍙椾綋濮撴皬"
align="center"
width="120"
@@ -1854,7 +1850,7 @@
placeholder="鍙椾綋濮撴皬"
/>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="鑾峰彇鐘舵��"
align="center"
@@ -2575,7 +2571,21 @@
allocateddataform: {},
procureddata: [],
transplantdata: [],
-
+ sysOrganlistL:[
+ {label:'蹇冭剰', value:'C38',},
+ {label:'鑲濊剰', value:'C22',},
+ {label:'宸﹁偩', value:'C64L',},
+ {label:'鍙宠偩', value:'C64R',},
+ {label:'鍏ㄨ偤', value:'C34',},
+ {label:'宸﹁偤', value:'C34L',},
+ {label:'鍙宠偤', value:'C34R',},
+ {label:'灏忚偁', value:'C17',},
+ {label:'鑳拌吅', value:'C25',},
+ {label:'閬椾綋', value:'C00',},
+ {label:'宸︾溂瑙掕啘', value:'C69L',},
+ {label:'鍙崇溂瑙掕啘', value:'C69R',},
+ {label:'鍏朵粬', value:'C01',},
+ ],
witnessform: {
infoid: null
},
@@ -3218,6 +3228,9 @@
saveDonatecomporgan(this.transplantdata).then(res => {
if (res == 200) {
this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
+ }else{
+ this.$modal.msgSuccess(res.msg);
+ return
}
});
console.log(this.accomplishform.id, "瀹屾垚id");
@@ -3231,6 +3244,17 @@
addDonatecompletioninfo(this.accomplishform).then(response => {
this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
this.$modal.closeLoading();
+ this.$modal
+ .confirm(
+ '妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�'
+ )
+ .then(() => {
+ this.$router.push({
+ path: "/finance/donorchargedetail/",
+ query: { id: 0, operation: "add", data: this.form }
+ });
+ })
+ .catch(() => {});
});
}
diff --git a/src/views/project/donorcharge/donorcharge/index.vue b/src/views/project/donorcharge/donorcharge/index.vue
index 8f95238..a45d009 100644
--- a/src/views/project/donorcharge/donorcharge/index.vue
+++ b/src/views/project/donorcharge/donorcharge/index.vue
@@ -290,6 +290,7 @@
curdonorinfo = item;
}
});
+ console.log(curdonorinfo,'curdonorinfo');
this.showSelectionDialog = false;
this.$router.push({
path: "/finance/donorchargedetail/",
diff --git a/src/views/project/donorcharge/donorchargedetail/index.vue b/src/views/project/donorcharge/donorchargedetail/index.vue
index 6071dd0..4d4134f 100644
--- a/src/views/project/donorcharge/donorchargedetail/index.vue
+++ b/src/views/project/donorcharge/donorchargedetail/index.vue
@@ -20,7 +20,7 @@
v-for="dict in dict.type.sys_user_sex"
:key="dict.label"
:label="dict.label"
- :value="parseInt(dict.value)"
+ :value="dict.value"
></el-option>
</el-select>
</el-form-item>
@@ -134,6 +134,7 @@
<el-input
v-model="scope.row.organname"
placeholder="鍣ㄥ畼鍚嶇О"
+ :disabled="true"
/>
</template>
</el-table-column>
@@ -144,7 +145,11 @@
prop="caseno"
>
<template slot-scope="scope">
- <el-input v-model="scope.row.caseno" placeholder="绯荤粺缂栧彿" />
+ <el-input
+ v-model="scope.row.caseno"
+ :disabled="true"
+ placeholder="绯荤粺缂栧彿"
+ />
</template>
</el-table-column>
<el-table-column
@@ -154,7 +159,11 @@
width="150"
>
<template slot-scope="scope">
- <el-input v-model="scope.row.amount" placeholder="瀹炴敹閲戦" />
+ <el-input
+ v-model="scope.row.amount"
+ :disabled="true"
+ placeholder="瀹炴敹閲戦"
+ />
</template>
</el-table-column>
<el-table-column
@@ -166,6 +175,7 @@
<template slot-scope="scope">
<el-date-picker
clearable
+ :disabled="true"
size="small"
style="width: 100%"
v-model="scope.row.amounttime"
@@ -185,6 +195,7 @@
<template slot-scope="scope">
<el-input
v-model="scope.row.organcharge"
+ :disabled="true"
placeholder="鏍囧噯璐圭敤"
/>
</template>
@@ -197,6 +208,7 @@
>
<template slot-scope="scope">
<org-selecter
+ :disabled="true"
ref="tranHosSelect"
:org-type="'4'"
v-model="scope.row.hospitalno"
@@ -211,7 +223,11 @@
prop="name"
>
<template slot-scope="scope">
- <el-input v-model="scope.row.name" placeholder="鍙椾綋濮撴皬" />
+ <el-input
+ v-model="scope.row.name"
+ :disabled="true"
+ placeholder="鍙椾綋濮撴皬"
+ />
</template>
</el-table-column>
<el-table-column
@@ -223,6 +239,7 @@
<template slot-scope="scope">
<el-date-picker
clearable
+ :disabled="true"
size="small"
style="width: 100%"
v-model="scope.row.organtime"
@@ -234,7 +251,7 @@
</template>
</el-table-column>
<el-table-column prop="organchargedesc" align="center" label="澶囨敞">
- <template slot-scope="scope">
+ <template slot-scope="scope" width="300">
<el-input
v-model="scope.row.organchargedesc"
placeholder="澶囨敞"
@@ -246,12 +263,12 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button
- type="primary"
+ type="success"
@click="submitForm"
v-if="operationType == 'add' || operationType == 'update'"
>淇� 瀛�</el-button
>
- <el-button type="primary" @click="cancel">鍏抽棴</el-button>
+ <el-button type="info" @click="cancel">鍏抽棴</el-button>
</div>
</div>
</div>
@@ -620,7 +637,6 @@
getDonorcharge(this.curId).then(response => {
this.form = response.data;
console.log("getDonorcharge", response);
-
//鍣ㄥ畼璐圭敤淇℃伅
this.organParams.donorchargeid = this.curId;
console.log("this.organParams", this.organParams);
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index a5186fc..290f53e 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -3019,10 +3019,8 @@
.catch(() => {
//鍑犵偣鍙栨秷鐨勬彁绀�
});
-
//鍏ㄩ儴鍒犻櫎鍚庢坊鍔犱竴鏉℃柊琛�
},
-
//璁＄畻鎬婚噾棰�
sumTotalFee(row) {
let allSum = 0;
diff --git a/src/views/project/organization/index.vue b/src/views/project/organization/index.vue
index 8055bc3..7cb588f 100644
--- a/src/views/project/organization/index.vue
+++ b/src/views/project/organization/index.vue
@@ -1,63 +1,151 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ v-show="showSearch"
+ label-width="68px"
+ >
<el-form-item label="缁勭粐鍚嶇О" prop="organizationname">
- <el-input v-model="queryParams.organizationname" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" clearable size="small"
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.organizationname"
+ placeholder="璇疯緭鍏ョ粍缁囧悕绉�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鏈烘瀯绫诲瀷" prop="organizationtype">
- <el-select v-model="queryParams.organizationtype" placeholder="璇烽�夋嫨鏈烘瀯绫诲瀷" clearable size="small">
- <el-option v-for="dict in dict.type.sys_OrganizationType" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ v-model="queryParams.organizationtype"
+ placeholder="璇烽�夋嫨鏈烘瀯绫诲瀷"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_OrganizationType"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
<el-form-item label="鎵�鍦ㄥ湴鍖�" prop="regionallevel">
- <el-select v-model="queryParams.regionallevel" placeholder="璇烽�夋嫨鎵�鍦ㄥ湴鍖�" clearable size="small">
- <el-option v-for="dict in dict.type.sys_RegionalLevel" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ v-model="queryParams.regionallevel"
+ placeholder="璇烽�夋嫨鎵�鍦ㄥ湴鍖�"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_RegionalLevel"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
<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-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button>
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ >鏂板</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleUpdate">淇敼</el-button>
+ <el-button
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ >淇敼</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
- @click="handleDelete">鍒犻櫎</el-button>
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ >鍒犻櫎</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
- @click="handleExport">瀵煎嚭</el-button>
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ :loading="exportLoading"
+ @click="handleExport"
+ >瀵煎嚭</el-button
+ >
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar
+ :showSearch.sync="showSearch"
+ @queryTable="getList"
+ ></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="organizationList" @selection-change="handleSelectionChange">
+ <el-table
+ v-loading="loading"
+ :data="organizationList"
+ @selection-change="handleSelectionChange"
+ >
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="涓婚敭鑷" align="center" prop="id" /> -->
<el-table-column label="鏈烘瀯绫诲瀷" align="center" prop="organizationtype">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_OrganizationType" :value="scope.row.organizationtype" />
+ <dict-tag
+ :options="dict.type.sys_OrganizationType"
+ :value="scope.row.organizationtype"
+ />
</template>
</el-table-column>
<el-table-column label="缁勭粐缂栧彿" align="left" prop="organizationid" />
- <el-table-column label="缁勭粐鍚嶇О" width="260px" align="left" prop="organizationname" />
+ <el-table-column
+ label="缁勭粐鍚嶇О"
+ width="260px"
+ align="left"
+ prop="organizationname"
+ />
<el-table-column label="鎵�鍦ㄥ湴鍖�" align="left" prop="regionallevel">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_RegionalLevel" :value="scope.row.regionallevel" />
+ <dict-tag
+ :options="dict.type.sys_RegionalLevel"
+ :value="scope.row.regionallevel"
+ />
</template>
</el-table-column>
- <el-table-column label="鍦板潃" width="260px" align="left" prop="registeraddress" />
+ <el-table-column
+ label="鍦板潃"
+ width="260px"
+ align="left"
+ prop="registeraddress"
+ />
<!--
<el-table-column label="鑱旂郴浜�" align="left" prop="contactperson" />
<el-table-column label="鑱旂郴鐢佃瘽" align="left" prop="contactnumber" />
@@ -67,66 +155,127 @@
</template>
</el-table-column>
-->
- <el-table-column label="鎿嶄綔" align="left" class-name="small-padding fixed-width">
+ <el-table-column
+ label="鎿嶄綔"
+ align="left"
+ class-name="small-padding fixed-width"
+ >
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ >淇敼</el-button
+ >
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(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" :close-on-click-modal="false" :visible.sync="open" width="60%" append-to-body>
+ <el-dialog
+ :title="title"
+ :close-on-click-modal="false"
+ :visible.sync="open"
+ width="60%"
+ append-to-body
+ >
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row style="overflow: hidden">
<el-col :span="5">
<el-form-item label="鎵�灞炲湴鍖�" prop="regionallevel">
<el-select v-model="form.regionallevel" placeholder="璇烽�夋嫨鍦板尯">
- <el-option v-for="dict in dict.type.sys_RegionalLevel" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-option
+ v-for="dict in dict.type.sys_RegionalLevel"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="缁勭粐鍚嶇О" prop="organizationname">
- <el-input v-model="form.organizationname" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" />
+ <el-input
+ v-model="form.organizationname"
+ placeholder="璇疯緭鍏ョ粍缁囧悕绉�"
+ />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="缁勭粐缂栧彿" prop="organizationid">
- <el-input v-model="form.organizationid" placeholder="璇疯緭鍏ョ粍缁囩紪鍙�" />
+ <el-input
+ v-model="form.organizationid"
+ :disabled="true"
+ placeholder="璇疯緭鍏ョ粍缁囩紪鍙�"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<el-form-item label="鏈烘瀯绫诲瀷" prop="organizationtype">
- <el-select v-model="form.organizationtype" placeholder="璇烽�夋嫨鏈烘瀯绫诲瀷">
- <el-option v-for="dict in dict.type.sys_OrganizationType" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ v-model="form.organizationtype"
+ placeholder="璇烽�夋嫨鏈烘瀯绫诲瀷"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_OrganizationType"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鍖婚櫌鎬ц川" prop="hospitalnature">
- <el-select v-model="form.hospitalnature" placeholder="璇烽�夋嫨鍖婚櫌鎬ц川">
- <el-option v-for="dict in dict.type.sys_HospitalNature" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ v-model="form.hospitalnature"
+ placeholder="璇烽�夋嫨鍖婚櫌鎬ц川"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_HospitalNature"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鍖婚櫌缂栫爜" prop="medicalcode">
- <el-input v-model="form.medicalcode" placeholder="璇疯緭鍏ュ尰鐤楁満鏋勭紪鍙�" />
+ <el-input
+ v-model="form.medicalcode"
+ placeholder="璇疯緭鍏ュ尰鐤楁満鏋勭紪鍙�"
+ />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="娉ㄥ唽鏃堕棿" prop="registertime">
- <el-date-picker clearable size="small" v-model="form.registertime" type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨娉ㄥ唽鏃堕棿">
+ <el-date-picker
+ clearable
+ size="small"
+ v-model="form.registertime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨娉ㄥ唽鏃堕棿"
+ >
</el-date-picker>
</el-form-item>
</el-col>
@@ -134,17 +283,26 @@
<el-row>
<el-col :span="10">
<el-form-item label="娉ㄥ唽鍦板潃" prop="registeraddress">
- <el-input v-model="form.registeraddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鐐硅缁嗗湴鍧�" />
+ <el-input
+ v-model="form.registeraddress"
+ placeholder="璇疯緭鍏ユ敞鍐屽湴鐐硅缁嗗湴鍧�"
+ />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鑱旂郴浜�" prop="contactperson">
- <el-input v-model="form.contactperson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+ <el-input
+ v-model="form.contactperson"
+ placeholder="璇疯緭鍏ヨ仈绯讳汉"
+ />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="鑱旂郴鐢佃瘽" prop="contactnumber">
- <el-input v-model="form.contactnumber" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ <el-input
+ v-model="form.contactnumber"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -156,14 +314,21 @@
</el-col>
<el-col :span="10">
<el-form-item label="閾惰璐﹀彿" prop="bankaccount">
- <el-input v-model="form.bankaccount" placeholder="璇疯緭鍏ラ摱琛岃处鍙�" />
+ <el-input
+ v-model="form.bankaccount"
+ placeholder="璇疯緭鍏ラ摱琛岃处鍙�"
+ />
</el-form-item>
</el-col>
-
</el-row>
<el-row>
<el-form-item label="浠嬬粛" prop="introduction">
- <el-input :rows="5" v-model="form.introduction" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input
+ :rows="5"
+ v-model="form.introduction"
+ type="textarea"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ />
</el-form-item>
</el-row>
<el-row>
@@ -189,7 +354,7 @@
delOrganization,
addOrganization,
updateOrganization,
- exportOrganization,
+ exportOrganization
} from "@/api/project/organization";
export default {
@@ -223,22 +388,24 @@
pageSize: 10,
organizationname: null,
organizationtype: null,
- province: null,
+ province: null
},
+ initregionallevel: "",
+ inithospitalnature: "",
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
organizationname: [
- { required: true, message: "缁勭粐鍚嶇О涓嶈兘涓虹┖", trigger: "blur" },
+ { required: true, message: "缁勭粐鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
],
- organizationid: [
- { required: true, message: "缁勭粐缂栧彿涓嶈兘涓虹┖", trigger: "blur" },
+ hospitalnature: [
+ { required: true, message: "鍖婚櫌鎬ц川涓嶈兘涓虹┖", trigger: "blur" },
],
regionallevel: [
- { required: true, message: "鎵�灞炲湴甯備笉鑳戒负绌�", trigger: "blur" },
- ],
- },
+ { required: true, message: "鎵�灞炲湴甯備笉鑳戒负绌�", trigger: "blur" }
+ ]
+ }
};
},
created() {
@@ -249,7 +416,7 @@
/** 鏌ヨ鏈烘瀯绠＄悊鍒楄〃 */
getList() {
this.loading = true;
- listOrganization(this.queryParams).then((response) => {
+ listOrganization(this.queryParams).then(response => {
this.organizationList = response.rows;
this.total = response.total;
this.loading = false;
@@ -292,7 +459,7 @@
community: null,
communityname: null,
countycode: null,
- countyname: null,
+ countyname: null
};
this.resetForm("form");
},
@@ -308,7 +475,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map((item) => item.id);
+ this.ids = selection.map(item => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@@ -322,7 +489,9 @@
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
- getOrganization(id).then((response) => {
+ getOrganization(id).then(response => {
+ this.initregionallevel = response.data.regionallevel;
+ this.inithospitalnature = response.data.hospitalnature;
this.form = response.data;
this.open = true;
this.title = "淇敼鏈烘瀯绠＄悊";
@@ -330,37 +499,65 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
- this.$refs["form"].validate((valid) => {
- if (valid) {
- if (this.form.id != null) {
- updateOrganization(this.form).then((response) => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
- });
- } else {
- addOrganization(this.form).then((response) => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
+ if (
+ this.initregionallevel == this.form.regionallevel &&
+ this.inithospitalnature == this.form.hospitalnature
+ ) {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ if (this.form.id != null) {
+ updateOrganization(this.form).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addOrganization(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
}
+ });
+ } else {
+ if (this.form.id != null) {
+ this.$modal
+ .confirm("鏈淇敼娑夊強鍏抽敭瀛楁锛屼繚瀛樺皢浼氭洿鏂扮粍缁囩紪鍙锋槸鍚︾户缁紵")
+ .then(()=> {
+ console.log(this.form);
+ return delOrganization(this.form.id);
+ })
+ .then(() => {
+ this.form.id = null;
+ addOrganization(this.form).then(response => {
+ this.$modal.msgSuccess("缂栬緫鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ });
+ } else {
+ addOrganization(this.form).then(response => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
}
- });
+ }
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal
.confirm('鏄惁纭鍒犻櫎鏈烘瀯绠＄悊缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
- .then(function () {
+ .then(function() {
return delOrganization(ids);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -371,12 +568,12 @@
this.exportLoading = true;
return exportOrganization(queryParams);
})
- .then((response) => {
+ .then(response => {
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => { });
- },
- },
+ .catch(() => {});
+ }
+ }
};
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/project/unitCost/index.vue b/src/views/project/unitCost/index.vue
index 33cfcc3..46c2196 100644
--- a/src/views/project/unitCost/index.vue
+++ b/src/views/project/unitCost/index.vue
@@ -450,6 +450,8 @@
exportDonorcharge,
listDonorpayment
} from "@/api/project/donorcharge";
+import { listOrganization, } from "@/api/project/organization";
+
import OrgSelecter from "@/views/project/components/orgselect";
export default {
@@ -529,6 +531,7 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
confirmSelection() {
var curdonorinfo = null;
+ console.log(this.selectionForm.donorid,'donorid');
//浠庢渚嬪垪琛ㄨ幏鍙栦俊鎭�
this.donorinfolist.map(item => {
if (this.selectionForm.donorid == item.id) {
@@ -550,6 +553,14 @@
this.total = response.total;
this.loading = false;
});
+ let searchData = {
+ organizationtype: '3', //浼犲叆鐨勭被鍨�
+ pageNum: 1,
+ pageSize: 100000
+ }; //鎼滅储鏉′欢
+ listOrganization(searchData).then(res => {
+ console.log(res);
+ });
},
// 鍙栨秷鎸夐挳
diff --git a/src/views/project/unitCost/particulars.vue b/src/views/project/unitCost/particulars.vue
index c2f6fe8..fb32417 100644
--- a/src/views/project/unitCost/particulars.vue
+++ b/src/views/project/unitCost/particulars.vue
@@ -7,52 +7,54 @@
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="name">
<el-input
- v-model="form.name"
+ v-model="form.createby"
placeholder="璇疯緭鍏ュ鍚�"
:disabled="true"
/>
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="5">
<el-form-item label="鏀舵鐘舵��" prop="sex">
- <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
+ <el-select v-model="form.paystatus" placeholder="璇疯緭鍏ユ�у埆">
<el-option
- v-for="dict in dict.type.sys_user_sex"
+ v-for="dict in dict.type.sys_gathering"
:key="dict.label"
:label="dict.label"
- :value="parseInt(dict.value)"
+ :value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="borthdate">
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<el-date-picker
clearable
size="small"
- v-model="form.borthdate"
+ v-model="form.createTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="閫夋嫨鍑虹敓骞存湀"
>
</el-date-picker>
</el-form-item>
- </el-col> </el-row
+ </el-col>
+
+ </el-row
><el-row
><el-col :span="5"
><el-form-item label="鏀舵鍗曚綅" prop="donateno">
<el-input
- v-model="form.donateno"
+ v-model="form.beneficiary"
placeholder="璇疯緭鍏ユ敹娆惧崟浣�"
:disabled="true"
/>
</el-form-item>
</el-col>
- <el-col :span="7"
+ <el-col :span="12"
><el-form-item label="鏀舵閾惰" prop="donateno">
<el-input
- v-model="form.donateno"
+ v-model="form.beneficiarybank"
placeholder="璇疯緭鍏ユ敹娆鹃摱琛�"
:disabled="true"
/>
@@ -62,14 +64,14 @@
<el-col :span="5">
<el-form-item label="鏀舵琛屽彿" prop="donationcategory">
<el-input
- v-model="form.donationcategory"
+ v-model="form.beneficiaryaccount"
placeholder="璇疯緭鍏ユ敹娆捐鍙�"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="17">
+ <el-col :span="24">
<el-form-item label="鑱旂郴淇℃伅" prop="remark">
<el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
@@ -78,40 +80,37 @@
<el-row>
<el-col :span="5">
<el-form-item label="浠樻鍖婚櫌" prop="sex">
- <el-select v-model="form.sex" placeholder="璇烽�夋嫨鍖婚櫌">
- <el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.label"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
- </el-select>
+ <el-input
+ v-model="form.hospitalname"
+ placeholder="璇疯緭鍏ヤ粯娆惧尰闄�"
+ :disabled="true"
+ />
</el-form-item>
</el-col>
- <el-col :span="5">
- <el-form-item label="搴旀敹閲戦" prop="chargeamount">
+ <el-col :span="6">
+ <el-form-item label="搴旀敹閲戦" prop="receivableamount">
<el-input
- v-model="form.chargeamount"
+ v-model="form.receivableamount"
placeholder="璇疯緭鍏ュ簲鏀堕噾棰�"
:disabled="true"
/>
</el-form-item>
</el-col>
- <el-col :span="5">
- <el-form-item label="瀹炴敹閲戦" prop="chargeamounted">
+ <el-col :span="6">
+ <el-form-item label="瀹炴敹閲戦" prop="receivedamount">
<el-input
- v-model="form.chargeamounted"
+ v-model="form.receivedamount"
placeholder="璇疯緭鍏ュ疄鏀堕噾棰�"
:disabled="true"
/>
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="borthdate">
+ <el-form-item label="鐢宠鏃ユ湡" prop="updatetime">
<el-date-picker
clearable
size="small"
- v-model="form.borthdate"
+ v-model="form.updatetime"
type="date"
value-format="yyyy-MM-dd"
placeholder="閫夋嫨鍑虹敓骞存湀"
@@ -120,6 +119,10 @@
</el-form-item>
</el-col>
</el-row>
+ <div class="headlines">
+ <div>鏀舵鏄庣粏</div>
+ <el-button type="primary" @click="handleAddpatient">鏂板</el-button>
+ </div>
<el-row style="margin-top: 10px">
<el-table
:data="donorchargeorgans"
@@ -276,13 +279,13 @@
align="center"
>
<template slot-scope="scope">
- <el-button
+ <!-- <el-button
type="text"
icon="el-icon-circle-plus-outline"
@click="handleAddpatient(scope.row)"
v-hasPermi="['system:donorcharge:edit']"
>鏂板</el-button
- >
+ > -->
<el-button
type="text"
@@ -306,12 +309,12 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button
- type="primary"
+ type="success"
@click="submitForm"
v-if="operationType == 'add' || operationType == 'update'"
>淇� 瀛�</el-button
>
- <el-button type="primary" @click="cancel">鍏抽棴</el-button>
+ <el-button type="info" @click="cancel">鍏抽棴</el-button>
</div>
<!-- 娣诲姞鎮ｈ�� -->
<el-dialog
@@ -591,7 +594,7 @@
Li_area_select,
pdf
},
- dicts: ["sys_user_sex", "sys_0_1"],
+ dicts: ["sys_gathering", "sys_0_1"],
name: "Donorchargemanager",
data() {
return {
@@ -957,7 +960,7 @@
handleUpdate() {
this.reset();
this.open = true;
- this.title = "淇敼鎹愮尞妗堜緥鍣ㄥ畼璐圭敤琛�";
+ this.title = "鏀舵鐢宠鍗曠紪杈�";
getDonorcharge(this.curId).then(response => {
this.form = response.data;
@@ -1387,6 +1390,15 @@
text-align: center;
}
}
+.headlines {
+ font-size: 25px;
+ display: flex;
+ width: 96%;
+ justify-content: space-between;
+ padding-left: 5px;
+ margin-bottom: 10px;
+ border-left: 5px solid rgb(65, 161, 190);
+ }
.button-delete {
color: rgb(236, 69, 69);
}
--
Gitblit v1.9.3