add:组盘页面增加出库确认

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 }

wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue

@@ -12,8 +12,13 @@
           label-suffix=":"
         >
           <el-form-item label="托盘号">
-            <el-input v-model="query.vehicle_code" clearable placeholder="托盘号" style="width: 200px;"
+            <el-input
-                      class="filter-item"/>
+              v-model="query.vehicle_code"
+              clearable
+              placeholder="托盘号"
+              style="width: 200px;"
+              class="filter-item"
+            />
           </el-form-item>
           <el-form-item label="组盘日期">
             <el-date-picker
@@ -43,11 +48,11 @@
           </el-form-item>
           <template v-for="(col,index) in cols">
             <el-form-item label="col.lable" prop="bill_code">
-              <label slot="label">{{col.lable}}:</label>
+              <label slot="label">{{ col.lable }}:</label>
               <el-input v-model="query.form_query[col.value]" :value="col.value" clearable style="width: 200px" />
             </el-form-item>
           </template>
-          <rrOperation :crud="crud"/>
+          <rrOperation :crud="crud" />
         </el-form>
 
       </div>
@@ -56,15 +61,25 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="warning"
+          type="success"
           icon="el-icon-upload2"
           size="mini"
           @click="uploadShow = true"
         >
           导入
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          @click="confirm"
+        >
+          出库确认
+        </el-button>
       </crudOperation>
-      <el-dialog width ="380px" :close-on-click-modal="false"  :visible.sync="statusEdit" title="编辑托盘状态">
+      <el-dialog width="380px" :close-on-click-modal="false" :visible.sync="statusEdit" title="编辑托盘状态">
         <el-form
           ref="form"
           :inline="true"
@@ -90,12 +105,18 @@
           <el-button type="primary" @click="submitStatus">确认</el-button>
         </div>
       </el-dialog>
-      <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()"/>
+      <UploadDialog :dialog-show.sync="uploadShow" @tableChanged3="crud.toQuery()" />
 
       <!--表格渲染-->
-      <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;"
+      <el-table
-                @selection-change="crud.selectionChangeHandler">
+        ref="table"
-        <el-table-column type="selection" width="55"/>
+        v-loading="crud.loading"
+        :data="crud.data"
+        size="mini"
+        style="width: 100%;"
+        @selection-change="crud.selectionChangeHandler"
+      >
+        <el-table-column type="selection" width="55" />
         <el-table-column prop="code" label="组盘编号" width="160px">
           <template slot-scope="scope">
             <el-link type="warning" @click="vechile(scope.row)">{{ scope.row.code }}</el-link>
@@ -106,14 +127,14 @@
             {{ statusEnum.label.FORM_STATUS[scope.row.status] }}
           </template>
         </el-table-column>
-        <el-table-column prop="vehicle_code" label="托盘"  show-overflow-tooltip/>
+        <el-table-column prop="vehicle_code" label="托盘" show-overflow-tooltip />
-        <el-table-column prop="source_form_type" label="源单号"  show-overflow-tooltip/>
+        <el-table-column prop="source_form_type" label="源单号" show-overflow-tooltip />
-        <el-table-column prop="source_form_id" label="源单id"  show-overflow-tooltip/>
+        <el-table-column prop="source_form_id" label="源单id" show-overflow-tooltip />
 
-        <el-table-column prop="create_time" label="组盘时间"/>
+        <el-table-column prop="create_time" label="组盘时间" />
-        <el-table-column prop="create_name" label="组盘人"/>
+        <el-table-column prop="create_name" label="组盘人" />
-        <el-table-column  v-for="(item, index) in cols" :key="item.value"  :label="item.lable" >
+        <el-table-column v-for="(item, index) in cols" :key="item.value" :label="item.lable">
-          <template slot-scope="scope">{{scope.row.form_data[item.value]}}</template>
+          <template slot-scope="scope">{{ scope.row.form_data[item.value] }}</template>
         </el-table-column>
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">
@@ -122,7 +143,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
-      <pagination></pagination>
+      <pagination />
     </div>
     <AddDialog @AddChanged="querytable" />
     <ViewDialog ref="viewRef" :form="form" />
@@ -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,
+      statusEdit: false,
-      vachileView: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()
+      })
+    }
   }
 }
 </script>