add: 新增需求: 空托限位送空盘,货梯满料入库

fix: 修复供给线点位冲突bug
This commit is contained in:
2023-06-02 16:17:02 +08:00
parent 50e68ef5c2
commit de1f553f6e
16 changed files with 789 additions and 93 deletions

View File

@@ -70,7 +70,7 @@
</el-select>
</el-form-item>
<el-form-item
v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')"
v-if="(query.region_id=='1663803432005406720' || query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624')"
label="块"
>
<el-input
@@ -82,7 +82,7 @@
/>
</el-form-item>
<el-form-item
v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
v-if="(query.region_id=='1663803432005406720' || query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
label="排"
>
<el-input
@@ -94,7 +94,7 @@
/>
</el-form-item>
<el-form-item
v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
v-if="(query.region_id=='1663803432005406720' || query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
label="列"
>
<el-input
@@ -106,7 +106,7 @@
/>
</el-form-item>
<el-form-item
v-if="(query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
v-if="(query.region_id=='1663803432005406720' || query.region_id=='1557539288307077120' || query.region_id=='1582909373552922624' || query.region_id=='1557538851726168064')"
label="层"
>
<el-input
@@ -341,7 +341,7 @@
<el-table-column prop="point_name" label="点位名称" width="150" sortable show-overflow-tooltip />
<el-table-column prop="region_name" label="区域名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="material_name" label="物料名称" min-width="120" show-overflow-tooltip />
<el-table-column prop="point_type_name" label="点位类型" />
<el-table-column prop="point_type_name" label="点位类型" min-width="120" show-overflow-tooltip/>
<el-table-column prop="point_status_name" label="点位状态" />
<el-table-column prop="lock_type_name" label="锁定类型" />
<el-table-column prop="vehicle_type" label="载具类型" min-width="120">