Browse Source

fix 前端页面

master
张江玮 2 years ago
parent
commit
3054a90c9c
  1. 6
      lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
  2. 8
      lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql
  3. 3
      lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java
  4. 1
      lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java
  5. 2
      lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java
  6. BIN
      lms/nladmin-system/src/main/java/org/nl/wms/wms.xls
  7. 4
      lms/nladmin-system/src/main/resources/config/application-dev.yml
  8. 36
      lms/nladmin-ui/src/views/wms/basedata/material/detail/index.vue
  9. 31
      lms/nladmin-ui/src/views/wms/basedata/material/index.vue
  10. 12
      lms/nladmin-ui/src/views/wms/pdm/device/index.vue
  11. 48
      lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue
  12. 19
      lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue
  13. 25
      lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue
  14. 61
      lms/nladmin-ui/src/views/wms/sch/point/index.vue
  15. 18
      lms/nladmin-ui/src/views/wms/sch/region/index.vue
  16. 1
      lms/nladmin-ui/src/views/wms/sch/task/index.vue

6
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java

@ -183,13 +183,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Transactional(rollbackFor = Exception.class)
public JSONObject apply(JSONObject param) {
String point_code = param.getString("device_code");
if (StrUtil.isBlank(point_code)) {
throw new BadRequestException("点位不能为空!");
}
String type = param.getString("type");
if (StrUtil.isBlank(type)) {
throw new BadRequestException("任务类型不能为空!");
}
if (StrUtil.isBlank(point_code)) {
throw new BadRequestException("点位不能为空!");
}
RLock lock = redissonClient.getFairLock("acs_to_wms:" + point_code);
boolean try_lock = false;
String task_code = null;

8
lms/nladmin-system/src/main/java/org/nl/wms/pdm/wql/MPS_PRODUCEDURE001.wql

@ -69,17 +69,17 @@
find_in_set( ShiftOrder.order_status, 输入.order_status)
ENDOPTION
OPTION 输入.begin_time <> ""
ShiftOrder.planproducestart_date >= 输入.begin_time
ShiftOrder.realproducestart_date >= 输入.begin_time
ENDOPTION
OPTION 输入.end_time <> ""
ShiftOrder.planproduceend_date <= 输入.end_time
ShiftOrder.realproduceend_date <= 输入.end_time
ENDOPTION
OPTION 输入.produceorder_code <> ""
ShiftOrder.produceorder_code like 输入.produceorder_code
ShiftOrder.workorder_code like 输入.produceorder_code
ENDOPTION
OPTION 输入.material <> ""
(
material.material_code like '%' 输入.material '%'
material.material_code like 输入.material
)
ENDOPTION
ENDSELECT

3
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java

@ -10,6 +10,7 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.sch.AcsUtil;
import org.nl.wms.sch.task.AcsTaskDTO;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
@ -25,11 +26,13 @@ import java.util.List;
* @created 2020年6月12日 下午5:53:28
*/
public abstract class AbstractAcsTask {
/**
* @discription 在如果任务无法形成会一直定时刷新判断
* @author ldjun
* @created 2020年6月12日 下午5:55:25
*/
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
public List<AcsTaskDTO> schedule() {
this.autoCreate();
this.findStartPoint();

1
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoCreateTask.java

@ -13,6 +13,7 @@ import org.nl.wms.sch.AcsUtil;
import org.nl.wms.sch.task.AcsTaskDTO;
import org.reflections.Reflections;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/SZSendMaterialTask.java

@ -7,11 +7,9 @@ import lombok.RequiredArgsConstructor;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.wms.basedata.eum.VehicleType;
import org.nl.wms.sch.manage.*;
import org.nl.wms.sch.task.util.TaskUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* @author zhangjiangwei

BIN
lms/nladmin-system/src/main/java/org/nl/wms/wms.xls

Binary file not shown.

4
lms/nladmin-system/src/main/resources/config/application-dev.yml

@ -6,9 +6,9 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:lnsh_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lnsh_lms3}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:P@ssw0rd}
password: ${DB_PWD:123456}
# 初始连接数
initial-size: 5
# 最小连接数

36
lms/nladmin-ui/src/views/wms/basedata/material/detail/index.vue

@ -10,9 +10,9 @@
:before-close="crud.cancelCU"
:visible.sync="crud.status.cu > 0"
:title="crud.status.title"
width="500px"
width="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="">
<el-form-item label="物料编码" prop="material_code">
<el-input v-model="form.material_code" style="width: 370px;" />
</el-form-item>
@ -36,7 +36,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button type="info" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
@ -47,9 +47,7 @@
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column
prop="material_code"
label="物料编码"
@ -82,11 +80,13 @@
/>
<el-table-column prop="brick_type" label="砖型" :min-width="flexWidth('brick_type',crud.data,'砖型')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'创建人')" />
<el-table-column prop="update_time" label="最后修改时间" :min-width="flexWidth('update_time',crud.data,'创建人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'创建人')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation
:is-visiable-del="false"
:data="scope.row"
:permission="permission"
/>
@ -133,7 +133,14 @@ export default {
url: 'api/materialDetail',
idField: 'material_id',
sort: 'material_id,desc',
crudMethod: { ...crudMaterialDetail }
crudMethod: { ...crudMaterialDetail },
optShow: {
add: false,
edit: false,
del: false,
download: false,
reset: true
}
})
},
data() {
@ -142,21 +149,6 @@ export default {
rules: {
material_code: [
{ required: true, message: '物料编码不能为空', trigger: 'blur' }
],
order_number: [
{ required: true, message: '订单编号不能为空', trigger: 'blur' }
],
customer_name: [
{ required: true, message: '客户名称不能为空', trigger: 'blur' }
],
product_name: [
{ required: true, message: '产品名称不能为空', trigger: 'blur' }
],
product_grade: [
{ required: true, message: '产品牌号不能为空', trigger: 'blur' }
],
brick_type: [
{ required: true, message: '砖型不能为空', trigger: 'blur' }
]
}
}

31
lms/nladmin-ui/src/views/wms/basedata/material/index.vue

@ -10,12 +10,11 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="编码名称">
<el-form-item label="物料编码">
<el-input
v-model="query.name"
clearable
size="mini"
placeholder="编码名称"
placeholder="物料编码"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@ -122,19 +121,19 @@
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column prop="material_code" label="物料编码" width="260" show-overflow-tooltip />
<el-table-column prop="standing_time" label="困料时间" width="75" />
<el-table-column prop="threshold_time" label="超时时间" width="75" />
<el-table-column prop="weight" label="单重" width="75" />
<el-table-column prop="product_code" label="产品编号" width="75" />
<el-table-column prop="a" label="长边长度" width="75" />
<el-table-column prop="b" label="短边长度" width="75" />
<el-table-column prop="h" label="梯形高度" width="75" />
<el-table-column prop="w" label="砖块厚度" width="75" />
<el-table-column prop="create_name" label="创建人" width="75" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column prop="update_optname" label="修改人" width="75" />
<el-table-column prop="update_time" label="修改时间" width="135" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="standing_time" label="困料时间" :min-width="flexWidth('standing_time',crud.data,'困料时间')" />
<el-table-column prop="threshold_time" label="超时时间" :min-width="flexWidth('threshold_time',crud.data,'超时时间')" />
<el-table-column prop="weight" label="单重" :min-width="flexWidth('weight',crud.data,'单重')" />
<el-table-column prop="product_code" label="产品编号" :min-width="flexWidth('product_code',crud.data,'产品编号')" />
<el-table-column prop="a" label="长边长度" :min-width="flexWidth('a',crud.data,'长边长度')" />
<el-table-column prop="b" label="短边长度" :min-width="flexWidth('b',crud.data,'短边长度')" />
<el-table-column prop="h" label="梯形高度" :min-width="flexWidth('h',crud.data,'梯形高度')" />
<el-table-column prop="w" label="砖块厚度" :min-width="flexWidth('w',crud.data,'砖块厚度')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column
v-permission="[]"
label="操作"

12
lms/nladmin-ui/src/views/wms/pdm/device/index.vue

@ -97,16 +97,16 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="device_code" label="设备编码" />
<el-table-column prop="device_name" label="设备名称" min-width="100" show-overflow-tooltip />
<el-table-column prop="region_name" label="所属区域" />
<el-table-column prop="device_model" label="设备类型" min-width="100" show-overflow-tooltip>
<el-table-column prop="device_code" label="设备编码" :min-width="flexWidth('device_code',crud.data,'设备编码')" />
<el-table-column prop="device_name" label="设备名称" :min-width="flexWidth('device_name',crud.data,'设备名称')" />
<el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
<el-table-column prop="device_model" label="设备类型" :min-width="flexWidth('device_model',crud.data,'设备类型')">
<template slot-scope="scope">
{{ dict.label.pdm_device_type[scope.row.device_model] }}
</template>
</el-table-column>
<el-table-column prop="productivity" label="设备产能" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="productivity" label="设备产能" :min-width="flexWidth('productivity',crud.data,'设备产能')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

48
lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@ -118,13 +118,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="计划数量/重量" prop="plan_qty">
<el-input v-model="form.plan_qty" type="number" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="生产设备" prop="device_name">
@ -138,6 +131,13 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="计划数量/重量" prop="plan_qty">
<el-input v-model="form.plan_qty" type="number" style="width: 300px" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item v-show="typeof (form.region_code) === 'string' && form.region_code === 'FJ'" label="木托盘类型" prop="vehicle_type">
@ -185,43 +185,43 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="生产班次工单标识" />
<el-table-column prop="workorder_code" label="工单编号" width="120px">
<el-table-column prop="workorder_code" label="工单编号" :min-width="flexWidth('workorder_code',crud.data,'工单编号')">
<!-- <template slot-scope="scope">-->
<!-- <el-link type="warning" @click="toView(scope.row)">{{ scope.row.produceorder_code }}</el-link>-->
<!-- </template>-->
</el-table-column>
<el-table-column prop="order_status" label="工单状态">
<el-table-column prop="order_status" label="工单状态" :min-width="flexWidth('order_status',crud.data,'工单状态')">
<template slot-scope="scope">
{{ dict.label.pdm_workorder_status[scope.row.order_status] }}
</template>
</el-table-column>
<el-table-column prop="device_name" label="设备" width="100" show-overflow-tooltip />
<el-table-column prop="material_code" label="物料编码" width="260" show-overflow-tooltip />
<el-table-column prop="vehicle_type" label="载具类型" min-width="120" show-overflow-tooltip>
<el-table-column prop="device_name" label="设备" :min-width="flexWidth('device_name',crud.data,'设备')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="plan_qty" label="计划数量" />
<el-table-column prop="is_urgent" label="是否加急">
<el-table-column prop="plan_qty" label="计划数量/重量" :min-width="flexWidth('plan_qty',crud.data,'计划数量/重量')" />
<el-table-column prop="is_urgent" label="是否加急" :min-width="flexWidth('is_urgent',crud.data,'是否加急')">
<template slot-scope="scope">
{{ dict.label.true_or_false[scope.row.is_urgent] }}
</template>
</el-table-column>
<el-table-column prop="is_pri" label="是否优先包装" width="100">
<el-table-column prop="is_pri" label="是否优先包装" :min-width="flexWidth('is_pri',crud.data,'是否优先包装')">
<template slot-scope="scope">
{{ dict.label.true_or_false[scope.row.is_pri] }}
</template>
</el-table-column>
<el-table-column prop="realproducestart_date" label="实际开始时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="realproduceend_date" label="实际结束时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="real_qty" label="实际数量" />
<el-table-column prop="qualified_qty" label="合格数量" />
<el-table-column prop="unqualified_qty" label="不合格数量" width="100" />
<el-table-column prop="create_name" label="创建人" />
<el-table-column prop="create_time" label="创建时间" width="150" />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column prop="realproducestart_date" label="实际开始时间" :min-width="flexWidth('realproducestart_date',crud.data,'实际开始时间')" />
<el-table-column prop="realproduceend_date" label="实际结束时间" :min-width="flexWidth('realproduceend_date',crud.data,'实际结束时间')" />
<el-table-column prop="real_qty" label="实际数量" :min-width="flexWidth('real_qty',crud.data,'实际数量')" />
<el-table-column prop="qualified_qty" label="合格数量" :min-width="flexWidth('qualified_qty',crud.data,'合格数量')" />
<el-table-column prop="unqualified_qty" label="不合格数量" :min-width="flexWidth('unqualified_qty',crud.data,'不合格数量')" />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

19
lms/nladmin-ui/src/views/wms/pub/DeviceDialog.vue

@ -12,15 +12,14 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
label-width="90px"
label-suffix=""
>
<el-form-item label="编码名称">
<el-form-item label="编码/名称">
<el-input
v-model="query.search"
clearable
size="mini"
placeholder="编码名称"
placeholder="编码/名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@ -46,15 +45,15 @@
</template>
</el-table-column>
<el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
<el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
<el-table-column prop="device_model" label="设备型号" show-overflow-tooltip>
<el-table-column prop="device_code" label="设备编码" :min-width="flexWidth('device_code',crud.data,'设备编码')" />
<el-table-column prop="device_name" label="设备名称" :min-width="flexWidth('device_name',crud.data,'设备名称')" />
<el-table-column prop="device_model" label="设备型号" :min-width="flexWidth('device_model',crud.data,'设备型号')">
<template slot-scope="scope">
{{ dict.label.pdm_device_type[scope.row.device_model] }}
</template>
</el-table-column>
<el-table-column prop="region_name" label="所属区域" show-overflow-tooltip />
<el-table-column prop="extend_code" label="外部编码" show-overflow-tooltip />
<el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
<el-table-column prop="extend_code" label="外部编码" :min-width="flexWidth('extend_code',crud.data,'外部编码')" />
</el-table>
<!--分页组件-->
<pagination />

25
lms/nladmin-ui/src/views/wms/pub/MaterDialog.vue

@ -12,14 +12,13 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
label-width="90px"
label-suffix=""
>
<el-form-item label="物料编码">
<el-input
v-model="query.name"
clearable
size="mini"
placeholder="物料编码"
@keyup.enter.native="crud.toQuery"
/>
@ -46,19 +45,19 @@
<el-radio v-model="tableRadio" :label="scope.row"><i /></el-radio>
</template>
</el-table-column>
<el-table-column prop="material_code" label="物料编码" width="260" show-overflow-tooltip />
<el-table-column prop="standing_time" label="静置时间" width="75" />
<el-table-column prop="threshold_time" label="阈值时间" width="75" />
<el-table-column prop="product_code" label="产品编号" width="75" />
<el-table-column prop="a" label="长边长度" width="75" />
<el-table-column prop="b" label="短边长度" width="75" />
<el-table-column prop="h" label="梯形高度" width="75" />
<el-table-column prop="w" label="砖块厚度" width="75" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="standing_time" label="静置时间" :min-width="flexWidth('standing_time',crud.data,'静置时间')" />
<el-table-column prop="threshold_time" label="阈值时间" :min-width="flexWidth('threshold_time',crud.data,'阈值时间')" />
<el-table-column prop="product_code" label="产品编号" :min-width="flexWidth('product_code',crud.data,'产品编号')" />
<el-table-column prop="a" label="长边长度" :min-width="flexWidth('a',crud.data,'长边长度')" />
<el-table-column prop="b" label="短边长度" :min-width="flexWidth('b',crud.data,'短边长度')" />
<el-table-column prop="h" label="梯形高度" :min-width="flexWidth('w',crud.data,'梯形高度')" />
<el-table-column prop="w" label="砖块厚度" :min-width="flexWidth('h',crud.data,'砖块厚度')" />
</el-table>
<!--分页组件-->
<pagination />
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="info" @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="submit"> </el-button>
</span>
</el-dialog>
@ -167,7 +166,7 @@ export default {
}
this.rows = this.$refs.table.selection
if (this.rows.length <= 0) {
this.$message('请先选物料')
this.$message('请先选物料')
return
}
this.crud.resetQuery(false)

61
lms/nladmin-ui/src/views/wms/sch/point/index.vue

@ -10,12 +10,11 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="编码名称">
<el-form-item label="编码/名称">
<el-input
v-model="query.name"
clearable
size="mini"
placeholder="编码名称"
placeholder="编码/名称"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@ -24,9 +23,7 @@
v-model="query.region_id"
clearable
filterable
size="mini"
placeholder="所属区域"
class="filter-item"
@clear="pointTypesList = null"
@change="getPointStatusAndTypeList(query.region_id, 1)"
>
@ -42,9 +39,7 @@
<el-select
v-model="query.point_type"
clearable
size="mini"
placeholder="点位类型"
class="filter-item"
@change="hand"
>
<el-option
@ -60,9 +55,7 @@
v-model="query.point_status"
clearable
filterable
size="mini"
placeholder="点位状态"
class="filter-item"
@change="hand"
>
<el-option
@ -78,9 +71,7 @@
v-model="query.lock_type"
clearable
filterable
size="mini"
placeholder="锁定类型"
class="filter-item"
@change="hand"
>
<el-option
@ -165,7 +156,7 @@
:title="crud.status.title"
width="600px"
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="160px" label-suffix="">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" :disabled="crud.status.edit" style="width: 300px" />
</el-form-item>
@ -192,9 +183,7 @@
<el-form-item label="点位类型" prop="point_type">
<el-select
v-model="form.point_type"
size="mini"
placeholder="设备点位类型"
class="filter-item"
placeholder="点位类型"
style="width: 300px"
>
<el-option
@ -208,9 +197,7 @@
<el-form-item v-show="crud.status.edit" label="点位状态" prop="point_status">
<el-select
v-model="form.point_status"
size="mini"
placeholder="点位状态"
class="filter-item"
style="width: 300px"
clearable
>
@ -225,9 +212,7 @@
<el-form-item v-show="crud.status.edit" label="锁定类型" prop="lock_type">
<el-select
v-model="form.lock_type"
size="mini"
placeholder="锁定类型"
class="filter-item"
style="width: 300px"
>
<el-option
@ -241,9 +226,7 @@
<el-form-item v-show="crud.status.edit" label="载具类型" prop="vehicle_type">
<el-select
v-model="form.vehicle_type"
size="mini"
placeholder="载具类型"
class="filter-item"
style="width: 300px"
clearable
>
@ -256,14 +239,12 @@
</el-select>
</el-form-item>
<el-form-item v-show="crud.status.edit" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 300px" />
<el-input v-model="form.vehicle_code" placeholder="载具编码" clearable style="width: 300px" />
</el-form-item>
<!-- <el-form-item label="关联设备" prop="device_code">
<el-form-item label="关联设备" prop="device_code">
<el-select
v-model="form.device_code"
size="mini"
placeholder="关联设备"
class="filter-item"
style="width: 300px"
clearable
>
@ -274,7 +255,7 @@
:value="item.device_code"
/>
</el-select>
</el-form-item>-->
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 300px" rows="2" type="textarea" />
</el-form-item>
@ -294,35 +275,37 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" width="120" show-overflow-tooltip />
<el-table-column prop="point_name" label="点位名称" width="150" show-overflow-tooltip />
<el-table-column prop="region_name" label="所属区域" min-width="80" show-overflow-tooltip />
<el-table-column prop="point_type_name" label="点位类型" min-width="120" />
<el-table-column prop="point_status" label="点位状态">
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
<el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" />
<el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')">
<template slot-scope="scope">
{{ dict.label.point_status[scope.row.point_status] }}
</template>
</el-table-column>
<el-table-column prop="lock_type" label="锁定类型">
<el-table-column prop="lock_type" label="锁定类型" :min-width="flexWidth('lock_type',crud.data,'锁定类型')">
<template slot-scope="scope">
{{ dict.label.lock_type[scope.row.lock_type] }}
</template>
</el-table-column>
<el-table-column prop="is_used" label="是否启用">
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
<template slot-scope="scope">
{{ dict.label.true_or_false[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_type" label="载具类型" min-width="80">
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" min-width="80" />
<el-table-column prop="material_code" label="物料编码" min-width="260" />
<el-table-column prop="remark" label="备注" min-width="100" show-overflow-tooltip />
<el-table-column prop="update_optname" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="150" />
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_optname" label="修改人" :min-width="flexWidth('update_optname',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column
v-permission="[]"
label="操作"

18
lms/nladmin-ui/src/views/wms/sch/region/index.vue

@ -8,17 +8,15 @@
:inline="true"
class="demo-form-inline"
label-position="right"
label-width="80px"
label-suffix=":"
label-width="90px"
label-suffix=""
>
<el-form-item label="编码/名称">
<el-input
v-model="query.region_code"
clearable
size="mini"
placeholder="请输入"
placeholder="编码/名称"
style="width: 180px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@ -37,16 +35,16 @@
>
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="120px" label-suffix=":">
<el-form-item label="区域编码" prop="region_code">
<el-input v-model="form.region_code" style="width: 300px;" />
<el-input v-model="form.region_code" clearable style="width: 300px;" />
</el-form-item>
<el-form-item label="区域名称" prop="region_name">
<el-input v-model="form.region_name" style="width: 300px;" />
<el-input v-model="form.region_name" clearable style="width: 300px;" />
</el-form-item>
<el-form-item label="点位类型说明">
<el-input v-model="form.point_type_explain" type="textarea" style="width: 300px;" />
<el-input v-model="form.point_type_explain" type="textarea" clearable style="width: 300px;" />
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" type="textarea" style="width: 300px;" />
<el-input v-model="form.remark" type="textarea" clearable style="width: 300px;" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -67,7 +65,7 @@
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="point_type_explain" label="点位类型说明" :min-width="flexWidth('point_type_explain',crud.data,'点位类型说明')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" show-overflow-tooltip />
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">

1
lms/nladmin-ui/src/views/wms/sch/task/index.vue

@ -55,7 +55,6 @@
multiple
style="width: 400px"
placeholder="任务状态"
class="filter-item"
clearable
@change="handTaskStatus"
>

Loading…
Cancel
Save