Skip to content

T
TF-MOM-WEB
Commit 227a5a2f authored by jingnan's avatar jingnan 👀
Browse files
Options

Merge remote-tracking branch 'origin/rubberPaint-dev' into dev

parents c9883241 8290b29f
Hide whitespace changes
Inline Side-by-side
Showing with 504 additions and 285 deletions
applications/architecture-dee/public/dee-workflow/main.js
View file @ 227a5a2f
This source diff could not be displayed because it is too large. You can view the blob instead.
applications/architecture-dee/public/dee-workflow/report.html
View file @ 227a5a2f
This source diff could not be displayed because it is too large. You can view the blob instead.
applications/dee-mes/src/privateComponents/components/BatchSignEditInstorageItems/index.vue
View file @ 227a5a2f
...@@ -260,6 +260,7 @@ export default { ...@@ -260,6 +260,7 @@ export default {
} }
}, },
'form.airModel': { 'form.airModel': {
immediate: true,
handler: function(val) { handler: function(val) {
val && this.changeSorties() val && this.changeSorties()
} }
......
applications/dee-mes/src/privateComponents/components/DeploymentCardInfoSelect/index.vue
View file @ 227a5a2f
...@@ -561,7 +561,11 @@ export default { ...@@ -561,7 +561,11 @@ export default {
'items': paramsItems, 'items': paramsItems,
'operator': 'AND' 'operator': 'AND'
}, },
'openProps': [], 'openProps': [
{
'name': 'shellacDeploy'
}
],
'sortItem': [ 'sortItem': [
{ {
'fieldName': 'modifyTime', 'fieldName': 'modifyTime',
...@@ -581,6 +585,7 @@ export default { ...@@ -581,6 +585,7 @@ export default {
this.$set(this.form, 'humidity', res.items.content[0].humidity) this.$set(this.form, 'humidity', res.items.content[0].humidity)
this.$set(this.form, 'component', res.items.content[0].component) this.$set(this.form, 'component', res.items.content[0].component)
this.$set(this.form, 'shellacDeployId', res.items.content[0].id) this.$set(this.form, 'shellacDeployId', res.items.content[0].id)
this.$set(this.form, 'shellacDeploy', { constructionTime: res.items.content[0].constructionTime })
this.$set(this.form, 'storeUp', res.items.content[0].storeUp) this.$set(this.form, 'storeUp', res.items.content[0].storeUp)
this.$set(this.form, 'storeUpTo', res.items.content[0].storeUpTo) this.$set(this.form, 'storeUpTo', res.items.content[0].storeUpTo)
if (this.form.validityStart && this.form.freeTemperature) { if (this.form.validityStart && this.form.freeTemperature) {
......
applications/dee-mes/src/views/taskExecution/components/RecordMaintenance/index.vue
View file @ 227a5a2f
...@@ -8,8 +8,16 @@ ...@@ -8,8 +8,16 @@
close-on-click-modal close-on-click-modal
class="record-maintenance-dialog" class="record-maintenance-dialog"
> >
<div> <dee-as-com
<!-- 表格 --> v-if="visible"
ref="applyTable"
table-height="60vh"
class="list-table"
:basic-data=" { ...$parent.editor}"
:lay-config="{ typeName: 'ExperimentRecord', layKey: 'ExperimentRecord_zhuangpei'}"
@on-deleteRow="deleteRow"
/>
<!-- <div>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="tableData" :data="tableData"
...@@ -33,7 +41,6 @@ ...@@ -33,7 +41,6 @@
:config-item="tableConfig" :config-item="tableConfig"
:table-columns="tableColumns" :table-columns="tableColumns"
/> />
<!-- <upload-files v-model="objFileLinks" /> -->
<span slot="reference" style="cursor: pointer;olor: #409eff;"> <span slot="reference" style="cursor: pointer;olor: #409eff;">
附件浏览 附件浏览
</span> </span>
...@@ -57,7 +64,7 @@ ...@@ -57,7 +64,7 @@
show-overflow-tooltip show-overflow-tooltip
/> />
</el-table> </el-table>
</div> </div> -->
</dee-dialog> </dee-dialog>
</template> </template>
<script> <script>
...@@ -68,161 +75,239 @@ export default { ...@@ -68,161 +75,239 @@ export default {
visible: false, visible: false,
// 加载中 // 加载中
loading: false, loading: false,
// 搜索条件 // // 搜索条件
form: { // form: {
status: 'Apply', // status: 'Apply',
serialNumber: '' // serialNumber: ''
}, // },
// 分页 // 分页
tablePagination: { // tablePagination: {
currentPage: 1, // currentPage: 1,
pageSize: 10, // pageSize: 10,
total: 0, // total: 0,
pageSizes: [10, 20, 50, 100] // pageSizes: [10, 20, 50, 100]
}, // },
// 所有可动态配置的表格列 // 所有可动态配置的表格列
colums: [ // colums: [
{ // {
title: 'AO号', // title: '机型',
show: true, // show: true,
key: 'extProcessPlan.serialNumber', // key: 'extProcessPlan.planeType',
sortable: true, // sortable: true,
width: 260 // width: 260
}, // },
{ // {
title: 'AO名称', // title: '架次',
show: true, // show: true,
key: 'extProcessPlan.name', // key: 'extProcessPlan.sorties',
sortable: true, // sortable: true,
width: 150 // width: 260
}, // },
{ // {
title: '工序号', // title: 'AO号',
show: true, // show: true,
key: 'extProcessOperation.code', // key: 'extProcessPlan.serialNumber',
sortable: true, // sortable: true,
width: 120 // width: 260
}, // },
{ // {
title: '工序名称', // title: 'AO名称',
show: true, // show: true,
key: 'extProcessOperation.name', // key: 'extProcessPlan.name',
sortable: true, // sortable: true,
width: 120 // width: 150
}, // },
{ // {
title: '操作者', // title: '工序号',
show: true, // show: true,
key: 'creator.userName', // key: 'extProcessOperation.code',
sortable: true, // sortable: true,
width: 120 // width: 120
}, // },
{ // {
title: '申请时间', // title: '工序名称',
show: true, // show: true,
key: 'appTime', // key: 'extProcessOperation.name',
sortable: true, // sortable: true,
width: 120, // width: 120
formatter: (row, column, cellValue, index) => // },
cellValue && cellValue.split(' ').length > 1 // {
? cellValue.split(' ')[0] // title: '样品名称',
: cellValue // show: true,
}, // key: 'specimen',
{ // sortable: true,
title: '状态', // width: 120
show: true, // },
key: 'status', // {
sortable: true, // title: '牌号',
width: 120, // show: true,
formatter: (row, column, cellValue, index) => { // key: 'modelNo',
if (cellValue === 'Apply') { // sortable: true,
return '未确认' // width: 120
} else { // },
return '已确认' // {
} // title: '炉批号',
} // show: true,
}, // key: 'lotNo',
{ // sortable: true,
title: '试验类型', // width: 120
show: true, // },
key: 'experimentType', // {
sortable: true, // title: '规格',
width: 120 // show: true,
}, // key: 'spec',
{ // sortable: true,
title: '试验报告号', // width: 120
show: true, // },
key: 'reportNumber', // {
sortable: true, // title: '申请依据',
width: 160 // show: true,
}, // key: 'reqBill',
{ // sortable: true,
title: '试验结论', // width: 120
show: true, // },
key: 'conclusion', // {
sortable: true, // title: '试验类型',
width: 120 // show: true,
} // key: 'experimentType',
], // sortable: true,
tableColumns: [ // width: 120
{ // },
'title': '文件名', // {
'key': 'target.originalFileName', // title: '试验数量',
'parentKey': 'target', // show: true,
'headerAlign': 'center', // key: 'amount',
'align': 'left' // sortable: true,
}, // width: 120
{ // },
'title': '文件大小', // {
'key': 'target.fileSize', // title: '技术文件/测试标准',
'parentKey': 'target', // show: true,
'level': 1, // key: 'skillFile',
'show': true, // sortable: true,
'headerAlign': 'center', // width: 170
'align': 'left' // },
}, // {
{ // title: '质量指标',
'title': '扩展名', // show: true,
'key': 'target.fileExtension', // key: 'require',
'parentKey': 'target', // sortable: true,
'level': 1, // width: 120
'show': true, // },
'headerAlign': 'center', // {
'align': 'left' // title: '其他',
} // show: true,
], // key: 'moreover',
tableConfig: { // sortable: true,
component: { // width: 120
alimit: 1, // },
appendFilter: ['ATTACH_FILE', 'SECONDARY', 'FLOW_FILE', 'PROCESS_CONTENTROLE_PDF'], // {
appendTitle: '附件', // title: '操作者',
appendUploadFilter: 'ATTACH_FILE', // show: true,
defaultValueSelfFun: 'return null', // key: 'creator.userName',
disabled: false, // sortable: true,
filterKey: 'contentType', // width: 120
// limit: 1, // },
masterFilter: ['MASTER_FILE', 'PRIMARY'], // {
masterTitle: '主内容', // title: '申请时间',
masterUploadFilter: 'MASTER_FILE', // show: true,
mlimit: 1, // key: 'createTime',
mrequired: true, // sortable: true,
name: 'DeeUploadTable', // width: 120,
placeholder: '', // formatter: (row, column, cellValue, index) =>
required: false, // cellValue && cellValue.split(' ').length > 1
showFileList: true, // ? cellValue.split(' ')[0]
state: 'edit', // : cellValue
taleType: 'single', // },
url: '/dfs/fileManager/feign/uploadFile' // {
}, // title: '状态',
descriptionShowMode: 'text', // show: true,
hidden: false, // key: 'status',
key: 'objFileLinks', // sortable: true,
name: '附件', // width: 120,
parentKey: 'objFileLinks', // formatter: (row, column, cellValue, index) => {
premMark: true, // if (cellValue === 'Apply') {
title: '', // return '未确认'
width: 3 // } else {
}, // return '已确认'
// }
// }
// },
// {
// title: '试验报告号',
// show: true,
// key: 'reportNumber',
// sortable: true,
// width: 160
// },
// {
// title: '试验结论',
// show: true,
// key: 'conclusion',
// sortable: true,
// width: 120
// }
// ],
// tableColumns: [
// {
// 'title': '文件名',
// 'key': 'target.originalFileName',
// 'parentKey': 'target',
// 'headerAlign': 'center',
// 'align': 'left'
// },
// {
// 'title': '文件大小',
// 'key': 'target.fileSize',
// 'parentKey': 'target',
// 'level': 1,
// 'show': true,
// 'headerAlign': 'center',
// 'align': 'left'
// },
// {
// 'title': '扩展名',
// 'key': 'target.fileExtension',
// 'parentKey': 'target',
// 'level': 1,
// 'show': true,
// 'headerAlign': 'center',
// 'align': 'left'
// }
// ],
// tableConfig: {
// component: {
// alimit: 1,
// appendFilter: ['ATTACH_FILE', 'SECONDARY', 'FLOW_FILE', 'PROCESS_CONTENTROLE_PDF'],
// appendTitle: '附件',
// appendUploadFilter: 'ATTACH_FILE',
// defaultValueSelfFun: 'return null',
// disabled: false,
// filterKey: 'contentType',
// // limit: 1,
// masterFilter: ['MASTER_FILE', 'PRIMARY'],
// masterTitle: '主内容',
// masterUploadFilter: 'MASTER_FILE',
// mlimit: 1,
// mrequired: true,
// name: 'DeeUploadTable',
// placeholder: '',
// required: false,
// showFileList: true,
// state: 'edit',
// taleType: 'single',
// url: '/dfs/fileManager/feign/uploadFile'
// },
// descriptionShowMode: 'text',
// hidden: false,
// key: 'objFileLinks',
// name: '附件',
// parentKey: 'objFileLinks',
// premMark: true,
// title: '',
// width: 3
// },
objFileLinks: [], objFileLinks: [],
// 表格数据 // 表格数据
tableData: [] tableData: []
...@@ -233,69 +318,74 @@ export default { ...@@ -233,69 +318,74 @@ export default {
// 打开弹出框 // 打开弹出框
open() { open() {
this.visible = true this.visible = true
this.$nextTick(() => {
this.init()
})
}, },
handleClose() {}, handleClose() {},
// 初始化数据 // 初始化数据
init() { // init() {
// 设置数据 // // 设置数据
this.loading = true // this.loading = true
this.tableData = [] // this.tableData = []
const params = { // const params = {
'searchItems': { // 'pageFrom': 1,
'children': [ // 'pageSize': 9999,
{ // 'searchItems': {
'items': [ // 'children': [
{ // {
'fieldName': 'extProcessOperationId', // 'items': [
'operator': 'EQ', // {
'value': this.$parent.editor.tableId // 'fieldName': 'extProcessOperationId',
} // 'operator': 'EQ',
], // 'value': this.$parent.editor.tableId
'operator': 'AND' // }
} // ],
], // 'operator': 'AND'
'items': [], // }
'operator': 'AND' // ],
}, // 'items': [],
'openProps': [ // 'operator': 'AND'
{ // },
'name': 'extProcessPlan' // 'openProps': [
}, // {
{ // 'name': 'extProcessPlan'
'name': 'extProcessOperation' // },
}, // {
{ // 'name': 'extProcessOperation'
'name': 'objFileLinks', // },
'openProps': [ // {
{ // 'name': 'objFileLinks',
'name': 'target' // 'openProps': [
} // {
] // 'name': 'target'
} // }
], // ]
'sortItem': [ // }
{ // ],
'fieldName': 'modifyTime', // 'sortItem': [
'sortOrder': 'desc' // {
} // 'fieldName': 'modifyTime',
], // 'sortOrder': 'desc'
'toValidateKeys': '' // }
} // ],
// 'toValidateKeys': ''
// }
// 发送请求 // // 发送请求
post('/ExperimentRecord/search', params) // post('/ExperimentRecord/queryExperiment', params)
.then((res) => { // .then((res) => {
this.tableData = res.items.content // this.tableData = res.items.content.map(item => {
this.tablePagination.total = res.items.totalElements // return {
}) // ...item.pbo,
.catch((err) => console.log(err)) // processInstanceId: item.processTask.processInstanceId,
.finally(() => { // processTaskId: item.processTask.id
this.loading = false // }
}) // })
}, // this.tablePagination.total = res.items.totalElements
// })
// .catch((err) => console.log(err))
// .finally(() => {
// this.loading = false
// })
// },
// getList(sourceId) { // getList(sourceId) {
// const params = { // const params = {
// indices: ['ObjFileLink'], // indices: ['ObjFileLink'],
...@@ -324,7 +414,7 @@ export default { ...@@ -324,7 +414,7 @@ export default {
// .catch((err) => console.error(err)) // .catch((err) => console.error(err))
// .finally(() => {}) // .finally(() => {})
// }, // },
deleteRow(id) { deleteRow(row) {
this.$confirm('确定要删除吗?', '提示', { this.$confirm('确定要删除吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
...@@ -333,7 +423,7 @@ export default { ...@@ -333,7 +423,7 @@ export default {
.then(() => { .then(() => {
const params = { const params = {
operator: 'REMOVE', operator: 'REMOVE',
id: id id: row.id
} }
post('/ExperimentRecord/recursion', params) post('/ExperimentRecord/recursion', params)
.then((res) => { .then((res) => {
...@@ -345,10 +435,11 @@ export default { ...@@ -345,10 +435,11 @@ export default {
}) })
} }
this.$emit('refreshPage') this.$emit('refreshPage')
this.visible = false
}) })
.catch((err) => console.error(err)) .catch((err) => console.error(err))
.finally(() => { .finally(() => {
this.init() // this.init()
}) })
}) })
.catch((error) => { .catch((error) => {
...@@ -377,53 +468,53 @@ export default { ...@@ -377,53 +468,53 @@ export default {
} }
} }
} }
.dee-table-body { // .dee-table-body {
height: 500px; // height: 500px;
} // }
.el-table thead th { // .el-table thead th {
color: #2e2e2e; // color: #2e2e2e;
font-weight: 700; // font-weight: 700;
font-size: 14px; // font-size: 14px;
padding: 0; // padding: 0;
background-color: #f3f6f7; // background-color: #f3f6f7;
line-height: 46px !important; // line-height: 46px !important;
} // }
.el-table .cell i.el-icon-loading { // .el-table .cell i.el-icon-loading {
font-size: 16px; // font-size: 16px;
color: #ff0c00; // color: #ff0c00;
font-weight: bold; // font-weight: bold;
position: absolute; // position: absolute;
right: 10px; // right: 10px;
top: 10px; // top: 10px;
} // }
.el-pagination { // .el-pagination {
text-align: right; // text-align: right;
padding: 10px 0; // padding: 10px 0;
} // }
.el-loading-spinner { // .el-loading-spinner {
width: 100%; // width: 100%;
} // }
} // }
.record-maintenance-popper { // .record-maintenance-popper {
.el-form-item__label { // .el-form-item__label {
display: none !important; // display: none !important;
} // }
.el-form-item__content { // .el-form-item__content {
padding-left: 0px !important; // padding-left: 0px !important;
} // }
.el-col { // .el-col {
padding: 0px !important; // padding: 0px !important;
} // }
.dee-upload-page, // .dee-upload-page,
.el-form-item { // .el-form-item {
margin-bottom: 0px !important; // margin-bottom: 0px !important;
} // }
.dee-table-header { // .dee-table-header {
display: none; // display: none;
} // }
.el-form-item { // .el-form-item {
margin-bottom: 0px; // margin-bottom: 0px;
} // }
} }
</style> </style>
applications/dee-mes/src/views/taskExecution/index.vue
View file @ 227a5a2f
...@@ -533,6 +533,42 @@ ...@@ -533,6 +533,42 @@
<!-- 物料确认 --> <!-- 物料确认 -->
<RecordMaintenance ref="RecordMaintenance" @refreshPage="refreshPage" /> <RecordMaintenance ref="RecordMaintenance" @refreshPage="refreshPage" />
<!-- 物料确认 --> <!-- 物料确认 -->
<!-- 试验申请创建 -->
<el-drawer
v-if="drawerShowExperimentAdd"
title="试验申请"
size="50%"
append-to-body
:before-close="onClose"
:visible.sync="drawerShowExperimentAdd"
>
<dee-as-com
:lay-config="{
typeName: 'ExperimentRecord',
layKey: 'NotGeneral_Experiment_Create'
}"
:form="experimentApplyForm"
parent-show-mode="dialog"
@on-cancel="onClose"
/>
</el-drawer>
<!-- 检验员 -->
<dee-dialog
width="40%"
title="选择检验员"
:before-close="closeDialog"
:dialog-visible="showDialog"
@handleClose="closeDialog"
>
<dee-as-com
:lay-config="{
typeName: 'ExperimentRecord',
layKey: 'checker'
}"
:form="checkerForm"
@on-cancel="closeDialog"
/>
</dee-dialog>
</div> </div>
</template> </template>
...@@ -598,7 +634,11 @@ export default { ...@@ -598,7 +634,11 @@ export default {
showHeader: true, showHeader: true,
sideShow: true, sideShow: true,
isOK: !this.$route.query.isOK || this.$route.query.isOK === 'false', isOK: !this.$route.query.isOK || this.$route.query.isOK === 'false',
isRevoke: this.$route.query.isRevoke && this.$route.query.isRevoke === 'true' isRevoke: this.$route.query.isRevoke && this.$route.query.isRevoke === 'true',
drawerShowExperimentAdd: false,
experimentApplyForm: {},
showDialog: false,
checkerForm: {}
} }
}, },
computed: {}, computed: {},
...@@ -607,6 +647,7 @@ export default { ...@@ -607,6 +647,7 @@ export default {
handler(to, from) { handler(to, from) {
if (to && to.name === 'assemblyPerform') { if (to && to.name === 'assemblyPerform') {
this.getWorkingProcedure() this.getWorkingProcedure()
this.refreshPage()
} }
} }
// immediate: true // immediate: true
...@@ -645,6 +686,23 @@ export default { ...@@ -645,6 +686,23 @@ export default {
} }
}) })
}) })
this.$bus.$on('completeExperimentAdd', ({ items }) => {
this.$nextTick(() => {
this.onClose()
if (items.id) {
this.getProcessInfo(items.id)
}
})
})
this.$bus.$on('refreshAssemblyPerform', () => {
this.$nextTick(() => {
this.closeDialog()
})
})
},
beforeDestroy() {
this.$bus.$off('completeExperimentAdd')
this.$bus.$off('refreshAssemblyPerform')
}, },
methods: { methods: {
getQRcode(info) { getQRcode(info) {
...@@ -1247,21 +1305,36 @@ export default { ...@@ -1247,21 +1305,36 @@ export default {
if (this.editor.countRecord) { if (this.editor.countRecord) {
this.$refs.RecordMaintenance.open() this.$refs.RecordMaintenance.open()
} else { } else {
var that = this if (!this.headerData) return
this.$confirm('确定要试验申请吗', '提示', { this.drawerShowExperimentAdd = true
confirmButtonText: '确定', this.$set(this.experimentApplyForm, 'isGeneral', false)
cancelButtonText: '取消', this.$set(this.experimentApplyForm, 'aircraftType', this.headerData.resName)
type: 'warning' this.$set(this.experimentApplyForm, 'sorties', this.headerData.serialNo)
this.$set(this.experimentApplyForm, 'extProcessPlan', {
serialNumber: this.headerData.serialNumber,
name: this.headerData.name,
id: this.headerData.aoId
}) })
.then(() => { this.$set(this.experimentApplyForm, 'extProcessOperation', {
that.testApplication() serialNumber: this.editor.serialNumber,
}) name: this.editor.title,
.catch(() => { id: this.editor.tableId
this.$message({ })
type: 'info', // var that = this
message: '已取消' // this.$confirm('确定要试验申请吗11', '提示', {
}) // confirmButtonText: '确定',
}) // cancelButtonText: '取消',
// type: 'warning'
// })
// .then(() => {
// that.testApplication()
// })
// .catch(() => {
// this.$message({
// type: 'info',
// message: '已取消'
// })
// })
} }
}, },
getHandledValue(num) { getHandledValue(num) {
...@@ -1410,7 +1483,50 @@ export default { ...@@ -1410,7 +1483,50 @@ export default {
}, },
refreshPage() { refreshPage() {
this.getWorkingProcedure() this.getWorkingProcedure()
},
getProcessInfo(id) {
post(
`/workflow/task/?page=1&size=9999`,
{
'pbo': `com.yonde.tf.mom.common.vo.execute.ExperimentRecordVO_dex_wfc_${id}`
}
)
.then((res) => {
if (res && res.items && res.items.content) {
const info = res.items.content[0] || {}
this.showDialog = true
this.checkerForm = {
'operationName': 'completeTask',
'operator': localStorage.getItem('userId'),
'description': '',
'id': info.id,
'processDefinitionId': info.processDefinitionId,
'processInstId': info.processInstanceId,
'routerSelect': 'check',
'taskDefinitionKey': info.taskDefinitionKey,
'participants': {
'wf_act_TeamRole_checker_userList': [
]
},
'variables': {},
'taskVariables': {}
}
}
})
.catch((err) => console.error(err))
.finally(() => {
// that.editShow = false
})
},
onClose() {
this.drawerShowExperimentAdd = false
this.experimentApplyForm = {}
},
closeDialog() {
this.showDialog = false
this.refreshPage()
} }
} }
} }
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment