From dbfa630021b25516dee45ae71b4277bcf4aa6aa4 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 22 七月 2025 20:42:48 +0800
Subject: [PATCH] 1、技术状态鉴定申请功能及流程 2、技术鉴定工单审批中检查明细展示限制条件调整
---
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue | 353 ++++++++++++++++++++
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue | 20
src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue | 396 +++++++++++++---------
src/views/flowable/workflow/FlowTodo.vue | 22 +
src/views/eam/equipment/modules/LxSearchEquipmentSelect.vue | 7
src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue | 196 +++++------
6 files changed, 712 insertions(+), 282 deletions(-)
diff --git a/src/views/eam/equipment/modules/LxSearchEquipmentSelect.vue b/src/views/eam/equipment/modules/LxSearchEquipmentSelect.vue
index e04b5bc..ec840e2 100644
--- a/src/views/eam/equipment/modules/LxSearchEquipmentSelect.vue
+++ b/src/views/eam/equipment/modules/LxSearchEquipmentSelect.vue
@@ -79,6 +79,13 @@
this.initSelectValue()
}
}
+ },
+ factoryOrgCode:{
+ handler(val){
+ if(val){
+ this.loadData()
+ }
+ }
}
},
methods: {
diff --git a/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue b/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue
index 18d6f4d..450b710 100644
--- a/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue
+++ b/src/views/eam/technical/EamTechnicalStatusEvaluationApplicationList.vue
@@ -1,49 +1,46 @@
<template>
<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>
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
+ <a-form-item label="缁熶竴缂栫爜">
+ <lx-search-equipment-select placeholder="璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�" v-model="queryParam.equipmentId"/>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="4" :lg="6" :md="8" :sm="12">
<a-form-item label="鐢宠鍗曞彿">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" v-model="queryParam.applicationOrderNum"></a-input>
+ <a-input placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" v-model="queryParam.applicationOrderNum"/>
</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.applicant"></a-input>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
<a-form-item label="鐢宠閮ㄩ棬">
- <a-input placeholder="璇疯緭鍏ョ敵璇烽儴闂�" v-model="queryParam.factoryOrgCode"></a-input>
+ <a-tree-select v-model="queryParam.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
+ show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
+ treeNodeFilterProp="title" searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨鐢宠閮ㄩ棬"
+ allow-clear tree-default-expand-all>
+ </a-tree-select>
</a-form-item>
</a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
<a-form-item label="鐢宠鏃ユ湡">
- <a-input placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" v-model="queryParam.applyDate"></a-input>
+ <a-range-picker v-model="queryParam.applyDate" value-format="YYYY-MM-DD" @change="handleDateRangeChange"/>
</a-form-item>
</a-col>
- </template>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-col :xl="5" :lg="6" :md="8" :sm="12">
+ <a-form-item label="鐢宠鍗曠姸鎬�">
+ <j-dict-select-tag v-model="queryParam.applicationStatus" placeholder="璇烽�夋嫨鐢宠鍗曠姸鎬�"
+ dict-code="technical_status_evaluation_application_status"/>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="4" :lg="6" :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 @click="handleToggleSearch" style="margin-left: 8px">
- {{ toggleSearchStatus ? '鏀惰捣' : '灞曞紑' }}
- <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
- </a>
</span>
</a-col>
-
</a-row>
</a-form>
</div>
@@ -51,195 +48,268 @@
<!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
<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>
- </a-menu>
- <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>
-
- <a-table
- ref="table"
- size="middle"
- bordered
- rowKey="id"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- class="j-table-force-nowrap"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- @change="handleTableChange">
+ <a-table ref="table" size="middle" bordered rowKey="id" :columns="columns" :dataSource="dataSource"
+ :pagination="ipagination" :loading="loading" :scroll="{x:'max-content'}" @change="handleTableChange">
<span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
+ <template v-if="record.applicationStatus=='WAIT_SUBMIT'">
+ <a @click.stop="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)">
- <a>鍒犻櫎</a>
- </a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+ <a-divider type="vertical"/>
+
+ <a-popconfirm title="纭畾鎻愪氦鍚楋紵" @confirm="handleSubmit(record.id)">
+ <a @click="e=>e.stopPropagation()">鎻愪氦</a>
+ </a-popconfirm>
+
+ <a-divider type="vertical"/>
+
+ <a-popconfirm title="纭畾浣滃簾鍚楋紵" @confirm="handleAbolish(record.id)">
+ <a @click="e=>e.stopPropagation()">浣滃簾</a>
+ </a-popconfirm>
+ </template>
+
+ <a @click.stop="handleDetail(record)"
+ v-if="record.applicationStatus!='WAIT_SUBMIT'&&record.applicationStatus!='ABOLISH'">璇︽儏</a>
</span>
-
- </a-table>
- </div>
+ </a-table>
<!-- table鍖哄煙-end -->
<!-- 琛ㄥ崟鍖哄煙 -->
- <eamTechnicalStatusEvaluationApplication-modal ref="modalForm" @ok="modalFormOk"></eamTechnicalStatusEvaluationApplication-modal>
+ <eamTechnicalStatusEvaluationApplication-modal ref="modalForm" @ok="modalFormOk"
+ :productionTreeData="productionTreeData"/>
+
+ <technical-status-evaluation-application-approval-modal ref="technicalStatusEvaluationApplicationApprovalModal"
+ :selectShenpiData="selectedRowData"/>
</a-card>
</template>
<script>
- import '@/assets/less/TableExpand.less'
import EamTechnicalStatusEvaluationApplicationModal from './modules/EamTechnicalStatusEvaluationApplicationModal'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+ import LxSearchEquipmentSelect from '../equipment/modules/LxSearchEquipmentSelect'
+ import { getAction } from '@/api/manage'
+ import TechnicalStatusEvaluationApplicationApprovalModal
+ from '../../flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'
export default {
- name: "EamTechnicalStatusEvaluationApplicationList",
- mixins:[JeecgListMixin],
+ name: 'EamTechnicalStatusEvaluationApplicationList',
+ mixins: [JeecgListMixin],
components: {
+ TechnicalStatusEvaluationApplicationApprovalModal,
+ LxSearchEquipmentSelect,
EamTechnicalStatusEvaluationApplicationModal
},
- data () {
+ data() {
return {
description: '鍔犲伐璁惧鎶�鏈壌瀹氱敵璇风鐞嗛〉闈�',
+ productionTreeData: [],
+ selectedRowData: {},
// 琛ㄥご
columns: [
{
title: '#',
dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title: '鍒犻櫎鏍囪',
- align:"center",
- dataIndex: 'delFlag'
- },
- {
+ key: 'rowIndex',
+ width: 60,
+ align: 'center',
+ customRender: function(t, r, index) {
+ return parseInt(index) + 1
+ },
+ fixed: 'left'
+ },
+ {
+ title: '缁熶竴缂栫爜',
+ align: 'center',
+ dataIndex: 'equipmentCode',
+ fixed: 'left'
+ },
+ {
+ title: '璁惧鍚嶇О',
+ align: 'center',
+ dataIndex: 'equipmentName',
+ fixed: 'left'
+ },
+ {
+ title: '璁惧鍨嬪彿',
+ align: 'center',
+ dataIndex: 'equipmentModel',
+ fixed: 'left'
+ },
+ {
+ title: '鐢宠鍗曠姸鎬�',
+ align: 'center',
+ dataIndex: 'applicationStatus_dictText',
+ fixed: 'left'
+ },
+ {
title: '鐢宠鍗曞彿',
- align:"center",
+ align: 'center',
dataIndex: 'applicationOrderNum'
- },
- {
+ },
+ {
title: '鐢宠浜�',
- align:"center",
- dataIndex: 'applicant'
- },
- {
+ align: 'center',
+ dataIndex: 'applicant_dictText'
+ },
+ {
title: '鐢宠閮ㄩ棬',
- align:"center",
- dataIndex: 'factoryOrgCode'
- },
- {
+ align: 'center',
+ dataIndex: 'factoryOrgCode_dictText'
+ },
+ {
title: '鐢宠鏃ユ湡',
- align:"center",
+ align: 'center',
dataIndex: 'applyDate'
- },
- {
- title: '鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚',
- align:"center",
- dataIndex: 'applicationStatus'
- },
- {
+ },
+ {
+ title: '鎶�鏈姸鎬侀壌瀹氭棩鏈�',
+ align: 'center',
+ dataIndex: 'evaluationDate'
+ },
+ {
title: '鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧',
- align:"center",
- dataIndex: 'departHeaderSignature'
- },
- {
+ align: 'center',
+ dataIndex: 'departHeaderSignature_dictText'
+ },
+ {
title: '鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧鏃堕棿',
- align:"center",
+ align: 'center',
dataIndex: 'departHeaderSignatureTime'
- },
- {
- title: '鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚',
- align:"center",
- dataIndex: 'departHeaderComment'
- },
- {
+ },
+ {
title: '鐢熶骇璁惧绠＄悊涓荤绛惧瓧',
- align:"center",
- dataIndex: 'productionHeaderSignature'
- },
- {
- title: '鐢熶骇璁惧绠＄悊涓荤绛惧瓧鍥涗欢',
- align:"center",
+ align: 'center',
+ dataIndex: 'productionHeaderSignature_dictText'
+ },
+ {
+ title: '鐢熶骇璁惧绠＄悊涓荤绛惧瓧鏃堕棿',
+ align: 'center',
dataIndex: 'productionHeaderSignatureTime'
- },
- {
- title: '鐢熶骇璁惧绠＄悊涓荤鎰忚',
- align:"center",
- dataIndex: 'productionHeaderComment'
- },
- {
+ },
+ {
title: '鐢熶骇淇濋殰閮ㄩ瀵肩瀛�',
- align:"center",
- dataIndex: 'productionSupportSignature'
- },
- {
+ align: 'center',
+ dataIndex: 'productionSupportSignature_dictText'
+ },
+ {
title: '鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�',
- align:"center",
+ align: 'center',
dataIndex: 'productionSupportSignatureTime'
- },
- {
- title: '鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�',
- align:"center",
- dataIndex: 'productionSupportComment'
- },
- {
+ },
+ {
title: 'HF缂栫爜',
- align:"center",
+ align: 'center',
dataIndex: 'hfCode'
- },
+ },
{
title: '鎿嶄綔',
dataIndex: 'action',
- align:"center",
+ align: 'center',
scopedSlots: { customRender: 'action' },
+ fixed: 'right',
+ width: 200
}
],
- url: {
- list: "/eam/eamTechnicalStatusEvaluationApplication/list",
- delete: "/eam/eamTechnicalStatusEvaluationApplication/delete",
- deleteBatch: "/eam/eamTechnicalStatusEvaluationApplication/deleteBatch",
- exportXlsUrl: "eam/eamTechnicalStatusEvaluationApplication/exportXls",
- importExcelUrl: "eam/eamTechnicalStatusEvaluationApplication/importExcel",
- },
- }
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- }
- },
+ url: {
+ list: '/eam/eamTechnicalStatusEvaluationApplication/list',
+ submit: '/eam/eamTechnicalStatusEvaluationApplication/submit',
+ abolish: '/eam/eamTechnicalStatusEvaluationApplication/abolish',
+ getProductionTreeList: '/eam/BaseFactory/queryTreeList'
+ }
+ }
+ },
+ created() {
+ this.getProductionTreeDataByApi()
+ },
methods: {
-
+ // 鑾峰彇鐢宠閮ㄩ棬鏍�
+ getProductionTreeDataByApi() {
+ getAction(this.url.getProductionTreeList)
+ .then(res => {
+ if (res.success) {
+ this.productionTreeData = res.result
+ } else {
+ this.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ },
+
+ /**
+ * 鎻愪氦鏃惰Е鍙�
+ * @param id
+ */
+ handleSubmit(id) {
+ const that = this
+ that.loading = true
+ getAction(this.url.submit, { id })
+ .then(res => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loading = false
+ }
+ })
+ },
+
+ /**
+ * 浣滃簾鏃惰Е鍙�
+ * @param id
+ */
+ handleAbolish(id) {
+ const that = this
+ that.loading = true
+ getAction(this.url.abolish, { id })
+ .then(res => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loadData()
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.loading = false
+ }
+ })
+ },
+
+ /**
+ * 鐐瑰嚮璇︽儏鏃惰Е鍙戞椂瑙﹀彂
+ * @param record
+ */
+ handleDetail(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = '璇︽儏'
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.disableSubmit = true
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleDetail(record)
+ },
+
+ /**
+ * 鐢宠鏃ユ湡鍊煎彂鐢熸敼鍙樻椂瑙﹀彂
+ * @param dateStringArray
+ */
+ handleDateRangeChange(dateStringArray) {
+ this.queryParam.dateBegin = dateStringArray[0]
+ this.queryParam.dateEnd = dateStringArray[1]
+ }
}
}
-</script>
-<style scoped>
- @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue b/src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue
index 6a92710..c8e2087 100644
--- a/src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue
+++ b/src/views/eam/technical/modules/EamTechnicalStatusEvaluationApplicationModal.vue
@@ -1,66 +1,30 @@
<template>
- <j-modal
- :title="title"
- :width="800"
- :visible="visible"
- :confirmLoading="confirmLoading"
- switchFullscreen
- @ok="handleOk"
- @cancel="handleCancel"
- cancelText="鍏抽棴">
-
+ <j-modal :title="title" :width="800" :visible="visible" :confirmLoading="confirmLoading" switchFullscreen
+ @ok="handleOk" @cancel="handleCancel" cancelText="鍏抽棴">
<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 ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model-item prop="factoryOrgCode" label="鐢宠閮ㄩ棬">
+ <a-tree-select v-model="model.factoryOrgCode" style="width: 100%" :tree-data="productionTreeData"
+ :disabled="!editable"
+ show-search :replaceFields="{key:'orgCode',value:'orgCode'}"
+ @change="()=>delete model.equipmentId"
+ treeNodeFilterProp="title" searchPlaceholder="璇疯緭鍏ュ叧閿瓧鎼滅储"
+ :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" placeholder="璇烽�夋嫨鐢宠閮ㄩ棬"
+ :allow-clear="false" tree-default-expand-all/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationOrderNum" label="鐢宠鍗曞彿">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟鍙�" v-model="model.applicationOrderNum" />
+ <a-form-model-item prop="equipmentId" label="缁熶竴缂栫爜">
+ <lx-search-equipment-select :disabled="!editable||!model.factoryOrgCode"
+ :placeholder="!model.factoryOrgCode?'璇烽�夋嫨鐢宠閮ㄩ棬':'璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�'"
+ v-model="model.equipmentId" :allow-clear="false"
+ :factoryOrgCode="model.factoryOrgCode"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicant" label="鐢宠浜�">
- <a-input placeholder="璇疯緭鍏ョ敵璇蜂汉" v-model="model.applicant" />
+ <a-form-model-item prop="evaluationDate" label="鎶�鏈姸鎬侀壌瀹氭棩鏈�">
+ <a-date-picker value-format="YYYY-MM-DD" v-model="model.evaluationDate" :allow-clear="false"
+ style="width: 100%"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="factoryOrgCode" label="鐢宠閮ㄩ棬">
- <a-input placeholder="璇疯緭鍏ョ敵璇烽儴闂�" v-model="model.factoryOrgCode" />
+ <a-form-model-item label="澶囨敞">
+ <a-textarea placeholder="璇疯緭鍏ュ娉�" v-model="model.remark"/>
</a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applyDate" label="鐢宠鏃ユ湡">
- <a-input placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" v-model="model.applyDate" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applicationStatus" label="鐢宠鍗曠姸鎬�;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟鐘舵��;寰呮彁浜ゃ�佸緟鍗曚綅瀹ょ骇棰嗗瀹℃牳銆佺敓浜ц澶囩鐞嗕富绠″鏍搞�佸緟淇濋殰閮ㄩ瀵煎鏍搞�佸凡浣滃簾銆佸凡瀹屾垚" v-model="model.applicationStatus" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignature" label="鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟浣嶅绾ч瀵肩瀛�" v-model="model.departHeaderSignature" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderSignatureTime" label="鐢宠鍗曚綅瀹ょ骇棰嗗绛惧瓧鏃堕棿">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟浣嶅绾ч瀵肩瀛楁椂闂�" v-model="model.departHeaderSignatureTime" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="departHeaderComment" label="鐢宠鍗曚綅瀹ょ骇棰嗗鎰忚">
- <a-input placeholder="璇疯緭鍏ョ敵璇峰崟浣嶅绾ч瀵兼剰瑙�" v-model="model.departHeaderComment" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderSignature" label="鐢熶骇璁惧绠＄悊涓荤绛惧瓧">
- <a-input placeholder="璇疯緭鍏ョ敓浜ц澶囩鐞嗕富绠＄瀛�" v-model="model.productionHeaderSignature" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderSignatureTime" label="鐢熶骇璁惧绠＄悊涓荤绛惧瓧鍥涗欢">
- <a-input placeholder="璇疯緭鍏ョ敓浜ц澶囩鐞嗕富绠＄瀛楀洓浠�" v-model="model.productionHeaderSignatureTime" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionHeaderComment" label="鐢熶骇璁惧绠＄悊涓荤鎰忚">
- <a-input placeholder="璇疯緭鍏ョ敓浜ц澶囩鐞嗕富绠℃剰瑙�" v-model="model.productionHeaderComment" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportSignature" label="鐢熶骇淇濋殰閮ㄩ瀵肩瀛�">
- <a-input placeholder="璇疯緭鍏ョ敓浜т繚闅滈儴棰嗗绛惧瓧" v-model="model.productionSupportSignature" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportSignatureTime" label="鐢熶骇淇濋殰閮ㄩ瀵肩瀛楁椂闂�">
- <a-input placeholder="璇疯緭鍏ョ敓浜т繚闅滈儴棰嗗绛惧瓧鏃堕棿" v-model="model.productionSupportSignatureTime" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionSupportComment" label="鐢熶骇淇濋殰閮ㄩ瀵兼剰瑙�">
- <a-input placeholder="璇疯緭鍏ョ敓浜т繚闅滈儴棰嗗鎰忚" v-model="model.productionSupportComment" />
- </a-form-model-item>
- <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="hfCode" label="HF缂栫爜">
- <a-input placeholder="璇疯緭鍏F缂栫爜" v-model="model.hfCode" />
- </a-form-model-item>
-
</a-form-model>
</a-spin>
</j-modal>
@@ -68,89 +32,103 @@
<script>
import { httpAction } from '@/api/manage'
- import moment from "moment"
+ import LxSearchEquipmentSelect from '../../equipment/modules/LxSearchEquipmentSelect'
export default {
- name: "EamTechnicalStatusEvaluationApplicationModal",
- data () {
+ name: 'EamTechnicalStatusEvaluationApplicationModal',
+ components: { LxSearchEquipmentSelect },
+ props: {
+ productionTreeData: {
+ type: Array
+ }
+ },
+ data() {
return {
- title:"鎿嶄綔",
+ title: '鎿嶄綔',
+ editable: true,
visible: false,
model: {},
labelCol: {
xs: { span: 24 },
- sm: { span: 5 },
+ sm: { span: 5 }
},
wrapperCol: {
xs: { span: 24 },
- sm: { span: 16 },
+ sm: { span: 16 }
},
confirmLoading: false,
- validatorRules:{
+ validatorRules: {
+ factoryOrgCode: [{ required: true, message: '璇烽�夋嫨鐢宠閮ㄩ棬', trigger: 'change' }],
+ equipmentId: [{ required: true, message: '璇疯緭鍏ョ粺涓�缂栫爜鎴栧悕绉版悳绱�', trigger: 'change' }],
+ evaluationDate: [{ required: true, message: '璇烽�夋嫨鎶�鏈姸鎬侀壌瀹氭棩鏈�', trigger: 'change' }]
},
url: {
- add: "/eam/eamTechnicalStatusEvaluationApplication/add",
- edit: "/eam/eamTechnicalStatusEvaluationApplication/edit",
- },
+ add: '/eam/eamTechnicalStatusEvaluationApplication/add',
+ edit: '/eam/eamTechnicalStatusEvaluationApplication/edit'
+ }
}
},
- created () {
- },
methods: {
- add () {
- //鍒濆鍖栭粯璁ゅ��
- this.edit({});
+ add() {
+ this.model = {}
+ this.editable = true
+ this.visible = true
},
- edit (record) {
- this.model = Object.assign({}, record);
- this.visible = true;
+
+ edit(record) {
+ this.model = Object.assign({}, record)
+ this.editable = false
+ this.visible = true
},
- close () {
- this.$emit('close');
- this.visible = false;
- this.$refs.form.clearValidate();
- },
- handleOk () {
- const that = this;
+
+ handleOk() {
+ const that = this
// 瑙﹀彂琛ㄥ崟楠岃瘉
- this.$refs.form.validate(valid => {
+ this.$refs.form.validate(valid => {
if (valid) {
- that.confirmLoading = true;
- let httpurl = '';
- let method = '';
- if(!this.model.id){
- httpurl+=this.url.add;
- method = 'post';
- }else{
- httpurl+=this.url.edit;
- method = 'put';
+ that.confirmLoading = true
+ let httpurl = ''
+ let method = ''
+ if (!this.model.id) {
+ httpurl += this.url.add
+ method = 'post'
+ } else {
+ httpurl += this.url.edit
+ method = 'put'
}
- httpAction(httpurl,this.model,method).then((res)=>{
- if(res.success){
- that.$message.success(res.message);
- that.$emit('ok');
- }else{
- that.$message.warning(res.message);
+ httpAction(httpurl, this.model, method).then((res) => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.close()
+ that.$emit('ok')
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
}
}).finally(() => {
- that.confirmLoading = false;
- that.close();
+ that.confirmLoading = false
})
- }else{
- return false;
+ } else {
+ return false
}
})
},
- handleCancel () {
+
+ handleCancel() {
this.close()
},
-
+ close() {
+ this.$emit('close')
+ this.visible = false
+ this.$refs.form.clearValidate()
+ }
}
}
-</script>
-
-<style lang="less" scoped>
-
-</style>
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index a3b335e..9215f12 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -110,6 +110,11 @@
<!--鎶�鏈姸鎬佸彉鏇�-->
<technical-status-change-approval-modal ref="technicalStatusChangeApprovalModal" :selectShenpiData="selectedRowData"
@modalFormOk="modalFormOk"/>
+
+ <!--鎶�鏈姸鎬侀壌瀹氱敵璇�-->
+ <technical-status-evaluation-application-approval-modal ref="technicalStatusEvaluationApplicationApprovalModal"
+ :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
</a-card>
</template>
@@ -126,11 +131,14 @@
from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal'
import TechnicalStatusChangeApprovalModal from './TechnicalStatus/TechnicalStatusChangeApprovalModal'
+ import TechnicalStatusEvaluationApplicationApprovalModal
+ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal'
export default {
name: 'FlowTodo',
mixins: [JeecgListMixin],
components: {
+ TechnicalStatusEvaluationApplicationApprovalModal,
TechnicalStatusChangeApprovalModal,
RepairOrderApprovalModal,
TechnicalStatusEvaluationOrderChangeApprovalModal,
@@ -245,6 +253,9 @@
case 'TECHNICAL_STATUS_CHANGE_PROCESS':
this.handleTechnicalStatusChange(record)
break
+ case 'TECHNICAL_STATUS_EVALUATION_APPLY_PROCESS':
+ this.handleTechnicalStatusEvaluationApply(record)
+ break
default:
alert('娌℃壘鍒拌娴佺▼')
}
@@ -335,6 +346,17 @@
this.$refs.technicalStatusChangeApprovalModal.handleApprove(record)
},
+ /**
+ * 鐐瑰嚮鎶�鏈姸鎬侀壌瀹氱敵璇峰垎绫绘祦绋嬪鎵规椂瑙﹀彂
+ * @param record
+ */
+ handleTechnicalStatusEvaluationApply(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = record.name
+ this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleApprove(record)
+ },
+
batchHandle() {
const categorySet = new Set(this.selectionRows.map(item => item.category))
const nameSet = new Set(this.selectionRows.map(item => item.name))
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
new file mode 100644
index 0000000..ad928cb
--- /dev/null
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
@@ -0,0 +1,353 @@
+<template>
+ <j-modal :title="title" :width="1300" :fullscreen="fullScreen" :visible="visible" :confirmLoading="confirmLoading"
+ :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" @ok="handleOk"
+ @cancel="handleCancel" cancelText="鍏抽棴">
+ <a-spin :spinning="spinning">
+ <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-row id="outer-row" :gutter="24">
+ <!--宸︿晶鍩虹淇℃伅鍒�-->
+ <a-col :span="!disableSubmit?8:14" class="scroll-col">
+ <a-tabs>
+ <a-tab-pane tab="鍩虹淇℃伅">
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鐢宠鍗曞彿">
+ <a-input v-model="model.applicationOrderNum" readOnly/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="缁熶竴缂栫爜">
+ <technical-status-equipment-select v-model="model.equipmentId"
+ @autocompleteForm="autocompleteForm" disabled/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row>
+
+
+ </a-row>
+
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鐢宠閮ㄩ棬">
+ <a-input v-model="model.factoryOrgCode_dictText" readOnly/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="鐢宠浜�">
+ <a-input v-model="model.applicant_dictText" readOnly/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row>
+ <a-col :span="12">
+ <a-form-model-item label="鎶�鏈姸鎬侀壌瀹氭棩鏈�">
+ <a-input v-model="model.evaluationDate" readOnly/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row>
+ <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="澶囨敞">
+ <a-textarea v-model="model.remark" readOnly/>
+ </a-form-model-item>
+ </a-row>
+ </a-tab-pane>
+ </a-tabs>
+ </a-col>
+
+ <!-- 涓棿鏄庣粏椤瑰垪-->
+ <a-col v-if="selectShenpiData.procInstId" :span="10" class="scroll-col">
+ <a-tabs>
+ <a-tab-pane key='1' tab='娴佺▼鍥�'>
+ <img :src="imageSrc" alt="Fetched Image" style="width: 100%" v-if="imageSrc"/>
+ </a-tab-pane>
+ </a-tabs>
+ </a-col>
+
+ <!--鍙充晶瀹℃壒鍒�-->
+ <a-col :span="!disableSubmit?6:10" class="scroll-col">
+ <a-tabs v-if="displayDepartHeaderFlag">
+ <a-tab-pane tab="浣跨敤鍗曚綅瀹ょ骇棰嗗纭">
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="departHeaderSignatureResult" label="纭绫诲瀷" :labelCol="rightColLabelCol"
+ :wrapperCol="rightColWrapperCol">
+ <j-dict-select-tag type='radio' v-model='model.departHeaderSignatureResult'
+ dictCode='approve_reject'
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='DEPART_HEADER_SIGNING')"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.departHeaderComment"
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='DEPART_HEADER_SIGNING')"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-tab-pane>
+ </a-tabs>
+
+ <a-tabs v-if="displayProductionHeaderFlag">
+ <a-tab-pane tab="鐢熶骇璁惧绠＄悊涓荤纭">
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="productionHeaderSignatureResult" label="纭绫诲瀷" :labelCol="rightColLabelCol"
+ :wrapperCol="rightColWrapperCol">
+ <j-dict-select-tag type='radio' v-model='model.productionHeaderSignatureResult'
+ dictCode='approve_reject'
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_HEADER_SIGNING')"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.productionHeaderComment"
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_HEADER_SIGNING')"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-tab-pane>
+ </a-tabs>
+
+ <a-tabs v-if="displayProductionSupportFlag">
+ <a-tab-pane tab="鐢熶骇淇濋殰閮ㄩ瀵肩‘璁�">
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="productionSupportSignatureResult" label="纭绫诲瀷"
+ :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
+ <j-dict-select-tag type='radio' v-model='model.productionSupportSignatureResult'
+ dictCode='approve_reject'
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_SUPPORT_SIGNING')"/>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item label="纭鎰忚" :labelCol="rightColLabelCol" :wrapperCol="rightColWrapperCol">
+ <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.productionSupportComment"
+ :disabled="disableSubmit||(model.applicationStatus&&model.applicationStatus!='PRODUCTION_SUPPORT_SIGNING')"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-tab-pane>
+ </a-tabs>
+ </a-col>
+ </a-row>
+ </a-form-model>
+ </a-spin>
+ </j-modal>
+</template>
+
+<script>
+ import { downFile, getAction, postAction } from '@/api/manage'
+ import TechnicalStatusEquipmentSelect from '../../../eam/equipment/modules/TechnicalStatusEquipmentSelect'
+
+ export default {
+ name: 'TechnicalStatusEvaluationApplicationApprovalModal',
+ components: {
+ TechnicalStatusEquipmentSelect
+ },
+ props: {
+ selectShenpiData: {
+ type: Object
+ }
+ },
+ data() {
+ return {
+ title: '鎿嶄綔',
+ visible: false,
+ model: {},
+ labelCol: {
+ xs: { span: 24 },
+ sm: { span: 10 }
+ },
+ wrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 14 }
+ },
+ labelColLong: {
+ xs: { span: 24 },
+ sm: { span: 5 }
+ },
+ wrapperColLong: {
+ xs: { span: 24 },
+ sm: { span: 19 }
+ },
+ rightColLabelCol: {
+ xs: { span: 24 },
+ sm: { span: 6 }
+ },
+ rightColWrapperCol: {
+ xs: { span: 24 },
+ sm: { span: 16 }
+ },
+ confirmLoading: false,
+ spinning: false,
+ imageSrc: null,
+ fullScreen: true,
+ validatorRules: {
+ departHeaderSignatureResult: [{ required: true, message: '璇烽�夋嫨纭绫诲瀷' }],
+ productionHeaderSignatureResult: [{ required: true, message: '璇烽�夋嫨纭绫诲瀷' }],
+ productionSupportSignatureResult: [{ required: true, message: '璇烽�夋嫨纭绫诲瀷' }]
+ },
+ url: {
+ queryById: '/eam/eamTechnicalStatusEvaluationApplication/queryById',
+ approval: '/eam/eamTechnicalStatusEvaluationApplication/approval',
+ diagramView: '/assign/flow/diagramView'
+ },
+ disableSubmit: false,
+ selectedRowKeys: []
+ }
+ },
+ computed: {
+ displayDepartHeaderFlag() {
+ return this.model.applicationStatus && ['DEPART_HEADER_SIGNING', 'PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
+ },
+ displayProductionHeaderFlag() {
+ return this.model.applicationStatus && ['PRODUCTION_HEADER_SIGNING', 'PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
+ },
+ displayProductionSupportFlag() {
+ return this.model.applicationStatus && ['PRODUCTION_SUPPORT_SIGNING', 'COMPLETED'].includes(this.model.applicationStatus)
+ }
+ },
+ methods: {
+ /**
+ * 涓婚〉闈㈢偣鍑绘墽琛屽鎵规椂瑙﹀彂
+ * @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
+ */
+ handleApprove(record) {
+ this.fullScreen = true
+ this.model = {}
+ this.getBasicInformationByApi(record)
+ this.getFlowChartImageByApi(record)
+ },
+
+ /**
+ * 涓婚〉闈㈢偣鍑昏鎯呮椂瑙﹀彂
+ * @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
+ */
+ handleDetail(record) {
+ this.fullScreen = false
+ this.model = Object.assign({}, record)
+ },
+
+ /**
+ * 鑾峰彇鍩虹淇℃伅
+ * @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
+ */
+ getBasicInformationByApi(record) {
+ this.spinning = true
+ const that = this
+ getAction(this.url.queryById, { id: record.dataId })
+ .then(res => {
+ if (res.success) {
+ that.model = Object.assign({}, res.result)
+ that.model.dataId = record.dataId
+ that.model.taskId = record.id
+ that.model.userId = record.assignee
+ that.model.instanceId = record.procInstId
+ }
+ else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ },
+
+ /**
+ * 鑾峰彇娴佺▼鍥�
+ * @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
+ */
+ getFlowChartImageByApi(record) {
+ const { processDefinitionId, processInstanceId, processDefinitionKey } = record
+ this.imageSrc = null
+ downFile(this.url.diagramView, {
+ processDefinitionId,
+ processInstanceId,
+ TaskDefinitionKey: processDefinitionKey
+ }, 'get')
+ .then((res => {
+ this.imageSrc = window.URL.createObjectURL(new Blob([res]))
+ }))
+ .catch(err => {
+ this.$notification.error({
+ message: '娑堟伅',
+ description: err.message
+ })
+ })
+ },
+
+ async handleOk() {
+ const that = this
+ // 瑙﹀彂琛ㄥ崟楠岃瘉
+ this.$refs.form.validate(valid => {
+ if (valid) {
+ that.confirmLoading = that.spinning = true
+
+ postAction(this.url.approval, this.model)
+ .then((res) => {
+ if (res.success) {
+ that.$notification.success({
+ message: '娑堟伅',
+ description: res.message
+ })
+ that.$emit('modalFormOk')
+ that.close()
+ } else {
+ that.$notification.warning({
+ message: '娑堟伅',
+ description: res.message
+ })
+ }
+ })
+ .finally(() => {
+ that.confirmLoading = that.spinning = false
+ })
+ } else {
+ return false
+ }
+ })
+ },
+
+ autocompleteForm(selectObj) {
+ this.$set(this.model, 'equipmentId', selectObj.equipmentId)
+ this.spinning = false
+ },
+
+ handleCancel() {
+ this.close()
+ },
+
+ close() {
+ this.$emit('close')
+ this.visible = false
+ this.$refs.form.clearValidate()
+ }
+ }
+ }
+</script>
+
+<style scoped lang="less">
+ /deep/ .ant-spin-nested-loading {
+ height: 100%;
+
+ .ant-spin-container {
+ height: 100%;
+
+ .ant-form {
+ height: 100%;
+
+ #outer-row {
+ height: 100%;
+
+ .scroll-col {
+ height: 100%;
+ overflow: auto;
+ }
+ }
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
index 43b9901..20a3606 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
@@ -53,9 +53,9 @@
<a-tabs :active-key="activeTabKey" @change="handleTabChange">
<a-tab-pane :key="1" tab="瀹夊叏瑁呯疆妫�鏌�" forceRender
- v-if="disableSubmit||
- selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm')||
- model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.safetyEquipmentCheckList.length>0">
+ v-if="(disableSubmit&&detail.safetyEquipmentCheckList.length>0)||
+ (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm'))||
+ (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
<j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source
:dataSource="detail.safetyEquipmentCheckList"
:columns="detail.safetyEquipmentCheckColumns">
@@ -93,9 +93,9 @@
</a-tab-pane>
<a-tab-pane :key="2" tab="璁惧绮惧害妫�鏌�" forceRender
- v-if="disableSubmit||
- selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm')||
- model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.precisionCheckList.length>0">
+ v-if="(disableSubmit&&detail.precisionCheckList.length>0)||
+ (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm'))||
+ (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
<j-vxe-table ref="editableDetailTable2" rowNumber bordered
alwaysEdit keep-source
:dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns">
@@ -132,9 +132,9 @@
</a-tab-pane>
<a-tab-pane :key="3" tab="鍏朵粬妫�鏌�" forceRender
- v-if="disableSubmit||
- selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm')||
- model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.otherCheckList.length>0">
+ v-if="(disableSubmit&&detail.otherCheckList.length>0)||
+ (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm'))||
+ (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
<j-vxe-table ref="editableDetailTable3" rowNumber bordered
alwaysEdit keep-source
:dataSource="detail.otherCheckList" :columns="detail.otherCheckColumns">
@@ -323,7 +323,7 @@
name: 'TechnicalStatusEvaluationApprovalModal',
mixins: [JVxeTableModelMixin],
components: {
- TechnicalStatusEquipmentSelect,
+ TechnicalStatusEquipmentSelect
},
props: {
selectShenpiData: {
--
Gitblit v1.9.3