Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报告格式修改

Browse Source
yangwl
zhaoxiaolin 4 months ago
parent 76d2a292c0
commit 08805ba136
3 changed files with 56 additions and 38 deletions
Show Stats Download Patch File Download Diff File

30
src/views/quality/incomeReport/index.vue
Unescape Escape View File

@ -210,8 +210,8 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="抽检数量" prop="sampleQuality"> <el-form-item label="检验依据" prop="standardNo">
<el-input v-model="form.sampleQuality" disabled /> <el-input v-model="form.standardNo" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -238,7 +238,7 @@
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="检验项目" align="center" prop="projectRuleName" /> <el-table-column label="检验项目" align="center" prop="projectRuleName" />
<el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/> <el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/>
<el-table-column label="抽检数" align="center" prop="sampleNum" width="60"/> <el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/>
<el-table-column label="实测结果" align="center" prop="actualValue" width="180"/> <el-table-column label="实测结果" align="center" prop="actualValue" width="180"/>
<el-table-column label="判定" align="center" prop="status" width="70"> <el-table-column label="判定" align="center" prop="status" width="70">
<template slot-scope="scope"> <template slot-scope="scope">
@ -265,14 +265,13 @@
<el-row> <el-row>
<el-col> <el-col>
<el-form-item label="综合检验结论" label-width="100px"> <el-form-item label="综合检验结论" label-width="100px">
<el-checkbox-group v-model="form.checkedValues"> <el-col :span="6">
<el-col offset="6" span="6"> <span v-if="this.checkResult=='Y'">√合格</span>
<el-checkbox label="Y">合格</el-checkbox> <span label="N" v-else>×不合格</span>
</el-col> </el-col>
<el-col offset="3" span="6"> <el-col :span="8">
<el-checkbox label="N">不合格</el-checkbox> 备注:判定合格打“√”，不合格打“×”
</el-col> </el-col>
</el-checkbox-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -330,6 +329,7 @@ export default {
//打印 //打印
formRef: 'form', formRef: 'form',
validateRules: [], validateRules: [],
checkResult: 'Y',
printData: { printData: {
printable: 'printFrom', printable: 'printFrom',
ignore: ['no-print'], ignore: ['no-print'],
@ -424,9 +424,12 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
if(this.queryParams.checkTimeArray.length>0){ if(this.queryParams.checkTimeArray != null &&this.queryParams.checkTimeArray.length>0){
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}else{
this.queryParams.checkTimeStart = null;
this.queryParams.checkTimeEnd = null;
} }
listIncome(this.queryParams).then(response => { listIncome(this.queryParams).then(response => {
@ -505,9 +508,10 @@ export default {
getIncome(recordId).then(response => { getIncome(recordId).then(response => {
this.form = response.data; this.form = response.data;
let checkedValues0 =[]; //let checkedValues0 =[];
checkedValues0.push(response.data.checkResult) //checkedValues0.push(response.data.checkResult)
this.form.checkedValues = checkedValues0; //this.form.checkedValues = checkedValues0;
this.checkResult = response.data.checkResult;
this.form.printable = 'printFrom'; //打印时需要 this.form.printable = 'printFrom'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要 this.form.ignore = ['no-print'];//打印时需要

17
src/views/quality/produceReport/index.vue
Unescape Escape View File

@ -521,9 +521,20 @@
<el-descriptions title="" border :column="1" :labelStyle="{width: '123px'}" :contentStyle="{width:'85%'}"> <el-descriptions title="" border :column="1" :labelStyle="{width: '123px'}" :contentStyle="{width:'85%'}">
<el-descriptions-item label="批量或致命性质量异常"></el-descriptions-item> <el-descriptions-item label="批量或致命性质量异常"></el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions title="" border :column="1" :labelStyle="{width:'100%'}" :contentStyle="{width:'0%'}"> <div style="display: flex;justify-content: space-between;">
<el-descriptions-item label="备注:无异常的打√，有异常的描述异常及数量比例，有数据的需要填写数据"></el-descriptions-item> <div style="width: 50%;">
</el-descriptions> <el-descriptions title="" border :span="2" :column="1" :labelStyle="{width:'50%'}" :contentStyle="{width:'0%'}">
<el-descriptions-item label="备注:无异常的打√，有异常的描述异常及数量比例，有数据的需要填写数据">
</el-descriptions-item>
</el-descriptions>
</div>
<div style="width: 50%;">
<el-descriptions title="" border :column="1" :labelStyle="{width:'5%'}" :contentStyle="{width:'50%'}">
<el-descriptions-item label="说明">{{form.bz}}
</el-descriptions-item>
</el-descriptions>
</div>
</div>
<br/> <br/>
<!-- 底部 --> <!-- 底部 -->
<el-row class="my-print-foot"> <el-row class="my-print-foot">

47
src/views/quality/productReport/index.vue
Unescape Escape View File

@ -100,7 +100,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -113,7 +113,7 @@
<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-button <el-button
class="print-btn" class="print-btn"
size="mini" size="mini"
type="primary" type="primary"
@ -134,13 +134,13 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8" class="center-text"> <el-col class="center-text">
<h2>成品检验报告</h2> <h2>成品检验报告</h2>
</el-col> </el-col>
</el-row> </el-row>
<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style"> <el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
<el-descriptions-item label="产品名称" class="my-description-item1">{{form.materialName}}</el-descriptions-item> <el-descriptions-item label="产品名称" class="my-description-item1">{{form.materialName}}</el-descriptions-item>
<el-descriptions-item label="生产数量" class="my-description-item2">{{form.quality}}</el-descriptions-item> <el-descriptions-item label="生产数量(单位/箱)" class="my-description-item2">{{form.quality}}</el-descriptions-item>
<el-descriptions-item label="检验编码" class="my-description-item3">{{form.checkNo}}</el-descriptions-item> <el-descriptions-item label="检验编码" class="my-description-item3">{{form.checkNo}}</el-descriptions-item>
<el-descriptions-item label="产品编码" class="my-description-item1">{{form.materialCode}}</el-descriptions-item> <el-descriptions-item label="产品编码" class="my-description-item1">{{form.materialCode}}</el-descriptions-item>
@ -152,16 +152,16 @@
<el-descriptions-item label="检验日期" class="my-description-item3">{{form.checkTime}}</el-descriptions-item> <el-descriptions-item label="检验日期" class="my-description-item3">{{form.checkTime}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-row class="border-row"> <el-row class="border-row">
<el-col :span="24"> <el-col :span="24">
包装检验项目 包装检验项目
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<!-- 检验项目明细 --> <!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" border :span-method="objectSpanMethod" > <el-table v-loading="loading" :data="checkProjectList" border :span-method="objectSpanMethod" >
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="检验项目" align="center" prop="projectRuleName" width="100"/> <el-table-column label="检验项目" align="center" prop="projectRuleName" width="100"/>
<el-table-column label="标准要求" align="center" prop="checkStandard"/> <el-table-column label="标准要求" align="center" prop="checkStandard"/>
<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/> <el-table-column label="抽检数(PC)" align="center" prop="samplePlan" width="60"/>
<!--<el-table-column label="单位" align="center" prop="unitCode" width="50"/>--> <!--<el-table-column label="单位" align="center" prop="unitCode" width="50"/>-->
<el-table-column label="实测结果及判定" align="center"> <el-table-column label="实测结果及判定" align="center">
<el-table-column label="实测结果" align="center" prop="actualValue" width="120"/> <el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
@ -177,8 +177,8 @@
<el-table-column label="附件" align="center" prop="files" width="120"> <el-table-column label="附件" align="center" prop="files" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image v-for="(item,index) in scope.row.files" :key="index" <el-image v-for="(item,index) in scope.row.files" :key="index"
:src="item.fileAddress" :src="item.fileAddress"
style="width: 100px; height: 100px" style="width: 100px; height: 100px"
:fit="fit" /> :fit="fit" />
</template> </template>
</el-table-column> </el-table-column>
@ -187,16 +187,16 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row class="border-row"> <el-row class="border-row">
<el-col :span="24"> <el-col :span="24">
内容物分析项目 内容物分析项目
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<!-- 检验项目明细 --> <!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList0" border> <el-table v-loading="loading" :data="checkProjectList0" border>
<el-table-column label="序号" align="center" type="index" width="50"/> <el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="检验项目" align="center" prop="projectRuleName" width="100"/> <el-table-column label="检验项目" align="center" prop="projectRuleName" width="100"/>
<el-table-column label="标准要求" align="center" prop="checkStandard"/> <el-table-column label="标准要求" align="center" prop="checkStandard"/>
<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/> <el-table-column label="抽检数(PC)" align="center" prop="samplePlan" width="60"/>
<el-table-column label="实测结果及判定" align="center"> <el-table-column label="实测结果及判定" align="center">
<el-table-column label="实测结果" align="center" prop="actualValue" width="120"/> <el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
<el-table-column label="判定" align="center" prop="status" width="110"/> <el-table-column label="判定" align="center" prop="status" width="110"/>
@ -211,7 +211,7 @@
<span label="N" v-else>×不合格</span> <span label="N" v-else>×不合格</span>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
判定合格打“√”，不合格打“×” 备注:判定合格打“√”，不合格打“×”
</el-col> </el-col>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
@ -226,7 +226,7 @@
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="品检主管：" label-width="100px"> <el-form-item label="品检主管：" label-width="100px">
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
@ -237,13 +237,13 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel">确 定</el-button> <el-button type="primary" @click="cancel">确 定</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -385,9 +385,12 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
if(this.queryParams.checkTimeArray.length>0){ if(this.queryParams.checkTimeArray != null &&this.queryParams.checkTimeArray.length>0){
this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}else{
this.queryParams.checkTimeStart = null;
this.queryParams.checkTimeEnd = null;
} }
listProduct(this.queryParams).then(response => { listProduct(this.queryParams).then(response => {
@ -505,7 +508,7 @@ export default {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -616,7 +619,7 @@ export default {
margin-bottom: 15px; margin-bottom: 15px;
margin-left: 10px; margin-left: 10px;
} }
.center-text { .center-text {
text-align: center; text-align: center;
} }
.report-logo { .report-logo {
@ -638,4 +641,4 @@ export default {
text-align:center; text-align:center;
} }
</style> </style>

Write Preview
Loading…
Cancel
Save