From 0af7ddaab76e430d586eed37897df96be09ba220 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 28 七月 2025 15:41:05 +0800
Subject: [PATCH] 设备处置流程方面的问题修改
---
src/views/eam/equipment/modules/EamEquipmentPrecisionList.vue | 83 ++++-
src/views/eam/dispose/EamEquipmentLeanOutList.vue | 120 ++++++-
src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue | 116 ++++++-
src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue | 140 +++++++-
src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue | 157 ++++++++--
src/views/flowable/workflow/FlowCompleted.vue | 208 +++++++++++--
src/views/flowable/workflow/FlowTodo.vue | 22 +
7 files changed, 672 insertions(+), 174 deletions(-)
diff --git a/src/views/eam/dispose/EamEquipmentLeanOutList.vue b/src/views/eam/dispose/EamEquipmentLeanOutList.vue
index ec649a4..c338f64 100644
--- a/src/views/eam/dispose/EamEquipmentLeanOutList.vue
+++ b/src/views/eam/dispose/EamEquipmentLeanOutList.vue
@@ -3,23 +3,58 @@
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
+ >
<a-row :gutter="24">
- <a-col :xl="4" :lg="7" :md="8" :sm="24">
- <a-form-item label="璁惧缂栧彿">
- <lx-search-equipment-select placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储"
- v-model="queryParam.equipmentId"></lx-search-equipment-select>
+ <a-col
+ :xl="4"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <a-form-item label="璁惧缂栧彿1">
+ <lx-search-equipment-select
+ placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储"
+ v-model="queryParam.equipmentId"
+ ></lx-search-equipment-select>
</a-form-item>
</a-col>
- <a-col :xl="4" :lg="7" :md="8" :sm="24">
+ <a-col
+ :xl="4"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
<a-form-item label="鍗曟嵁鍙�">
- <a-input placeholder="璇疯緭鍏ュ崟鎹彿" v-model="queryParam.code"></a-input>
+ <a-input
+ placeholder="璇疯緭鍏ュ崟鎹彿"
+ v-model="queryParam.code"
+ ></a-input>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <span
+ style="float: left;overflow: hidden;"
+ class="table-page-search-submitButtons"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ type="info"
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
</span>
</a-col>
</a-row>
@@ -28,10 +63,17 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<div class="table-operator">
- <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+ <a-button
+ @click="handleAdd"
+ type="primary"
+ icon="plus"
+ >鏂板</a-button>
<a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay">
- <a-menu-item key="1" @click="batchDel">
+ <a-menu-item
+ key="1"
+ @click="batchDel"
+ >
<a-icon type="delete" />
鍒犻櫎
</a-menu-item>
@@ -44,10 +86,15 @@
<!-- table鍖哄煙-begin -->
<div>
- <div 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>椤�
- <a style="margin-left: 24px" @click="onClearSelected">娓呯┖</a>
+ <div
+ 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>椤�
+ <a
+ style="margin-left: 24px"
+ @click="onClearSelected"
+ >娓呯┖</a>
</div>
<a-table
@@ -61,32 +108,48 @@
:loading="loading"
:scroll="{ x: 'max-content' }"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange">
+ @change="handleTableChange"
+ >
- <span slot="action" slot-scope="text, record">
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
<template v-if="record.leanStatus === 'WAIT_SUBMIT'">
<a @click="handleEdit(record)">缂栬緫</a>
<a-divider type="vertical" />
- <a-popconfirm title="纭畾鎻愪氦鍚�?" @confirm="() => handleSubmit(record.id)">
+ <a-popconfirm
+ title="纭畾鎻愪氦鍚�?"
+ @confirm="() => handleSubmit(record.id)"
+ >
<a>鎻愪氦</a>
</a-popconfirm>
<a-divider type="vertical" />
<a-dropdown>
<a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
<a-menu slot="overlay">
- <a-menu-item>
- <a href="javascript:;" @click="handleDetail(record)">璇︽儏</a>
+ <a-menu-item>
+ <a
+ href="javascript:;"
+ @click="handleDetail(record)"
+ >璇︽儏</a>
</a-menu-item>
<a-menu-item>
- <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+ <a-popconfirm
+ title="纭畾鍒犻櫎鍚�?"
+ @confirm="() => handleDelete(record.id)"
+ >
<a>鍒犻櫎</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</template>
- <template v-else>
- <a href="javascript:;" @click="handleDetail(record)">璇︽儏</a>
+ <template v-else>
+ <a
+ href="javascript:;"
+ @click="handleDetail(record)"
+ >璇︽儏</a>
</template>
</span>
@@ -95,7 +158,10 @@
<!-- table鍖哄煙-end -->
<!-- 琛ㄥ崟鍖哄煙 -->
- <eamEquipmentLeanOut-modal ref="modalForm" @ok="modalFormOk"></eamEquipmentLeanOut-modal>
+ <eamEquipmentLeanOut-modal
+ ref="modalForm"
+ @ok="modalFormOk"
+ ></eamEquipmentLeanOut-modal>
</a-card>
</template>
@@ -125,7 +191,7 @@
width: 60,
fixed: 'left',
align: 'center',
- customRender: function(t, r, index) {
+ customRender: function (t, r, index) {
return parseInt(index) + 1
}
},
diff --git a/src/views/eam/equipment/modules/EamEquipmentPrecisionList.vue b/src/views/eam/equipment/modules/EamEquipmentPrecisionList.vue
index 5b8aa0e..3869b1f 100644
--- a/src/views/eam/equipment/modules/EamEquipmentPrecisionList.vue
+++ b/src/views/eam/equipment/modules/EamEquipmentPrecisionList.vue
@@ -2,8 +2,14 @@
<a-spin :spinning="confirmLoading">
<vxe-toolbar>
<template v-slot:buttons>
- <vxe-button status="primary" @click="insertEvent()">鏂板</vxe-button>
- <vxe-button status="danger" @click="handleBatchRemove()">鎵归噺鍒犻櫎</vxe-button>
+ <vxe-button
+ status="primary"
+ @click="insertEvent()"
+ >鏂板</vxe-button>
+ <vxe-button
+ status="danger"
+ @click="handleBatchRemove()"
+ >鎵归噺鍒犻櫎</vxe-button>
</template>
</vxe-toolbar>
<vxe-table
@@ -17,18 +23,52 @@
:data="dataSource"
:edit-rules="validRules"
:edit-config="{trigger: 'manual', mode: 'row', showStatus: true}"
- style="margin-top: 8px;">
- <vxe-table-column type="checkbox" width="60"></vxe-table-column>
- <vxe-table-column type="seq" width="60"></vxe-table-column>
- <vxe-table-column title="ID" field="id" :visible="false"></vxe-table-column>
- <vxe-table-column title="equipmentId" field="equipmentId" :visible="false"></vxe-table-column>
- <vxe-table-column title="妫�娴嬮」鐩�" field="parameterId" align="center"
- :edit-render="{name : '$select', options: precisionParameterList, optionProps: {label:'parameterName', value:'id'}, props: {clearable:true}, events: {change:handleParamSelectChange}}"></vxe-table-column>
- <vxe-table-column title="鍙傛暟缂栫爜" field="parameterCode" align="center"></vxe-table-column>
- <vxe-table-column title="鍏佸樊鍊�(mm)" field="parameterValue" align="center"
- :edit-render="{name : '$input'}"></vxe-table-column>
- <vxe-table-column title="瀹為檯鍊�" field="actualValue" align="center"></vxe-table-column>
- <vxe-table-column title="鎿嶄綔" width="160">
+ style="margin-top: 8px;"
+ >
+ <vxe-table-column
+ type="checkbox"
+ width="60"
+ ></vxe-table-column>
+ <vxe-table-column
+ type="seq"
+ width="60"
+ ></vxe-table-column>
+ <vxe-table-column
+ title="ID"
+ field="id"
+ :visible="false"
+ ></vxe-table-column>
+ <vxe-table-column
+ title="equipmentId"
+ field="equipmentId"
+ :visible="false"
+ ></vxe-table-column>
+ <vxe-table-column
+ title="妫�娴嬮」鐩�"
+ field="parameterId"
+ align="center"
+ :edit-render="{name : '$select', options: precisionParameterList, optionProps: {label:'parameterName', value:'id'}, props: {clearable:true}, events: {change:handleParamSelectChange}}"
+ ></vxe-table-column>
+ <vxe-table-column
+ title="鍙傛暟缂栫爜"
+ field="parameterCode"
+ align="center"
+ ></vxe-table-column>
+ <vxe-table-column
+ title="鍏佸樊鍊�(mm)"
+ field="parameterValue"
+ align="center"
+ :edit-render="{name : '$input'}"
+ ></vxe-table-column>
+ <vxe-table-column
+ title="瀹為檯鍊�"
+ field="actualValue"
+ align="center"
+ ></vxe-table-column>
+ <vxe-table-column
+ title="鎿嶄綔"
+ width="160"
+ >
<template v-slot="{row}">
<template v-if="hasEditStatus(row)">
<vxe-button @click="saveRowEvent(row)">淇濆瓨</vxe-button>
@@ -212,18 +252,18 @@
}
})
},
- handleBatchRemove(){
+ handleBatchRemove() {
let xTable = this.$refs.editableDetailTable
let that = this
let checkboxRecords = xTable.getCheckboxRecords();
- if(checkboxRecords && checkboxRecords.length > 0) {
+ if (checkboxRecords && checkboxRecords.length > 0) {
let ids = checkboxRecords.map(record => record.id);
this.$confirm({
title: "纭鍒犻櫎",
content: "鏄惁鍒犻櫎閫変腑鏁版嵁?",
onOk: function () {
that.confirmLoading = true;
- deleteAction(that.url.deleteBatch, {ids: ids.join(',')}).then((res) => {
+ deleteAction(that.url.deleteBatch, { ids: ids.join(',') }).then((res) => {
if (res.success) {
//閲嶆柊璁＄畻鍒嗛〉闂
that.reCalculatePage(checkboxRecords.length)
@@ -273,18 +313,17 @@
this.ipagination.current = currentIndex
}
},
- handlePageChange(current, pageSize){
+ handlePageChange(current, pageSize) {
this.$set(this.ipagination, 'current', current)
- this.$emit('change', {current, pageSize})
+ this.$emit('change', { current, pageSize })
},
- handleShowSizeChange(current, pageSize){
+ handleShowSizeChange(current, pageSize) {
this.$set(this.ipagination, 'pageSize', pageSize)
- this.$emit('change', {current, pageSize})
+ this.$emit('change', { current, pageSize })
},
}
}
</script>
<style lang="less" scoped>
-
</style>
\ No newline at end of file
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index e592092..f6dbded 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -7,29 +7,69 @@
<a-card :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
- <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-form
+ layout="inline"
+ @keyup.enter.native="searchQuery"
+ >
<a-row :gutter="24">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
<a-form-item label="娴佺▼鍒嗙被">
- <j-dict-select-tag placeholder="璇烽�夋嫨娴佺▼鍒嗙被" v-model="queryParam.category"
- dictCode="flow_type"></j-dict-select-tag>
+ <j-dict-select-tag
+ placeholder="璇烽�夋嫨娴佺▼鍒嗙被"
+ v-model="queryParam.category"
+ dictCode="flow_type"
+ ></j-dict-select-tag>
</a-form-item>
</a-col>
- <a-col :xl="10" :lg="11" :md="12" :sm="24">
+ <a-col
+ :xl="10"
+ :lg="11"
+ :md="12"
+ :sm="24"
+ >
<a-form-item label="鎿嶄綔鏃堕棿">
- <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
- class="query-group-cust"
- v-model="queryParam.startTime"></j-date>
+ <j-date
+ :show-time="true"
+ date-format="YYYY-MM-DD HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
+ class="query-group-cust"
+ v-model="queryParam.startTime"
+ ></j-date>
<span class="query-group-split-cust"></span>
- <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
- class="query-group-cust"
- v-model="queryParam.endTime"></j-date>
+ <j-date
+ :show-time="true"
+ date-format="YYYY-MM-DD HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
+ class="query-group-cust"
+ v-model="queryParam.endTime"
+ ></j-date>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
- <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
- <a-button @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24"
+ >
+ <span
+ style="float: left;overflow: hidden;"
+ class="table-page-search-submitButtons"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
</span>
</a-col>
</a-row>
@@ -51,32 +91,76 @@
:pagination="ipagination"
:loading="loading"
class="j-table-force-nowrap"
- @change="handleTableChange">
+ @change="handleTableChange"
+ >
- <span slot="action" slot-scope="text, record">
- <a @click="handelDetial(record,text)">璇︽儏</a>
+ <span
+ slot="action"
+ slot-scope="text, record"
+ >
+ <a @click="handelDetial(record,text)">璇︽儏</a>
</span>
</a-table>
</div>
- <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
+ <AssignFileStreamXq
+ ref="modalFormApproval"
+ :selectShenpiData="selectShenpiData"
+ ></AssignFileStreamXq>
- <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>
+ <DispatchFileXq
+ ref="modalFormDispatchFileXq"
+ :selectShenpiData="selectDispatchFileXqData"
+ ></DispatchFileXq>
- <inspection-order-handle ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData" />
+ <inspection-order-handle
+ ref="modalFormInspectionOrderXq"
+ :selectShenpiData="selectInspectionOrderXqData"
+ />
- <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData" />
+ <week-maintenance-approval-modal
+ ref="weekMaintenanceApprovalModal"
+ :selectShenpiData="selectWeekMaintenanceData"
+ />
- <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectRepairOrderData" />
+ <repair-order-approval-modal
+ ref="repairOrderApprovalModal"
+ :selectShenpiData="selectRepairOrderData"
+ />
- <out-bound-order-handle ref="outBoundOrderHandle" :selectShenpiData="selectOutBoundOrderData" />
- <stocktaking-bound-handle ref="stocktakingBoundHandle" :selectShenpiData="selectStocktakingBoundOrderData"
- @searchReset="searchReset"></stocktaking-bound-handle>
+ <out-bound-order-handle
+ ref="outBoundOrderHandle"
+ :selectShenpiData="selectOutBoundOrderData"
+ />
+ <stocktaking-bound-handle
+ ref="stocktakingBoundHandle"
+ :selectShenpiData="selectStocktakingBoundOrderData"
+ @searchReset="searchReset"
+ ></stocktaking-bound-handle>
+ <loss-bound-handle
+ ref="lossBoundHandle"
+ :selectShenpiData="selectLossBoundOrderData"
+ @searchReset="searchReset"
+ ></loss-bound-handle>
- <loss-bound-handle ref="lossBoundHandle" :selectShenpiData="selectLossBoundOrderData"
- @searchReset="searchReset"></loss-bound-handle>
+ <equipment-lean-out-approval-modal
+ ref='equipmentLeanOutApprovalModelRef'
+ @searchReset='searchReset'
+ />
+ <equipment-seal-up-approval-modal
+ ref='equipmentSealUpApprovalModelRef'
+ @searchReset='searchReset'
+ />
+ <equipment-transfer-approval-modal
+ ref='equipmentTransferApprovalModelRef'
+ @searchReset='searchReset'
+ />
+ <equipment-scrap-approval-modal
+ ref='equipmentScrapApprovalModelRef'
+ @searchReset='searchReset'
+ />
</a-card>
</template>
@@ -94,6 +178,10 @@
import OutBoundOrderHandle from '@views/flowable/workflow/outBoundOrder/OutBoundOrderHandle.vue'
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
import stocktakingBoundHandle from '@views/flowable/workflow/stocktakingBound/stocktakingBoundHandle.vue'
+import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue'
+import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue'
+import EquipmentTransferApprovalModal from '@views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue'
+import EquipmentScrapApprovalModal from '@views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue'
export default {
name: 'NcDeviceCharactersList',
@@ -107,7 +195,11 @@
WeekMaintenanceApprovalModal,
InspectionOrderHandle,
JDictSelectTag,
- OutBoundOrderHandle
+ OutBoundOrderHandle,
+ EquipmentLeanOutApprovalModal,
+ EquipmentSealUpApprovalModal,
+ EquipmentTransferApprovalModal,
+ EquipmentScrapApprovalModal
},
data() {
return {
@@ -120,7 +212,7 @@
key: 'rowIndex',
width: 200,
align: 'center',
- customRender: function(t, r, index) {
+ customRender: function (t, r, index) {
return parseInt(index) + 1
}
},
@@ -180,13 +272,18 @@
selectRepairOrderData: {},
selectOutBoundOrderData: {},
selectLossBoundOrderData: {},
- selectStocktakingBoundOrderData: {}
+ selectStocktakingBoundOrderData: {},
+ // selectEquipmentLeanOutData: {},
+ // selectEquipmentSealUpData: {},
+ // selectEquipmentTransferData: {},
+ // selectEquipmentScrapData: {},
+
}
},
created() {
},
computed: {
- importExcelUrl: function() {
+ importExcelUrl: function () {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
}
},
@@ -221,6 +318,21 @@
break
case 'toolsLossApproval':
this.handleToolLossApproval(item)
+ break
+ case 'equipment_seal_up':
+ this.handleEquipmentSealUp(item)
+ break
+ case 'equipment_unseal':
+ this.handleEquipmentUnSeal(item)
+ break
+ case 'equipment_lean_out':
+ this.handleEquipmentLeanOut(item)
+ break
+ case 'equipment_transfer':
+ this.handleEquipmentTransfer(item)
+ break
+ case 'equipment_scrap':
+ this.handleEquipmentScrap(item)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -326,7 +438,37 @@
this.$refs.lossBoundHandle.clearTableSource()
this.$refs.lossBoundHandle.getAllApproveData(item)
- }
+ },
+ handleEquipmentLeanOut(item) {
+ this.$refs.equipmentLeanOutApprovalModelRef.visible = false
+ this.$refs.equipmentLeanOutApprovalModelRef.disableSubmit = true
+ this.$refs.equipmentLeanOutApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentLeanOutApprovalModelRef.title = item.name
+ },
+ handleEquipmentSealUp(item) {
+ this.$refs.equipmentSealUpApprovalModelRef.visible = true
+ this.$refs.equipmentSealUpApprovalModelRef.title = item.name
+ this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = true
+ },
+ handleEquipmentUnSeal(item) {
+ this.$refs.equipmentSealUpApprovalModelRef.visible = true
+ this.$refs.equipmentSealUpApprovalModelRef.title = item.name
+ this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = true
+ },
+ handleEquipmentTransfer(item) {
+ this.$refs.equipmentTransferApprovalModelRef.visible = true
+ this.$refs.equipmentTransferApprovalModelRef.title = item.name
+ this.$refs.equipmentTransferApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentTransferApprovalModelRef.disableSubmit = true
+ },
+ handleEquipmentScrap(item) {
+ this.$refs.equipmentScrapApprovalModelRef.visible = true
+ this.$refs.equipmentScrapApprovalModelRef.title = item.name
+ this.$refs.equipmentScrapApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentScrapApprovalModelRef.disableSubmit = true
+ },
}
}
</script>
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 9a452fc..c5924f6 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -432,9 +432,9 @@
selectStocktakingBoundOrderData: {},
selectInboundOrderData: {},
selectSparePartApplyData: {},
- selectGuideCardData:{},
- selectEquipmentAssignProductData:{},
- selectEquipmentSealUpData:{},
+ selectGuideCardData: {},
+ selectEquipmentAssignProductData: {},
+ selectEquipmentSealUpData: {},
//涓氬姟淇℃伅ID
dataId: undefined
}
@@ -530,6 +530,9 @@
case 'equipment_seal_up':
this.handleEquipmentSealUp(item)
break
+ case 'equipment_unseal':
+ this.handleEquipmentUnSeal(item)
+ break
case 'toolInStorageApproval':
this.handleToolInStorage(item)
break
@@ -580,7 +583,7 @@
} else if (categorySet.has('WEEK_MAINTENANCE')) {
this.$refs.weenMaintenanceBatchApprovalModalRef.handleDetail(this.selectionRows[0])
this.$refs.weenMaintenanceBatchApprovalModalRef.title = this.selectionRows[0].name
- }else if (categorySet.has('ggApproval')){
+ } else if (categorySet.has('ggApproval')) {
let ids = ''
for (let a = 0; a < this.selectedRowKeys.length; a++) {
ids += this.selectedRowKeys[a] + ','
@@ -622,7 +625,7 @@
this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
},
//DNC-瀹氬瀷瀹℃壒椤甸潰
- handStandardizedDetial(item){
+ handStandardizedDetial(item) {
this.selectDispatchFileXqData = item
this.$refs.StandardizedProcessHandle.clearTableSource()
this.$refs.StandardizedProcessHandle.getAllApproveData(item)
@@ -710,6 +713,13 @@
this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false
},
+
+ handleEquipmentUnSeal(item) {
+ this.$refs.equipmentSealUpApprovalModelRef.visible = true
+ this.$refs.equipmentSealUpApprovalModelRef.title = item.name
+ this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item)
+ this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false
+ },
handleToolInStorage(item) {
if (item && item.dataId) {
this.selectInboundOrderData = Object.assign({}, item)
@@ -746,7 +756,7 @@
this.$refs.guideCardBatchHandle.getAllApproveData(item)
},
//DNC-璁惧缁撴瀯鏍戞寚娲句骇鍝佺粨鏋勬爲
- handleEquipmentAssignProductApproval(item){
+ handleEquipmentAssignProductApproval(item) {
console.log('item----->', item)
this.selectEquipmentSealUpData = item
this.$refs.assignEquipmentFileStreamHandle.clearTableSource()
diff --git a/src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue b/src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue
index 9ec7e26..5a0afd4 100644
--- a/src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue
+++ b/src/views/flowable/workflow/scrap/EquipmentScrapApprovalModal.vue
@@ -9,58 +9,127 @@
centered
switchFullscreen
@cancel='handleCancel'
- @ok='handleOk'>
+ @ok='handleOk'
+ >
<a-spin :spinning='spinning'>
- <a-form-model ref='form' :model='model' :rules='validatorRules'>
- <a-divider orientation='center' style='font-size: large;font-style: italic;color: #66aeed;'> 鎶ュ簾锛堣浆璁╋級淇℃伅
+ <a-form-model
+ ref='form'
+ :model='model'
+ :rules='validatorRules'
+ >
+ <a-divider
+ orientation='center'
+ style='font-size: large;font-style: italic;color: #66aeed;'
+ > 鎶ュ簾锛堣浆璁╋級淇℃伅
</a-divider>
<a-row :gutter='24'>
<a-col :span='12'>
- <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='鍗曟嵁鍙�' prop='code'>
- <a-input v-model='model.code' disabled />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='鍗曟嵁鍙�'
+ prop='code'
+ >
+ <a-input
+ v-model='model.code'
+ disabled
+ />
</a-form-model-item>
</a-col>
<a-col :span='12'>
- <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='璁惧缂栫爜' prop='equipmentId'>
- <lx-search-equipment-select v-model='model.equipmentId'
- disabled placeholder='璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储'></lx-search-equipment-select>
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='璁惧缂栫爜'
+ prop='equipmentId'
+ >
+ <lx-search-equipment-select
+ v-model='model.equipmentId'
+ disabled
+ placeholder='璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储'
+ ></lx-search-equipment-select>
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter='24'>
<a-col :span='12'>
- <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='鐢宠浜�' prop='reportUser_dictText'>
- <a-input v-model='model.reportUser_dictText' disabled />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='鐢宠浜�'
+ prop='reportUser_dictText'
+ >
+ <a-input
+ v-model='model.reportUser_dictText'
+ disabled
+ />
</a-form-model-item>
</a-col>
<a-col :span='12'>
- <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='澶勭疆鍘熷洜' prop='scrapReason'>
- <a-input v-model='model.scrapReason' disabled />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='澶勭疆鍘熷洜'
+ prop='scrapReason'
+ >
+ <a-input
+ v-model='model.scrapReason'
+ disabled
+ />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter='24'>
<a-col :span='12'>
- <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='澶囨敞' prop='remark'>
- <a-textarea v-model='model.remark' disabled />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='澶囨敞'
+ prop='remark'
+ >
+ <a-textarea
+ v-model='model.remark'
+ disabled
+ />
</a-form-model-item>
</a-col>
</a-row>
<div v-if='approvalDisable'>
- <a-divider orientation='center' style='font-size: large;font-style: italic;color: #66aeed;'> 绠＄悊鍛樻姤搴燂紙杞锛夊鏍�
+ <a-divider
+ orientation='center'
+ style='font-size: large;font-style: italic;color: #66aeed;'
+ > 绠＄悊鍛樻姤搴燂紙杞锛夊鏍�
</a-divider>
<a-row :gutter='24'>
<a-col :span='12'>
- <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='瀹℃壒绫诲瀷' prop='approvalDealType'>
- <j-dict-select-tag v-model='model.approvalDealType' :disabled='disableSubmit || initialAcceptanceDisable' dictCode='approved_rejected'
- placeholder='璇烽�夋嫨澶勭悊绫诲瀷' type='radio' />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='瀹℃壒绫诲瀷'
+ prop='approvalDealType'
+ >
+ <j-dict-select-tag
+ v-model='model.approvalDealType'
+ :disabled='disableSubmit || initialAcceptanceDisable'
+ dictCode='approved_rejected'
+ placeholder='璇烽�夋嫨澶勭悊绫诲瀷'
+ type='radio'
+ />
</a-form-model-item>
</a-col>
<a-col :span='12'>
- <a-form-model-item :labelCol='labelCol' :wrapperCol='wrapperCol' label='瀹℃壒鎰忚' prop='approvalComment'>
- <a-textarea v-model='model.approvalComment' :disabled='disableSubmit || returnDisable'
- placeholder='璇疯緭鍏ユ剰瑙�' />
+ <a-form-model-item
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ label='瀹℃壒鎰忚'
+ prop='approvalComment'
+ >
+ <a-textarea
+ v-model='model.approvalComment'
+ :disabled='disableSubmit || returnDisable'
+ placeholder='璇疯緭鍏ユ剰瑙�'
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -142,8 +211,8 @@
this.loadAllProductionTree()
},
computed: {
- approvalDisable: function() {
- return ['WAIT_CHECK'].includes(this.model.scrapStatus)
+ approvalDisable: function () {
+ return ['WAIT_SUBMIT', 'WAIT_CHECK', 'COMPLETE'].includes(this.model.scrapStatus)
}
},
methods: {
@@ -219,5 +288,4 @@
</script>
<style lang='less' scoped>
-
</style>
\ No newline at end of file
diff --git a/src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue b/src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue
index ef2f20f..8fd8bdc 100644
--- a/src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue
+++ b/src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue
@@ -9,76 +9,166 @@
@ok="handleOk"
@cancel="handleCancel"
centered
- cancelText="鍏抽棴">
+ cancelText="鍏抽棴"
+ >
<a-spin :spinning="spinning">
- <a-form-model ref="form" :model="model" :rules="validatorRules">
- <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 灏佸瓨淇℃伅
+ <a-form-model
+ ref="form"
+ :model="model"
+ :rules="validatorRules"
+ >
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 灏佸瓨淇℃伅
</a-divider>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code" label="鍗曟嵁鍙�">
- <a-input v-model="model.code" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="code"
+ label="鍗曟嵁鍙�"
+ >
+ <a-input
+ v-model="model.code"
+ disabled
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="璁惧缂栫爜">
- <lx-search-equipment-select placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储"
- v-model="model.equipmentId" disabled></lx-search-equipment-select>
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="equipmentId"
+ label="璁惧缂栫爜"
+ >
+ <lx-search-equipment-select
+ placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储"
+ v-model="model.equipmentId"
+ disabled
+ ></lx-search-equipment-select>
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sealUpReason" label="灏佸瓨鍘熷洜">
- <a-textarea v-model="model.sealUpReason" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="sealUpReason"
+ label="灏佸瓨鍘熷洜"
+ >
+ <a-textarea
+ v-model="model.sealUpReason"
+ disabled
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportUser_dictText" label="鐢宠浜�">
- <a-input v-model="model.reportUser_dictText" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="reportUser_dictText"
+ label="鐢宠浜�"
+ >
+ <a-input
+ v-model="model.reportUser_dictText"
+ disabled
+ />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
- <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="澶囨敞">
- <a-textarea v-model="model.remark" disabled />
+ <a-form-model-item
+ :labelCol="labelColLong"
+ :wrapperCol="wrapperColLong"
+ prop="remark"
+ label="澶囨敞"
+ >
+ <a-textarea
+ v-model="model.remark"
+ disabled
+ />
</a-form-model-item>
</a-col>
</a-row>
<div v-if="approvalDisable">
- <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 绠＄悊鍛樺皝瀛樺鏍�
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 绠＄悊鍛樺皝瀛樺鏍�
</a-divider>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalDealType" label="瀹℃壒绫诲瀷">
- <j-dict-select-tag type="radio" v-model="model.approvalDealType" dictCode="approved_rejected"
- placeholder="璇烽�夋嫨澶勭悊绫诲瀷" :disabled="disableSubmit || initialAcceptanceDisable" />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="approvalDealType"
+ label="瀹℃壒绫诲瀷"
+ >
+ <j-dict-select-tag
+ type="radio"
+ v-model="model.approvalDealType"
+ dictCode="approved_rejected"
+ placeholder="璇烽�夋嫨澶勭悊绫诲瀷"
+ :disabled="disableSubmit || returnDisable"
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="瀹℃壒鎰忚">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.approvalComment"
- :disabled="disableSubmit || returnDisable" />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="approvalComment"
+ label="瀹℃壒鎰忚"
+ >
+ <a-textarea
+ placeholder="璇疯緭鍏ユ剰瑙�"
+ v-model="model.approvalComment"
+ :disabled="disableSubmit || returnDisable"
+ />
</a-form-model-item>
</a-col>
</a-row>
</div>
<div v-if="confirmDisable">
- <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 绠＄悊鍛樺惎灏佸鏍�
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 绠＄悊鍛樺惎灏佸鏍�
</a-divider>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unsealApprovalDealType" label="瀹℃壒绫诲瀷">
- <j-dict-select-tag type="radio" v-model="model.unsealApprovalDealType" dictCode="approved_rejected"
- placeholder="璇烽�夋嫨澶勭悊绫诲瀷" :disabled="disableSubmit || initialAcceptanceDisable" />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="unsealApprovalDealType"
+ label="瀹℃壒绫诲瀷"
+ >
+ <j-dict-select-tag
+ type="radio"
+ v-model="model.unsealApprovalDealType"
+ dictCode="approved_rejected"
+ placeholder="璇烽�夋嫨澶勭悊绫诲瀷"
+ :disabled="disableSubmit || completionDisable"
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unsealApprovalComment" label="瀹℃壒鎰忚">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.unsealApprovalComment"
- :disabled="disableSubmit || completionDisable" />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="unsealApprovalComment"
+ label="瀹℃壒鎰忚"
+ >
+ <a-textarea
+ placeholder="璇疯緭鍏ユ剰瑙�"
+ v-model="model.unsealApprovalComment"
+ :disabled="disableSubmit || completionDisable"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -160,16 +250,16 @@
this.loadAllProductionTree()
},
computed: {
- approvalDisable: function() {
- return ['WAIT_CHECK','SEALED', 'WAIT_UNSEALING_AUDIT', 'COMPLETE'].includes(this.model.sealStatus)
+ approvalDisable: function () {
+ return ['WAIT_CHECK', 'SEALED', 'WAIT_UNSEALING_AUDIT', 'COMPLETE'].includes(this.model.sealStatus)
},
- returnDisable: function() {
+ returnDisable: function () {
return ['SEALED', 'WAIT_UNSEALING_AUDIT', 'COMPLETE'].includes(this.model.sealStatus)
},
- confirmDisable: function() {
+ confirmDisable: function () {
return ['WAIT_UNSEALING_AUDIT', 'COMPLETE'].includes(this.model.sealStatus)
},
- completionDisable: function() {
+ completionDisable: function () {
return ['COMPLETE'].includes(this.model.leanStatus)
}
},
@@ -246,5 +336,4 @@
</script>
<style lang="less" scoped>
-
</style>
\ No newline at end of file
diff --git a/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue b/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue
index c0f5b68..a33291e 100644
--- a/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue
+++ b/src/views/flowable/workflow/transfer/EquipmentTransferApprovalModal.vue
@@ -9,70 +9,155 @@
@ok="handleOk"
@cancel="handleCancel"
centered
- cancelText="鍏抽棴">
+ cancelText="鍏抽棴"
+ >
<a-spin :spinning="spinning">
- <a-form-model ref="form" :model="model" :rules="validatorRules">
- <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 褰掑睘淇℃伅
+ <a-form-model
+ ref="form"
+ :model="model"
+ :rules="validatorRules"
+ >
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 褰掑睘淇℃伅
</a-divider>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code" label="鍗曟嵁鍙�">
- <a-input v-model="model.code" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="code"
+ label="鍗曟嵁鍙�"
+ >
+ <a-input
+ v-model="model.code"
+ disabled
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="璁惧缂栫爜">
- <lx-search-equipment-select placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储"
- v-model="model.equipmentId" disabled></lx-search-equipment-select>
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="equipmentId"
+ label="璁惧缂栫爜"
+ >
+ <lx-search-equipment-select
+ placeholder="璇疯緭鍏ヨ澶囩紪鍙锋垨鍚嶇О鎼滅储"
+ v-model="model.equipmentId"
+ disabled
+ ></lx-search-equipment-select>
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="newDepartId_dictText" label="璋冨叆閮ㄩ棬">
- <a-input v-model="model.newDepartId_dictText" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="newDepartId_dictText"
+ label="璋冨叆閮ㄩ棬"
+ >
+ <a-input
+ v-model="model.newDepartId_dictText"
+ disabled
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="oldDepartId_dictText" label="璋冨嚭閮ㄩ棬">
- <a-input v-model="model.oldDepartId_dictText" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="oldDepartId_dictText"
+ label="璋冨嚭閮ㄩ棬"
+ >
+ <a-input
+ v-model="model.oldDepartId_dictText"
+ disabled
+ />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportUser_dictText" label="鐢宠浜�">
- <a-input v-model="model.reportUser_dictText" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="reportUser_dictText"
+ label="鐢宠浜�"
+ >
+ <a-input
+ v-model="model.reportUser_dictText"
+ disabled
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="transferReason" label="鍙樺姩鍘熷洜">
- <a-input v-model="model.transferReason" disabled />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="transferReason"
+ label="鍙樺姩鍘熷洜"
+ >
+ <a-input
+ v-model="model.transferReason"
+ disabled
+ />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :span="24">
- <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="澶囨敞">
- <a-textarea v-model="model.remark" disabled />
+ <a-form-model-item
+ :labelCol="labelColLong"
+ :wrapperCol="wrapperColLong"
+ prop="remark"
+ label="澶囨敞"
+ >
+ <a-textarea
+ v-model="model.remark"
+ disabled
+ />
</a-form-model-item>
</a-col>
</a-row>
<div v-if="approvalDisable">
- <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 绠＄悊鍛樺皝瀛樺鏍�
+ <a-divider
+ orientation="center"
+ style="font-size: large;font-style: italic;color: #66aeed;"
+ > 绠＄悊鍛樺皝瀛樺鏍�
</a-divider>
<a-row :gutter="24">
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalDealType" label="瀹℃壒绫诲瀷">
- <j-dict-select-tag type="radio" v-model="model.approvalDealType" dictCode="approved_rejected"
- placeholder="璇烽�夋嫨澶勭悊绫诲瀷" :disabled="disableSubmit || initialAcceptanceDisable" />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="approvalDealType"
+ label="瀹℃壒绫诲瀷"
+ >
+ <j-dict-select-tag
+ type="radio"
+ v-model="model.approvalDealType"
+ dictCode="approved_rejected"
+ placeholder="璇烽�夋嫨澶勭悊绫诲瀷"
+ :disabled="disableSubmit || initialAcceptanceDisable"
+ />
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalComment" label="瀹℃壒鎰忚">
- <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.approvalComment"
- :disabled="disableSubmit || returnDisable" />
+ <a-form-model-item
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="approvalComment"
+ label="瀹℃壒鎰忚"
+ >
+ <a-textarea
+ placeholder="璇疯緭鍏ユ剰瑙�"
+ v-model="model.approvalComment"
+ :disabled="disableSubmit || returnDisable"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -154,8 +239,8 @@
this.loadAllProductionTree()
},
computed: {
- approvalDisable: function() {
- return ['WAIT_CHECK'].includes(this.model.transferStatus)
+ approvalDisable: function () {
+ return ['WAIT_SUBMIT', 'WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE',].includes(this.model.transferStatus)
},
},
methods: {
@@ -231,5 +316,4 @@
</script>
<style lang="less" scoped>
-
</style>
\ No newline at end of file
--
Gitblit v1.9.3