From 240c74ffb2b98faddf76648116ca9eeb61ee2cde Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 11 一月 2024 09:34:49 +0800 Subject: [PATCH] 问题项修改 --- src/views/eam/RepairOrderList.vue | 171 +++++++++++++++++++++++++++++++------------------------- 1 files changed, 95 insertions(+), 76 deletions(-) diff --git a/src/views/eam/RepairOrderList.vue b/src/views/eam/RepairOrderList.vue index c2c0583..fdf05fe 100644 --- a/src/views/eam/RepairOrderList.vue +++ b/src/views/eam/RepairOrderList.vue @@ -8,14 +8,17 @@ layout="inline" @keyup.enter.native="searchQuery" > - <a-row :gutter="24" style="margin-bottom: 1%;"> + <a-row + :gutter="24" + style="margin-bottom: 1%;" + > <a-col :xl="24" :lg="7" :md="8" :sm="24" > - <a-form-item label="缁熶竴缂栧彿缇�"> + <a-form-item label="缁熶竴缂栧彿缇�"> <a-textarea placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤绌烘牸闅斿紑,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�" v-model="queryParam.nums" @@ -82,28 +85,27 @@ </span> </a-col> --> <a-col - :xl="6" - :lg="7" - :md="8" - :sm="24" - > - <a-form-item label="璁惧鍚嶇О"> - <a-input - placeholder="璇疯緭鍏ヨ澶囧悕绉�" - v-model="queryParam.equipmentName" - ></a-input> - </a-form-item> - </a-col> - </a-row> - <a-row :gutter="24"> - <a-col :xl="6" - :lg="7" - :md="8" - :sm="24"> - <a-form-item - label="璁惧鎵�灞炲垎绫�" - > + :lg="7" + :md="8" + :sm="24" + > + <a-form-item label="璁惧鍚嶇О"> + <a-input + placeholder="璇疯緭鍏ヨ澶囧悕绉�" + v-model="queryParam.equipmentName" + ></a-input> + </a-form-item> + </a-col> + </a-row> + <a-row :gutter="24"> + <a-col + :xl="6" + :lg="7" + :md="8" + :sm="24" + > + <a-form-item label="璁惧鎵�灞炲垎绫�"> <j-dict-select-tag dictCode="mom_eam_equipment_category,name,id" placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨" @@ -111,15 +113,13 @@ /> </a-form-item> </a-col> - <a-col - :xl="6" + <a-col + :xl="6" :lg="7" - :md="8" - :sm="24" + :md="8" + :sm="24" > - <a-form-item - label="宸ュ尯" - > + <a-form-item label="宸ュ尯"> <j-dict-select-tag allow-clear placeholder="璇烽�夋嫨璧勫伐鍖�" @@ -130,14 +130,12 @@ </a-form-item> </a-col> <a-col - :xl="6" + :xl="6" :lg="7" - :md="8" - :sm="24" + :md="8" + :sm="24" > - <a-form-item - label="鏄惁鍏抽敭璁惧" - > + <a-form-item label="鏄惁鍏抽敭璁惧"> <j-dict-select-tag allow-clear placeholder="璇烽�夋嫨鏄惁鍏抽敭璁惧" @@ -163,8 +161,8 @@ /> </a-form-item> </a-col> - </a-row> - <!-- <a-row :gutter="24"> + </a-row> + <!-- <a-row :gutter="24"> <a-col :xl="6" :lg="7" @@ -187,16 +185,16 @@ </div> <!-- 鎿嶄綔鎸夐挳鍖哄煙 --> <div class="table-operator"> - <a-dropdown> + <!-- <a-dropdown> <a-menu slot="overlay"> - <!-- <a-menu-item + <a-menu-item key="1" @click="handleAddPre(1)" - ><a-icon type="smile" />鑷缓</a-menu-item> --> - <!-- <a-menu-item + ><a-icon type="smile" />鑷缓</a-menu-item> + <a-menu-item key="2" @click="handleAddPre(2)" - ><a-icon type="copy" />鍙傜収鏁呴殰鎶ヤ慨鍗�</a-menu-item> --> + ><a-icon type="copy" />鍙傜収鏁呴殰鎶ヤ慨鍗�</a-menu-item> <a-menu-item key="2" @click="handleAddPre(3)" @@ -206,7 +204,7 @@ type="primary" icon="plus" >鏂板</a-button> - </a-dropdown> + </a-dropdown> --> <a-button type="primary" @@ -226,10 +224,10 @@ :disabled="selectionRows.length==0" >娲惧伐</a-button> <a-button - type="primary" - icon="plus" - @click="getReports" - v-has="'repair:accept'" + type="primary" + icon="plus" + @click="getReports" + v-has="'repair:accept'" >棰嗗彇</a-button> <!-- <a-button type="primary" icon="download" @click="handleExportXls('缁翠慨宸ュ崟')">瀵煎嚭</a-button> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> @@ -258,7 +256,6 @@ bordered rowKey="id" class="j-table-force-nowrap" - :scroll="{ x: 'calc(2700px + 50%)', y: 900 }" :columns="columns" :dataSource="dataSource" :pagination="ipagination" @@ -266,17 +263,32 @@ @change="handleTableChange" :customRow="clickThenSelect" :rowClassName="tableRowClass" + :scroll="{ x: 'calc(1700px + 50%)', y: 900 }" > - <span slot="jell" slot-scope="text"> - <j-ellipsis :value="text" :length="8" /> + <span + slot="jell" + slot-scope="text" + > + <j-ellipsis + :value="text" + :length="8" + /> </span> <span slot="specificEquipment" slot-scope="text" > - <a-icon type="check" style="color: chartreuse;" v-if="text==='0'" /> - <a-icon type="close" v-else style="color:red;"/> - </span> + <a-icon + type="check" + style="color: chartreuse;" + v-if="text==='0'" + /> + <a-icon + type="close" + v-else + style="color:red;" + /> + </span> <span slot="num" slot-scope="text, record" @@ -285,8 +297,14 @@ v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '7' " class="lot" @click="handleOrderExe(record)" - ><j-ellipsis :value="text" :length="15"/></a> - <span v-else> <j-ellipsis :value="text" :length="15"/></span> + ><j-ellipsis + :value="text" + :length="15" + /></a> + <span v-else> <j-ellipsis + :value="text" + :length="15" + /></span> </span> <span slot="action" @@ -425,10 +443,9 @@ tab="瀹為檯鐢ㄦ枡" key="6" forceRender - v-if="false" > - <!-- v-if="!sonsAddStatus&&selectedRowKeys.length!=0" --> + <!-- v-if="!sonsAddStatus&&selectedRowKeys.length!=0" --> <RepairOrderActualMaterialList :mainId="repairOrderActualMaterialMainId" /> </a-tab-pane> <a-tab-pane @@ -510,10 +527,10 @@ FaultReportRepair, store }, - mounted(){ + mounted() { let intervalId = setInterval(() => { - this.loadData(); - }, 600*1000); // 1000姣锛屽嵆1绉� + this.loadData(); + }, 600 * 1000); // 1000姣锛屽嵆1绉� }, data() { return { @@ -534,6 +551,7 @@ title: '鍏抽敭璁惧', align: "center", dataIndex: 'specificEquipment', + width: 90, scopedSlots: { customRender: 'specificEquipment' } }, { @@ -545,8 +563,8 @@ title: '缁翠慨鐘舵��', align: "center", dataIndex: 'repairOrderUda1_dictText', - customRender:function (t,r,index) { - return t===null||r.repairOrderUda1===null?'/':t; + customRender: function (t, r, index) { + return t === null || r.repairOrderUda1 === null ? '/' : t; } }, { @@ -599,8 +617,8 @@ title: '缁翠慨鐝粍', align: "center", dataIndex: 'teamId_dictText', - scopedSlots: { - customRender: 'jell' + scopedSlots: { + customRender: 'jell' } }, { @@ -632,8 +650,8 @@ title: '鏁呴殰鎻忚堪', align: "center", dataIndex: 'faultDescription', - scopedSlots: { - customRender: 'jell' + scopedSlots: { + customRender: 'jell' } }, // { @@ -712,9 +730,10 @@ dataIndex: 'action', align: "center", fixed: "right", - width: 230, + width: 130, scopedSlots: { customRender: 'action' }, } + ], url: { list: "/eam/repairOrder/list", @@ -731,8 +750,8 @@ /* 鍒嗛〉鍙傛暟 */ ipagination: { current: 1, - pageSize: 5, - pageSizeOptions: ['5', '10', '50'], + pageSize: 20, + pageSizeOptions: ['5', '10', '20', '50'], showTotal: (total, range) => { return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�" }, @@ -948,16 +967,16 @@ this.onClearSelected() this.$refs.FaultDescriptionList.faultId = '-1' }, - getReports(){ - this.$refs.FaultReportRepair.title = '鏁呴殰鎶ヤ慨鍗�'; - this.$refs.FaultReportRepair.loadData(); - this.$refs.FaultReportRepair.visible = true; + getReports() { + this.$refs.FaultReportRepair.title = '鏁呴殰鎶ヤ慨鍗�'; + this.$refs.FaultReportRepair.loadData(); + this.$refs.FaultReportRepair.visible = true; }, tableRowClass(record, index) { if ("2" === record.status) { - if (record.specificEquipment==='0'&&dayjs(record.faultTime).add(12,'hour')<dayjs()) { + if (record.specificEquipment === '0' && dayjs(record.faultTime).add(12, 'hour') < dayjs()) { return 'error' - } else if(dayjs(record.faultTime).add(7,'day')<dayjs()){ + } else if (dayjs(record.faultTime).add(7, 'day') < dayjs()) { return 'primary' } } -- Gitblit v1.9.3