|
|
|
@ -87,13 +87,14 @@ |
|
|
|
prop="" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
min-width="130" |
|
|
|
min-width="180" |
|
|
|
fixed="left" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope" class="foo_container"> |
|
|
|
<a v-if="scope.row.inspectedFlag=='N'" type="text" size="small" @click="inspectModal(scope.row)">检验</a> |
|
|
|
<a v-if="scope.row.inspectedFlag=='Y'" type="text" size="small" @click="toPrint(scope.row)">补打结果</a> |
|
|
|
<a v-if="scope.row.inspectedFlag=='Y'" type="text" size="small" @click="cancelInspectResult(scope.row)">取消检验结果</a> |
|
|
|
<a v-if="scope.row.toTypeFlag=='混炼胶入库'" type="text" size="small" @click="detailModal(scope.row)">混炼明细</a> |
|
|
|
<a v-if="scope.row.toTypeFlag=='硫化检验单'&&scope.row.inspectedFlag=='N'" type="text" size="small" @click="cancelInspect(scope.row)">删除检验单</a> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
@ -205,7 +206,7 @@ |
|
|
|
|
|
|
|
</el-table> |
|
|
|
<el-dialog title="录入检验结果" :close-on-click-modal="false" v-drag :visible.sync="inspectFlag" width="480px"> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;" @submit.native.prevent> |
|
|
|
<el-form-item :label="'检验单号：'"> |
|
|
|
<el-input v-model="inspectData.transNo" disabled style="width: 130px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
@ -221,7 +222,7 @@ |
|
|
|
<el-input v-model="inspectData.partDescSpec" disabled style="width: 417px;" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;"> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: 0px;" @submit.native.prevent> |
|
|
|
<el-form-item :label="'检验结果：'"> |
|
|
|
<el-select v-model="inspectData.inspectResult" style="width: 120px"> |
|
|
|
<el-option label="合格" value="合格"></el-option> |
|
|
|
@ -238,12 +239,68 @@ |
|
|
|
<el-button type="primary" @click="inspectFlag = false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
<el-dialog :close-on-click-modal="false" :close-on-press-escape="false" v-drag title="周计划清单" :visible.sync="detailFlag" width="600px"> |
|
|
|
<el-table |
|
|
|
height="300" |
|
|
|
:data="detailList" |
|
|
|
border |
|
|
|
style="width: 100%"> |
|
|
|
<el-table-column |
|
|
|
prop="taskNo" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="80" |
|
|
|
label="混炼任务单号"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="orderNo" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="70" |
|
|
|
label="周计划号"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="partDesc" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="100" |
|
|
|
label="混炼胶名称"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="orderQty" |
|
|
|
header-align="center" |
|
|
|
align="right" |
|
|
|
min-width="70" |
|
|
|
label="周计划数量"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="hunlianQty" |
|
|
|
header-align="center" |
|
|
|
align="right" |
|
|
|
min-width="70" |
|
|
|
label="混炼胶数量"> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="orderDate" |
|
|
|
header-align="center" |
|
|
|
align="left" |
|
|
|
min-width="100" |
|
|
|
label="周计划日期"> |
|
|
|
</el-table-column> |
|
|
|
|
|
|
|
</el-table> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<el-button @click="detailFlag = false" type="primary">关闭</el-button> |
|
|
|
</span> |
|
|
|
</el-dialog> |
|
|
|
<Chooselist ref="baseList" @getBaseData="getBaseData"></Chooselist> |
|
|
|
</div> |
|
|
|
</template> |
|
|
|
|
|
|
|
<script> |
|
|
|
import { |
|
|
|
getHunlianTaskData,getHunlianTaskDetailData |
|
|
|
} from "@/api/production.js" |
|
|
|
import { |
|
|
|
getInspectData, |
|
|
|
inspectSave, |
|
|
|
@ -262,6 +319,8 @@ |
|
|
|
}, |
|
|
|
data () { |
|
|
|
return { |
|
|
|
detailList:[], |
|
|
|
detailFlag:false, |
|
|
|
// 导出 start |
|
|
|
exportData: [], |
|
|
|
exportDataStandard: { |
|
|
|
@ -287,6 +346,7 @@ |
|
|
|
exportHeader: ['派工单列表'], |
|
|
|
exportFooter: [], |
|
|
|
exportDefaultValue: '这一行这一列没有数据', |
|
|
|
|
|
|
|
// 导出 end |
|
|
|
height: 200, |
|
|
|
tableData: [], |
|
|
|
@ -325,6 +385,17 @@ |
|
|
|
}) |
|
|
|
}, |
|
|
|
methods: { |
|
|
|
detailModal(row){ |
|
|
|
let inData={ |
|
|
|
site:row.site, |
|
|
|
taskNo:row.orderNo, |
|
|
|
} |
|
|
|
getHunlianTaskDetailData(inData).then(({data}) => { |
|
|
|
this.detailList = data.rows; |
|
|
|
}) |
|
|
|
this.detailFlag=true; |
|
|
|
|
|
|
|
}, |
|
|
|
// 获取基础数据列表S |
|
|
|
getBaseList (val, type) { |
|
|
|
this.tagNo = val |
|
|
|
|
