mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request '修改bug' (#66) from zwq into develop
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #66
This commit is contained in:
朱文强 2022-03-16 14:19:58 +08:00
commit d8424e1752
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/QualityManager/scrap/ScrapInfo-add.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2022-03-11 10:55:27
* @LastEditTime: 2022-03-16 14:11:09
* @Description:
-->
<template>
@ -226,7 +226,7 @@ export default {
this.dataForm = res.data
})
} else {
this.dataForm.registerTime = this.moment().format('YYYY-MM-DD HH:mm:ss')
this.dataForm.registerTime = this.moment()
}
})
},

10
src/views/basicData/Warehouse/components/PublishTask.vue
View File

@ -1,8 +1,8 @@
<!--
* @Author: gtz
* @Date: 2022-03-12 14:17:55
* @LastEditors: gtz
* @LastEditTime: 2022-03-12 14:23:43
* @LastEditors: zwq
* @LastEditTime: 2022-03-16 14:18:33
* @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\basicData\Warehouse\components\PublishTask.vue
-->
@ -21,13 +21,13 @@
label-position="left"
>
<el-form-item :label="$t('module.basicData.Warehouse.startPosition')" prop="startPosition">
<el-input v-model="dataForm.startPosition" readonly :style="{width: '100%'}" />
<el-input v-model="dataForm.startPosition" :style="{width: '100%'}" />
</el-form-item>
<el-form-item :label="$t('module.basicData.Warehouse.endPosition')" prop="endPosition">
<el-input v-model="dataForm.endPosition" readonly :style="{width: '100%'}" />
<el-input v-model="dataForm.endPosition" :style="{width: '100%'}" />
</el-form-item>
<el-form-item :label="$t('module.basicData.Warehouse.taskType')" prop="taskType">
<el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
<el-input v-model="dataForm.taskType" :style="{width: '100%'}" />
</el-form-item>
</el-form>
</el-row>

6
src/views/orderManage/components/ExecutionInfoDetail.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2022-03-16 09:53:56
* @LastEditTime: 2022-03-16 14:17:40
* @Description:
-->
<template>
@ -116,6 +116,7 @@
<script>
import { ExecutionInfoDetail } from '@/api/orderManage/00A'
import { timeFormatter } from '@/filters'
export default {
data() {
@ -124,7 +125,6 @@ export default {
dataForm: {
id: 0,
name: undefined,
createTime: undefined,
priority: '',
actualQuantity: '',
startProduceTime: '',
@ -152,6 +152,8 @@ export default {
res.data.type = this.statusfilter('orderType', res.data.type)
res.data.priority = this.statusfilter('priority', res.data.priority)
res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
res.data.finishProduceTime = timeFormatter(res.data.finishProduceTime)
res.data.startProduceTime = timeFormatter(res.data.startProduceTime)
res.data.ProcessOrNot = res.data.processId ? '是' : '否'
this.dataForm = res.data
})

5
src/views/orderManage/components/ProcessInfoDetail.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2022-03-16 09:53:00
* @LastEditTime: 2022-03-16 14:17:37
* @Description:
-->
<template>
@ -106,6 +106,7 @@
<script>
import { ProcessInfoDetail } from '@/api/orderManage/00A'
import { timeFormatter } from '@/filters'
export default {
data() {
@ -114,7 +115,6 @@ export default {
dataForm: {
id: 0,
name: undefined,
createTime: undefined,
priority: '',
actualQuantity: '',
startProduceTime: '',
@ -141,6 +141,7 @@ export default {
res.data.type = this.statusfilter('orderType', res.data.type)
res.data.priority = this.statusfilter('priority', res.data.priority)
res.data.triggerOrigin = this.statusfilter('triggerOrigin', res.data.triggerOrigin)
res.data.startProduceTime = timeFormatter(res.data.startProduceTime)
this.dataForm = res.data
})
}