opt:优化任务配置页面、点位管理页面
This commit is contained in:
@@ -175,17 +175,6 @@
|
||||
>
|
||||
禁用
|
||||
</el-button>
|
||||
<!-- <el-button
|
||||
slot="right"
|
||||
class="filter-item"
|
||||
size="mini"
|
||||
type="primary"
|
||||
icon="el-icon-info"
|
||||
@click="showConfirmationDialog"
|
||||
>
|
||||
缓存区一键移库
|
||||
</el-button>-->
|
||||
<!-- Confirmation Dialog -->
|
||||
</crudOperation>
|
||||
<el-dialog
|
||||
title="确认"
|
||||
@@ -280,16 +269,6 @@
|
||||
<el-form-item v-if="form.point_status !== '1'" label="子托盘编码" prop="vehicle_code2">
|
||||
<el-input v-model="form.vehicle_code2" clearable style="width: 370px;" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="可放载具类型" prop="can_vehicle_types">
|
||||
<el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" clearable style="width: 370px;">
|
||||
<el-option
|
||||
v-for="item in dict.vehicle_type"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item label="载具数量" prop="vehicle_qty">
|
||||
<el-input-number v-model="form.vehicle_qty" style="width: 370px;" :controls="false" class="clear-number-input" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
|
||||
</el-form-item>
|
||||
@@ -305,7 +284,7 @@
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="text" @click="crud.cancelCU">取消</el-button>
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
|
||||
<el-button :loading="crud.cu === 2" type="primary" @click="mysubmit">确认</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!--表格渲染-->
|
||||
@@ -316,21 +295,10 @@
|
||||
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
|
||||
<el-table-column prop="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
|
||||
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
|
||||
<!-- <el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" /> -->
|
||||
<el-table-column prop="point_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')" />
|
||||
<!-- <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
|
||||
<!-- <el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />-->
|
||||
<!-- <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 30)">
|
||||
<template slot-scope="scope">
|
||||
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<!-- <el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" /> -->
|
||||
<el-table-column prop="vehicle_code" label="母托盘编码" :min-width="flexWidth('vehicle_code',crud.data,'母托盘编码')" />
|
||||
<el-table-column prop="vehicle_code2" label="子托盘编码" :min-width="flexWidth('vehicle_code2',crud.data,'子托盘编码')" />
|
||||
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
|
||||
<!-- <el-table-column prop="product_description" label="物料名称" :min-width="flexWidth('product_description',crud.data,'物料名称')" />
|
||||
<el-table-column prop="supplier_name" label="供应商名称" :min-width="flexWidth('supplier_name',crud.data,'供应商名称')" /> -->
|
||||
<el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
|
||||
<template slot-scope="scope">
|
||||
{{ scope.row.ing_task_code?'是':'否' }}
|
||||
@@ -364,6 +332,7 @@
|
||||
style="display: inline"
|
||||
:data="scope.row"
|
||||
:permission="permission"
|
||||
:disabled-dle="true"
|
||||
/>
|
||||
<el-button
|
||||
v-if="showQtyButton(scope.row.vehicle_qty,scope.row.region_code)"
|
||||
@@ -374,15 +343,6 @@
|
||||
>
|
||||
异常出库
|
||||
</el-button>
|
||||
<!-- <el-button
|
||||
v-if="showButton(scope.row.point_status)"
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-view"
|
||||
@click="toView(scope.row)"
|
||||
>
|
||||
查看详情
|
||||
</el-button> -->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@@ -587,16 +547,19 @@ export default {
|
||||
this.crud.query.point_type = null
|
||||
this.crud.query.point_status = null
|
||||
this.hand()
|
||||
}, openReasonDialog(row) {
|
||||
},
|
||||
openReasonDialog(row) {
|
||||
// 打开选择原因的对话框
|
||||
this.reasonDialogVisible = true
|
||||
// 这里可以将row存储到data中,以便在提交时使用
|
||||
this.selectedRow = row
|
||||
}, closeReasonDialog() {
|
||||
},
|
||||
closeReasonDialog() {
|
||||
// 关闭选择原因的对话框
|
||||
this.reasonDialogVisible = false
|
||||
this.$refs['reasonForm'].resetFields()
|
||||
}, submitReason() {
|
||||
},
|
||||
submitReason() {
|
||||
// 提交选择的原因到后端接口
|
||||
const data = {
|
||||
reason: this.reasonForm.reason,
|
||||
@@ -617,9 +580,26 @@ export default {
|
||||
console.error('提交失败,废包材位有货', error)
|
||||
this.$message.error('提交失败,废包材位有货')
|
||||
})
|
||||
}, showConfirmationDialog() {
|
||||
},
|
||||
showConfirmationDialog() {
|
||||
this.dialogVisible = true
|
||||
},
|
||||
mysubmit(){
|
||||
// 弹出输入回温时间和回温模式的对话框
|
||||
this.$confirm('当前货位信息发生变更,请确认货位信息与实际一致', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
console.log('提交')
|
||||
this.crud.submitCU('form')
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
message: '已取消删除'
|
||||
});
|
||||
});
|
||||
},
|
||||
confirmMove() {
|
||||
this.$axios.post('/api/schBaseTask/move', { })
|
||||
.then(response => {
|
||||
|
||||
Reference in New Issue
Block a user