add 项目更新

lms/nladmin-ui/src/views/wms/basedata/vehicle/group/index.vue

@@ -62,6 +62,15 @@
           <el-form-item label="点位号">
             <el-input v-model="form.point_code" style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="物料标识" prop="material_number">
+                <el-input
+                  v-model="form.material_id"
+                  style="width: 300px"
+                  clearable
+                  @focus="materialShow=true"
+                  @clear="form.material_id=''; form.material_number=''; form.material_name=''"
+                />
+              </el-form-item>
           <el-form-item label="是否满垛" prop="is_full">
             <el-radio v-model="form.is_full" label="0">否</el-radio>
             <el-radio v-model="form.is_full" label="1">是</el-radio>
@@ -102,6 +111,7 @@
         />
         <el-table-column prop="qty" label="数量" :min-width="flexWidth('qty',crud.data,'数量')" />
         <el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')" />
+        <el-table-column prop="material_number"label="物料号":min-width="flexWidth('material_number',crud.data,'物料号')"/>
         <!--        <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')"/>-->
         <el-table-column prop="is_full" label="是否满垛" :min-width="flexWidth('is_full',crud.data,'是否满垛')">
           <template slot-scope="scope">
@@ -143,6 +153,7 @@
         </el-table-column>
       </el-table>
       <!--分页组件-->
+      <MaterDtl :dialog-show.sync="materialShow" :is-single="true" @setMaterValue="setMaterValue" />
       <pagination />
     </div>
   </div>
@@ -154,6 +165,7 @@ import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
+import MaterDtl from '@/views/wms/pub/MaterDialog'
 import pagination from '@crud/Pagination'
 
 const defaultForm = {
@@ -222,12 +234,14 @@ const defaultForm = {
   update_time: null,
   is_delete: null,
   is_fire: '0',
-  is_in_kiln: null
+  is_in_kiln: null,
+  material_id: null,
+  material_number: null
 }
 export default {
   name: 'VehicleDetail',
   dicts: ['vehicle_type'],
-  components: { pagination, crudOperation, rrOperation, udOperation },
+  components: { pagination, crudOperation,MaterDtl, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -241,6 +255,7 @@ export default {
   data() {
     return {
       permission: {},
+      materialShow: false,
       rules: {
         vehicle_type: [
           { required: true, message: '不能为空', trigger: 'blur' }
@@ -261,6 +276,11 @@ export default {
     }
   },
   methods: {
+        // 新增编辑给form表单物料相关信息赋值
+        setMaterValue(row) {
+      this.form.material_id = row.material_id
+      this.form.material_number = row.material_number
+    },
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
     [CRUD.HOOK.beforeRefresh]() {
       return true