Commit 0894b4df authored by chenzj's avatar chenzj

领料单修复

parent 6d255cd2
...@@ -108,19 +108,19 @@ ...@@ -108,19 +108,19 @@
</el-table-column> </el-table-column>
<el-table-column label="领料单名称" align="center" prop="issueName" :show-overflow-tooltip="true"/> <el-table-column label="领料单名称" align="center" prop="issueName" :show-overflow-tooltip="true"/>
<el-table-column label="生产工单" align="center" prop="workorderCode" /> <el-table-column label="生产工单" align="center" prop="workorderCode" />
<el-table-column label="客户编号" align="center" prop="clientCode" /> <el-table-column label="申请单号" align="center" prop="applyNo" />
<el-table-column label="客户名称" align="center" prop="clientName" /> <el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="领料日期" align="center" prop="issueDate" width="180"> <el-table-column label="领料日期" align="center" prop="issueDate" width="180">
<template slot-scope="scope"> <!-- <template slot-scope="scope">width="180"
<span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d}') }}</span>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="单据状态" align="center" prop="status"> <!-- <el-table-column label="单据状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/> <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
v-if="scope.row.status =='PREPARE'" v-if="scope.row.status =='PREPARE'"
@click="handleExecute(scope.row)" @click="handleExecute(scope.row)"
v-hasPermi="['mes:wm:issueheader:edit']" v-hasPermi="['mes:wm:issueheader:edit']"
>执行领出</el-button> >执行领出</el-button> -->
<!-- <el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:wm:issueheader:edit']" v-hasPermi="['mes:wm:issueheader:edit']"
>修改</el-button> --> >修改</el-button> -->
<el-button <!-- <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
v-hasPermi="['mes:wm:issueheader:remove']" v-hasPermi="['mes:wm:issueheader:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column> -->
</el-table> </el-table>
<pagination <pagination
...@@ -193,30 +193,6 @@ ...@@ -193,30 +193,6 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="领料仓库">
<el-cascader v-model="warehouseInfo"
:options="warehouseOptions"
:props="warehouseProps"
@change="handleWarehouseChanged"
>
</el-cascader>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单据状态" prop="status">
<el-select v-model="form.status" disabled>
<el-option
v-for="dict in dict.type.mes_order_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="生产工单" prop="workorderCode"> <el-form-item label="生产工单" prop="workorderCode">
<el-input v-model="form.workorderCode" placeholder="请选择生产工单" > <el-input v-model="form.workorderCode" placeholder="请选择生产工单" >
...@@ -226,15 +202,8 @@ ...@@ -226,15 +202,8 @@
<WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect> <WorkorderSelect ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="客户编号" > <el-form-item label="申请单号" prop="applyNo">
<el-input v-model="form.clientCode" placeholder="请选择生产工单" > <el-input v-model="form.applyNo" placeholder="请输入申请单" />
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户名称" >
<el-input v-model="form.clientName" placeholder="请选择生产工单" >
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
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