From f6e08ed9602307f610fc3f0bc3266103dca40c2b Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 25 四月 2024 15:44:00 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/unitCost/particulars/index.vue | 133 +++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 80 deletions(-)
diff --git a/src/views/project/unitCost/particulars/index.vue b/src/views/project/unitCost/particulars/index.vue
index faf6b38..5cabaa7 100644
--- a/src/views/project/unitCost/particulars/index.vue
+++ b/src/views/project/unitCost/particulars/index.vue
@@ -6,17 +6,9 @@
<el-row>
<el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker v-model="form.createTime" value-format="yyyy-MM-dd " type="date"
- :disabled="true" placeholder="閫夋嫨鍑虹敓骞存湀">
+ <el-date-picker v-model="form.createTime" value-format="yyyy-MM-dd " type="date" :disabled="true"
+ placeholder="閫夋嫨鍑虹敓骞存湀">
</el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="鍗曟嵁鐘舵��" prop="paystatus">
- <el-select v-model="form.paystatus" placeholder="璇烽�夋嫨鐘舵��">
- <el-option v-for="dict in gatheringlist" :key="dict.label" :label="dict.label"
- :value="dict.value"></el-option>
- </el-select>
</el-form-item>
</el-col>
<el-col :span="5"><el-form-item label="鍗曟嵁缂栧彿" prop="paymentno">
@@ -24,41 +16,30 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="缁忓姙浜�" prop="createby">
- <el-input v-model="form.createby" placeholder="璇疯緭鍏ュ鍚�" :disabled="true" />
+ <el-form-item label="鏀舵鐘舵��" prop="paystatus">
+ <el-select v-model="form.paystatus" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option v-for="dict in gatheringlist" :key="dict.label" :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-input v-model="form.userName" placeholder="璇疯緭鍏ュ鍚�" :disabled="true" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
- <el-form-item label="鏀舵鍗曚綅" prop="beneficiary">
- <el-input v-model="form.beneficiary" placeholder="璇疯緭鍏ユ敹娆惧崟浣�" />
- </el-form-item>
- </el-col>
- <el-col :span="10">
- <el-form-item label="鏀舵閾惰" prop="beneficiarybank">
- <el-input v-model="form.beneficiarybank" placeholder="璇疯緭鍏ユ敹娆鹃摱琛�" />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="鏀舵璐﹀彿" prop="beneficiaryaccount">
- <el-input v-model="form.beneficiaryaccount" placeholder="璇疯緭鍏ユ敹娆捐鍙�" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="20">
- <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="5">
- <el-form-item label="浠樻鍖婚櫌" prop="hospitalname">
+ <el-form-item label="鍖荤枟鏈烘瀯" prop="hospitalname">
<el-input v-model="form.hospitalname" placeholder="璇疯緭鍏ヤ粯娆惧尰闄�" :disabled="true" />
</el-form-item>
- </el-col>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="搴旀敹閲戦" prop="receivableamount">
+ <el-input v-model="form.receivableamount" placeholder="璇疯緭鍏ュ簲鏀堕噾棰�" :disabled="true" />
+ </el-form-item>
+ </el-col>
<el-col :span="5">
<el-form-item label="瀹炴敹閲戦" prop="receivedamount">
<el-input @blur="chargeSumall" v-model="form.receivedamount" placeholder="璇疯緭鍏ュ疄鏀堕噾棰�" />
@@ -66,14 +47,16 @@
</el-col>
<el-col :span="5">
<el-form-item label="鏀舵鏃ユ湡" prop="receivedtime">
- <el-date-picker clearable size="small" v-model="form.receivedtime" value-format="yyyy-MM-dd "
- type="date" placeholder="閫夋嫨鏀舵鏃ユ湡">
+ <el-date-picker clearable size="small" v-model="form.receivedtime" value-format="yyyy-MM-dd " type="date"
+ placeholder="閫夋嫨鏀舵鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="5">
- <el-form-item label="搴旀敹閲戦" prop="receivableamount">
- <el-input v-model="form.receivableamount" placeholder="璇疯緭鍏ュ簲鏀堕噾棰�" :disabled="true" />
+ </el-row>
+ <el-row>
+ <el-col :span="20">
+ <el-form-item label="澶囨敞淇℃伅" prop="remark">
+ <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-col>
</el-row>
@@ -84,9 +67,9 @@
<el-row style="margin-top: 10px">
<el-table :data="donorchargeorgans" ref="table" border max-height="800" highlight-current-row
:summary-method="getSummaries" show-summary>
- <el-table-column prop="organno" align="center" fixed label="鍣ㄥ畼缂栧彿" width="90">
+ <el-table-column prop="donorname" align="center" fixed label="鎹愮尞鑰�" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.organno" placeholder="鍣ㄥ畼缂栧彿" :disabled="true" />
+ <el-input v-model="scope.row.donorname" placeholder="鎹愮尞鑰�" :disabled="true" />
</template>
</el-table-column>
<el-table-column prop="organname" fixed align="center" label="鍣ㄥ畼鍚嶇О" width="120">
@@ -94,25 +77,19 @@
<el-input v-model="scope.row.organname" :disabled="true" placeholder="鍣ㄥ畼鍚嶇О" />
</template>
</el-table-column>
- <el-table-column label="鍥藉缂栧彿" align="center" width="120" prop="caseno">
+ <el-table-column prop="organno" align="center" fixed label="鍣ㄥ畼缂栧彿" width="90">
<template slot-scope="scope">
- <el-input v-model="scope.row.caseno" :disabled="true" placeholder="鍥藉缂栧彿" />
+ <el-input v-model="scope.row.organno" placeholder="鍣ㄥ畼缂栧彿" :disabled="true" />
</template>
</el-table-column>
- <el-table-column prop="hospitalno" align="center" label="鎺ユ敹鍖婚櫌" width="280">
+ <el-table-column label="鍒嗛厤绯荤粺缂栧彿" align="center" width="120" prop="caseno">
<template slot-scope="scope">
- <!-- <el-input
- v-model="scope.row.hospitalname"
- :disabled="true"
- placeholder="鎺ユ敹鍖婚櫌"
- /> -->
- <org-selecter ref="tranHosSelect" :org-type="'4'" :disabled="true" v-model="scope.row.hospitalno"
- style="width: 100%" />
+ <el-input v-model="scope.row.caseno" :disabled="true" placeholder="鍒嗛厤绯荤粺缂栧彿" />
</template>
</el-table-column>
<el-table-column label="鍙椾綋濮撴皬" align="center" width="120" prop="name">
<template slot-scope="scope">
- <el-input v-model="scope.row.name" :disabled="true" placeholder="鍙椾綋濮撴皬" />
+ <el-input v-model="scope.row.name" placeholder="鍙椾綋濮撴皬" />
</template>
</el-table-column>
<el-table-column prop="receiveTime" align="center" label="鎺ユ敹鏃ユ湡" width="200">
@@ -122,7 +99,6 @@
</el-date-picker>
</template>
</el-table-column>
-
<el-table-column prop="organcharge" align="center" label="搴旀敹閲戦" width="150">
<template slot-scope="scope">
<el-input @blur="chargeSum" v-model="scope.row.organcharge" placeholder="搴旀敹閲戦" />
@@ -133,7 +109,18 @@
<el-input @blur="chargeSum" v-model="scope.row.amount" placeholder="瀹炴敹閲戦" />
</template>
</el-table-column>
-
+ <el-table-column prop="organchargedesc" width="280" align="center" label="澶囨敞">
+ <template slot-scope="scope">
+ <el-input type="textarea" :rows="1" v-model="scope.row.organchargedesc" placeholder="澶囨敞" />
+ </template>
+ </el-table-column>
+ <!--
+ <el-table-column prop="hospitalno" align="center" label="鎺ユ敹鍖婚櫌" width="280">
+ <template slot-scope="scope">
+ <org-selecter ref="tranHosSelect" :org-type="'4'" :disabled="true" v-model="scope.row.hospitalno"
+ style="width: 100%" />
+ </template>
+ </el-table-column>
<el-table-column prop="amounttime" align="center" label="鏀舵鏃ユ湡" width="200">
<template slot-scope="scope">
<el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.amounttime" type="date"
@@ -141,11 +128,7 @@
</el-date-picker>
</template>
</el-table-column>
- <el-table-column prop="organchargedesc" width="280" align="center" label="澶囨敞">
- <template slot-scope="scope">
- <el-input type="textarea" :rows="1" v-model="scope.row.organchargedesc" placeholder="澶囨敞" />
- </template>
- </el-table-column>
+ -->
<el-table-column label="鎿嶄綔" fixed="right" width="260" align="center">
<template slot-scope="scope">
<el-button type="text" @click="handleDelete(scope.row)" v-hasPermi="['system:donorcharge:remove']"><span
@@ -167,19 +150,11 @@
<div class="examine-jic">
<div style="margin: 0 10px 20px 10px;">
<el-card class="box-card">
- <el-tag
- v-for="item in overallCase"
- :key="item.id"
- closable
- @close="handleClose(item)"
- >
+ <el-tag v-for="item in overallCase" :key="item.id" closable @close="handleClose(item)">
{{ item.donorname }}
</el-tag>
<div style="margin-top: 20px; text-align: right;">
- 鍏遍�夋嫨<span
- style="font-size: 18px; color: #409EFF;margin: 0 10px;"
- >{{ overallCase.length }}</span
- >鏉℃暟鎹�
+ 鍏遍�夋嫨<span style="font-size: 18px; color: #409EFF;margin: 0 10px;">{{ overallCase.length }}</span>鏉℃暟鎹�
</div>
</el-card>
</div>
@@ -214,20 +189,17 @@
scope.row.donorname
}}</template>
</el-table-column>
-
<el-table-column prop="organname" label="鍣ㄥ畼鍚嶇О" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="organno" label="鍣ㄥ畼缂栧彿" width="120">
</el-table-column>
- <el-table-column prop="caseno" label="鍥藉鍒嗛厤缂栧彿" show-overflow-tooltip>
+ <el-table-column prop="caseno" label="鍒嗛厤绯荤粺缂栧彿" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="name" label="鍙椾綋濮撴皬" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="hospitalname" label="鎺ユ敹鍖婚櫌" show-overflow-tooltip>
+ <el-table-column prop="receiveTime" label="绉绘鏃ユ湡" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="receiveTime" label="鎺ユ敹鏃ユ湡" show-overflow-tooltip>
- </el-table-column>
- <el-table-column prop="address" label="澶囨敞" show-overflow-tooltip>
+ <el-table-column prop="organchargedesc" label="澶囨敞淇℃伅" show-overflow-tooltip>
</el-table-column>
</el-table>
</el-row>
@@ -854,7 +826,7 @@
handleDelete(row) {
this.$modal
- .confirm("鏄惁纭鍒犻櫎璇ユ潯鍣ㄥ畼璐圭敤鏁版嵁椤癸紵")
+ .confirm("鏄惁纭鍒犻櫎璇ユ潯鍣ㄥ畼鐨勬暟鎹」锛�")
.then(() => {
let value = row;
value.paymentid = null;
@@ -1236,6 +1208,7 @@
}
}
}
+
::v-deep .el-tag--medium {
height: 28px;
line-height: 26px;
--
Gitblit v1.9.3