change - 订单明细配方信息详情显示

boardTest
yinq 12 months ago
parent a9f7bdfe63
commit 64c2da7768

@ -28,30 +28,30 @@
end-placeholder="结束时间"
></el-date-picker>
</el-form-item>
<!-- <el-form-item label="交货日期" prop="DeliveryDate">-->
<!-- <el-input-->
<!-- v-model="queryParams.DeliveryDate"-->
<!-- placeholder="请输入交货日期"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="订单所属" prop="OrderOwner">-->
<!-- <el-input-->
<!-- v-model="queryParams.OrderOwner"-->
<!-- placeholder="请输入订单所属"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="输送带长度规格" prop="BeltLengthSpecifications">-->
<!-- <el-input-->
<!-- v-model="queryParams.BeltLengthSpecifications"-->
<!-- placeholder="请输入输送带长度规格"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="交货日期" prop="DeliveryDate">-->
<!-- <el-input-->
<!-- v-model="queryParams.DeliveryDate"-->
<!-- placeholder="请输入交货日期"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="订单所属" prop="OrderOwner">-->
<!-- <el-input-->
<!-- v-model="queryParams.OrderOwner"-->
<!-- placeholder="请输入订单所属"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="输送带长度规格" prop="BeltLengthSpecifications">-->
<!-- <el-input-->
<!-- v-model="queryParams.BeltLengthSpecifications"-->
<!-- placeholder="请输入输送带长度规格"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<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>
@ -59,17 +59,17 @@
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['mes/prod:prodOrderDetail:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<!-- <el-col :span="1.5">-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- plain-->
<!-- icon="el-icon-plus"-->
<!-- size="mini"-->
<!-- @click="handleAdd"-->
<!-- v-hasPermi="['mes/prod:prodOrderDetail:add']"-->
<!-- >新增-->
<!-- </el-button>-->
<!-- </el-col>-->
<el-col :span="1.5">
<el-button
type="success"
@ -112,22 +112,30 @@
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="任务编号" align="center" prop="SeqNo" v-if="columns[1].visible" fixed="left" width="130"/>
<el-table-column label="下单日期" align="center" prop="OrderDate" width="180" v-if="columns[2].visible">
<el-table-column label="下单日期" align="center" prop="OrderDate" width="100" v-if="columns[2].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.OrderDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
<span>{{ parseTime(scope.row.OrderDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="交货日期" align="center" prop="DeliveryDate" width="100" v-if="columns[3].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.DeliveryDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="交货日期" align="center" prop="DeliveryDate" v-if="columns[3].visible"/>
<el-table-column label="产品类型" align="center" prop="ProductType" v-if="columns[4].visible"/>
<el-table-column label="产品状态" align="center" prop="ProductStatus" v-if="columns[5].visible" width="100"/>
<el-table-column label="订单所属" align="center" prop="OrderOwner" v-if="columns[6].visible"/>
<el-table-column label="客户信息" align="center" prop="CustomerInfo" v-if="columns[7].visible"/>
<el-table-column label="输送带长度规格" align="center" prop="BeltLengthSpecifications" v-if="columns[8].visible" width="230"/>
<el-table-column label="输送带长度规格" align="center" prop="BeltLengthSpecifications" v-if="columns[8].visible"
width="230"
/>
<el-table-column label="面积与重量" align="center" prop="AreaAndWeight" v-if="columns[9].visible" width="200"/>
<el-table-column label="使用原材料" align="center" prop="UsingRawMaterials" v-if="columns[10].visible" width="230"/>
<el-table-column label="输送带宽度" align="center" prop="BeltWidth" v-if="columns[11].visible"/>
<el-table-column label="输送带布层" align="center" prop="BeltClothLayer" v-if="columns[12].visible"/>
<el-table-column label="客户要求输送带长度" align="center" prop="BeltRequiredLength" v-if="columns[13].visible" width="100"/>
<el-table-column label="客户要求输送带长度" align="center" prop="BeltRequiredLength" v-if="columns[13].visible"
width="100"
/>
<el-table-column label="客户要求上胶厚度" align="center" prop="GluingRequiredThickness" v-if="columns[14].visible"/>
<el-table-column label="客户要求下胶厚度" align="center" prop="LowerGlueRequiredThickness" v-if="columns[15].visible"/>
<el-table-column label="生产上胶厚度" align="center" prop="ProductionGluingThickness" v-if="columns[16].visible"/>
@ -147,26 +155,80 @@
<el-table-column label="压延生产米数" align="center" prop="RollingProductionMeters" v-if="columns[30].visible"/>
<el-table-column label="推荐垫布宽度" align="center" prop="RecommendedPadWidth" v-if="columns[31].visible"/>
<el-table-column label="大布厂家" align="center" prop="BigFabricManufacturer" v-if="columns[32].visible"/>
<el-table-column label="布料规格" align="center" prop="FabricSpecifications" v-if="columns[33].visible"/>
<el-table-column label="布料规格" align="center" prop="FabricSpecifications" v-if="columns[33].visible">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="detailsSearch(scope.row,1)"
>查看详情
</el-button>
</template>
</el-table-column>
<el-table-column label="预计布料使用量" align="center" prop="EstimatedFabricUsage" v-if="columns[34].visible"/>
<el-table-column label="布宽度" align="center" prop="ClothWidth" v-if="columns[35].visible"/>
<el-table-column label="布重量" align="center" prop="ClothWeight" v-if="columns[36].visible"/>
<el-table-column label="小布使用布料规格" align="center" prop="SmallFabricSpecificationsDic" v-if="columns[37].visible"/>
<el-table-column label="小布使用布料规格" align="center" prop="SmallFabricSpecificationsDic" v-if="columns[37].visible">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="detailsSearch(scope.row,2)"
>查看详情
</el-button>
</template>
</el-table-column>
<el-table-column label="小布宽度" align="center" prop="SmallClothWidth" v-if="columns[38].visible"/>
<el-table-column label="小布布料使用量" align="center" prop="SmallClothUsage" v-if="columns[39].visible"/>
<el-table-column label="小布用布重量" align="center" prop="SmallClothWeight" v-if="columns[40].visible"/>
<el-table-column label="用胶工艺" align="center" prop="GluingProcess" v-if="columns[41].visible"/>
<el-table-column label="上下胶使用胶料" align="center" prop="UpperLowerGlue" v-if="columns[42].visible"/>
<el-table-column label="上下胶使用胶料" align="center" prop="UpperLowerGlue" v-if="columns[42].visible">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="detailsSearch(scope.row,3)"
>查看详情
</el-button>
</template>
</el-table-column>
<el-table-column label="上下胶系数" align="center" prop="UpperLowerGlueCoefficient" v-if="columns[43].visible"/>
<el-table-column label="上下胶标准用胶量" align="center" prop="UpperLowerGlueUsage" v-if="columns[44].visible"/>
<el-table-column label="下胶使用胶料" align="center" prop="LowerGlue" v-if="columns[45].visible"/>
<el-table-column label="下胶使用胶料" align="center" prop="LowerGlue" v-if="columns[45].visible">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="detailsSearch(scope.row,4)"
>查看详情
</el-button>
</template>
</el-table-column>
<el-table-column label="下胶系数" align="center" prop="LowerGlueCoefficient" v-if="columns[46].visible"/>
<el-table-column label="下胶标准用胶量" align="center" prop="LowerGlueUsage" v-if="columns[47].visible"/>
<el-table-column label="大布胶使用胶料" align="center" prop="LargeClothGlue" v-if="columns[48].visible"/>
<el-table-column label="大布胶使用胶料" align="center" prop="LargeClothGlue" v-if="columns[48].visible">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="detailsSearch(scope.row,5)"
>查看详情
</el-button>
</template>
</el-table-column>
<el-table-column label="大布胶系数" align="center" prop="LargeClothGlueCoefficient" v-if="columns[49].visible"/>
<el-table-column label="胶布标准用胶量" align="center" prop="LargeClothGlueUsage" v-if="columns[50].visible"/>
<el-table-column label="上下缓冲胶标准用胶量" align="center" prop="BufferGlueUsage" v-if="columns[51].visible" width="100"/>
<el-table-column label="中间胶" align="center" prop="MiddleGlue" v-if="columns[52].visible"/>
<el-table-column label="中间胶" align="center" prop="MiddleGlue" v-if="columns[52].visible">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="detailsSearch(scope.row,6)"
>查看详情
</el-button>
</template>
</el-table-column>
<el-table-column label="中间胶系数" align="center" prop="MiddleGlueCoefficient" v-if="columns[53].visible"/>
<el-table-column label="中间胶使用量" align="center" prop="MiddleGlueUsage" v-if="columns[54].visible"/>
<el-table-column label="小条宽度" align="center" prop="SmallBarWidth" v-if="columns[55].visible"/>
@ -182,7 +244,9 @@
<el-table-column label="裙边面积" align="center" prop="SkirtArea" v-if="columns[65].visible"/>
<el-table-column label="隔板面积" align="center" prop="PartitionArea" v-if="columns[66].visible"/>
<el-table-column label="挡边带总面积" align="center" prop="EdgeBandingTotalArea" v-if="columns[67].visible"/>
<el-table-column label="钢丝绳输送带工资总面积" align="center" prop="WireropeBeltTotalArea" v-if="columns[68].visible" width="100"/>
<el-table-column label="钢丝绳输送带工资总面积" align="center" prop="WireropeBeltTotalArea" v-if="columns[68].visible"
width="100"
/>
<el-table-column label="创建者" align="center" prop="createdBy" v-if="columns[69].visible"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180" v-if="columns[70].visible">
<template slot-scope="scope">
@ -195,26 +259,26 @@
<span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['mes/prod:prodOrderDetail:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['mes/prod:prodOrderDetail:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-edit"-->
<!-- @click="handleUpdate(scope.row)"-->
<!-- v-hasPermi="['mes/prod:prodOrderDetail:edit']"-->
<!-- >修改-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- size="mini"-->
<!-- type="text"-->
<!-- icon="el-icon-delete"-->
<!-- @click="handleDelete(scope.row)"-->
<!-- v-hasPermi="['mes/prod:prodOrderDetail:remove']"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<pagination
@ -438,6 +502,46 @@
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
<!-- 布料 抽屉 -->
<el-drawer
:title="clothTitle"
:visible.sync="clothTable"
direction="rtl"
size="30%"
>
<el-form ref="form" :model="form" label-width="100px">
<el-form-item label="材料编号:">{{ clothData.MaterialNo }}</el-form-item>
<el-form-item label="材料名称:">{{ clothData.MaterialName }}</el-form-item>
<el-form-item label="材料规格:">{{ clothData.MaterialSpecification }}</el-form-item>
<el-form-item label="材料大类:">{{ clothData.MaterialLargeCategories }}</el-form-item>
<el-form-item label="材料小类:">{{ clothData.MaterialSmallCategories }}</el-form-item>
</el-form>
</el-drawer>
<!-- 胶料 抽屉 -->
<el-drawer
:title="glueTitle"
:visible.sync="glueTable"
direction="rtl"
size="50%"
>
<el-form ref="form" :model="form" label-width="150px">
<el-form-item label="加促后重量合计:">{{ glueData.AfterPromotionTotalWeight }}</el-form-item>
</el-form>
<el-table :data="glueData.MaterialList_1">
<el-table-column property="MaterialNo" label="第一次投料材料编号"></el-table-column>
<el-table-column property="MaterialName" label="材料名称"></el-table-column>
<el-table-column property="MaterialSpecification" label="材料规格"></el-table-column>
<el-table-column property="EnterSecondLaneWeight" label="进入二道时重量KG"></el-table-column>
</el-table>
<el-table :data="glueData.MaterialList_2">
<el-table-column property="MaterialNo" label="第二次投料材料编号"></el-table-column>
<el-table-column property="MaterialName" label="材料名称"></el-table-column>
<el-table-column property="MaterialSpecification" label="材料规格"></el-table-column>
<el-table-column property="ProductionRequiresWeight" label="生产需要重量kg"></el-table-column>
</el-table>
</el-drawer>
</div>
</template>
@ -454,6 +558,13 @@ export default {
name: 'ProdOrderDetail',
data() {
return {
//
clothTable: false,
clothData: {},
clothTitle: '',
glueTable: false,
glueData: {},
glueTitle: '',
//
loading: true,
//
@ -794,6 +905,53 @@ export default {
}
})
},
//
detailsSearch(row, type) {
this.clothData = {};
this.glueData = {};
if (type === 1) {
this.clothTable = true
this.clothData = JSON.parse(row.FabricSpecifications)
this.clothTitle = '布料规格|任务编号:' + row.SeqNo
return
}
if (type === 2) {
this.clothTable = true
this.clothData = JSON.parse(row.SmallFabricSpecificationsDic)
this.clothTitle = '小布使用布料规格|任务编号:' + row.SeqNo
return
}
if ([3, 4, 5, 6].includes(type)) {
if (type === 3){
this.glueData = JSON.parse(row.UpperLowerGlue)
this.glueTitle = '上下胶使用胶料|任务编号:' + row.SeqNo
} else if (type === 4) {
this.glueData = JSON.parse(row.LowerGlue)
this.glueTitle = '下胶使用胶料|任务编号:' + row.SeqNo
} else if (type === 5) {
this.glueData = JSON.parse(row.LargeClothGlue)
this.glueTitle = '大布胶使用胶料|任务编号:' + row.SeqNo
} else if (type === 6) {
this.glueData = JSON.parse(row.MiddleGlue)
this.glueTitle = '中间胶|任务编号:' + row.SeqNo
}
this.glueData.MaterialList_1.forEach(item => {
item.MaterialName = item.Material.MaterialName
item.MaterialSpecification = item.Material.MaterialSpecification
item.MaterialLargeCategories = item.Material.MaterialLargeCategories
item.MaterialSmallCategories = item.Material.MaterialSmallCategories
})
this.glueData.MaterialList_2.forEach(item => {
item.MaterialName = item.Material.MaterialName
item.MaterialSpecification = item.Material.MaterialSpecification
item.MaterialLargeCategories = item.Material.MaterialLargeCategories
item.MaterialSmallCategories = item.Material.MaterialSmallCategories
})
this.glueTable = true
}
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids

Loading…
Cancel
Save