From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/EquipmentCalibrationOrder.vue | 178 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 125 insertions(+), 53 deletions(-)
diff --git a/src/views/eam/EquipmentCalibrationOrder.vue b/src/views/eam/EquipmentCalibrationOrder.vue
index 0bc40df..5b7d464 100644
--- a/src/views/eam/EquipmentCalibrationOrder.vue
+++ b/src/views/eam/EquipmentCalibrationOrder.vue
@@ -15,10 +15,10 @@
:sm='8'
>
<a-form-item label='宸ュ崟缂栫爜'>
- <a-input
+ <j-input
placeholder='璇疯緭鍏ュ伐鍗曠紪鐮�'
v-model='queryParam.num'
- ></a-input>
+ ></j-input>
</a-form-item>
</a-col>
<!-- <a-col
@@ -64,6 +64,7 @@
@click='handleAdd'
type='primary'
icon='plus'
+ v-has="'calibrationOrder:add'"
>鏂板
</a-button>
</div>
@@ -74,8 +75,7 @@
class='ant-alert ant-alert-info'
style='margin-bottom: 16px;'
>
- <i class='anticon anticon-info-circle ant-alert-icon'></i> 宸查�夋嫨 <a
- style='font-weight: 600'>{{ selectedRowKeys.length }}</a>椤�
+ <i class='anticon anticon-info-circle ant-alert-icon'></i> 宸查�夋嫨 <a style='font-weight: 600'>{{ selectedRowKeys.length }}</a>椤�
<a
style='margin-left: 24px'
@click='onClearSelected'
@@ -85,7 +85,7 @@
<a-table
ref='table'
size='middle'
- :scroll="{ x: 'calc(700px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
bordered
rowKey='id'
:columns='columns'
@@ -102,15 +102,37 @@
slot='action'
slot-scope='text, record'
>
- <a
- v-if="record.status === '1'"
- @click='handleAddOrderReport(record)'
- >缁撴灉褰曞叆</a>
- <a-divider
- v-if="record.status === '1'"
- type='vertical'
- />
- <a @click='handleDetail(record)'>璇︽儏</a>
+ <a
+ v-show="record.status === '1' || record.status === '3'"
+ @click='handleAddOrderReport(record)'
+ v-has="'calibrationOrder:write'"
+ >缁撴灉褰曞叆</a>
+
+ <a-divider
+ v-show="record.status === '1' || record.status === '3'"
+ type='vertical'
+ />
+ <a
+ v-show="record.status === '2' && record.equipmentImportance != 'D'"
+ @click='handleTechnologyStatus(record)'
+ v-has="'calibrationOrder:audit'"
+ >缁撴灉瀹℃牳</a>
+
+ <a-divider
+ v-show="record.status === '2' && record.equipmentImportance != 'D'"
+ type='vertical'
+ />
+ <a
+ v-show="record.status === '2' && record.equipmentImportance == 'D'"
+ @click='handleTechnologyStatusAuthenticate(record)'
+ v-has="'calibrationOrder:authenticate'"
+ >D绫绘妧鏈姸鎬侀壌瀹�</a>
+
+ <a-divider
+ v-show="record.status === '2' && record.equipmentImportance == 'D'"
+ type='vertical'
+ />
+ <a @click='handleDetail(record)'>璇︽儏</a>
<!-- <a-popconfirm-->
<!-- title='纭畾涓嬪彂宸ュ崟鍚�?'-->
<!-- @confirm='() => handleOrderIssue(record)'-->
@@ -194,7 +216,7 @@
<!-- </a-dropdown>-->
</span>
- <span
+ <!-- <span
slot='num'
slot-scope='text, record'
>
@@ -205,11 +227,9 @@
>{{ record.num }}</a>
<span v-else>{{ record.num }}</span>
- </span>
+ </span> -->
</a-table>
- <a-tabs
- defaultActiveKey='2'
- >
+ <a-tabs defaultActiveKey='2'>
<!-- <a-tab-pane -->
<!-- key="1"-->
<!-- tab="妫�楠岄」"-->
@@ -221,8 +241,10 @@
key='2'
tab='妫�瀹氭姤鍛�'
>
- <equipment-calibration-order-report-list ref='EquipmentCalibrationOrderReportList'
- :calibrationOrderId='mainId'></equipment-calibration-order-report-list>
+ <equipment-calibration-order-report-list
+ ref='EquipmentCalibrationOrderReportList'
+ :calibrationOrderId='mainId'
+ ></equipment-calibration-order-report-list>
</a-tab-pane>
</a-tabs>
@@ -237,12 +259,25 @@
ref='EquipmentCalibrationOrderExeDrawer'
@ok='modalFormOk'
></equipment-calibration-order-exe-drawer>
- <final-modal ref='finalModal' @ok='modalFormOk'></final-modal>
+ <final-modal
+ ref='finalModal'
+ @ok='modalFormOk'
+ ></final-modal>
<equipment-calibration-order-report-modal
ref='equipmentCalibrationOrderReportModal'
@ok='modalFormOk'
></equipment-calibration-order-report-modal>
+
+ <equipment-technology-status-modal
+ ref="EquipmentTechnologyStatusModal"
+ @ok="modalFormOk"
+ ></equipment-technology-status-modal>
+
+ <technology-status-authenticate-modal
+ ref="TechnologyStatusAuthenticateModal"
+ @ok="modalFormOk"
+ ></technology-status-authenticate-modal>
</a-card>
</template>
@@ -259,6 +294,9 @@
import FinalModal from './modules/equipmentCalibrationOrder/FinalModal.vue'
import EquipmentCalibrationOrderReportModal
from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal'
+import EquipmentTechnologyStatusModal from './modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal'
+import TechnologyStatusAuthenticateModal from './modules/equipmentCalibrationOrder/TechnologyStatusAuthenticateModal'
+import { interceptorFunc } from 'vxe-table'
export default {
name: 'EquipmentCalibrationOrder',
@@ -269,15 +307,18 @@
EquipmentPrecisionParametersList,
EquipmentCalibrationOrderReportList,
EquipmentCalibrationOrderReportModal,
- FinalModal
+ FinalModal,
+ EquipmentTechnologyStatusModal,
+ TechnologyStatusAuthenticateModal
},
data() {
return {
description: '鎶�鏈姸鎬侀壌瀹氱鐞�',
+ disableMixinCreated: true,
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 + '鏉�'
},
@@ -295,7 +336,7 @@
key: 'rowIndex',
width: 60,
align: 'center',
- customRender: function(t, r, index) {
+ customRender: function (t, r, index) {
return parseInt(index) + 1
}
},
@@ -307,12 +348,22 @@
// scopedSlots: { customRender: 'num' }
},
{
- title: '妫�瀹氭柟寮�',
+ title: '鐘舵��',
align: 'center',
- dataIndex: 'calibrationType_dictText'
+ dataIndex: 'status_dictText'
},
{
- title: '璁惧缂栫爜',
+ title: '鍒ゅ畾缁撴灉',
+ align: 'center',
+ dataIndex: 'calibrationResult_dictText'
+ },
+ // {
+ // title: '妫�瀹氭柟寮�',
+ // align: 'center',
+ // dataIndex: 'calibrationType_dictText'
+ // },
+ {
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'equipmentNum'
},
@@ -331,31 +382,22 @@
align: 'center',
dataIndex: 'equipmentSpecification'
},
- {
- title: '鍒ゅ畾渚濇嵁',
- align: 'center',
- dataIndex: 'managementMode_dictText'
- },
- {
- title: '鐘舵��',
- align: 'center',
- dataIndex: 'status_dictText'
- },
- {
- title: '鍒ゅ畾缁撴灉',
- align: 'center',
- dataIndex: 'calibrationResult_dictText'
- },
+ // {
+ // title: '鍒ゅ畾渚濇嵁',
+ // align: 'center',
+ // dataIndex: 'managementMode_dictText'
+ // },
+
// {
// title: '鍒涘缓浜�',
// align: 'center',
// dataIndex: 'createBy'
// },
- // {
- // title: '鍒涘缓鏃ユ湡',
- // align: 'center',
- // dataIndex: 'createTime'
- // },
+ {
+ title: '鍒涘缓鏃ユ湡',
+ align: 'center',
+ dataIndex: 'createTime'
+ },
// {
// title: '妫�瀹氫汉',
// align: 'center',
@@ -366,6 +408,11 @@
align: 'center',
dataIndex: 'calibrationTime'
},
+ {
+ title: '瀹℃牳鎰忚',
+ align: 'center',
+ dataIndex: 'remark'
+ },
// {
// title: '涓嬪彂鏃堕棿',
// align: 'center',
@@ -375,8 +422,8 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
+ width: 200,
fixed: 'right',
- width: 120,
scopedSlots: { customRender: 'action' }
}
],
@@ -390,9 +437,20 @@
},
computed: {
- importExcelUrl: function() {
+ importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
}
+ },
+ created() {
+ //浠庤矾鐢变腑鑾峰彇鏌ヨ鏉′欢
+ if (this.$route.query) {
+ this.queryParam.equipmentId = this.$route.query.equipmentId;
+ //鏌ヨ鏉′欢鎸夋椂闂村�掑簭
+ this.queryParam.sort = 'createTime';
+ this.queryParam.order = 'desc';
+ }
+ this.loadData()
+ this.initDictConfig();
},
methods: {
@@ -405,6 +463,19 @@
}
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
+ },
+
+ handleTechnologyStatus(record) {
+ this.$refs.EquipmentTechnologyStatusModal.edit(record);
+ this.$refs.EquipmentTechnologyStatusModal.title = "瀹℃牳";
+ this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
+ },
+
+ handleTechnologyStatusAuthenticate: function (record) {
+ this.$refs.TechnologyStatusAuthenticateModal.edit(record);
+ this.$refs.TechnologyStatusAuthenticateModal.title = "鎶�鏈姸鎬佺紪杈�";
+ this.$refs.TechnologyStatusAuthenticateModal.disableSubmit = false;
+
},
handleOrderExe(record) {
@@ -461,14 +532,15 @@
}
},
// 鐩存帴涓婁紶閴村畾鎶ュ憡
- handleAddOrderReport: function(record) {
+ handleAddOrderReport: function (record) {
this.$refs.equipmentCalibrationOrderReportModal.add(record.id)
this.$refs.equipmentCalibrationOrderReportModal.title = '涓婁紶妫�瀹氭姤鍛�'
this.$refs.equipmentCalibrationOrderReportModal.disableSubmit = false
},
handleFinal(record) {
this.$refs.finalModal.edit(record)
- }
+ },
+
}
}
</script>
--
Gitblit v1.9.3