From 6b24c28ba8a418c1efb46ed0576c9d6c3f5ab82c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 12 十二月 2023 17:28:56 +0800
Subject: [PATCH] Merge branch 'develop' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/RepairOrderActualWorkHoursList.vue | 240 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 135 insertions(+), 105 deletions(-)
diff --git a/src/views/eam/RepairOrderActualWorkHoursList.vue b/src/views/eam/RepairOrderActualWorkHoursList.vue
index 05ec3aa..d51329b 100644
--- a/src/views/eam/RepairOrderActualWorkHoursList.vue
+++ b/src/views/eam/RepairOrderActualWorkHoursList.vue
@@ -1,16 +1,16 @@
<template>
- <a-card :bordered="false" :class="'cust-erp-sub-tab'">
+ <a-card :bordered='false' :class="'cust-erp-sub-tab'">
<!-- 鏌ヨ鍖哄煙 -->
- <div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
- <a-row :gutter="24">
+ <div class='table-page-search-wrapper'>
+ <a-form layout='inline' @keyup.enter.native='searchQuery'>
+ <a-row :gutter='24'>
</a-row>
</a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <div class="table-operator" v-if="mainId">
+ <div class='table-operator' v-if='mainId'>
<!-- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('瀹為檯宸ユ椂')">瀵煎嚭</a-button> -->
<!-- <a-upload
@@ -22,11 +22,16 @@
@change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
</a-upload> -->
- <a-dropdown v-if="selectedRowKeys.length > 0">
- <a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>鍒犻櫎</a-menu-item>
+ <a-dropdown v-if='selectedRowKeys.length > 0'>
+ <a-menu slot='overlay'>
+ <a-menu-item key='1' @click='batchDel'>
+ <a-icon type='delete' />
+ 鍒犻櫎
+ </a-menu-item>
</a-menu>
- <a-button style="margin-left: 8px"> 鎵归噺鎿嶄綔 <a-icon type="down" /></a-button>
+ <a-button style='margin-left: 8px'> 鎵归噺鎿嶄綔
+ <a-icon type='down' />
+ </a-button>
</a-dropdown>
</div>
@@ -38,42 +43,43 @@
</div> -->
<a-table
- ref="table"
- size="middle"
+ ref='table'
+ size='middle'
bordered
- rowKey="id"
- :scroll="{x:true}"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- @change="handleTableChange">
+ rowKey='id'
+ :scroll='{x:true}'
+ :columns='columns'
+ :dataSource='dataSource'
+ :pagination='ipagination'
+ :loading='loading'
+ @change='handleTableChange'>
<!-- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" -->
- <template slot="htmlSlot" slot-scope="text">
- <div v-html="text"></div>
+ <template slot='htmlSlot' slot-scope='text'>
+ <div v-html='text'></div>
</template>
- <template slot="imgSlot" slot-scope="text,record">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+ <template slot='imgSlot' slot-scope='text,record'>
+ <span v-if='!text' style='font-size: 12px;font-style: italic;'>鏃犲浘鐗�</span>
+ <img v-else :src='getImgView(text)' :preview='record.id' height='25px' alt=''
+ style='max-width:80px;font-size: 12px;font-style: italic;' />
</template>
- <template slot="fileSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
+ <template slot='fileSlot' slot-scope='text'>
+ <span v-if='!text' style='font-size: 12px;font-style: italic;'>鏃犳枃浠�</span>
<a-button
v-else
- :ghost="true"
- type="primary"
- icon="download"
- size="small"
- @click="downloadFile(text)">
+ :ghost='true'
+ type='primary'
+ icon='download'
+ size='small'
+ @click='downloadFile(text)'>
涓嬭浇
</a-button>
</template>
- <span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
- <a-divider type="vertical" />
- <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <span slot='action' slot-scope='text, record'>
+ <a @click='handleEdit(record)'>缂栬緫</a>
+ <a-divider type='vertical' />
+ <a-popconfirm title='纭畾鍒犻櫎鍚�?' @confirm='() => handleDelete(record.id)'>
<a>鍒犻櫎</a>
</a-popconfirm>
</span>
@@ -81,65 +87,73 @@
</a-table>
</div>
- <repairOrderActualWorkHours-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></repairOrderActualWorkHours-modal>
+ <repairOrderActualWorkHours-modal ref='modalForm' @ok='modalFormOk'
+ :mainId='mainId'></repairOrderActualWorkHours-modal>
</a-card>
</template>
<script>
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import RepairOrderActualWorkHoursModal from './modules/repairorder/RepairOrderActualWorkHoursModal'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import RepairOrderActualWorkHoursModal from './modules/repairorder/RepairOrderActualWorkHoursModal'
- export default {
- name: "RepairOrderActualWorkHoursList",
- mixins:[JeecgListMixin],
- components: { RepairOrderActualWorkHoursModal },
- props:{
- mainId:{
- type:String,
- default:'',
- required:false
- }
- },
- watch:{
- mainId:{
- immediate: true,
- handler(val) {
- if(!this.mainId){
- this.clearList()
- }else{
- this.queryParam['repairOrderId'] = val
- this.loadData(1);
- }
+export default {
+ name: 'RepairOrderActualWorkHoursList',
+ mixins: [JeecgListMixin],
+ components: { RepairOrderActualWorkHoursModal },
+ props: {
+ mainId: {
+ type: String,
+ default: '',
+ required: false
+ }
+ },
+ watch: {
+ mainId: {
+ immediate: true,
+ handler(val) {
+ if (!this.mainId) {
+ this.clearList()
+ } else {
+ this.queryParam['repairOrderId'] = val
+ this.loadData(1)
}
}
- },
- data () {
- return {
- description: '缁翠慨宸ュ崟绠＄悊椤甸潰',
- disableMixinCreated:true,
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
+ }
+ },
+ data() {
+ return {
+ description: '缁翠慨宸ュ崟绠＄悊椤甸潰',
+ disableMixinCreated: true,
+ // 琛ㄥご
+ columns: [
+ {
+ title: '#',
+ dataIndex: '',
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ }
+ },
+ {
title: '浜哄憳缂栫爜',
dataIndex: 'username',
- align: 'center',
+ align: 'center'
},
{
title: '浜哄憳鍚嶇О',
dataIndex: 'realname',
- align: 'center',
+ align: 'center'
+
+ },
+
+ {
+ title: '涓绘壙淇汉',
+ dataIndex: 'principalContractor_dictText',
+ align: 'center'
},
// {
@@ -151,37 +165,53 @@
{
title: '瀹為檯宸ユ椂',
dataIndex: 'actualHour',
- align: 'center',
+ align: 'center'
},
- ],
- url: {
- list: "/eam/repairOrder/listRepairOrderActualWorkHoursByMainId",
- delete: "/eam/repairOrder/deleteRepairOrderActualWorkHours",
- deleteBatch: "/eam/repairOrder/deleteBatchRepairOrderActualWorkHours",
- exportXlsUrl: "/eam/repairOrder/exportRepairOrderActualWorkHours",
- importUrl: "/eam/repairOrder/importRepairOrderActualWorkHours",
- },
- dictOptions:{
- }
- }
- },
- created() {
- },
- computed: {
- importExcelUrl(){
- return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
- }
- },
- methods: {
- clearList(){
- this.dataSource=[]
- this.selectedRowKeys=[]
- this.ipagination.current = 1
- }
+ {
+ title: '寮�濮嬫椂闂�',
+ dataIndex: 'startTime',
+ align: 'center'
+ },
+ {
+ title: '缁撴潫鏃堕棿',
+ dataIndex: 'endTime',
+ align: 'center'
+ },
+
+ {
+ title: '鐞嗚宸ユ椂',
+ dataIndex: 'theoreticalTime',
+ align: 'center'
+ }
+ ],
+ url: {
+ list: '/eam/repairOrder/listRepairOrderActualWorkHoursByMainId',
+ delete: '/eam/repairOrder/deleteRepairOrderActualWorkHours',
+ deleteBatch: '/eam/repairOrder/deleteBatchRepairOrderActualWorkHours',
+ exportXlsUrl: '/eam/repairOrder/exportRepairOrderActualWorkHours',
+ importUrl: '/eam/repairOrder/importRepairOrderActualWorkHours'
+ },
+ dictOptions: {}
}
+ },
+ created() {
+ },
+ computed: {
+ importExcelUrl() {
+ return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`
+ }
+ },
+ methods: {
+ clearList() {
+ this.dataSource = []
+ this.selectedRowKeys = []
+ this.ipagination.current = 1
+ }
+
}
+}
</script>
<style scoped>
- @import '~@assets/less/common.less'
+@import '~@assets/less/common.less'
</style>
--
Gitblit v1.9.3