diff --git a/src/icons/svg/icon-出库.svg b/src/icons/svg/icon-出库.svg index 3acb3b1..0dfb941 100644 --- a/src/icons/svg/icon-出库.svg +++ b/src/icons/svg/icon-出库.svg @@ -1,7 +1,7 @@ - 出库on + 库位 Created with Sketch. @@ -21,4 +21,4 @@ - \ No newline at end of file + diff --git a/src/router/index.js b/src/router/index.js index 6b8d05d..6e07b42 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -34,6 +34,7 @@ // 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否 // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理! { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页' } }, + { path: '/schedule', component: _import('modules/job/schedule'), name: 'schedule', meta: { title: '定时任务' } }, { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } }, { path: '/instock', component: _import('modules/work/instock'), name: 'instock', meta: { title: '扫码入库' } }, { path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } }, diff --git a/src/views/common/home.vue b/src/views/common/home.vue index 149eacf..f0ffa9a 100644 --- a/src/views/common/home.vue +++ b/src/views/common/home.vue @@ -3,7 +3,7 @@ - +

入库 @@ -12,10 +12,10 @@ - +

- 出库 + 库位

Warehouse

 @@ -41,6 +41,7 @@ > @@ -57,12 +58,12 @@ align="center" label="操作员名称"> - - + --> - - + --> 首页 + + + 定时任务 + @@ -42,10 +46,10 @@ 数据字典 --> - + 仓库基础信息 diff --git a/src/views/modules/work/mtalarmlog.vue b/src/views/modules/work/mtalarmlog.vue index e26aefa..4b320b6 100644 --- a/src/views/modules/work/mtalarmlog.vue +++ b/src/views/modules/work/mtalarmlog.vue @@ -11,6 +11,8 @@ diff --git a/src/views/modules/work/mtcommunlog.vue b/src/views/modules/work/mtcommunlog.vue index 98e8a47..9a9013b 100644 --- a/src/views/modules/work/mtcommunlog.vue +++ b/src/views/modules/work/mtcommunlog.vue @@ -11,6 +11,8 @@ diff --git a/src/views/modules/work/mtequipmentinfo.vue b/src/views/modules/work/mtequipmentinfo.vue index d81f920..47c9eb5 100644 --- a/src/views/modules/work/mtequipmentinfo.vue +++ b/src/views/modules/work/mtequipmentinfo.vue @@ -11,6 +11,8 @@ diff --git a/src/views/modules/work/mtpointinfo.vue b/src/views/modules/work/mtpointinfo.vue index 38778ba..389ebf1 100644 --- a/src/views/modules/work/mtpointinfo.vue +++ b/src/views/modules/work/mtpointinfo.vue @@ -11,6 +11,8 @@ diff --git a/src/views/modules/work/mtproduct-add-or-update.vue b/src/views/modules/work/mtproduct-add-or-update.vue index f136d74..e39021d 100644 --- a/src/views/modules/work/mtproduct-add-or-update.vue +++ b/src/views/modules/work/mtproduct-add-or-update.vue @@ -4,30 +4,20 @@ :close-on-click-modal="false" :visible.sync="visible"> - - + + - - - - - - - + - - - - - + + - - + + + + + @@ -48,41 +38,27 @@ dataForm: { id: 0, productName: '', - productAllName: '', - specModel: '', - productCode: 'CP' + new Date().getTime(), - productType: '', - unitName: '', + productCode: '', + length: '', + heigth: '', + width: '', remark: '' }, - options: [{ - value: '1', - label: '成品' - }, { - value: '2', - label: '半成品' - }, { - value: '3', - label: '原材料' - }], dataRule: { productName: [ - { required: true, message: '产品名称不能为空', trigger: 'blur' } - ], - productAllName: [ - { required: true, message: '产品全名不能为空', trigger: 'blur' } - ], - specModel: [ - { required: true, message: '规格型号不能为空', trigger: 'blur' } + { required: true, message: '板材名称不能为空', trigger: 'blur' } ], productCode: [ - { required: true, message: '产品编码不能为空', trigger: 'blur' } + { required: true, message: '编码不能为空', trigger: 'blur' } ], - productType: [ - { required: true, message: '产品类别，1:成品，2:半成品，3:原材料。。不能为空', trigger: 'blur' } + length: [ + { required: true, message: '长不能为空', trigger: 'blur' } ], - unitName: [ - { required: true, message: '单位名称不能为空', trigger: 'blur' } + heigth: [ + { required: true, message: '高不能为空', trigger: 'blur' } + ], + width: [ + { required: true, message: '宽不能为空', trigger: 'blur' } ] } } @@ -116,11 +92,10 @@ data: this.$http.adornData({ 'id': this.dataForm.id || undefined, 'productName': this.dataForm.productName, - 'productAllName': this.dataForm.productAllName, - 'specModel': this.dataForm.specModel, 'productCode': this.dataForm.productCode, - 'productType': this.dataForm.productType, - 'unitName': this.dataForm.unitName, + 'length': this.dataForm.length, + 'heigth': this.dataForm.heigth, + 'width': this.dataForm.width, 'remark': this.dataForm.remark }) }).then(({data}) => { diff --git a/src/views/modules/work/mtproduct.vue b/src/views/modules/work/mtproduct.vue index ca569b6..71426eb 100644 --- a/src/views/modules/work/mtproduct.vue +++ b/src/views/modules/work/mtproduct.vue @@ -1,8 +1,16 @@ diff --git a/src/views/modules/work/mtsysdictdata.vue b/src/views/modules/work/mtsysdictdata.vue index 8003b6c..802eca2 100644 --- a/src/views/modules/work/mtsysdictdata.vue +++ b/src/views/modules/work/mtsysdictdata.vue @@ -20,6 +20,8 @@ diff --git a/src/views/modules/work/mttaskinfo-add-or-update.vue b/src/views/modules/work/mttaskinfo-add-or-update.vue index 4c133e2..019f67a 100644 --- a/src/views/modules/work/mttaskinfo-add-or-update.vue +++ b/src/views/modules/work/mttaskinfo-add-or-update.vue @@ -2,37 +2,81 @@ - - - - - - - - - - - - + :visible.sync="visible" + > + + + + v-for="item in warehouseArr" + :key="item.value" + :label="item.label" + :value="item.value" + > + - - - - - - + + + + + + + + + + + + + + + + + + + + + 取消 @@ -42,112 +86,155 @@ diff --git a/src/views/modules/work/mttaskinfo.vue b/src/views/modules/work/mttaskinfo.vue index 225c6f0..fa2a34b 100644 --- a/src/views/modules/work/mttaskinfo.vue +++ b/src/views/modules/work/mttaskinfo.vue @@ -11,6 +11,8 @@ @@ -33,12 +35,12 @@ align="center" label="操作员名称"> - - + --> - - + --> @@ -184,6 +186,27 @@ this.$refs.addOrUpdate.init(id) }) }, + runtask (id) { + console.log(id) + this.$http({ + url: this.$http.adornUrl('/work/mttaskinfo/runtask'), + method: 'post', + data: this.$http.adornData(id, false) + }).then(({data}) => { + if (data && data.code === 0) { + this.$message({ + message: '操作成功', + type: 'success', + duration: 1500, + onClose: () => { + this.getDataList() + } + }) + } else { + this.$message.error(data.msg) + } + }) + }, // 删除 deleteHandle (id) { this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', { diff --git a/src/views/modules/work/mttaskinfodet.vue b/src/views/modules/work/mttaskinfodet.vue index 5cff77b..7637809 100644 --- a/src/views/modules/work/mttaskinfodet.vue +++ b/src/views/modules/work/mttaskinfodet.vue @@ -12,6 +12,8 @@ @@ -44,7 +46,7 @@ @@ -54,6 +56,9 @@ header-align="center" align="center" label="终点"> + - - + --> - 修改 删除 - + --> @@ -143,7 +148,18 @@ dataForm: { key: '' }, + taskId: '', dataList: [], + endPosition: [ + { + value: 290, + label: 'A库出口' + }, + { + value: 292, + label: 'B库出口' + } + ], dataListLoading: false, addOrUpdateVisible: false } @@ -152,6 +168,7 @@ AddOrUpdate }, activated () { + this.taskId = this.$route.params.id this.getDataList() }, methods: { @@ -162,6 +179,7 @@ url: this.$http.adornUrl('/work/mttaskinfodet/list'), method: 'get', params: this.$http.adornParams({ + 'task_id': this.taskId, 'page': 1, 'limit': 500, 'key': this.dataForm.key diff --git a/src/views/modules/work/mttaskinfodetlog.vue b/src/views/modules/work/mttaskinfodetlog.vue index d951bd6..a6e048f 100644 --- a/src/views/modules/work/mttaskinfodetlog.vue +++ b/src/views/modules/work/mttaskinfodetlog.vue @@ -11,6 +11,8 @@ diff --git a/src/views/modules/work/mttaskinfolog.vue b/src/views/modules/work/mttaskinfolog.vue index 6b130e6..bc0f34c 100644 --- a/src/views/modules/work/mttaskinfolog.vue +++ b/src/views/modules/work/mttaskinfolog.vue @@ -11,6 +11,8 @@ diff --git a/src/views/modules/work/mtwarehousing-add-or-update.vue b/src/views/modules/work/mtwarehousing-add-or-update.vue index 28e2699..46f75e5 100644 --- a/src/views/modules/work/mtwarehousing-add-or-update.vue +++ b/src/views/modules/work/mtwarehousing-add-or-update.vue @@ -62,7 +62,7 @@ params: this.$http.adornParams() }).then(({data}) => { if (data && data.code === 0) { - this.dataForm = data.mtWarehousing + this.dataForm = data.mtWarehouseing } }) } diff --git a/src/views/modules/work/mtwarehousing.vue b/src/views/modules/work/mtwarehousing.vue index 86d7478..eac6c67 100644 --- a/src/views/modules/work/mtwarehousing.vue +++ b/src/views/modules/work/mtwarehousing.vue @@ -11,6 +11,8 @@ diff --git a/src/views/modules/work/mtwarehouspositionrelat-add-or-update.vue b/src/views/modules/work/mtwarehouspositionrelat-add-or-update.vue index e15342e..ab45981 100644 --- a/src/views/modules/work/mtwarehouspositionrelat-add-or-update.vue +++ b/src/views/modules/work/mtwarehouspositionrelat-add-or-update.vue @@ -4,7 +4,7 @@ :close-on-click-modal="false" :visible.sync="visible"> - + - + - - + + - + - + - + @@ -81,7 +81,7 @@ params: this.$http.adornParams() }).then(({data}) => { if (data && data.code === 0) { - this.dataForm = data.mtWarehousPositionRelat + this.dataForm = data.mtWarehousePositionRelat } }) } diff --git a/src/views/modules/work/mtwarehouspositionrelat.vue b/src/views/modules/work/mtwarehouspositionrelat.vue index 8cd26db..560c974 100644 --- a/src/views/modules/work/mtwarehouspositionrelat.vue +++ b/src/views/modules/work/mtwarehouspositionrelat.vue @@ -11,6 +11,8 @@ @@ -27,17 +29,17 @@ align="center" label="添加时间"> - - + --> + label="操作员"> - {{scope.row.isEmpty === 0?'空' :'有货'}} - - --> + + label="板材名称"> - - + --> - - + + @@ -81,7 +81,7 @@ { required: true, message: '产品编码不能为空', trigger: 'blur' } ], productName: [ - { required: true, message: '产品名称不能为空', trigger: 'blur' } + { required: true, message: '板材名称不能为空', trigger: 'blur' } ], quantity: [ { required: true, message: '货物数量， 货物总的数量不能为空', trigger: 'blur' } diff --git a/src/views/modules/work/mtwarehouspositionrelatlog.vue b/src/views/modules/work/mtwarehouspositionrelatlog.vue index 6634ce6..90440a1 100644 --- a/src/views/modules/work/mtwarehouspositionrelatlog.vue +++ b/src/views/modules/work/mtwarehouspositionrelatlog.vue @@ -11,6 +11,8 @@ @@ -72,7 +74,7 @@ prop="productName" header-align="center" align="center" - label="产品名称"> + label="板材名称">