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

修改bug #65

Merged
zwq merged 1 commits from zwq into develop 2022-03-16 10:13:21 +08:00
Conversation 0 Commits 1 Files Changed 19 +69 -66
19 changed files with 69 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lang/i18n/en/module/basicData.js
View File

@ -1,8 +1,8 @@
/* /*
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
* @LastEditors: fzq * @LastEditors: zwq
* @LastEditTime: 2022-03-15 18:33:48 * @LastEditTime: 2022-03-16 10:10:59
* @Description: file content * @Description: file content
*/ */
export default { export default {
@ -31,6 +31,7 @@ export default {
Tips: 'Tips', Tips: 'Tips',
TipsBefore: 'Are you sure you want to delete', TipsBefore: 'Are you sure you want to delete',
TipsStorageBefore: 'Confirm to add location:', TipsStorageBefore: 'Confirm to add location:',
PleaseAddLocationFirst: 'Please Add Location First!',
Description: 'Description', Description: 'Description',
Remarks: 'Remarks', Remarks: 'Remarks',
Yes: 'Yes', Yes: 'Yes',

5
src/lang/i18n/zh/module/basicData.js
View File

@ -1,8 +1,8 @@
/* /*
* @Author: gtz * @Author: gtz
* @Date: 2021-03-04 16:13:51 * @Date: 2021-03-04 16:13:51
* @LastEditors: fzq * @LastEditors: zwq
* @LastEditTime: 2022-03-15 18:33:48 * @LastEditTime: 2022-03-16 10:10:43
* @Description: file content * @Description: file content
*/ */
export default { export default {
@ -31,6 +31,7 @@ export default {
Tips: '提示', Tips: '提示',
TipsBefore: '确定删除', TipsBefore: '确定删除',
TipsStorageBefore: '确定添加库位:', TipsStorageBefore: '确定添加库位:',
PleaseAddLocationFirst: '请先添加库位!',
Description: '描述', Description: '描述',
Remarks: '备注', Remarks: '备注',
Or: '或', Or: '或',

3
src/views/QualityManager/scrap/index.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 15:41:11 * @Date: 2020-12-29 15:41:11
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-11 11:24:48 * @LastEditTime: 2022-03-16 09:54:40
* @Description: * @Description:
--> -->
<template> <template>
@ -11,7 +11,6 @@
:model="formData" :model="formData"
:inline="true" :inline="true"
size="medium" size="medium"
label-width="80px"
> >
<el-form-item :label="$t('module.basicData.ScrapInfo.PlateId')" prop="substrateId"> <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 /> <el-input v-model="formData.substrateId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.PlateId')])" style="width:200px" clearable />

3
src/views/basicData/Warehouse/CurrentTask.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 15:41:11 * @Date: 2020-12-29 15:41:11
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-14 10:35:17 * @LastEditTime: 2022-03-16 09:45:43
* @Description: * @Description:
--> -->
<template> <template>
@ -12,7 +12,6 @@
:model="formData" :model="formData"
:inline="true" :inline="true"
size="medium" size="medium"
label-width="100px"
> >
<el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType"> <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> <el-select v-model="formData.taskType" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskType')])" clearable>

3
src/views/basicData/Warehouse/HistoricalTask.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 15:41:11 * @Date: 2020-12-29 15:41:11
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-14 10:37:13 * @LastEditTime: 2022-03-16 09:46:13
* @Description: * @Description:
--> -->
<template> <template>
@ -12,7 +12,6 @@
:model="formData" :model="formData"
:inline="true" :inline="true"
size="medium" size="medium"
label-width="100px"
> >
<el-form-item :label="$t('module.basicData.Warehouse.TaskType')" prop="taskType"> <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> <el-select v-model="formData.taskType" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.Warehouse.TaskType')])" clearable>

3
src/views/basicData/Warehouse/ProcessStorageManagement.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 15:41:11 * @Date: 2020-12-29 15:41:11
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-14 10:35:21 * @LastEditTime: 2022-03-16 09:46:19
* @Description: * @Description:
--> -->
<template> <template>
@ -13,7 +13,6 @@
:model="listQuery" :model="listQuery"
:inline="true" :inline="true"
size="medium" size="medium"
label-width="100px"
> >
<el-form-item :label="$t('module.art.processList.processName')" prop="key"> <el-form-item :label="$t('module.art.processList.processName')" prop="key">
<el-select <el-select

4
src/views/basicData/Warehouse/StorageBoxInfo.vue
View File

@ -2,12 +2,12 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 15:41:11 * @Date: 2020-12-29 15:41:11
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-14 09:33:28 * @LastEditTime: 2022-03-16 09:45:26
* @Description: * @Description:
--> -->
<template> <template>
<div class="app-container"> <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-form-item :label="$t('module.basicData.Warehouse.StorageBoxNumber')" prop="code">
<el-select <el-select
v-model="listQuery.code" v-model="listQuery.code"

4
src/views/basicData/Warehouse/StorageBoxRack.vue
View File

@ -2,12 +2,12 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 15:41:11 * @Date: 2020-12-29 15:41:11
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-01-17 14:06:53 * @LastEditTime: 2022-03-16 09:46:26
* @Description: * @Description:
--> -->
<template> <template>
<div class="app-container"> <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-form-item :label="$t('module.basicData.Warehouse.LocationName')" prop="currLocationId">
<el-select <el-select
v-model="listQuery.currLocationId" v-model="listQuery.currLocationId"

4
src/views/basicData/Warehouse/components/CurrentTask-add.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-14 10:55:22 * @LastEditTime: 2022-03-16 09:49:10
* @Description: * @Description:
--> -->
<template> <template>
@ -15,7 +15,7 @@
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
size="medium" size="medium"
label-width="110px" label-width="170px"
label-position="left" label-position="left"
> >
<el-col :span="12"> <el-col :span="12">

4
src/views/basicData/Warehouse/components/CurrentTaskInfo.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-01-14 15:55:39 * @LastEditTime: 2022-03-16 09:50:12
* @Description: * @Description:
--> -->
<template> <template>
@ -15,7 +15,7 @@
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
size="medium" size="medium"
label-width="110px" label-width="160px"
label-position="left" label-position="left"
> >
<el-col :span="8"> <el-col :span="8">

5
src/views/basicData/Warehouse/components/HistoricalTaskInfo.vue
View File

@ -2,20 +2,21 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-01-13 16:22:39 * @LastEditTime: 2022-03-16 09:50:58
* @Description: * @Description:
--> -->
<template> <template>
<el-dialog <el-dialog
:title="'btn.see' | i18nFilter" :title="'btn.see' | i18nFilter"
:visible.sync="visible" :visible.sync="visible"
width="60%"
> >
<el-row :gutter="10"> <el-row :gutter="10">
<el-form <el-form
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
size="medium" size="medium"
label-width="110px" label-width="170px"
label-position="left" label-position="left"
> >
<el-col :span="8"> <el-col :span="8">

7
src/views/basicData/Warehouse/components/ProcessStorageManagement-info.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 15:41:11 * @Date: 2020-12-29 15:41:11
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-15 14:15:30 * @LastEditTime: 2022-03-16 09:52:07
* @Description: * @Description:
--> -->
<template> <template>
@ -65,11 +65,6 @@ const tableProps = [
prop: 'name', prop: 'name',
label: i18n.t('module.basicData.cache.LocationName'), label: i18n.t('module.basicData.cache.LocationName'),
align: 'center' align: 'center'
},
{
prop: 'shelfName',
label: i18n.t('module.basicData.cache.locationType'),
align: 'center'
} }
] ]

6
src/views/basicData/Warehouse/components/StorageBoxRack-add.vue
View File

@ -1,8 +1,8 @@
<!-- <!--
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: fzq * @LastEditors: zwq
* @LastEditTime: 2022-03-10 18:44:36 * @LastEditTime: 2022-03-16 09:47:25
* @Description: * @Description:
--> -->
<template> <template>
@ -10,7 +10,7 @@
:title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter" :title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
:visible.sync="visible" :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-form-item :label="$t('module.basicData.Warehouse.LocationName')" prop="currLocationId">
<el-select <el-select
v-model="dataForm.currLocationId" v-model="dataForm.currLocationId"

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

@ -2,7 +2,7 @@
* @Author: gtz * @Author: gtz
* @Date: 2022-03-03 09:16:10 * @Date: 2022-03-03 09:16:10
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-15 17:03:28 * @LastEditTime: 2022-03-16 10:11:10
* @Description: file content * @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue * @FilePath: \mt-ck-wms-ui\src\views\dashboard\index.vue
--> -->
@ -302,6 +302,7 @@ export default {
console.log(v) console.log(v)
}, },
submitLinkList() { submitLinkList() {
if (this.selectStorageList.length) {
const tipArr = this.selectStorageList.map(item => { const tipArr = this.selectStorageList.map(item => {
return item.locationName return item.locationName
}) })
@ -325,6 +326,13 @@ export default {
}) })
}) })
}).catch(() => {}) }).catch(() => {})
} else {
this.$message({
message: this.$t('module.basicData.visual.PleaseAddLocationFirst'),
type: 'warning',
duration: 1500
})
}
}, },
goback() { goback() {
this.selectStorageList.splice(0, this.selectStorageList.length) this.selectStorageList.splice(0, this.selectStorageList.length)

3
src/views/basicData/Warehouse/components/processStorageType.vue
View File

@ -2,7 +2,7 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-15 11:02:46 * @LastEditTime: 2022-03-16 09:47:01
* @Description: * @Description:
--> -->
<template> <template>
@ -15,7 +15,6 @@
:model="dataForm" :model="dataForm"
size="medium" size="medium"
:rules="dataRule" :rules="dataRule"
label-width="110px"
label-position="left" label-position="left"
> >
<el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="portAttrId"> <el-form-item :label="$t('module.basicData.Warehouse.SelectStorageType')" prop="portAttrId">

4
src/views/basicData/Warehouse/components/testdata.js
View File

@ -2,7 +2,7 @@
* @Author: gtz * @Author: gtz
* @Date: 2022-03-03 15:47:47 * @Date: 2022-03-03 15:47:47
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-15 10:52:46 * @LastEditTime: 2022-03-16 09:43:36
* @Description: file content * @Description: file content
* @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js * @FilePath: \mt-ck-wms-ui\src\views\dashboard\testdata.js
*/ */
@ -2605,7 +2605,7 @@ export default {
selectStorageList: [], selectStorageList: [],
typeVisible: false, typeVisible: false,
id: '', id: '',
bottomIndex: ['一', '二'], bottomIndex: ['module.dashboard.first', 'module.dashboard.second'],
current: 1, current: 1,
totalPage: 1 totalPage: 1
} }

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

@ -2,20 +2,21 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-15 10:50:00 * @LastEditTime: 2022-03-16 09:53:56
* @Description: * @Description:
--> -->
<template> <template>
<el-dialog <el-dialog
:title="'btn.see' | i18nFilter" :title="'btn.see' | i18nFilter"
:visible.sync="visible" :visible.sync="visible"
width="70%"
> >
<el-row :gutter="10"> <el-row :gutter="10">
<el-form <el-form
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
size="medium" size="medium"
label-width="110px" label-width="180px"
label-position="left" label-position="left"
> >
<el-col :span="8"> <el-col :span="8">

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

@ -2,20 +2,21 @@
* @Author: zwq * @Author: zwq
* @Date: 2020-12-29 16:37:56 * @Date: 2020-12-29 16:37:56
* @LastEditors: zwq * @LastEditors: zwq
* @LastEditTime: 2022-03-09 16:40:11 * @LastEditTime: 2022-03-16 09:53:00
* @Description: * @Description:
--> -->
<template> <template>
<el-dialog <el-dialog
:title="'btn.see' | i18nFilter" :title="'btn.see' | i18nFilter"
:visible.sync="visible" :visible.sync="visible"
width="70%"
> >
<el-row :gutter="10"> <el-row :gutter="10">
<el-form <el-form
ref="dataForm" ref="dataForm"
:model="dataForm" :model="dataForm"
size="medium" size="medium"
label-width="110px" label-width="180px"
label-position="left" label-position="left"
> >
<el-col :span="8"> <el-col :span="8">

8
src/views/orderManage/components/processLinkBtn.vue
View File

@ -1,7 +1,7 @@
<!-- <!--
* @Date: 2021-01-07 20:09:37 * @Date: 2021-01-07 20:09:37
* @LastEditors: zwq * @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 * @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
* @Description: * @Description:
--> -->
@ -13,7 +13,7 @@
width="160" width="160"
> >
<div> <div>
<el-select v-model="value" placeholder="请选择"> <el-select v-model="value" :placeholder="$t('module.basicData.Warehouse.RelateProcess')">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.id" :key="item.id"
@ -23,8 +23,8 @@
</el-select> </el-select>
</div> </div>
<div style="text-align: right; margin: 0"> <div style="text-align: right; margin: 0">
<el-button size="mini" type="text" @click="visible = false">取消</el-button> <el-button size="mini" type="text" @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
<el-button type="primary" size="mini" @click="emitClick">确定</el-button> <el-button type="primary" size="mini" @click="emitClick">{{ 'btn.confirm' | i18nFilter }}</el-button>
</div> </div>
<el-button slot="reference" type="text">{{ $t('module.basicData.Warehouse.RelateProcess') }}</el-button> <el-button slot="reference" type="text">{{ $t('module.basicData.Warehouse.RelateProcess') }}</el-button>
</el-popover> </el-popover>