renren/spc
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新

Browse Source
This commit is contained in:
朱文强
2023-06-27 16:13:44 +08:00
parent 297561ff8f
commit 425c72eecc
55 changed files with 611 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/process-inspection/Counting/CGraph.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-09-15 10:22:53
* @LastEditors: zwq
* @LastEditTime: 2023-01-09 14:20:16
* @LastEditTime: 2023-06-27 14:50:51
* @Description: C图
-->
<template>
@@ -34,7 +34,7 @@
</el-col>
</el-row>
<el-row :gutter="6" v-else>
<el-empty description="无数据"></el-empty>
<el-empty :description="$t('module.basicData.noData')"></el-empty>
</el-row>
</el-card>
</template>

2
src/views/process-inspection/Counting/NPGraph.vue
View File

@@ -34,7 +34,7 @@
</el-col>
</el-row>
<el-row :gutter="6" v-else>
<el-empty description="无数据"></el-empty>
<el-empty :description="$t('module.basicData.noData')"></el-empty>
</el-row>
</el-card>
</template>

2
src/views/process-inspection/Counting/PGraph.vue
View File

@@ -34,7 +34,7 @@
</el-col>
</el-row>
<el-row :gutter="6" v-else>
<el-empty description="无数据"></el-empty>
<el-empty :description="$t('module.basicData.noData')"></el-empty>
</el-row>
</el-card>
</template>

2
src/views/process-inspection/Counting/UGraph.vue
View File

@@ -34,7 +34,7 @@
</el-col>
</el-row>
<el-row :gutter="6" v-else>
<el-empty description="无数据"></el-empty>
<el-empty :description="$t('module.basicData.noData')"></el-empty>
</el-row>
</el-card>
</template>

8
src/views/process-inspection/Metrological/XMRGraph.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-09-15 10:23:42
* @LastEditors: zwq
* @LastEditTime: 2023-01-09 14:26:17
* @LastEditTime: 2023-06-27 14:57:36
* @Description: 单值-移动极差 控制图
-->
<template>
@@ -43,7 +43,7 @@
{{ item.name }}<span style="float:right">{{ parseFloat(item.value).toFixed(4) }}</span>
</div>
<el-collapse>
<el-collapse-item title="单值数值" name="0">
<el-collapse-item :title="$t('module.basicData.singleValue')" name="0">
<div
v-for="(val, key, index) in this.dataList.xbarCL"
:key="index + 'xbar'"
@@ -55,7 +55,7 @@
}}</span>
</div>
</el-collapse-item>
<el-collapse-item title="移动极差数值" name="1">
<el-collapse-item :title="$t('module.basicData.movingRangeValue')" name="1">
<div
v-for="(val, key, index) in this.dataList.rcl"
:key="index + 'rcl'"
@@ -75,7 +75,7 @@
</el-col>
</el-row>
<el-row :gutter="6" v-else>
<el-empty description="无数据"></el-empty>
<el-empty :description="$t('module.basicData.noData')"></el-empty>
</el-row>
<!-- 原始数据 -->
<raw-data

8
src/views/process-inspection/Metrological/XbarRGraph.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-09-15 10:22:12
* @LastEditors: zwq
* @LastEditTime: 2023-01-09 14:18:18
* @LastEditTime: 2023-06-27 14:54:21
* @Description: 均值极差控制图
-->
<template>
@@ -43,7 +43,7 @@
{{ item.name }}<span style="float:right">{{ parseFloat(item.value).toFixed(4) }}</span>
</div>
<el-collapse>
<el-collapse-item title="均值数值" name="0">
<el-collapse-item :title="$t('module.basicData.meanValue')" name="0">
<div
v-for="(val, key, index) in this.dataList.xbarCL"
:key="index + 'xbar'"
@@ -55,7 +55,7 @@
}}</span>
</div>
</el-collapse-item>
<el-collapse-item title="极差数值" name="1">
<el-collapse-item :title="$t('module.basicData.rangeValue')" name="1">
<div
v-for="(val, key, index) in this.dataList.rcl"
:key="index + 'rcl'"
@@ -75,7 +75,7 @@
</el-col>
</el-row>
<el-row :gutter="6" v-else>
<el-empty description="无数据"></el-empty>
<el-empty :description="$t('module.basicData.noData')"></el-empty>
</el-row>
<!-- 原始数据 -->
<raw-data

8
src/views/process-inspection/Metrological/XbarSGraph.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-09-15 10:22:53
* @LastEditors: zwq
* @LastEditTime: 2023-01-09 14:21:51
* @LastEditTime: 2023-06-27 14:56:12
* @Description: 均值标准差控制图
-->
<template>
@@ -43,7 +43,7 @@
{{ item.name }}<span style="float:right">{{ parseFloat(item.value).toFixed(4) }}</span>
</div>
<el-collapse>
<el-collapse-item title="均值数值" name="0">
<el-collapse-item :title="$t('module.basicData.meanValue')" name="0">
<div
v-for="(val, key, index) in this.dataList.xbarCL"
:key="index + 'xbar'"
@@ -55,7 +55,7 @@
}}</span>
</div>
</el-collapse-item>
<el-collapse-item title="标准差数值" name="1">
<el-collapse-item :title="$t('module.basicData.StdDeviation')" name="1">
<div
v-for="(val, key, index) in this.dataList.scl"
:key="index + 'scl'"
@@ -75,7 +75,7 @@
</el-col>
</el-row>
<el-row :gutter="6" v-else>
<el-empty description="无数据"></el-empty>
<el-empty :description="$t('module.basicData.noData')"></el-empty>
</el-row>
<!-- 原始数据 -->
<raw-data

6
src/views/process-inspection/components/detail-table.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2023-06-21 13:31:02
* @LastEditTime: 2023-06-27 15:03:21
* @Description:
-->
<template>
@@ -10,10 +10,10 @@
<div style="margin-left:20px">
<el-button size="small" type="primary" @click="addSample()">
<svg class="icon-svg"><use xlink:href="#icon-新建"></use></svg>
添加样本组
{{ $t('module.basicData.AddSampleGroup')}}
</el-button>
<el-button size="small" type="primary" @click="Submit()">
提交
{{ $t('submit')}}
</el-button>
</div>
<el-table

26
src/views/process-inspection/components/features-table.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2022-12-28 09:45:02
* @LastEditTime: 2023-06-27 15:09:36
* @Description:
-->
<template>
@@ -17,11 +17,11 @@
v-loading="dataListLoading"
style="width: 100%;"
>
<el-table-column type="index" header-align="center" align="center" label="序号" width="50">
<el-table-column type="index" header-align="center" align="center" :label='$t("index")' width="50">
</el-table-column>
<el-table-column prop="workingProcedureName" align="center" label="工序"> </el-table-column>
<el-table-column prop="name" align="center" label="特性"> </el-table-column>
<el-table-column prop="defectLevel" align="center" label="缺陷等级">
<el-table-column prop="workingProcedureName" align="center" :label="$t('module.basicData.procedure')"> </el-table-column>
<el-table-column prop="name" align="center" :label="$t('module.basicData.features')"> </el-table-column>
<el-table-column prop="defectLevel" align="center" :label="$t('module.basicData.defectLevel')">
<template slot-scope="scope">
<span>{{
{ 1: '致命缺陷',2: '严重缺陷',3: '轻微缺陷' }[
@@ -29,7 +29,7 @@
]
}}</span>
</template> </el-table-column>
<el-table-column prop="type" align="center" label="特性类型">
<el-table-column prop="type" align="center" :label="$t('module.basicData.featuresType')">
<template slot-scope="scope">
<span>{{
{ 1: "计量型", 2: "计数型"}[
@@ -37,16 +37,16 @@
]
}}</span>
</template></el-table-column>
<el-table-column prop="measureToolName" align="center" label="量具"> </el-table-column>
<el-table-column prop="measureToolName" align="center" :label="$t('module.basicData.measureTool')"> </el-table-column>
<el-table-column prop="usl" align="center" label="USL"> </el-table-column>
<el-table-column prop="sl" align="center" label="SL"> </el-table-column>
<el-table-column prop="lsl" align="center" label="LSL"> </el-table-column>
<el-table-column prop="black1" align="center" label="记录数量"> </el-table-column>
<el-table-column prop="black2" align="center" label="最大值"> </el-table-column>
<el-table-column prop="black3" align="center" label="最小值"> </el-table-column>
<el-table-column prop="black4" align="center" label="均值"> </el-table-column>
<el-table-column prop="black5" align="center" label="检验结果"> </el-table-column>
<el-table-column prop="black6" align="center" label="缺陷数量"> </el-table-column>
<el-table-column prop="black1" align="center" :label="$t('module.basicData.recordQuantity')"> </el-table-column>
<el-table-column prop="black2" align="center" :label="$t('module.basicData.MaxValue')"> </el-table-column>
<el-table-column prop="black3" align="center" :label="$t('module.basicData.miniValue')"> </el-table-column>
<el-table-column prop="black4" align="center" :label="$t('module.basicData.meanValue')"> </el-table-column>
<el-table-column prop="black5" align="center" :label="$t('module.basicData.inspectionResults')"> </el-table-column>
<el-table-column prop="black6" align="center" :label="$t('module.basicData.defectValue')"> </el-table-column>
</el-table>
</template>

83
src/views/process-inspection/components/generalOperation-add.vue
View File

@@ -2,18 +2,18 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2023-04-20 10:57:44
* @LastEditTime: 2023-06-27 16:05:14
* @Description:
-->
<template>
<el-drawer :visible.sync="visible" size="90%" class="drawerClass" :before-close="handleClose">
<template slot="title">
<h3 class="titleStyle">{{ !dataForm.id ? "登记" : "修改" }}</h3>
<h3 class="titleStyle">{{ !dataForm.id ? $t('register') : $t('update') }}</h3>
</template>
<el-collapse value="1" @change="handleChange">
<el-collapse-item name="1">
<template slot="title">
<h3 style="margin-left:20px">检验信息</h3>
<h3 style="margin-left:20px">{{$t('module.basicData.inspectionInfo')}}</h3>
</template>
<el-row :gutter="6">
<el-form
@@ -22,43 +22,50 @@
ref="dataForm"
:disabled="!dataForm.id ? false : true"
@keyup.enter.native="dataFormSubmit()"
label-width="100px"
label-width="120px"
>
<el-col :span="6">
<el-form-item label="检验站点" prop="inspectionSite">
<el-input v-model="dataForm.inspectionSite" placeholder="检验站点"></el-input>
<el-form-item :label="$t('module.basicData.inspectionSite')" prop="">
<el-input
v-model="dataForm.inspectionSite"
:placeholder="$t('placeholder.first')+$t('module.basicData.inspectionSite')"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="开单时间" prop="createTime">
<el-form-item :label="$t('module.basicData.billingTime')" prop="createTime">
<el-date-picker
v-model="dataForm.createTime"
type="datetime"
readonly
format="yyyy-MM-dd hh:mm:ss"
value-format="yyyy-MM-dd hh:mm:ss"
placeholder="选择日期时间"
:placeholder="$t('placeholder.second')"
:style="{ width: '100%' }"
>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单号" prop="orderNumber">
<el-input v-model="dataForm.orderNumber" placeholder="订单号"></el-input>
<el-form-item :label="$t('module.basicData.orderNumber')" prop="orderNumber">
<el-input v-model="dataForm.orderNumber"
:placeholder="$t('placeholder.first')+$t('module.basicData.orderNumber')"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="批次号" prop="batchNumber">
<el-input v-model="dataForm.batchNumber" placeholder="批次号"></el-input>
<el-form-item :label="$t('module.basicData.batch')" prop="batchNumber">
<el-input v-model="dataForm.batchNumber"
:placeholder="$t('placeholder.first')+$t('module.basicData.batch')"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品" prop="productId">
<el-form-item :label="$t('module.basicData.product')" prop="productId">
<el-select
v-model="dataForm.productId"
@change="getWorkingprocedureByProductId"
placeholder="请选择产品"
:placeholder="$t('placeholder.second')+$t('module.basicData.product')"
filterable
clearable
:style="{ width: '100%' }"
@@ -74,13 +81,13 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="检验阶段" prop="inspectionStage">
<el-form-item :label="$t('module.basicData.inspectionStage')" prop="inspectionStage">
<el-select
v-model="dataForm.inspectionStage"
:style="{ width: '100%' }"
@change="$forceUpdate()"
clearable
placeholder="请选择检验阶段"
:placeholder="$t('placeholder.second')+$t('module.basicData.inspectionStage')"
>
<el-option
v-for="item in inspectionStageArr"
@@ -93,11 +100,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工序" prop="workingProcedureId">
<el-form-item :label="$t('module.basicData.procedure')" prop="workingProcedureId">
<el-select
v-model="dataForm.workingProcedureId"
@change="$forceUpdate()"
placeholder="请选择工序"
:placeholder="$t('placeholder.second')+$t('module.basicData.procedure')"
filterable
clearable
:style="{ width: '100%' }"
@@ -113,10 +120,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台号" prop="machineId">
<el-form-item :label="$t('module.basicData.machine')" prop="machineId">
<el-select
v-model="dataForm.machineId"
placeholder="请选择机台号"
:placeholder="$t('placeholder.second')+$t('module.basicData.machine')"
filterable
clearable
:style="{ width: '100%' }"
@@ -132,46 +139,46 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="分组样本数" prop="numberOfGroupedSamples">
<el-form-item :label="$t('module.basicData.groupSample')" prop="numberOfGroupedSamples">
<el-input
v-model="dataForm.numberOfGroupedSamples"
placeholder="分组样本数"
:placeholder="$t('placeholder.first')+$t('module.basicData.groupSample')"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="样本大小" prop="numberOfSamples">
<el-form-item :label="$t('module.basicData.sampleSize')" prop="numberOfSamples">
<el-input
v-model="dataForm.numberOfSamples"
placeholder="样本大小"
:placeholder="$t('placeholder.first')+$t('module.basicData.sampleSize')"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="缺陷数量" prop="numberOfDefects">
<el-form-item :label="$t('module.basicData.defectValue')" prop="numberOfDefects">
<el-input
v-model="dataForm.numberOfDefects"
placeholder="缺陷数量"
:placeholder="$t('placeholder.first')+$t('module.basicData.defectValue')"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="不良数量" prop="defectiveQuantity">
<el-form-item :label="$t('module.basicData.poorValue')" prop="defectiveQuantity">
<el-input
v-model="dataForm.defectiveQuantity"
placeholder="不良数量"
:placeholder="$t('placeholder.first')+$t('module.basicData.poorValue')"
disabled
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="班次" prop="shiftId">
<el-form-item :label="$t('module.basicData.classes')" prop="shiftId">
<el-select
v-model="dataForm.shiftId"
placeholder="请选择班次"
:placeholder="$t('placeholder.second')+$t('module.basicData.classes')"
filterable
clearable
:style="{ width: '100%' }"
@@ -187,11 +194,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产人" prop="producer">
<el-form-item :label="$t('module.basicData.producer')" prop="producer">
<el-select
:style="{ width: '100%' }"
v-model="dataForm.producer"
placeholder="请选择生产人"
:placeholder="$t('placeholder.second')+$t('module.basicData.producer')"
>
<el-option
v-for="item in optionArr.arr3"
@@ -204,11 +211,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="检验人" prop="inspector">
<el-form-item :label="$t('module.basicData.inspector')" prop="inspector">
<el-select
:style="{ width: '100%' }"
v-model="dataForm.inspector"
placeholder="请选择检验人"
:placeholder="$t('placeholder.second')+$t('module.basicData.inspector')"
>
<el-option
v-for="item in optionArr.arr3"
@@ -224,14 +231,14 @@
</el-row>
<el-row v-if="!dataForm.id">
<span style="margin-left:20px">
<el-button size="medium" type="primary" @click="dataFormSubmit()">开单</el-button>
<el-button size="medium" @click="visible = false">关闭</el-button>
<el-button size="medium" type="primary" @click="dataFormSubmit()">{{ $t('billing')}}</el-button>
<el-button size="medium" @click="visible = false">{{ $t('close')}}</el-button>
</span>
</el-row>
</el-collapse-item>
<el-collapse-item name="2" v-if="dataForm.id">
<template slot="title">
<h3 style="margin-left:20px">特性信息</h3>
<h3 style="margin-left:20px">{{$t('module.basicData.featuresInfo')}}</h3>
</template>
<features-table
v-if="featuresTableVisible"
@@ -242,7 +249,7 @@
</el-collapse-item>
</el-collapse>
<div v-if="dataForm.id">
<el-divider content-position="left"><h3 style="font-size:15px">详情</h3></el-divider>
<el-divider content-position="left"><h3 style="font-size:15px">{{ $t('detail') }}</h3></el-divider>
<detail-table
v-loading="detailLoading"
:inspectionSheetId="dataForm.id"

8
src/views/process-inspection/components/interpretationScheme.vue
View File

@@ -2,11 +2,11 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2022-12-16 09:28:44
* @LastEditTime: 2023-06-27 15:28:09
* @Description:
-->
<template>
<el-dialog title="选择分析判读方案" :visible.sync="visible">
<el-dialog :title="$t('module.basicData.selectAnalysisPlan')" :visible.sync="visible">
<el-checkbox-group v-model="checkList">
<el-checkbox
style="width:100%;font-size:20px;margin:8px 5px"
@@ -29,8 +29,8 @@
</el-checkbox>
</el-checkbox-group>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit()">确定</el-button>
<el-button @click="visible = false">{{$t('cancel')}}</el-button>
<el-button type="primary" @click="dataFormSubmit()">{{$t('confirm')}}</el-button>
</span>
</el-dialog>
</template>

8
src/views/process-inspection/components/rawData.vue
View File

@@ -2,11 +2,11 @@
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2023-01-09 15:48:09
* @LastEditTime: 2023-06-27 15:29:15
* @Description:
-->
<template>
<el-dialog title="原始数据" :visible.sync="visible">
<el-dialog :title="$t('module.basicData.rawData')" :visible.sync="visible">
<el-table
:data="dataList"
:stripe="true"
@@ -19,9 +19,9 @@
v-loading="dataListLoading"
style="width: 100%;"
>
<el-table-column type="index" header-align="center" align="center" label="序号" width="50">
<el-table-column type="index" header-align="center" align="center" :label='$t("index")' width="50">
</el-table-column>
<el-table-column prop="data" align="center" label="原始数据">
<el-table-column prop="data" align="center" :label="$t('module.basicData.rawData')">
<template slot-scope="scope">
<span>{{ lineIndex === 2 ? scope.row.x : scope.row.data.toString() }}</span>
</template>

70
src/views/process-inspection/generalOperation.vue
View File

@@ -2,44 +2,44 @@
* @Author: zwq
* @Date: 2022-09-15 10:44:29
* @LastEditors: zwq
* @LastEditTime: 2023-06-21 16:27:24
* @LastEditTime: 2023-06-27 16:07:58
* @Description:
-->
<template>
<el-card shadow="never" class="aui-card--fill">
<el-row :gutter="6" style="background-color:#e6f7ff;padding-top:10px;margin-bottom:0">
<el-form ref="dataForm" :model="dataForm" :rules="rules" size="small" label-width="80px">
<el-form ref="dataForm" :model="dataForm" :rules="rules" size="small" label-width="120px">
<el-col :span="6">
<el-form-item label="检验时间" prop="time">
<el-form-item :label="$t('module.basicData.inspectionTime')" prop="time">
<el-date-picker
type="daterange"
v-model="time"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
:style="{ width: '100%' }"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('module.basicData.startTime')"
:end-placeholder="$t('module.basicData.endTime')"
range-separator="-"
clearable
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="检验站点" prop="inspectionSite">
<el-form-item :label="$t('module.basicData.inspectionSite')" prop="inspectionSite">
<el-input
size="small"
v-model="dataForm.inspectionSite"
clearable
placeholder="请输入检验站点"
:placeholder="$t('placeholder.first')+$t('module.basicData.inspectionSite')"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品" prop="productId">
<el-form-item :label="$t('module.basicData.product')" prop="productId">
<el-select
v-model="dataForm.productId"
@change="getWorkingprocedureByProductId"
placeholder="请选择产品"
:placeholder="$t('placeholder.second')+$t('module.basicData.product')"
filterable
clearable
:style="{ width: '100%' }"
@@ -55,10 +55,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工序" prop="workingProcedureId">
<el-form-item :label="$t('module.basicData.procedure')" prop="workingProcedureId">
<el-select
v-model="dataForm.workingProcedureId"
placeholder="请选择工序"
:placeholder="$t('placeholder.second')+$t('module.basicData.procedure')"
filterable
clearable
@change="$forceUpdate()"
@@ -75,10 +75,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="机台号" prop="machineId">
<el-form-item :label="$t('module.basicData.machine')" prop="machineId">
<el-select
v-model="dataForm.machineId"
placeholder="请选择机台号"
:placeholder="$t('placeholder.second')+$t('module.basicData.machine')"
filterable
clearable
:style="{ width: '100%' }"
@@ -94,27 +94,31 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="批次号" prop="batchNumber">
<el-form-item :label="$t('module.basicData.batch')" prop="batchNumber">
<el-input
size="small"
v-model="dataForm.batchNumber"
clearable
placeholder="请输入批次号"
:placeholder="$t('placeholder.first')+$t('module.basicData.batch')"
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="检验单号" prop="id">
<el-input size="small" v-model="dataForm.id" clearable placeholder="请输入检验单号" />
<el-form-item :label="$t('module.basicData.inspectionNum')" prop="id">
<el-input
size="small"
v-model="dataForm.id"
clearable
:placeholder="$t('placeholder.first')+$t('module.basicData.inspectionNum')" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="订单号" prop="orderNumber">
<el-form-item :label="$t('module.basicData.orderNumber')" prop="orderNumber">
<el-input
size="small"
v-model="dataForm.orderNumber"
clearable
placeholder="请输入订单号"
:placeholder="$t('placeholder.first')+$t('module.basicData.orderNumber')"
/>
</el-form-item>
</el-col>
@@ -122,17 +126,17 @@
<el-form-item style="float:right;padding-right:20px">
<el-button size="small" @click="getDataList()">
<svg class="icon-svg"><use xlink:href="#icon-sousuo"></use></svg>
查询
{{ $t('query')}}
</el-button>
<el-button size="small" type="primary" @click="addOrUpdateHandle()">
<svg class="icon-svg"><use xlink:href="#icon-新建"></use></svg>
登记
{{ $t('register')}}
</el-button>
<el-button size="small" type="primary" @click="exportHandle('通用作业')">
<svg class="icon-svg">
<use xlink:href="#导出"></use>
</svg>
导出
{{ $t('export')}}
</el-button>
</el-form-item>
</el-col>
@@ -172,25 +176,26 @@
import basicPage from "@/mixins/basic-page";
import AddOrUpdate from './components/generalOperation-add'
import basicFilter from "@/filters/basic-filter";
import { timeFormatter } from "@/filters/basic-filter"
import i18n from "@/i18n";
const tableProps = [
{
prop: "id",
label: "检验单号",
label: i18n.t("module.basicData.inspectionNum"),
},
{
prop: "batchNumber",
label: "批次号",
label: i18n.t("module.basicData.batch"),
},
{
prop: "inspectionStage",
label: "检验阶段",
label: i18n.t("module.basicData.inspectionStage"),
filter: basicFilter("inspectionStage"),
},
{
prop: "productName",
label: "产品名称",
label: i18n.t("module.basicData.productName"),
},
{
prop: "machineName",
@@ -198,27 +203,28 @@ const tableProps = [
},
{
prop: "workingProcedureName",
label: "工序",
label: i18n.t("module.basicData.procedure"),
},
{
prop: "createTime",
label: "检验时间",
label: i18n.t("module.basicData.inspectionTime"),
filter: timeFormatter,
},
{
prop: "shiftName",
label: "班次",
label: i18n.t("module.basicData.classes"),
},
{
prop: "numberOfSamples",
label: "抽样数量",
label: i18n.t("module.basicData.sampleQuantity"),
},
{
prop: "numberOfDefects",
label: "缺陷数量",
label: i18n.t("module.basicData.defectValue"),
},
{
prop: "defectiveQuantity",
label: "不良数量",
label: i18n.t("module.basicData.poorValue"),
},
{
prop: "remark",

46
src/views/process-inspection/query-form.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2022-09-15 10:44:29
* @LastEditors: zwq
* @LastEditTime: 2023-01-09 14:10:26
* @LastEditTime: 2023-06-27 16:03:40
* @Description:
-->
<template>
@@ -11,16 +11,16 @@
:gutter="6"
style="background-color:#e6f7ff;margin:-20px;padding-top:10px;margin-bottom:0"
>
<el-form ref="dataForm" :model="dataForm" :rules="rules" size="small" label-width="80px">
<el-form ref="dataForm" :model="dataForm" :rules="rules" size="small" label-width="120px">
<el-col :span="6">
<el-form-item label="检验时间" prop="time">
<el-form-item :label="$t('module.basicData.inspectionTime')" prop="time">
<el-date-picker
type="daterange"
v-model="dataForm.time"
format="yyyy-MM-dd"
:style="{ width: '100%' }"
start-placeholder="开始日期"
end-placeholder="结束日期"
:start-placeholder="$t('module.basicData.startTime')"
:end-placeholder="$t('module.basicData.endTime')"
range-separator="-"
clearable
></el-date-picker>
@@ -46,10 +46,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品" prop="productId">
<el-form-item :label="$t('module.basicData.product')" prop="productId">
<el-select
v-model="dataForm.productId"
placeholder="请选择产品"
:placeholder="$t('placeholder.second')+$t('module.basicData.product')"
@change="getWorkingprocedureByProductId"
filterable
clearable
@@ -66,11 +66,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="检验类型" prop="inspectionStage">
<el-form-item :label="$t('module.basicData.inspectionType')" prop="inspectionStage">
<el-select
v-model="dataForm.inspectionStage"
@change="getFeaturesList()"
placeholder="请选择检验类型"
:placeholder="$t('placeholder.second')+$t('module.basicData.inspectionType')"
filterable
clearable
:style="{ width: '100%' }"
@@ -85,11 +85,11 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="工序" prop="workingProcedureId">
<el-form-item :label="$t('module.basicData.procedure')" prop="workingProcedureId">
<el-select
v-model="dataForm.workingProcedureId"
@change="$forceUpdate(), getFeaturesList()"
placeholder="请选择工序"
:placeholder="$t('placeholder.second')+$t('module.basicData.procedure')"
filterable
clearable
:style="{ width: '100%' }"
@@ -105,10 +105,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="特性" prop="productFeaturesId">
<el-form-item :label="$t('module.basicData.features')" prop="productFeaturesId">
<el-select
v-model="dataForm.productFeaturesId"
placeholder="请选择特性"
:placeholder="$t('placeholder.second')+$t('module.basicData.features')"
filterable
clearable
:style="{ width: '100%' }"
@@ -124,20 +124,20 @@
</el-form-item>
</el-col>
<el-col :span="6" v-if="!groupTypeShow">
<el-form-item label="样本大小" prop="sampleSize">
<el-form-item :label="$t('module.basicData.sampleSize')" prop="sampleSize">
<el-input-number
v-model="dataForm.sampleSize"
placeholder="样本大小"
:placeholder="$t('placeholder.first')+$t('module.basicData.sampleSize')"
:step="1"
></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6" v-if="groupTypeShow">
<el-form-item label="分组" prop="groupType">
<el-form-item :label="$t('module.basicData.grouping')" prop="groupType">
<el-radio-group v-model="dataForm.groupType">
<el-radio :label="1">年</el-radio>
<el-radio :label="2">月</el-radio>
<el-radio :label="3">日</el-radio>
<el-radio :label="1">{{ $t('Year') }}</el-radio>
<el-radio :label="2">{{ $t('Month') }}</el-radio>
<el-radio :label="3">{{ $t('Day') }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -145,21 +145,21 @@
<el-form-item>
<el-button size="small" @click="getDataList()">
<svg class="icon-svg"><use xlink:href="#icon-sousuo"></use></svg>
查询
{{ $t('query')}}
</el-button>
<el-button v-if="showRaw" size="small" type="primary" @click="rawData()">
<svg class="icon-svg"><use xlink:href="#历史记录"></use></svg>
原始数据
{{ $t('rawData')}}
</el-button>
<el-button size="small" type="primary" @click="exportHandle()">
<svg class="icon-svg">
<use xlink:href="#导出"></use>
</svg>
导出
{{ $t('export')}}
</el-button>
<el-button v-if="!groupTypeShow" size="small" type="primary" @click="showScheme()">
<svg class="icon-svg"><use xlink:href="#方案管理"></use></svg>
配置分析方案
{{ $t('configurationAnalysisPlan')}}
</el-button>
</el-form-item>
</el-col>