From daf7bbe252c412bd5f58ab134b9a96f814f338be Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期四, 18 十二月 2025 11:09:11 +0800
Subject: [PATCH] 日期更改
---
src/permission.js | 1
src/views/project/donationdetails/index.vue | 296 ++++++++++++++++++++++++++++++++---------------------------
OPO-srm .zip | 0
3 files changed, 160 insertions(+), 137 deletions(-)
diff --git a/OPO-srm .zip b/OPO-srm .zip
new file mode 100644
index 0000000..b4e27f6
--- /dev/null
+++ b/OPO-srm .zip
Binary files differ
diff --git a/src/permission.js b/src/permission.js
index 55653cb..428ff1e 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -6,7 +6,6 @@
import { getToken } from '@/utils/auth'
NProgress.configure({ showSpinner: false })
-
const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/dataview']
router.beforeEach((to, from, next) => {
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index b2f8635..701baac 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -205,14 +205,14 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
+ <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="閫夋嫨鎶ュ憡鏃堕棿"
+ placeholder="閫夋嫨鎶ュ憡鏃ユ湡"
>
</el-date-picker>
</el-form-item>
@@ -286,7 +286,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="6" v-if="form.treatmenthospitalno">
<el-form-item
align="left"
label="鍖荤枟鏈烘瀯"
@@ -299,7 +299,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="6" v-if="form.treatmentdeptname">
<el-form-item label="绉戝" prop="treatmentdeptno">
<el-input
v-model="form.treatmentdeptname"
@@ -368,19 +368,50 @@
>
<el-row>
<el-col :span="8">
- <el-form-item label="浣忛櫌鍙�" prop="inpatientno">
- <el-input v-model="form.inpatientno" placeholder="浣忛櫌鍙�" />
- </el-form-item>
- </el-col>
- <el-col :span="16">
- <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname">
+ <el-form-item
+ label="鎵�鍦ㄥ尰鐤楁満鏋�"label-width="120px"
+ prop="currentMedicalInstitution"
+ >
<el-input
- v-model="form.diagnosisname"
- placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
+ v-model="form.currentMedicalInstitution"
+ placeholder="璇疯緭鍏�"
/>
</el-form-item>
</el-col>
+ <el-col :span="10">
+ <el-form-item
+ label-width="150px"
+ label="鎵�鍦ㄥ尰鐤楁満鏋勭瀹�"
+ prop="currentDept"
+ >
+ <el-input v-model="form.currentDept" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
</el-row>
+ <el-row>
+ <el-col :span="8">
+ <el-form-item
+ label="棣栨鍖荤枟鏈烘瀯"
+ label-width="120px"
+ prop="firstMedicalInstitution"
+ >
+ <el-input
+ v-model="form.firstMedicalInstitution"
+ placeholder="璇疯緭鍏�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item
+ label-width="150px"
+ label="棣栨鍖荤枟鏈烘瀯绉戝"
+ prop="firstDept"
+ >
+ <el-input v-model="form.firstDept" placeholder="璇疯緭鍏�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+
<el-row>
<!-- <el-col :span="6">
<el-form-item label="姘戞棌" prop="nation">
@@ -402,73 +433,6 @@
<el-col :span="6">
<el-form-item label="鍥界睄" prop="nationality">
<el-input v-model="form.nationality" placeholder="璇疯緭鍏ュ浗绫�" />
- </el-form-item>
- </el-col>
- </el-row>
- <!-- <el-row>
- <el-col :span="6">
- <el-form-item label="鑱屼笟" prop="occupation">
- <el-select v-model="form.occupation" 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>
- <el-col :span="6">
- <el-form-item label="瀛﹀巻" prop="education">
- <el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻">
- <el-option
- v-for="dict in dict.type.sys_education || []"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row> -->
- <el-row>
- <el-col :span="6">
- <el-form-item
- label="鎵�鍦ㄥ尰鐤楁満鏋�"
- prop="currentMedicalInstitution"
- >
- <el-input
- v-model="form.currentMedicalInstitution"
- placeholder="璇疯緭鍏�"
- />
- </el-form-item>
- </el-col>
- <el-col :span="10">
- <el-form-item
- label-width="150px"
- label="鎵�鍦ㄥ尰鐤楁満鏋勭瀹�"
- prop="currentDept"
- >
- <el-input v-model="form.currentDept" placeholder="璇疯緭鍏�" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="棣栨鍖荤枟鏈烘瀯" prop="firstMedicalInstitution">
- <el-input
- v-model="form.firstMedicalInstitution"
- placeholder="璇疯緭鍏�"
- />
- </el-form-item>
- </el-col>
- <el-col :span="10">
- <el-form-item
- label-width="150px"
- label="棣栨鍖荤枟鏈烘瀯绉戝"
- prop="firstDept"
- >
- <el-input v-model="form.firstDept" placeholder="璇疯緭鍏�" />
</el-form-item>
</el-col>
</el-row>
@@ -511,8 +475,14 @@
/>
</el-col>
</el-row>
+
<el-row>
- <el-col :span="12">
+ <el-col :span="4">
+ <el-form-item label="浣忛櫌鍙�" prop="inpatientno">
+ <el-input v-model="form.inpatientno" placeholder="浣忛櫌鍙�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="9">
<el-form-item align="left" label="琛�鍨�" prop="bloodtype">
<el-radio-group v-model="form.bloodtype">
<el-radio
@@ -524,7 +494,7 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12" :pull="1">
+ <el-col :span="9" :pull="1">
<el-form-item label="Rh(D)" align="left" prop="rhyin">
<el-radio-group v-model="form.rhyin">
<el-radio
@@ -537,6 +507,44 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="16">
+ <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname">
+ <el-input
+ v-model="form.diagnosisname"
+ placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <!-- <el-row>
+ <el-col :span="6">
+ <el-form-item label="鑱屼笟" prop="occupation">
+ <el-select v-model="form.occupation" 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>
+ <el-col :span="6">
+ <el-form-item label="瀛﹀巻" prop="education">
+ <el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻">
+ <el-option
+ v-for="dict in dict.type.sys_education || []"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row> -->
+
<el-row>
<el-form-item label="鐤剧梾绫诲瀷" align="left" prop="diseasetype">
<el-checkbox-group v-model="form.diseasetype">
@@ -593,7 +601,9 @@
</el-checkbox-group>
</el-form-item>
</el-col>
- <el-col :span="15" align="left">
+ </el-row>
+ <el-row>
+ <el-col :span="15">
<el-form-item label="鍏朵粬鎯呭喌" prop="othercases">
<el-checkbox-group v-model="form.othercases">
<el-checkbox
@@ -1428,20 +1438,7 @@
width="90"
prop="organno"
/> -->
- <el-table-column
- label="鍒嗛厤绯荤粺缂栧彿"
- align="center"
- width="120"
- prop="caseno"
- >
- <template slot-scope="scope">
- <el-input
- v-model="scope.row.caseno"
- placeholder="鍒嗛厤绯荤粺缂栧彿"
- />
- </template>
- </el-table-column>
- <el-table-column
+ <el-table-column
label="鍒嗛厤鎺ユ敹鏃堕棿"
align="center"
width="200"
@@ -1460,6 +1457,20 @@
</el-date-picker>
</template>
</el-table-column>
+ <el-table-column
+ label="鍒嗛厤绯荤粺缂栧彿"
+ align="center"
+ width="120"
+ prop="caseno"
+ >
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.caseno"
+ placeholder="鍒嗛厤绯荤粺缂栧彿"
+ />
+ </template>
+ </el-table-column>
+
<el-table-column
label="鍙椾綋濮撴皬"
align="center"
@@ -1559,24 +1570,15 @@
label-position="right"
>
<el-row>
- <el-col :span="24">
+ <el-col :span="10">
<el-form-item
- align="left"
- label="鎹愮尞绫诲埆"
- prop="donationcategory"
+ label="鎹愮尞鍖婚櫌"
+ prop="donateHospital "
>
- <el-radio-group v-model="witnessform.donationcategory">
- <el-radio
- v-for="dict in dict.type.sys_DonationCategory || []"
- :key="dict.value"
- :label="dict.value"
- >{{ dict.label }}</el-radio
- >
- </el-radio-group>
+ <el-input v-model="witnessform.donateHospital " placeholder="璇疯緭鍏ユ崘鐚尰闄�" />
</el-form-item>
</el-col>
</el-row>
- <el-row> </el-row>
<el-row>
<el-col :span="6">
<el-form-item
@@ -1604,6 +1606,19 @@
/>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item
+ align="left"
+ label="姝讳骸鍘熷洜"
+ label-width="120px"
+ prop="deathreason"
+ >
+ <el-input
+ v-model="witnessform.deathreason"
+ placeholder="璇疯緭鍏ユ浜″師鍥�"
+ />
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item
align="left"
@@ -1621,20 +1636,28 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="6">
+
+ </el-row>
+ <el-row>
+ <el-col :span="24">
<el-form-item
align="left"
- label="姝讳骸鍘熷洜"
- label-width="120px"
- prop="deathreason"
+ label="鎹愮尞绫诲埆"
+ prop="donationcategory"
>
- <el-input
- v-model="witnessform.deathreason"
- placeholder="璇疯緭鍏ユ浜″師鍥�"
- />
+ <el-radio-group v-model="witnessform.donationcategory">
+ <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>
</el-row>
+ <el-row> </el-row>
+
<el-row>
<el-col :span="6">
<el-form-item
@@ -1934,25 +1957,7 @@
/>
</template>
</el-table-column> -->
- <el-table-column
- label="鑾峰彇寮�濮嬫椂闂�"
- align="center"
- width="200"
- prop="organStartTime"
- >
- <template slot-scope="scope">
- <el-date-picker
- clearable
- size="small"
- style="width: 100%"
- v-model="scope.row.organStartTime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
- >
- </el-date-picker>
- </template>
- </el-table-column>
+
<el-table-column
v-if="organgettimetrue"
label="鍣ㄥ畼绂讳綋鏃堕棿"
@@ -2004,6 +2009,25 @@
/>
</template>
</el-table-column>
+ <el-table-column
+ label="鑾峰彇寮�濮嬫椂闂�"
+ align="center"
+ width="200"
+ prop="organStartTime"
+ >
+ <template slot-scope="scope">
+ <el-date-picker
+ clearable
+ size="small"
+ style="width: 100%"
+ v-model="scope.row.organStartTime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
+ >
+ </el-date-picker>
+ </template>
+ </el-table-column>
<!-- <el-table-column
label="鍙椾綋濮撴皬"
align="center"
--
Gitblit v1.9.3