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 +++++---
src/views/eam/DailyInspectionOrderList.vue | 13
src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue | 76 ++--
src/views/eam/modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal.vue | 285 +++++++++++++++++++++
src/views/eam/Daily3MaintenanceOrderList.vue | 14
src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue | 104 +++++++
src/views/eam/DailyMaintenanceOrderList.vue | 103 +++----
src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue | 4
src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue | 46 +-
src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue | 6
src/views/system/RoleUserList.vue | 4
11 files changed, 596 insertions(+), 177 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index cb174e0..8e2d5d9 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -432,12 +432,12 @@
dataIndex: 'maintenanceCycleName',
width: 100,
},
- {
- title: '娲惧伐鏂瑰紡',
- align: "center",
- dataIndex: 'assignModeName',
- width: 100,
- },
+ // {
+ // title: '娲惧伐鏂瑰紡',
+ // align: "center",
+ // dataIndex: 'assignModeName',
+ // width: 100,
+ // },
{
title: '缁熶竴缂栫爜',
align: "center",
@@ -459,7 +459,7 @@
dataIndex: 'checkStatusName',
},
{
- title: '鏈�氳繃鍘熷洜',
+ title: '楠屾敹鏈�氳繃鍘熷洜',
align: "center",
dataIndex: 'notPassReason',
scopedSlots: { customRender: 'notPassReason' }
diff --git a/src/views/eam/DailyInspectionOrderList.vue b/src/views/eam/DailyInspectionOrderList.vue
index 7ba2ee7..a5a1cf9 100644
--- a/src/views/eam/DailyInspectionOrderList.vue
+++ b/src/views/eam/DailyInspectionOrderList.vue
@@ -332,7 +332,14 @@
{
title: '鐘舵��',
align: "center",
+ width: 100,
dataIndex: 'statusName'
+ },
+ {
+ title: '鐐规鍛ㄦ湡',
+ align: "center",
+ width: 100,
+ dataIndex: 'inspectionCycleName'
},
// {
// title: '鐐规鏃ユ湡',
@@ -397,11 +404,7 @@
// align: "center",
// dataIndex: 'inspectionStandardNum'
// },
- {
- title: '鐐规鍛ㄦ湡',
- align: "center",
- dataIndex: 'inspectionCycleName'
- },
+
// {
// title: '娲惧伐鏂瑰紡',
// align: "center",
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index 014bc4c..bf01a53 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -67,14 +67,14 @@
v-has="'dailyMaintenanceOrder:add'"
>鏂板</a-button>
<a-button
- v-if="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
+ v-show="selectedRowKeys.length == 1 && selectionRows[0].status == '8'"
@click="handlePrintInfo(selectionRows[0])"
type="primary"
style="margin-left: 8px"
>绉讳氦鍗曟墦鍗�
</a-button>
<!-- <a-button
- v-if="selectedRowKeys.length > 0"
+ v-show="selectedRowKeys.length > 0"
type="primary"
@click="batchAssign"
style="margin-left: 8px"
@@ -97,7 +97,7 @@
icon="import"
>瀵煎叆</a-button>
</a-upload> -->
- <!-- <a-dropdown v-if="selectedRowKeys.length > 0">
+ <!-- <a-dropdown v-show="selectedRowKeys.length > 0">
<a-menu slot="overlay">
<a-menu-item
key="1"
@@ -146,10 +146,10 @@
@confirm="() => handleOrderIssue(record)"
v-has="'dailyMaintenanceOrder:issue'"
>
- <a v-if="record.status == '1'">鎺ユ敹</a>
+ <a v-show="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '1'"
+ v-show="record.status == '1'"
type="vertical"
/>
<a-popconfirm
@@ -157,32 +157,14 @@
@confirm="() => handleOrderReset(record)"
v-has="'dailyMaintenanceOrder:issue'"
>
- <a v-if="record.status == '2'">鎾ゅ洖</a>
+ <a v-show="record.status == '2'">鎾ゅ洖</a>
</a-popconfirm>
<a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
/>
- <!-- <a-popconfirm
- title="纭畾鎭㈠宸ュ崟鍚�?"
- @confirm="() => handleOrderRecover(record)"
- v-has="'dailyMaintenanceOrder:recover'"
- >
- <a v-if="record.status == '7'">鎭㈠</a>
- </a-popconfirm>
<a-divider
- v-if="record.status == '7'"
- type="vertical"
- /> -->
- <!-- <a-popconfirm
- title="纭畾浣滃簾宸ュ崟鍚�?"
- @confirm="() => handleOrderCancel(record)"
- v-has="'dailyMaintenanceOrder:recover'"
- >
- <a v-if="record.status == '2'">浣滃簾</a>
- </a-popconfirm> -->
- <a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
/>
<a-popconfirm
@@ -190,54 +172,66 @@
@confirm="() => handleOrderGet(record)"
v-has="'dailyMaintenanceOrder:get'"
>
- <a v-if="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
+ <a v-show="record.status == '2' && record.assignMode == '1'">棰嗗彇</a>
</a-popconfirm>
- <a
- v-if="record.status == '2' && record.assignMode == '2' "
+ <!-- <a
+ v-show="record.status == '2' && record.assignMode == '2' "
@click="handleAssignOrder(record)"
v-has="'dailyMaintenanceOrder:assign'"
>娲惧伐</a>
- <!-- <a
- v-if="record.status == '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
- @click="handleAssignOrder(record)"
- v-has="'dailyMaintenanceOrder:assign'"
- >鏀规淳</a> -->
- <!-- <a
- v-if="record.status == '3'"
- @click="handleAssignOrder(record)"
- >鏀规淳</a> -->
+
<a-divider
- v-if="record.status == '2'"
+ v-show="record.status == '2'"
type="vertical"
- />
+ /> -->
<a-divider
- v-if="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
+ v-show="record.status === '3'&& record.assignMode == '2' && record.maintenanceUserName != null "
type="vertical"
/>
<a
- v-if="record.status === '3' || record.status === '4' "
+ v-show="record.status === '3' || record.status === '4' "
@click="handleOrderExe(record)"
v-has="'dailyMaintenanceOrder:exe'"
>鎵ц</a>
<a-divider
- v-if="record.status === '3' || record.status === '4' "
+ v-show="record.status === '3' || record.status === '4' "
type="vertical"
/>
<a
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
@click="handleEdit(record)"
v-has="'dailyMaintenanceOrder:edit'"
>缂栬緫</a>
<a-divider
- v-if="record.status === '1'"
+ v-show="record.status === '1'"
type="vertical"
/>
<a
- v-if="record.status === '5' || record.status === '8'"
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '0' || record.confirmStatus === '2')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:operateUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '1' || record.confirmStatus === '4')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:repairUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '3' || record.confirmStatus === '6')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:repairDirectorUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '5')"
+ @click="handleFinish(record)"
+ v-has="'dailyMaintenanceOrder:equipmentInspectorUser'"
+ >瀹屽伐绉讳氦鍗�</a>
+ <a
+ v-show="(record.status === '5' || record.status === '8') && (record.confirmStatus === '7')"
@click="handleFinish(record)"
>瀹屽伐绉讳氦鍗�</a>
<a-divider
- v-if="record.status === '5' || record.status === '8'"
+ v-show="record.status === '5' || record.status === '8'"
type="vertical"
/>
<a-dropdown>
@@ -252,7 +246,7 @@
@confirm="() => handleDelete(record.id)"
v-has="'dailyMaintenanceOrder:delete'"
>
- <a v-if="record.status === '1'">鍒犻櫎</a>
+ <a v-show="record.status === '1'">鍒犻櫎</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
@@ -264,7 +258,7 @@
slot-scope="text, record"
>
<a
- v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '7' "
+ v-if="record.status === '3' || record.status === '4' ||record.status === '5' ||record.status === '7' ||record.status === '8'"
class="lot"
@click="handleOrderExe(record)"
>{{record.num}}</a>
@@ -351,11 +345,16 @@
// align: "center",
// dataIndex: 'maintenanceCycleName',
// },
+ // {
+ // title: '娲惧伐鏂瑰紡',
+ // align: "center",
+ // dataIndex: 'assignModeName',
+ // width: 100,
+ // },
{
- title: '娲惧伐鏂瑰紡',
+ title: '绉讳氦鍗曠‘璁ょ姸鎬�',
align: "center",
- dataIndex: 'assignModeName',
- width: 100,
+ dataIndex: 'confirmStatusName'
},
{
title: '缁熶竴缂栫爜',
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
diff --git a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
index 51a61f3..19dafbd 100644
--- a/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
+++ b/src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue
@@ -390,8 +390,8 @@
align: 'center',
dataIndex: 'inspectionProjectResult',
scopedSlots: { customRender: 'inspectionProjectResult' },
- className: 'red',
},
+ // className: 'red',
// {
// title: '鍒ゅ畾',
// align: 'center',
@@ -409,8 +409,8 @@
align: 'center',
dataIndex: 'abnormalDesc',
scopedSlots: { customRender: 'abnormalDesc' },
- className: 'red',
},
+ // className: 'red',
// {
// title: '寮傚父鎷嶇収',
// align: 'center',
@@ -422,8 +422,8 @@
align: 'center',
dataIndex: 'treatmentMeasure',
scopedSlots: { customRender: 'treatmentMeasure' },
- className: 'red',
},
+ // className: 'red',
],
url: {
list: "/eam/inspectionOrderDetail/list",
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
index fb46035..ecea2ac 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
@@ -152,12 +152,39 @@
鍏抽棴
</a-button>
- <a-button
+ <!-- <a-button
@click="handleOk()"
type="primary"
:loading="confirmLoading"
:disabled="disableSubmit || confirmLoading"
- >纭畾</a-button>
+ >纭畾</a-button> -->
+ <a-popconfirm
+ @confirm="() => handleReject()"
+ title="纭灏嗗綋鍓嶄簩淇濆畬宸ョЩ浜ゅ崟椹冲洖锛�"
+ :disabled="this.model.confirmStatus == '0' || this.model.confirmStatus == '2'|| this.model.confirmStatus == '7'"
+ >
+ <a-button
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ :disabled="this.model.confirmStatus == '0' || this.model.confirmStatus == '2'|| this.model.confirmStatus == '7'"
+ >
+ 椹冲洖
+ </a-button>
+ </a-popconfirm>
+ <a-popconfirm
+ @confirm="() => handleOk()"
+ title="纭灏嗗綋鍓嶄簩淇濆畬宸ョЩ浜ゅ崟瀹℃牳閫氳繃锛�"
+ :disabled="this.model.confirmStatus == '7'"
+ >
+ <a-button
+ type='primary'
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ :disabled="this.model.confirmStatus == '7'"
+ >
+ 閫氳繃
+ </a-button>
+ </a-popconfirm>
</template>
</a-modal>
@@ -294,12 +321,24 @@
this.close();
},
- handleOk() {
+
+ handleReject() {
const that = this;
this.form.validateFields((err, values) => {
if (!err) {
that.confirmLoading = true;
let formData = Object.assign(this.model, values);
+ if (this.model.confirmStatus == '1') {
+ formData.confirmStatus = '2'
+ } else if (this.model.confirmStatus == '3') {
+ formData.confirmStatus = '4'
+ } else if (this.model.confirmStatus == '5') {
+ formData.confirmStatus = '6'
+ } else if (this.model.confirmStatus == '6') {
+ formData.confirmStatus = '4'
+ } else if (this.model.confirmStatus == '4') {
+ formData.confirmStatus = '2'
+ }
requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
if (res.success) {
that.$message.success(res.message);
@@ -315,6 +354,65 @@
})
},
+
+ handleOk() {
+ const that = this;
+ that.form.validateFields((err, values) => {
+ if (!err) {
+ this.confirmLoading = true;
+ let formData = Object.assign(this.model, values);
+ if (this.model.confirmStatus == '0') {
+ formData.confirmStatus = '1'
+ } else if (this.model.confirmStatus == '2') {
+ formData.confirmStatus = '1'
+ } else if (this.model.confirmStatus == '1') {
+ formData.confirmStatus = '3'
+ } else if (this.model.confirmStatus == '4') {
+ formData.confirmStatus = '3'
+ } else if (this.model.confirmStatus == '3') {
+ formData.confirmStatus = '5'
+ } else if (this.model.confirmStatus == '6') {
+ formData.confirmStatus = '5'
+ } else if (this.model.confirmStatus == '5') {
+ formData.confirmStatus = '7'
+ }
+ requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+
+
+ // handleOk() {
+ // const that = this;
+ // this.form.validateFields((err, values) => {
+ // if (!err) {
+ // that.confirmLoading = true;
+ // let formData = Object.assign(this.model, values);
+ // requestPut(this.url.edit, formData, { id: this.model.id }).then((res) => {
+ // if (res.success) {
+ // that.$message.success(res.message);
+ // that.$emit('ok');
+ // } else {
+ // that.$message.warning(res.message);
+ // }
+ // }).finally(() => {
+ // that.confirmLoading = false;
+ // that.close();
+ // })
+ // }
+ // })
+ // },
+
handleDelete(text, record, index) {
this.dataSource.splice(index, 1);
},
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
index 3e3ad33..8036c29 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
@@ -1,7 +1,7 @@
<template>
<a-modal
:title='title'
- :width='1250'
+ :width='650'
:visible='visible'
:maskClosable='false'
@ok='handleOk'
@@ -12,7 +12,7 @@
<a-spin :spinning='confirmLoading'>
<a-form :form='form'>
<a-row :gutter='24'>
- <a-col :span='12'>
+ <a-col :span='24'>
<a-form-item
label='宸ュ崟鍙�'
:labelCol='labelCol'
@@ -26,25 +26,7 @@
/>
</a-form-item>
</a-col>
- <a-col :span='12'>
- <a-form-item
- label='妫�瀹氭柟寮�'
- :labelCol='labelCol'
- :wrapperCol='wrapperCol'
- >
- <j-dict-select-tag
- allow-clear
- :disabled='disableSubmit'
- :placeholder="disableSubmit?'':'璇烽�夋嫨妫�瀹氭柟寮�'"
- :triggerChange='true'
- dictCode='calibration_type'
- v-decorator="['calibrationType', validatorRules.calibrationType]"
- />
- </a-form-item>
- </a-col>
- </a-row>
- <a-row :gutter='24'>
- <a-col :span='12'>
+ <a-col :span='24'>
<a-form-item
label='璁惧'
:labelCol='labelCol'
@@ -60,8 +42,24 @@
/>
</a-form-item>
</a-col>
+ <a-col :span='24'>
+ <a-form-item
+ label='妫�瀹氭柟寮�'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ >
+ <j-dict-select-tag
+ allow-clear
+ :disabled='disableSubmit'
+ :placeholder="disableSubmit?'':'璇烽�夋嫨妫�瀹氭柟寮�'"
+ :triggerChange='true'
+ dictCode='calibration_type'
+ v-decorator="['calibrationType', validatorRules.calibrationType]"
+ />
+ </a-form-item>
+ </a-col>
- <a-col :span='12'>
+ <a-col :span='24'>
<a-form-item
label='鍒ゆ柇渚濇嵁'
:labelCol='labelCol'
@@ -83,7 +81,7 @@
hidden
:gutter='24'
>
- <a-col :span='12'>
+ <a-col :span='24'>
<a-form-item
label='璁惧Id'
:labelCol='labelCol'
@@ -99,7 +97,7 @@
</a-col>
</a-row>
<a-row :gutter='24'>
- <a-col :span='24'>
+ <!-- <a-col :span='24'>
<a-form-item
:labelCol='{span:3}'
:wrapperCol='{span:21}'
@@ -112,7 +110,7 @@
v-decorator="['remark', validatorRules.remark]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span='24'>
<a-form-item
:labelCol='{span:3}'
@@ -131,16 +129,17 @@
</a-row>
</a-form>
</a-spin>
- <a-table v-show='false'
- ref='table'
- bordered
- size='middle'
- rowKey='id'
- :columns='columns'
- :pagination='ipagination'
- :loading='loading'
- :dataSource='dataSource'
- @change='handleTableChange'
+ <a-table
+ v-show='false'
+ ref='table'
+ bordered
+ size='middle'
+ rowKey='id'
+ :columns='columns'
+ :pagination='ipagination'
+ :loading='loading'
+ :dataSource='dataSource'
+ @change='handleTableChange'
>
</a-table>
@@ -221,7 +220,7 @@
disableSubmit: false,
codeDisable: true,
dataSource: [],
- num:"",
+ num: "",
model: { 'management_mode': 'report', 'calibration_type': 'self' },
labelCol: {
xs: { span: 24 },
@@ -281,11 +280,12 @@
this.precisionParametersTemplateId = '-1'
getAction(this.url.getNum, { type: 'CalibrationOrder', length: '4' }).then((res) => {
if (res.success) {
- this.num = res.message
+ // this.num = res.message
+ this.form.setFieldsValue({ "num": res.message })
}
})
// 鏂板鏃跺�欒缃壌瀹氱被鍨嬩负鑷銆� 鍒ゅ畾渚濇嵁涓烘姤鍛�
- this.edit({ "num":this.num,'calibrationType': 'self', 'managementMode': 'report' })
+ this.edit({ "num": this.num, 'calibrationType': 'self', 'managementMode': 'report' })
},
edit(record) {
let that = this
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
index 35295a1..6b9272a 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
@@ -101,7 +101,7 @@
data() {
return {
description: '妫�瀹氭姤鍛�',
- disableMixinCreated:true,
+ disableMixinCreated: true,
columns: [
{
title: '#',
@@ -135,11 +135,11 @@
dataIndex: 'size',
scopedSlots: { customRender: 'size' },
},
- {
- title: '鍒ゅ畾缁撴灉',
- align: 'center',
- dataIndex: 'judgmentResultName'
- },
+ // {
+ // title: '鍒ゅ畾缁撴灉',
+ // align: 'center',
+ // dataIndex: 'judgmentResultName'
+ // },
{
title: '鎿嶄綔',
align: 'center',
@@ -156,27 +156,27 @@
},
}
},
- props:{
- calibrationOrderId:{
- type:String,
- default:'',
- required:false
+ props: {
+ calibrationOrderId: {
+ type: String,
+ default: '',
+ required: false
}
},
- watch:{
- calibrationOrderId:{
- immediate: true,
- handler(val) {
- if(!this.calibrationOrderId){
- this.clearList()
- }else{
- this.queryParam['calibrationOrderId'] = val;
- this.queryParam['delFlag'] = 0;
- this.loadData(1);
- }
+ watch: {
+ calibrationOrderId: {
+ immediate: true,
+ handler(val) {
+ if (!this.calibrationOrderId) {
+ // this.clearList()
+ } else {
+ this.queryParam['calibrationOrderId'] = val;
+ this.queryParam['delFlag'] = 0;
+ this.loadData(1);
}
}
- },
+ }
+ },
// mounted() {
// this.$bus.$on('equipmentSelectionRows', (data) => {
// this.equipmentSelectionRows = data
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
index dc6f818..f50b36f 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
@@ -102,7 +102,7 @@
</a-form-item>
</a-col>
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="24">
<a-form-item
:labelCol="{span:4}"
@@ -120,7 +120,7 @@
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row :gutter="24">
<a-col :span="24">
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal.vue
new file mode 100644
index 0000000..98c2fdb
--- /dev/null
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal.vue
@@ -0,0 +1,285 @@
+<template>
+ <a-modal
+ :title='title'
+ :width="650"
+ :visible='visible'
+ :maskClosable='false'
+ cancelText='鍏抽棴'
+ @cancel='handleCancel'
+ :confirmLoading='confirmLoading'
+ >
+ <!-- @ok='handleOk' -->
+ <a-spin :spinning='confirmLoading'>
+ <a-form :form="form">
+ <a-row :gutter="24">
+ <a-col :span="24">
+ <a-form-item
+ label="缁熶竴缂栧彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ョ粺涓�缂栧彿'"
+ v-decorator="['equipmentNum', validatorRules.equipmentNum ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item
+ label="璁惧鍚嶇О"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囧悕绉�'"
+ v-decorator="['equipmentName', validatorRules.equipmentName ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item
+ label="鍨嬪彿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�'"
+ v-decorator="['equipmentModel', validatorRules.equipmentModel ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-item
+ label="瑙勬牸"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヨ鏍�'"
+ v-decorator="['equipmentSpecification', validatorRules.equipmentSpecification ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item
+ label="鎶�鏈姸鎬�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <!-- prop="technologyStatus" -->
+ <j-dict-select-tag
+ allow-clear
+ placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
+ :triggerChange="true"
+ dictCode="technology_status"
+ v-decorator="['judgmentResult', validatorRules.judgmentResult ]"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span='24'>
+ <a-form-item
+ label="瀹℃牳鎰忚"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-textarea
+ rows='3'
+ placeholder='璇疯緭鍏ュ鏍告剰瑙�'
+ v-decorator="['remark', validatorRules.remark ]"
+ ></a-textarea>
+ </a-form-item>
+ </a-col>
+ </a-row>
+ </a-form>
+ </a-spin>
+ <template slot='footer'>
+ <a-popconfirm
+ @confirm="() => handleReject()"
+ title="纭灏嗗綋鍓嶇粨鏋滈┏鍥烇紵"
+ >
+ <a-button
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ >
+ 椹冲洖
+ </a-button>
+ </a-popconfirm>
+ <a-popconfirm
+ @confirm="() => handleOk()"
+ title="纭灏嗗綋鍓嶇粨鏋滃鏍搁�氳繃锛�"
+ >
+ <a-button
+ type='primary'
+ :loading='confirmLoading'
+ :style="{marginRight: '8px'}"
+ >
+ 閫氳繃
+ </a-button>
+ </a-popconfirm>
+ </template>
+ </a-modal>
+
+</template>
+
+<script>
+import { httpAction, requestPut, postAction } from '@/api/manage'
+import Tooltip from 'ant-design-vue/es/tooltip'
+import pick from 'lodash.pick'
+
+
+export default {
+ name: 'EquipmentTechnologyStatusModal',
+ components: {
+ Tooltip
+ },
+ data() {
+ return {
+ title: '鎿嶄綔',
+ visible: false,
+ disableSubmit: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 }
+ },
+ confirmLoading: false,
+ form: this.$form.createForm(this),
+ validatorRules: {
+ remark: {
+ rules: [
+ { required: true, message: '璇疯緭鍏ュ鏍告剰瑙�!' },
+ ]
+ },
+ judgmentResult: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鎶�鏈姸鎬�!' },
+ ]
+ },
+ },
+ url: {
+ auditApproval: "/eam/calibrationOrderReport/editEquipmentTechnologyStatus",
+ },
+ }
+ },
+
+
+ methods: {
+ close() {
+ this.$emit('close')
+ this.visible = false
+ },
+
+ handleCancel() {
+ this.close()
+ },
+
+ edit(record) {
+ this.form.resetFields();
+ this.model = Object.assign({}, record);
+ this.visible = true;
+ this.disableSubmit = false;
+ this.$nextTick(() => {
+ this.form.setFieldsValue(pick(this.model, 'equipmentNum', 'equipmentName', 'equipmentModel', 'equipmentSpecification', 'judgmentResult', 'remark'))
+ });
+ if (record.id) {
+ this.codeDisable = true;
+ } else {
+ this.codeDisable = false;
+ }
+ },
+
+
+
+ handleReject() {
+ const that = this;
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let formData = Object.assign(this.model, values);
+ formData.status = '3'
+ requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+
+
+ handleOk() {
+ const that = this;
+ that.form.validateFields((err, values) => {
+ if (!err) {
+ this.confirmLoading = true;
+ let formData = Object.assign(this.model, values);
+ formData.status = '4'
+ requestPut(this.url.auditApproval, formData, { id: this.model.id }).then((res) => {
+ if (res.success) {
+ that.$message.success(res.message);
+ that.$emit('ok');
+ } else {
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ that.close();
+ })
+ }
+ })
+ },
+ }
+
+}
+</script>
+
+<style lang='less' scoped>
+/deep/ .frozenRowClass {
+ color: #c9c9c9;
+}
+
+.fontweight {
+ font-weight: bold;
+}
+
+.ant-btn {
+ padding: 0 10px;
+ margin-left: 3px;
+}
+
+.ant-form-item-control {
+ line-height: 0px;
+}
+
+/** 涓昏〃鍗曡闂磋窛 */
+.ant-form .ant-form-item {
+ margin-bottom: 10px;
+}
+
+/** Tab椤甸潰琛岄棿璺� */
+.ant-tabs-content .ant-form-item {
+ margin-bottom: 0px;
+}
+
+/deep/ .ant-modal-title {
+ text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index d6c78cb..1cdf9ee 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -152,8 +152,8 @@
</a-table>
</div>
<!-- 鍙充晶鐨勮鑹叉潈闄愰厤缃� -->
- <!-- <user-role-modal ref="modalUserRole"></user-role-modal> -->
- <user-role-modal-new ref="modalUserRole"></user-role-modal-new>
+ <user-role-modal ref="modalUserRole"></user-role-modal>
+ <!-- <user-role-modal-new ref="modalUserRole"></user-role-modal-new> -->
<role-modal
ref="modalForm"
@ok="modalFormOk"
--
Gitblit v1.9.3