rev：退料组盘页面优化

wms/nladmin-ui/src/views/wms/basedata/group/AddReceiveDtl.vue

@@ -10,6 +10,70 @@
     @open="open"
   >
     <el-form ref="form2" :model="formMst" :rules="rules" size="mini" label-width="110px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="关联工单" prop="bom_list">
+            <el-select
+              v-model="formMst.bom_list"
+              multiple
+              size="mini"
+              style="width: 280px;"
+              class="filter-item"
+              @change="queryBomMater"
+            >
+              <el-option
+                v-for="item in bomList"
+                :label="item.bom_code"
+                :value="item.bom_code"
+              >
+                <span style="float: left">{{ item.bom_code }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{'可退重量：'+ item.real_weigh_qty }}</span>
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="当前点位" prop="point_code">
+            <el-select
+              v-model="formMst.point_code"
+              size="mini"
+              @change="queryVehicle"
+              placeholder="全部"
+              style="width: 220px"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in pointList"
+                :key="item.point_code"
+                :label="item.point_name"
+                :value="item.point_code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="载具编码" prop="storagevehicle_code">
+            <el-select
+              v-model="formMst.storagevehicle_code"
+              size="mini"
+              placeholder="全部"
+              style="width: 220px"
+              class="filter-item"
+              @change="queryVehicleType"
+            >
+              <el-option
+                v-for="item in vehicleList"
+                :key="item.vehicle_code"
+                :label="item.vehicle_code"
+                :value="item.vehicle_code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
       <el-row>
         <el-col :span="8">
           <el-form-item label="物料编码" prop="material_code">
@@ -20,6 +84,7 @@
               style="width: 220px"
               class="filter-item"
               filterable
+              disabled
               @change="queryMater"
             >
               <el-option
@@ -47,8 +112,22 @@
 
       <el-row>
         <el-col :span="8">
-          <el-form-item label="载具编码" prop="storagevehicle_code">
-            <el-input v-model="formMst.storagevehicle_code" style="width: 220px;" />
+          <el-form-item label="机台编码" prop="device_code">
+            <el-select
+              disabled
+              v-model="formMst.device_code"
+              size="mini"
+              style="width: 220px;"
+              class="filter-item"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in deviceList"
+                :key="item.device_code"
+                :label="item.device_code"
+                :value="item.device_code"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
 
@@ -125,7 +204,7 @@
               size="mini"
               style="width: 220px;"
               class="filter-item"
-              @change="crud.toQuery"
+              disabled
             >
               <el-option
                 v-for="item in dict.QUALITY_TYPE"
@@ -143,7 +222,7 @@
               size="mini"
               style="width: 220px;"
               class="filter-item"
-              @change="crud.toQuery"
+              disabled
             >
               <el-option
                 v-for="item in dict.storagevehicle_type"
@@ -155,48 +234,6 @@
         </el-col>
       </el-row>
 
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="关联工单" prop="bom_list">
-            <el-select
-              v-model="formMst.bom_list"
-              multiple
-              size="mini"
-              style="width: 280px;"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in bomList"
-                :label="item.bom_code"
-                :value="item.bom_code"
-              >
-                <span style="float: left">{{ item.bom_code }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{'可退重量：'+ item.real_weigh_qty }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="机台编码" prop="device_code">
-            <el-select
-              v-model="formMst.device_code"
-              size="mini"
-              style="width: 220px;"
-              class="filter-item"
-              @change="crud.toQuery"
-            >
-              <el-option
-                v-for="item in deviceList"
-                :key="item.device_code"
-                :label="item.device_code"
-                :value="item.device_code"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
       <el-row>
         <el-col :span="12">
           <el-form-item label="执行标准" prop="execution_stand">
@@ -238,7 +275,7 @@ import CRUD, { crud } from '@crud/crud'
 import crudGroup from '@/views/wms/basedata/group/group'
 import crudDeviceinfo from '@/views/wms/basedata/deviceInfo/deviceinfo'
 import crudCallMaterial from '@/views/wms/pdm/callmaterial/callmaterial'
-
+import crudPoint from '@/views/wms/sch/point/schBasePoint'
 export default {
   name: 'WeighDialog',
   mixins: [crud()],
@@ -262,7 +299,7 @@ export default {
         remark: null,
         status: null,
         supp_code: null,
-        quality_time: null,
+        quality_time: new Date(),
         produce_time: new Date(),
         execution_stand: null,
         bake_num: 0,
@@ -280,7 +317,9 @@ export default {
       pcsnList: [],
       materList: [],
       deviceList: [],
+      pointList: [],
       bomList: [],
+      vehicleList: [],
       current: null,
       dialogVisible: false,
       rules: {
@@ -359,6 +398,14 @@ export default {
       crudDeviceinfo.getDevice({}).then(res => {
         this.deviceList = res
       })
+      // 查询工单信息
+      crudCallMaterial.queryMaterialBom({}).then(res => {
+        this.bomList = res
+      })
+      const area_type = 'INOUR01'
+      crudPoint.getPointList({ 'region_code': area_type }).then(res => {
+        this.pointList = res
+      })
     },
     outReceiveGroup() {
       if (!this.formMst.material_id) {
@@ -408,19 +455,43 @@ export default {
         this.formMst.material_spec = row.material_spec
         this.formMst.material_name = row.material_name
         this.formMst.material_id = row.material_id
-        // 查询工单信息
-        crudCallMaterial.queryMaterialBom({ 'material_id': this.formMst.material_id }).then(res => {
-          if (res.length === 0) {
-            this.formMst.bom_list = []
-          }
-          this.bomList = res
-        })
       }).catch(() => {
         this.formMst.material_spec = ''
         this.formMst.material_name = ''
         this.formMst.material_code = ''
         this.formMst.material_id = ''
       })
+    },
+    queryBomMater(value) {
+      if (value.length === 0) {
+        this.formMst.material_spec = ''
+        this.formMst.material_name = ''
+        this.formMst.material_code = ''
+        this.formMst.material_id = ''
+        this.formMst.device_code = ''
+      } else {
+        const bom_code = value[0]
+        for (let i = 0; i < this.bomList.length; i++) {
+          const row = this.bomList[i]
+          if (row.bom_code === bom_code) {
+            // 给物料编码赋值
+            this.formMst.material_code = row.material_code
+            this.queryMater(row.material_code)
+            // 给机台编码赋值
+            this.formMst.device_code = row.device_code
+          }
+        }
+      }
+    },
+    queryVehicle(value) {
+      crudGroup.queryVehicle({ 'point_code': value }).then(res => {
+        this.vehicleList = res
+      })
+    },
+    queryVehicleType(value) {
+      crudGroup.queryVehicleType({ 'vehicle_code': value }).then(res => {
+        this.formMst.box_type = res.storagevehicle_type
+      })
     }
   }
 }

wms/nladmin-ui/src/views/wms/basedata/group/group.js

@@ -96,5 +96,22 @@ export function outReceiveGroup(data) {
   })
 }
 
+export function queryVehicle(data) {
+  return request({
+    url: 'api/group/queryVehicle',
+    method: 'post',
+    data
+  })
+}
+
+export function queryVehicleType(data) {
+  return request({
+    url: 'api/group/queryVehicleType',
+    method: 'post',
+    data
+  })
+}
+
 export default { add, edit, del, queryMater, queryMaterList, checkVehicle,
-  querySupp, copySave, printDelete, excelImport, getPcsn, outReceiveGroup }
+  querySupp, copySave, printDelete, excelImport, getPcsn, outReceiveGroup,
+  queryVehicle, queryVehicleType }