rev:界面布局优化
This commit is contained in:
@@ -155,7 +155,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="update_optname" label="修改人" />
|
<el-table-column prop="update_optname" label="修改人" />
|
||||||
<el-table-column prop="update_time" label="修改时间" width="135" />
|
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
|
||||||
<el-table-column
|
<el-table-column
|
||||||
v-permission="['admin','Materialbase:edit','Materialbase:del']"
|
v-permission="['admin','Materialbase:edit','Materialbase:del']"
|
||||||
fixed="right"
|
fixed="right"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
@close="close"
|
@close="close"
|
||||||
>
|
>
|
||||||
<div>
|
<div>
|
||||||
<el-form ref="form" :inline="true" :rules="rules" size="mini" label-width="180px">
|
<el-form ref="form" :inline="true" :rules="rules" size="mini" label-width="180px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
|
||||||
<el-form-item label="工单编码">
|
<el-form-item label="工单编码">
|
||||||
<el-input v-model="query.workorder_code" style="width: 200px;" clearable/>
|
<el-input v-model="query.workorder_code" style="width: 200px;" clearable/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -76,7 +76,7 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="product_area" label="生产车间" />
|
<el-table-column prop="product_area" label="生产车间" />
|
||||||
<el-table-column prop="device_code" label="设备编码" align="center" />
|
<el-table-column prop="device_code" label="设备编码" align="center" :min-width="flexWidth('device_code',crud.data,'设备编码')"/>
|
||||||
<el-table-column prop="needproduct_qty" label="待生产数" />
|
<el-table-column prop="needproduct_qty" label="待生产数" />
|
||||||
<el-table-column prop="report_qty" label="报工数量" >
|
<el-table-column prop="report_qty" label="报工数量" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@@ -94,8 +94,8 @@
|
|||||||
<!-- </template>-->
|
<!-- </template>-->
|
||||||
<!-- </el-table-column>-->
|
<!-- </el-table-column>-->
|
||||||
<!-- <el-table-column prop="person_finish_qty" label="人员期末数量" />-->
|
<!-- <el-table-column prop="person_finish_qty" label="人员期末数量" />-->
|
||||||
<el-table-column prop="operatetime_start" label="开工时间" />
|
<el-table-column prop="operatetime_start" label="开工时间" :min-width="flexWidth('operatetime_start',crud.data,'开工时间')"/>
|
||||||
<el-table-column prop="operatetime_end" label="完工时间" />
|
<el-table-column prop="operatetime_end" label="完工时间" :min-width="flexWidth('operatetime_end',crud.data,'完工时间')"/>
|
||||||
<el-table-column prop="report_status" label="报工状态" >
|
<el-table-column prop="report_status" label="报工状态" >
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ reportStatus[scope.row.report_status-1].label }}
|
{{ reportStatus[scope.row.report_status-1].label }}
|
||||||
@@ -103,7 +103,7 @@
|
|||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="produce_person_name" label="操作人" align="center" />
|
<el-table-column prop="produce_person_name" label="操作人" align="center" />
|
||||||
<el-table-column prop="confirm_name" label="审核人" align="center" />
|
<el-table-column prop="confirm_name" label="审核人" align="center" />
|
||||||
<el-table-column prop="confirm_time" label="审核时间" align="center" />
|
<el-table-column prop="confirm_time" label="审核时间" align="center" :min-width="flexWidth('confirm_time',crud.data,'审核时间')" />
|
||||||
<el-table-column label="操作" width="120px" align="center" fixed="right">
|
<el-table-column label="操作" width="120px" align="center" fixed="right">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button :disabled="scope.row.report_status =='3'" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="reportApprove(scope.row)">提交审核</el-button>
|
<el-button :disabled="scope.row.report_status =='3'" size="mini" style="margin-left: -1px;margin-right: 2px" type="text" @click="reportApprove(scope.row)">提交审核</el-button>
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
<el-form-item label="业务类型" prop="bill_type">
|
<el-form-item label="业务类型" prop="bill_type">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.bill_type"
|
v-model="form.bill_type"
|
||||||
|
style="width: 210px"
|
||||||
clearable
|
clearable
|
||||||
size="mini"
|
size="mini"
|
||||||
placeholder="业务类型"
|
placeholder="业务类型"
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="仓 库">
|
<el-form-item label="仓 库">
|
||||||
<el-select
|
<el-select
|
||||||
|
style="width: 210px"
|
||||||
v-model="form.product_code"
|
v-model="form.product_code"
|
||||||
clearable
|
clearable
|
||||||
size="mini"
|
size="mini"
|
||||||
@@ -35,6 +36,7 @@
|
|||||||
<el-form-item label="业务类型">
|
<el-form-item label="业务类型">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.bill_type"
|
v-model="form.bill_type"
|
||||||
|
style="width: 210px"
|
||||||
clearable
|
clearable
|
||||||
filterable
|
filterable
|
||||||
size="mini"
|
size="mini"
|
||||||
|
|||||||
@@ -28,19 +28,6 @@
|
|||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item label="入库日期">
|
|
||||||
<el-date-picker
|
|
||||||
v-model="query.createTime"
|
|
||||||
type="daterange"
|
|
||||||
value-format="yyyy-MM-dd HH:mm:ss"
|
|
||||||
start-placeholder="开始日期"
|
|
||||||
end-placeholder="结束日期"
|
|
||||||
:default-time="['00:00:00', '23:59:59']"
|
|
||||||
@change="crud.toQuery"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
|
||||||
|
|
||||||
<el-form-item label="仓位编码">
|
<el-form-item label="仓位编码">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="query.struct_code"
|
v-model="query.struct_code"
|
||||||
@@ -80,7 +67,17 @@
|
|||||||
@keyup.enter.native="crud.toQuery"
|
@keyup.enter.native="crud.toQuery"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="入库日期">
|
||||||
|
<el-date-picker
|
||||||
|
v-model="query.createTime"
|
||||||
|
type="daterange"
|
||||||
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
|
start-placeholder="开始日期"
|
||||||
|
end-placeholder="结束日期"
|
||||||
|
:default-time="['00:00:00', '23:59:59']"
|
||||||
|
@change="crud.toQuery"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
<rrOperation />
|
<rrOperation />
|
||||||
</el-form>
|
</el-form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -32,6 +32,7 @@
|
|||||||
<el-form-item label="业务类型" prop="bill_type">
|
<el-form-item label="业务类型" prop="bill_type">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="form.bill_type"
|
v-model="form.bill_type"
|
||||||
|
style="width: 210px"
|
||||||
clearable
|
clearable
|
||||||
size="mini"
|
size="mini"
|
||||||
placeholder="业务类型"
|
placeholder="业务类型"
|
||||||
|
|||||||
Reference in New Issue
Block a user