rev:分配逻辑；todo:分配完更新单据还是载具？

wms_pro/qd/src/views/wms/base_manage/vehicle/index.vue

@@ -13,7 +13,7 @@
         >
           <el-form-item label="载具类型">
             <el-select
-              v-model="query.storagevehicle_type"
+              v-model="query.vehicle_type"
               clearable
               size="mini"
               placeholder="请选择"
@@ -31,7 +31,7 @@
 
           <el-form-item label="载具号">
             <el-input
-              v-model="query.storagevehicle_code_begin"
+              v-model="query.vehicle_code_begin"
               clearable
               size="mini"
               placeholder="起始载具号"
@@ -41,7 +41,7 @@
             />
             -
             <el-input
-              v-model="query.storagevehicle_code_end"
+              v-model="query.vehicle_code_end"
               clearable
               size="mini"
               placeholder="结束载具号"
@@ -77,7 +77,7 @@
       >
         <el-form ref="form" :model="materialForm" :rules="rules" size="mini" label-width="110px">
           <el-form-item label="载具编码" prop="vehicle_code">
-            <el-input v-model="materialForm.storagevehicle_code" disabled style="width: 370px;" />
+            <el-input v-model="materialForm.vehicle_code" disabled style="width: 370px;" />
           </el-form-item>
           <el-form-item label="物料编码" prop="material_code">
             <template slot-scope="scope">
@@ -109,9 +109,9 @@
         @close="materiValueCancel()"
       >
         <el-form ref="form" :model="updateForm" :rules="rules" size="mini" label-width="110px">
-          <el-form-item label="载具编号" prop="storagevehicle_code">
+          <el-form-item label="载具编号" prop="vehicle_code">
             <template slot-scope="scope">
-              <el-input v-model="updateForm.storagevehicle_code" clearable />
+              <el-input v-model="updateForm.vehicle_code" clearable />
             </template>
           </el-form-item>
           <el-form-item label="载具重量(g)" prop="vehicle_weight">
@@ -164,9 +164,9 @@
         width="450px"
       >
         <el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
-          <el-form-item label="载具类型" prop="storagevehicle_type">
+          <el-form-item label="载具类型" prop="vehicle_type">
             <el-select
-              v-model="form.storagevehicle_type"
+              v-model="form.vehicle_type"
               clearable
               size="mini"
               placeholder="请选择"
@@ -182,8 +182,8 @@
             </el-select>
           </el-form-item>
           <br>
-          <el-form-item label="起始载具号" prop="storagevehicle_code">
-            <el-input v-model="form.storagevehicle_code" :disabled="true" style="width: 250px;" />
+          <el-form-item label="起始载具号" prop="vehicle_code">
+            <el-input v-model="form.vehicle_code" :disabled="true" style="width: 250px;" />
           </el-form-item>
           <el-form-item label="载具数量" prop="num">
             <el-input-number v-model="form.num" :precision="0" style="width: 150px;" />
@@ -209,18 +209,17 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column v-if="false" prop="storagevehicle_id" label="载具标识" />
         <el-table-column prop="storagevehicle_type" label="载具类型">
           <template slot-scope="scope">
-            {{ dict.label.storagevehicle_type[scope.row.storagevehicle_type] }}
+            {{ dict.label.storagevehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="storagevehicle_code" label="载具编码">
+        <el-table-column prop="vehicle_code" label="载具编码">
           <template slot-scope="scope">
-            <el-link type="warning" @click="toView(scope.row.storagevehicle_code)">{{ scope.row.storagevehicle_code }}</el-link>
+            <el-link type="warning" @click="toView(scope.row.vehicle_code)">{{ scope.row.vehicle_code }}</el-link>
           </template>
         </el-table-column>
-        <el-table-column prop="storagevehicle_name" label="载具名称" />
+        <el-table-column prop="vehicle_name" label="载具名称" />
         <el-table-column prop="vehicle_weight" label="载具单重(g)" />
         <el-table-column label="是否启用" align="center" prop="is_used">
           <template slot-scope="scope">
@@ -232,8 +231,8 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="create_name" label="创建人" />
-        <el-table-column prop="create_time" label="创建时间" />
+        <el-table-column prop="update_name" label="创建人" />
+        <el-table-column prop="update_time" label="创建时间" />
         <el-table-column
           v-permission="['admin','storagevehicleinfo:edit','storagevehicleinfo:del']"
           label="操作"
@@ -276,27 +275,23 @@ import { getLodop } from '@/assets/js/lodop/LodopFuncs'
 // import MaterDtl from '@/views/wms/pub/MaterDialog'
 
 const defaultForm = {
-  storagevehicle_id: null,
-  storagevehicle_code: null,
-  storagevehicle_name: null,
+  vehicle_code: null,
+  vehicle_name: null,
   one_code: null,
   two_code: null,
   rfid_code: null,
-  create_id: null,
-  create_name: null,
-  create_time: null,
-  update_optid: null,
-  update_optname: null,
+  update_name: null,
   update_time: null,
   is_delete: null,
   is_used: '1',
   storagevehicle_type: null,
-  vehicle_width: null,
-  vehicle_long: null,
-  vehicle_height: null,
+  w: null,
+  l: null,
+  h: null,
+  weight: null,
   overstruct_type: null,
   occupystruct_qty: null,
-  ext_id: null,
+  ext_json: null,
   num: '1'
 }
 export default {
@@ -308,8 +303,8 @@ export default {
     return CRUD({
       title: '载具',
       url: 'api/bmVehicleInfo',
-      idField: 'storagevehicle_id',
-      sort: 'storagevehicle_id,desc',
+      idField: 'vehicle_code',
+      sort: 'vehicle_code,desc',
       crudMethod: { ...crudStoragevehicleinfo },
       optShow: {
         add: true,
@@ -349,16 +344,7 @@ export default {
       resultCodeArr: [],
       permission: {},
       rules: {
-        storagevehicle_code: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_id: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_name: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ],
-        create_time: [
+        vehicle_code: [
           { required: true, message: '不能为空', trigger: 'blur' }
         ],
         is_delete: [
@@ -367,7 +353,7 @@ export default {
         is_used: [
           { required: true, message: '不能为空', trigger: 'blur' }
         ],
-        storagevehicle_type: [
+        vehicle_type: [
           { required: true, message: '不能为空', trigger: 'blur' }
         ],
         overstruct_type: [
@@ -462,7 +448,7 @@ export default {
       console.log(_selectData.length)
       console.log(this.printForm)
       for (let i = 0; i < _selectData.length; i++) {
-        const code = _selectData[i].storagevehicle_code
+        const code = _selectData[i].vehicle_code
         const LODOP = getLodop()
         LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
         // 打印纸张大小设置https://www.it610.com/article/2094844.html
@@ -523,11 +509,11 @@ export default {
     getVehicle(code) {
       if (!code) {
         this.crud.notify('请选择载具类型', CRUD.NOTIFICATION_TYPE.INFO)
-        this.form.storagevehicle_code = ''
+        this.form.vehicle_code = ''
         return false
       }
       crudStoragevehicleinfo.getVehicle(code).then(res => {
-        this.form.storagevehicle_code = res.value
+        this.form.vehicle_code = res.value
       })
     }
   }