界面调整

yangwl
zhaoxiaolin 4 months ago
parent 3ae5a42a97
commit cf9c9afb38

@ -116,14 +116,14 @@
>导出 >导出
</el-button> </el-button>
</el-col> </el-col>
<!--
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-guide" size="mini" <el-button type="primary" plain icon="el-icon-guide" size="mini"
@click="handleAutoSplit" @click="handleAutoSplit"
:disabled="single" :disabled="single"
v-hasPermi="['mes:pro:order:edit']">辅助排产 v-hasPermi="['mes:pro:order:edit']">辅助排产
</el-button> </el-button>
</el-col>--> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>

@ -251,7 +251,7 @@
<el-dialog <el-dialog
title="工单信息" title="工单信息"
:visible.sync="printDialogVisible" :visible.sync="printDialogVisible"
width="1450px" width="1000px"
> >
<div id="printFrom" class="my-print-box"> <div id="printFrom" class="my-print-box">
@ -285,11 +285,11 @@
<el-table-column <el-table-column
prop="workorderCode" prop="workorderCode"
label="生产工单" label="生产工单"
width="150"> width="130">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="workorderCodeSap" prop="workorderCodeSap"
width="150" width="100" :formatter="orderCodeFormate"
label="生产订单"> label="生产订单">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -298,37 +298,39 @@
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="unit" prop="unit" width="50"
label="单位"> label="单位">
</el-table-column> </el-table-column>
<!--
<el-table-column <el-table-column
prop="quantityProduced" prop="quantityProduced" width="80"
label="已生产数量"> label="已生产数量">
</el-table-column> </el-table-column>-->
<el-table-column <el-table-column
prop="quantitySplit" prop="quantitySplit" width="80"
label="拆分数量"> label="拆分数量">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="routeCode" prop="routeCode" width="90"
label="工艺编码"> label="工艺编码">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="prodLineCode" prop="prodLineCode" width="100"
label="产线设备"> label="产线设备">
</el-table-column> </el-table-column>
<el-table-column label="班次" align="center" prop="shiftId" :formatter="shiftFormat"> <el-table-column label="班次" align="center" prop="shiftId" :formatter="shiftFormat" width="40">
</el-table-column> </el-table-column>
<el-table-column label="工单状态" align="center" prop="status"> <el-table-column label="工单状态" align="center" prop="status" width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.workorder_type" :value="scope.row.status"/> <dict-tag :options="dict.type.workorder_type" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<!--
<el-table-column label="产品类型" align="center" prop="prodType"> <el-table-column label="产品类型" align="center" prop="prodType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.product_type" :value="scope.row.prodType"/> <dict-tag :options="dict.type.product_type" :value="scope.row.prodType"/>
</template> </template>
</el-table-column> </el-table-column>-->
</el-table> </el-table>
<br/> <br/>

@ -18,6 +18,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--
<el-col :span="4"> <el-col :span="4">
<el-form-item label="是否发起OA" prop="startOA"> <el-form-item label="是否发起OA" prop="startOA">
<el-radio-group v-model="form.startOA"> <el-radio-group v-model="form.startOA">
@ -50,11 +51,18 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="14"> <el-col :span="14">
<el-form-item v-if="form.startOA == '1'" label="不合格描述" prop="remark"> <el-form-item v-if="form.startOA == '1'" label="不合格描述" prop="remark">
<el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" /> <el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
</el-form-item> </el-form-item>
</el-col> </el-col>
-->
<el-col :span="14">
<el-form-item label="不合格描述" prop="remark">
<el-input type='textarea' v-model="form.remark" placeholder="请输入不合格描述" />
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>

Loading…
Cancel
Save