.env.development | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/eam/dispose/EamEquipmentSealUpList.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/eam/dispose/modules/EamEquipmentSealUpModal.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/flowable/workflow/FlowTodo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
yarn.lock | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.env.development
@@ -1,7 +1,7 @@ NODE_ENV=development # VUE_APP_API_BASE_URL=http://192.168.1.118:3000 # VUE_APP_API_BASE_URL=http://195.0.1.10:6099 VUE_APP_API_BASE_URL=http://192.168.1.12:9999 VUE_APP_API_BASE_URL=http://192.168.1.27:9999 # VUE_APP_API_BASE_URL=http://127.0.0.1:9999 # VUE_APP_API_BASE_URL=http://195.0.1.10:8099 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas src/views/eam/dispose/EamEquipmentSealUpList.vue
@@ -1,102 +1,87 @@ <template> <a-card :bordered="false"> <a-card :bordered='false'> <!-- æ¥è¯¢åºå --> <div class="table-page-search-wrapper"> <a-form layout="inline" @keyup.enter.native="searchQuery"> <a-row :gutter="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="å 餿 è®°"> <a-input placeholder="请è¾å ¥å 餿 è®°" v-model="queryParam.delFlag"></a-input> <div class='table-page-search-wrapper'> <a-form layout='inline' @keyup.enter.native='searchQuery'> <a-row :gutter='24'> <a-col :lg='7' :md='8' :sm='24' :xl='4'> <a-form-item label='设å¤ç¼å·'> <lx-search-equipment-select v-model='queryParam.equipmentId' placeholder='请è¾å ¥è®¾å¤ç¼å·æåç§°æç´¢'></lx-search-equipment-select> </a-form-item> </a-col> <a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="设å¤ID"> <a-input placeholder="请è¾å ¥è®¾å¤ID" v-model="queryParam.equipmentId"></a-input> <a-col :lg='7' :md='8' :sm='24' :xl='4'> <a-form-item label='åæ®å·'> <a-input v-model='queryParam.code' placeholder='请è¾å ¥åæ®å·'></a-input> </a-form-item> </a-col> <template v-if="toggleSearchStatus"> <a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="åæ®å·"> <a-input placeholder="请è¾å ¥åæ®å·" v-model="queryParam.code"></a-input> </a-form-item> </a-col> <a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="ç³è¯·äºº"> <a-input placeholder="请è¾å ¥ç³è¯·äºº" v-model="queryParam.reportUser"></a-input> </a-form-item> </a-col> <a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-form-item label="å°åå¼å§æ¶é´"> <a-input placeholder="请è¾å ¥å°åå¼å§æ¶é´" v-model="queryParam.sealStartTime"></a-input> </a-form-item> </a-col> </template> <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="primary" @click="searchReset" icon="reload" style="margin-left: 8px">éç½®</a-button> <a @click="handleToggleSearch" style="margin-left: 8px"> {{ toggleSearchStatus ? 'æ¶èµ·' : 'å±å¼' }} <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> </a> <a-col :lg='7' :md='8' :sm='24' :xl='6'> <span class='table-page-search-submitButtons' style='float: left;overflow: hidden;'> <a-button icon='search' type='primary' @click='searchQuery'>æ¥è¯¢</a-button> <a-button icon='reload' style='margin-left: 8px' type='info' @click='searchReset'>éç½®</a-button> </span> </a-col> </a-row> </a-form> </div> <!-- æä½æé®åºå --> <div class="table-operator"> <a-button @click="handleAdd" type="primary" icon="plus">æ°å¢</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"> <a-button type="primary" icon="import">å¯¼å ¥</a-button> </a-upload> <a-dropdown v-if="selectedRowKeys.length > 0"> <a-menu slot="overlay"> <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>å é¤</a-menu-item> <div class='table-operator'> <a-button icon='plus' type='primary' @click='handleAdd'>æ°å¢</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">--> <!-- <a-button type="primary" icon="import">å¯¼å ¥</a-button>--> <!-- </a-upload>--> <a-dropdown v-if='selectedRowKeys.length > 0'> <a-menu slot='overlay'> <a-menu-item key='1' @click='batchDel'> <a-icon type='delete' /> å é¤ </a-menu-item> </a-menu> <a-button style="margin-left: 8px"> æ¹éæä½ <a-icon type="down" /></a-button> <a-button style='margin-left: 8px'> æ¹éæä½ <a-icon type='down' /> </a-button> </a-dropdown> </div> <!-- 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 ref="table" size="middle" ref='table' :columns='columns' :dataSource='dataSource' :loading='loading' :pagination='ipagination' :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' bordered rowKey="id" :columns="columns" :dataSource="dataSource" :pagination="ipagination" :loading="loading" class="j-table-force-nowrap" :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" @change="handleTableChange"> class='j-table-force-nowrap' rowKey='id' size='middle' @change='handleTableChange'> <span slot="action" slot-scope="text, record"> <a @click="handleEdit(record)">ç¼è¾</a> <a-divider type="vertical" /> <a-dropdown> <a class="ant-dropdown-link">æ´å¤ <a-icon type="down" /></a> <a-menu slot="overlay"> <a-menu-item> <a-popconfirm title="ç¡®å®å é¤å?" @confirm="() => handleDelete(record.id)"> <span slot='action' slot-scope='text, record'> <template v-if="record.sealStatus === 'WAIT_SUBMIT'"> <a-popconfirm title='ç¡®å®æäº¤å?' @confirm='() => handleSubmit(record.id)'> <a>æäº¤</a> </a-popconfirm> <a-divider type='vertical' /> <a @click='handleEdit(record)'>ç¼è¾</a> <a-divider type='vertical' /> <a-popconfirm title='ç¡®å®å é¤å?' @confirm='() => handleDelete(record.id)'> <a>å é¤</a> </a-popconfirm> </a-menu-item> </a-menu> </a-dropdown> </template> <template v-else> <a @click='handleDetail(record)'>详æ </a> </template> </span> </a-table> @@ -104,7 +89,7 @@ <!-- tableåºå-end --> <!-- 表ååºå --> <eamEquipmentSealUp-modal ref="modalForm" @ok="modalFormOk"></eamEquipmentSealUp-modal> <eamEquipmentSealUp-modal ref='modalForm' @ok='modalFormOk'></eamEquipmentSealUp-modal> </a-card> </template> @@ -112,12 +97,15 @@ import '@/assets/less/TableExpand.less' import EamEquipmentSealUpModal from './modules/EamEquipmentSealUpModal' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue' import { getAction } from '@api/manage' export default { name: "EamEquipmentSealUpList", name: 'EamEquipmentSealUpList', mixins:[JeecgListMixin], components: { EamEquipmentSealUpModal EamEquipmentSealUpModal, LxSearchEquipmentSelect }, data () { return { @@ -129,89 +117,112 @@ dataIndex: '', key:'rowIndex', width:60, align:"center", align: 'center', customRender:function (t,r,index) { return parseInt(index)+1; return parseInt(index) + 1 } }, { title: 'å 餿 è®°', align:"center", dataIndex: 'delFlag' title: '设å¤ç¼å·', align: 'center', dataIndex: 'equipmentCode' }, { title: '设å¤ID', align:"center", dataIndex: 'equipmentId' title: '设å¤åç§°', align: 'center', dataIndex: 'equipmentName' }, { title: 'åæ®å·', align:"center", align: 'center', dataIndex: 'code' }, { title: 'ç³è¯·äºº', align:"center", dataIndex: 'reportUser' align: 'center', dataIndex: 'reportUser_dictText' }, { title: 'å°åå¼å§æ¶é´', align:"center", align: 'center', dataIndex: 'sealStartTime' }, { title: 'å°åç»ææ¶é´', align:"center", align: 'center', dataIndex: 'sealEndTime' }, { title: 'å°ååå ', align:"center", align: 'center', dataIndex: 'sealUpReason' }, { title: 'å°åç¶æ', align:"center", dataIndex: 'sealStatus' align: 'center', dataIndex: 'sealStatus_dictText' }, { title: 'å®¡æ ¸äºº', align:"center", align: 'center', dataIndex: 'approvalUser' }, { title: 'å®¡æ ¸æ¶é´', align:"center", align: 'center', dataIndex: 'approvalTime' }, { title: '夿³¨', align:"center", align: 'center', dataIndex: 'remark' }, { title: 'æä½', dataIndex: 'action', align:"center", scopedSlots: { customRender: 'action' }, align: 'center', scopedSlots: { customRender: 'action' } } ], url: { list: "/eam/eamEquipmentSealUp/list", delete: "/eam/eamEquipmentSealUp/delete", deleteBatch: "/eam/eamEquipmentSealUp/deleteBatch", exportXlsUrl: "eam/eamEquipmentSealUp/exportXls", importExcelUrl: "eam/eamEquipmentSealUp/importExcel", }, list: '/eam/eamEquipmentSealUp/list', delete: '/eam/eamEquipmentSealUp/delete', deleteBatch: '/eam/eamEquipmentSealUp/deleteBatch', submit: '/eam/eamEquipmentSealUp/submit' } } }, computed: { importExcelUrl: function(){ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}` } }, methods: { handleSubmit(id) { if (!this.url.submit) { this.$message.error('请设置url.submit屿§!') return } let that = this getAction(that.url.submit, { id: id }).then((res) => { if (res.success) { //éæ°è®¡ç®å页é®é¢ that.reCalculatePage(1) // that.$message.success(res.message); that.$notification.success({ message: 'æ¶æ¯', description: res.message }) that.loadData() } else { // that.$message.warning(res.message); that.$notification.warning({ message: 'æ¶æ¯', description: res.message }) } }) } } } </script> src/views/eam/dispose/modules/EamEquipmentSealUpModal.vue
@@ -11,36 +11,15 @@ <a-spin :spinning="confirmLoading"> <a-form-model ref="form" :model="model" :rules="validatorRules"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="å 餿 è®°"> <a-input-number v-model="model.delFlag"/> </a-form-model-item> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设å¤ID"> <a-input placeholder="请è¾å ¥è®¾å¤ID" v-model="model.equipmentId" /> </a-form-model-item> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code" label="åæ®å·"> <a-input placeholder="请è¾å ¥åæ®å·" v-model="model.code" /> <a-input placeholder="ç¼ç ç³»ç»èªå¨çæ" v-model="model.code" disabled /> </a-form-model-item> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportUser" label="ç³è¯·äºº"> <a-input placeholder="请è¾å ¥ç³è¯·äºº" v-model="model.reportUser" /> </a-form-model-item> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sealStartTime" label="å°åå¼å§æ¶é´"> <a-input placeholder="请è¾å ¥å°åå¼å§æ¶é´" v-model="model.sealStartTime" /> </a-form-model-item> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sealEndTime" label="å°åç»ææ¶é´"> <a-input placeholder="请è¾å ¥å°åç»ææ¶é´" v-model="model.sealEndTime" /> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentId" label="设å¤ç¼å·"> <lx-search-equipment-select placeholder="请è¾å ¥è®¾å¤ç¼å·æåç§°æç´¢" v-model="model.equipmentId"></lx-search-equipment-select> </a-form-model-item> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sealUpReason" label="å°ååå "> <a-input placeholder="请è¾å ¥å°ååå " v-model="model.sealUpReason" /> </a-form-model-item> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sealStatus" label="å°åç¶æ"> <a-input placeholder="请è¾å ¥å°åç¶æ" v-model="model.sealStatus" /> </a-form-model-item> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalUser" label="å®¡æ ¸äºº"> <a-input placeholder="请è¾å ¥å®¡æ ¸äºº" v-model="model.approvalUser" /> </a-form-model-item> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="approvalTime" label="å®¡æ ¸æ¶é´"> <a-input placeholder="请è¾å ¥å®¡æ ¸æ¶é´" v-model="model.approvalTime" /> </a-form-model-item> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark" label="夿³¨"> <a-input placeholder="请è¾å ¥å¤æ³¨" v-model="model.remark" /> @@ -54,9 +33,13 @@ <script> import { httpAction } from '@/api/manage' import moment from "moment" import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue' export default { name: "EamEquipmentSealUpModal", components: { LxSearchEquipmentSelect }, data () { return { title:"æä½", @@ -73,6 +56,12 @@ confirmLoading: false, validatorRules:{ equipmentId: [ { required: true, message: 'è¯·éæ©è®¾å¤ï¼' } ], sealUpReason: [ { required: true, message: '请è¾å ¥å°ååå ï¼' } ], }, url: { add: "/eam/eamEquipmentSealUp/add", src/views/flowable/workflow/FlowTodo.vue
@@ -124,6 +124,7 @@ @searchReset="searchReset"></second-maintenance-approval-modal> <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectThirdMaintenanceData" @searchReset="searchReset"></third-maintenance-approval-modal> <equipment-seal-up-approval-modal ref="equipmentSealUpApprovalModelRef" @searchReset="searchReset"/> </a-card> </template> @@ -147,7 +148,7 @@ import EquipmentLeanOutApprovalModal from '@views/flowable/workflow/leanOut/EquipmentLeanOutApprovalModal.vue' import SecondMaintenanceApprovalModal from '@views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue' import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue' import EquipmentSealUpApprovalModal from '@views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue' export default { name: 'NcDeviceCharactersList', mixins: [JeecgListMixin, mixinDevice], @@ -163,7 +164,8 @@ InspectionOrderHandle, EquipmentLeanOutApprovalModal, SecondMaintenanceApprovalModal, ThirdMaintenanceApprovalModal ThirdMaintenanceApprovalModal, EquipmentSealUpApprovalModal, }, data() { return { @@ -325,6 +327,9 @@ case 'third_maintenance': this.handleThirdMaintenance(item) break case 'equipment_seal_up': this.handleEquipmentSealUp(item) break default: alert('没æ¾å°è¯¥æµç¨') } @@ -431,6 +436,12 @@ this.$refs.thirdMaintenanceApprovalModal.disableSubmit = false } }, handleEquipmentSealUp(item) { this.$refs.equipmentSealUpApprovalModelRef.visible = true this.$refs.equipmentSealUpApprovalModelRef.title = item.name this.$refs.equipmentSealUpApprovalModelRef.handleDetail(item) this.$refs.equipmentSealUpApprovalModelRef.disableSubmit = false }, } } </script> src/views/flowable/workflow/sealUp/EquipmentSealUpApprovalModal.vue
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,257 @@ <template> <j-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" switchFullscreen @ok="handleOk" @cancel="handleCancel" centered 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-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> </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> </a-col> </a-row> <a-row :guitter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanDepartId_dictText" label="åå ¥è½¦é´"> <a-input v-model="model.leanDepartId_dictText" disabled /> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leanPerson_dictText" label="åç¨äºº"> <a-input v-model="model.leanPerson_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="leanReason" label="åç¨åå "> <a-textarea v-model="model.leanReason" disabled /> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" 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> <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> </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> </a-col> </a-row> </div> <div v-if="returnDisable"> <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> å½è¿ä¿¡æ¯ </a-divider> <a-row :gutter="24"> <a-col :span="24"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="returnComment" label="å½è¿å¤æ³¨"> <a-textarea placeholder="请è¾å ¥å½è¿å¤æ³¨" v-model="model.returnComment" :disabled="disableSubmit || confirmDisable" /> </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> <a-row :gutter="24"> <a-col :span="24"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmComment" label="确认æè§"> <a-textarea placeholder="请è¾å ¥æè§" v-model="model.confirmComment" :disabled="disableSubmit || completionDisable" /> </a-form-model-item> </a-col> </a-row> </div> </a-form-model> </a-spin> </j-modal> </template> <script> import { getAction, httpAction } from '@/api/manage' import LxSearchEquipmentSelect from '@views/eam/equipment/modules/LxSearchEquipmentSelect.vue' export default { name: 'EquipmentLeanOutApprovalModal', components: { LxSearchEquipmentSelect }, props: { selectShenpiData: { type: Object } }, data() { return { title: 'æä½', visible: false, editable: false, model: {}, treeData: [], labelCol: { xs: { span: 24 }, sm: { span: 5 } }, wrapperCol: { xs: { span: 24 }, sm: { span: 18 } }, labelColLong: { xs: { span: 24 }, sm: { span: 2 } }, wrapperColLong: { xs: { span: 24 }, sm: { span: 21 } }, confirmLoading: false, spinning: false, imageSrc: null, validatorRules: { approvalDealType: [ { required: true, message: 'è¯·éæ©éè¿æé©³å!' } ], approvalComment: [ { required: true, message: '请è¾å ¥å®¡æ¹æè§!' } ], returnComment: [ { required: true, message: '请è¾å ¥å½è¿å¤æ³¨!' } ], confirmComment: [ { required: true, message: '请è¾å ¥ç¡®è®¤æè§!' } ] }, url: { queryById: '/eam/eamEquipmentSealUp/queryById', approval: '/eam/eamEquipmentSealUp/approval', loadProductionOptions: '/mdc/mdcProduction/loadProductionTreeOptions' }, disableSubmit: false } }, created() { this.loadAllProductionTree() }, computed: { approvalDisable: function() { return ['WAIT_APPROVAL', 'WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus) }, returnDisable: function() { return ['WAIT_RETURN', 'WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus) }, confirmDisable: function() { return ['WAIT_CONFIRM', 'COMPLETE'].includes(this.model.leanStatus) }, completionDisable: function() { return ['COMPLETE'].includes(this.model.leanStatus) } }, methods: { async handleDetail(item) { this.initParams() this.model = {} let res = await getAction(this.url.queryById, { id: item.dataId }) this.model = Object.assign({}, res.result) this.model.dataId = item.dataId this.model.taskId = item.id this.model.userId = item.assignee this.model.instanceId = item.procInstId this.model.values = item.variables this.spinning = false; }, recordDetail(record) { console.log('record', record) this.initParams() this.model = Object.assign({}, record) }, initParams() { this.visible = true this.spinning = true }, async handleOk() { const that = this // 触å表åéªè¯ this.$refs.form.validate(valid => { if (valid) { that.confirmLoading = that.spinning = true let httpurl = this.url.approval let method = 'put' httpAction(httpurl, this.model, method).then((res) => { if (res.success) { that.$message.success(res.message) that.$emit('searchReset') that.close() } else { that.$message.warning(res.message) } }).finally(() => { that.confirmLoading = that.spinning = false }) } else { return false } }) }, handleCancel() { this.close() }, close() { this.$emit('close') this.visible = false this.$refs.form.clearValidate() }, loadAllProductionTree() { //å 载车é´éæ©æ getAction(this.url.loadProductionOptions).then(res => { if (res.success) { this.treeData = [...res.result] } else { that.$message.warning(res.message) } }) } } } </script> <style lang="less" scoped> </style> yarn.lock
@@ -9682,6 +9682,11 @@ single-spa "^5.9.2" tslib "^1.10.0" qrcode.vue@^1.7.0: version "1.7.0" resolved "https://registry.npmmirror.com/qrcode.vue/-/qrcode.vue-1.7.0.tgz#c54b2934f0650c10d92785d08aaad36c55e0fc56" integrity sha512-R7t6Y3fDDtcU7L4rtqwGUDP9xD64gJhIwpfjhRCTKmBoYF6SS49PIJHRJ048cse6OI7iwTwgyy2C46N9Ygoc6g== qs@6.7.0: version "6.7.0" resolved "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"