From d20e5f8282009375db1143c4287df10915a01046 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Sat, 7 Oct 2023 09:58:37 +0800 Subject: [PATCH] =?UTF-8?q?add:=E7=BB=9F=E8=AE=A1=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StIvtStructivtDailyController.java | 4 +- .../st/dailyStructivt/dailyStructivt.js | 4 +- .../st/dailyStructivt/index.vue | 38 +++++++++---------- .../wms/pdm/base/productRoute/AddDialog.vue | 15 ++++---- 4 files changed, 29 insertions(+), 32 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java index ce6f364a..f17b9eed 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/storage/controller/dailyStructivt/StIvtStructivtDailyController.java @@ -40,8 +40,8 @@ public class StIvtStructivtDailyController { @PostMapping("/sync") @Log("同步日库区") @SaIgnore - public ResponseEntity sync(@RequestBody String[] structivts){ - stIvtStructivtDailyService.dailyStructivt(structivts); + public ResponseEntity sync(@RequestBody String[] ids){ + stIvtStructivtDailyService.dailyStructivt(ids); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt.js b/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt.js index 6f3cac8b..c7fb0841 100644 --- a/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt.js +++ b/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/dailyStructivt.js @@ -19,7 +19,7 @@ export function sync(param) { return request({ url: 'api/structivtDaily/sync', method: 'post', - param + data: param }) } @@ -30,4 +30,4 @@ export function edit(data) { data }) } -export default { add, edit, del,sync } +export default { add, edit, del, sync } diff --git a/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/index.vue b/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/index.vue index ad82709e..37a215c3 100644 --- a/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/index.vue +++ b/mes/qd/src/views/wms/masterdata_manage/st/dailyStructivt/index.vue @@ -39,22 +39,21 @@ type="warning" icon="el-icon-check" size="mini" - :disabled="confirm_flag" @click="sync" > 同步 - - - - - - - - - - - + + + + + + + + + + + - - + + @@ -97,7 +96,6 @@ import rrOperation from '@crud/RR.operation' import crudMdPbMeasureunit from '@/api/wms/basedata/master/mdPbMeasureunit' import { downloadFile } from '@/utils' - const defaultForm = { struct_id: null, cascader: null, @@ -173,7 +171,7 @@ export default { } } return { - measure_unit:[], + measure_unit: [], sects: [], downloadLoading: false, permission: { @@ -181,7 +179,7 @@ export default { edit: ['admin', 'dept:edit'], del: ['admin', 'dept:del'] }, - trueorfalse: [ { value: true, label: '是' }, { value: false, label: '否' }] + trueorfalse: [{ value: true, label: '是' }, { value: false, label: '否' }] } }, created() { @@ -193,8 +191,8 @@ export default { }) }, methods: { - sync(){ - dailyStructivt.sync({'structivts':'st_ivt_structivt_bcp'}).then(result => { + sync() { + dailyStructivt.sync(Array.of('st_ivt_structivt_bcp', 'st_ivt_structivt_cp', 'st_ivt_structivt_yl')).then(result => { this.crud.notify('同步成功', CRUD.NOTIFICATION_TYPE.SUCCESS) }).catch(() => { }) }, @@ -234,7 +232,7 @@ export default { this.query.sect_id = val[1] } this.crud.toQuery() - }, + } } } diff --git a/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue b/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue index faa738a4..0e8fe06e 100644 --- a/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue +++ b/mes/qd/src/views/wms/pdm/base/productRoute/AddDialog.vue @@ -144,7 +144,7 @@ import CRUD, { form, crud } from '@crud/crud' import crudProductRoute from '@/api/productprocessroute' -import Treeselect, {LOAD_CHILDREN_OPTIONS} from '@riophae/vue-treeselect' +import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' import crudClassstandard from '@/api/wms/basedata/master/classstandard' import crudMdPbMeasureunit from '@/api/wms/basedata/master/mdPbMeasureunit' @@ -161,7 +161,7 @@ const defaultForm = { export default { name: 'AddDialog', dicts: ['product_area'], - components: {Treeselect }, + components: { Treeselect }, mixins: [form(defaultForm), crud()], props: { dialogShow: { @@ -307,7 +307,6 @@ export default { this.deviceList.forEach(row => { res.check_list.forEach(selected => { if (selected.device_code === row.device_code) { - this.$refs.multipleTable.toggleRowSelection(row, true) } }) @@ -317,7 +316,7 @@ export default { } }, getRoute() { - // 查询原材料库的仓库 + // 查询原辅料库的仓库 crudProductRoute.getRoute({}).then(res => { this.routeList = res }) @@ -326,10 +325,10 @@ export default { this.form.tableData.push({ workprocedure_no: '', is_check: '1' }) }, // 获取子节点数据 - loadChildNodes({action, parentNode, callback}) { + loadChildNodes({ action, parentNode, callback }) { if (action === LOAD_CHILDREN_OPTIONS) { - crudClassstandard.getClass({pid: parentNode.id}).then(res => { - parentNode.children = res.content.map(function (obj) { + crudClassstandard.getClass({ pid: parentNode.id }).then(res => { + parentNode.children = res.content.map(function(obj) { if (obj.hasChildren) { obj.children = null } @@ -343,7 +342,7 @@ export default { }, delLine() { this.form.tableData.splice(-1) - }, + } } }