|
|
@ -54,17 +54,6 @@
|
|
|
|
>
|
|
|
|
>
|
|
|
|
</el-date-picker>
|
|
|
|
</el-date-picker>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form-item>
|
|
|
|
<!-- <el-form-item label="订单类型" prop="status">-->
|
|
|
|
|
|
|
|
<!-- <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable>-->
|
|
|
|
|
|
|
|
<!-- <el-option-->
|
|
|
|
|
|
|
|
<!-- v-for="dict in dict.type.product_type"-->
|
|
|
|
|
|
|
|
<!-- :key="dict.value"-->
|
|
|
|
|
|
|
|
<!-- :label="dict.label"-->
|
|
|
|
|
|
|
|
<!-- :value="dict.value"-->
|
|
|
|
|
|
|
|
<!-- />-->
|
|
|
|
|
|
|
|
<!-- </el-select>-->
|
|
|
|
|
|
|
|
<!-- </el-form-item>-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
@ -72,17 +61,6 @@
|
|
|
|
</el-form>
|
|
|
|
</el-form>
|
|
|
|
|
|
|
|
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
|
<el-row :gutter="10" class="mb8">
|
|
|
|
<!-- <el-col :span="1.5">-->
|
|
|
|
|
|
|
|
<!-- <el-button-->
|
|
|
|
|
|
|
|
<!-- type="primary"-->
|
|
|
|
|
|
|
|
<!-- plain-->
|
|
|
|
|
|
|
|
<!-- icon="el-icon-plus"-->
|
|
|
|
|
|
|
|
<!-- size="mini"-->
|
|
|
|
|
|
|
|
<!-- @click="setUp"-->
|
|
|
|
|
|
|
|
<!-- v-hasPermi="['mes:pro:order:add']"-->
|
|
|
|
|
|
|
|
<!-- >新增-->
|
|
|
|
|
|
|
|
<!-- </el-button>-->
|
|
|
|
|
|
|
|
<!-- </el-col>-->
|
|
|
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-col :span="1.5">
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
|
type="success"
|
|
|
|
type="success"
|
|
|
@ -129,7 +107,9 @@
|
|
|
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
|
|
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
|
|
|
|
|
|
|
|
<el-table-column width="150" label="订单号" align="center" prop="orderCode"/>
|
|
|
|
<el-table-column width="150" label="订单号" align="center" prop="orderCode"
|
|
|
|
|
|
|
|
:formatter="orderCodeFormate"
|
|
|
|
|
|
|
|
/>
|
|
|
|
<el-table-column width="130" label="物料号" align="center" prop="prodCode"
|
|
|
|
<el-table-column width="130" label="物料号" align="center" prop="prodCode"
|
|
|
|
:formatter="productCodeFormate"
|
|
|
|
:formatter="productCodeFormate"
|
|
|
|
/>
|
|
|
|
/>
|
|
|
@ -154,9 +134,6 @@
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column width="100" align="center" label="计划工厂编码" prop="planFactoryCode"/>
|
|
|
|
<el-table-column width="100" align="center" label="计划工厂编码" prop="planFactoryCode"/>
|
|
|
|
<el-table-column label="订单类型" align="center" prop="orderType">
|
|
|
|
<el-table-column label="订单类型" align="center" prop="orderType">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
|
|
|
|
<dict-tag :options="dict.type.order_type" :value="scope.row.orderType"/>
|
|
|
|
|
|
|
|
</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">
|
|
|
@ -372,7 +349,9 @@
|
|
|
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
|
|
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
|
|
|
|
>
|
|
|
|
>
|
|
|
|
<el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column width="60" align="center" label="序号" type="index"></el-table-column>
|
|
|
|
<el-table-column width="150" label="订单编号" prop="orderCode"/>
|
|
|
|
<el-table-column width="150" label="订单编号" prop="orderCode"
|
|
|
|
|
|
|
|
:formatter="orderCodeFormate"
|
|
|
|
|
|
|
|
/>
|
|
|
|
<el-table-column width="380" label="产品名称" align="center" prop="prodDesc"/>
|
|
|
|
<el-table-column width="380" label="产品名称" align="center" prop="prodDesc"/>
|
|
|
|
<el-table-column width="60" label="单位" align="center" prop="unit"/>
|
|
|
|
<el-table-column width="60" label="单位" align="center" prop="unit"/>
|
|
|
|
<el-table-column width="130" label="产品数量" align="center" prop="quantity"/>
|
|
|
|
<el-table-column width="130" label="产品数量" align="center" prop="quantity"/>
|
|
|
@ -639,6 +618,10 @@ export default {
|
|
|
|
productCodeFormate(row, column, cellValue){
|
|
|
|
productCodeFormate(row, column, cellValue){
|
|
|
|
return cellValue.slice(7,18); //返回值
|
|
|
|
return cellValue.slice(7,18); //返回值
|
|
|
|
},
|
|
|
|
},
|
|
|
|
|
|
|
|
//订单编码格式化
|
|
|
|
|
|
|
|
orderCodeFormate(row, column, cellValue){
|
|
|
|
|
|
|
|
return cellValue.slice(3,18); //返回值
|
|
|
|
|
|
|
|
},
|
|
|
|
|
|
|
|
|
|
|
|
// 新增-校验车数
|
|
|
|
// 新增-校验车数
|
|
|
|
changeCarNum(num) {
|
|
|
|
changeCarNum(num) {
|
|
|
|