From 2b40b960dd1f30fec8c5e0a90d22b12aeccc5fec Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 14 四月 2023 21:14:36 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/expertFeeFundApply/index.vue | 142 +++---
vue.config.js | 4
src/views/project/travelexpenseslist/index.vue | 351 ++++++++++-----
src/views/project/fund/fundApply/index.vue | 73 +-
src/views/project/fund/medicalCostFundApply/index.vue | 83 +-
src/views/project/donationwitness/index.vue | 648 +++++-----------------------
6 files changed, 505 insertions(+), 796 deletions(-)
diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index c5cf180..4fa5c29 100644
--- a/src/views/project/donationwitness/index.vue
+++ b/src/views/project/donationwitness/index.vue
@@ -1,47 +1,23 @@
<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="queryParams.treatmenthospitalno"
- />
+ <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalno">
+ <org-selecter ref="orgSelecter" :org-type="'3'" v-model="queryParams.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>
@@ -49,18 +25,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>
@@ -69,12 +36,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>
@@ -82,136 +44,69 @@
<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>
</el-row>
</el-form>
<el-row :gutter="10" class="mb8">
-
+
<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>
-
+
</el-row>
- <el-table
- v-loading="loading"
- :default-sort="{ prop: 'deathtime', order: 'descending' }"
- border
- :data="donatebaseinfoList"
- >
- <el-table-column
- label="鎶ュ憡鏃堕棿"
- align="center"
- prop="reporttime"
- width="140"
- >
+ <el-table v-loading="loading" :default-sort="{ prop: 'deathtime', order: 'descending' }" border
+ :data="donatebaseinfoList">
+ <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reporttime" width="140">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.reporttime, "{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="treatmenthospitalname" />
<!-- <el-table-column label="韬唤璇佸彿" prop="idcardno" width="200" /> -->
<el-table-column label="鎹愮尞绫诲埆" align="center" prop="dwdonationcategory" width="150">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_DonationCategory"
- :value="scope.row.dwdonationcategory"
- />
+ <dict-tag :options="dict.type.sys_DonationCategory" :value="scope.row.dwdonationcategory" />
</template>
</el-table-column>
<el-table-column label="瑙佽瘉鏃堕棿" align="center" prop="operationbegtime">
- <template slot-scope="scope">
+ <template slot-scope="scope">
<span>{{ parseTime(scope.row.operationbegtime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <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="140"
- fixed="right"
- >
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="140" fixed="right">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleAdd(scope.row)"
- >瑙佽瘉鐧昏</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">瑙佽瘉鐧昏</el-button>
<!-- <el-button
v-if="scope.row.recordstate==2 || scope.row.recordstate==3"
size="mini"
@@ -220,179 +115,85 @@
@click="submitRecord(scope.row)"
v-hasPermi="['project:donatebaseinfo:edit']"
>涓婃姤浼︾悊瀹℃煡</el-button> -->
- <el-button
- size="mini"
- type="text"
- icon="el-icon-refrigerator"
- @click="handledownload(scope.row)"
- >涓嬭浇</el-button
- >
+ <el-button 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="1000px"
- append-to-body
- :close-on-click-modal="false"
- >
- <el-form
- ref="form"
- style="margin: 0px auto"
- :model="form"
- :rules="rules"
- label-width="120px"
- >
+ <el-dialog :title="title" align="center" :visible.sync="open" width="1000px" append-to-body
+ :close-on-click-modal="false">
+ <el-form ref="form" style="margin: 0px auto" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="12">
<el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input
- v-model="curCase.donorno"
- disabled
- placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�"
- />
+ <el-input v-model="curCase.donorno" disabled placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item
- align="left"
- label="鎹愮尞鍖婚櫌"
- prop="treatmenthospitalname"
- >
- <org-selecter
- ref="orgSelecter"
- :org-type="'3'"
- v-model="curCase.treatmenthospitalname"
- disabled
- />
+ <el-form-item align="left" label="鎹愮尞鍖婚櫌" prop="treatmenthospitalname">
+ <org-selecter ref="orgSelecter" :org-type="'3'" v-model="curCase.treatmenthospitalname" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="濮撳悕 " prop="name">
- <el-input
- v-model="curCase.name"
- disabled
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- />
+ <el-input v-model="curCase.name" disabled placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎬у埆" prop="sex">
- <el-select
- v-model="curCase.sex"
- disabled
- placeholder="璇烽�夋嫨鎬у埆"
- >
- <el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="curCase.sex" disabled placeholder="璇烽�夋嫨鎬у埆">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
- <el-date-picker
- style="width: 95%"
- clearable
- v-model="curCase.birthday"
- type="date"
- value-format="yyyy:MM:dd"
- placeholder="閫夋嫨鍑虹敓鏃ユ湡"
- disabled
- >
+ <el-date-picker style="width: 95%" clearable v-model="curCase.birthday" type="date"
+ value-format="yyyy:MM:dd" placeholder="閫夋嫨鍑虹敓鏃ユ湡" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="姘戞棌" prop="nation">
- <el-select
- v-model="curCase.nation"
- disabled
- placeholder="璇烽�夋嫨姘戞棌"
- >
- <el-option
- v-for="dict in dict.type.sys_nation"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="curCase.nation" disabled placeholder="璇烽�夋嫨姘戞棌">
+ <el-option v-for="dict in dict.type.sys_nation" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
- </el-col> </el-row
- ><el-row>
+ </el-col> </el-row><el-row>
<el-col :span="6">
<el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
- <el-select
- v-model="curCase.idcardtype"
- disabled
- placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.sys_IDType"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-select v-model="curCase.idcardtype" disabled placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+ <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="璇佷欢鍙风爜" prop="idcardno">
- <el-input
- ref="updateBSvalue"
- class="sfzcode"
- v-model="curCase.idcardno"
- placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�"
- disabled
- />
+ <el-input ref="updateBSvalue" class="sfzcode" v-model="curCase.idcardno" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瀛﹀巻" prop="education">
- <el-select
- v-model="curCase.education"
- disabled
- placeholder="璇烽�夋嫨瀛﹀巻"
- >
- <el-option
- v-for="dict in dict.type.sys_education"
- :key="dict.value"
- :label="dict.value"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="curCase.education" disabled placeholder="璇烽�夋嫨瀛﹀巻">
+ <el-option v-for="dict in dict.type.sys_education" :key="dict.value" :label="dict.value"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鑱屼笟" prop="occupation">
- <el-select
- v-model="curCase.occupation"
- disabled
- placeholder="璇烽�夋嫨鑱屼笟"
- >
- <el-option
- v-for="dict in dict.type.sys_occupation"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="curCase.occupation" disabled placeholder="璇烽�夋嫨鑱屼笟">
+ <el-option v-for="dict in dict.type.sys_occupation" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -402,12 +203,7 @@
<el-col :span="24">
<el-form-item align="left" label="鎹愮尞鍐冲畾">
<el-checkbox-group v-model="form.organdonation">
- <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>
@@ -418,12 +214,8 @@
<el-col :span="24">
<el-form-item align="left" label="鎹愮尞绫诲埆" prop="donationcategory">
<el-radio-group v-model="form.donationcategory">
- <el-radio
- v-for="dict in dict.type.sys_DonationCategory"
- :key="dict.value"
- :label="dict.value"
- >{{ dict.label }}</el-radio
- >
+ <el-radio v-for="dict in dict.type.sys_DonationCategory" :key="dict.value" :label="dict.value">{{
+ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -444,41 +236,26 @@
</el-col>
<el-col :span="10">
<el-form-item align="left" label="鍖荤敓涓�" prop="deathjudgedocto">
- <el-input
- v-model="form.deathjudgedocto"
- placeholder="鍒ゅ畾鍖荤敓濮撳悕"
- />
+ <el-input v-model="form.deathjudgedocto" placeholder="鍒ゅ畾鍖荤敓濮撳悕" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item align="left" label="鍖荤敓浜�" prop="deathjudgedoctt">
- <el-input
- v-model="form.deathjudgedoctt"
- placeholder="鍒ゅ畾鍖荤敓濮撳悕"
- />
+ <el-input v-model="form.deathjudgedoctt" placeholder="鍒ゅ畾鍖荤敓濮撳悕" />
</el-form-item>
</el-col>
</el-row>
- <el-row
- ><el-col :span="2"><el-form-item align="left" label="" /> </el-col>
+ <el-row><el-col :span="2"><el-form-item align="left" label="" /> </el-col>
<el-col :span="10">
<el-form-item align="left" label="姝讳骸鏃堕棿" prop="deathtime">
- <el-date-picker
- clearable
- v-model="form.deathtime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨姝讳骸鏃堕棿"
- >
+ <el-date-picker clearable v-model="form.deathtime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨姝讳骸鏃堕棿">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item align="left" label="姝讳骸鍘熷洜" prop="deathreason">
- <el-input
- v-model="form.deathreason"
- placeholder="璇疯緭鍏ユ浜″師鍥�"
- />
+ <el-input v-model="form.deathreason" placeholder="璇疯緭鍏ユ浜″師鍥�" />
</el-form-item>
</el-col>
</el-row>
@@ -488,249 +265,117 @@
</el-col>
<el-col :span="10">
<el-form-item align="left" label="寮�濮嬫椂闂�" prop="operationbegtime">
- <el-date-picker
- clearable
- v-model="form.operationbegtime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鎵嬫湳寮�濮嬫椂闂�"
- >
+ <el-date-picker clearable v-model="form.operationbegtime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鎵嬫湳寮�濮嬫椂闂�">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item align="left" label="缁撴潫鏃堕棿" prop="operationendtime">
- <el-date-picker
- clearable
- v-model="form.operationendtime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
- >
+ <el-date-picker clearable v-model="form.operationendtime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
- <el-row
- ><el-col :span="2"
- ><el-form-item align="left" label="鑵逛富鍔ㄨ剦:" />
+ <el-row><el-col :span="2"><el-form-item align="left" label="鑵逛富鍔ㄨ剦:" />
</el-col>
<el-col :span="10">
- <el-form-item
- label="鎻掔鏃堕棿"
- align="left"
- prop="abdominalaortacannulatime"
- >
- <el-date-picker
- clearable
- v-model="form.abdominalaortacannulatime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鑵逛富鍔ㄨ剦鎻掔鏃堕棿"
- >
+ <el-form-item label="鎻掔鏃堕棿" align="left" prop="abdominalaortacannulatime">
+ <el-date-picker clearable v-model="form.abdominalaortacannulatime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鑵逛富鍔ㄨ剦鎻掔鏃堕棿">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="10">
- <el-form-item
- label="鐏屾敞鏃堕棿"
- align="left"
- prop="abdominalaortaperfusiontime"
- >
- <el-date-picker
- clearable
- v-model="form.abdominalaortaperfusiontime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿"
- >
+ <el-form-item label="鐏屾敞鏃堕棿" align="left" prop="abdominalaortaperfusiontime">
+ <el-date-picker clearable v-model="form.abdominalaortaperfusiontime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
- <el-row
- ><el-col :span="2"
- ><el-form-item align="left" label="闂ㄩ潤鑴�:" />
+ <el-row><el-col :span="2"><el-form-item align="left" label="闂ㄩ潤鑴�:" />
</el-col>
<el-col :span="10">
- <el-form-item
- label="鎻掔鏃堕棿"
- align="left"
- prop="portalveincannulatime"
- >
- <el-date-picker
- clearable
- v-model="form.portalveincannulatime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨闂ㄩ潤鑴夎剦鎻掔鏃堕棿"
- >
+ <el-form-item label="鎻掔鏃堕棿" align="left" prop="portalveincannulatime">
+ <el-date-picker clearable v-model="form.portalveincannulatime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夎剦鎻掔鏃堕棿">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="10">
- <el-form-item
- label="鐏屾敞鏃堕棿"
- align="left"
- prop="portalveinperfusiontime"
- >
- <el-date-picker
- clearable
- v-model="form.portalveinperfusiontime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
- >
+ <el-form-item label="鐏屾敞鏃堕棿" align="left" prop="portalveinperfusiontime">
+ <el-date-picker clearable v-model="form.portalveinperfusiontime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
- <el-row
- ><el-col :span="2"
- ><el-form-item align="left" label="鑲哄姩鑴�:" />
+ <el-row><el-col :span="2"><el-form-item align="left" label="鑲哄姩鑴�:" />
</el-col>
<el-col :span="10">
- <el-form-item
- label="鎻掔鏃堕棿"
- align="left"
- prop="pulmonaryarterycannulatime"
- >
- <el-date-picker
- clearable
- v-model="form.pulmonaryarterycannulatime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨闂ㄩ潤鑴夋彃绠℃椂闂�"
- >
+ <el-form-item label="鎻掔鏃堕棿" align="left" prop="pulmonaryarterycannulatime">
+ <el-date-picker clearable v-model="form.pulmonaryarterycannulatime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夋彃绠℃椂闂�">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="10">
- <el-form-item
- label="鐏屾敞鏃堕棿"
- align="left"
- prop="pulmonaryarteryperfusiontime"
- >
- <el-date-picker
- clearable
- v-model="form.pulmonaryarteryperfusiontime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
- >
+ <el-form-item label="鐏屾敞鏃堕棿" align="left" prop="pulmonaryarteryperfusiontime">
+ <el-date-picker clearable v-model="form.pulmonaryarteryperfusiontime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
- <el-row
- ><el-col :span="2"
- ><el-form-item align="left" label="涓诲姩鑴�:" />
+ <el-row><el-col :span="2"><el-form-item align="left" label="涓诲姩鑴�:" />
</el-col>
<el-col :span="10">
<el-form-item label="鐏屾敞鏃堕棿" align="left" prop="aortacannulatime">
- <el-date-picker
- clearable
- v-model="form.aortacannulatime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
- >
+ <el-date-picker clearable v-model="form.aortacannulatime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="10">
- <el-form-item
- label="鐏屾敞鏃堕棿"
- align="left"
- prop="aortaperfusiontime"
- >
- <el-date-picker
- clearable
- v-model="form.aortaperfusiontime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
- >
+ <el-form-item label="鐏屾敞鏃堕棿" align="left" prop="aortaperfusiontime">
+ <el-date-picker clearable v-model="form.aortaperfusiontime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-table :data="tableData" border>
- <el-table-column
- align="center"
- width="80px"
- prop="organname"
- label="鍣ㄥ畼鍚嶇О"
- >
+ <el-table-column align="center" width="80px" prop="organname" label="鍣ㄥ畼鍚嶇О">
</el-table-column>
- <el-table-column
- align="center"
- width="220px"
- prop="gainhospitalno"
- label="鑾峰彇缁勭粐"
- >
+ <el-table-column align="center" width="220px" prop="gainhospitalno" label="鑾峰彇缁勭粐">
<template slot-scope="scope">
- <org-selecter
- ref="gainhosselect"
- :org-type="'4'"
- v-model="scope.row.gainhospitalno"
- />
+ <org-selecter ref="gainhosselect" :org-type="'4'" v-model="scope.row.gainhospitalno" />
</template>
</el-table-column>
- <el-table-column
- align="center"
- width="140px"
- prop="organgetdoct"
- label="鑾峰彇鍖诲笀"
- >
+ <el-table-column align="center" width="140px" prop="organgetdoct" label="鑾峰彇鍖诲笀">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.organgetdoct"
- placeholder="璇疯緭鍏ヨ幏鍙栧尰甯�"
- ></el-input>
+ <el-input v-model="scope.row.organgetdoct" placeholder="璇疯緭鍏ヨ幏鍙栧尰甯�"></el-input>
</template>
</el-table-column>
- <el-table-column
- align="center"
- width="210px"
- prop="organgettime"
- label="鑾峰彇鏃ユ湡"
- >
+ <el-table-column align="center" width="210px" prop="organgettime" label="鑾峰彇鏃ユ湡">
<template slot-scope="scope">
<el-row>
- <el-date-picker
- clearable
- size="small"
- style="width: 100%"
- v-model="scope.row.organgettime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍣ㄥ畼鑾峰彇鏃堕棿"
- >
+ <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.organgettime"
+ type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍣ㄥ畼鑾峰彇鏃堕棿">
</el-date-picker>
</el-row>
</template>
</el-table-column>
- <el-table-column
- label="鍣ㄥ畼鐘舵��"
- align="center"
- prop="organstate"
- width="180"
- >
+ <el-table-column label="鍣ㄥ畼鐘舵��" align="center" prop="organstate" width="180">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.organstate"
- placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
- >
- <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="璇烽�夋嫨鍣ㄥ畼鐘舵��">
+ <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>
@@ -739,53 +384,33 @@
<el-col :span="12">
<el-form-item align="left" label="榛樺搥缂呮��浠紡">
<el-radio-group v-model="form.isspendremember">
- <el-radio
- v-for="dict in dict.type.sys_0_1"
- :key="dict.value"
- :label="parseInt(dict.value)"
- >{{ dict.label }}</el-radio
- >
+ <el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
+ }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item align="left" label="鎭㈠閬椾綋浠">
<el-radio-group v-model="form.isrestoreremains">
- <el-radio
- v-for="dict in dict.type.sys_0_1"
- :key="dict.value"
- :label="parseInt(dict.value)"
- >{{ dict.label }}</el-radio
- >
+ <el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
+ }}</el-radio>
</el-radio-group>
- </el-form-item></el-col
- >
+ </el-form-item></el-col>
</el-row>
<!-- <el-form-item align="left" label="姝讳骸璇佹槑闄勪欢璺緞">
<fileUpload v-model="form.deathjudgeannex" />
</el-form-item> -->
<el-row>
<el-col :span="8">
- <el-form-item
- label="鎵嬫湳璐熻矗浜�"
- label-width="140px"
- prop="responsibleusername"
- >
- <el-input
- v-model="form.responsibleusername"
- placeholder="璇疯緭鍏ヨ礋璐ｄ汉濮撳悕"
- />
+ <el-form-item label="鎵嬫湳璐熻矗浜�" label-width="140px" prop="responsibleusername">
+ <el-input v-model="form.responsibleusername" placeholder="璇疯緭鍏ヨ礋璐ｄ汉濮撳悕" />
</el-form-item>
</el-col>
<el-col :span="8">
<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>
@@ -793,12 +418,8 @@
<el-col :span="8">
<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>
@@ -807,12 +428,7 @@
</el-form>
<!-- 缂栬緫鍣ㄥ畼 -->
- <el-dialog
- title="鍣ㄥ畼"
- :close-on-click-modal="false"
- :visible.sync="dialogFormVisible"
- append-to-body
- >
+ <el-dialog title="鍣ㄥ畼" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
<el-form :model="table">
<el-form-item label="鍣ㄥ畼鍚嶇О" :label-width="formLabelWidth">
<el-input v-model="form.organnames"></el-input>
@@ -820,9 +436,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogFormVisible = false"
- >淇� 瀛�</el-button
- >
+ <el-button type="primary" @click="dialogFormVisible = false">淇� 瀛�</el-button>
</div>
</el-dialog>
<div slot="footer" class="dialog-footer">
@@ -912,7 +526,7 @@
return {
starttime: "",
endtime: "",
-
+
// 鎻掔浣嶇疆
cannulatimeList: {},
coordinatorlist1: [],
@@ -1537,7 +1151,7 @@
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
//鑾峰彇鐥呬汉宸叉崘鐚殑鍣ㄥ畼鍒楄〃
GetDonortedList() {
@@ -1599,7 +1213,7 @@
aEle.click();
});
},
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const queryParams = this.queryParams;
this.$modal.confirm('鏄惁纭瀵煎嚭鎵�鏈夎幏鍙栬璇佹暟鎹」锛�').then(() => {
@@ -1608,7 +1222,7 @@
}).then(response => {
this.$download.name(response.msg);
this.exportLoading = false;
- }).catch(() => {});z
+ }).catch(() => { }); z
}
},
};
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index 70104a6..b7c61c9 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -18,14 +18,12 @@
</el-select>
</el-form-item>
</el-col>
-
<el-col :span="6">
<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-col>
</el-row>
</el-form>
-
<el-row>
<el-col :span="8">
<el-card shadow="never">
@@ -36,7 +34,6 @@
</el-row>
</el-col>
</el-row>
-
<el-table v-loading="loading" border highlight-current-row :data="donatebaseinfoList"
@row-click="selectDonotor">
<!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> -->
@@ -52,7 +49,6 @@
:limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
</el-card>
</el-col>
-
<el-col :span="16">
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
@@ -95,11 +91,9 @@
align="center"
prop="amountrequested"
width="120px"
- /> -->
+ /> -->
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
-
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
-
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width"
width="280px">
<template slot-scope="scope">
@@ -124,7 +118,7 @@
icon="el-icon-download"
@click="mixExport(scope)"
>涓嬭浇</el-button
- > -->
+ > -->
<!-- v-hasPermi="['project:expretfund:download']" -->
</template>
</el-table-column>
@@ -136,28 +130,24 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
- <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1600px" :title="title"
+ <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
style="text-align: center" v-loading="loading">
<el-form style="height: 550px; overflow-y: auto; overflow-x: hidden" ref="form" :model="form" label-width="120px"
:rules="rules">
- <el-row>
+ <el-row style="text-align: left">
<el-col :span="7">
- <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable />
+ <el-form-item label="璐圭敤绫诲瀷">
+ <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio>
</el-form-item>
</el-col>
-
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="鎹愮尞鑰�" prop="name">
<el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
- <!-- <el-input
- v-model="form.recordstatus"
- placeholder="瀹℃牳鎰忚"
- /> -->
+ <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/> -->
<el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
<el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
:value="dict.value" />
@@ -165,7 +155,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row style="text-align: left">
<el-col :span="7">
<el-form-item label="鐢宠浜�" prop="username">
<el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%">
@@ -174,13 +164,11 @@
</el-select>
</el-form-item>
</el-col>
-
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
</el-form-item>
</el-col>
-
<el-col :span="7">
<el-form-item label="宸ヤ綔鍗曚綅" prop="unitno">
<org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
@@ -188,25 +176,34 @@
</el-col>
</el-row>
<el-row style="text-align: left">
- <el-form-item label="璐圭敤鐢宠">
- <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio>
- </el-form-item>
+ <el-col :span="14">
+ <el-form-item label="鐢宠璇存槑" prop="remark">
+ <el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px">
<el-row style="margin-bottom: 10px">
<el-col :span="4">
<el-button @click.native.prevent="addAlls" type="primary" size="small">
- 鏈嶅姟椤圭洰瀵煎叆
+ 瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
</el-row>
<el-table :data="fundDetailArr" v-loading="loading" border highlight-current-row>
- <el-table-column prop="orderno" align="center" label="搴忓彿" width="80">
+ <el-table-column prop="orderno" align="center" label="搴忓彿" width="65">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
- <el-table-column prop="applytype" align="center" label="璐圭敤绫诲瀷" width="220">
+ <el-table-column prop="applytype" align="center" label="璐圭敤绫诲瀷" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)">
<el-option v-for="dict in fundtypeArr" :key="dict.index" :label="dict.label"
@@ -223,7 +220,7 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemcode" align="center" label="璐圭敤缂栧彿" show-overflow-tooltip="">
+ <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip="" v-if="false" >
</el-table-column>
<el-table-column prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="180">
<template slot-scope="scope">
@@ -234,7 +231,22 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="120" v-if="form.applytype != 3">
+ <el-table-column v-if="this.ismanager == true" prop="amount" align="center" label="绋庡墠閲戦" width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
+ @change="selectamount(scope.row)">
+ <el-option v-for="dict in scope.row.fundblock" :key="dict.expensedescribe" :label="dict.expense"
+ :value="dict.expense"></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="100" v-if="this.ismanager == true">
+ <!-- v-if="form.applytype != '3'"涓婂悓 -->
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="100" v-if="form.applytype != 3">
<template slot-scope="scope">
<el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
}}</el-button>
@@ -254,26 +266,10 @@
:value="item.reportName"
>
</el-option>
- </el-select> -->
+ </el-select> -->
</template>
</el-table-column>
- <el-table-column v-if="this.ismanager == true" prop="amount" align="center" label="绋庡墠閲戦" width="120">
- <template slot-scope="scope">
- <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
- @change="selectamount(scope.row)">
- <el-option v-for="dict in scope.row.fundblock" :key="dict.expensedescribe" :label="dict.expense"
- :value="dict.expense"></el-option>
- </el-select>
- </template>
- </el-table-column>
-
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="this.ismanager == true">
- <!-- v-if="form.applytype != '3'"涓婂悓 -->
- <template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
- </template>
- </el-table-column>
- <el-table-column prop="unitno" align="center" label="鍗曚綅" width="220">
+ <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="220">
<template slot-scope="scope">
<el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
}}</el-button>
@@ -290,10 +286,9 @@
:label="spec.organizationname"
:value="spec.organizationid"
></el-option>
- </el-select> -->
+ </el-select> -->
</template>
</el-table-column>
-
<el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="
@@ -303,7 +298,6 @@
" />
</template>
</el-table-column>
-
<el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="
@@ -313,7 +307,6 @@
" />
</template>
</el-table-column>
-
<el-table-column prop="remark" align="center" label="澶囨敞" width="210" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="澶囨敞" />
@@ -353,22 +346,32 @@
</template>
</el-table-column>
</el-table>
- </el-row>
- <el-row>
- <el-col :span="22">
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="澶囨敞" />
- </el-form-item>
- </el-col>
</el-row>
<el-row>
<el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
- </el-date-picker>
+ <el-form-item label="鐢宠閲戦" prop="amountrequested">
+ <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" />
+ </el-form-item>
+ </el-col> <el-col :span="7">
+ <el-form-item label="绋庡墠鍚堣" prop="pretaxcost">
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
</el-form-item>
</el-col>
+ <el-col :span="7">
+ <el-form-item label="绋庡悗鍚堣" prop="pretaxcost">
+ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
+ </el-form-item>
+ </el-col>
+ <!--
+ <el-col :span="7">
+ <el-form-item label="棰勬敮閲戦" prop="prepaidamount">
+ <el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
+ </el-form-item>
+ </el-col>
+ -->
+ </el-row>
+ <!--
+ <el-row>
<el-col :span="7">
<el-form-item label="OPO涓績绛惧瓧" prop="opochecker">
<el-input v-model="form.opochecker" placeholder="opo涓績绛惧瓧" />
@@ -400,9 +403,10 @@
</el-form-item>
</el-col>
</el-row>
+ -->
<el-row>
- <el-col :span="24">
- <el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexbankcard">
+ <el-col :span="12">
+ <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard">
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
:headers="headers" :on-success="
(response, file, fileList) =>
@@ -438,7 +442,7 @@
<el-form ref="funddetailForm" :model="funddetailForm">
<el-row>
<el-col :span="24" v-if="detailInfoDialogShowType == 'name'">
- <el-form-item label="濮撳悕" prop="beneficiaryname" label-width="80px">
+ <el-form-item label="涓撳濮撳悕" prop="beneficiaryname" label-width="80px">
<el-select filterable allow-create ref="beneficiaryname" default-first-option
v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName">
@@ -448,8 +452,8 @@
</el-col>
<el-col :span="24" v-if="detailInfoDialogShowType == 'unit'">
- <el-form-item label="鍗曚綅" prop="unitno" label-width="80px">
- <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅" clearable filterable allow-create
+ <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="80px">
+ <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
style="width: 100%">
<el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
:value="spec.organizationid"></el-option>
@@ -1301,7 +1305,7 @@
this.form.name = this.curCase.name;
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
+
getownFundDetail(id).then((res) => {
console.log("鏌ヨ鏄庣粏璁板綍锛�", res);
this.fundDetailArr = res.data;
diff --git a/src/views/project/fund/fundApply/index.vue b/src/views/project/fund/fundApply/index.vue
index f04b4cb..a475f27 100644
--- a/src/views/project/fund/fundApply/index.vue
+++ b/src/views/project/fund/fundApply/index.vue
@@ -9,7 +9,6 @@
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
-
<el-col :span="6">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
<el-select v-model="queryParams.recordstate" placeholder="璇烽�夋嫨璁板綍鐘舵��" clearable size="small">
@@ -36,7 +35,6 @@
</el-row>
</el-col>
</el-row>
-
<el-table v-loading="loading" border highlight-current-row :data="donatebaseinfoList"
@row-click="selectDonotor">
<!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> -->
@@ -51,7 +49,6 @@
:limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
</el-card>
</el-col>
-
<el-col :span="16">
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
@@ -121,24 +118,20 @@
<el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
style="text-align: center" v-loading="loading">
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
- <el-row>
+ <el-row style="text-align: left">
<el-col :span="7">
- <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable />
+ <el-form-item label="鐢宠绫诲瀷">
+ <el-radio v-model="form.applytype" label="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio>
</el-form-item>
</el-col>
-
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="鎹愮尞鑰�" prop="name">
<el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
- <!-- <el-input
- v-model="form.recordstatus"
- placeholder="瀹℃牳鎰忚"
- /> -->
+ <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚" /> -->
<el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small">
<el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
:value="dict.value" />
@@ -146,7 +139,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row style="text-align: left">
<el-col :span="7">
<el-form-item label="鐢宠浜�" prop="username">
<el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%">
@@ -155,13 +148,11 @@
</el-select>
</el-form-item>
</el-col>
-
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
</el-form-item>
</el-col>
-
<el-col :span="7">
<el-form-item label="宸ヤ綔鍗曚綅" prop="unitno">
<org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
@@ -169,14 +160,23 @@
</el-col>
</el-row>
<el-row style="text-align: left">
- <el-form-item label="璐圭敤鐢宠">
- <el-radio v-model="form.applytype" label="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio>
- </el-form-item>
+ <el-col :span="14">
+ <el-form-item label="鐢宠璇存槑" prop="remark">
+ <el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row style="margin-bottom: 10px">
<el-col :span="4">
<el-button @click.native.prevent="addAlls" type="primary" size="small">
- 鏈嶅姟椤圭洰瀵煎叆
+ 瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
</el-row>
@@ -212,7 +212,7 @@
<!-- <el-input
v-model="scope.row.beneficiaryname"
placeholder="濮撳悕"
- /> -->
+ /> -->
</template>
</el-table-column>
<el-table-column prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="180">
@@ -310,24 +310,22 @@
</el-table>
</el-row>
<el-row>
- <el-col :span="8">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
- </el-date-picker>
+ <el-col :span="7">
+ <el-form-item label="鐢宠閲戦" prop="amountrequested">
+ <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" />
</el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="绋庡墠閲戦鍚堣" prop="pretaxcost">
+ </el-col> <el-col :span="7">
+ <el-form-item label="绋庡墠鍚堣" prop="pretaxcost">
<el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="绋庡悗閲戦鍚堣" prop="pretaxcost">
+ <el-col :span="7">
+ <el-form-item label="绋庡悗鍚堣" prop="pretaxcost">
<el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
</el-form-item>
</el-col>
- <el-col :span="8">
+ <!--
+ <el-col :span="7">
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
</el-form-item>
@@ -352,22 +350,21 @@
<el-input v-model="form.officedirector" placeholder="璇疯緭鍏ュ姙鍏涓讳换" />
</el-form-item>
</el-col>
-
<el-col :span="8">
<el-form-item label="璐㈠姟閮ㄨ礋璐ｄ汉" prop="financedirector">
<el-input v-model="form.financedirector" placeholder="璇疯緭鍏ヨ储鍔￠儴璐熻矗浜�" />
</el-form-item>
</el-col>
-
<el-col :span="8">
<el-form-item label="璐㈠姟瀹℃牳" prop="financechecher">
<el-input v-model="form.financechecher" placeholder="璇疯緭鍏ヨ储鍔″鏍�" />
</el-form-item>
</el-col>
+ -->
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexbankcard">
+ <el-form-item label="鐢宠闄勪欢锛�" align="left" prop="annexbankcard">
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
:headers="headers" :on-success="
(response, file, fileList) =>
@@ -1116,14 +1113,14 @@
this.dialogOpen = true;
this.title = "淇敼璐圭敤鐢宠";
this.dialogType = "edit";
-
+
const id = row.id || this.ids;
getFund(id).then((response) => {
this.form = response.data;
this.form.name = this.curCase.name;
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
+
getownFundDetail(id).then(async (res) => {
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
@@ -1155,7 +1152,7 @@
};
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
+
listFundflow(listFundflowparams).then((res) => {
this.fundflowList = res.rows;
});
diff --git a/src/views/project/fund/medicalCostFundApply/index.vue b/src/views/project/fund/medicalCostFundApply/index.vue
index 0ca057b..15fb538 100644
--- a/src/views/project/fund/medicalCostFundApply/index.vue
+++ b/src/views/project/fund/medicalCostFundApply/index.vue
@@ -119,34 +119,32 @@
</el-card>
</el-col>
</el-row>
-
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
<el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
style="text-align: center" v-loading="loading">
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
- <el-row>
+ <el-row style="text-align: left">
<el-col :span="7">
- <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable />
- </el-form-item>
- </el-col>
-
- <el-col :span="8">
+ <el-form-item label="鐢宠绫诲瀷">
+ <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰鐢宠</el-radio>
+ </el-form-item></el-col>
+ <el-col :span="7">
<el-form-item label="鎹愮尞鑰�" prop="name">
<el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
</el-form-item>
</el-col>
<el-col :span="7">
<el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
- <el-input v-if="0" v-model="form.recordstatus" placeholder="瀹℃牳鎰忚" />
- <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
+ <!--<el-input v-if="0" v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/>-->
+ <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small"
+ style="width: 100%">
<el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row style="text-align: left">
<el-col :span="7">
<el-form-item label="鐢宠浜�" prop="username">
<el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%">
@@ -155,13 +153,11 @@
</el-select>
</el-form-item>
</el-col>
-
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
</el-form-item>
</el-col>
-
<el-col :span="7">
<el-form-item label="宸ヤ綔鍗曚綅" prop="unitno">
<org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
@@ -169,14 +165,23 @@
</el-col>
</el-row>
<el-row style="text-align: left">
- <el-form-item label="璐圭敤鐢宠">
- <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰</el-radio>
- </el-form-item>
+ <el-col :span="14">
+ <el-form-item label="鐢宠璇存槑" prop="remark">
+ <el-input v-model="form.remark" placeholder="澶囨敞" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row style="margin-bottom: 10px">
<el-col :span="4">
<el-button @click.native.prevent="addAlls" type="primary" size="small">
- 鏈嶅姟椤圭洰瀵煎叆
+ 瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
</el-row>
@@ -234,7 +239,7 @@
></el-option>
</el-select>
</template>
- </el-table-column> -->
+ </el-table-column> -->
<el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3">
<template slot-scope="scope">
<el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
@@ -242,7 +247,8 @@
<el-option v-for="dict in fundblock" :key="dict.expensedescribe" :label="dict.expense"
:value="dict.expense"></el-option>
</el-select>
- <!-- <el-input
+ <!--
+ <el-input
v-model="scope.row.amount"
placeholder="绋庡墠閲戦"
@change="selectamount(scope.row)"
@@ -250,8 +256,8 @@
(val) => {
sumTotalFee(scope.row);
}
- "
- /> -->
+ " />
+ -->
</template>
</el-table-column>
<el-table-column prop="taxamount" align="center" label="鎵ｇ◣" width="120" v-if="form.applytype != '3'">
@@ -268,7 +274,6 @@
<el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
</template>
</el-table-column>
-
<el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="
@@ -308,7 +313,6 @@
<el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
</template>
</el-table-column>
-
<el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210">
<template slot-scope="scope">
<el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
@@ -319,7 +323,6 @@
<el-input v-model="scope.row.remark" placeholder="澶囨敞" />
</template>
</el-table-column>
-
<el-table-column prop="title" align="center" label="鑱岀О" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.title" placeholder="鑱岀О" />
@@ -335,7 +338,6 @@
<el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
</template>
</el-table-column>
-
<el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210" v-if="form.applytype != '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
@@ -364,27 +366,23 @@
>鏂板鎴愭湰璐圭敤</el-button
>
</el-col>
- </el-row> -->
- <el-row>
- <el-col :span="22">
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="澶囨敞" />
- </el-form-item>
- </el-col>
- </el-row>
+ </el-row> -->
<el-row>
<el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="8">
<el-form-item label="鐢宠閲戦" prop="amountrequested">
<el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" />
</el-form-item>
+ </el-col> <el-col :span="7">
+ <el-form-item label="绋庡墠鍚堣" prop="pretaxcost">
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
+ </el-form-item>
</el-col>
+ <el-col :span="7">
+ <el-form-item label="绋庡悗鍚堣" prop="pretaxcost">
+ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
+ </el-form-item>
+ </el-col>
+ <!--
<el-col :span="7">
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
@@ -420,10 +418,11 @@
<el-input v-model="form.financechecher" placeholder="璇疯緭鍏ヨ储鍔″鏍�" />
</el-form-item>
</el-col>
+ -->
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexbankcard">
+ <el-form-item label="璐圭敤鐢宠闄勪欢锛�" align="left" prop="annexbankcard">
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
:headers="headers" :on-success="
(response, file, fileList) =>
diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseslist/index.vue
index bd8c6ec..7fb498d 100644
--- a/src/views/project/travelexpenseslist/index.vue
+++ b/src/views/project/travelexpenseslist/index.vue
@@ -45,8 +45,6 @@
</el-form-item>
</el-col>
</el-row>
-
-
</el-form>
<el-row :gutter="10" class="mb8">
@@ -93,15 +91,8 @@
</el-table-column>
<el-table-column label="閾惰鍗″彿" width="180" align="center" prop="bankcardno">
</el-table-column>
- <!-- <el-table-column label="鎶ラ攢鍚堣" align="center" prop="financechecher">
- </el-table-column> -->
- <!-- <el-table-column
- label="璐㈠姟瀹℃牳"
- width="120"
- align="center"
- prop="financechecher"
- >
- </el-table-column> -->
+ <!-- <el-table-column label="鎶ラ攢鍚堣" align="center" prop="financechecher"/>-->
+ <!-- <el-table-column label="璐㈠姟瀹℃牳" width="120" align="center" prop="financechecher" /> -->
<el-table-column label="鎹愮尞鑰�" width="120" align="center" prop="donorname">
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="270">
@@ -132,10 +123,21 @@
@close="reset">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
- <el-col :span="7">
- <!-- <el-form-item label="澶囨敞" prop="reason">
+ <!--
+ <el-form-item label="澶囨敞" prop="reason">
<el-input v-model="form.reason" placeholder="涓撹亴浜哄憳 鍗忚皟鍛�" />
- </el-form-item> --><el-form-item label="鎶ラ攢浜�" prop="username">
+ </el-form-item>
+ -->
+ <el-col :span="5">
+ <el-form-item label="鎶ラ攢鍒嗙被" prop="costtype">
+ <el-select v-model="form.costtype" value-key="value" placeholder="璇烽�夋嫨鍑哄樊浜哄垎绫�" @change="getTravelers">
+ <el-option v-for="dict in dict.type.sys_travelexpensebelong" :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="username">
<el-select v-model="form.username" clearable filterable allow-create ref="getReportname"
default-first-option placeholder="璇烽�夋嫨">
<el-option v-for="item in reporters" :key="item.reportNo" :label="item.reportName"
@@ -144,32 +146,25 @@
</el-select>
</el-form-item>
</el-col>
-
- <el-col :span="8">
- <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input disabled v-model="form.donorno" placeholder="鎹愮尞缂栧彿" />
+ <el-col :span="5">
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-date-picker style="width: 100%" v-model="form.createTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="鐢宠鏃ユ湡">
+ </el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="鎹愮尞鑰�" prop="infoid">
- <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
- <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
- </el-option>
+ <el-col :span="5">
+ <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
+ <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
+ <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="7">
- <el-form-item label="鍑哄樊浜哄垎绫�" prop="costtype">
- <el-select v-model="form.costtype" value-key="value" placeholder="璇烽�夋嫨鍑哄樊浜哄垎绫�" @change="getTravelers">
- <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鍑哄樊浜�" prop="travelers">
+ <el-col :span="5">
+ <el-form-item label="鎶ラ攢浜�" prop="travelers">
<el-select v-model="form.travelers" clearable filterable allow-create ref="getReportname"
default-first-option placeholder="璇烽�夋嫨" @change="selectedTraveler">
<el-option v-for="item in travelers" :key="item.reportNo" :label="item.reportName"
@@ -178,34 +173,85 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="鍖哄煙缁勯暱" prop="managername">
- <el-input v-model="form.managername" placeholder="鍖哄煙缁勯暱" />
- </el-form-item> </el-col></el-row><el-row>
+ <el-col :span="5">
+ <el-form-item label="鏀舵閾惰" prop="depositbank">
+ <el-input v-model="form.depositbank" placeholder="寮�鎴烽摱琛�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="閾惰璐﹀彿" prop="bankcardno">
+ <el-input v-model="form.bankcardno" placeholder="寮�鎴烽摱琛�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+ <el-input v-model="form.phone" placeholder="鑱旂郴鐢佃瘽" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
<el-col :span="15">
<el-form-item label="鍑哄樊浜嬬敱" prop="reason">
<el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker style="width: 100%" v-model="form.createTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鐢宠鏃ユ湡">
- </el-date-picker>
+ <el-col :span="5">
+ <el-form-item label="鍖哄煙缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="鍖哄煙缁勯暱" />
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="22">
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="澶囨敞" />
+ <el-col :span="20"><el-divider></el-divider></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="infoid">
+ <el-select :disabled = "true" v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
+ <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="瀹跺睘璐圭敤" prop="donoramount">
+ <el-input :disabled = "true" v-model="form.donoramount" placeholder="瀹跺睘璐圭敤" @blur="
+ (val) => {
+ sumTotalFee();
+ }
+ " onchange="if(/[^0-9.]/.test(this.value)){alert('璇锋纭緭鍏ユ暣鏁版暟瀛楁垨灏忔暟锛�');this.value='';}" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="璐圭敤璇存槑" prop="donorremark">
+ <el-input :disabled = "true" v-model="form.donorremark" placeholder="瀹跺睘璐圭敤璇存槑" />
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="8"> </el-col>
+ <el-col :span="5">
+ <el-form-item label="瀹跺睘浜烘暟" prop="donorrelatives">
+ <el-input v-model="form.donorrelatives" placeholder="瀹跺睘浜烘暟" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鏀舵浜�" prop="donorpayee">
+ <el-input v-model="form.donorpayee" placeholder="浜插睘鏀舵浜�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鏀舵閾惰" prop="donorbank">
+ <el-input v-model="form.donorbank" placeholder="瀹跺睘閾惰" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="閾惰鍗″彿" prop="donorbankcard">
+ <el-input v-model="form.donorbankcard" placeholder="閾惰鍗″彿" />
+ </el-form-item>
+ </el-col>
</el-row>
- <!-- <el-row type="flex" :gutter="10" align="right" class="mb8">
+ <!--
+ <el-row type="flex" :gutter="10" align="right" class="mb8">
<el-col :span="6">
<el-button
type="primary"
@@ -216,47 +262,58 @@
>鏂板涓�琛�</el-button
>
</el-col>
- </el-row> -->
+ </el-row>
+ -->
<el-row>
<el-table :data="applicationDetailArr" border highlight-current-row>
- <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="80">
+ <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
- <el-table-column prop="starttime" slot="" label="鍑哄彂鏃ユ湡" fixed align="center" width="150">
+ <el-table-column prop="starttime" slot="" label="寮�濮嬫棩鏈�" fixed align="center" width="150">
<template slot-scope="scope">
- <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鍑哄彂鏃ユ湡" @change="getStandard(scope.row)">
+ <el-date-picker :picker-options="{
+ disabledDate: time => {
+ if (scope.row.endtime) { return time.getTime() > new Date(scope.row.endtime.replace(/-/g, '/')) }
+ }
+ }" clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getallowance(scope.row)">
</el-date-picker>
</template>
</el-table-column>
-
- <el-table-column prop="departure" slot="" label="鍑哄彂鍦扮偣" align="center" width="200" fixed>
+ <el-table-column prop="endtime" slot="" label="缁撴潫鏃ユ湡" align="center" fixed width="150">
+ <template slot-scope="scope">
+ <el-date-picker :picker-options="{
+ disabledDate: time => {
+ if (scope.row.starttime) { return time.getTime() < new Date(scope.row.starttime.replace(/-/g, '/')) }
+ }
+ }" clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getallowance(scope.row)">
+ </el-date-picker>
+ </template>
+ </el-table-column>
+ <el-table-column prop="departure" slot="" label="鍑哄彂鍦扮偣" align="center" fixed width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦扮偣" />
</template>
</el-table-column>
- <el-table-column prop="endtime" slot="" label="鍒拌揪鏃ユ湡" align="center" width="150" fixed>
+ <el-table-column label="鍒拌揪鍦扮偣" prop="destination" align="center" fixed width="100">
<template slot-scope="scope">
- <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鍒拌揪鏃ユ湡">
- </el-date-picker>
+ <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦扮偣" @blur="getallowance(scope.row)" />
</template>
</el-table-column>
- <el-table-column label="鍒拌揪鍦扮偣" prop="destination" align="center" width="200">
- <template slot-scope="scope">
- <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦扮偣" />
- </template>
- </el-table-column>
- <el-table-column prop="days" label="澶╂暟" width="70" align="center">
+ <el-table-column prop="days" label="澶╂暟" width="65" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.days" @blur="getStandard(scope.row)" placeholder="澶╂暟" />
</template>
</el-table-column>
- <el-table-column prop="traffictype" label="浜ら�氬伐鍏�" align="center" width="120">
+ <el-table-column prop="traffictype" label="浜ら�氬伐鍏�" align="center" width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.traffictype" placeholder="浜ら�氬伐鍏�" />
+ <el-select v-model="scope.row.traffictype" placeholder="浜ら�氬伐鍏�">
+ <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80">
@@ -268,6 +325,7 @@
" />
</template>
</el-table-column>
+ <!--
<el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂" align="center" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="
@@ -278,6 +336,7 @@
</el-input>
</template>
</el-table-column>
+ -->
<el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="
@@ -287,16 +346,8 @@
" />
</template>
</el-table-column>
- <el-table-column prop="otherexpense" label="鏉傝垂" align="center" width="80">
- <template slot-scope="scope">
- <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
- </template>
- </el-table-column>
- <el-table-column prop="foodexpenses" label="浼欓璐规姤閿�" align="center" width="100">
+
+ <el-table-column prop="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="
(val) => {
@@ -305,7 +356,7 @@
" />
</template>
</el-table-column>
- <el-table-column prop="foodallowance" label="浼欓璐硅ˉ鍔�" align="center" width="100">
+ <el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="
(val) => {
@@ -314,6 +365,16 @@
" />
</template>
</el-table-column>
+ <el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="80">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="
+ (val) => {
+ sumTotalFee();
+ }
+ " />
+ </template>
+ </el-table-column>
+
<el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90">
<template slot-scope="scope">
<el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="
@@ -328,6 +389,7 @@
<el-input v-model="scope.row.otherfeedesc" placeholder="鍏朵粬璐圭敤璇存槑" />
</template>
</el-table-column>
+
<el-table-column prop="total" label="鍚堣" align="center" width="110">
<template slot-scope="scope">
<el-input v-model="scope.row.total" placeholder="鍚堣" />
@@ -346,80 +408,56 @@
</el-table>
</el-row>
<el-row style="margin-top: 10px">
- <el-col :span="7">
- <el-form-item label="鎶ラ攢鍚堣" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣" />
+ <el-col :span="6">
+ <el-form-item label="鎶ラ攢閲戦" prop="amountrequested">
+ <el-input v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣閲戦" />
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="澶у啓" prop="bigstrmoney">
- <el-input v-model="form.bigstrmoney" placeholder="棰嗘閲戦" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="棰嗘閲戦" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="棰嗘閲戦" />
+ <el-col :span="12">
+ <el-form-item label="澶у啓閲戦" prop="bigstrmoney">
+ <el-input v-model="form.bigstrmoney" placeholder="鎶ラ攢澶у啓閲戦" />
</el-form-item>
</el-col>
</el-row>
+
+ <!--
<el-row>
<el-col :span="7">
- <el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
- <el-input v-model="form.depositbank" placeholder="寮�鎴烽摱琛�" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="閾惰璐﹀彿" prop="bankcardno">
- <el-input v-model="form.bankcardno" placeholder="寮�鎴烽摱琛�" />
+ <el-form-item label="涓績璐熻矗浜�" prop="opochecker">
+ <el-input v-model="form.opochecker" placeholder="涓績璐熻矗浜�" />
</el-form-item>
</el-col>
<el-col :span="7">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
- <el-input v-model="form.phone" placeholder="鑱旂郴鐢佃瘽" />
+ <el-form-item label="璐㈠姟鍓櫌闀�" prop="finvicepresident">
+ <el-input v-model="form.finvicepresident" placeholder="璐㈠姟鍓櫌闀�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="涓氬姟鍓櫌闀�" prop="busvicepresident">
+ <el-input v-model="form.busvicepresident" placeholder="涓氬姟鍓櫌闀�" />
</el-form-item>
</el-col>
</el-row>
- <el-col :span="7">
- <el-form-item label="涓績璐熻矗浜�" prop="opochecker">
- <el-input v-model="form.opochecker" placeholder="涓績璐熻矗浜�" />
- </el-form-item>
- </el-col>
-
- <el-col :span="8">
- <el-form-item label="璐㈠姟鍓櫌闀�" prop="finvicepresident">
- <el-input v-model="form.finvicepresident" placeholder="璐㈠姟鍓櫌闀�" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="涓氬姟鍓櫌闀�" prop="busvicepresident">
- <el-input v-model="form.busvicepresident" placeholder="涓氬姟鍓櫌闀�" />
- </el-form-item>
- </el-col>
<el-row>
<el-col :span="7">
<el-form-item label="鍔炲叕瀹や富浠�" prop="officedirector">
<el-input v-model="form.officedirector" placeholder="鍔炲叕瀹や富浠�" />
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="璐㈠姟閮ㄤ富浠�" prop="financedirector">
<el-input v-model="form.financedirector" placeholder="璐㈠姟閮ㄤ富浠�" />
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
- <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
- <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
- :value="dict.value" />
- </el-select>
- </el-form-item>
- </el-col>
</el-row>
+ -->
<el-row>
- <el-col :span="24">
- <!-- <el-form-item label="鏂囦欢鍦板潃" prop="fileurl">
+ <el-col :span="14">
+ <!--
+ <el-form-item label="鏂囦欢鍦板潃" prop="fileurl">
<el-input v-model="form.fileurl" placeholder="璇疯緭鍏ユ枃浠跺湴鍧�" />
- </el-form-item> -->
+ </el-form-item>
+ -->
<el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexfiles">
<!-- <file-upload ref="fileUpload" :fileType=fileType :limit="1" :on-success="handleUploadSuccess"></file-upload> -->
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
@@ -500,6 +538,7 @@
"sys_financeitemtype",
"sys_recordstatus",
"sys_travelexpensebelong",
+ "sys_traffictype",
],
data() {
return {
@@ -563,7 +602,13 @@
{ required: true, message: "璇烽�夋嫨鎶ラ攢褰掔被", trigger: "blur" },
],
username: [
- { required: true, message: "璇疯緭鍏ユ姤閿�浜�", trigger: "blur" },
+ { required: true, message: "璇烽�夋嫨濉姤浜�", trigger: "blur" },
+ ],
+ travelers: [
+ { required: true, message: "璇烽�夋嫨鎶ラ攢浜�", trigger: "blur" },
+ ],
+ reason: [
+ { required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" },
],
},
//璐圭敤鐢宠鍗昮orm
@@ -701,6 +746,47 @@
}
});
},
+ //璁＄畻琛ュ姪
+ getallowance(row) {
+ if (
+ row.starttime != "" &&
+ row.starttime != null &&
+ row.endtime != "" &&
+ row.endtime != null
+ ) {
+ //璁＄畻澶╂暟
+ row.days = 1 + Math.floor(Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) / (1099 * 3699 * 24))
+
+ /*let aDate, oDate1, oDate2, Date_end,Date_start;
+ Date_end = row.endtime.split(" "); //灏嗘椂闂翠互绌烘牸鍒掑垎涓轰袱涓暟缁� 绗竴涓暟缁勬槸 2019-05-20 绗簩涓暟缁勬槸 00锛�00锛�00
+ aDate = Date_end[0].split("-"); //鑾峰彇绗竴涓暟缁勭殑鍊�
+ oDate1 = new Date(aDate[0], aDate[1], aDate[2]); //灏嗗墠鍗婁釜鏁扮粍浠�-鎷嗗垎锛屾瘡涓�涓槸涓�涓暟鍊�
+
+ Date_start = row.starttime.split(" ");
+ aDate = Date_start[0].split("-");
+ oDate2 = new Date(aDate[0], aDate[1], aDate[2]);
+ row.days = 1+parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24); //鎶婄浉宸殑姣鏁拌浆鎹负澶╂暟
+ */
+ } else {
+ row.days = ''
+ };
+
+ //鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80
+ if (row.destination != "") {
+ var str = row.destination;
+ //楠岃瘉鍩庡競
+ ////if (str.indexOf("妗愬簮锛屽缓寰凤紝娣冲畨") !== -1) { };
+ if (str.includes("鏉窞")) { row.otherexpense = parseInt(row.days) * 0 }
+ else if (str.includes("妗愬簮") || str.includes("寤哄痉") || str.includes("娣冲畨")) { row.otherexpense = parseInt(row.days) * 60 }
+ else { row.otherexpense = parseInt(row.days) * 80 };
+ }
+
+ //浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛�
+ row.foodallowance = parseInt(row.days) * 100
+
+ //璁＄畻鍚堣
+ this.sumTotalFee();
+ },
getStandard(row) {
if (
@@ -787,8 +873,8 @@
}
return area;
},
+
selectbaseinfo() {
- console.log("infoid", this.form.infoid);
let list = this.balist;
list.forEach((item) => {
if (item.id == this.form.infoid) {
@@ -798,9 +884,11 @@
}
});
},
+
onpick(e) {
// console.log(e,this.value1)
},
+
gettable(e) {
const id = e.id;
getdownload(e.id).then((res) => {
@@ -829,6 +917,7 @@
// aEle.click();
// });
},
+
/** 鏌ヨ鎶ラ攢鐢宠鍒楄〃 */
getList() {
this.loading = true;
@@ -1108,7 +1197,6 @@
addReimbursementdetail(applicationDetailArr[i]);
}
- console.log("idaaaaaa:", res, id, this.applicationDetailArr);
});
});
}
@@ -1270,6 +1358,12 @@
sumTotalFee() {
// debugger;
let allSum = 0;
+ //鎹愮尞鑰呭灞炶垂鐢�
+ if (!isNaN(parseFloat(this.form.donoramount))) {
+ allSum += parseFloat(this.form.donoramount);
+ }
+
+ //鎶ラ攢鏄庣粏璐圭敤
try {
for (let i = 0; i < this.applicationDetailArr.length; i++) {
let totalFee = 0;
@@ -1301,6 +1395,7 @@
allSum += parseFloat(this.applicationDetailArr[i].total);
}
}
+
this.form.amountrequested = allSum.toFixed(2);
this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
} catch { }
diff --git a/vue.config.js b/vue.config.js
index 9a4320e..426703a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,8 +33,8 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://localhost:8080`,
- //target: `https://slb.hospitalstar.com:9093`,
+ //target: `http://localhost:8080`,
+ target: `https://slb.hospitalstar.com:9093`,
//target:`http://192.168.0.106:8080`,
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.3