From 15e22fc7a5b6ee006ff88e0eb0d1bd36f14d683f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 01 四月 2025 15:21:28 +0800
Subject: [PATCH] 修改审签工作流
---
src/views/dnc/common/DocumentBatchDeleteModal.vue | 12
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue | 12
src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue | 17
src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue | 12
src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue | 221 ++++++++---------
src/views/dnc/base/modules/DeviceStructure/Document/HasSentDocumentTableList.vue | 12
src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue | 12
src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue | 4
/dev/null | 142 -----------
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue | 12
src/views/flowable/workflow/FlowLedger.vue | 47 ++-
src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue | 15
src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue | 105 +++-----
src/views/flowable/workflow/FlowCompleted.vue | 28 +
src/views/flowable/workflow/FlowTodo.vue | 37 ++
src/views/dnc/common/DocumentInfo.vue | 2
16 files changed, 292 insertions(+), 398 deletions(-)
diff --git a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
index e643836..0594357 100644
--- a/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/Document/HasReceivedDocumentTableList.vue
@@ -64,13 +64,15 @@
},
{
title: '鐘� 鎬�',
- dataIndex: 'docStatus_dictText',
- key: 'docStatus',
+ dataIndex: 'docDispatchStatus_dictText',
+ key: 'docDispatchStatus',
align: 'center',
filters: [
- { text: '璁捐', value: 1 },
- { text: '鍙戝竷', value: 2 },
- { text: '褰掓。', value: 3 }
+ { text: '缂栧埗', value: 1 },
+ { text: '鏍″', value: 2 },
+ { text: '鎵瑰噯', value: 3 },
+ { text: '璇曞垏', value: 4 },
+ { text: '瀹氬瀷', value: 5 }
]
},
{ title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center' },
diff --git a/src/views/dnc/base/modules/DeviceStructure/Document/HasSentDocumentTableList.vue b/src/views/dnc/base/modules/DeviceStructure/Document/HasSentDocumentTableList.vue
index c1d74bd..6740776 100644
--- a/src/views/dnc/base/modules/DeviceStructure/Document/HasSentDocumentTableList.vue
+++ b/src/views/dnc/base/modules/DeviceStructure/Document/HasSentDocumentTableList.vue
@@ -64,13 +64,15 @@
},
{
title: '鐘� 鎬�',
- dataIndex: 'docStatus_dictText',
- key: 'docStatus',
+ dataIndex: 'docDispatchStatus_dictText',
+ key: 'docDispatchStatus',
align: 'center',
filters: [
- { text: '璁捐', value: 1 },
- { text: '鍙戝竷', value: 2 },
- { text: '褰掓。', value: 3 }
+ { text: '缂栧埗', value: 1 },
+ { text: '鏍″', value: 2 },
+ { text: '鎵瑰噯', value: 3 },
+ { text: '璇曞垏', value: 4 },
+ { text: '瀹氬瀷', value: 5 }
]
},
{ title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center' },
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue
index b21399a..84303fb 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentAssignModal.vue
@@ -137,13 +137,15 @@
},
{
title: '鐘� 鎬�',
- dataIndex: 'docStatus_dictText',
- key: 'docStatus',
+ dataIndex: 'docDispatchStatus_dictText',
+ key: 'docDispatchStatus',
align: 'center',
filters: [
- { text: '璁捐', value: 1 },
- { text: '鍙戝竷', value: 2 },
- { text: '褰掓。', value: 3 }
+ { text: '缂栧埗', value: 1 },
+ { text: '鏍″', value: 2 },
+ { text: '鎵瑰噯', value: 3 },
+ { text: '璇曞垏', value: 4 },
+ { text: '瀹氬瀷', value: 5 }
]
},
{
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
index af502ae..d79b070 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
@@ -65,13 +65,15 @@
},
{
title: '鐘� 鎬�',
- dataIndex: 'docStatus_dictText',
- key: 'docStatus',
+ dataIndex: 'docDispatchStatus_dictText',
+ key: 'docDispatchStatus',
align: 'center',
filters: [
- { text: '璁捐', value: 1 },
- { text: '鍙戝竷', value: 2 },
- { text: '褰掓。', value: 3 }
+ { text: '缂栧埗', value: 1 },
+ { text: '鏍″', value: 2 },
+ { text: '鎵瑰噯', value: 3 },
+ { text: '璇曞垏', value: 4 },
+ { text: '瀹氬瀷', value: 5 }
]
},
{ title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center', width: 200 },
diff --git a/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue b/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue
index 2e12839..841e1ed 100644
--- a/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Document/OtherDocumentTableList.vue
@@ -61,13 +61,15 @@
},
{
title: '鐘� 鎬�',
- dataIndex: 'docStatus_dictText',
- key: 'docStatus',
+ dataIndex: 'docDispatchStatus_dictText',
+ key: 'docDispatchStatus',
align: 'center',
filters: [
- { text: '璁捐', value: 1 },
- { text: '鍙戝竷', value: 2 },
- { text: '褰掓。', value: 3 }
+ { text: '缂栧埗', value: 1 },
+ { text: '鏍″', value: 2 },
+ { text: '鎵瑰噯', value: 3 },
+ { text: '璇曞垏', value: 4 },
+ { text: '瀹氬瀷', value: 5 }
]
},
{ title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center', width: 200 },
diff --git a/src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue b/src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue
index 57e4e6c..6717549 100644
--- a/src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue
+++ b/src/views/dnc/base/modules/ProductStructure/Process/ProcessModalForm.vue
@@ -34,8 +34,8 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="宸ヨ壓瑙勭▼鐗堟湰">
- <a-input v-model="model.craftVersion" placeholder="璇疯緭鍏ュ伐鑹鸿绋嬬増鏈�"></a-input>
+ <a-form-model-item label="宸ュ簭瑙勭▼鐗堟湰">
+ <a-input v-model="model.craftVersion" placeholder="璇疯緭鍏ュ伐搴忚绋嬬増鏈�"></a-input>
</a-form-model-item>
</a-col>
</a-row>
diff --git a/src/views/dnc/common/DocumentBatchDeleteModal.vue b/src/views/dnc/common/DocumentBatchDeleteModal.vue
index ec1c412..05dc60f 100644
--- a/src/views/dnc/common/DocumentBatchDeleteModal.vue
+++ b/src/views/dnc/common/DocumentBatchDeleteModal.vue
@@ -87,13 +87,15 @@
},
{
title: '鐘� 鎬�',
- dataIndex: 'docStatus_dictText',
- key: 'docStatus',
+ dataIndex: 'docDispatchStatus_dictText',
+ key: 'docDispatchStatus',
align: 'center',
filters: [
- { text: '璁捐', value: 1 },
- { text: '鍙戝竷', value: 2 },
- { text: '褰掓。', value: 3 }
+ { text: '缂栧埗', value: 1 },
+ { text: '鏍″', value: 2 },
+ { text: '鎵瑰噯', value: 3 },
+ { text: '璇曞垏', value: 4 },
+ { text: '瀹氬瀷', value: 5 }
]
},
{ title: '绯荤粺鎸囧畾鐗堟湰', dataIndex: 'publishVersion', align: 'center', width: 200 },
diff --git a/src/views/dnc/common/DocumentInfo.vue b/src/views/dnc/common/DocumentInfo.vue
index f5708c5..a33165c 100644
--- a/src/views/dnc/common/DocumentInfo.vue
+++ b/src/views/dnc/common/DocumentInfo.vue
@@ -4,7 +4,7 @@
<a-descriptions-item label="浠ｇ爜鐗堟湰">{{currentLevelDetails.docAlias}}</a-descriptions-item>
<a-descriptions-item label="璁惧缂栧彿">{{currentLevelDetails.docCode}}</a-descriptions-item>
<a-descriptions-item label="鏂囨。鍚庣紑">{{currentLevelDetails.docSuffix}}</a-descriptions-item>
- <a-descriptions-item label="鏂囨。鐘舵��">{{currentLevelDetails.docStatus_dictText}}</a-descriptions-item>
+ <a-descriptions-item label="鏂囨。鐘舵��">{{currentLevelDetails.docDispatchStatus_dictText}}</a-descriptions-item>
<a-descriptions-item label="绯荤粺鎸囧畾鐗堟湰">{{currentLevelDetails.publishVersion}}</a-descriptions-item>
<a-descriptions-item label="鍑哄簱鐘舵��">{{currentLevelDetails.pullStatus_dictText}}</a-descriptions-item>
<a-descriptions-item label="鍑哄簱浜�">{{currentLevelDetails.pullUser_dictText}}</a-descriptions-item>
diff --git a/src/views/flowable/test_demo/TestDemoList.vue b/src/views/flowable/test_demo/TestDemoList.vue
deleted file mode 100644
index a53ace4..0000000
--- a/src/views/flowable/test_demo/TestDemoList.vue
+++ /dev/null
@@ -1,311 +0,0 @@
-<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.name"></a-input>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鎬у埆">
- <j-dict-select-tag placeholder="璇烽�夋嫨鎬у埆" v-model="queryParam.sex" dictCode="sex"/>
- </a-form-item>
- </a-col>
- <template v-if="toggleSearchStatus">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鐢熸棩">
- <j-date placeholder="璇烽�夋嫨鐢熸棩" v-model="queryParam.birthday"></j-date>
- </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.userCode"></a-input>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鍩庡競">
- <j-area-linkage type="cascader" v-model="queryParam.chegnshi" placeholder="璇烽�夋嫨鐪佸競鍖�"/>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="checkbox">
- <j-dict-select-tag placeholder="璇烽�夋嫨checkbox" v-model="queryParam.ceck" dictCode="sex"/>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="涓嬫媺澶氶��">
- <j-multi-select-tag placeholder="璇烽�夋嫨涓嬫媺澶氶��" dictCode="sex" v-model="queryParam.xiamuti"/>
- </a-form-item>
- </a-col>
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鎼滅储涓嬫媺">
- <j-search-select-tag placeholder="璇烽�夋嫨鎼滅储涓嬫媺" v-model="queryParam.searchSel" dict="sys_role,role_name,role_code"/>
- </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-form>
- </div>
- <!-- 鏌ヨ鍖哄煙-END -->
-
- <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
- <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>
- <!-- 楂樼骇鏌ヨ鍖哄煙 -->
- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
- <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"
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
- class="j-table-force-nowrap"
- @change="handleTableChange">
-
- <template slot="htmlSlot" slot-scope="text">
- <div v-html="text"></div>
- </template>
- <template slot="imgSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犲浘鐗�</span>
- <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
- </template>
- <template slot="pcaSlot" slot-scope="text">
- <div>{{ getPcaText(text) }}</div>
- </template>
- <template slot="fileSlot" slot-scope="text">
- <span v-if="!text" style="font-size: 12px;font-style: italic;">鏃犳枃浠�</span>
- <a-button
- v-else
- :ghost="true"
- type="primary"
- icon="download"
- size="small"
- @click="downloadFile(text)">
- 涓嬭浇
- </a-button>
- </template>
-
- <span slot="action" slot-scope="text, record">
- <a @click="handleEdit(record)">缂栬緫</a>
- <a-divider type="vertical" ></a-divider>
- <a @click="relationAct(record)">鍏宠仈娴佺▼</a>
- <act-apply-btn @success="loadData" :data-id="record.id"
- :variables="{ assigneeList:[]}"></act-apply-btn>
- {{isCanApply(record)}}
- <act-handle-btn @success="loadData" :data-id="record.id" :type="3" text="閲嶆柊鎻愪氦"></act-handle-btn>
- {{isCanReApply(record)}}
- <act-handle-btn @success="loadData" :data-id="record.id" :type="0" text="閫氳繃"
- :candidate-users="[{username:'admin',realname:'绠＄悊鍛�'},{username:'jeecg',realname:'jeecg璐﹀彿'}]"
- ></act-handle-btn>
- {{isCanPass(record)}}
- <act-handle-btn @success="loadData" :data-id="record.id" :type="1" text="椹冲洖"></act-handle-btn>
- {{isCanBacke(record)}}
- <act-handle-btn @success="loadData" :data-id="record.id" :type="2" text="閫�鍥�"
- @targetKeyChange="targetKeyChange"
- :candidate-users="[{username:'admin',realname:'绠＄悊鍛�'},{username:'jeecg',realname:'jeecg璐﹀彿'}]"
- ></act-handle-btn>
- {{isCanBacke(record)}}
- <act-cancel-btn @success="loadData" :data-id="record.id"></act-cancel-btn>
- {{isCanRecall(record)}}
- <act-historic-detail-btn :data-id="record.id"></act-historic-detail-btn>
- {{isCanHistoric(record)}}
- <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>
- </span>
-
- </a-table>
- </div>
-
- <test-demo-modal ref="modalForm" @ok="modalFormOk"></test-demo-modal>
- </a-card>
-</template>
-
-<script>
-
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import TestDemoModal from './modules/TestDemoModal'
- import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
- import Area from '@/components/_util/Area'
- import {getAction} from "@api/manage";
- import ActApplyBtn from "@views/flowable/components/ActApplyBtn";
- import ActCancelBtn from "@views/flowable/components/ActCancelBtn";
- import ActHandleBtn from "@views/flowable/components/ActHandleBtn";
- import ActHistoricDetailBtn from "@views/flowable/components/ActHistoricDetailBtn";
- import {FlowableMixin} from "@views/flowable/mixin/FlowableMixin";
-
- export default {
- name: 'TestDemoList',
- mixins:[JeecgListMixin, mixinDevice,FlowableMixin],
- components: {
- TestDemoModal,
- ActApplyBtn,
- ActCancelBtn,
- ActHandleBtn,
- ActHistoricDetailBtn
- },
- data () {
- return {
- description: '娴嬭瘯鐢ㄦ埛琛ㄧ鐞嗛〉闈�',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title:'鐢ㄦ埛鍚�',
- align:"center",
- sorter: true,
- dataIndex: 'name'
- },
- {
- title:'鎬у埆',
- align:"center",
- sorter: true,
- dataIndex: 'sex_dictText'
- },
- {
- title:'骞撮緞',
- align:"center",
- dataIndex: 'age'
- },
- {
- title:'娴佺▼鐘舵��',
- align:"center",
- dataIndex: 'actStatus'
- },
- {
- title:'寰呭鐞嗚妭鐐�',
- align:"center",
- dataIndex: 'taskName'
- },
- {
- title: '鎿嶄綔',
- dataIndex: 'action',
- align:"center",
- scopedSlots: { customRender: 'action' }
- }
- ],
- url: {
- list: "/test_demo/testDemo/list",
- delete: "/test_demo/testDemo/delete",
- deleteBatch: "/test_demo/testDemo/deleteBatch",
- exportXlsUrl: "/test_demo/testDemo/exportXls",
- importExcelUrl: "test_demo/testDemo/importExcel",
-
- },
- dictOptions:{},
- pcaData:'',
- superFieldList:[],
- }
- },
- created() {
- this.pcaData = new Area()
- this.getSuperFieldList();
- },
- computed: {
- importExcelUrl: function(){
- return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
- },
- },
- methods: {
- getPcaText(code){
- return this.pcaData.getText(code);
- },
- initDictConfig(){
- },
- getSuperFieldList(){
- let fieldList=[];
- fieldList.push({type:'string',value:'id',text:'涓婚敭',dictCode:''})
- fieldList.push({type:'string',value:'name',text:'鐢ㄦ埛鍚�',dictCode:''})
- fieldList.push({type:'string',value:'sex',text:'鎬у埆',dictCode:'sex'})
- fieldList.push({type:'int',value:'age',text:'骞撮緞',dictCode:''})
- fieldList.push({type:'string',value:'descc',text:'鎻忚堪',dictCode:''})
- fieldList.push({type:'date',value:'birthday',text:'鐢熸棩'})
- fieldList.push({type:'string',value:'userCode',text:'鐢ㄦ埛缂栫爜',dictCode:''})
- fieldList.push({type:'string',value:'topPic',text:'澶村儚',dictCode:''})
- fieldList.push({type:'string',value:'fileKk',text:'闄勪欢',dictCode:''})
- fieldList.push({type:'pca',value:'chegnshi',text:'鍩庡競'})
- fieldList.push({type:'string',value:'pop',text:'寮圭獥',dictCode:''})
- fieldList.push({type:'string',value:'ceck',text:'checkbox',dictCode:'sex'})
- fieldList.push({type:'list_multi',value:'xiamuti',text:'涓嬫媺澶氶��',dictTable:'', dictText:'', dictCode:'sex'})
- fieldList.push({type:'sel_search',value:'searchSel',text:'鎼滅储涓嬫媺',dictTable:'sys_role', dictText:'role_name', dictCode:'role_code'})
- fieldList.push({type:'sel_search',value:'selTable',text:'涓嬫媺瀛楀吀琛�',dictTable:'sys_user', dictText:'realname', dictCode:'username'})
- this.superFieldList = fieldList
- },
- relationAct(r) {
- getAction("/test_demo/testDemo/relationAct",{dataId:r.id}).then(res=>{
- if (res.success){
- this.$message.success("鎿嶄綔鎴愬姛")
- this.loadData()
- } else {
- this.$message.error("鎿嶄綔澶辫触")
- }
- })
- },
- targetKeyChange(targetKey) {
- // todo
- console.log('targetKey鏀瑰彉锛屾敼鍙� :candidate-users 鍊欓�変汉',targetKey)
- }
- }
- }
-</script>
-<style scoped>
- @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/src/views/flowable/test_demo/modules/TestDemoForm.vue b/src/views/flowable/test_demo/modules/TestDemoForm.vue
deleted file mode 100644
index b7dde82..0000000
--- a/src/views/flowable/test_demo/modules/TestDemoForm.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
- <a-spin :spinning="confirmLoading">
- <j-form-container :disabled="formDisabled">
- <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鐢ㄦ埛鍚�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
- <a-input v-model="model.name" placeholder="璇疯緭鍏ョ敤鎴峰悕" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鎬у埆" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="sex">
- <j-dict-select-tag type="list" v-model="model.sex" dictCode="sex" placeholder="璇烽�夋嫨鎬у埆" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="骞撮緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="age">
- <a-input-number v-model="model.age" placeholder="璇疯緭鍏ュ勾榫�" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鎻忚堪" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="descc">
- <j-editor v-model="model.descc" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鐢熸棩" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="birthday">
- <j-date placeholder="璇烽�夋嫨鐢熸棩" v-model="model.birthday" style="width: 100%" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鐢ㄦ埛缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="userCode">
- <a-input v-model="model.userCode" placeholder="璇疯緭鍏ョ敤鎴风紪鐮�" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="澶村儚" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="topPic">
- <j-image-upload isMultiple v-model="model.topPic" ></j-image-upload>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="闄勪欢" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fileKk">
- <j-upload v-model="model.fileKk" ></j-upload>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍩庡競" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chegnshi">
- <j-area-linkage type="cascader" v-model="model.chegnshi" placeholder="璇疯緭鍏ョ渷甯傚尯" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="寮圭獥" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pop">
- <a-input v-model="model.pop" placeholder="璇疯緭鍏ュ脊绐�" ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="checkbox" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ceck">
- <j-multi-select-tag type="checkbox" v-model="model.ceck" dictCode="sex" placeholder="璇烽�夋嫨checkbox" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="涓嬫媺澶氶��" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="xiamuti">
- <j-multi-select-tag type="list_multi" v-model="model.xiamuti" dictCode="sex" placeholder="璇烽�夋嫨涓嬫媺澶氶��" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鎼滅储涓嬫媺" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="searchSel">
- <j-search-select-tag v-model="model.searchSel" dict="sys_role,role_name,role_code" />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="涓嬫媺瀛楀吀琛�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="selTable">
- <j-search-select-tag v-model="model.selTable" dict="sys_user,realname,username" />
- </a-form-model-item>
- </a-col>
- </a-row>
- </a-form-model>
- </j-form-container>
- </a-spin>
-</template>
-
-<script>
-
- import { httpAction, getAction } from '@/api/manage'
- import { validateDuplicateValue } from '@/utils/util'
-
- export default {
- name: 'TestDemoForm',
- components: {
- },
- props: {
- //琛ㄥ崟绂佺敤
- disabled: {
- type: Boolean,
- default: false,
- required: false
- }
- },
- data () {
- return {
- model:{
- },
- labelCol: {
- xs: { span: 24 },
- sm: { span: 5 },
- },
- wrapperCol: {
- xs: { span: 24 },
- sm: { span: 16 },
- },
- confirmLoading: false,
- validatorRules: {
- name: [
- { required: true, message: '璇疯緭鍏ョ敤鎴峰悕!'},
- ],
- },
- url: {
- add: "/test_demo/testDemo/add",
- edit: "/test_demo/testDemo/edit",
- queryById: "/test_demo/testDemo/queryById"
- }
- }
- },
- computed: {
- formDisabled(){
- return this.disabled
- },
- },
- created () {
- //澶囦唤model鍘熷鍊�
- this.modelDefault = JSON.parse(JSON.stringify(this.model));
- },
- methods: {
- add () {
- this.edit(this.modelDefault);
- },
- edit (record) {
- this.model = Object.assign({}, record);
- this.visible = true;
- },
- submitForm () {
- const that = this;
- // 瑙﹀彂琛ㄥ崟楠岃瘉
- 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';
- }
- httpAction(httpurl,this.model,method).then((res)=>{
- if(res.success){
- that.$message.success(res.message);
- that.$emit('ok');
- }else{
- that.$message.warning(res.message);
- }
- }).finally(() => {
- that.confirmLoading = false;
- })
- }
-
- })
- },
- }
- }
-</script>
\ No newline at end of file
diff --git a/src/views/flowable/test_demo/modules/TestDemoModal.vue b/src/views/flowable/test_demo/modules/TestDemoModal.vue
deleted file mode 100644
index 9fd874f..0000000
--- a/src/views/flowable/test_demo/modules/TestDemoModal.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<template>
- <j-modal
- :title="title"
- :width="width"
- :visible="visible"
- switchFullscreen
- @ok="handleOk"
- :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
- @cancel="handleCancel"
- cancelText="鍏抽棴">
- <test-demo-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></test-demo-form>
- </j-modal>
-</template>
-
-<script>
-
- import TestDemoForm from './TestDemoForm'
- export default {
- name: 'TestDemoModal',
- components: {
- TestDemoForm
- },
- data () {
- return {
- title:'',
- width:896,
- visible: false,
- disableSubmit: false
- }
- },
- methods: {
- add () {
- this.visible=true
- this.$nextTick(()=>{
- this.$refs.realForm.add();
- })
- },
- edit (record) {
- this.visible=true
- this.$nextTick(()=>{
- this.$refs.realForm.edit(record);
- })
- },
- close () {
- this.$emit('close');
- this.visible = false;
- },
- handleOk () {
- this.$refs.realForm.submitForm();
- },
- submitCallback(){
- this.$emit('ok');
- this.visible = false;
- },
- handleCancel () {
- this.close()
- }
- }
- }
-</script>
\ No newline at end of file
diff --git a/src/views/flowable/workflow/FlowCompleted.vue b/src/views/flowable/workflow/FlowCompleted.vue
index e83eee4..eecaeb1 100644
--- a/src/views/flowable/workflow/FlowCompleted.vue
+++ b/src/views/flowable/workflow/FlowCompleted.vue
@@ -75,7 +75,9 @@
</a-table>
</div>
- <FlowXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowXq>
+ <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
+
+ <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>
</a-card>
</template>
@@ -86,13 +88,15 @@
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'
+import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue'
+import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue'
export default {
name: 'NcDeviceCharactersList',
mixins:[JeecgListMixin, mixinDevice],
components: {
- FlowXq,
+ DispatchFileXq,
+ AssignFileStreamXq: AssignFileStreamXq,
JDictSelectTag,
},
data () {
@@ -156,10 +160,11 @@
}
],
url: {
- list: "/nc/assign/flow/finishedList",
+ list: "/assign/flow/finishedList",
},
dictOptions:{},
selectShenpiData: {},
+ selectDispatchFileXqData:{}
}
},
created() {
@@ -174,11 +179,14 @@
console.log('鐐瑰嚮浜嗚鎯�')
console.log('item----->', item)
console.log('index----->', index)
- let approcesstype = this.splitAprocessType(item.description)
+ let approcesstype = this.splitAprocessType(item.category_dictText)
console.log('approcesstype--->', approcesstype)
switch (approcesstype) {
case '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�':
this.handDrDetial(item)
+ break
+ case 'NC绋嬪簭绛炬淳':
+ this.handDispatchFileDetial(item)
break
default:
alert('娌℃壘鍒拌瀹℃壒')
@@ -194,6 +202,16 @@
this.$refs.modalFormApproval.clearTableSource()
this.$refs.modalFormApproval.getAllApproveData(item)
},
+ handDispatchFileDetial(item){
+ console.log('item----->', item)
+ this.selectDispatchFileXqData = item
+ this.selectDispatchFileXqData.assignee_dictText=item.todoUsers_dictText
+ this.selectDispatchFileXqData.procInstId=item.procInsId
+ this.selectDispatchFileXqData.processInstanceId=item.procInsId
+ this.selectDispatchFileXqData.title=item.description
+ this.$refs.modalFormDispatchFileXq.clearTableSource()
+ this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ }
}
}
</script>
diff --git a/src/views/flowable/workflow/FlowLedger.vue b/src/views/flowable/workflow/FlowLedger.vue
index f483a9a..2974c83 100644
--- a/src/views/flowable/workflow/FlowLedger.vue
+++ b/src/views/flowable/workflow/FlowLedger.vue
@@ -87,8 +87,9 @@
</a-table>
</div>
- <FlowXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowXq>
+ <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
+ <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>
</a-card>
</template>
@@ -98,13 +99,15 @@
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'
+import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue'
+import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue'
export default {
name: 'NcDeviceCharactersList',
mixins:[JeecgListMixin, mixinDevice],
components: {
- FlowXq,
+ DispatchFileXq,
+ AssignFileStreamXq: AssignFileStreamXq,
JDictSelectTag,
},
data () {
@@ -116,7 +119,6 @@
title: '搴忓彿',
dataIndex: '',
key:'rowIndex',
- width:200,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
@@ -144,17 +146,12 @@
dataIndex: 'proposer_dictText'
},
{
- title:'娴佺▼鐘舵�佽鏄�',
- align:"center",
- dataIndex: 'actStatus'
+ title: '鍓嶉┍鑺傜偣',
+ align: "center",
+ dataIndex: 'preNode',
},
{
- title:'褰撳墠鐨勪换鍔d',
- align:"center",
- dataIndex: 'taskId'
- },
- {
- title:'褰撳墠鐨勮妭鐐�',
+ title:'褰撳墠鑺傜偣',
align:"center",
dataIndex: 'taskName'
},
@@ -169,7 +166,12 @@
dataIndex: 'endTime'
},
{
- title:'浠诲姟浜�',
+ title:'澶勭悊鏃堕暱',
+ align:"center",
+ dataIndex: 'duration'
+ },
+ {
+ title:'褰撳墠浠诲姟浜�',
align:"center",
dataIndex: 'todoUsers_dictText'
},
@@ -188,10 +190,11 @@
}
],
url: {
- list: "nc/assign/flow/list",
+ list: "/assign/flow/list",
},
dictOptions:{},
selectShenpiData: {},
+ selectDispatchFileXqData:{}
}
},
created() {
@@ -206,12 +209,16 @@
console.log('鐐瑰嚮浜嗚鎯�')
console.log('item----->', item)
console.log('index----->', index)
- let approcesstype = this.splitAprocessType(item.title)
+ let approcesstype = this.splitAprocessType(item.category_dictText)
console.log('approcesstype--->', approcesstype)
switch (approcesstype) {
case '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�':
item.description=item.title
this.handDrDetial(item)
+ break
+ case 'NC绋嬪簭绛炬淳':
+ item.description=item.title
+ this.handDispatchFileDetial(item)
break
default:
alert('娌℃壘鍒拌瀹℃壒')
@@ -227,6 +234,14 @@
this.$refs.modalFormApproval.clearTableSource()
this.$refs.modalFormApproval.getAllApproveData(item)
},
+ handDispatchFileDetial(item){
+ this.selectDispatchFileXqData = item
+ this.selectDispatchFileXqData.assignee_dictText=item.todoUsers_dictText
+ this.selectDispatchFileXqData.createTime=item.startTime
+ this.selectDispatchFileXqData.procInstId=item.processInstanceId
+ this.$refs.modalFormDispatchFileXq.clearTableSource()
+ this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ }
}
}
</script>
diff --git a/src/views/flowable/workflow/FlowManage.vue b/src/views/flowable/workflow/FlowManage.vue
deleted file mode 100644
index 57fc669..0000000
--- a/src/views/flowable/workflow/FlowManage.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
- <a-card :bordered="false">
- <div>
- <a-table
- ref="table"
- size="middle"
- :scroll="{x:true}"
- bordered
- rowKey="id"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- class="j-table-force-nowrap"
- >
- </a-table>
- </div>
- </a-card>
-</template>
-
-<script>
-
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-
- export default {
- name: 'FlowManage',
- mixins:[JeecgListMixin, mixinDevice],
- components: {
-
- },
- data () {
- return {
- toolsVisable:true,
- description: '娴佺▼绠＄悊椤甸潰',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title:'娴佺▼瀹氫箟key',
- align:"center",
- dataIndex: 'processDefinitionKey'
- },
- {
- title:'娴佺▼瀹氫箟id',
- align:"center",
- dataIndex: 'processDefinitionId'
- },
- {
- title:'娴佺▼涓氬姟绠�瑕佹弿杩�',
- align:"center",
- dataIndex: 'title'
- },
- {
- title:'涓氬姟琛╥d',
- align:"center",
- dataIndex: 'dataId'
- },
- {
- title:'鐢宠浜�',
- align:"center",
- dataIndex: 'proposer'
- },
- {
- title:'娴佺▼鐘舵�佽鏄�',
- align:"center",
- dataIndex: 'actStatus'
- },
- {
- title:'褰撳墠鐨勪换鍔d',
- align:"center",
- dataIndex: 'taskId'
- },
- {
- title:'褰撳墠鐨勮妭鐐�',
- align:"center",
- dataIndex: 'taskName'
- },
- {
- title:'褰撳墠鐨勮妭鐐笽d',
- align:"center",
- dataIndex: 'taskNameId'
- },
- {
- title:'浠诲姟浜�',
- align:"center",
- dataIndex: 'todoUsers'
- },
- {
- title:'澶勭悊杩囩殑浜�',
- align:"center",
- dataIndex: 'doneUsers'
- },
- ],
- url: {
- list: "/nc/assign/flow/list",
-
- },
- dictOptions:{},
- superFieldList:[],
- workflowSource:[]
- }
- },
- created() {
- this.getSuperFieldList();
- },
- computed: {
- },
- methods: {
- getSuperFieldList(){
- let fieldList=[];
- fieldList.push({type:'string',value:'processDefinitionKey',text:'娴佺▼瀹氫箟key',dictCode:''})
- fieldList.push({type:'string',value:'processDefinitionId',text:'娴佺▼瀹氫箟id',dictCode:''})
- fieldList.push({type:'string',value:'title',text:'娴佺▼涓氬姟绠�瑕佹弿杩�',dictCode:''})
- fieldList.push({type:'string',value:'dataId',text:'涓氬姟琛╥d',dictCode:''})
- fieldList.push({type:'string',value:'proposer',text:'鐢宠浜�',dictCode:''})
- fieldList.push({type:'string',value:'actStatus',text:'娴佺▼鐘舵�佽鏄�',dictCode:''})
- fieldList.push({type:'string',value:'taskId',text:'褰撳墠鐨勪换鍔d',dictCode:''})
- fieldList.push({type:'string',value:'taskName',text:'褰撳墠鐨勮妭鐐�',dictCode:'unit_all'})
- fieldList.push({type:'string',value:'taskNameId',text:'褰撳墠鐨勮妭鐐笽d',dictCode:''})
- fieldList.push({type:'string',value:'todoUsers',text:'浠诲姟浜�',dictCode:''})
- fieldList.push({type:'string',value:'doneUsers',text:'澶勭悊杩囩殑浜�',dictCode:''})
- this.superFieldList = fieldList
- }
- }
- }
-</script>
-<style scoped>
- @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/src/views/flowable/workflow/FlowMyTaskToDo.vue b/src/views/flowable/workflow/FlowMyTaskToDo.vue
deleted file mode 100644
index a76b002..0000000
--- a/src/views/flowable/workflow/FlowMyTaskToDo.vue
+++ /dev/null
@@ -1,299 +0,0 @@
-<template>
- <a-card>
- <a-list
- class="demo-loadmore-list"
- :loading="loading"
- item-layout="horizontal"
- :data-source="carddata"
- >
-
- <a-list-item slot="renderItem" slot-scope="item, index">
- <a slot="actions" @click="handelDetial(item,index)">鏌ョ湅璇︽儏</a>
- <a-list-item-meta :description='item.createTime'>
- <a slot="title">{{ item.title }}</a>
- <a-avatar
- slot="avatar"
- src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
- />
- </a-list-item-meta>
- <div><b>{{ item.name }}</b></div>
- </a-list-item>
- </a-list>
-
-
- <FlowNcZpi ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowNcZpi>
- </a-card>
-</template>
-<style>
-.demo-loadmore-list {
- min-height: 350px;
-}
-</style>
-
-<script>
-import { getAction, deleteAction, postAction } from '@/api/manage'
-import '@/assets/less/TableExpand.less'
-import { mixinDevice } from '@/utils/mixin'
-import store from '@/store'
-import FlowNcZpi from './FlowNcZpi.vue'
-
-
-export default {
- name: 'FlowMyTaskToDo',
- mixins: [mixinDevice],
- components: {
- FlowNcZpi
- },
- data() {
- return {
- jsonArr: {},
- infos: [],
- selectShenpiData: {},
- carddata: [],
- toTaskSelfData: [],
- toolsVisable: true,
- description: '瀹℃壒寰呭姙椤甸潰',
- ipagination: {
- current: 1,
- pageSize: 10,
- pageSizeOptions: ['10', '20', '30'],
- showTotal: (total, range) => {
- return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
- },
- showQuickJumper: true,
- showSizeChanger: true,
- total: 0
- },
- loading: false,
- // 琛ㄥご
- selectedRowKeys: [],
- url: {
- toTaskBySelfList: '/nc/assign/flow/toTaskBySelf',
- complete: '/plmebomtechnicalordercreatebomapproval/plmEbomTechnicalorderCreatebomapproval/completeByDateId',
- reject: '/plmebomtechnicalordercreatebomapproval/plmEbomTechnicalorderCreatebomapproval/rejectTask',
- pdfSign: '/plmebomtechnicalordercreatebomapproval/plmEbomTechnicalorderCreatebomapproval/pdfSign',
- queryApproveJiJiaByDataId: '/plmmbomprocedurespecification/plmMbomProcedurespecification/queryApproveJiJiaByDataId',
- queryApproveLsByDataId: '/plmbomlsgy/plmMbomLsgy/queryApproveLsByDataId',
- queryApproveFxByDataId: '/plmmbomfxgy/plmMbomFxgy/queryApproveFxByDataId',
- queryByNumber: '/plmebompartmaster/plmEbomPartmaster/queryByNumber',
- getCaxaUrlJJ: '/plmmbomjijiagyapproval/plmMbomJijiagyApproval/getCaxaUrlJeecg',
- getCaxaUrlLS: '/plmbomlsgy/plmMbomLsgy/getCaxaUrlJeecg',
- getCaxaUrlFx: '/plmmbomfxgy/plmMbomFxgy/getCaxaUrlJeecg',
- queryApproveJiJiaById: '/plmmbomjijiagyapproval/plmMbomJijiagyApproval/queryApproveJiJiaById',
- signCxpFile: '/plmmbomjijiagyapproval/plmMbomJijiagyApproval/signCxpFile',
- queryApproveLsById: '/plmmbomapprovallsgy/plmMbomApprovalLsgy/queryApproveDataById',
- queryApproveFxById: '/plmmbomapprovalfxgy/plmMbomApprovalFxgy/queryApproveDataById',
- queryJjDataByJjggAprovalId: '/plmmbomprocedurespecification/plmMbomProcedurespecification/queryJjDataByJjggAprovalId',
- queryJjggByApprovalId: '/plmmbomjjgg/plmMbomJjgg/queryJjggByApprovalId',
- getCaxaUrlJjgg:'/plmmbomjjgg/plmMbomJjgg/getCaxaUrlJeecg',
- queryJjggApprovalByDataId:'/plmmbomjjggapproval/plmMbomJjggApproval/queryById'
- },
- dictOptions: {},
- superFieldList: [],
- workflowSource: []
- }
- },
- created() {
- this.toTaskBySelf()
- this.getSuperFieldList()
- },
- computed: {},
- methods: {
- toTaskBySelf() {
- let usercode = store.getters.userInfo.username
- let param = {
- 'currentUserId': usercode
- }
- console.log('usercode--->', usercode)
-
- getAction(this.url.toTaskBySelfList, param).then((res => {
- if (res.success) {
- console.log('res---->', res)
- console.log('resresult---->', res.result)
- this.carddata = res.result
- }
- }))
- console.log('this.toTaskSelfData---->', this.toTaskSelfData)
- },
- 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鏂囨。鍒拌澶囨祦绋�':
- this.handDrDetial(item)
- break
- default:
- alert('娌℃壘鍒拌瀹℃壒')
- }
- },
- handDrDetial(item) {
- this.selectShenpiData = item
- this.$refs.modalFormApproval.clearTableSource()
- this.$refs.modalFormApproval.getAllApproveData(item)
- },
- handCheckApprove(record,approcesstype){
- if(approcesstype === '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�'){
-
- }else if(approcesstype === '鏈哄姞瀹℃壒娴佺▼'){
-
- }else if(approcesstype === '涓存椂宸ヨ壓瀹℃壒娴佺▼'){
-
- }else if(approcesstype === '杩斾慨宸ヨ壓瀹℃壒娴佺▼'){
-
- }else if(approcesstype === '鏈哄姞鏇存敼鍗曞鎵规祦绋�'){
-
- }
- },
- handleCommonAgree(record) {
- console.log('record------>', record)
- let flowTaskVo = {}
- flowTaskVo.dataId = record.dataId
- flowTaskVo.taskId = record.id
- flowTaskVo.userId = record.assignee
- flowTaskVo.instanceId = record.procInstId
- flowTaskVo.targetKey = record.taskDefKey
- flowTaskVo.values = record.variables
- flowTaskVo.assignee = record.assignee
- postAction(this.url.complete, flowTaskVo).then((res => {
- if (res.success) {
- this.$message.success(res.result)
- } else {
- this.$message.warning(res.result)
- }
- }))
- },
- handleZhuanJiao(record) {
- let approcesstype = this.splitAprocessType(record.title)
- this.handleCommonZhuanJiao(record)
- },
- handleCommonZhuanJiao(record) {
- this.$refs.Flowzhuanjiao.openThis()
- this.$refs.Flowzhuanjiao.approveData = record
- },
- handleJjggpdfSign(record){
- let parm = {
- 'id': record.dataId
- }
- console.log("parm===>",parm)
- getAction(this.url.queryJjggApprovalByDataId,parm).then(res=>{
- console.log("resres--->",res.result)
- let infos = {}
- let signInfos = []
- let signInfo = {
- 'proc_bz': res.result.organization,
- 'proc_bz_date': res.result.writeTime,
- // 'proc_jd': res.result.proofread,
- // 'proc_jd_date': res.result.proofreadTime,
- 'proc_sh': res.result.examine,
- 'proc_sh_date': res.result.examineTime,
- 'proc_pz': res.result.ratify,
- 'proc_pz_date': res.result.approveTime
- }
- signInfos.push(signInfo)
- let type = {
- 'type': 'jjggd'
- }
- infos.signInfos = signInfos
- infos.type = type
- let parm2 = {
- 'dataId': record.dataId
- }
- getAction(this.url.queryJjggByApprovalId,parm2).then(res2=>{
- let parm3 = {
- 'signInfos': JSON.stringify(signInfos),
- 'type': 'jjggd',
- 'cxpFile': res2.result.filecxp,
- 'number': res2.result.number
- }
- console.log('parm3---->', parm3)
- console.log('parm3---->', res2.result)
- getAction(this.url.signCxpFile, parm3).then(res3 => {
- console.log('res3---->', res3)
- this.$message.success('绛惧悕瀹屾垚')
- })
- })
- })
- },
- handeditFxCapp(item) {
- console.log('item----->', item)
- let parm1 = {
- 'dataId': item.dataId
- }
- getAction(this.url.queryApproveFxByDataId, parm1).then(res => {
- if (res.success) {
- let fileNo = this.splitAprocessNumber(item.title)
- this.jsonArr.userName = item.assignee
- this.jsonArr.partNumber = res.result.partnumber
- this.jsonArr.partName = res.result.partname
- this.jsonArr.drawingVision = res.result.editiondrawing
- this.jsonArr.fileNo = fileNo
- this.jsonArr.id = res.result.id
- let parm2 = {
- 'number': res.result.partnumber
- }
- this.jsonArr.number = res.result.number
- this.jsonArr.cxpFilePath = res.result.attract
- // this.jsonArr.cxpFilePath = '/pdmCapp/鑸槦鏈哄姞宸ヨ壓瑙勭▼.cxp'
- getAction(this.url.queryByNumber, parm2).then(res2 => {
- this.jsonArr.partType = res2.result.partType
- this.infos.push(this.jsonArr)
- let infosJsonNew = JSON.stringify(this.infos)
- console.log('infosJson--->', infosJsonNew)
- let parm3 = {}
- parm3.infosJson = infosJsonNew
- console.log('infosJsonNew---->', infosJsonNew)
- getAction(this.url.getCaxaUrlFx, parm3).then(res => {
- console.log('鎵ц浜嗗彂閫�')
- if (res.status == 'SUCCESS') {
- console.log('resUrl------>', res)
- let beforeUrl = res.msg
- let afterBefore = this.jiexieUrl(beforeUrl)
- console.log('afterBefore---->', afterBefore)
- window.open(afterBefore, '_blank')
- }
- }).finally(
- this.jsonArr = {},
- this.infos = []
- )
- })
- }
- })
- },
- jiexieUrl(beforeUrl) {
- let afterBefore = beforeUrl.replaceAll('%3A', ':').replaceAll('%2F', '/').replaceAll('%23', '#').replaceAll('%7C', '|').replaceAll('%5C', '\\\\')
- return afterBefore
- },
- getSuperFieldList() {
- let fieldList = []
- fieldList.push({ type: 'string', value: 'id', text: '浠诲姟ID', dictCode: '' })
- fieldList.push({ type: 'string', value: 'rev', text: '鐗堟湰鍙�', dictCode: '' })
- fieldList.push({ type: 'string', value: 'executionId', text: '鎵ц瀹炰緥ID', dictCode: '' })
- fieldList.push({ type: 'string', value: 'procInstId', text: '娴佺▼瀹炰緥ID', dictCode: '' })
- fieldList.push({ type: 'string', value: 'procDefId', text: '娴佺▼瀹氫箟ID', dictCode: '' })
- fieldList.push({ type: 'string', value: 'name', text: '浠诲姟鍚嶇О', dictCode: '' })
- fieldList.push({ type: 'string', value: 'taskDefKey', text: '浠诲姟瀹氫箟Key', dictCode: '' })
- fieldList.push({ type: 'string', value: 'assignee', text: '鍔炵悊浜�', dictCode: 'unit_all' })
- fieldList.push({ type: 'string', value: 'priority', text: '浼樺厛绾�', dictCode: '' })
- fieldList.push({ type: 'string', value: 'createTime', text: '浠诲姟鍒涘缓鏃堕棿', dictCode: '' })
- fieldList.push({ type: 'string', value: 'suspensionState', text: '鏆傚仠鐘舵��', dictCode: '' })
- this.superFieldList = fieldList
- },
- splitAprocessType(title) {
- let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧杩涜鍒嗗壊
- let result = parts[0]
- return result
- },
- splitAprocessNumber(title) {
- let parts = title.split('锛�') // 娉ㄦ剰鍐掑彿鏄叏瑙掑瓧绗︼紝浣跨敤瀵瑰簲鐨勫瓧绗﹁繘琛屽垎鍓�
- let result = parts[1]
- return result
- }
- }
-}
-</script>
-<style scoped>
-@import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 83bc4b1..8db64e3 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -89,7 +89,9 @@
</a-table>
</div>
- <FlowNcZpi ref="modalFormApproval" :selectShenpiData="selectShenpiData"></FlowNcZpi>
+ <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamHandle>
+ <DispatchFileHandle ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData" @searchReset="searchReset"></DispatchFileHandle>
+
</a-card>
</template>
@@ -99,16 +101,15 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
-import store from '@/store'
-import { getAction } from '@api/manage'
-import FlowNcZpi from '@views/flowable/workflow/FlowNcZpi.vue'
-
+import AssignFileStreamHandle from '@views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue'
+import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue'
export default {
name: 'NcDeviceCharactersList',
mixins:[JeecgListMixin, mixinDevice],
components: {
- FlowNcZpi,
+ AssignFileStreamHandle,
JDictSelectTag,
+ DispatchFileHandle
},
data () {
return {
@@ -146,13 +147,13 @@
{
title: '涓婁竴姝ュ鐞嗕汉',
align: "center",
- dataIndex: 'variables.INITIATOR',
+ dataIndex: 'preNodeAssignee_dictText',
width:200
},
{
- title: '涓婁竴姝ヨ妭鐐�',
+ title: '鍓嶉┍鑺傜偣',
align: "center",
- dataIndex: 'actStatus',
+ dataIndex: 'preNode',
width:200
},
{
@@ -177,10 +178,11 @@
}
],
url: {
- list: '/nc/assign/flow/toTaskBySelf',
+ list: '/assign/flow/toTaskBySelf',
},
dictOptions:{},
selectShenpiData: {},
+ selectDispatchFileXqData:{}
}
},
created() {
@@ -195,11 +197,14 @@
console.log('鐐瑰嚮浜嗚鎯�')
console.log('item----->', item)
console.log('index----->', index)
- let approcesstype = this.splitAprocessType(item.title)
+ let approcesstype = this.splitAprocessType(item.category_dictText)
console.log('approcesstype--->', approcesstype)
switch (approcesstype) {
case '鎸囨淳NC鏂囨。鍒拌澶囨祦绋�':
this.handDrDetial(item)
+ break
+ case 'NC绋嬪簭绛炬淳':
+ this.handDispatchFileDetial(item)
break
default:
alert('娌℃壘鍒拌瀹℃壒')
@@ -215,6 +220,16 @@
this.$refs.modalFormApproval.clearTableSource()
this.$refs.modalFormApproval.getAllApproveData(item)
},
+ searchReset() {
+ this.queryParam = {}
+ this.loadData(1);
+ },
+ handDispatchFileDetial(item){
+ console.log('item----->', item)
+ this.selectDispatchFileXqData = item
+ this.$refs.modalFormDispatchFileXq.clearTableSource()
+ this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ }
}
}
</script>
diff --git a/src/views/flowable/workflow/FlowWorkTaskList.vue b/src/views/flowable/workflow/FlowWorkTaskList.vue
deleted file mode 100644
index c912aa5..0000000
--- a/src/views/flowable/workflow/FlowWorkTaskList.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<template>
- <a-card :bordered="false">
- <div>
- <a-table
- ref="table"
- size="middle"
- :scroll="{x:true}"
- bordered
- rowKey="id"
- :columns="columns"
- :dataSource="dataSource"
- :pagination="ipagination"
- :loading="loading"
- class="j-table-force-nowrap"
- >
- </a-table>
- </div>
- </a-card>
-</template>
-
-<script>
-
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
- export default {
- name: 'FlowManage',
- mixins:[JeecgListMixin, mixinDevice],
- components: {
-
- },
- data () {
- return {
- toolsVisable:true,
- description: '浠诲姟鍒楄〃椤甸潰',
- // 琛ㄥご
- columns: [
- {
- title: '#',
- dataIndex: '',
- key:'rowIndex',
- width:60,
- align:"center",
- customRender:function (t,r,index) {
- return parseInt(index)+1;
- }
- },
- {
- title:'浠诲姟ID',
- align:"center",
- dataIndex: 'id'
- },
- {
- title:'鐗堟湰鍙�',
- align:"center",
- dataIndex: 'rev'
- },
- {
- title:'鎵ц瀹炰緥ID',
- align:"center",
- dataIndex: 'executionId'
- },
- {
- title:'娴佺▼瀹炰緥ID',
- align:"center",
- dataIndex: 'procInstId'
- },
- {
- title:'娴佺▼瀹氫箟ID',
- align:"center",
- dataIndex: 'procDefId'
- },
- {
- title:'浠诲姟鍚嶇О',
- align:"center",
- dataIndex: 'name'
- },
- {
- title:'浠诲姟瀹氫箟Key',
- align:"center",
- dataIndex: 'taskDefKey'
- },
- {
- title:'鍔炵悊浜�',
- align:"center",
- dataIndex: 'assignee'
- },
- {
- title:'浼樺厛绾�',
- align:"center",
- dataIndex: 'priority'
- },
- {
- title:'浠诲姟鍒涘缓鏃堕棿',
- align:"center",
- dataIndex: 'createTime'
- },
- {
- title:'鏆傚仠鐘舵��',
- align:"center",
- dataIndex: 'suspensionState'
- },
-
- ],
- url: {
- list: "/nc/assign/flow/workTasklist",
-
- },
- dictOptions:{},
- superFieldList:[],
- workflowSource:[]
- }
- },
- created() {
- this.getSuperFieldList();
- },
- computed: {
- },
- methods: {
- getSuperFieldList(){
- let fieldList=[];
- fieldList.push({type:'string',value:'id',text:'浠诲姟ID',dictCode:''})
- fieldList.push({type:'string',value:'rev',text:'鐗堟湰鍙�',dictCode:''})
- fieldList.push({type:'string',value:'executionId',text:'鎵ц瀹炰緥ID',dictCode:''})
- fieldList.push({type:'string',value:'procInstId',text:'娴佺▼瀹炰緥ID',dictCode:''})
- fieldList.push({type:'string',value:'procDefId',text:'娴佺▼瀹氫箟ID',dictCode:''})
- fieldList.push({type:'string',value:'name',text:'浠诲姟鍚嶇О',dictCode:''})
- fieldList.push({type:'string',value:'taskDefKey',text:'浠诲姟瀹氫箟Key',dictCode:''})
- fieldList.push({type:'string',value:'assignee',text:'鍔炵悊浜�',dictCode:'unit_all'})
- fieldList.push({type:'string',value:'priority',text:'浼樺厛绾�',dictCode:''})
- fieldList.push({type:'string',value:'createTime',text:'浠诲姟鍒涘缓鏃堕棿',dictCode:''})
- fieldList.push({type:'string',value:'suspensionState',text:'鏆傚仠鐘舵��',dictCode:''})
- this.superFieldList = fieldList
- }
- }
- }
-</script>
-<style scoped>
- @import '~@assets/less/common.less';
-</style>
\ No newline at end of file
diff --git a/src/views/flowable/workflow/FlowNcZpi.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
similarity index 96%
rename from src/views/flowable/workflow/FlowNcZpi.vue
rename to src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
index f958e3c..6fbbb4f 100644
--- a/src/views/flowable/workflow/FlowNcZpi.vue
+++ b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
@@ -1,3 +1,8 @@
+<!--
+ Description: 宸ヤ綔娴�-鎸囨淳璁惧澶勭悊椤甸潰 List
+ Author: 浣滆�� liuyh
+ Date: 2025-02-27
+-->
<template>
<a-modal
:title="title"
@@ -168,9 +173,9 @@
<script>
-import '@/assets/less/TableExpand.less'
+import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
-import { getAction, deleteAction, postAction, downFile, httpAction } from '@/api/manage'
+import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
export default {
name: 'FlowShenPi',
mixins: [mixinDevice],
@@ -240,9 +245,9 @@
// 琛ㄥご
url: {
queryBomDataById: '/nc/activit/selectVoById',
- diagramView: '/nc/assign/flow/diagramView',
- queryHisTaskList:'/nc/assign/flow/queryHisTaskList',
- approve:"/nc/activit/assign/file/approve",
+ diagramView: '/assign/flow/diagramView',
+ queryHisTaskList:'/assign/flow/queryHisTaskList',
+ approve:"/activit/assign/file/approve",
},
dictOptions: {},
superFieldList: [],
@@ -335,7 +340,7 @@
'id': item.dataId
}
let parmhis={
- 'drapprovedataId': item.dataId
+ 'procInstId': item.dataId
}
getAction(this.url.queryHisTaskList,parmhis).then(res=>{
this.hitaskDataSource=res.result
diff --git a/src/views/flowable/workflow/FlowXq.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
similarity index 96%
rename from src/views/flowable/workflow/FlowXq.vue
rename to src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
index 2a88be5..c9ba525 100644
--- a/src/views/flowable/workflow/FlowXq.vue
+++ b/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
@@ -1,3 +1,8 @@
+<!--
+ Description: 宸ヤ綔娴�-鎸囨淳璁惧璇︽儏椤甸潰 List
+ Author: 浣滆�� liuyh
+ Date: 2025-02-27
+-->
<template>
<a-modal
:title="title"
@@ -124,9 +129,9 @@
<script>
-import '@/assets/less/TableExpand.less'
+import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
-import { getAction, deleteAction, postAction, downFile, httpAction } from '@/api/manage'
+import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
export default {
name: 'FlowShenPi',
mixins: [mixinDevice],
@@ -196,9 +201,9 @@
// 琛ㄥご
url: {
queryBomDataById: '/nc/activit/selectVoById',
- diagramView: '/nc/assign/flow/diagramView',
- queryHisTaskList:'/nc/assign/flow/queryHisTaskList',
- approve:"/nc/activit/assign/file/approve",
+ diagramView: '/assign/flow/diagramView',
+ queryHisTaskList:'/assign/flow/queryHisTaskList',
+ approve:"/activit/assign/file/approve",
},
dictOptions: {},
superFieldList: [],
diff --git a/src/views/flowable/workflow/FlowNcZpi.vue b/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
similarity index 61%
copy from src/views/flowable/workflow/FlowNcZpi.vue
copy to src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
index f958e3c..4d153bb 100644
--- a/src/views/flowable/workflow/FlowNcZpi.vue
+++ b/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
@@ -1,3 +1,8 @@
+<!--
+ Description: 宸ヤ綔娴�-NC瀹＄澶勭悊椤甸潰 List
+ Author: 浣滆�� liuyh
+ Date: 2025-02-27
+-->
<template>
<a-modal
:title="title"
@@ -12,10 +17,10 @@
<br>
<br>
<a-tag color="blue">
- 澶勭悊浜� {{ selectShenpiData.assignee }}
+ 褰撳墠澶勭悊浜� {{ selectShenpiData.assignee_dictText }}
</a-tag>
<a-tag color="blue">
- 鍒涘缓鏃堕棿 {{ selectShenpiData.createTime }}
+ 浠诲姟鍒涘缓鏃堕棿 {{ selectShenpiData.createTime }}
</a-tag>
<br>
<br>
@@ -26,7 +31,7 @@
<hr class="shallow-hr">
</div>
<div>
- <b>鎸囨淳璇︽儏</b>
+ <b>瀹＄璇︽儏</b>
<br>
<a-form :form='form'>
<a-spin :spinning="spinning">
@@ -35,61 +40,37 @@
<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 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='componentId'>
+ <a-form-model-item label='鏂囨。鐗堟湰' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='publishVersion'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.publishVersion'></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='docSuffix'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.docSuffix'></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 label='鍑哄簱鐘舵��' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullStatus_dictText'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.pullStatus_dictText'></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 label='鍑哄簱浜�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullUser_dictText'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.pullUser_dictText'></a-input>
</a-form-model-item>
</a-col>
</a-row>
@@ -100,13 +81,12 @@
<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>鍔炵悊绫诲瀷锛歿{item.bllx_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>
+ <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
+ <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
+ <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
+ <p v-if="index1 ===0">鐢宠鍘熷洜锛歿{item.description}}</p>
+ <p v-else >澶勭悊鎰忚锛歿{item.description}}</p>
+ <div class="left_qiu"><span>{{item.taskName}}</span></div>
</div>
</a-timeline-item>
</a-timeline>
@@ -123,34 +103,19 @@
<br>
<a-form-model ref="form" :model="approveData" :rules="validatorRules" slot="detail">
<a-row>
- <a-col ::span='span'>
- <a-form-model-item label="鐢宠浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop='applyUser'>
- <a-input :disabled='coldisabled' v-model='tableRowRecord.applyUser'></a-input>
+ <a-col ::span='span' v-if="selectShenpiData.taskDefKey ==='task_proofread'" class="btxx">
+ <a-form-model-item label="澶勭悊绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop='status'>
+ <j-dict-select-tag type='list' v-model='assignFileStream.status' dictCode='nc_sq_handle_type_jd' placeholder="璇烽�夋嫨澶勭悊绫诲瀷" />
</a-form-model-item >
</a-col>
- <a-col ::span='span'>
- <a-form-model-item label="鐢宠鍘熷洜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applyReason">
- <a-textarea :disabled='coldisabled' v-model="tableRowRecord.applyReason" rows="4" />
+ <a-col ::span='span' v-if="selectShenpiData.taskDefKey ==='task_approve' || selectShenpiData.taskDefKey ==='task_cut' || selectShenpiData.taskDefKey ==='task_finalize'" class="btxx">
+ <a-form-model-item label="澶勭悊绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop='status'>
+ <j-dict-select-tag type='list' v-model='assignFileStream.status' dictCode='nc_sq_handle_type' placeholder="璇烽�夋嫨澶勭悊绫诲瀷" />
</a-form-model-item >
- </a-col>
- <a-col ::span='span'>
- <a-form-model-item label="鐢宠鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="applyTime">
- <a-input :disabled='coldisabled' v-model='tableRowRecord.applyTime'></a-input>
- </a-form-model-item >
- </a-col>
- <a-col :span="24">
- <a-form-item label="瀵嗙骇涓�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag type='list' v-model='assignFileStream.secretLevel' dictCode='dnc_secret_level' placeholder="璇烽�夋嫨瀵嗙骇" />
- </a-form-item>
</a-col>
<a-col :span="24" class="btxx">
- <a-form-item label="瀹℃壒鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <j-dict-select-tag type='list' v-model='assignFileStream.status' dictCode='dnc_assign_stream_status' placeholder="璇烽�夋嫨瀹℃壒鐘舵��" />
- </a-form-item>
- </a-col>
- <a-col :span="24" class="btxx">
- <a-form-model-item label="瀹℃壒鎰忚" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-textarea v-model="assignFileStream.approveContent" rows="4" placeholder="璇疯緭鍏ュ鎵规剰瑙�"/>
+ <a-form-model-item label="澶勭悊鎰忚" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-textarea v-model="assignFileStream.approveContent" rows="4" placeholder="璇疯緭鍏ュ鐞嗘剰瑙�"/>
</a-form-model-item >
</a-col>
</a-row>
@@ -168,9 +133,9 @@
<script>
-import '@/assets/less/TableExpand.less'
+import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
-import { getAction, deleteAction, postAction, downFile, httpAction } from '@/api/manage'
+import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
export default {
name: 'FlowShenPi',
mixins: [mixinDevice],
@@ -206,26 +171,6 @@
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: '璇烽�夋嫨瀹℃壒鐘舵��!'},
@@ -234,15 +179,16 @@
},
approveData: {},
flowData: {},
- title: '瀹℃壒椤甸潰',
+ 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",
+ queryBomDataById: '/dncFlow/dispatchFile/selectVoById',
+ diagramView: '/assign/flow/diagramView',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+ approve:"/dncFlow/dispatchFile/approval",
+ saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile"
},
dictOptions: {},
superFieldList: [],
@@ -286,12 +232,43 @@
},
submitForm () {
const that = this;
- if (!that.assignFileStream.status==null || that.assignFileStream.status===undefined){
- this.$message.warning('璇烽�夋嫨瀹℃壒鐘舵�侊紒')
+ if (that.selectShenpiData.taskDefKey ==='task_prepare'){
+ // 瑙﹀彂琛ㄥ崟楠岃瘉-閲嶆柊鍚姩
+ this.form.validateFields((err, values) => {
+ if (!err) {
+ that.confirmLoading = true;
+ let url=this.url.saveDispatchFile;
+ let method = 'post';
+ let flowTaskVo = {}
+ flowTaskVo.comment =that.assignFileStream.approveContent;
+ flowTaskVo.dataId = this.selectShenpiData.dataId
+ flowTaskVo.instanceId = this.selectShenpiData.procInstId
+ flowTaskVo.taskId = this.selectShenpiData.id
+ console.log("琛ㄥ崟鎻愪氦鏁版嵁",flowTaskVo)
+ httpAction(url,flowTaskVo,method).then((res)=>{
+ if(res.success){
+ that.$message.success(res.message);
+ that.visible = false
+ //鍒锋柊琛ㄦ牸
+ that.$emit('searchReset')
+ }else{
+ that.$message.warning(res.message);
+ }
+ }).finally(() => {
+ that.confirmLoading = false;
+ })
+ }
+ })
+ //璺冲嚭鏂规硶
return false;
+ }else {
+ 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('璇疯緭鍏ュ鎵规剰瑙侊紒')
+ this.$message.warning('璇疯緭鍏ュ鐞嗘剰瑙侊紒')
return false;
}
// 瑙﹀彂琛ㄥ崟楠岃瘉
@@ -300,24 +277,35 @@
that.confirmLoading = true;
let url=this.url.approve
let method = 'post';
+ let handle =that.assignFileStream.status === '1';
let flowTaskVo = {}
- flowTaskVo.status=that.assignFileStream.status;
- flowTaskVo.approveContent =that.assignFileStream.approveContent;
+ switch (that.selectShenpiData.taskDefKey){
+ case "task_approve":
+ flowTaskVo.ratify=handle;
+ break;
+ case "task_cut":
+ flowTaskVo.cut=handle;
+ break;
+ case "task_finalize":
+ flowTaskVo.stereotype=handle;
+ break;
+ }
+ if (that.selectShenpiData.taskDefKey ==='task_proofread'){
+ flowTaskVo.proofreadStatus =that.assignFileStream.status;
+ }
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');
+ that.visible = false
+ //鍒锋柊琛ㄦ牸
+ that.$emit('searchReset')
}else{
that.$message.warning(res.message);
}
@@ -325,7 +313,6 @@
that.confirmLoading = false;
})
}
-
})
},
getAllApproveData(item) {
@@ -335,14 +322,14 @@
'id': item.dataId
}
let parmhis={
- 'drapprovedataId': item.dataId
+ 'procInstId': item.procInstId
}
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)
+ this.tableRowRecord = res.result[0]
+ console.log('this.tableRowRecord----->', this.tableRowRecord[0])
}
}))
}).finally(
diff --git a/src/views/flowable/workflow/FlowXq.vue b/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
similarity index 74%
copy from src/views/flowable/workflow/FlowXq.vue
copy to src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
index 2a88be5..2e20803 100644
--- a/src/views/flowable/workflow/FlowXq.vue
+++ b/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
@@ -1,3 +1,8 @@
+<!--
+ Description: 宸ヤ綔娴�-NC瀹＄璇︽儏椤甸潰 List
+ Author: 浣滆�� liuyh
+ Date: 2025-02-27
+-->
<template>
<a-modal
:title="title"
@@ -8,14 +13,14 @@
>
<a-card :bordered="false">
<div>
- <b>{{ selectShenpiData.description }}</b>
+ <b>{{ selectShenpiData.title }}</b>
<br>
<br>
<a-tag color="blue">
- 澶勭悊浜� {{ selectShenpiData.assignee }}
+ 褰撳墠澶勭悊浜� {{ selectShenpiData.assignee_dictText }}
</a-tag>
<a-tag color="blue">
- 鍒涘缓鏃堕棿 {{ selectShenpiData.createTime }}
+ 褰撳墠浠诲姟鍒涘缓鏃堕棿 {{ selectShenpiData.createTime }}
</a-tag>
<br>
<br>
@@ -26,7 +31,7 @@
<hr class="shallow-hr">
</div>
<div>
- <b>鎸囨淳璇︽儏</b>
+ <b>瀹＄璇︽儏</b>
<br>
<a-form :form='form'>
<a-spin :spinning="spinning">
@@ -35,61 +40,37 @@
<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 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='componentId'>
+ <a-form-model-item label='鏂囨。鐗堟湰' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='publishVersion'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.publishVersion'></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='docSuffix'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.docSuffix'></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 label='鍑哄簱鐘舵��' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullStatus_dictText'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.pullStatus_dictText'></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 label='鍑哄簱浜�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullUser_dictText'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.pullUser_dictText'></a-input>
</a-form-model-item>
</a-col>
</a-row>
@@ -100,13 +81,11 @@
<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>
+ <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
+ <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
+ <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
+ <p v-if="index1 !==0">澶勭悊鎰忚锛歿{item.description}}</p>
+ <div class="left_qiu"><span>{{item.taskName}}</span></div>
</div>
</a-timeline-item>
</a-timeline>
@@ -124,9 +103,9 @@
<script>
-import '@/assets/less/TableExpand.less'
+import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
-import { getAction, deleteAction, postAction, downFile, httpAction } from '@/api/manage'
+import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
export default {
name: 'FlowShenPi',
mixins: [mixinDevice],
@@ -195,10 +174,10 @@
visible: false,
// 琛ㄥご
url: {
- queryBomDataById: '/nc/activit/selectVoById',
- diagramView: '/nc/assign/flow/diagramView',
- queryHisTaskList:'/nc/assign/flow/queryHisTaskList',
- approve:"/nc/activit/assign/file/approve",
+ queryBomDataById: '/dncFlow/dispatchFile/selectVoById',
+ diagramView: '/assign/flow/diagramView',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+ approve:"/activit/assign/file/approve",
},
dictOptions: {},
superFieldList: [],
@@ -291,14 +270,14 @@
'id': item.dataId
}
let parmhis={
- 'drapprovedataId': item.dataId
+ 'procInstId': item.procInstId
}
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)
+ this.tableRowRecord = res.result[0]
+ console.log('this.tableRowRecord----->', this.tableRowRecord[0])
}
}))
}).finally(
--
Gitblit v1.9.3