Commit e3c83af6 authored by tanjunxin's avatar tanjunxin

fix: 1.生产工单细节优化; 2.领料申请细节优化

parent 6f21924c
......@@ -85,7 +85,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="产品名称" prop="itemName">
<el-input v-model="form.itemName" placeholder="请输入产品名称" />
<el-input v-model="form.itemName" type="textarea" placeholder="请输入产品名称" />
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -97,12 +97,14 @@
<el-row>
<el-col :span="8">
<el-form-item label="工作中心" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="请输入工作中心" />
<el-input v-model="form.workstationCode" placeholder="请输入工作中心编码" />
<el-input v-model="form.workstationName" type="textarea" placeholder="请输入工作中心名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作单元" prop="workunitCode">
<el-input v-model="form.workunitCode" placeholder="请输入工作单元" />
<el-input v-model="form.workunitCode" placeholder="请输入工作单元编码" />
<el-input v-model="form.workunitName" type="textarea" placeholder="请输入工作单元名称" />
</el-form-item>
</el-col>
<el-col :span="8">
......
......@@ -113,14 +113,14 @@
<el-input v-model="form.applyNo" placeholder="请输入申请号" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<!-- <el-col :span="12">
<el-form-item label="工作中心" prop="workstationCode">
<el-input v-model="form.workstationCode" placeholder="工作中心">
<el-button slot="append" icon="el-icon-search" @click="handleWorkstationSelect"
:disabled="form.workstationMaterialId"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<el-col :span="12">
......
......@@ -20,8 +20,11 @@
<el-input v-model="queryParams.workorderCode" placeholder="请输入工单编码" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="来源单据" prop="sourceCode">
<!-- <el-form-item label="来源单据" prop="sourceCode">
<el-input v-model="queryParams.sourceCode" placeholder="请输入来源单据" clearable @keyup.enter.native="handleQuery" />
</el-form-item> -->
<el-form-item label="订单编号" prop="salesVoucher">
<el-input v-model="queryParams.salesVoucher" placeholder="请输入订单编号" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品名称" prop="productName">
<el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable @keyup.enter.native="handleQuery" />
......@@ -730,6 +733,7 @@ export default {
orderSource: null,
sapItemCode: null,
// sourceCode: null,
salesVoucher: null,
productId: null,
productCode: null,
productName: null,
......
......@@ -33,10 +33,10 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<!-- <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['pro:material:add']">新增</el-button>
</el-col>
</el-col> -->
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['pro:material:edit']">修改</el-button>
......@@ -57,14 +57,14 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="产品编码" align="center" width="150" prop="sapItemCode" />
<el-table-column label="产品名称" align="center" width="150" prop="itemName" />
<el-table-column label="工作中心名称" align="center" width="150" prop="workstationName" />
<!-- <el-table-column label="工作中心名称" align="center" width="150" prop="workstationName" /> -->
<el-table-column label="申请单号" align="center" width="150" prop="applyNo" />
<el-table-column label="工单号" align="center" width="150" prop="workorderCode" />
<el-table-column label="领料类型" align="center" width="150" prop="applyType">
<!-- <el-table-column label="领料类型" align="center" width="150" prop="applyType">
<template slot-scope="scope">
<dict-tag :options="dict.type.pro_requisition_type" :value="scope.row.applyType" />
</template>
</el-table-column>
</el-table-column> -->
<el-table-column label="申请数量" align="center" width="150" prop="applyNum" />
<el-table-column label="是否结案" align="center" prop="windCase">
<template slot-scope="scope">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment