From 70bf5f310d85c3a0700d75a7a877f5a1e403d83f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 28 三月 2024 09:09:51 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-expenses.vue | 69 ++++++++--------------------------
1 files changed, 17 insertions(+), 52 deletions(-)
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index ebfbe7c..77eab64 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -47,11 +47,25 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;">璐圭敤缁熻</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button size="small" type="primary">涓嬪崟</el-button>
+ <el-button size="small" type="primary">OA鎺ㄩ��</el-button>
</el-col>
</el-row>
</div>
<div class="search">
+ <div class="search_thing">
+ <div class="search_label">鏃堕棿鑼冨洿锛�</div>
+ <div class="search_input">
+ <el-date-picker
+ v-model="componentData.entity.sample"
+ type="datetimerange"
+ range-separator="鑷�"
+ format="yyyy-MM-dd HH:mm:ss"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ size="small">
+ </el-date-picker>
+ </div>
+ </div>
<div class="search_thing">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
@@ -113,57 +127,8 @@
isIndex: true,
showSelect: false,
select: false,
- do: [{
- id: 'handleWeave',
- font: '鍦ㄧ嚎缂栧埗',
- type: 'text',
- method: 'handleWeave',
- disabFun: (row, index) => {
- return row.state != 1
- }
- }, {
- id: 'download',
- font: '涓嬭浇',
- type: 'text',
- method: 'download',
- disabFun: (row, index) => {
- return row.state != 1
- }
- }, {
- id: 'handleUpload',
- font: '涓婁紶',
- type: 'text',
- method: 'handleUpload',
- disabFun: (row, index) => {
- return row.state != 0
- }
- }, {
- id: 'handlRestore',
- font: '杩樺師',
- type: 'text',
- method: 'handleRestore'
- }, {
- id: 'handleIssued',
- font: '瀹℃牳',
- type: 'text',
- method: 'handleIssued',
- disabFun: (row, index) => {
- return row.state != 1 || row.sendTime != null
- }
- }, {
- id: 'handleApprove',
- font: '鎵瑰噯',
- type: 'text',
- method: 'handleApprove',
- disabFun: (row, index) => {
- return row.state != 1 || row.sendTime != null
- }
- }],
- linkEvent:{
- entrustCode:{
- method:'selectAllByOne'
- }
- },
+ do: [],
+ linkEvent:{},
tagField: {
type: {
select: [{
--
Gitblit v1.9.3