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

入库检验报告+标准产能(时)

Browse Source
master
zhaoxiaolin 7 months ago
parent 63bdb5e263
commit 3cb23bc4d1
3 changed files with 130 additions and 119 deletions
Show Stats Download Patch File Download Diff File

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

@ -138,89 +138,36 @@
<h2>成品检验报告</h2> <h2>成品检验报告</h2>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
<el-col :span="16"> <el-descriptions-item label="产品名称" class="my-description-item1">{{form.materialName}}</el-descriptions-item>
<el-form-item label="产品名称" prop="materialName"> <el-descriptions-item label="生产数量" class="my-description-item2">{{form.quality}}</el-descriptions-item>
<el-input v-model="form.materialName" disabled /> <el-descriptions-item label="检验编码" class="my-description-item3">{{form.checkNo}}</el-descriptions-item>
</el-form-item>
</el-col> <el-descriptions-item label="产品编码" class="my-description-item1">{{form.materialCode}}</el-descriptions-item>
<el-col :span="8"> <el-descriptions-item label="抽样地点" class="my-description-item2">{{form.checkLoc}}</el-descriptions-item>
<el-form-item label="产品编码" prop="materialCode"> <el-descriptions-item label="报检日期" class="my-description-item3">{{form.createTime}}</el-descriptions-item>
<el-input v-model="form.materialCode" disabled />
</el-form-item> <el-descriptions-item label="生产批号" class="my-description-item1">{{form.incomeBatchNo}}</el-descriptions-item>
</el-col> <el-descriptions-item label="检验依据" class="my-description-item2">{{form.standardNo}}</el-descriptions-item>
</el-row> <el-descriptions-item label="检验日期" class="my-description-item3">{{form.checkTime}}</el-descriptions-item>
<el-row> </el-descriptions>
<el-col :span="8"> <el-row class="border-row">
<el-form-item label="生产数量" prop="quality"> <el-col :span="24">
<el-input type="number" v-model="form.quality" disabled/> 包装检验项目
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位" prop="unit" >
<el-input v-model="form.unit" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检验编号" prop="checkNo">
<el-input v-model="form.checkNo" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="生产批号" prop="incomeBatchNo">
<el-input v-model="form.incomeBatchNo" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="抽样地点" prop="checkLoc">
<el-input v-model="form.checkLoc" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检验依据" prop="standardNo">
<el-input v-model="form.standardNo" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="报检日期" prop="createTime">
<el-input v-model="form.checkTime" placeholder="请输入报检日期" disabled>
{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="检验日期" prop="checkTime">
<el-input v-model="form.checkTime" placeholder="请输入检验日期" disabled>
{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="产品提报人" prop="checkManName">
<el-input v-model="form.checkManName" placeholder="请输入OEM产品提报人" disabled/>
</el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="24"> <el-col :span="24">
<!-- 检验项目明细 --> <!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList" > <el-table v-loading="loading" :data="checkProjectList" border>
<el-table-column type="selection" width="50" align="center" />
<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="ruleName" /> <el-table-column label="检验项目" align="center" prop="ruleName" width="100"/>
<el-table-column label="标准要求" align="center" prop="checkStandard" width="160"/> <el-table-column label="标准要求" align="center" prop="checkStandard"/>
<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="unitCode" width="50"/> <!--<el-table-column label="单位" align="center" prop="unitCode" width="50"/>-->
<el-table-column label="实测结果" align="center" prop="actualValue" width="160"/> <el-table-column label="实测结果及判定" align="center">
<el-table-column label="判定" align="center" prop="status" width="70"> <el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
<template slot-scope="scope"> <el-table-column label="判定" align="center" prop="status" width="110"/>
<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
</template>
</el-table-column> </el-table-column>
<!--
<el-table-column label="不良类型" align="center" prop="defectCode" width="80"> <el-table-column label="不良类型" align="center" prop="defectCode" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span> <span v-if="scope.row.defectCode">{{ getCodeValue(scope.row.defectCode) }}</span>
@ -235,37 +182,62 @@
:fit="fit" /> :fit="fit" />
</template> </template>
</el-table-column> </el-table-column>
-->
</el-table> </el-table>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row class="border-row">
<el-col> <el-col :span="24">
<el-form-item label="综合检验结论" label-width="100px"> 内容物分析项目
<el-col offset="6" span="6">
<el-checkbox disabled>合格</el-checkbox>
</el-col>
<el-col offset="3" span="6">
<el-checkbox disabled>不合格</el-checkbox>
</el-col> </el-col>
</el-form-item> <el-col :span="24">
<!-- 检验项目明细 -->
<el-table v-loading="loading" :data="checkProjectList0" border>
<el-table-column label="序号" align="center" type="index" width="50"/>
<el-table-column label="检验项目" align="center" prop="ruleName" width="100"/>
<el-table-column label="标准要求" align="center" prop="checkStandard"/>
<el-table-column label="抽检数" align="center" prop="samplePlan" width="60"/>
<el-table-column label="实测结果及判定" align="center">
<el-table-column label="实测结果" align="center" prop="actualValue" width="120"/>
<el-table-column label="判定" align="center" prop="status" width="110"/>
</el-table-column>
</el-table>
</el-col> </el-col>
</el-row> </el-row>
<el-descriptions title="" border :column="1">
<el-descriptions-item label="综合检验结论">
<el-col offset="1" span="6">
<el-checkbox-group v-model="form.checkedValues">
<el-checkbox label="Y">合格</el-checkbox>
<el-checkbox label="N">不合格</el-checkbox>
</el-checkbox-group>
</el-col>
<el-col span="8">
判定合格打“√”，不合格打“×”
</el-col>
</el-descriptions-item>
</el-descriptions>
<!--
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-form-item label="备注：" label-width="100px"> <el-form-item label="备注：" label-width="100px">
<el-input type="textarea" disabled/> <el-input type="textarea" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>-->
<el-row> <el-row>
<el-col :span="20"> <el-col :span="10">
<el-form-item label="品检主管：" label-width="100px"> <el-form-item label="品检主管：" label-width="100px">
<el-input disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="20"> <el-col :span="10">
<el-form-item label="品管员：" > <el-form-item label="检验员：" >
<el-input disabled/> {{form.checkManName}}
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -358,13 +330,27 @@ export default {
factoryCode: null, factoryCode: null,
}, },
// 表单参数 // 表单参数
form: {}, form: {checkedValues:[]},
checkTypes:[], checkTypes:[],
// 表单校验 // 表单校验
rules: { rules: {
/* incomeBatchNo: [ /* incomeBatchNo: [
{ required: true, message: "来料批次号不能为空", trigger: "blur" } { required: true, message: "来料批次号不能为空", trigger: "blur" }
], */ ], */
},
content_style: {
'text-align': 'center',
'min-width': '200px',
'word-break': 'break-all'
},
label_style: {
'color': '#000',
'text-align': 'center',
'font-weight': '600',
'height': '40px',
'background-color': '#d6dbe1',
'min-width': '100px',
'word-break': 'keep-all'
} }
}; };
}, },
@ -481,6 +467,9 @@ export default {
this.queryParams.recordId = recordId; this.queryParams.recordId = recordId;
getProduct(recordId).then(response => { getProduct(recordId).then(response => {
this.form = response.data; this.form = response.data;
let checkedValues0 =[];
checkedValues0.push(response.data.checkResult)
this.form.checkedValues = ['Y'];
this.form.printable = 'printFrom'; //打印时需要 this.form.printable = 'printFrom'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要 this.form.ignore = ['no-print'];//打印时需要
this.open = true; this.open = true;
@ -529,7 +518,18 @@ export default {
getCheckedProjectList(){ getCheckedProjectList(){
this.loading = true; this.loading = true;
getCkeckProjectList(this.queryParams).then((response) => { getCkeckProjectList(this.queryParams).then((response) => {
this.checkProjectList = response.rows; const itemType1s=[];
const itemType0s=[];
response.rows.forEach(item=>{
if (item.itemType == '1') {
itemType1s.push(item);
}else if(item.itemType == '0'){
itemType0s.push(item);
}
})
this.checkProjectList = itemType1s;
this.checkProjectList0 = itemType0s;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
this.form.standardNo = this.checkProjectList[0].standardNo; this.form.standardNo = this.checkProjectList[0].standardNo;
@ -576,4 +576,18 @@ export default {
margin-left: 15px; margin-left: 15px;
height: 38px; height: 38px;
} }
.my-description-item1 {
width: 280px; /* 或者你想要的任何宽度 */
}
.my-description-item2 {
width: 120px; /* 或者你想要的任何宽度 */
}
.my-description-item3 {
width: 80px; /* 或者你想要的任何宽度 */
}
.border-row {
border: 1px solid #d3dce6; /* 边框颜色可以根据需要自定义 */
text-align:center;
}
</style> </style>

3
src/views/quality/qcWarehousing/index.vue
Unescape Escape View File

@ -458,9 +458,6 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
incomeBatchNo: [
{ required: true, message: "批次号不能为空", trigger: "blur" }
],
orderNo: [ orderNo: [
{ required: true, message: "订单号不能为空", trigger: "blur" } { required: true, message: "订单号不能为空", trigger: "blur" }
], ],

10
src/views/wms/equipment/index.vue
Unescape Escape View File

@ -189,7 +189,7 @@
label="设备编码" label="设备编码"
align="center" align="center"
prop="equipmentCode" prop="equipmentCode"
width="150" width="100"
fixed="left" fixed="left"
> >
<template slot-scope="scope"> <template slot-scope="scope">
@ -205,7 +205,7 @@
label="设备名称" label="设备名称"
align="center" align="center"
prop="equipmentName" prop="equipmentName"
width="300" width="200"
/> />
<el-table-column <el-table-column
label="是否启用" label="是否启用"
@ -315,7 +315,7 @@
width="100" width="100"
/> />
<el-table-column <el-table-column
label="单台能力工时" label="标准产能(时)"
align="center" align="center"
prop="unitWorkingHours" prop="unitWorkingHours"
width="100" width="100"
@ -566,7 +566,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="单台能力工时" prop="unitWorkingHours"> <el-form-item label="标准产能(时)" prop="unitWorkingHours">
<el-input-number <el-input-number
:min="0" :min="0"
:step="1" :step="1"
@ -939,7 +939,7 @@
<el-descriptions-item label="工段">{{ <el-descriptions-item label="工段">{{
form.workshopSection form.workshopSection
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="单台能力工时">{{ <el-descriptions-item label="标准产能(时)">{{
form.unitWorkingHours form.unitWorkingHours
}}</el-descriptions-item> }}</el-descriptions-item>
<el-descriptions-item label="工时单价">{{ <el-descriptions-item label="工时单价">{{

Write Preview
Loading…
Cancel
Save