fzq #67
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* @Author: gtz
|
||||
* @Date: 2021-03-04 16:13:51
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-15 18:33:48
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-16 10:10:59
|
||||
* @Description: file content
|
||||
*/
|
||||
export default {
|
||||
@ -31,6 +31,7 @@ export default {
|
||||
Tips: 'Tips',
|
||||
TipsBefore: 'Are you sure you want to delete',
|
||||
TipsStorageBefore: 'Confirm to add location:',
|
||||
PleaseAddLocationFirst: 'Please Add Location First!',
|
||||
Description: 'Description',
|
||||
Remarks: 'Remarks',
|
||||
Yes: 'Yes',
|
||||
|
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* @Author: gtz
|
||||
* @Date: 2021-03-04 16:13:51
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-15 18:33:48
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-16 10:10:43
|
||||
* @Description: file content
|
||||
*/
|
||||
export default {
|
||||
@ -31,6 +31,7 @@ export default {
|
||||
Tips: '提示',
|
||||
TipsBefore: '确定删除',
|
||||
TipsStorageBefore: '确定添加库位:',
|
||||
PleaseAddLocationFirst: '请先添加库位!',
|
||||
Description: '描述',
|
||||
Remarks: '备注',
|
||||
Or: '或',
|
||||
|
@ -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()
|
||||
}
|
||||
})
|
||||
},
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-11 11:24:48
|
||||
* @LastEditTime: 2022-03-16 09:54:40
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -11,7 +11,6 @@
|
||||
:model="formData"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="80px"
|
||||
>
|
||||
<el-form-item :label="$t('module.basicData.ScrapInfo.PlateId')" prop="substrateId">
|
||||
<el-input v-model="formData.substrateId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.PlateId')])" style="width:200px" clearable />
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-14 10:35:17
|
||||
* @LastEditTime: 2022-03-16 09:45:43
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -12,7 +12,6 @@
|
||||
:model="formData"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType">
|
||||
<el-select v-model="formData.taskType" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskType')])" clearable>
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-14 10:37:13
|
||||
* @LastEditTime: 2022-03-16 09:46:13
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -12,7 +12,6 @@
|
||||
:model="formData"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType">
|
||||
<el-select v-model="formData.taskType" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskType')])" clearable>
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-14 10:35:21
|
||||
* @LastEditTime: 2022-03-16 09:46:19
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -13,7 +13,6 @@
|
||||
:model="listQuery"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item :label="$t('module.art.processList.processName')" prop="key">
|
||||
<el-select
|
||||
|
@ -2,12 +2,12 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-14 09:33:28
|
||||
* @LastEditTime: 2022-03-16 09:45:26
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form ref="listQuery" :model="listQuery" :inline="true" label-width="120px" @keyup.enter.native="getList()">
|
||||
<el-form ref="listQuery" :model="listQuery" :inline="true" @keyup.enter.native="getList()">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.StorageBoxNumber')" prop="code">
|
||||
<el-select
|
||||
v-model="listQuery.code"
|
||||
|
@ -2,12 +2,12 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-17 14:06:53
|
||||
* @LastEditTime: 2022-03-16 09:46:26
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form ref="listQuery" :model="listQuery" :inline="true" label-width="120px" @keyup.enter.native="getList()">
|
||||
<el-form ref="listQuery" :model="listQuery" :inline="true" @keyup.enter.native="getList()">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.LocationName')" prop="currLocationId">
|
||||
<el-select
|
||||
v-model="listQuery.currLocationId"
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-14 10:55:22
|
||||
* @LastEditTime: 2022-03-16 09:49:10
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -15,7 +15,7 @@
|
||||
ref="dataForm"
|
||||
:model="dataForm"
|
||||
size="medium"
|
||||
label-width="110px"
|
||||
label-width="170px"
|
||||
label-position="left"
|
||||
>
|
||||
<el-col :span="12">
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-14 15:55:39
|
||||
* @LastEditTime: 2022-03-16 09:50:12
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -15,7 +15,7 @@
|
||||
ref="dataForm"
|
||||
:model="dataForm"
|
||||
size="medium"
|
||||
label-width="110px"
|
||||
label-width="160px"
|
||||
label-position="left"
|
||||
>
|
||||
<el-col :span="8">
|
||||
|
@ -2,20 +2,21 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-13 16:22:39
|
||||
* @LastEditTime: 2022-03-16 09:50:58
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="'btn.see' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
width="60%"
|
||||
>
|
||||
<el-row :gutter="10">
|
||||
<el-form
|
||||
ref="dataForm"
|
||||
:model="dataForm"
|
||||
size="medium"
|
||||
label-width="110px"
|
||||
label-width="170px"
|
||||
label-position="left"
|
||||
>
|
||||
<el-col :span="8">
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-15 14:15:30
|
||||
* @LastEditTime: 2022-03-16 09:52:07
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -65,11 +65,6 @@ const tableProps = [
|
||||
prop: 'name',
|
||||
label: i18n.t('module.basicData.cache.LocationName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'shelfName',
|
||||
label: i18n.t('module.basicData.cache.locationType'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
|
@ -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>
|
||||
|
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-10 18:44:36
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-16 09:47:25
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -10,7 +10,7 @@
|
||||
:title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
>
|
||||
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="120px" @keyup.enter.native="dataFormSubmit()">
|
||||
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" @keyup.enter.native="dataFormSubmit()">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.LocationName')" prop="currLocationId">
|
||||
<el-select
|
||||
v-model="dataForm.currLocationId"
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: gtz
|
||||
* @Date: 2022-03-03 09:16:10
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-15 17:03:28
|
||||
* @LastEditTime: 2022-03-16 10:11:10
|
||||
* @Description: file content
|
||||
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
|
||||
-->
|
||||
@ -302,29 +302,37 @@ export default {
|
||||
console.log(v)
|
||||
},
|
||||
submitLinkList() {
|
||||
const tipArr = this.selectStorageList.map(item => {
|
||||
return item.locationName
|
||||
})
|
||||
const obj = {
|
||||
workSequenId: this.id,
|
||||
processLocationStorageList: this.selectStorageList
|
||||
}
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
batchListAdd(obj).then(res => {
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.selectStorageList.splice(0, this.selectStorageList.length)
|
||||
}
|
||||
})
|
||||
if (this.selectStorageList.length) {
|
||||
const tipArr = this.selectStorageList.map(item => {
|
||||
return item.locationName
|
||||
})
|
||||
}).catch(() => {})
|
||||
const obj = {
|
||||
workSequenId: this.id,
|
||||
processLocationStorageList: this.selectStorageList
|
||||
}
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsStorageBefore')}[${tipArr.join(',')}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
batchListAdd(obj).then(res => {
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.selectStorageList.splice(0, this.selectStorageList.length)
|
||||
}
|
||||
})
|
||||
})
|
||||
}).catch(() => {})
|
||||
} else {
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.PleaseAddLocationFirst'),
|
||||
type: 'warning',
|
||||
duration: 1500
|
||||
})
|
||||
}
|
||||
},
|
||||
goback() {
|
||||
this.selectStorageList.splice(0, this.selectStorageList.length)
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-15 11:02:46
|
||||
* @LastEditTime: 2022-03-16 09:47:01
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -15,7 +15,6 @@
|
||||
:model="dataForm"
|
||||
size="medium"
|
||||
:rules="dataRule"
|
||||
label-width="110px"
|
||||
label-position="left"
|
||||
>
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="portAttrId">
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: gtz
|
||||
* @Date: 2022-03-03 15:47:47
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-15 10:52:46
|
||||
* @LastEditTime: 2022-03-16 09:43:36
|
||||
* @Description: file content
|
||||
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
|
||||
*/
|
||||
@ -2605,7 +2605,7 @@ export default {
|
||||
selectStorageList: [],
|
||||
typeVisible: false,
|
||||
id: '',
|
||||
bottomIndex: ['一', '二'],
|
||||
bottomIndex: ['module.dashboard.first', 'module.dashboard.second'],
|
||||
current: 1,
|
||||
totalPage: 1
|
||||
}
|
||||
|
@ -2,20 +2,21 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-15 10:50:00
|
||||
* @LastEditTime: 2022-03-16 14:17:40
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="'btn.see' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
width="70%"
|
||||
>
|
||||
<el-row :gutter="10">
|
||||
<el-form
|
||||
ref="dataForm"
|
||||
:model="dataForm"
|
||||
size="medium"
|
||||
label-width="110px"
|
||||
label-width="180px"
|
||||
label-position="left"
|
||||
>
|
||||
<el-col :span="8">
|
||||
@ -115,6 +116,7 @@
|
||||
|
||||
<script>
|
||||
import { ExecutionInfoDetail } from '@/api/orderManage/00A'
|
||||
import { timeFormatter } from '@/filters'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
@ -123,7 +125,6 @@ export default {
|
||||
dataForm: {
|
||||
id: 0,
|
||||
name: undefined,
|
||||
createTime: undefined,
|
||||
priority: '',
|
||||
actualQuantity: '',
|
||||
startProduceTime: '',
|
||||
@ -151,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
|
||||
})
|
||||
|
@ -2,20 +2,21 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-09 16:40:11
|
||||
* @LastEditTime: 2022-03-16 14:17:37
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="'btn.see' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
width="70%"
|
||||
>
|
||||
<el-row :gutter="10">
|
||||
<el-form
|
||||
ref="dataForm"
|
||||
:model="dataForm"
|
||||
size="medium"
|
||||
label-width="110px"
|
||||
label-width="180px"
|
||||
label-position="left"
|
||||
>
|
||||
<el-col :span="8">
|
||||
@ -105,6 +106,7 @@
|
||||
|
||||
<script>
|
||||
import { ProcessInfoDetail } from '@/api/orderManage/00A'
|
||||
import { timeFormatter } from '@/filters'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
@ -113,7 +115,6 @@ export default {
|
||||
dataForm: {
|
||||
id: 0,
|
||||
name: undefined,
|
||||
createTime: undefined,
|
||||
priority: '',
|
||||
actualQuantity: '',
|
||||
startProduceTime: '',
|
||||
@ -140,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
|
||||
})
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Date: 2021-01-07 20:09:37
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-10 14:25:50
|
||||
* @LastEditTime: 2022-03-16 10:02:41
|
||||
* @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
|
||||
* @Description:
|
||||
-->
|
||||
@ -13,7 +13,7 @@
|
||||
width="160"
|
||||
>
|
||||
<div>
|
||||
<el-select v-model="value" placeholder="请选择">
|
||||
<el-select v-model="value" :placeholder="$t('module.basicData.Warehouse.RelateProcess')">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.id"
|
||||
@ -23,8 +23,8 @@
|
||||
</el-select>
|
||||
</div>
|
||||
<div style="text-align: right; margin: 0">
|
||||
<el-button size="mini" type="text" @click="visible = false">取消</el-button>
|
||||
<el-button type="primary" size="mini" @click="emitClick">确定</el-button>
|
||||
<el-button size="mini" type="text" @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
|
||||
<el-button type="primary" size="mini" @click="emitClick">{{ 'btn.confirm' | i18nFilter }}</el-button>
|
||||
</div>
|
||||
<el-button slot="reference" type="text">{{ $t('module.basicData.Warehouse.RelateProcess') }}</el-button>
|
||||
</el-popover>
|
||||
|
Loading…
Reference in New Issue
Block a user