From 15228767ddcd4c8c254ac87c527ebcfbd06e68ac Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 七月 2024 18:04:53 +0800
Subject: [PATCH] 修复
---
src/components/do/b3-work-time-management/work-time-management.vue | 15 ++++++++-------
src/components/view/b1-expenses.vue | 18 +++++++++++++-----
2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-management.vue b/src/components/do/b3-work-time-management/work-time-management.vue
index f70ad63..b1a9914 100644
--- a/src/components/do/b3-work-time-management/work-time-management.vue
+++ b/src/components/do/b3-work-time-management/work-time-management.vue
@@ -363,13 +363,13 @@
entityCopy1: {},
upIndex1:100,
weekList:[
- {label: '鍛ㄤ竴', value: '1',type:'primary'},
- {label: '鍛ㄤ簩', value: '2',type:'primary'},
- {label: '鍛ㄤ笁', value: '3',type:'primary'},
- {label: '鍛ㄥ洓', value: '4',type:'primary'},
- {label: '鍛ㄤ簲', value: '5',type:'primary'},
- {label: '鍛ㄥ叚', value: '6',type:'primary'},
- {label: '鍛ㄦ棩', value: '7',type:'primary'}
+ {label: '鍛ㄤ竴', value: '鍛ㄤ竴',type:'primary'},
+ {label: '鍛ㄤ簩', value: '鍛ㄤ簩',type:'primary'},
+ {label: '鍛ㄤ笁', value: '鍛ㄤ笁',type:'primary'},
+ {label: '鍛ㄥ洓', value: '鍛ㄥ洓',type:'primary'},
+ {label: '鍛ㄤ簲', value: '鍛ㄤ簲',type:'primary'},
+ {label: '鍛ㄥ叚', value: '鍛ㄥ叚',type:'primary'},
+ {label: '鍛ㄦ棩', value: '鍛ㄦ棩',type:'primary'}
],
currentTable:'ValueTable0',
addVisible:false,
@@ -508,6 +508,7 @@
this.entity.dateTime.push(formattedDate2);
this.componentData1.entity.dateTime.push(formattedDate1);
this.componentData1.entity.dateTime.push(formattedDate2);
+ this.componentData1.entity.dateTime = JSON.stringify(this.componentData1.entity.dateTime)
this.refreshTable()
},
getPower(){
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 31ac8d5..84d70ac 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -73,7 +73,7 @@
<el-select @focus="getCompanyOptions" @change="refreshTable()" clearable
size="small" v-model="componentData.entity.company" style="width: 100%">
<el-option v-for="item in companyOptions" :key="item.value"
- :label="item.label" :value="item.value">
+ :label="item.label" :value="item.label">
</el-option>
</el-select>
</div>
@@ -114,7 +114,7 @@
company: null,
dates: null,
orderBy: {
- field: 'id,ins_sample_id',
+ field: 'id',
order: 'asc'
}
},
@@ -135,6 +135,14 @@
name: 'entrustCode',
index: 2
},
+ /* {
+ name: 'sample',
+ index: 3
+ },
+ {
+ name: 'model',
+ index: 4
+ }, */
{
name: 'company',
index: 8
@@ -145,8 +153,8 @@
},
],
// 鐗规畩鐨勫悎骞惰锛屾牴鎹甿ain鍜宺ows鐨刵ame鏉ュ悎骞�
- special: {
- main: 'insSampleId',
+ /* special: {
+ main: 'entrustCode',
rows: [{
name: 'sample',
index: 3
@@ -164,7 +172,7 @@
index: 6
},
]
- }
+ } */
},
tagField: {
type: {
--
Gitblit v1.9.3