| | |
| | | </a-form-item> |
| | | </a-col> |
| | | <template v-if="toggleSearchStatus"> |
| | | <a-col :xl="6" :lg="7" :md="8" :sm="24"> |
| | | <a-form-item label="é¨é¨åç»"> |
| | | <j-dict-select-tag v-model="queryParam.departId" placeholder="è¯·éæ©é¨é¨åç»" dictCode="sys_department,depart_name,depart_id"/> |
| | | <a-col :md="4" :sm="4"> |
| | | <a-form-item label="车é´åç§°"> |
| | | <!--<a-input placeholder="请è¾å
¥è½¦é´åç§°" v-model="queryParam.productionName"></a-input>--> |
| | | <a-tree-select v-model="queryParam.departId" :treeData="workshopTreeData" placeholder="è¯·éæ©è½¦é´" |
| | | :treeDefaultExpandedKeys="treeDefaultExpandedKeys"></a-tree-select> |
| | | </a-form-item> |
| | | </a-col> |
| | | <a-col :xl="6" :lg="7" :md="8" :sm="24"> |
| | |
| | | import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
| | | import JDictSelectTag from '@/components/dict/JDictSelectTag.vue' |
| | | import NcDeviceCharactersModal from './modules/NcDeviceCharacters/NcDeviceCharactersModal__Style#Drawer.vue' |
| | | import { queryProductionTreeList } from '@api/api' |
| | | |
| | | export default { |
| | | name: 'NcDeviceCharactersList', |
| | |
| | | importExcelUrl: "mdc/mdcDriveTypeParamConfig/importExcel", |
| | | }, |
| | | dictOptions:{}, |
| | | workshopTreeData: [], |
| | | treeDefaultExpandedKeys: [] |
| | | } |
| | | }, |
| | | created() { |
| | | this.getWorkshopListByApi() |
| | | }, |
| | | computed: { |
| | | importExcelUrl: function(){ |
| | |
| | | }, |
| | | methods: { |
| | | initDictConfig(){ |
| | | } |
| | | }, |
| | | /** |
| | | * è°ç¨æ¥å£è·åæ¥è¯¢åºåè½¦é´æ å表 |
| | | */ |
| | | getWorkshopListByApi() { |
| | | queryProductionTreeList().then(res => { |
| | | if (res.success) { |
| | | this.workshopTreeData = res.result |
| | | this.treeDefaultExpandedKeys = [...res.result].map(item => item.key) |
| | | } |
| | | }) |
| | | }, |
| | | } |
| | | } |
| | | </script> |
| | |
| | | </a-col> |
| | | <a-col :span="24"> |
| | | <a-form-item label="æå±è½¦é´" :labelCol="labelCol" :wrapperCol="wrapperCol"> |
| | | <!-- <j-dict-select-tag type="list" v-decorator="['departId']" :trigger-change="true" dictCode="sys_department,depart_name,depart_id" placeholder="è¯·éæ©æå±é¨é¨"/>--> |
| | | <j-select-equipment-production v-model="model.departId" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production> |
| | | </a-form-item> |
| | | </a-col> |
| | |
| | | this.edit({}); |
| | | }, |
| | | backProductionInfo(info) { |
| | | // console.log(info) |
| | | console.log(info) |
| | | this.model.productionIds = this.model.selectedProduction; |
| | | this.nextProductionOptions = info.map((item,index,arr)=>{ |
| | | let c = {label:item.text, value: item.value+""} |
| | |
| | | <a-descriptions-item label="è£
é
ç±»å">{{currentLevelDetails.assembleType}}</a-descriptions-item> |
| | | <a-descriptions-item label="ç产类å">{{currentLevelDetails.produceType}}</a-descriptions-item> |
| | | <a-descriptions-item label="å¤çç±»å ">{{currentLevelDetails.processType}}</a-descriptions-item> |
| | | <a-descriptions-item label="ç»æç±»å ">{{currentLevelDetails.structureType}}</a-descriptions-item> |
| | | <a-descriptions-item label="æè´¨">{{currentLevelDetails.structureType}}</a-descriptions-item> |
| | | <a-descriptions-item label="éé" >{{currentLevelDetails.componentWeight}}</a-descriptions-item> |
| | | <a-descriptions-item label="å建人">{{currentLevelDetails.createBy_dictText}}</a-descriptions-item> |
| | | <a-descriptions-item label="å建æ¶é´">{{currentLevelDetails.createTime}}</a-descriptions-item> |
| | |
| | | </a-form-model-item> |
| | | </a-col> |
| | | <a-col :span="12"> |
| | | <a-form-model-item label="ç»æç±»å"> |
| | | <a-input v-model="model.structureType" placeholder="请è¾å
¥ç»æç±»å"></a-input> |
| | | <a-form-model-item label="æè´¨"> |
| | | <a-input v-model="model.structureType" placeholder="请è¾å
¥æè´¨"></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | </a-row> |
| | |
| | | <a-descriptions-item label="è£
é
ç±»å">{{currentLevelDetails.assembleType}}</a-descriptions-item> |
| | | <a-descriptions-item label="ç产类å">{{currentLevelDetails.produceType}}</a-descriptions-item> |
| | | <a-descriptions-item label="å¤çç±»å ">{{currentLevelDetails.processType}}</a-descriptions-item> |
| | | <a-descriptions-item label="ç»æç±»å ">{{currentLevelDetails.structureType}}</a-descriptions-item> |
| | | <a-descriptions-item label="æè´¨">{{currentLevelDetails.structureType}}</a-descriptions-item> |
| | | <a-descriptions-item label="éé">{{currentLevelDetails.partsWeight}}</a-descriptions-item> |
| | | <a-descriptions-item label="å建人">{{currentLevelDetails.createBy_dictText}}</a-descriptions-item> |
| | | <a-descriptions-item label="å建æ¶é´">{{currentLevelDetails.createTime}}</a-descriptions-item> |
| | |
| | | </a-form-model-item> |
| | | </a-col> |
| | | <a-col :span="12"> |
| | | <a-form-model-item label="ç»æç±»å"> |
| | | <a-input v-model="model.structureType" placeholder="请è¾å
¥ç»æç±»å"></a-input> |
| | | <a-form-model-item label="æè´¨"> |
| | | <a-input v-model="model.structureType" placeholder="请è¾å
¥æè´¨"></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | </a-row> |
| | |
| | | <a-descriptions-item label="å·¥åºç±»å">{{currentLevelDetails.processType}}</a-descriptions-item> |
| | | <a-descriptions-item label="å 工设å¤åå·">{{currentLevelDetails.processingEquipmentModel}}</a-descriptions-item> |
| | | <a-descriptions-item label="å 工设å¤ç±»å">{{currentLevelDetails.processingEquipmentOs}}</a-descriptions-item> |
| | | <a-descriptions-item label="å 工设å¤ç¼å·">{{currentLevelDetails.processingEquipmentCode}}</a-descriptions-item> |
| | | <a-descriptions-item label="å·¥è£
ç¼å·">{{currentLevelDetails.assembleStep}}</a-descriptions-item> |
| | | <a-descriptions-item label="å·¥è£
åç§°">{{currentLevelDetails.assembleName}}</a-descriptions-item> |
| | | <a-descriptions-item label="å建人">{{currentLevelDetails.createBy_dictText}}</a-descriptions-item> |
| | |
| | | </a-row> |
| | | |
| | | <a-row> |
| | | <a-col :span="24"> |
| | | <a-form-model-item label="å 工设å¤ç¼å·" :labelCol="labelColLong" :wrapperCol="wrapperColLong"> |
| | | <j-dict-select-tag v-model="model.processingEquipmentCode" placeholder="è¯·éæ©å 工设å¤ç¼å·" dictCode="mdc_equipment,equipment_id,equipment_id"/> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | </a-row> |
| | | |
| | | <a-row> |
| | | <a-col :span="12"> |
| | | <a-form-model-item label="å 工设å¤åå·"> |
| | | <a-input v-model="model.processingEquipmentModel" placeholder="请è¾å
¥å 工设å¤åå·"></a-input> |
| | |
| | | <a-descriptions-item label="å·¥æ¥ç±»å">{{currentLevelDetails.stepType}}</a-descriptions-item> |
| | | <a-descriptions-item label="å 工设å¤åå·">{{currentLevelDetails.processingEquipmentModel}}</a-descriptions-item> |
| | | <a-descriptions-item label="å 工设å¤ç±»å">{{currentLevelDetails.processingEquipmentOs}}</a-descriptions-item> |
| | | <a-descriptions-item label="å 工设å¤ç¼å·">{{currentLevelDetails.deviceNo}}</a-descriptions-item> |
| | | <a-descriptions-item label="å·¥è£
ç¼å·">{{currentLevelDetails.assembleStep}}</a-descriptions-item> |
| | | <a-descriptions-item label="å·¥è£
åç§°">{{currentLevelDetails.assembleName}}</a-descriptions-item> |
| | | <a-descriptions-item label="å建人">{{currentLevelDetails.createBy_dictText}}</a-descriptions-item> |
| | |
| | | </a-row> |
| | | |
| | | <a-row> |
| | | <a-col :span="24"> |
| | | <a-form-model-item label="å 工设å¤ç¼å·" :labelCol="labelColLong" :wrapperCol="wrapperColLong"> |
| | | <j-dict-select-tag v-model="model.deviceNo" placeholder="è¯·éæ©å 工设å¤ç¼å·" dictCode="mdc_equipment,equipment_id,equipment_id"/> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | </a-row> |
| | | |
| | | <a-row> |
| | | <a-col :span="12"> |
| | | <a-form-model-item label="å 工设å¤åå·"> |
| | | <a-input v-model="model.processingEquipmentModel" placeholder="请è¾å
¥å 工设å¤åå·"></a-input> |
| | |
| | | definition.hasChildren = true |
| | | } |
| | | }); |
| | | // ææ |
| | | const param2 = Object.assign({ |
| | | isLastVersion:0 |
| | | },this.queryParams,{ |
| | | pageSize: 9999, |
| | | pageNum:1 |
| | | }) |
| | | listDefinition(param2).then(response => { |
| | | console.log(response) |
| | | this.allDefinitionList = response.result.records; |
| | | }); |
| | | // // ææ |
| | | // const param2 = Object.assign({ |
| | | // isLastVersion:0 |
| | | // },this.queryParams,{ |
| | | // pageSize: 9999, |
| | | // pageNum:1 |
| | | // }) |
| | | // listDefinition(param2).then(response => { |
| | | // console.log(response) |
| | | // this.allDefinitionList = response.result.records; |
| | | // }); |
| | | }, |
| | | /** éç½®æé®æä½ */ |
| | | resetQuery() { |
| | |
| | | <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.deviceNo"></a-input> |
| | | <a-form-item label="æµç¨åç±»"> |
| | | <j-dict-select-tag placeholder="è¯·éæ©æµç¨åç±»" v-model="queryParam.category" dictCode="flow_type"></j-dict-select-tag> |
| | | </a-form-item> |
| | | </a-col> |
| | | <template v-if="toggleSearchStatus"> |
| | | <a-col :xl="6" :lg="7" :md="8" :sm="24"> |
| | | <a-form-item label="æµç¨åç±»"> |
| | | <j-dict-select-tag v-model="queryParam.departId" placeholder="è¯·éæ©æµç¨åç±»" dictCode="sys_department,depart_name,depart_id"/> |
| | | </a-form-item> |
| | | </a-col> |
| | | <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.endTime"></j-date> |
| | | </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> |
| | | </span> |
| | | </a-col> |
| | | </a-row> |
| | |
| | | </a-table> |
| | | </div> |
| | | |
| | | <FlowNcZpi ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowNcZpi> |
| | | <FlowXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowXq> |
| | | |
| | | </a-card> |
| | | </template> |
| | |
| | | import { mixinDevice } from '@/utils/mixin' |
| | | import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
| | | import JDictSelectTag from '@/components/dict/JDictSelectTag.vue' |
| | | import FlowNcZpi from '@views/flowable/workflow/FlowNcZpi.vue' |
| | | import FlowXq from '@views/flowable/workflow/FlowXq.vue' |
| | | |
| | | export default { |
| | | name: 'NcDeviceCharactersList', |
| | | mixins:[JeecgListMixin, mixinDevice], |
| | | components: { |
| | | FlowNcZpi, |
| | | FlowXq, |
| | | JDictSelectTag, |
| | | }, |
| | | data () { |
| | |
| | | } |
| | | }, |
| | | { |
| | | title: 'æµç¨åç±»', |
| | | align: "center", |
| | | dataIndex: 'category_dictText', |
| | | width: 200, |
| | | }, |
| | | { |
| | | title: 'æµç¨åç§°', |
| | | align: "center", |
| | | dataIndex: 'procDefName', |
| | |
| | | <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="æµç¨åç±»"> |
| | | <j-dict-select-tag placeholder="è¯·éæ©æµç¨åç±»" v-model="queryParam.category" dictCode="flow_type"></j-dict-select-tag> |
| | | </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.deviceNo"></a-input> |
| | | <a-form-item label="æµç¨åç§°"> |
| | | <a-input placeholder="请è¾å
¥æµç¨åç§°" v-model="queryParam.flowName"></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.characters"></a-input> |
| | | <a-form-item label="ç®è¦æè¿°"> |
| | | <a-input placeholder="请è¾å
¥ç®è¦æè¿°" v-model="queryParam.title"></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="é¨é¨åç»"> |
| | | <j-dict-select-tag v-model="queryParam.departId" placeholder="è¯·éæ©é¨é¨åç»" dictCode="sys_department,depart_name,depart_id"/> |
| | | </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.controlSystem"></a-input> |
| | | </a-form-item> |
| | | </a-col> |
| | | <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> |
| | | <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> |
| | | </a-form-item> |
| | | </a-col> |
| | | </template> |
| | | <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> |
| | | <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> |
| | | </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="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> |
| | | </span> |
| | | </a-col> |
| | | </a-row> |
| | |
| | | </template> |
| | | |
| | | <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 @click="handleDetail(record)">详æ
</a> |
| | | </a-menu-item> |
| | | <a-menu-item> |
| | | <a-popconfirm |
| | | title="ç¡®å®å é¤å?" |
| | | @confirm="() => handleDelete(record.id)" |
| | | > |
| | | <a>å é¤</a> |
| | | </a-popconfirm> |
| | | </a-menu-item> |
| | | </a-menu> |
| | | </a-dropdown> |
| | | <a @click="handelDetial(record,text)">详æ
</a> |
| | | </span> |
| | | |
| | | </a-table> |
| | | </div> |
| | | |
| | | |
| | | <FlowXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowXq> |
| | | |
| | | </a-card> |
| | | </template> |
| | |
| | | import { mixinDevice } from '@/utils/mixin' |
| | | import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
| | | import JDictSelectTag from '@/components/dict/JDictSelectTag.vue' |
| | | import FlowXq from '@views/flowable/workflow/FlowXq.vue' |
| | | |
| | | export default { |
| | | name: 'NcDeviceCharactersList', |
| | | mixins:[JeecgListMixin, mixinDevice], |
| | | components: { |
| | | FlowXq, |
| | | JDictSelectTag, |
| | | }, |
| | | data () { |
| | |
| | | customRender:function (t,r,index) { |
| | | return parseInt(index)+1; |
| | | } |
| | | }, |
| | | { |
| | | title: 'æµç¨åç±»', |
| | | align: "center", |
| | | dataIndex: 'category_dictText', |
| | | width: 200, |
| | | }, |
| | | { |
| | | title:'æµç¨åç§°', |
| | |
| | | list: "nc/assign/flow/list", |
| | | }, |
| | | dictOptions:{}, |
| | | selectShenpiData: {}, |
| | | } |
| | | }, |
| | | created() { |
| | |
| | | }, |
| | | }, |
| | | methods: { |
| | | initDictConfig(){ |
| | | } |
| | | handelDetial(item, index) { |
| | | console.log('ç¹å»äºè¯¦æ
') |
| | | console.log('item----->', item) |
| | | console.log('index----->', index) |
| | | let approcesstype = this.splitAprocessType(item.title) |
| | | console.log('approcesstype--->', approcesstype) |
| | | switch (approcesstype) { |
| | | case 'ææ´¾NCææ¡£å°è®¾å¤æµç¨': |
| | | item.description=item.title |
| | | this.handDrDetial(item) |
| | | break |
| | | default: |
| | | alert('没æ¾å°è¯¥å®¡æ¹') |
| | | } |
| | | }, |
| | | splitAprocessType(title) { |
| | | let parts = title.split('ï¼') // 注æåå·æ¯å
¨è§å符ï¼ä½¿ç¨å¯¹åºçåè¿è¡åå² |
| | | let result = parts[0] |
| | | return result |
| | | }, |
| | | handDrDetial(item) { |
| | | this.selectShenpiData = item |
| | | this.$refs.modalFormApproval.clearTableSource() |
| | | this.$refs.modalFormApproval.getAllApproveData(item) |
| | | }, |
| | | } |
| | | } |
| | | </script> |
| | |
| | | </a-row> |
| | | <a-row> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='设å¤ç±»åç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceManagementCode'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.deviceManagementCode'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='设å¤ç±»åç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceManagementName'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.deviceManagementName'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | </a-row> |
| | | <a-row> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='ææ¡£åç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='docName'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.docName'></a-input> |
| | | </a-form-model-item> |
| | |
| | | <p>ç»ææ¶é´ï¼{{item.endTime}}</p> |
| | | <p>å¤ç人ï¼{{item.assignee}}</p> |
| | | <p>åçç±»åï¼{{item.bllx_dictText}}</p> |
| | | <p>å¤çæè§ï¼{{item.cause}}</p> |
| | | <p v-if="item.name == 'æäº¤ç³è¯·'">ææ´¾åå ï¼{{item.cause}}</p> |
| | | <p v-else >å¤çæè§ï¼{{item.cause}}</p> |
| | | <div class="left_qiu"><span>{{item.name}}</span></div> |
| | | </div> |
| | | </a-timeline-item> |
| | |
| | | console.log('flowData----->', this.flowData) |
| | | try { |
| | | let parm = { |
| | | taskId: this.flowData.id |
| | | processDefinitionId: this.flowData.processDefinitionId, |
| | | processInstanceId:this.flowData.processInstanceId, |
| | | TaskDefinitionKey:this.flowData.processDefinitionKey |
| | | } |
| | | downFile(this.url.diagramView,parm,'get').then((res=>{ |
| | | console.log('Pica------>',res) |
| | |
| | | <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="æµç¨åç±»"> |
| | | <j-dict-select-tag placeholder="è¯·éæ©æµç¨åç±»" v-model="queryParam.category" dictCode="flow_type"></j-dict-select-tag> |
| | | </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.flowName"></a-input> |
| | | </a-form-item> |
| | |
| | | } |
| | | }, |
| | | { |
| | | title: 'æµç¨åç±»', |
| | | align: "center", |
| | | dataIndex: 'category_dictText', |
| | | width: 200, |
| | | }, |
| | | { |
| | | title: 'æµç¨åç§°', |
| | | align: "center", |
| | | dataIndex: 'flowName', |
¶Ô±ÈÐÂÎļþ |
| | |
| | | <template> |
| | | <a-modal |
| | | :title="title" |
| | | :width="width" |
| | | :visible="visible" |
| | | :footer="null" |
| | | @cancel="handCancel" |
| | | > |
| | | <a-card :bordered="false"> |
| | | <div> |
| | | <b>{{ selectShenpiData.description }}</b> |
| | | <br> |
| | | <br> |
| | | <a-tag color="blue"> |
| | | å¤ç人 {{ selectShenpiData.assignee }} |
| | | </a-tag> |
| | | <a-tag color="blue"> |
| | | å建æ¶é´ {{ selectShenpiData.createTime }} |
| | | </a-tag> |
| | | <br> |
| | | <br> |
| | | <button @click="fetchAndShowBmp" class="btn-custom">æå¼æµç¨å¾</button> |
| | | <div v-if="imageSrc"> |
| | | <img :src="imageSrc" alt="Fetched Image" /> |
| | | </div> |
| | | <hr class="shallow-hr"> |
| | | </div> |
| | | <div> |
| | | <b>ææ´¾è¯¦æ
</b> |
| | | <br> |
| | | <a-form :form='form'> |
| | | <a-spin :spinning="spinning"> |
| | | <a-tabs default-active-key='1' @change='callback'> |
| | | <a-tab-pane key='1' tab='åºæ¬ä¿¡æ¯'> |
| | | <a-form-model ref='form' :model='tableRowRecord' :rules='validatorRules'> |
| | | <a-row> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='产ååç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='productName'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.productName'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='é¨ä»¶åç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='componentId'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.componentName'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | </a-row> |
| | | <a-row> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='é¶ä»¶åç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='partsName'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.partsName'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='å·¥åºåç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='processName'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.processName'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | </a-row> |
| | | <a-row> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='å·¥æ¥åç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='stepName'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.stepName'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='设å¤åç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceName'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.deviceName'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | </a-row> |
| | | <a-row> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='设å¤ç±»åç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceManagementCode'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.deviceManagementCode'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='设å¤ç±»åç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceManagementName'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.deviceManagementName'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | </a-row> |
| | | <a-row> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='ææ¡£åç§°' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='docName'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.docName'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | <a-col :span='span'> |
| | | <a-form-model-item label='ææ¡£çæ¬' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='version'> |
| | | <a-input :disabled='coldisabled' v-model='tableRowRecord.version'></a-input> |
| | | </a-form-model-item> |
| | | </a-col> |
| | | </a-row> |
| | | </a-form-model> |
| | | </a-tab-pane> |
| | | <a-tab-pane key='2' tab='æµç¨èç¹'> |
| | | <a-card> |
| | | <a-timeline style="padding:0 1% 0 12%" > |
| | | <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1"> |
| | | <div class="bottom"> |
| | | <p>å¼å§æ¶é´ï¼{{item.startTime}}</p> |
| | | <p>ç»ææ¶é´ï¼{{item.endTime}}</p> |
| | | <p>å¤ç人ï¼{{item.assignee}}</p> |
| | | <p v-if="item.name !== 'æäº¤ç³è¯·'">åçç±»åï¼{{item.status_dictText}}</p> |
| | | <p v-if="item.name === 'æäº¤ç³è¯·'">ææ´¾åå ï¼{{item.cause}}</p> |
| | | <p v-else >å¤çæè§ï¼{{item.cause}}</p> |
| | | <div class="left_qiu"><span>{{item.name}}</span></div> |
| | | </div> |
| | | </a-timeline-item> |
| | | </a-timeline> |
| | | </a-card> |
| | | </a-tab-pane> |
| | | </a-tabs> |
| | | </a-spin> |
| | | </a-form> |
| | | </div> |
| | | </a-card> |
| | | |
| | | |
| | | </a-modal> |
| | | </template> |
| | | |
| | | <script> |
| | | |
| | | import '@/assets/less/TableExpand.less' |
| | | import { mixinDevice } from '@/utils/mixin' |
| | | import { getAction, deleteAction, postAction, downFile, httpAction } from '@/api/manage' |
| | | export default { |
| | | name: 'FlowShenPi', |
| | | mixins: [mixinDevice], |
| | | props: { |
| | | selectShenpiData: { |
| | | type: Object, |
| | | required: true |
| | | } |
| | | }, |
| | | |
| | | data() { |
| | | return { |
| | | form: this.$form.createForm(this), |
| | | span: 12, |
| | | span1: 8, |
| | | coldisabled: true, |
| | | spinning: false, |
| | | tableRowRecord: {}, |
| | | assignFileStream:{}, |
| | | tableDataSource: [], |
| | | usageDataSource: [], |
| | | hitaskDataSource:[], |
| | | bomForm: {}, |
| | | approveContent:"", |
| | | imageSrc: null, |
| | | drawerVisible: true, |
| | | labelCol: { |
| | | xs: { span: 24 }, |
| | | sm: { span: 5 } |
| | | }, |
| | | wrapperCol: { |
| | | xs: { span: 30 }, |
| | | sm: { span: 16 } |
| | | }, |
| | | validatorRules: { |
| | | version: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥ææ¡£çæ¬!'}, |
| | | ] |
| | | }, |
| | | applyUser: { |
| | | rules: [ |
| | | { required: true, message: 'è¯·éæ©ç³è¯·äºº!'}, |
| | | ] |
| | | }, |
| | | approveContent: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥å®¡æ¹æè§!'}, |
| | | ] |
| | | }, |
| | | docName: { |
| | | rules: [ |
| | | { required: true, message: '请è¾å
¥ææ¡£åç§°!'}, |
| | | ] |
| | | }, |
| | | status: { |
| | | rules: [ |
| | | { required: true, message: 'è¯·éæ©å®¡æ¹ç¶æ!'}, |
| | | ] |
| | | }, |
| | | }, |
| | | approveData: {}, |
| | | flowData: {}, |
| | | title: '详æ
页é¢', |
| | | width: 1000, |
| | | visible: false, |
| | | // 表头 |
| | | url: { |
| | | queryBomDataById: '/nc/activit/selectVoById', |
| | | diagramView: '/nc/assign/flow/diagramView', |
| | | queryHisTaskList:'/nc/assign/flow/queryHisTaskList', |
| | | approve:"/nc/activit/assign/file/approve", |
| | | }, |
| | | dictOptions: {}, |
| | | superFieldList: [], |
| | | workflowSource: [] |
| | | } |
| | | }, |
| | | created() { |
| | | }, |
| | | computed: {}, |
| | | methods: { |
| | | callback() { |
| | | }, |
| | | handCancel() { |
| | | this.visible = false |
| | | }, |
| | | clearTableSource() { |
| | | this.tableDataSource = [] |
| | | this.usageDataSource = [] |
| | | }, |
| | | fetchAndShowBmp() { |
| | | console.log('flowData----->', this.flowData) |
| | | try { |
| | | let parm = { |
| | | processDefinitionId: this.flowData.processDefinitionId, |
| | | processInstanceId:this.flowData.processInstanceId, |
| | | TaskDefinitionKey:this.flowData.processDefinitionKey |
| | | } |
| | | downFile(this.url.diagramView,parm,'get').then((res=>{ |
| | | console.log('Pica------>',res) |
| | | const urlObject = window.URL.createObjectURL(new Blob([res])) |
| | | this.imageSrc = urlObject |
| | | })) |
| | | } catch (error) { |
| | | console.error('Error fetching image blob:', error) |
| | | alert('æ æ³å è½½å¾çï¼è¯·ç¨ååè¯ã') |
| | | } |
| | | }, |
| | | handleQueXiaoTask(){ |
| | | this.visible = false |
| | | this.routeReload() |
| | | }, |
| | | submitForm () { |
| | | const that = this; |
| | | if (!that.assignFileStream.status==null || that.assignFileStream.status===undefined){ |
| | | this.$message.warning('è¯·éæ©å®¡æ¹ç¶æï¼') |
| | | return false; |
| | | } |
| | | if (!that.assignFileStream.approveContent==null || that.assignFileStream.approveContent===undefined) { |
| | | this.$message.warning('请è¾å
¥å®¡æ¹æè§ï¼') |
| | | return false; |
| | | } |
| | | // 触å表åéªè¯ |
| | | this.form.validateFields((err, values) => { |
| | | if (!err) { |
| | | that.confirmLoading = true; |
| | | let url=this.url.approve |
| | | let method = 'post'; |
| | | let flowTaskVo = {} |
| | | flowTaskVo.status=that.assignFileStream.status; |
| | | flowTaskVo.approveContent =that.assignFileStream.approveContent; |
| | | flowTaskVo.comment =that.assignFileStream.approveContent; |
| | | flowTaskVo.secretLevel = that.assignFileStream.secretLevel; |
| | | flowTaskVo.dataId = this.selectShenpiData.dataId |
| | | flowTaskVo.taskId = this.selectShenpiData.id |
| | | flowTaskVo.userId = this.selectShenpiData.assignee |
| | | flowTaskVo.instanceId = this.selectShenpiData.procInstId |
| | | flowTaskVo.targetKey = this.selectShenpiData.taskDefKey |
| | | flowTaskVo.values = this.selectShenpiData.variables |
| | | flowTaskVo.assignee = this.selectShenpiData.assignee |
| | | flowTaskVo.secretLevel = that.assignFileStream.secretLevel; |
| | | console.log("表åæäº¤æ°æ®",flowTaskVo) |
| | | httpAction(url,flowTaskVo,method).then((res)=>{ |
| | | if(res.success){ |
| | | that.$message.success(res.message); |
| | | that.$emit('ok'); |
| | | }else{ |
| | | that.$message.warning(res.message); |
| | | } |
| | | }).finally(() => { |
| | | that.confirmLoading = false; |
| | | }) |
| | | } |
| | | |
| | | }) |
| | | }, |
| | | getAllApproveData(item) { |
| | | console.log('selectShenpiData----->', this.selectShenpiData) |
| | | this.flowData = item |
| | | let param = { |
| | | 'id': item.dataId |
| | | } |
| | | let parmhis={ |
| | | 'drapprovedataId': item.dataId |
| | | } |
| | | getAction(this.url.queryHisTaskList,parmhis).then(res=>{ |
| | | this.hitaskDataSource=res.result |
| | | getAction(this.url.queryBomDataById, param).then((res => { |
| | | if (res.success) { |
| | | this.tableRowRecord = res.result |
| | | console.log('this.tableRowRecord----->', this.tableRowRecord) |
| | | } |
| | | })) |
| | | }).finally( |
| | | this.visible = true, |
| | | console.log('this.approveData---->', this.approveData) |
| | | ) |
| | | } |
| | | } |
| | | } |
| | | </script> |
| | | <style scoped> |
| | | .shallow-hr { |
| | | border: 0; |
| | | height: 1px; /* åç线çé«åº¦ */ |
| | | background-color: rgba(0, 0, 0, 0.1); /* ä½¿ç¨ RGBA é¢è²ï¼å¹¶è®¾ç½®è¾ä½çéæåº¦ */ |
| | | margin: 20px 0; /* åç线ä¸ä¸çå¤è¾¹è· */ |
| | | } |
| | | .btn-custom { |
| | | background-color: #4CAF50; /* 绿è²èæ¯ */ |
| | | color: white; /* ç½è²æå */ |
| | | border: none; /* æ è¾¹æ¡ */ |
| | | padding: 5px 15px; /* å
è¾¹è· */ |
| | | text-align: center; /* æåå±
ä¸ */ |
| | | text-decoration: none; /* æ ä¸å线 */ |
| | | display: inline-block; /* è¡å
åå
ç´ */ |
| | | font-size: 12px; /* åä½å¤§å° */ |
| | | margin: 4px 2px; /* å¤è¾¹è· */ |
| | | cursor: pointer; /* é¼ æ æ¬åæ¶æ¾ç¤ºæå */ |
| | | border-radius: 4px; /* åè§è¾¹æ¡ */ |
| | | } |
| | | |
| | | .bold-large-label { |
| | | font-weight: bold; |
| | | font-size: 20px; /* æä½ éè¦çä»»ä½å¤§å° */ |
| | | } |
| | | .left_qiu{ |
| | | position: absolute; |
| | | left: -74px; |
| | | top: 0; |
| | | width:54px; |
| | | border-radius: 50%; |
| | | height:54px; |
| | | font-size: 13px; |
| | | margin: auto; |
| | | display: flex; |
| | | flex-wrap: wrap; |
| | | align-items: center; |
| | | justify-content: center; |
| | | background: #0099ff; |
| | | transform: translate(0, 0); |
| | | } |
| | | /deep/ .ant-timeline-item-tail{ |
| | | left: -29px !important; |
| | | } |
| | | .left_qiu span{ |
| | | width: 3em; |
| | | display: block; |
| | | color: #fff; |
| | | text-align: center; |
| | | } |
| | | .img{ |
| | | width: 75%; |
| | | } |
| | | |
| | | .wrap{ |
| | | clear: both; |
| | | width: 100%; |
| | | display: flex; |
| | | height: 50px; |
| | | border: 1px solid #ccc; |
| | | /* background-color: aqua; */ |
| | | } |
| | | .box{ |
| | | width:21%; |
| | | height:50px; |
| | | border-right: 1px solid #ccc; |
| | | line-height: 50px; |
| | | /* background: red; */ |
| | | text-align:center; |
| | | margin: auto; |
| | | } |
| | | |
| | | @import '~@assets/less/common.less'; |
| | | </style> |