diff --git a/.env.prod b/.env.prod index 813d8ca..9296d68 100644 --- a/.env.prod +++ b/.env.prod @@ -2,7 +2,7 @@ # @Author: zwq # @Date: 2023-08-17 15:10:53 # @LastEditors: zwq - # @LastEditTime: 2023-11-02 11:20:37 + # @LastEditTime: 2024-01-15 14:08:52 # @Description: ### # 生产环境配置 @@ -12,10 +12,12 @@ ENV = 'production' VUE_APP_TITLE = 南京锂膜管理系统 # 南京锂膜管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +# VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = '' # 根据服务器或域名修改 -PUBLIC_PATH = 'http://192.168.0.31:8003/' +# PUBLIC_PATH = 'http://192.168.0.31:8003/' +PUBLIC_PATH = '' # 二级部署路径 VUE_APP_APP_NAME ='yudao-admin' diff --git a/src/views/asrs/agvLog/index.vue b/src/views/asrs/agvLog/index.vue index 596637e..d49bb4e 100644 --- a/src/views/asrs/agvLog/index.vue +++ b/src/views/asrs/agvLog/index.vue @@ -33,6 +33,10 @@ const tableProps = [ prop: 'reqParameter', label: '请求参数', }, + { + prop: 'response', + label: '响应参数', + }, { prop: 'createTime', label: '时间', diff --git a/src/views/asrs/jobMainTask/index.vue b/src/views/asrs/jobMainTask/index.vue index 5b1b31c..fcc800a 100644 --- a/src/views/asrs/jobMainTask/index.vue +++ b/src/views/asrs/jobMainTask/index.vue @@ -57,6 +57,10 @@ const tableProps = [ label: '堆垛机', width:110 }, + { + prop: 'trayCode', + label: '托盘编码', + }, { prop: 'agv', label: 'agv', @@ -132,20 +136,6 @@ const mainTaskState = [ id: 7, }, ]; -const agvArr = [ - { - name: 'A1', - id: 1, - }, - { - name: 'A2', - id: 2, - }, - { - name: 'A3', - id: 3, - }, -]; export default { mixins: [basicPage], data() { @@ -161,10 +151,10 @@ export default { }, tableProps, tableBtn: [ - { - type: 'canlce', - btnName: '取消', - }, + // { + // type: 'canlce', + // btnName: '取消', + // }, ], tableData: [], formConfig: [ @@ -182,6 +172,12 @@ export default { defaultSelect: '', filterable: true, }, + { + type: 'input', + label: '托盘编码', + placeholder: '托盘编码', + param: 'tcode', + }, { type: 'select', label: '状态', @@ -193,7 +189,7 @@ export default { { type: 'select', label: 'agv', - selectOptions: agvArr, + selectOptions: [], param: 'agv', defaultSelect: '', filterable: true, @@ -224,8 +220,19 @@ export default { }; }, components: {}, - created() {}, + created() { + this.setFormConfig(); + }, methods: { + setFormConfig() { + for (let i = 1; i <= 16; i++) { + const obj = { + id: i, + name: i, + }; + this.formConfig[4].selectOptions.push(obj); + } + }, buttonClick(val) { switch (val.btnName) { case 'search': @@ -233,6 +240,7 @@ export default { this.listQuery.pageSize = 10; this.listQuery.mainTaskCode = val.code; this.listQuery.mainTaskType = val.taskType; + this.listQuery.trayCode = val.tcode; this.listQuery.mainTaskState = val.status; this.listQuery.agv = val.agv; this.listQuery.createTime = val.searchTime; diff --git a/src/views/asrs/jobMainTaskHistory/index.vue b/src/views/asrs/jobMainTaskHistory/index.vue index 7d74fb2..88cdfab 100644 --- a/src/views/asrs/jobMainTaskHistory/index.vue +++ b/src/views/asrs/jobMainTaskHistory/index.vue @@ -50,6 +50,10 @@ const tableProps = [ label: '堆垛机', width:110 }, + { + prop: 'trayCode', + label: '托盘编码', + }, { prop: 'agv', label: 'agv', @@ -92,6 +96,10 @@ const mainTaskType = [ name: '移库', id: 3, }, + { + name: '出库带移库', + id: 4, + }, ]; const mainTaskState = [ { @@ -119,33 +127,23 @@ const mainTaskState = [ id: 5, }, ]; -const agvArr = [ - { - name: 'A1', - id: 1, - }, - { - name: 'A2', - id: 2, - }, - { - name: 'A3', - id: 3, - }, -]; const stackerArr = [ { - name: 'D1', + name: '1', id: 1, }, { - name: 'D2', + name: '2', id: 2, }, { - name: 'D3', + name: '3', id: 3, }, + { + name: '4', + id: 4, + }, ]; export default { mixins: [basicPage], @@ -171,6 +169,12 @@ export default { defaultSelect: '', filterable: true, }, + { + type: 'input', + label: '托盘编码', + placeholder: '托盘编码', + param: 'tcode', + }, // { // type: 'select', // label: '状态', @@ -190,7 +194,7 @@ export default { { type: 'select', label: 'agv', - selectOptions: agvArr, + selectOptions: [], param: 'agv', defaultSelect: '', filterable: true, @@ -223,8 +227,18 @@ export default { components: {}, created() { this.listQuery.mainTaskState = 5; - }, + this.setFormConfig(); + }, methods: { + setFormConfig() { + for (let i = 1; i <= 16; i++) { + const obj = { + id: i, + name: i, + }; + this.formConfig[4].selectOptions.push(obj); + } + }, buttonClick(val) { switch (val.btnName) { case 'search': @@ -232,6 +246,7 @@ export default { this.listQuery.pageSize = 10; this.listQuery.mainTaskCode = val.code; this.listQuery.mainTaskType = val.taskType; + this.listQuery.trayCode = val.tcode; // this.listQuery.mainTaskState = val.status; this.listQuery.mainTaskState = 5; this.listQuery.stacker = val.stacker; diff --git a/src/views/asrs/warehouseStorehouse/index.vue b/src/views/asrs/warehouseStorehouse/index.vue index d4c2abb..fdbf06b 100644 --- a/src/views/asrs/warehouseStorehouse/index.vue +++ b/src/views/asrs/warehouseStorehouse/index.vue @@ -109,12 +109,12 @@ export default { btnName: '编辑', } : undefined, - this.$auth.hasPermi(`asrs:warehouse-storehouse:delete`) - ? { - type: 'delete', - btnName: '删除', - } - : undefined, + // this.$auth.hasPermi(`asrs:warehouse-storehouse:delete`) + // ? { + // type: 'delete', + // btnName: '删除', + // } + // : undefined, ].filter((v)=>v), tableData: [], formConfig: [ @@ -136,16 +136,16 @@ export default { name: 'search', color: 'primary', }, - { - type: 'separate', - }, - { - type: this.$auth.hasPermi('asrs:warehouse-storehouse:create') ? 'button' : '', - btnName: '新增', - name: 'add', - color: 'success', - plain: true, - }, + // { + // type: 'separate', + // }, + // { + // type: this.$auth.hasPermi('asrs:warehouse-storehouse:create') ? 'button' : '', + // btnName: '新增', + // name: 'add', + // color: 'success', + // plain: true, + // }, // { // type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '', // }, diff --git a/src/views/asrs/warehouseStorehouse/indexb.vue b/src/views/asrs/warehouseStorehouse/indexb.vue index 391dd74..67ab2ba 100644 --- a/src/views/asrs/warehouseStorehouse/indexb.vue +++ b/src/views/asrs/warehouseStorehouse/indexb.vue @@ -110,12 +110,12 @@ export default { btnName: '编辑', } : undefined, - this.$auth.hasPermi(`asrs:warehouse-storehouse:delete`) - ? { - type: 'delete', - btnName: '删除', - } - : undefined, + // this.$auth.hasPermi(`asrs:warehouse-storehouse:delete`) + // ? { + // type: 'delete', + // btnName: '删除', + // } + // : undefined, ].filter((v)=>v), tableData: [], formConfig: [ @@ -137,16 +137,16 @@ export default { name: 'search', color: 'primary', }, - { - type: 'separate', - }, - { - type: this.$auth.hasPermi('asrs:warehouse-storehouse:create') ? 'button' : '', - btnName: '新增', - name: 'add', - color: 'success', - plain: true, - }, + // { + // type: 'separate', + // }, + // { + // type: this.$auth.hasPermi('asrs:warehouse-storehouse:create') ? 'button' : '', + // btnName: '新增', + // name: 'add', + // color: 'success', + // plain: true, + // }, // { // type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '', // }, diff --git a/src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue b/src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue index b709d25..d4f617f 100644 --- a/src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue +++ b/src/views/asrs/warehouseStorehouseGoodsSpecification/index.vue @@ -144,6 +144,20 @@ const warehouseStorehouseState = [ id: 2, }, ]; +const qualityArr = [ + { + name: 'A', + id: 0, + }, + { + name: 'B', + id: 1, + }, + { + name: 'C', + id: 2, + }, +]; export default { mixins: [basicPage], data() { @@ -154,17 +168,39 @@ export default { tableData: [], processArr, warehouseStorehouseState, + qualityArr, formConfig: [ { - type: 'input', - label: '库位名', - placeholder: '库位名', - param: 'name', + type: 'select', + label: '排', + selectOptions: [], + param: 'wareRow', + defaultSelect: '', + filterable: true, + width: 100 + }, + { + type: 'select', + label: '列', + selectOptions: [], + param: 'wareColumn', + defaultSelect: '', + filterable: true, + width: 100 + }, + { + type: 'select', + label: '层', + selectOptions: [], + param: 'wareLayer', + defaultSelect: '', + filterable: true, + width: 100 }, { type: 'input', - label: '库位编码', - placeholder: '库位编码', + label: '托盘编码', + placeholder: '托盘编码', param: 'code', }, { @@ -174,10 +210,12 @@ export default { param: 'pname', }, { - type: 'input', - label: '产品编码', - placeholder: '产品编码', - param: 'pcode', + type: 'select', + label: '品质', + selectOptions: qualityArr, + param: 'quality', + defaultSelect: '', + filterable: true, }, { type: 'select', @@ -217,17 +255,44 @@ export default { AddOrUpdate, product, }, - created() {}, + created() { + this.setFormConfig(); + }, methods: { + setFormConfig() { + for (let i = 1; i <= 16; i++) { + const obj = { + id: i, + name: i + '排', + }; + this.formConfig[0].selectOptions.push(obj); + } + for (let i = 1; i <= 30; i++) { + const obj = { + id: i, + name: i + '列', + }; + this.formConfig[1].selectOptions.push(obj); + } + for (let i = 1; i <= 4; i++) { + const obj = { + id: i, + name: i + '层', + }; + this.formConfig[2].selectOptions.push(obj); + } + }, buttonClick(val) { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; this.listQuery.pageSize = 10; - this.listQuery.warehouseStorehouseName = val.name; - this.listQuery.warehouseStorehouseCode = val.code; + this.listQuery.wareRow = val.wareRow; + this.listQuery.wareColumn = val.wareColumn; + this.listQuery.wareLayer = val.wareLayer; + this.listQuery.trayCode = val.code; this.listQuery.goodName = val.pname; - this.listQuery.goodCode = val.pcode; + this.listQuery.quality = val.quality; this.listQuery.process = val.processId; this.listQuery.warehouseStorehouseState = val.warehouseStorehouseStateId; diff --git a/src/views/asrs/warehouseStorehouseGoodsSpecification/indexb.vue b/src/views/asrs/warehouseStorehouseGoodsSpecification/indexb.vue index 7f26c84..c79c5be 100644 --- a/src/views/asrs/warehouseStorehouseGoodsSpecification/indexb.vue +++ b/src/views/asrs/warehouseStorehouseGoodsSpecification/indexb.vue @@ -139,6 +139,20 @@ const warehouseStorehouseState = [ id: 2, }, ]; +const qualityArr = [ + { + name: 'A', + id: 0, + }, + { + name: 'B', + id: 1, + }, + { + name: 'C', + id: 2, + }, +]; export default { mixins: [basicPage], data() { @@ -152,15 +166,36 @@ export default { bPage: true, formConfig: [ { - type: 'input', - label: '库位名', - placeholder: '库位名', - param: 'name', + type: 'select', + label: '排', + selectOptions: [], + param: 'wareRow', + defaultSelect: '', + filterable: true, + width: 100 + }, + { + type: 'select', + label: '列', + selectOptions: [], + param: 'wareColumn', + defaultSelect: '', + filterable: true, + width: 100 + }, + { + type: 'select', + label: '层', + selectOptions: [], + param: 'wareLayer', + defaultSelect: '', + filterable: true, + width: 100 }, { type: 'input', - label: '库位编码', - placeholder: '库位编码', + label: '托盘编码', + placeholder: '托盘编码', param: 'code', }, { @@ -170,10 +205,12 @@ export default { param: 'pname', }, { - type: 'input', - label: '产品编码', - placeholder: '产品编码', - param: 'pcode', + type: 'select', + label: '品质', + selectOptions: qualityArr, + param: 'quality', + defaultSelect: '', + filterable: true, }, { type: 'select', @@ -215,17 +252,43 @@ export default { }, created() { this.listQuery.warehouseId = this.bId; - }, + this.setFormConfig(); + }, methods: { + setFormConfig() { + for (let i = 1; i <= 16; i++) { + const obj = { + id: i, + name: i + '排', + }; + this.formConfig[0].selectOptions.push(obj); + } + for (let i = 1; i <= 30; i++) { + const obj = { + id: i, + name: i + '列', + }; + this.formConfig[1].selectOptions.push(obj); + } + for (let i = 1; i <= 4; i++) { + const obj = { + id: i, + name: i + '层', + }; + this.formConfig[2].selectOptions.push(obj); + } + }, buttonClick(val) { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; this.listQuery.pageSize = 10; - this.listQuery.warehouseStorehouseName = val.name; - this.listQuery.warehouseStorehouseCode = val.code; + this.listQuery.wareRow = val.wareRow; + this.listQuery.wareColumn = val.wareColumn; + this.listQuery.wareLayer = val.wareLayer; + this.listQuery.trayCode = val.code; this.listQuery.goodName = val.pname; - this.listQuery.goodCode = val.pcode; + this.listQuery.quality = val.quality; this.listQuery.process = val.processId; this.listQuery.warehouseStorehouseState = val.warehouseStorehouseStateId; this.getDataList(); diff --git a/src/views/asrs/warehouseStorehouseStorage/index.vue b/src/views/asrs/warehouseStorehouseStorage/index.vue index 470f842..4c97c87 100644 --- a/src/views/asrs/warehouseStorehouseStorage/index.vue +++ b/src/views/asrs/warehouseStorehouseStorage/index.vue @@ -170,6 +170,20 @@ const warehouseStorehouseState = [ id: 2, }, ]; +const qualityArr = [ + { + name: 'A', + id: 0, + }, + { + name: 'B', + id: 1, + }, + { + name: 'C', + id: 2, + }, +]; export default { mixins: [basicPage], data() { @@ -183,10 +197,31 @@ export default { warehouseStorehouseState, formConfig: [ { - type: 'input', - label: '库位名', - placeholder: '库位名', - param: 'name', + type: 'select', + label: '排', + selectOptions: [], + param: 'wareRow', + defaultSelect: '', + filterable: true, + width: 100 + }, + { + type: 'select', + label: '列', + selectOptions: [], + param: 'wareColumn', + defaultSelect: '', + filterable: true, + width: 100 + }, + { + type: 'select', + label: '层', + selectOptions: [], + param: 'wareLayer', + defaultSelect: '', + filterable: true, + width: 100 }, { type: 'input', @@ -201,10 +236,12 @@ export default { param: 'pname', }, { - type: 'input', - label: '产品编码', - placeholder: '产品编码', - param: 'pcode', + type: 'select', + label: '品质', + selectOptions: qualityArr, + param: 'quality', + defaultSelect: '', + filterable: true, }, { type: 'select', @@ -228,6 +265,15 @@ export default { name: 'search', color: 'primary', }, + // { + // type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '', + // }, + // { + // type: this.$auth.hasPermi('base:factory:export') ? 'button' : '', + // btnName: '导出', + // name: 'export', + // color: 'warning', + // }, ], }; }, @@ -236,17 +282,44 @@ export default { product, outOrMove, }, - created() {}, + created() { + this.setFormConfig(); + }, methods: { + setFormConfig() { + for (let i = 1; i <= 16; i++) { + const obj = { + id: i, + name: i + '排', + }; + this.formConfig[0].selectOptions.push(obj); + } + for (let i = 1; i <= 30; i++) { + const obj = { + id: i, + name: i + '列', + }; + this.formConfig[1].selectOptions.push(obj); + } + for (let i = 1; i <= 4; i++) { + const obj = { + id: i, + name: i + '层', + }; + this.formConfig[2].selectOptions.push(obj); + } + }, buttonClick(val) { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; this.listQuery.pageSize = 10; - this.listQuery.warehouseStorehouseName = val.name; + this.listQuery.wareRow = val.wareRow; + this.listQuery.wareColumn = val.wareColumn; + this.listQuery.wareLayer = val.wareLayer; this.listQuery.trayCode = val.code; this.listQuery.goodName = val.pname; - this.listQuery.goodCode = val.pcode; + this.listQuery.quality = val.quality; this.listQuery.process = val.processId; this.listQuery.warehouseStorehouseState = val.warehouseStorehouseStateId; @@ -286,7 +359,7 @@ export default { this.addOrUpdateVisible = true; this.addOrEditTitle = '移库'; this.$nextTick(() => { - this.$refs.addOrUpdate.init(val.data.id, 1,this.listQuery.warehouseId); + this.$refs.addOrUpdate.init(val.data.id, 1,this.listQuery.warehouseId,val.data.stacker); }); } else if (val.type === 'in') { this.drawerVisible = true; diff --git a/src/views/asrs/warehouseStorehouseStorage/indexb.vue b/src/views/asrs/warehouseStorehouseStorage/indexb.vue index fc2e21c..6e9ae55 100644 --- a/src/views/asrs/warehouseStorehouseStorage/indexb.vue +++ b/src/views/asrs/warehouseStorehouseStorage/indexb.vue @@ -170,6 +170,20 @@ const warehouseStorehouseState = [ id: 2, }, ]; +const qualityArr = [ + { + name: 'A', + id: 0, + }, + { + name: 'B', + id: 1, + }, + { + name: 'C', + id: 2, + }, +]; export default { mixins: [basicPage], data() { @@ -184,10 +198,31 @@ export default { warehouseStorehouseState, formConfig: [ { - type: 'input', - label: '库位名', - placeholder: '库位名', - param: 'name', + type: 'select', + label: '排', + selectOptions: [], + param: 'wareRow', + defaultSelect: '', + filterable: true, + width: 100 + }, + { + type: 'select', + label: '列', + selectOptions: [], + param: 'wareColumn', + defaultSelect: '', + filterable: true, + width: 100 + }, + { + type: 'select', + label: '层', + selectOptions: [], + param: 'wareLayer', + defaultSelect: '', + filterable: true, + width: 100 }, { type: 'input', @@ -202,10 +237,12 @@ export default { param: 'pname', }, { - type: 'input', - label: '产品编码', - placeholder: '产品编码', - param: 'pcode', + type: 'select', + label: '品质', + selectOptions: qualityArr, + param: 'quality', + defaultSelect: '', + filterable: true, }, { type: 'select', @@ -229,6 +266,15 @@ export default { name: 'search', color: 'primary', }, + // { + // type: this.$auth.hasPermi('base:factory:create') ? 'separate' : '', + // }, + // { + // type: this.$auth.hasPermi('base:factory:export') ? 'button' : '', + // btnName: '导出', + // name: 'export', + // color: 'warning', + // }, ], }; }, @@ -239,17 +285,42 @@ export default { }, created() { this.listQuery.warehouseId = this.bId; + this.setFormConfig(); }, methods: { + setFormConfig() { + for (let i = 1; i <= 16; i++) { + const obj = { + id: i, + name: i + '排', + }; + this.formConfig[0].selectOptions.push(obj); + } + for (let i = 1; i <= 30; i++) { + const obj = { + id: i, + name: i + '列', + }; + this.formConfig[1].selectOptions.push(obj); + } + for (let i = 1; i <= 4; i++) { + const obj = { + id: i, + name: i + '层', + }; + this.formConfig[2].selectOptions.push(obj); + } + }, buttonClick(val) { switch (val.btnName) { case 'search': this.listQuery.pageNo = 1; this.listQuery.pageSize = 10; - this.listQuery.warehouseStorehouseName = val.name; + this.listQuery.wareColumn = val.wareColumn; + this.listQuery.wareLayer = val.wareLayer; this.listQuery.trayCode = val.code; this.listQuery.goodName = val.pname; - this.listQuery.goodCode = val.pcode; + this.listQuery.quality = val.quality; this.listQuery.process = val.processId; this.listQuery.warehouseStorehouseState = val.warehouseStorehouseStateId; @@ -288,7 +359,7 @@ export default { this.addOrUpdateVisible = true; this.addOrEditTitle = '移库'; this.$nextTick(() => { - this.$refs.addOrUpdate.init(val.data.id, 1,this.listQuery.warehouseId); + this.$refs.addOrUpdate.init(val.data.id, 1,this.listQuery.warehouseId,val.data.stacker); }); } else if (val.type === 'in') { this.drawerVisible = true; diff --git a/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue b/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue index 3820b2b..f85f510 100644 --- a/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue +++ b/src/views/asrs/warehouseStorehouseStorage/out-or-move.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: zwq - * @LastEditTime: 2023-11-02 11:15:57 + * @LastEditTime: 2024-01-16 14:49:00 * @Description: -->