diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/groupdick.js b/wms_pro/qd/src/views/wms/md_manage/group_dick/groupdick.js
index 918b0f1e..43553b7a 100644
--- a/wms_pro/qd/src/views/wms/md_manage/group_dick/groupdick.js
+++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/groupdick.js
@@ -39,6 +39,14 @@ export function addPersons(data) {
})
}
+export function confirm(data) {
+ return request({
+ url: '/api/ioStorage/out',
+ method: 'post',
+ data
+ })
+}
+
export function getHeader(data) {
return request({
url: '/api/mdGruopDick/getHeader',
@@ -79,4 +87,4 @@ export function excelImport(data) {
})
}
-export default { add, edit, del, addPersons, getHeader, deleteRow, addDevices,excelImport,updategroup }
+export default { add, edit, del, addPersons, getHeader, deleteRow, addDevices, excelImport, updategroup, confirm }
diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue
index 919dbf13..22d37e9f 100644
--- a/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue
+++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue
@@ -12,8 +12,13 @@
label-suffix=":"
>
-
+
-
+
-
+
@@ -56,15 +61,25 @@
导入
+
+ 出库确认
+
-
+
确认
-
+
-
-
+
+
{{ scope.row.code }}
@@ -106,14 +127,14 @@
{{ statusEnum.label.FORM_STATUS[scope.row.status] }}
-
-
-
+
+
+
-
-
-
- {{scope.row.form_data[item.value]}}
+
+
+
+ {{ scope.row.form_data[item.value] }}
@@ -122,7 +143,7 @@
-
+
@@ -140,7 +161,6 @@ import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
import ViewDialog from '@/views/wms/md_manage/group_dick/ViewDialog'
import UploadDialog from './UploadDialog'
-
const defaultForm = {
id: '',
code: '',
@@ -156,9 +176,18 @@ const defaultForm = {
form_data: {}
}
export default {
- name: 'groupDick',
+ name: 'GroupDick',
statusEnums: ['FORM_STATUS'],
- components: { ViewDialog, AddDialog, crudbucketrecord, formstruc, pagination, crudOperation, rrOperation,UploadDialog },
+ components: {
+ ViewDialog,
+ AddDialog,
+ crudbucketrecord,
+ formstruc,
+ pagination,
+ crudOperation,
+ rrOperation,
+ UploadDialog
+ },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
return CRUD({
@@ -180,9 +209,10 @@ export default {
return {
cols: [],
GroupShow: false,
+ currentRow: null,
viewShow: false,
- statusEdit:false,
- vachileView:false,
+ statusEdit: false,
+ vachileView: false,
editForm: {},
classes3: [],
uploadShow: false,
@@ -191,7 +221,7 @@ export default {
rules: {},
unit_list: [{ value: 16, label: '个\\只' }],
queryTypeOptions: [
- {key: 'deliver_code', display_name: '发货单号'}
+ { key: 'deliver_code', display_name: '发货单号' }
]
}
},
@@ -203,21 +233,21 @@ export default {
formstruc.getHeader('md_group_dick').then(res => {
this.cols = res
res.forEach(a => {
- this.form.form_data[a.value,'']
+ this.form.form_data[a.value, '']
})
})
},
- querytable(){
+ querytable() {
this.crud.toQuery()
},
- vechile(row){
+ vechile(row) {
this.$refs.viewRef.setForm(row)
},
- editStatus(row){
+ editStatus(row) {
this.editForm = row,
- this.statusEdit = true
+ this.statusEdit = true
},
- submitStatus(){
+ submitStatus() {
crudbucketrecord.updategroup(this.editForm).then(res => {
this.editForm = {}
this.crud.notify('编辑成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
@@ -225,6 +255,22 @@ export default {
this.crud.toQuery()
})
},
+ confirm() {
+ debugger
+ if (this.crud.selections.length === 0) {
+ this.crud.notify('请选择一个载具', CRUD.NOTIFICATION_TYPE.INFO)
+ return
+ }
+ if (this.crud.selections.length > 1) {
+ this.crud.notify('请确认只选择一个载具', CRUD.NOTIFICATION_TYPE.INFO)
+ return
+ }
+ debugger
+ crudbucketrecord.confirm(JSON.stringify({ 'vehicle_code': this.crud.selections[0].vehicle_code })).then(res => {
+ this.crud.notify('载具出库确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+ this.crud.toQuery()
+ })
+ }
}
}