root/yuenanFuJia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:国际化优化

Browse Source
This commit is contained in:
郑旭明\73939
2025-11-03 16:30:22 +08:00
parent 8086fef673
commit d6d2b584ff
22 changed files with 208 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nladmin-ui/src/views/wms/basedata/class/index.vue
View File

@@ -12,21 +12,22 @@
label-suffix=":"
>
<el-form-item :label="$t('wms.basedata.class.class_name')">
<el-select
v-model="query.class_code"
:placeholder="$t('wms.basedata.class.search_placeholder')"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand">
<el-select
v-model="query.class_code"
:placeholder="$t('wms.basedata.class.search_placeholder')"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
@change="hand"
>
<el-option
v-for="item in classNames"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
:value="item.value"
/>
</el-select>
</el-form-item>
<rrOperation :crud="crud" />

2
nladmin-ui/src/views/wms/basedata/customer/index.vue
View File

@@ -127,7 +127,7 @@
<el-table-column prop="corp_tele_no" :label="$t('wms.basedata.customer.corp_tele_no')" show-overflow-tooltip />
<el-table-column prop="corp_address" :label="$t('wms.basedata.customer.corp_address')" show-overflow-tooltip />
<el-table-column prop="jurid_name" :label="$t('wms.basedata.customer.jurid_name')" show-overflow-tooltip />
<el-table-column prop="update_optname" :label="$t('common.modifier')" width="150px"/>
<el-table-column prop="update_optname" :label="$t('common.modifier')" width="150px" />
<el-table-column prop="update_time" :label="$t('common.modify_time')" width="150" />
<el-table-column :label="$t('wms.basedata.customer.is_used')" align="center" prop="is_used">
<template slot-scope="scope">

2
nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -300,7 +300,7 @@ export default {
name: data.material_name
}), i18n.t('common.tips'), {
confirmButtonText: i18n.t('common.Confirm'),
cancelButtonText: i18n.t('common.Cancel'),
cancelButtonText: i18n.t('common.Cancel'),
type: 'warning'
}).then(() => {
crudMaterial.edit(data).then(res => {

22
nladmin-ui/src/views/wms/basedata/materialSet/index.vue
View File

@@ -32,18 +32,18 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="right"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="addDig"
>
{{ $t('wms.basedata.materialSet.add') }}
</el-button>
slot="right"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="addDig"
>
{{ $t('wms.basedata.materialSet.add') }}
</el-button>
</crudOperation>
<!--表格渲染-->
<el-table ref="table" :max-height="590" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table ref="table" v-loading="crud.loading" :max-height="590" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column
v-permission="['admin','structrelamaterial:edit','structrelamaterial:del']"
:label="$t('wms.basedata.materialSet.operation')"
@@ -140,7 +140,7 @@ export default {
if (val.length === 2) {
this.query.stor_id = val[0]
this.query.sect_id = val[1]
}else{
} else {
this.query.stor_id = ''
this.query.sect_id = ''
}

2
nladmin-ui/src/views/wms/basedata/sectattr/index.vue
View File

@@ -299,7 +299,7 @@ export default {
return is_used === '1'
},
changeEnabled(data, val) {
let status = val === '1' ? i18n.t('wms.basedata.sectattr.disable') : i18n.t('wms.basedata.sectattr.enable')
const status = val === '1' ? i18n.t('wms.basedata.sectattr.disable') : i18n.t('wms.basedata.sectattr.enable')
this.$confirm(i18n.t('wms.basedata.sectattr.change_status_confirm', { status }), i18n.t('wms.basedata.sectattr.confirm_title'), {
confirmButtonText: i18n.t('wms.basedata.sectattr.confirm'),
cancelButtonText: i18n.t('wms.basedata.sectattr.cancel'),

10
nladmin-ui/src/views/wms/basedata/storagevehicleinfo/index.vue
View File

@@ -201,14 +201,14 @@
<el-input-number v-model="form.weight" :precision="0" style="width: 150px;" />
</el-form-item>
<el-form-item :label="$t('md_pb_storagevehicleinfo.is_used')">
<el-radio v-model="form.is_used" label="0">{{$t('common.No')}}</el-radio>
<el-radio v-model="form.is_used" label="1">{{$t('common.Yes')}}</el-radio>
<el-radio v-model="form.is_used" label="0">{{ $t('common.No') }}</el-radio>
<el-radio v-model="form.is_used" label="1">{{ $t('common.Yes') }}</el-radio>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="info" @click="crud.cancelCU">{{$t('common.Cancel')}}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{$t('md_pb_storagevehicleinfo.generate')}}</el-button>
<el-button type="primary" @click="addAndprint">{{$t('md_pb_storagevehicleinfo.generate_and_print')}}</el-button>
<el-button type="info" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('md_pb_storagevehicleinfo.generate') }}</el-button>
<el-button type="primary" @click="addAndprint">{{ $t('md_pb_storagevehicleinfo.generate_and_print') }}</el-button>
</div>
</el-dialog>
<!--表格渲染-->

33
nladmin-ui/src/views/wms/basedata/structattr/index.vue
View File

@@ -92,8 +92,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
</crudOperation>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog
@@ -164,12 +163,12 @@
<el-col :span="12">
<el-form-item :label="$t('wms.basedata.structattr.capacity')" prop="capacity">
<label slot="label">{{ $t('wms.basedata.structattr.capacity') }}:</label>
<el-input-number v-model="form.capacity" style="width: 200px;" :precision="3" :controls="false"></el-input-number>
<el-input-number v-model="form.capacity" style="width: 200px;" :precision="3" :controls="false" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('wms.basedata.structattr.weight_bearing')" prop="weight">
<el-input-number v-model="form.weight" style="width: 200px;" :precision="3" :controls="false"></el-input-number>
<el-input-number v-model="form.weight" style="width: 200px;" :precision="3" :controls="false" />
</el-form-item>
</el-col>
</el-row>
@@ -177,13 +176,13 @@
<el-col :span="12">
<el-form-item :label="$t('wms.basedata.structattr.width')" prop="width">
<label slot="label">{{ $t('wms.basedata.structattr.width') }}:</label>
<el-input-number v-model="form.width" style="width: 200px;" :precision="3" :controls="false"></el-input-number>
<el-input-number v-model="form.width" style="width: 200px;" :precision="3" :controls="false" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('wms.basedata.structattr.depth')" prop="zdepth">
<label slot="label">{{ $t('wms.basedata.structattr.depth') }}:</label>
<el-input-number v-model="form.zdepth" style="width: 200px;" :precision="3" :controls="false"></el-input-number>
<el-input-number v-model="form.zdepth" style="width: 200px;" :precision="3" :controls="false" />
</el-form-item>
</el-col>
</el-row>
@@ -191,7 +190,7 @@
<el-col :span="12">
<el-form-item :label="$t('wms.basedata.structattr.height')" prop="height">
<label slot="label">{{ $t('wms.basedata.structattr.height') }}:</label>
<el-input-number v-model="form.height" style="width: 200px;" :precision="3" :controls="false"></el-input-number>
<el-input-number v-model="form.height" style="width: 200px;" :precision="3" :controls="false" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -205,13 +204,13 @@
<el-col :span="12">
<el-form-item :label="$t('wms.basedata.structattr.row')" prop="row_num">
<label slot="label">{{ $t('wms.basedata.structattr.row') }}:</label>
<el-input-number v-model="form.row_num" style="width: 200px;" :precision="0" :min="1" :controls="false"></el-input-number>
<el-input-number v-model="form.row_num" style="width: 200px;" :precision="0" :min="1" :controls="false" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('wms.basedata.structattr.column')" prop="col_num">
<label slot="label">{{ $t('wms.basedata.structattr.column') }}:</label>
<el-input-number v-model="form.col_num" style="width: 200px;" :precision="0" :min="1" :controls="false"></el-input-number>
<el-input-number v-model="form.col_num" style="width: 200px;" :precision="0" :min="1" :controls="false" />
</el-form-item>
</el-col>
</el-row>
@@ -219,7 +218,7 @@
<el-col :span="12">
<el-form-item :label="$t('wms.basedata.structattr.layer')" prop="layer_num">
<label slot="label">{{ $t('wms.basedata.structattr.layer') }}:</label>
<el-input-number v-model="form.layer_num" style="width: 200px;" :precision="0" :min="1" :controls="false"></el-input-number>
<el-input-number v-model="form.layer_num" style="width: 200px;" :precision="0" :min="1" :controls="false" />
</el-form-item>
</el-col>
</el-row>
@@ -390,27 +389,27 @@ export default {
layerList: [
{ 'label': i18n.t('wms.basedata.structattr.layer_1'), 'value': '1' },
{ 'label': i18n.t('wms.basedata.structattr.layer_2'), 'value': '2' },
{ 'label': i18n.t('wms.basedata.structattr.layer_3'), 'value': '3'}
{ 'label': i18n.t('wms.basedata.structattr.layer_3'), 'value': '3' }
],
isHaveList: [
{ 'label': i18n.t('wms.basedata.structattr.empty'), 'value': '1' },
{ 'label': i18n.t('wms.basedata.structattr.has_goods'), 'value': '2'}
{ 'label': i18n.t('wms.basedata.structattr.has_goods'), 'value': '2' }
],
rules: {
struct_id: [
{ required: true, message: i18n.t('wms.basedata.structattr.struct_code_not_empty'), trigger: 'blur' }
],
struct_code: [
{ required: true, message: i18n.t('wms.basedata.structattr.position_code_not_empty'), trigger: 'blur'}
{ required: true, message: i18n.t('wms.basedata.structattr.position_code_not_empty'), trigger: 'blur' }
],
struct_name: [
{ required: true, message: i18n.t('wms.basedata.structattr.position_name_not_empty'), trigger: 'blur'}
{ required: true, message: i18n.t('wms.basedata.structattr.position_name_not_empty'), trigger: 'blur' }
],
sect_id: [
{ required: true, message: i18n.t('wms.basedata.structattr.warehouse_area_not_empty'), trigger: 'blur'}
{ required: true, message: i18n.t('wms.basedata.structattr.warehouse_area_not_empty'), trigger: 'blur' }
],
stor_id: [
{ required: true, message: i18n.t('wms.basedata.structattr.warehouse_not_empty'), trigger: 'blur'}
{ required: true, message: i18n.t('wms.basedata.structattr.warehouse_not_empty'), trigger: 'blur' }
],
row_num: [
{ required: false, message: i18n.t('wms.basedata.structattr.struct_code_not_empty'), trigger: 'blur' },
@@ -420,7 +419,7 @@ export default {
{ required: false, message: i18n.t('wms.basedata.structattr.struct_code_not_empty'), trigger: 'blur' },
{ validator: numberOne }
],
layer_num: [
layer_num: [
{ required: false, message: i18n.t('wms.basedata.structattr.struct_code_not_empty'), trigger: 'blur' },
{ validator: numberOne }
]

18
nladmin-ui/src/views/wms/decision_manage/strategy/AddDialog.vue
View File

@@ -70,8 +70,8 @@
</el-row>
</el-form>
<div v-show="crud.status.cu > 0" slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">{{$t('common.Cancel')}}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{$t('common.Confirm')}}</el-button>
<el-button type="text" @click="crud.cancelCU">{{ $t('common.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">{{ $t('common.Confirm') }}</el-button>
</div>
</el-dialog>
</template>
@@ -106,13 +106,6 @@ export default {
type: Object
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
data() {
return {
dialogVisible: false,
@@ -145,6 +138,13 @@ export default {
}
}
},
watch: {
dialogShow: {
handler(newValue, oldValue) {
this.dialogVisible = newValue
}
}
},
methods: {
handleClose(done) {
this.$confirm(i18n.t('wms.decision_manage.strategy.confirm_close'))

18
nladmin-ui/src/views/wms/decision_manage/strategy/index.vue
View File

@@ -27,7 +27,7 @@
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"/>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-table
ref="table"
@@ -38,17 +38,17 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column :label="$t('wms.decision_manage.strategy.strategy_type')" >
<el-table-column :label="$t('wms.decision_manage.strategy.strategy_type')">
<template slot-scope="scope">
{{scope.row.ban?$t('wms.decision_manage.strategy.system_strategy'):$t('wms.decision_manage.strategy.custom_strategy')}}
{{ scope.row.ban?$t('wms.decision_manage.strategy.system_strategy'):$t('wms.decision_manage.strategy.custom_strategy') }}
</template>
</el-table-column>
<el-table-column prop="strategy_name" :label="$t('wms.decision_manage.strategy.strategy_name')" />
<el-table-column prop="strategy_code" :label="$t('wms.decision_manage.strategy.strategy_code')" />
<el-table-column prop="strategy_type" :label="$t('wms.decision_manage.strategy.decision_type')" />
<el-table-column prop="class_type" :label="$t('wms.decision_manage.strategy.strategy_executor')" />
<el-table-column prop="param" show-overflow-tooltip :label="$t('wms.decision_manage.strategy.param')" />
<el-table-column prop="remark" show-overflow-tooltip :label="$t('wms.decision_manage.strategy.description')" />
<el-table-column prop="param" show-overflow-tooltip :label="$t('wms.decision_manage.strategy.param')" />
<el-table-column prop="remark" show-overflow-tooltip :label="$t('wms.decision_manage.strategy.description')" />
<el-table-column :label="$t('wms.decision_manage.strategy.is_used')" align="center" prop="is_used">
<template slot-scope="scope">
<el-switch
@@ -60,7 +60,7 @@
</template>
</el-table-column>
<el-table-column prop="update_name" :label="$t('wms.decision_manage.strategy.operator')" />
<el-table-column min-width="160" prop="update_time" :label="$t('wms.decision_manage.strategy.operation_time')" />
<el-table-column min-width="160" prop="update_time" :label="$t('wms.decision_manage.strategy.operation_time')" />
<el-table-column
v-permission="[]"
:label="$t('common.operation')"
@@ -70,8 +70,8 @@
>
<template slot-scope="scope">
<udOperation
:disabledDle="scope.row.ban"
:disabledEdit="scope.row.ban"
:disabled-dle="scope.row.ban"
:disabled-edit="scope.row.ban"
:data="scope.row"
:permission="permission"
/>
@@ -129,7 +129,7 @@ export default {
return true
},
format_is_used(is_used) {
return is_used==true
return is_used == true
},
changeEnabled(data, val) {
let msg = i18n.t('wms.decision_manage.strategy.confirm_disable')

78
nladmin-ui/src/views/wms/pm_manage/form_data/ViewDialog.vue
View File

@@ -8,33 +8,40 @@
@close="close"
@open="open"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
:model="form" size="mini" label-width="100px" label-suffix=":">
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
size="mini"
label-width="100px"
label-suffix=":"
>
<el-form-item label="单据编号" prop="code">
<el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 210px"/>
<el-input v-model="form.code" disabled placeholder="系统生成" clearable style="width: 210px" />
</el-form-item>
<el-form-item label="单据类型" prop="form_type">
<el-input v-model="form.form_type" disabled clearable style="width: 210px"/>
<el-input v-model="form.form_type" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务单据类型" prop="source_form_type">
<el-input v-model="form.biz_code" disabled clearable style="width: 210px"/>
<el-input v-model="form.biz_code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务单据id" prop="source_form_id">
<el-input v-model="form.biz_code" disabled clearable style="width: 210px"/>
<el-input v-model="form.biz_code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="业务单据时间" prop="source_form_date">
<!-- <el-date-picker v-model="form.biz_date" type="date" placeholder="选择日期" style="width: 210px"-->
<!-- value-format="yyyy-MM-dd" :disabled="true"/>-->
<el-input v-model="form.biz_date" disabled clearable style="width: 210px"/>
<el-input v-model="form.biz_date" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="批次" prop="pcsn">
<el-input v-model="form.pcsn" disabled clearable style="width: 210px"/>
<el-input v-model="form.pcsn" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="物料数量" prop="qty">
<el-input v-model="form.qty" disabled clearable style="width: 210px"/>
<el-input v-model="form.qty" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="载具编号" prop="vehicle_code">
<el-input v-model="form.vehicle_code" disabled clearable style="width: 210px"/>
<el-input v-model="form.vehicle_code" disabled clearable style="width: 210px" />
</el-form-item>
<el-form-item label="单据状态" prop="status">
<el-select
@@ -57,12 +64,12 @@
<el-form-item label="创建时间" prop="create_time">
<!-- <el-date-picker v-model="form.create_time" type="date" placeholder="选择日期" style="width: 210px"-->
<!-- value-format="yyyy-MM-dd" :disabled="true"/>-->
<el-input v-model="form.create_time" disabled clearable style="width: 210px"/>
<el-input v-model="form.create_time" disabled clearable style="width: 210px" />
</el-form-item>
<template v-for="(col,index) in cols">
<el-form-item label="col.lable" prop="bill_code">
<label slot="label">{{ col.lable }}:</label>
<el-input disabled v-model="form.form_data[col.value]" :value="col.value" clearable style="width: 210px"/>
<el-input v-model="form.form_data[col.value]" disabled :value="col.value" clearable style="width: 210px" />
</el-form-item>
</template>
</el-form>
@@ -82,15 +89,15 @@
:header-cell-style="{background:'#f5f7fa',color:'#606266'}"
@current-change="handleDtlCurrentChange"
>
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120"/>
<el-table-column prop="form_type" label="单据类型" show-overflow-tooltip width="120" />
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120"/>
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120"/>
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120"/>
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120"/>
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip/>
<el-table-column prop="assign_qty" label="分配数量" show-overflow-tooltip/>
<el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120"/>
<el-table-column prop="material_id" label="物料id" show-overflow-tooltip width="120" />
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip width="120" />
<el-table-column prop="material_spec" label="物料规格" show-overflow-tooltip width="120" />
<el-table-column prop="pcsn" label="批次" show-overflow-tooltip width="120" />
<el-table-column prop="qty" label="物料数量" show-overflow-tooltip />
<el-table-column prop="assign_qty" label="分配数量" show-overflow-tooltip />
<el-table-column prop="vehicle_code" label="载具编号" show-overflow-tooltip width="120" />
<el-table-column prop="status" label="单据状态" show-overflow-tooltip width="120">
<template slot-scope="scope">
<template v-for="item in formStatus">
@@ -98,16 +105,21 @@
</template>
</template>
</el-table-column>
<el-table-column prop="source_form_id" label="业务单据id" show-overflow-tooltip width="120"/>
<el-table-column prop="source_form_type" label="业务单据类型" show-overflow-tooltip width="120"/>
<el-table-column prop="source_form_date" label="业务单据时间" show-overflow-tooltip width="130"/>
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120"/>
<el-table-column width="130" show-overflow-tooltip v-for="(item, index) in dtlCols" :key="item.value"
:label="item.lable">
<el-table-column prop="source_form_id" label="业务单据id" show-overflow-tooltip width="120" />
<el-table-column prop="source_form_type" label="业务单据类型" show-overflow-tooltip width="120" />
<el-table-column prop="source_form_date" label="业务单据时间" show-overflow-tooltip width="130" />
<el-table-column prop="parent_id" label="父单据数据id" show-overflow-tooltip width="120" />
<el-table-column
v-for="(item, index) in dtlCols"
:key="item.value"
width="130"
show-overflow-tooltip
:label="item.lable"
>
<template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
</el-table-column>
<el-table-column prop="create_time" label="创建时间"/>
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120"/>
<el-table-column prop="create_time" label="创建时间" />
<el-table-column prop="proc_inst_id" label="对应流程实例id" show-overflow-tooltip width="120" />
</el-table>
</el-card>
</el-dialog>
@@ -115,9 +127,9 @@
<script>
import {crud} from '@crud/crud'
import crudFormData, {getSonFormData} from './formData'
//import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
import { crud } from '@crud/crud'
import crudFormData, { getSonFormData } from './formData'
// import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
export default {
name: 'ViewDialog',
@@ -179,7 +191,7 @@ export default {
setForm(row) {
this.dialogVisible = true
this.form = row
let dtl_form_type = this.form.children[0].form_type;
const dtl_form_type = this.form.children[0].form_type
// formstruc.getHeader(this.form.form_type).then(res => {
// this.cols = res
// })
@@ -230,7 +242,7 @@ export default {
},
queryTableDdis() {
if (this.currentdtl !== null) {
crudProductIn.getVehicleTask({'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id}).then(res => {
crudProductIn.getVehicleTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
this.tabledis = res
}).catch(() => {
this.tabledis = []

3
nladmin-ui/src/views/wms/pm_manage/form_data/index.vue
View File

@@ -83,8 +83,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
</crudOperation>
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="820px">
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="135px" label-suffix=":">

25
nladmin-ui/src/views/wms/pm_manage/form_data2/ViewDialog.vue
View File

@@ -8,19 +8,26 @@
@close="close"
@open="open"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true"
:model="form" size="mini" label-width="100px" label-suffix=":">
<el-form
ref="form"
style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;"
:inline="true"
:model="form"
size="mini"
label-width="100px"
label-suffix=":"
>
<el-form-item :label="$t('wms.pm_manage.form_data2.form_code')" prop="code">
<el-input v-model="form.code" disabled :placeholder="$t('wms.pm_manage.form_data2.system_generated')" style="width: 210px"/>
<el-input v-model="form.code" disabled :placeholder="$t('wms.pm_manage.form_data2.system_generated')" style="width: 210px" />
</el-form-item>
<el-form-item :label="$t('wms.pm_manage.form_data2.form_type')" prop="form_type">
<el-input v-model="form.form_type" disabled style="width: 210px"/>
<el-input v-model="form.form_type" disabled style="width: 210px" />
</el-form-item>
<el-form-item :label="$t('wms.pm_manage.form_data2.form_date')" prop="source_form_date">
<el-input v-model="form.source_form_date" disabled style="width: 210px"/>
<el-input v-model="form.source_form_date" disabled style="width: 210px" />
</el-form-item>
<el-form-item :label="$t('wms.pm_manage.form_data2.material_qty')" prop="qty">
<el-input v-model="form.qty" disabled style="width: 210px"/>
<el-input v-model="form.qty" disabled style="width: 210px" />
</el-form-item>
<el-form-item :label="$t('wms.pm_manage.form_data2.form_status')" prop="status">
<el-select
@@ -39,7 +46,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('wms.pm_manage.form_data2.create_time')" prop="create_time">
<el-input v-model="form.create_time" disabled clearable style="width: 210px"/>
<el-input v-model="form.create_time" disabled clearable style="width: 210px" />
</el-form-item>
</el-form>
<div class="crud-opts2">
@@ -74,9 +81,9 @@
<script>
import {crud} from '@crud/crud'
import { crud } from '@crud/crud'
import i18n from '@/i18n'
import crudFormData, {getSonFormData} from './formData'
import crudFormData, { getSonFormData } from './formData'
export default {
name: 'ViewDialog',

6
nladmin-ui/src/views/wms/sch/point/PointDialog.vue
View File

@@ -58,12 +58,12 @@
<el-table-column prop="point_name" :label="$t('wms.sch.point.point_code')" width="180" show-overflow-tooltip />
<el-table-column prop="region_code" :label="$t('wms.sch.point.region_code')" :min-width="flexWidth('region_code',crud.data,$t('wms.sch.point.region_code'))" />
<el-table-column prop="region_name" :label="$t('wms.sch.point.region_name')" :min-width="flexWidth('region_name',crud.data,$t('wms.sch.point.region_name'))" />
<el-table-column prop="point_type_name" :label="$t('wms.sch.point.point_type')" :min-width="flexWidth('point_type_name',crud.data,$t('wms.sch.point.point_type'))"/>
<el-table-column prop="point_status_name" :label="$t('wms.sch.point.point_status')" :min-width="flexWidth('point_status_name',crud.data,$t('wms.sch.point.point_status'))"/>
<el-table-column prop="point_type_name" :label="$t('wms.sch.point.point_type')" :min-width="flexWidth('point_type_name',crud.data,$t('wms.sch.point.point_type'))" />
<el-table-column prop="point_status_name" :label="$t('wms.sch.point.point_status')" :min-width="flexWidth('point_status_name',crud.data,$t('wms.sch.point.point_status'))" />
<el-table-column prop="remark" :label="$t('wms.sch.point.remark')" :min-width="flexWidth('remark',crud.data,$t('wms.sch.point.remark'))" />
<el-table-column prop="is_used" :label="$t('wms.sch.point.is_used')" :min-width="flexWidth('is_used',crud.data,$t('wms.sch.point.is_used'))">
<template slot-scope="scope">
{{scope.row.is_used?$t('common.Yes'):$t('common.No')}}
{{ scope.row.is_used?$t('common.Yes'):$t('common.No') }}
</template>
</el-table-column>
</el-table>

40
nladmin-ui/src/views/wms/sch/point/ViewDialog.vue
View File

@@ -14,31 +14,31 @@
</div>
<el-form ref="form" disabled :inline="true" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item :label="$t('wms.sch.point.region_code')">
<el-input v-model="form.region_code" style="width: 200px;"/>
<el-input v-model="form.region_code" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.region_name')">
<el-input v-model="form.region_name" style="width: 200px;"/>
<el-input v-model="form.region_name" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.point_code')">
<el-input v-model="form.point_code" style="width: 200px;"/>
<el-input v-model="form.point_code" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.point_name')">
<el-input v-model="form.point_name" style="width: 200px;"/>
<el-input v-model="form.point_name" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.point_type')">
<el-input v-model="form.point_type_name" style="width: 200px;"/>
<el-input v-model="form.point_type_name" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.point_status')">
<el-input v-model="form.point_status_name" style="width: 200px;"/>
<el-input v-model="form.point_status_name" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.vehicle_type')">
<el-input v-model="form.vehicle_type" style="width: 200px;"/>
<el-input v-model="form.vehicle_type" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.vehicle_code')">
<el-input v-model="form.vehicle_code" style="width: 200px;"/>
<el-input v-model="form.vehicle_code" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.vehicle_qty')">
<el-input v-model="form.vehicle_qty" style="width: 200px;"/>
<el-input v-model="form.vehicle_qty" style="width: 200px;" />
</el-form-item>
</el-form>
@@ -51,37 +51,37 @@
</div>
<el-form ref="form" disabled :inline="true" :model="groups" :rules="rules" size="mini" label-width="100px">
<el-form-item :label="$t('wms.sch.point.material_code')">
<el-input v-model="groups.material_code" style="width: 200px;"/>
<el-input v-model="groups.material_code" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.material_name')">
<el-input v-model="groups.material_name" style="width: 200px;"/>
<el-input v-model="groups.material_name" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.material_spec')">
<el-input v-model="groups.material_spec" style="width: 200px;"/>
<el-input v-model="groups.material_spec" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.raw_material_code')">
<el-input v-model="groups.raw_material_code" style="width: 200px;"/>
<el-input v-model="groups.raw_material_code" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.pcsn')">
<el-input v-model="groups.pcsn" style="width: 200px;"/>
<el-input v-model="groups.pcsn" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.material_qty')">
<el-input v-model="groups.material_qty" style="width: 200px;"/>
<el-input v-model="groups.material_qty" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.material_weight')">
<el-input v-model="groups.material_weight" style="width: 200px;"/>
<el-input v-model="groups.material_weight" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.equipment')">
<el-input v-model="groups.point_name" style="width: 200px;"/>
<el-input v-model="groups.point_name" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.instorage_time')">
<el-input v-model="groups.instorage_time" style="width: 200px;"/>
<el-input v-model="groups.instorage_time" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.standing_time')">
<el-input v-model="groups.standing_time" style="width: 200px;"/>
<el-input v-model="groups.standing_time" style="width: 200px;" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.bind_status')">
<el-input v-model="groups.group_bind_material_status_name" style="width: 200px;"/>
<el-input v-model="groups.group_bind_material_status_name" style="width: 200px;" />
</el-form-item>
</el-form>
</el-card>

26
nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -110,7 +110,7 @@
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" >
<crudOperation :permission="permission">
<el-button
v-if="crud.query.is_used == 'false'"
slot="right"
@@ -232,7 +232,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('wms.sch.point.parent_code')" prop="vehicle_code">
<el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint"/>
<el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint" />
</el-form-item>
<el-form-item v-if="form.point_status !== '1'" :label="$t('wms.sch.point.vehicle_code')" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
@@ -243,8 +243,8 @@
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('wms.sch.point.can_vehicle_types')" prop="can_vehicle_types">
@@ -253,12 +253,12 @@
v-for="item in dict.vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('wms.sch.point.vehicle_qty')" prop="vehicle_qty">
<el-input-number style="width: 370px;" :controls="false" class="clear-number-input" v-model="form.vehicle_qty" :min="0" :precision="0" :max="99999" :label="$t('wms.sch.point.vehicle_qty')" size="mini" />
<el-input-number v-model="form.vehicle_qty" style="width: 370px;" :controls="false" class="clear-number-input" :min="0" :precision="0" :max="99999" :label="$t('wms.sch.point.vehicle_qty')" size="mini" />
</el-form-item>
<el-form-item :label="$t('wms.sch.point.is_has_workder')">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
@@ -283,13 +283,13 @@
<el-table-column prop="point_name" :label="$t('wms.sch.point.point_name')" :min-width="flexWidth('point_name',crud.data,$t('wms.sch.point.point_name'))" />
<el-table-column prop="region_code" :label="$t('wms.sch.point.region_code')" :min-width="flexWidth('region_code',crud.data,$t('wms.sch.point.region_code'))" />
<el-table-column prop="region_name" :label="$t('wms.sch.point.region_name')" :min-width="flexWidth('region_name',crud.data,$t('wms.sch.point.region_name'))" />
<el-table-column prop="point_type_name" :label="$t('wms.sch.point.point_type')" :min-width="flexWidth('point_type_name',crud.data,$t('wms.sch.point.point_type'))"/>
<el-table-column prop="point_status" :label="$t('wms.sch.point.point_status')" :formatter="bill_typeFormat" :min-width="flexWidth('point_status',crud.data,$t('wms.sch.point.point_type'))"/>
<el-table-column prop="point_type_name" :label="$t('wms.sch.point.point_type')" :min-width="flexWidth('point_type_name',crud.data,$t('wms.sch.point.point_type'))" />
<el-table-column prop="point_status" :label="$t('wms.sch.point.point_status')" :formatter="bill_typeFormat" :min-width="flexWidth('point_status',crud.data,$t('wms.sch.point.point_type'))" />
<el-table-column prop="vehicle_code" :label="$t('wms.sch.point.vehicle_code')" :min-width="flexWidth('vehicle_code',crud.data,$t('wms.sch.point.vehicle_code'))" />
<el-table-column prop="vehicle_qty" :label="$t('wms.sch.point.vehicle_qty')" :min-width="flexWidth('vehicle_qty',crud.data,$t('wms.sch.point.vehicle_qty'))" />
<el-table-column :label="$t('wms.sch.point.is_locked')" :min-width="flexWidth('vehicle_qty',crud.data,$t('wms.sch.point.is_locked'))">
<template slot-scope="scope">
{{scope.row.ing_task_code ? $t('wms.sch.point.yes') : $t('wms.sch.point.no')}}
{{ scope.row.ing_task_code ? $t('wms.sch.point.yes') : $t('wms.sch.point.no') }}
</template>
</el-table-column>
<el-table-column :label="$t('wms.sch.point.is_used')" align="center" prop="is_used" :min-width="flexWidth('is_used',crud.data,$t('wms.sch.point.is_used'))">
@@ -308,7 +308,7 @@
<el-table-column prop="ing_task_code" :label="$t('wms.sch.point.current_task')" :min-width="flexWidth('ing_task_code',crud.data,$t('wms.sch.point.executing_task'))" />
<el-table-column prop="is_auto" :label="$t('wms.sch.point.is_auto')" :min-width="flexWidth('is_auto',crud.data,$t('wms.sch.point.is_auto'))">
<template slot-scope="scope">
{{scope.row.is_auto ? $t('wms.sch.point.yes') : $t('wms.sch.point.no')}}
{{ scope.row.is_auto ? $t('wms.sch.point.yes') : $t('wms.sch.point.no') }}
</template>
</el-table-column>
<el-table-column prop="remark" :label="$t('wms.sch.point.remark')" :min-width="flexWidth('remark',crud.data,$t('wms.sch.point.remark'))" />
@@ -336,8 +336,8 @@
<!--分页组件-->
<pagination />
</div>
<ViewDialog ref="viewDialog"/>
<PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged"/>
<ViewDialog ref="viewDialog" />
<PointDialog :dialog-show.sync="pointDialog" :is-single="false" @tableChanged="tableChanged" />
</div>
</template>

9
nladmin-ui/src/views/wms/sch/region/index.vue
View File

@@ -46,8 +46,9 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="520px">
<el-form style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
width="520px"
>
<el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item :label="$t('wms.sch.region.workshop')">
<el-select
v-model="form.workshop_code"
@@ -62,7 +63,7 @@
</el-select>
</el-form-item>
<el-form-item :label="$t('wms.sch.region.region_code')">
<el-input v-model="form.region_code" style="width: 370px;" :disabled="crud.status.edit===1"/>
<el-input v-model="form.region_code" style="width: 370px;" :disabled="crud.status.edit===1" />
</el-form-item>
<el-form-item :label="$t('wms.sch.region.region_name')">
<el-input v-model="form.region_name" style="width: 370px;" />
@@ -108,7 +109,7 @@
<el-table-column prop="point_status_explain" :label="$t('wms.sch.region.point_status_explain')" :min-width="flexWidth('point_status_explain',crud.data,$t('wms.sch.region.point_status_explain'))" />
<el-table-column prop="is_has_workder" :label="$t('wms.sch.region.is_has_workder')" :min-width="flexWidth('is_has_workder',crud.data,$t('wms.sch.region.is_has_workder'))">
<template slot-scope="scope">
{{scope.row.is_has_workder ? $t('wms.sch.region.yes') : $t('wms.sch.region.no')}}
{{ scope.row.is_has_workder ? $t('wms.sch.region.yes') : $t('wms.sch.region.no') }}
</template>
</el-table-column>
<el-table-column prop="workshop_code" :label="$t('wms.sch.region.workshop_code')" :min-width="flexWidth('workshop_code',crud.data,$t('wms.sch.region.workshop_code'))" />

31
nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -32,12 +32,13 @@
</el-form-item>
<el-form-item label="任务名称">
<label slot="label">{{ $t('wms.sch.task.task_name') }}:</label>
<el-select v-model="query.config_code" :placeholder="$t('common.Please_select')" style="width: 240px" @change="crud.toQuery" clearable>
<el-select v-model="query.config_code" :placeholder="$t('common.Please_select')" style="width: 240px" clearable @change="crud.toQuery">
<el-option
v-for="item in taskConfigList"
:key="item.config_id"
:label="item.task_name"
:value="item.config_code">
:value="item.config_code"
>
<span style="float: left">{{ item.config_code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.task_name }}</span>
</el-option>
@@ -60,8 +61,8 @@
range-separator="至"
:start-placeholder="$t('common.start_date')"
:end-placeholder="$t('common.end_date')"
@change="crud.toQuery">
</el-date-picker>
@change="crud.toQuery"
/>
</el-form-item>
<el-form-item label="任务状态">
<el-select
@@ -122,9 +123,9 @@
<el-form-item :label="$t('wms.sch.task.vehicle_code')">
<el-input v-model="form.vehicle_code" style="width: 240px;" />
</el-form-item>
<!-- <el-form-item label="优先级">-->
<!-- <el-input v-model="form.priority" style="width: 240px;" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="优先级">-->
<!-- <el-input v-model="form.priority" style="width: 240px;" />-->
<!-- </el-form-item>-->
<el-form-item v-if="false" :label="$t('wms.sch.task.handle_class')">
<el-input v-model="form.handle_class" style="width: 240px;" />
</el-form-item>
@@ -184,7 +185,7 @@
{{ scope.row.vehicle_code2 ? scope.row.vehicle_code2 : '-' }}
</template>
</el-table-column>-->
<!-- <el-table-column prop="task_class_id" label="任务分类" :min-width="flexWidth('task_class_id',crud.data,'任务分类')" />-->
<!-- <el-table-column prop="task_class_id" label="任务分类" :min-width="flexWidth('task_class_id',crud.data,'任务分类')" />-->
<el-table-column prop="task_status" :label="$t('wms.sch.task.task_status')" :min-width="flexWidth('task_status',crud.data,'任务状态')">
<template slot-scope="scope">
{{ getStatusName(scope.row.task_status) }}
@@ -195,7 +196,7 @@
<el-table-column prop="task_name" :label="$t('wms.sch.task.config_name')" :min-width="flexWidth('task_name',crud.data,'任务名称')" />
<el-table-column prop="point_code1" :label="$t('wms.sch.task.start_point')" :min-width="flexWidth('point_code1',crud.data,'起点')" />
<el-table-column prop="point_code2" :label="$t('wms.sch.task.end_point')" :min-width="flexWidth('point_code2',crud.data,'终点')" />
<!-- <el-table-column prop="point_code3" :label="$t('wms.sch.task.start_point2')" :min-width="flexWidth('point_code3',crud.data,'点位3')" />
<!-- <el-table-column prop="point_code3" :label="$t('wms.sch.task.start_point2')" :min-width="flexWidth('point_code3',crud.data,'点位3')" />
<el-table-column prop="point_code4" :label="$t('wms.sch.task.end_point2')" :min-width="flexWidth('point_code4',crud.data,'点位4')" />-->
<el-table-column prop="vehicle_type" :label="$t('wms.sch.task.vehicle_type')" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')">
<template slot-scope="scope">
@@ -207,14 +208,14 @@
<el-table-column v-if="false" prop="handle_class" :label="$t('wms.sch.task.handle_class')" :min-width="flexWidth('handle_class',crud.data,'处理类')" />
<el-table-column v-if="false" prop="handle_status" :label="$t('wms.sch.task.handle_status')" :min-width="flexWidth('handle_status',crud.data,'处理状态')" />
<el-table-column prop="car_no" :label="$t('wms.sch.task.car_no')" :min-width="flexWidth('car_no',crud.data,'车号')" />
<!-- <el-table-column prop="task_group_id" :label="$t('wms.sch.task.task_group_id')" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')" />-->
<!-- <el-table-column prop="task_group_id" :label="$t('wms.sch.task.task_group_id')" :min-width="flexWidth('task_group_id',crud.data,'任务组标识')" />-->
<el-table-column prop="task_group_seq" :label="$t('wms.sch.task.task_group_seq')" :min-width="flexWidth('task_group_seq',crud.data,'任务组顺序号')" />
<el-table-column prop="finished_type" :label="$t('wms.sch.task.finished_type')" :min-width="flexWidth('finished_type',crud.data,'任务完成类型')">
<template slot-scope="scope">
{{ dict.label.finished_type[scope.row.finished_type]?dict.label.finished_type[scope.row.finished_type]:$t('wms.sch.task.unfinished') }}
</template>
</el-table-column>
<el-table-column prop="create_mode" :label="$t('wms.sch.task.create_mode')" :min-width="flexWidth('create_mode',crud.data,'生成方式')" >
<el-table-column prop="create_mode" :label="$t('wms.sch.task.create_mode')" :min-width="flexWidth('create_mode',crud.data,'生成方式')">
<template slot-scope="scope">
{{ dict.label.create_mode[scope.row.create_mode] }}
</template>
@@ -223,14 +224,14 @@
<el-table-column prop="request_param" :label="$t('wms.sch.task.request_param')" :min-width="flexWidth('request_param',crud.data,'生成任务的请求参数')" />
<el-table-column prop="response_param" :label="$t('wms.sch.task.response_param')" :min-width="flexWidth('response_param',crud.data,'下发任务的请求参数')" />
<el-table-column prop="workshop_code" :label="$t('wms.sch.task.workshop_code')" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<!-- <el-table-column prop="ext_group_data" :label="$t('wms.sch.task.ext_group_data')" :min-width="flexWidth('ext_group_data',crud.data,'额外组盘信息')" />-->
<!-- <el-table-column prop="ext_group_data" :label="$t('wms.sch.task.ext_group_data')" :min-width="flexWidth('ext_group_data',crud.data,'额外组盘信息')" />-->
<el-table-column prop="create_name" :label="$t('common.create_name')" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" :label="$t('common.create_time')" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" :label="$t('common.update_name')" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" :label="$t('common.update_time')" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" :label="$t('common.operation')" width="160px" align="center" fixed="right">
<template slot-scope="scope">
<!-- <el-button
<!-- <el-button
type="text"
icon="el-icon-upload"
@click="doOperate(scope.row, 'c')"
@@ -238,14 +239,14 @@
<el-button
type="text"
icon="el-icon-success"
@click="doOperate(scope.row, 'a')"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
@click="doOperate(scope.row, 'a')"
>{{ $t('wms.sch.task.complete') }}</el-button>
<el-button
type="text"
icon="el-icon-error"
@click="doOperate(scope.row, 'b')"
:disabled="scope.row.task_status==='5' || scope.row.task_status==='6'"
@click="doOperate(scope.row, 'b')"
>{{ $t('wms.sch.task.cancel') }}</el-button>
</template>
</el-table-column>

4
nladmin-ui/src/views/wms/sch/taskconfig/index.vue
View File

@@ -279,7 +279,7 @@
</template>
</el-table-column>
<el-table-column prop="task_name" :label="$t('wms.sch.taskconfig.task_name')" :min-width="flexWidth('task_name',crud.data,$t('wms.sch.taskconfig.task_name'))" />
<!-- <el-table-column prop="task_type" :label="$t('wms.sch.taskconfig.task_type')" :min-width="flexWidth('task_type',crud.data,$t('wms.sch.taskconfig.task_type'), 20)" >
<!-- <el-table-column prop="task_type" :label="$t('wms.sch.taskconfig.task_type')" :min-width="flexWidth('task_type',crud.data,$t('wms.sch.taskconfig.task_type'), 20)" >
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
</template>
@@ -305,7 +305,7 @@
<el-table-column prop="start_point_pre" :label="$t('wms.sch.taskconfig.start_point_pre')" :min-width="flexWidth('start_point_pre',crud.data,$t('wms.sch.taskconfig.start_point_pre'))" />
<el-table-column prop="next_region_pre" :label="$t('wms.sch.taskconfig.next_region_pre')" :min-width="flexWidth('next_region_pre',crud.data,$t('wms.sch.taskconfig.next_region_pre'))" />
<el-table-column prop="route_plan_code" :label="$t('wms.sch.taskconfig.route_plan_code')" :min-width="flexWidth('route_plan_code',crud.data,$t('wms.sch.taskconfig.route_plan_code'))" />
<el-table-column prop="task_direction" :label="$t('wms.sch.taskconfig.task_direction')" :min-width="flexWidth('task_direction',crud.data,$t('wms.sch.taskconfig.task_direction'))" >
<el-table-column prop="task_direction" :label="$t('wms.sch.taskconfig.task_direction')" :min-width="flexWidth('task_direction',crud.data,$t('wms.sch.taskconfig.task_direction'))">
<template slot-scope="scope">
{{ dict.label.task_direction[scope.row.task_direction] }}
</template>

11
nladmin-ui/src/views/wms/st/movebill/AddDialog.vue
View File

@@ -47,7 +47,8 @@
<el-select
v-model="form.stor_id"
clearable
:placeholder="$t('wms.st.movebill.warehouse')",
:placeholder="$t('wms.st.movebill.warehouse')"
,
class="filter-item"
style="width: 210px"
:disabled="crud.status.view > 0"
@@ -64,7 +65,8 @@
<el-form-item :label="$t('wms.st.movebill.bill_type')" prop="bill_type">
<el-select
v-model="form.bill_type"
:placeholder="$t('wms.st.movebill.bill_type')",
:placeholder="$t('wms.st.movebill.bill_type')"
,
class="filter-item"
>
<el-option
@@ -78,7 +80,8 @@
<el-form-item :label="$t('wms.st.movebill.bill_status')" prop="bill_status">
<el-select
v-model="form.bill_status"
:placeholder="$t('wms.st.movebill.bill_status')",
:placeholder="$t('wms.st.movebill.bill_status')"
,
class="filter-item"
:disabled="true"
>
@@ -135,8 +138,8 @@
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
v-if="form.bill_type !== '30'"
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"

8
nladmin-ui/src/views/wms/st/movebill/index.vue
View File

@@ -106,7 +106,7 @@
type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
:start-placeholder="$t('wms.st.movebill.start_date')"
:end-placeholder="$t('wms.st.movebill.end_date')"
:end-placeholder="$t('wms.st.movebill.end_date')"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
@@ -164,11 +164,11 @@
<el-link type="warning" @click="crud.toView(scope.row)">{{ scope.row.bill_code }}</el-link>
</template>
</el-table-column>
<el-table-column :formatter="stateFormat" prop="bill_status" :label="$t('wms.st.movebill.bill_status')" :min-width="flexWidth('bill_status',crud.data,'单据状态')"/>
<el-table-column :formatter="stateFormat" prop="bill_status" :label="$t('wms.st.movebill.bill_status')" :min-width="flexWidth('bill_status',crud.data,'单据状态')" />
<el-table-column prop="stor_name" :label="$t('wms.st.movebill.warehouse')" :min-width="flexWidth('stor_name',crud.data,'仓库')" />
<el-table-column prop="bill_type" :formatter="bill_typeFormat" :label="$t('wms.st.movebill.bill_type')" :min-width="flexWidth('bill_type',crud.data,'业务类型')"/>
<el-table-column prop="bill_type" :formatter="bill_typeFormat" :label="$t('wms.st.movebill.bill_type')" :min-width="flexWidth('bill_type',crud.data,'业务类型')" />
<el-table-column prop="biz_date" :label="$t('wms.st.movebill.business_date')" :min-width="flexWidth('biz_date',crud.data,'业务日期')" />
<el-table-column :formatter="create_modeFormat" prop="create_mode" :label="$t('wms.st.movebill.create_mode')" :min-width="flexWidth('create_mode',crud.data,'生成方式')"/>
<el-table-column :formatter="create_modeFormat" prop="create_mode" :label="$t('wms.st.movebill.create_mode')" :min-width="flexWidth('create_mode',crud.data,'生成方式')" />
<el-table-column :label="$t('wms.st.movebill.detail_count')" prop="detail_count" :min-width="flexWidth('detail_count',crud.data,'明细数')" />
<el-table-column prop="input_optname" :label="$t('wms.st.movebill.created_by')" :min-width="flexWidth('input_optname',crud.data,'创建人')" />
<el-table-column prop="input_time" :label="$t('wms.st.movebill.created_date')" :min-width="flexWidth('input_time',crud.data,'创建日期')" />

16
nladmin-ui/src/views/wms/st/outbill/AddDialog.vue
View File

@@ -110,14 +110,14 @@
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="queryOrderDtl()"
>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="queryOrderDtl()"
>
{{ $t('wms.st.outbill.material_list') }}
</el-button>
<el-button

6
nladmin-ui/src/views/wms/st/outbill/StructIvt.vue
View File

@@ -83,9 +83,9 @@
<el-table-column show-overflow-tooltip prop="qty" :label="$t('wms.st.outbill.available_weight')" align="center" />
<el-table-column align="center" :label="$t('common.operation')" width="160" fixed="right">
<template scope="scope">
<el-button v-show="!scope.row.edit" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">{{ $t('common.edit') }}</el-button>
<el-button v-show="scope.row.edit" type="success" class="filter-item" size="mini" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">{{ $t('common.complete') }}</el-button>
</template>
<el-button v-show="!scope.row.edit" type="primary" class="filter-item" size="mini" icon="el-icon-edit" @click="handleEdit(scope.$index, scope.row)">{{ $t('common.edit') }}</el-button>
<el-button v-show="scope.row.edit" type="success" class="filter-item" size="mini" icon="el-icon-check" @click="handleEdit(scope.$index, scope.row)">{{ $t('common.complete') }}</el-button>
</template>
</el-table-column>
</el-table>
</el-dialog>