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 {
}
},
'form.airModel': {
immediate: true,
handler: function(val) {
val && this.changeSorties()
}
......
applications/dee-mes/src/privateComponents/components/DeploymentCardInfoSelect/index.vue
View file @ 227a5a2f
......@@ -561,7 +561,11 @@ export default {
'items': paramsItems,
'operator': 'AND'
},
'openProps': [],
'openProps': [
{
'name': 'shellacDeploy'
}
],
'sortItem': [
{
'fieldName': 'modifyTime',
......@@ -581,6 +585,7 @@ export default {
this.$set(this.form, 'humidity', res.items.content[0].humidity)
this.$set(this.form, 'component', res.items.content[0].component)
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, 'storeUpTo', res.items.content[0].storeUpTo)
if (this.form.validityStart && this.form.freeTemperature) {
......
applications/dee-mes/src/views/taskExecution/components/RecordMaintenance/index.vue
View file @ 227a5a2f
......@@ -8,8 +8,16 @@
close-on-click-modal
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
v-loading="loading"
:data="tableData"
......@@ -33,7 +41,6 @@
:config-item="tableConfig"
:table-columns="tableColumns"
/>
<!-- <upload-files v-model="objFileLinks" /> -->
<span slot="reference" style="cursor: pointer;olor: #409eff;">
附件浏览
</span>
......@@ -57,7 +64,7 @@
show-overflow-tooltip
/>
</el-table>
</div>
</div> -->
</dee-dialog>
</template>
<script>
......@@ -68,161 +75,239 @@ export default {
visible: false,
// 加载中
loading: false,
// 搜索条件
form: {
status: 'Apply',
serialNumber: ''
},
// // 搜索条件
// form: {
// status: 'Apply',
// serialNumber: ''
// },
// 分页
tablePagination: {
currentPage: 1,
pageSize: 10,
total: 0,
pageSizes: [10, 20, 50, 100]
},
// tablePagination: {
// currentPage: 1,
// pageSize: 10,
// total: 0,
// pageSizes: [10, 20, 50, 100]
// },
// 所有可动态配置的表格列
colums: [
{
title: 'AO号',
show: true,
key: 'extProcessPlan.serialNumber',
sortable: true,
width: 260
},
{
title: 'AO名称',
show: true,
key: 'extProcessPlan.name',
sortable: true,
width: 150
},
{
title: '工序号',
show: true,
key: 'extProcessOperation.code',
sortable: true,
width: 120
},
{
title: '工序名称',
show: true,
key: 'extProcessOperation.name',
sortable: true,
width: 120
},
{
title: '操作者',
show: true,
key: 'creator.userName',
sortable: true,
width: 120
},
{
title: '申请时间',
show: true,
key: 'appTime',
sortable: true,
width: 120,
formatter: (row, column, cellValue, index) =>
cellValue && cellValue.split(' ').length > 1
? cellValue.split(' ')[0]
: cellValue
},
{
title: '状态',
show: true,
key: 'status',
sortable: true,
width: 120,
formatter: (row, column, cellValue, index) => {
if (cellValue === 'Apply') {
return '未确认'
} else {
return '已确认'
}
}
},
{
title: '试验类型',
show: true,
key: 'experimentType',
sortable: true,
width: 120
},
{
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
},
// colums: [
// {
// title: '机型',
// show: true,
// key: 'extProcessPlan.planeType',
// sortable: true,
// width: 260
// },
// {
// title: '架次',
// show: true,
// key: 'extProcessPlan.sorties',
// sortable: true,
// width: 260
// },
// {
// title: 'AO号',
// show: true,
// key: 'extProcessPlan.serialNumber',
// sortable: true,
// width: 260
// },
// {
// title: 'AO名称',
// show: true,
// key: 'extProcessPlan.name',
// sortable: true,
// width: 150
// },
// {
// title: '工序号',
// show: true,
// key: 'extProcessOperation.code',
// sortable: true,
// width: 120
// },
// {
// title: '工序名称',
// show: true,
// key: 'extProcessOperation.name',
// sortable: true,
// width: 120
// },
// {
// title: '样品名称',
// show: true,
// key: 'specimen',
// sortable: true,
// width: 120
// },
// {
// title: '牌号',
// show: true,
// key: 'modelNo',
// sortable: true,
// width: 120
// },
// {
// title: '炉批号',
// show: true,
// key: 'lotNo',
// sortable: true,
// width: 120
// },
// {
// title: '规格',
// show: true,
// key: 'spec',
// sortable: true,
// width: 120
// },
// {
// title: '申请依据',
// show: true,
// key: 'reqBill',
// sortable: true,
// width: 120
// },
// {
// title: '试验类型',
// show: true,
// key: 'experimentType',
// sortable: true,
// width: 120
// },
// {
// title: '试验数量',
// show: true,
// key: 'amount',
// sortable: true,
// width: 120
// },
// {
// title: '技术文件/测试标准',
// show: true,
// key: 'skillFile',
// sortable: true,
// width: 170
// },
// {
// title: '质量指标',
// show: true,
// key: 'require',
// sortable: true,
// width: 120
// },
// {
// title: '其他',
// show: true,
// key: 'moreover',
// sortable: true,
// width: 120
// },
// {
// title: '操作者',
// show: true,
// key: 'creator.userName',
// sortable: true,
// width: 120
// },
// {
// title: '申请时间',
// show: true,
// key: 'createTime',
// sortable: true,
// width: 120,
// formatter: (row, column, cellValue, index) =>
// cellValue && cellValue.split(' ').length > 1
// ? cellValue.split(' ')[0]
// : cellValue
// },
// {
// title: '状态',
// show: true,
// key: 'status',
// sortable: true,
// width: 120,
// formatter: (row, column, cellValue, index) => {
// if (cellValue === 'Apply') {
// return '未确认'
// } 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: [],
// 表格数据
tableData: []
......@@ -233,69 +318,74 @@ export default {
// 打开弹出框
open() {
this.visible = true
this.$nextTick(() => {
this.init()
})
},
handleClose() {},
// 初始化数据
init() {
// 设置数据
this.loading = true
this.tableData = []
const params = {
'searchItems': {
'children': [
{
'items': [
{
'fieldName': 'extProcessOperationId',
'operator': 'EQ',
'value': this.$parent.editor.tableId
}
],
'operator': 'AND'
}
],
'items': [],
'operator': 'AND'
},
'openProps': [
{
'name': 'extProcessPlan'
},
{
'name': 'extProcessOperation'
},
{
'name': 'objFileLinks',
'openProps': [
{
'name': 'target'
}
]
}
],
'sortItem': [
{
'fieldName': 'modifyTime',
'sortOrder': 'desc'
}
],
'toValidateKeys': ''
}
// init() {
// // 设置数据
// this.loading = true
// this.tableData = []
// const params = {
// 'pageFrom': 1,
// 'pageSize': 9999,
// 'searchItems': {
// 'children': [
// {
// 'items': [
// {
// 'fieldName': 'extProcessOperationId',
// 'operator': 'EQ',
// 'value': this.$parent.editor.tableId
// }
// ],
// 'operator': 'AND'
// }
// ],
// 'items': [],
// 'operator': 'AND'
// },
// 'openProps': [
// {
// 'name': 'extProcessPlan'
// },
// {
// 'name': 'extProcessOperation'
// },
// {
// 'name': 'objFileLinks',
// 'openProps': [
// {
// 'name': 'target'
// }
// ]
// }
// ],
// 'sortItem': [
// {
// 'fieldName': 'modifyTime',
// 'sortOrder': 'desc'
// }
// ],
// 'toValidateKeys': ''
// }
// 发送请求
post('/ExperimentRecord/search', params)
.then((res) => {
this.tableData = res.items.content
this.tablePagination.total = res.items.totalElements
})
.catch((err) => console.log(err))
.finally(() => {
this.loading = false
})
},
// // 发送请求
// post('/ExperimentRecord/queryExperiment', params)
// .then((res) => {
// this.tableData = res.items.content.map(item => {
// return {
// ...item.pbo,
// processInstanceId: item.processTask.processInstanceId,
// processTaskId: item.processTask.id
// }
// })
// this.tablePagination.total = res.items.totalElements
// })
// .catch((err) => console.log(err))
// .finally(() => {
// this.loading = false
// })
// },
// getList(sourceId) {
// const params = {
// indices: ['ObjFileLink'],
......@@ -324,7 +414,7 @@ export default {
// .catch((err) => console.error(err))
// .finally(() => {})
// },
deleteRow(id) {
deleteRow(row) {
this.$confirm('确定要删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
......@@ -333,7 +423,7 @@ export default {
.then(() => {
const params = {
operator: 'REMOVE',
id: id
id: row.id
}
post('/ExperimentRecord/recursion', params)
.then((res) => {
......@@ -345,10 +435,11 @@ export default {
})
}
this.$emit('refreshPage')
this.visible = false
})
.catch((err) => console.error(err))
.finally(() => {
this.init()
// this.init()
})
})
.catch((error) => {
......@@ -377,53 +468,53 @@ export default {
}
}
}
.dee-table-body {
height: 500px;
}
.el-table thead th {
color: #2e2e2e;
font-weight: 700;
font-size: 14px;
padding: 0;
background-color: #f3f6f7;
line-height: 46px !important;
}
// .dee-table-body {
// height: 500px;
// }
// .el-table thead th {
// color: #2e2e2e;
// font-weight: 700;
// font-size: 14px;
// padding: 0;
// background-color: #f3f6f7;
// line-height: 46px !important;
// }
.el-table .cell i.el-icon-loading {
font-size: 16px;
color: #ff0c00;
font-weight: bold;
position: absolute;
right: 10px;
top: 10px;
}
.el-pagination {
text-align: right;
padding: 10px 0;
}
.el-loading-spinner {
width: 100%;
}
}
.record-maintenance-popper {
.el-form-item__label {
display: none !important;
}
.el-form-item__content {
padding-left: 0px !important;
}
.el-col {
padding: 0px !important;
}
.dee-upload-page,
.el-form-item {
margin-bottom: 0px !important;
}
.dee-table-header {
display: none;
}
.el-form-item {
margin-bottom: 0px;
}
// .el-table .cell i.el-icon-loading {
// font-size: 16px;
// color: #ff0c00;
// font-weight: bold;
// position: absolute;
// right: 10px;
// top: 10px;
// }
// .el-pagination {
// text-align: right;
// padding: 10px 0;
// }
// .el-loading-spinner {
// width: 100%;
// }
// }
// .record-maintenance-popper {
// .el-form-item__label {
// display: none !important;
// }
// .el-form-item__content {
// padding-left: 0px !important;
// }
// .el-col {
// padding: 0px !important;
// }
// .dee-upload-page,
// .el-form-item {
// margin-bottom: 0px !important;
// }
// .dee-table-header {
// display: none;
// }
// .el-form-item {
// margin-bottom: 0px;
// }
}
</style>
applications/dee-mes/src/views/taskExecution/index.vue
View file @ 227a5a2f
......@@ -533,6 +533,42 @@
<!-- 物料确认 -->
<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>
</template>
......@@ -598,7 +634,11 @@ export default {
showHeader: true,
sideShow: true,
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: {},
......@@ -607,6 +647,7 @@ export default {
handler(to, from) {
if (to && to.name === 'assemblyPerform') {
this.getWorkingProcedure()
this.refreshPage()
}
}
// immediate: true
......@@ -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: {
getQRcode(info) {
......@@ -1247,21 +1305,36 @@ export default {
if (this.editor.countRecord) {
this.$refs.RecordMaintenance.open()
} else {
var that = this
this.$confirm('确定要试验申请吗', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
if (!this.headerData) return
this.drawerShowExperimentAdd = true
this.$set(this.experimentApplyForm, 'isGeneral', false)
this.$set(this.experimentApplyForm, 'aircraftType', this.headerData.resName)
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(() => {
that.testApplication()
})
.catch(() => {
this.$message({
type: 'info',
message: '已取消'
})
})
this.$set(this.experimentApplyForm, 'extProcessOperation', {
serialNumber: this.editor.serialNumber,
name: this.editor.title,
id: this.editor.tableId
})
// var that = this
// this.$confirm('确定要试验申请吗11', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// })
// .then(() => {
// that.testApplication()
// })
// .catch(() => {
// this.$message({
// type: 'info',
// message: '已取消'
// })
// })
}
},
getHandledValue(num) {
......@@ -1410,7 +1483,50 @@ export default {
},
refreshPage() {
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>
......
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