From e9ad171baa8ae05e47fb3698d2f2bc6fd9fc3124 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 21 十一月 2023 10:03:58 +0800
Subject: [PATCH] 签审
---
src/views/eam/EquipmentCalibrationOrder.vue | 118 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 42 deletions(-)
diff --git a/src/views/eam/EquipmentCalibrationOrder.vue b/src/views/eam/EquipmentCalibrationOrder.vue
index aa1ded2..bdec41f 100644
--- a/src/views/eam/EquipmentCalibrationOrder.vue
+++ b/src/views/eam/EquipmentCalibrationOrder.vue
@@ -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,27 @@
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'"
+ @click='handleTechnologyStatus(record)'
+ v-has="'calibrationOrder:audit'"
+ >缁撴灉瀹℃牳</a>
+
+ <a-divider
+ v-show="record.status === '2'"
+ type='vertical'
+ />
+ <a @click='handleDetail(record)'>璇︽儏</a>
<!-- <a-popconfirm-->
<!-- title='纭畾涓嬪彂宸ュ崟鍚�?'-->
<!-- @confirm='() => handleOrderIssue(record)'-->
@@ -194,7 +206,7 @@
<!-- </a-dropdown>-->
</span>
- <span
+ <!-- <span
slot='num'
slot-scope='text, record'
>
@@ -205,11 +217,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 +231,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 +249,20 @@
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>
</a-card>
</template>
@@ -259,6 +279,7 @@
import FinalModal from './modules/equipmentCalibrationOrder/FinalModal.vue'
import EquipmentCalibrationOrderReportModal
from './modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal'
+import EquipmentTechnologyStatusModal from './modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal'
export default {
name: 'EquipmentCalibrationOrder',
@@ -269,7 +290,8 @@
EquipmentPrecisionParametersList,
EquipmentCalibrationOrderReportList,
EquipmentCalibrationOrderReportModal,
- FinalModal
+ FinalModal,
+ EquipmentTechnologyStatusModal
},
data() {
return {
@@ -295,7 +317,7 @@
key: 'rowIndex',
width: 60,
align: 'center',
- customRender: function(t, r, index) {
+ customRender: function (t, r, index) {
return parseInt(index) + 1
}
},
@@ -307,10 +329,20 @@
// scopedSlots: { customRender: 'num' }
},
{
- title: '妫�瀹氭柟寮�',
+ title: '鐘舵��',
align: 'center',
- dataIndex: 'calibrationType_dictText'
+ dataIndex: 'status_dictText'
},
+ {
+ title: '鍒ゅ畾缁撴灉',
+ align: 'center',
+ dataIndex: 'calibrationResult_dictText'
+ },
+ // {
+ // title: '妫�瀹氭柟寮�',
+ // align: 'center',
+ // dataIndex: 'calibrationType_dictText'
+ // },
{
title: '缁熶竴缂栫爜',
align: 'center',
@@ -331,21 +363,12 @@
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',
@@ -366,6 +389,11 @@
align: 'center',
dataIndex: 'calibrationTime'
},
+ {
+ title: '瀹℃牳鎰忚',
+ align: 'center',
+ dataIndex: 'remark'
+ },
// {
// title: '涓嬪彂鏃堕棿',
// align: 'center',
@@ -375,8 +403,8 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
+ width: 200,
fixed: 'right',
- width: 120,
scopedSlots: { customRender: 'action' }
}
],
@@ -390,7 +418,7 @@
},
computed: {
- importExcelUrl: function() {
+ importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
}
},
@@ -405,6 +433,12 @@
}
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
+ },
+
+ handleTechnologyStatus(record) {
+ this.$refs.EquipmentTechnologyStatusModal.edit(record);
+ this.$refs.EquipmentTechnologyStatusModal.title = "瀹℃牳";
+ this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
},
handleOrderExe(record) {
@@ -461,7 +495,7 @@
}
},
// 鐩存帴涓婁紶閴村畾鎶ュ憡
- handleAddOrderReport: function(record) {
+ handleAddOrderReport: function (record) {
this.$refs.equipmentCalibrationOrderReportModal.add(record.id)
this.$refs.equipmentCalibrationOrderReportModal.title = '涓婁紶妫�瀹氭姤鍛�'
this.$refs.equipmentCalibrationOrderReportModal.disableSubmit = false
--
Gitblit v1.9.3