From c75027743ea7c3ecc2d0885f01d11d2ad78679a3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 14:23:26 +0800
Subject: [PATCH] Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/organallocation/index.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/project/organallocation/index.vue b/src/views/project/organallocation/index.vue
index ada013a..8060a6f 100644
--- a/src/views/project/organallocation/index.vue
+++ b/src/views/project/organallocation/index.vue
@@ -3,6 +3,7 @@
<div class="app-container">
<!-- 鎼滅储鏉′欢 -->
<el-form
+ class="opo-query-form"
:model="queryParams"
ref="queryForm"
:inline="true"
@@ -150,12 +151,19 @@
/>
</template>
</el-table-column>
- <el-table-column
- label="骞撮緞"
- align="center"
- prop="age"
- width="100"
- />
+ <el-table-column label="骞撮緞" align="center" prop="age" width="100">
+ <template slot-scope="scope">
+ {{
+ `${
+ scope.row.age && scope.row.age !== 0 ? `${scope.row.age}${scope.row.ageunit?scope.row.ageunit:''}` : ""
+ } ${
+ scope.row.age2 && scope.row.age2 !== 0
+ ? `${scope.row.age2}${scope.row.ageunit2}`
+ : ""
+ }`.trim()
+ }}
+ </template>
+ </el-table-column>
<el-table-column
label="鎶ュ憡浜�"
align="center"
@@ -330,7 +338,7 @@
size="small"
style="width: 100%"
v-model="form.applicanttime"
- type="datetime"
+ type="datetime" format="yyyy-MM-dd HH:mm"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鎺ユ敹鏃堕棿"
>
@@ -700,7 +708,7 @@
this.queryParams.reportervalue = this.reportervalue;
console.log(JSON.stringify(this.queryParams));
- // this.queryParams.city='001'
+ // this.queryParams.city='053'
//console.log(JSON.stringify(this.queryParams));
if (this.starttime != "") {
this.queryParams.starttime = this.starttime;
--
Gitblit v1.9.3