diff --git a/src/views/agvTask/TesAgv.data.ts b/src/views/agvTask/TesAgv.data.ts index 2f60f7f..46393b7 100644 --- a/src/views/agvTask/TesAgv.data.ts +++ b/src/views/agvTask/TesAgv.data.ts @@ -39,7 +39,13 @@ export const columns: BasicColumn[] = [ } }, { - title: '目标库位', + title: '起点', + align: "center", + width: '120px', + dataIndex: 'startCode' + }, + { + title: '终点', align: "center", width: '120px', dataIndex: 'endCode' diff --git a/src/views/base/point/Point.data.ts b/src/views/base/point/Point.data.ts index 7bdbb00..00beb2a 100644 --- a/src/views/base/point/Point.data.ts +++ b/src/views/base/point/Point.data.ts @@ -25,17 +25,17 @@ export const columns: BasicColumn[] = [ { title: '排', align: 'center', - dataIndex: 'rows', + dataIndex: 'rowNum', }, { title: '列', align: 'center', - dataIndex: 'cols', + dataIndex: 'colNum', }, { title: '层', align: 'center', - dataIndex: 'layers', + dataIndex: 'layerNum', }, { title: '是否启用', diff --git a/src/views/base/point/components/PointForm.vue b/src/views/base/point/components/PointForm.vue index 7e8df63..6c281cd 100644 --- a/src/views/base/point/components/PointForm.vue +++ b/src/views/base/point/components/PointForm.vue @@ -33,18 +33,18 @@ - - + + - - + + - - + + @@ -90,9 +90,9 @@ areaId: '', pointCode: '', status: 0, - rows: '00', - cols: '00', - layers: '00', + rowNum: '00', + colNum: '00', + layerNum: '00', description: '', delFlag: 0, izActive: 1, @@ -106,9 +106,9 @@ const validatorRules = reactive({ areaId: [{ required: true, message: '请选择库区!' }], pointCode: [{ required: true, message: '请输入库位编码!' }], - row: [{ required: true, message: '请输入排!' }], - col: [{ required: true, message: '请输入列!' }], - layer: [{ required: true, message: '请输入层!' }], + rowNum: [{ required: true, message: '请输入排!' }], + colNum: [{ required: true, message: '请输入列!' }], + layerNum: [{ required: true, message: '请输入层!' }], status: [{ required: true, message: '请选择状态!' }], }); const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false }); diff --git a/src/views/receive/asn/Asn.data.ts b/src/views/receive/asn/Asn.data.ts index c8f8ec9..1440f41 100644 --- a/src/views/receive/asn/Asn.data.ts +++ b/src/views/receive/asn/Asn.data.ts @@ -59,6 +59,11 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'whCode', }, + { + title: '回传报文', + align: 'center', + dataIndex: 'resMessage', + }, { title: '订单日期', align: 'center', @@ -120,13 +125,13 @@ export const asnDetailColumns: JVxeColumn[] = [ ], }, { - title: '库位', - key: 'pointId', + title: '起点', + key: 'fromPointId', type: JVxeTypes.selectSearch, width: 150, async: true, // 异步搜索,默认为 true //查询状态为可用、启用、未删除的库位 - dictCode: 'base_point where area_id = 1986328561044119554 and iz_active=1 and del_flag=0,point_code,id', + dictCode: 'base_point where area_id = 1983454124619755521 and iz_active=1 and del_flag=0,point_code,id', tipsContent: '请搜索库位', validateRules: [ { diff --git a/src/views/shipping/Pick.data.ts b/src/views/shipping/Pick.data.ts index 857b639..090d551 100644 --- a/src/views/shipping/Pick.data.ts +++ b/src/views/shipping/Pick.data.ts @@ -23,7 +23,7 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'status_dictText', customRender: ({ text }) => { - //入库状态:1.已创建;2.部分分配;3.已分配;4.拣货中;5.拣货完成;6.已关闭;7.已取消。 + //出库状态:1.已创建;2.部分分配;3.已分配;4.拣货中;5.拣货完成;6.已关闭;7.已取消。 const statusColorMap = { 已创建: 'orange', 部分分配: 'cyan', diff --git a/src/views/super/airag/aiapp/components/AiAppModal.vue b/src/views/super/airag/aiapp/components/AiAppModal.vue index d4bc2a9..1abe91f 100644 --- a/src/views/super/airag/aiapp/components/AiAppModal.vue +++ b/src/views/super/airag/aiapp/components/AiAppModal.vue @@ -5,7 +5,7 @@ {{title}} - +