前端修改 机械手双工位任务完成修改 工单反馈mes修改为系统参数控制

lms/nladmin-ui/src/views/wms/pdm/workerorder/index.vue

@@ -353,7 +353,6 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-value="default_date_show"
-              :picker-options="disabled_time"
             />
           </el-form-item>
         </el-form>
@@ -453,11 +452,6 @@ export default {
       show_sync_dialog: false,
       sync_time: '',
       default_date_show: '',
-      disabled_time: {
-        disabledDate(time) {
-          return time.getTime() > Date.now() // 可选历史天、可选当前天、不可选未来天
-        }
-      },
       rules: {
         // produceorder_code: [
         //   { required: true, message: '生产班次工单编号不能为空', trigger: 'blur' }

lms/nladmin-ui/src/views/wms/st/ysa/inventory.vue

@@ -32,12 +32,13 @@
             >
               <el-option
                 v-for="item in region_code_list"
+                :key="item.region_id"
                 :label="item.region_name"
                 :value="item.region_code"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="载具类型">
+          <el-form-item v-if="false" label="载具类型">
             <el-select
               v-model="query.vehicle_type"
               clearable
@@ -49,12 +50,13 @@
             >
               <el-option
                 v-for="item in dict.vehicle_type"
+                :key="item.id"
                 :label="item.label"
                 :value="item.value"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="入库时间">
+          <el-form-item v-if="false" label="入库时间">
             <el-date-picker
               v-model="query.createTime"
               type="daterange"
@@ -65,7 +67,7 @@
               @change="crud.toQuery"
             />
           </el-form-item>
-          <el-form-item label="锁定类型">
+          <el-form-item v-if="false" label="锁定类型">
             <el-select
               v-model="query.lock_type"
               clearable
@@ -77,6 +79,7 @@
             >
               <el-option
                 v-for="item in dict.d_lock_type"
+                :key="item.id"
                 :label="item.label"
                 :value="item.value"
               />
@@ -141,6 +144,7 @@
             >
               <el-option
                 v-for="item in dict.vehicle_type"
+                :key="item.id"
                 :label="item.label"
                 :value="item.value"
               />
@@ -157,6 +161,7 @@
             >
               <el-option
                 v-for="item in vehicleList"
+                :key="item.vehicle_id"
                 :label="item.vehicle_code"
                 :value="item.vehicle_code"
               />
@@ -208,14 +213,14 @@
         <el-table-column prop="material_code" label="物料编号" />
         <el-table-column prop="material_name" label="物料名称" />
         <!--        <el-table-column prop="pcsn" label="批次" />-->
-        <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
-        <el-table-column prop="instorage_time" label="出入库时间" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="lock_type" label="锁定类型">
+        <el-table-column v-if="false" prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
+        <el-table-column v-if="false" prop="instorage_time" label="出入库时间" min-width="150" show-overflow-tooltip />
+        <el-table-column v-if="false" prop="lock_type" label="锁定类型">
           <template slot-scope="scope">
             {{ dict.label.d_lock_type[scope.row.lock_type] }}
           </template>
         </el-table-column>
-        <el-table-column prop="is_used" label="是否启用">
+        <el-table-column v-if="false" prop="is_used" label="是否启用">
           <template slot-scope="scope">
             {{ scope.row.is_used == '1' ? '是' : '否' }}
           </template>
@@ -234,7 +239,6 @@ import crudStructivt from '../structivt'
 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 pagination from '@crud/Pagination'
 import crudPoint from '@/api/wms/sch/point'
 import MaterDtl from '@/views/wms/pub/MaterDialog'
@@ -270,7 +274,7 @@ const defaultForm = {
 }
 export default {
   name: 'Inventory',
-  components: { pagination, crudOperation, rrOperation, udOperation, MaterDtl },
+  components: { pagination, crudOperation, rrOperation, MaterDtl },
   dicts: ['sch_point_status', 'vehicle_type', 'is_used', 'd_lock_type'],
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {