From cdd399de614778acee8880ec133242c5500c3e03 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 12 八月 2026 09:56:22 +0800
Subject: [PATCH] 合并冲突
---
src/views/project/fundcheck/medicalCostCheck/index.vue | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index 72419c6..464203a 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -1,15 +1,15 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
<el-row align="left">
<el-col :span="5">
<el-form-item label="鎹愮尞妗堜緥" prop="donorname" style="float: left">
- <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�" clearable size="small"
+ <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ユ崘鐚��" clearable size="small"
@keyup.enter.native="flowconclusion" />
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label-width="120px" label="棰勫鐘舵��" prop="checkstatus" style="float: left">
+ <el-form-item label-width="90px" label="棰勫鐘舵��" prop="checkstatus" style="float: left">
<el-select v-model="queryParams.checkstatus" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option v-for="item in checkmaterials" :key="item.value" :label="item.label" :value="item.value">
</el-option>
@@ -76,13 +76,13 @@
</el-table-column>
-->
<el-table-column label="鎶ラ攢鍗曞彿" align="center" prop="bh" width="150px" />
- <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="applyTime">
+ <el-table-column label="鐢宠鏃ユ湡" width="120px" align="center" prop="applyTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
- <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" />
+ <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="120px" />
+ <el-table-column label="缁忓姙浜�" align="center" prop="username" width="90px" />
<!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />-->
<!--
<el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" />
@@ -95,21 +95,21 @@
</el-table-column>
<el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />
-->
- <el-table-column label="鐢宠鏉愭枡鐘舵��" width="140" align="center" prop="checkstatus">
+ <el-table-column label="鏉愭枡棰勫鐘舵��" width="140px" align="center" prop="checkstatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_stage_type" :value="scope.row.checkstatus" />
</template>
</el-table-column>
- <el-table-column label="瀹℃壒鐘舵��" align="center" prop="recordstatus" width="180">
+ <el-table-column label="瀹℃壒鐘舵��" align="center" prop="recordstatus" width="140px">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
- <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="150px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="140px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="90px" />
+ <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="90px" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
- <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px">
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope">
<el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
@click="handleCheck(scope.row)">瀹℃牳</el-button>
@@ -593,11 +593,11 @@
checkmaterials: [
{
value: 1,
- label: "鏉愭枡寰呭鏍�"
+ label: "寰呭鏍�"
},
{
value: 2,
- label: "瀹℃煡閫氳繃绛夊緟閭瘎绾歌川鏉愭枡"
+ label: "瀹℃煡閫氳繃绛夊緟绾歌川鏉愭枡"
},
{
value: 3,
@@ -1552,7 +1552,7 @@
// this.defaultperson = response.data;
// this.standardlevel = response.data.standardlevel;
if (
- response.data.userName === "001" ||
+ response.data.userName === "053" ||
response.data.userName === "002" ||
response.data.userName === "admin"
) {
--
Gitblit v1.9.3