Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

检验任务表合一

Browse Source
yangwl
zhaoxiaolin 1 year ago
parent 3dde10de54
commit 5debe2b848
5 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File

1
src/views/quality/qcIncome/checkProjectType.vue
Unescape Escape View File

@ -143,6 +143,7 @@ export default {
this.data=rowdata; this.data=rowdata;
this.queryParams.belongTo = this.data.recordId; this.queryParams.belongTo = this.data.recordId;
this.typeCode = typeCode; this.typeCode = typeCode;
this.checkType = this.data.checkType;
this.getList(); this.getList();
}, },

7
src/views/quality/qcIncome/index.vue
Unescape Escape View File

@ -131,6 +131,7 @@
<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/> <el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/> <el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
<el-table-column label="来料批次号" align="center" prop="incomeBatchNo" width="120"/> <el-table-column label="来料批次号" align="center" prop="incomeBatchNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="120"/> <el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
@ -636,6 +637,12 @@ export default {
}, },
//检验项目弹窗 //检验项目弹窗
handleCheckProject(row){ handleCheckProject(row){
if(row.checkStatus != '0'){
this.$modal.msgSuccess("已经完成检验");
return
}
this.$refs.itemSelectProject.showFlag = true; this.$refs.itemSelectProject.showFlag = true;
this.$refs.itemSelectProject.init(row,'material'); this.$refs.itemSelectProject.init(row,'material');
}, },

65
src/views/quality/qcProduce/index.vue
Unescape Escape View File

@ -41,9 +41,9 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="车间名称" prop="carName"> <el-form-item label="车间名称" prop="supplierName">
<el-input <el-input
v-model="queryParams.carName" v-model="queryParams.supplierName"
placeholder="请输入所属车间名称" placeholder="请输入所属车间名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
@ -51,9 +51,9 @@
</el-form-item> </el-form-item>
<el-form-item label="生产时间" prop="produceDateArray"> <el-form-item label="生产时间" prop="incomeTimeArray">
<el-date-picker <el-date-picker
v-model="queryParams.produceDateArray" v-model="queryParams.incomeTimeArray"
format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
type="datetimerange" type="datetimerange"
range-separator="至" range-separator="至"
@ -159,6 +159,7 @@
<el-table v-loading="loading" :data="qcProduceList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="qcProduceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="recordId" v-if="false"/> <el-table-column label="id" align="center" prop="recordId" v-if="false"/>
<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
<el-table-column label="任务编号" align="center" prop="checkNo" width="120"/> <el-table-column label="任务编号" align="center" prop="checkNo" width="120"/>
<el-table-column label="批次号" align="center" prop="batchNo" width="120"/> <el-table-column label="批次号" align="center" prop="batchNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="120"/> <el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
@ -166,11 +167,11 @@
<el-table-column label="物料名称" align="center" prop="materialName" width="150"/> <el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
<el-table-column label="数量" align="center" prop="quality" /> <el-table-column label="数量" align="center" prop="quality" />
<el-table-column label="单位" align="center" prop="unit" /> <el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="车间编码" align="center" prop="carCode" width="120"/> <el-table-column label="车间编码" align="center" prop="supplierCode" width="120"/>
<el-table-column label="车间名称" align="center" prop="carName" width="240"/> <el-table-column label="车间名称" align="center" prop="supplierName" width="240"/>
<el-table-column label="生产时间" align="center" prop="produceDate" width="180"> <el-table-column label="生产时间" align="center" prop="incomeTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.produceDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检测地点" align="center" prop="checkLoc" width="120"/> <el-table-column label="检测地点" align="center" prop="checkLoc" width="120"/>
@ -297,21 +298,21 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="车间名称" prop="carName"> <el-form-item label="车间名称" prop="supplierName">
<el-input v-model="form.carName" placeholder="请输入所属车间名称" > <el-input v-model="form.supplierName" placeholder="请输入所属车间名称" >
<el-button slot="append" @click="handleSelectWorkCenter" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectWorkCenter" icon="el-icon-search"></el-button>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="车间编码" prop="carCode"> <el-form-item label="车间编码" prop="supplierCode">
<el-input v-model="form.carCode" placeholder="请输入所属车间编码" disabled/> <el-input v-model="form.supplierCode" placeholder="请输入所属车间编码" disabled/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="生产时间" prop="produceDate"> <el-form-item label="生产时间" prop="incomeTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.produceDate" v-model="form.incomeTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择生产时间"> placeholder="请选择生产时间">
@ -400,7 +401,7 @@ export default {
open: false, open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
produceDateArray: [], incomeTimeArray: [],
checkTimeArray: [], checkTimeArray: [],
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -411,9 +412,9 @@ export default {
materialName: null, materialName: null,
quality: null, quality: null,
unit: null, unit: null,
carCode: null, supplierCode: null,
carName: null, supplierName: null,
produceDate: null, incomeTime: null,
checkLoc: null, checkLoc: null,
checkStatus: null, checkStatus: null,
checkManCode: null, checkManCode: null,
@ -449,10 +450,10 @@ export default {
unit: [ unit: [
{ required: true, message: "单位不能为空", trigger: "blur" } { required: true, message: "单位不能为空", trigger: "blur" }
], ],
carName: [ supplierName: [
{ required: true, message: "车间不能为空", trigger: "blur" } { required: true, message: "车间不能为空", trigger: "blur" }
], ],
produceDate: [ incomeTime: [
{ required: true, message: "生产时间不能为空", trigger: "blur" } { required: true, message: "生产时间不能为空", trigger: "blur" }
], ],
checkManName: [ checkManName: [
@ -483,7 +484,7 @@ export default {
getDate() { getDate() {
let start = this.Fungetdate (0) let start = this.Fungetdate (0)
let end = this.Fungetdate (1) let end = this.Fungetdate (1)
this.queryParams.produceDateArray.push(start,end) this.queryParams.incomeTimeArray.push(start,end)
//this.queryParams.checkTimeArray.push(start,end) //this.queryParams.checkTimeArray.push(start,end)
}, },
Fungetdate (num) { Fungetdate (num) {
@ -499,9 +500,9 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
if(this.queryParams.produceDateArray.length>0){ if(this.queryParams.incomeTimeArray.length>0){
this.queryParams.produceDateStart = moment(this.queryParams.produceDateArray[0]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
this.queryParams.produceDateEnd = moment(this.queryParams.produceDateArray[1]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
} }
if(this.queryParams.checkTimeArray.length>0){ if(this.queryParams.checkTimeArray.length>0){
@ -531,9 +532,9 @@ export default {
materialName: null, materialName: null,
quality: null, quality: null,
unit: null, unit: null,
carCode: null, supplierCode: null,
carName: null, supplierName: null,
produceDate: null, incomeTime: null,
checkLoc: null, checkLoc: null,
checkStatus: null, checkStatus: null,
checkManCode: null, checkManCode: null,
@ -650,8 +651,8 @@ export default {
}, },
//工作中心选择确认 //工作中心选择确认
onSelectWorkCenter(obj) { onSelectWorkCenter(obj) {
this.form.carCode = obj.code; this.form.supplierCode = obj.code;
this.form.carName = obj.name; this.form.supplierName = obj.name;
}, },
/**人员选择弹出框**/ /**人员选择弹出框**/
@ -665,6 +666,12 @@ export default {
}, },
//检验项目弹窗 //检验项目弹窗
handleCheckProject(row){ handleCheckProject(row){
if(row.checkStatus != '0'){
this.$modal.msgSuccess("已经完成检验");
return
}
this.$refs.itemSelectProject.showFlag = true; this.$refs.itemSelectProject.showFlag = true;
this.$refs.itemSelectProject.init(row,'produce'); this.$refs.itemSelectProject.init(row,'produce');
}, },

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

@ -59,7 +59,6 @@
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="检测地点" prop="checkLoc"> <el-form-item label="检测地点" prop="checkLoc">
<el-input <el-input
v-model="queryParams.checkLoc" v-model="queryParams.checkLoc"
@ -156,6 +155,7 @@
<el-table v-loading="loading" :data="warehousingList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="warehousingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="recordId" v-if="false"/> <el-table-column label="id" align="center" prop="recordId" v-if="false"/>
<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/> <el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
<el-table-column label="批次号" align="center" prop="batchNo" width="120"/> <el-table-column label="批次号" align="center" prop="batchNo" width="120"/>
<el-table-column label="订单号" align="center" prop="orderNo" width="120"/> <el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
@ -659,6 +659,12 @@ export default {
}, },
//检验项目弹窗 //检验项目弹窗
handleCheckProject(row){ handleCheckProject(row){
if(row.checkStatus != '0'){
this.$modal.msgSuccess("已经完成检验");
return
}
this.$refs.itemSelectProject.showFlag = true; this.$refs.itemSelectProject.showFlag = true;
this.$refs.itemSelectProject.init(row,'product'); this.$refs.itemSelectProject.init(row,'product');
}, },

12
src/views/quality/unqualified/index.vue
Unescape Escape View File

@ -117,14 +117,7 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['quality:unqualified:edit']" v-hasPermi="['quality:unqualified:edit']"
>修改</el-button> >处理</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['quality:unqualified:remove']"
>删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -224,9 +217,6 @@ export default {
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {
factoryCode: [
{ required: true, message: "工厂编码不能为空", trigger: "blur" }
],
} }
}; };
}, },

Write Preview
Loading…
Cancel
Save