From 916735aca6816732bc43a186dd9d7ccf5e5a1989 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 14 十二月 2023 23:09:47 +0800
Subject: [PATCH] yxh:修改了账户管理和案例编辑
---
src/views/project/donationdetails/index.vue | 195 ++++++++++-----------
src/views/project/fund/applyDetail/index.vue | 44 ++--
src/views/project/donatebaseinfo/index.vue | 120 +++++++-----
src/views/project/externalperson/index.vue | 129 ++++++++++---
4 files changed, 282 insertions(+), 206 deletions(-)
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 45a3233..7b7b5d9 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -8,7 +8,7 @@
label-width="70px"
>
<el-row :gutter="8">
- <el-col :span="6">
+ <el-col :span="5">
<el-form-item label="濮撳悕" prop="name">
<el-input
v-model="queryParams.name"
@@ -19,7 +19,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="5">
<el-form-item
align="left"
label="鍖荤枟鏈烘瀯"
@@ -33,7 +33,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="5">
<el-form-item label="鎹愮尞鍦板競">
<el-select v-model="queryParams.city" placeholder="璇烽�夋嫨鍦板競">
<el-option
@@ -45,8 +45,25 @@
</el-option>
</el-select>
</el-form-item>
+ </el-col>
+ <el-col :span="9">
+ <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>
+ </el-form-item>
</el-col>
- <el-col :span="6">
+ </el-row>
+ <el-row :gutter="8">
+ <el-col :span="5">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
<el-select
v-model="queryParams.recordstate"
@@ -63,9 +80,7 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="8">
- <el-col :span="6">
+ <el-col :span="5">
<el-form-item label="鎶ュ憡浜�">
<el-select
v-model="queryParams.reporterno"
@@ -81,26 +96,7 @@
</el-select>
</el-form-item>
</el-col>
-
- <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>
- </el-form-item>
- </el-col>
- </el-row>
-
- <el-row>
- <el-col :span="14">
+ <el-col :span="9">
<el-form-item label="绫嶈疮">
<div>
<li_area_select
@@ -110,7 +106,6 @@
</div>
</el-form-item>
</el-col>
-
<el-col :span="4">
<el-form-item>
<el-button
@@ -180,7 +175,7 @@
<!-- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="id" /> -->
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column
- label="鎶ュ憡鏃堕棿"
+ label="鏃堕棿"
align="center"
prop="reporttime"
width="100"
@@ -189,9 +184,8 @@
<span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
-
+ <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" width="200" />
<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
@@ -202,24 +196,31 @@
</el-table-column>
<el-table-column label="骞撮緞" align="center" prop="age" width="100" />
<el-table-column
- label="鐜版墍鍦ㄥ湴甯�"
- align="center"
- prop="registercityname"
- width="150"
- />
-
- <el-table-column
label="鍖荤枟鏈烘瀯"
align="center"
prop="treatmenthospitalname"
/>
+ <el-table-column label="琛�鍨�" align="center" prop="bloodtype" width="100">
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_BloodType"
+ :value="scope.row.bloodtype"
+ />
+ </template>
+ </el-table-column>
<el-table-column
label="鎶ュ憡浜�"
align="center"
prop="reportername"
width="100"
/>
-
+ <!--
+ <el-table-column
+ label="鐜版墍鍦ㄥ湴甯�"
+ align="center"
+ prop="registercityname"
+ width="150"
+ />
<el-table-column
label="鎹愮尞杩涘害"
align="center"
@@ -227,18 +228,30 @@
width="120"
>
<template slot-scope="scope">
- <dict-tag
+ <dict-tag
:options="dict.type.sys_DonationStatus"
:value="scope.row.recordstate"
- />
+ />
</template>
</el-table-column>
-
+ -->
+ <el-table-column
+ label="鎹愮尞杩涘害"
+ align="center"
+ prop="workflow"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_donornode"
+ :value="scope.row.workflow"
+ />
+ </template>
+ </el-table-column>
<el-table-column
label="鎿嶄綔"
align="center"
class-name="small-padding fixed-width"
- width="200"
fixed="right"
>
<template slot-scope="scope">
@@ -250,15 +263,17 @@
v-hasPermi="['project:donatebaseinfo:edit']"
>璇︽儏</el-button
>
-
- <!-- <el-button v-if="scope.row.recordstate == 0" size="mini" type="text" icon="el-icon-delete"
+ <el-button v-if="scope.row.recordstate == 0" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)" v-hasPermi="['project:donatebaseinfo:remove']">鍒犻櫎</el-button>
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handletermination(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 v-if="scope.row.recordstate == 0 || scope.row.recordstate == 3" size="mini" type="text"
- icon="el-icon-thumb" @click="handleapproval(scope.row)">涓婃姤瀹℃牳</el-button> -->
- <!-- 鎾ら攢鐢宠 -->
+ <!--
+ <el-button v-if="scope.row.recordstate == 0 || scope.row.recordstate == 3" size="mini" type="text"
+ icon="el-icon-thumb" @click="handleapproval(scope.row)">鎻愪氦</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-edit" @click="handletermination(scope.row)"
+ v-hasPermi="['project:donatebaseinfo:edit']">{{ scope.row.recordstate == 99 ? "鎭㈠": "缁堟" }}</el-button>
+ -->
</template>
</el-table-column>
</el-table>
@@ -885,7 +900,8 @@
"sys_DonationStatus",
"sys_DiseaseType",
"sys_SelfWill",
- "sys_FamilyRelation"
+ "sys_FamilyRelation",
+ "sys_donornode"
],
data() {
return {
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index f43ff28..26cdb13 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -171,32 +171,49 @@
"
>
<el-row style="margin-top: 10px">
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item label="鎹愮尞缂栧彿" prop="donorno">
<el-input v-model="form.donorno" disabled />
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item
- align="left"
- label="鍖荤枟鏈烘瀯"
- prop="treatmenthospitalno"
- >
- <org-selecter
- ref="addOrgSelect"
- :org-type="'3'"
- v-model="form.treatmenthospitalno"
- />
+ <el-col :span="6">
+ <el-form-item label="鎶ュ憡浜�" prop="reporterno">
+ <el-select
+ ref="getReportname"
+ v-model="form.reporterno"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in reporters"
+ :key="item.reportNo"
+ :label="item.reportName"
+ :value="item.reportNo"
+ >
+ </el-option>
+ </el-select>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="绉戝" prop="treatmentdeptno">
+ <el-col :span="6">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone">
<el-input
- v-model="form.treatmentdeptname"
- placeholder="璇疯緭鍏ョ瀹�"
+ v-model="form.reporterphone"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
/>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
+ <el-date-picker
+ clearable
+ size="small"
+ v-model="form.reporttime"
+ 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="6">
@@ -204,39 +221,6 @@
<el-input v-model="form.name" placeholder="蹇呭～椤�" />
</el-form-item>
</el-col>
- <el-col :span="6">
- <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-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="骞撮緞" prop="age">
- <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
- <el-date-picker
- clearable
- size="small"
- v-model="form.birthday"
- type="date"
- style="width: 174px"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍑虹敓鏃ユ湡"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
<el-select
@@ -255,7 +239,6 @@
<el-col :span="6">
<el-form-item label="璇佷欢鍙风爜" prop="idcardno">
<el-input
- style="width: 174px"
ref="updateBSvalue"
class="sfzcode"
v-model="form.idcardno"
@@ -263,46 +246,58 @@
@blur="updateMessage"
/>
</el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="8">
- <el-form-item label="鎶ュ憡浜�" prop="reporterno">
- <el-select
- ref="getReportname"
- v-model="form.reporterno"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in reporters"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportNo"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone">
- <el-input
- v-model="form.reporterphone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
<el-date-picker
clearable
size="small"
- style="width: 190px"
- v-model="form.reporttime"
- type="datetime"
+ v-model="form.birthday"
+ type="date"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鎶ュ憡鏃堕棿"
+ placeholder="閫夋嫨鍑虹敓鏃ユ湡"
>
</el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <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-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="骞撮緞" prop="age">
+ <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item
+ align="left"
+ label="鍖荤枟鏈烘瀯"
+ prop="treatmenthospitalno"
+ >
+ <org-selecter
+ ref="addOrgSelect"
+ :org-type="'3'"
+ v-model="form.treatmenthospitalno"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="绉戝" prop="treatmentdeptno">
+ <el-input
+ v-model="form.treatmentdeptname"
+ placeholder="璇疯緭鍏ョ瀹�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -727,18 +722,18 @@
v-show="!showTerminationBtn"
type="primary"
@click="submitForm"
- >淇濆瓨鎹愮尞鑰呬俊鎭�</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<el-button
v-show="Reportforreview"
type="primary"
@click="Reportforreview"
- >涓婃姤瀹℃牳</el-button
+ >鎻愪氦</el-button
>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
@@ -953,12 +948,12 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨璇勪及淇℃伅</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<!-- <el-button
v-show="makeastepforward"
@@ -1160,12 +1155,12 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨鎹愮尞淇℃伅</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<!-- <el-button
v-show="makeastepforward"
@@ -1228,12 +1223,12 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨浼︾悊淇℃伅</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<!-- <el-button
v-show="makeastepforward"
@@ -1606,12 +1601,12 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨鍣ㄥ畼鍒嗛厤淇℃伅</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<!-- <el-button
v-show="makeastepforward"
@@ -1961,12 +1956,12 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨瑙佽瘉淇℃伅</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<!-- <el-button
v-show="makeastepforward"
@@ -2083,18 +2078,18 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >瀹屾垚鐧昏</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<el-button
v-show="Reportforreview"
type="primary"
@click="Reportforreview"
- >涓婃姤瀹℃牳</el-button
+ >鎻愪氦</el-button
>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
diff --git a/src/views/project/externalperson/index.vue b/src/views/project/externalperson/index.vue
index e2e6e92..e2951a9 100644
--- a/src/views/project/externalperson/index.vue
+++ b/src/views/project/externalperson/index.vue
@@ -1,6 +1,6 @@
<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="80px">
<el-form-item label="璐﹀彿缂栧彿" prop="userno">
<el-input v-model="queryParams.userno" placeholder="璇疯緭鍏ヨ处鍙风紪鍙�" clearable size="small"
@keyup.enter.native="handleQuery" />
@@ -84,51 +84,91 @@
<!-- 娣诲姞鎴栦慨鏀瑰鍥村崟浣嶄汉鍛樺璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-row><el-col :span="12"><el-form-item label="璐﹀彿绫诲埆" prop="usertype">
+ <el-row>
+ <el-col :span="12"><el-form-item label="璐﹀彿绫诲埆" prop="usertype">
<el-select v-model="form.usertype" placeholder="璇烽�夋嫨璐﹀彿绫诲埆">
<el-option v-for="dict in dict.type.sys_UserType" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
- </el-select> </el-form-item></el-col><el-col :span="12">
+ </el-select> </el-form-item>
+ </el-col>
+ <el-col :span="12">
<el-form-item label="璐﹀彿缂栧彿" prop="userno">
- <el-input v-model="form.userno" placeholder="璇疯緭鍏ヨ处鍙风紪鍙�" /> </el-form-item></el-col></el-row><el-row>
+ <el-input v-model="form.userno" placeholder="璇疯緭鍏ヨ处鍙风紪鍙�" /> </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="璐﹀彿鍚嶇О" prop="username">
- <el-input v-model="form.username" placeholder="璇疯緭鍏ヨ处鍙峰悕绉�" /> </el-form-item></el-col><el-col :span="12">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
- <el-input v-model="form.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item></el-col>
- </el-row><el-row v-if="form.usertype != 'org'"><el-col :span="24">
- <el-form-item label="韬唤璇佸彿" prop="idcardno">
- <el-input v-model="form.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" /> </el-form-item></el-col></el-row><el-row
- v-if="form.usertype != 'org'"><el-col :span="12">
- <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.value" :label="dict.label"
- :value="dict.value"></el-option> </el-select></el-form-item></el-col><el-col :span="12"><el-form-item
- label="鑱岀О" prop="title">
- <el-select v-model="form.title" placeholder="璇烽�夋嫨浜哄憳鑱岀О">
- <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option> </el-select>
- </el-form-item> </el-col></el-row><el-row v-if="form.usertype != 'org'"><el-col :span="24">
- <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitname">
- <el-input v-model="form.unitname" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" /> </el-form-item></el-col></el-row><el-row
- v-if="form.usertype != 'org'"><el-col :span="12">
- <el-form-item label="鍗曚綅浜哄憳缂栧彿" prop="personnelunitno">
- <el-input v-model="form.personnelunitno" placeholder="璇疯緭鍏ュ崟浣嶄汉鍛樼紪鍙�" />
- </el-form-item></el-col><el-col :span="12">
- <el-form-item label="鍦ㄨ亴鐘舵��" prop="userstatus">
- <el-radio-group v-model="form.userstatus">
+ <el-input v-model="form.username" placeholder="璇疯緭鍏ヨ处鍙峰悕绉�" /> </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍚敤鐘舵��" prop="userstatus">
+ <el-radio-group v-model="form.userstatus" :disabled="ismanager==false">
<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-row><el-row><el-col :span="24"><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
- <el-input v-model="form.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" /> </el-form-item></el-col><el-col
- :span="24"><el-form-item label="閾惰鍗″彿" prop="bankcardno">
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="form.usertype != 'org'">
+ <el-col :span="24">
+ <el-form-item label="韬唤璇佸彿" prop="idcardno">
+ <el-input v-model="form.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" /> </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="form.usertype != 'org'"><el-col :span="12">
+ <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.value" :label="dict.label"
+ :value="dict.value"></el-option> </el-select></el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑱岀О" prop="title">
+ <el-select v-model="form.title" placeholder="璇烽�夋嫨浜哄憳鑱岀О">
+ <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option> </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="form.usertype != 'org'">
+ <el-col :span="12">
+ <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitname">
+ <el-input v-model="form.unitname" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" /> </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鍗曚綅宸ュ彿" prop="personnelunitno">
+ <el-input v-model="form.personnelunitno" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24"><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
+ <el-input v-model="form.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" /> </el-form-item>
+ </el-col>
+ <el-col :span="24"><el-form-item label="閾惰鍗″彿" prop="bankcardno">
<el-input v-model="form.bankcardno" placeholder="璇疯緭鍏ラ摱琛屽崱鍙�" />
- </el-form-item></el-col></el-row><el-row><el-col :span="24">
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
+ <el-input v-model="form.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
<el-form-item label="鑱旂郴鍦板潃" prop="address">
- <el-input v-model="form.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item></el-col></el-row>
- <!--<el-row><el-col :span="24"><el-form-item label="寮�鎴锋敮琛�" prop="branchbankname">
- <el-input v-model="form.branchbankname" placeholder="璇疯緭鍏ュ紑鎴锋敮琛�" /> </el-form-item></el-col></el-row>-->
+ <el-input v-model="form.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item>
+ </el-col>
+ </el-row>
+ <!--
+ <el-row>
+ <el-col :span="24"><el-form-item label="寮�鎴锋敮琛�" prop="branchbankname">
+ <el-input v-model="form.branchbankname" placeholder="璇疯緭鍏ュ紑鎴锋敮琛�" /> </el-form-item>
+ </el-col>
+ </el-row>
+ -->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -147,6 +187,7 @@
updateExternalperson,
exportExternalperson,
} from "@/api/project/externalperson";
+import { getUserProfile } from "@/api/system/user";
export default {
name: "Externalperson",
@@ -185,12 +226,30 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {},
+ //鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
+ ismanager: false,
};
},
created() {
+ this.getUserProfile();
this.getList();
},
methods: {
+ //鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
+ getUserProfile() {
+ getUserProfile().then(res => {
+ if (
+ res.data.userName == "admin" ||
+ res.data.userName == "001" ||
+ res.data.userName == "047"
+ ) {
+ this.ismanager = true;
+ } else {
+ this.ismanager = false;
+ }
+ });
+ },
+
/** 鏌ヨ澶栧洿鍗曚綅浜哄憳鍒楄〃 */
getList() {
this.loading = true;
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 7223428..6f6f751 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -9,11 +9,12 @@
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<el-date-picker
clearable
+ :disabled="true"
style="width: 100%"
v-model="form.createTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鐢宠鏃ユ湡"
+ placeholder="鏃� 鏈�"
>
</el-date-picker>
</el-form-item>
@@ -1604,9 +1605,9 @@
// 琛ㄥ崟鏍￠獙
rules: {
- createTime: [
- { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
- ],
+ // createTime: [
+ // { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
+ // ],
reason: [
{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
],
@@ -2374,21 +2375,26 @@
// },
checksubmit() {
console.log(this.checkObj.flowlevelone);
- if (
- this.form.checkstatus != 3 &&
- this.userprofile.nickName == "闄堟厱鍗�" &&
- this.checkObj.flowlevelone == 1
- ) {
- this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒");
- return;
- } else if (
- (this.form.applytype == "1" || this.form.applytype == "2") &&
- this.form.fundtaxtime == null
- ) {
- this.$modal.msgError(
- "鎻愪氦涓撳璐圭敤鐢宠鍗曘�佷鸡鐞嗕笓瀹剁敵璇疯垂鐢ㄧ敵璇峰崟瀹℃牳锛岄渶瑕佸厛瀹屾垚涓◣璁＄畻锛�"
- );
- return;
+ if(this.userprofile.nickName == "闄堟厱鍗�"){
+ //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
+ if ( this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1 ) {
+ this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒");
+ return;
+ }
+
+ //妫�鏌ヤ釜绋庤绠�
+ // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) {
+ // this.$modal.msgError(
+ // "鎻愪氦涓撳璐圭敤鐢宠鍗曘�佷鸡鐞嗕笓瀹剁敵璇疯垂鐢ㄧ敵璇峰崟瀹℃牳锛岄渶瑕佸厛瀹屾垚涓◣璁＄畻锛�"
+ // );
+ // return;
+ // }
+ if ( (this.form.applytype == "1") && this.form.fundtaxtime == null ) {
+ this.$modal.msgError(
+ "鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁＄畻锛�"
+ );
+ return;
+ }
}
this.Savenow();
--
Gitblit v1.9.3