不合格流程提交

master
zhaoxiaolin 10 months ago
parent 0e9854a734
commit 3c77411624

@ -42,3 +42,12 @@ export function delUnqualified(id) {
method: 'delete' method: 'delete'
}); });
} }
// 查询检测项列表
export function getOAInfoList(query) {
return request({
url: '/quality/unqualified/getOAInfoList',
method: 'get',
params: query
});
}

@ -426,7 +426,9 @@ export default {
}, },
// //
orderCodeFormate(row, column, cellValue){ orderCodeFormate(row, column, cellValue){
if(cellValue !=null){
return cellValue.slice(3,18); // return cellValue.slice(3,18); //
}
}, },
// //
handlePrint(params) { handlePrint(params) {

@ -803,7 +803,9 @@ export default {
}, },
// //
orderCodeFormate(row, column, cellValue){ orderCodeFormate(row, column, cellValue){
if(cellValue !=null){
return cellValue.slice(3,18); // return cellValue.slice(3,18); //
}
}, },
/**获取默认查询时间段**/ /**获取默认查询时间段**/
getDate() { getDate() {
@ -1170,6 +1172,7 @@ export default {
}, },
/** 报工损耗按钮操作 */ /** 报工损耗按钮操作 */
handleConsumeHz(row) { handleConsumeHz(row) {
debugger
this.reset(); this.reset();
let sr = this.selectRow[0]; let sr = this.selectRow[0];
this.queryParams.workorderCode = sr.workorderCode; this.queryParams.workorderCode = sr.workorderCode;

@ -620,7 +620,9 @@ export default {
}, },
// //
orderCodeFormate(row, column, cellValue){ orderCodeFormate(row, column, cellValue){
if(cellValue !=null){
return cellValue.slice(3,18); // return cellValue.slice(3,18); //
}
}, },
// - // -

@ -830,7 +830,10 @@ export default {
}, },
// //
orderCodeFormate(row, column, cellValue){ orderCodeFormate(row, column, cellValue){
if(cellValue !=null){
return cellValue.slice(3,18); // return cellValue.slice(3,18); //
}
}, },
// - // -
handleMaterielQuery() { handleMaterielQuery() {

@ -11,6 +11,14 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="任务编号" prop="checkNo">
<el-input
v-model="queryParams.checkNo"
placeholder="请输入检验任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="批次号" prop="incomeBatchNo"> <el-form-item label="批次号" prop="incomeBatchNo">
<el-input <el-input
v-model="queryParams.incomeBatchNo" v-model="queryParams.incomeBatchNo"
@ -558,12 +566,15 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
if(this.queryParams.incomeTimeArray.length>0){ if(this.queryParams.incomeTimeArray != null &&this.queryParams.incomeTimeArray.length>0){
this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[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.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss'); this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
}else{
this.queryParams.incomeTimeStart = null;
this.queryParams.incomeTimeEnd = null;
} }
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');
} }

@ -26,10 +26,10 @@
<el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" > <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
<el-table-column width="50" align="center" type="selection"/> <el-table-column width="50" align="center" type="selection"/>
<el-table-column label="订单号" align="left" prop="orderNo" width="120" :formatter="orderCodeFormate"/> <el-table-column label="订单号" align="left" prop="orderNo" width="120" :formatter="orderCodeFormate"/>
<el-table-column label="订单状态" align="left" prop="status" width="90"/> <!--<el-table-column label="订单状态" align="left" prop="status" width="90"/>-->
<el-table-column label="工单号" align="left" prop="workorderCode" width="130"/> <el-table-column label="工单号" align="left" prop="workorderCode" width="130"/>
<el-table-column label="产品编码" align="left" prop="materialCode" width="180" :formatter="productCodeFormate"/> <el-table-column label="产品编码" align="left" prop="materialCode" width="160" :formatter="productCodeFormate"/>
<el-table-column label="产品名称" align="left" prop="materialName" width="180"/> <el-table-column label="产品名称" align="left" prop="materialName" width="200"/>
<el-table-column label="排产数量" align="left" prop="quality" width="100" /> <el-table-column label="排产数量" align="left" prop="quality" width="100" />
<el-table-column label="单位" align="left" prop="unit" width="80"/> <el-table-column label="单位" align="left" prop="unit" width="80"/>
<el-table-column label="生产日期" align="left" prop="incomeTime" width="100" > <el-table-column label="生产日期" align="left" prop="incomeTime" width="100" >
@ -101,7 +101,9 @@ export default {
}, },
// //
orderCodeFormate(row, column, cellValue){ orderCodeFormate(row, column, cellValue){
if(cellValue !=null){
return cellValue.slice(3,18); // return cellValue.slice(3,18); //
}
}, },
/** 查询表格列表*/ /** 查询表格列表*/
getList() { getList() {

@ -189,7 +189,9 @@ export default {
}, },
// //
orderCodeFormate(row, column, cellValue){ orderCodeFormate(row, column, cellValue){
if(cellValue !=null){
return cellValue.slice(3,18); // return cellValue.slice(3,18); //
}
}, },
/**获取默认查询时间段**/ /**获取默认查询时间段**/
getDate() { getDate() {

@ -103,7 +103,7 @@
icon="el-icon-s-check" icon="el-icon-s-check"
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleViewOA"
v-hasPermi="['quality:unqualified:edit']" v-hasPermi="['quality:unqualified:edit']"
>OA审批查看</el-button> >OA审批查看</el-button>
</el-col> </el-col>
@ -126,27 +126,35 @@
<el-table-column label="检查任务编码" align="center" prop="checkNo" width="130"/> <el-table-column label="检查任务编码" align="center" prop="checkNo" width="130"/>
<el-table-column label="订单编码" align="center" prop="orderNo" width="130"/> <el-table-column label="订单编码" align="center" prop="orderNo" width="130"/>
<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="150" :show-overflow-tooltip="true"/> <el-table-column label="批次号" align="center" prop="incomeBatchNo" width="150" :show-overflow-tooltip="true"/>
<el-table-column label="质检项目" align="center" prop="checkName" width="80"/> <el-table-column label="质检项目" align="center" prop="checkName" width="120"/>
<el-table-column label="物料编码" align="center" prop="materialCode" width="150" :formatter="productCodeFormate"/> <el-table-column label="物料编码" align="center" prop="materialCode" width="150" :formatter="productCodeFormate"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="150" :show-overflow-tooltip="true"/> <el-table-column label="物料名称" align="center" prop="materialName" width="150" :show-overflow-tooltip="true"/>
<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="status" > <el-table-column label="抽样数量" align="center" prop="sampleQuality" width="100"/>
<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="100"/>
<el-table-column label="不合格时间" align="center" prop="createTime" width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="不合格描述" align="center" prop="remark" width="300" :show-overflow-tooltip="true"/>
<el-table-column label="oa流程ID" align="center" prop="requestid" width="100" />
<el-table-column label="发起OA时间" align="center" prop="startTime" width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="startOaStatus" >
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag <dict-tag
:options="dict.type.do_result" :options="dict.type.do_result"
:value="scope.row.status" :value="scope.row.startOaStatus"
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="抽样数量" align="center" prop="sampleQuality" width="100"/> <el-table-column label="提交失败原因" align="center" prop="startOaMsg" width="100" :show-overflow-tooltip="true">
<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="100"/>
<el-table-column label="流程发起时间" align="center" prop="createTime" width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="不合格描述" align="center" prop="remark" width="120"/>
</el-table> </el-table>
<pagination <pagination
@ -281,6 +289,11 @@
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>
<!--OA流程弹窗弹窗-->
<ItemOAInfo
ref="itemOaInfo"
></ItemOAInfo>
</div> </div>
</template> </template>
@ -288,16 +301,19 @@
import { listUnqualified, getUnqualified, delUnqualified, addUnqualified, updateUnqualified } from "@/api/quality/unqualified"; import { listUnqualified, getUnqualified, delUnqualified, addUnqualified, updateUnqualified } from "@/api/quality/unqualified";
import { getCheckTypeList} from "@/api/quality/qcTable"; import { getCheckTypeList} from "@/api/quality/qcTable";
import { getCheckTypes } from "@/api/quality/qcProduce"; import { getCheckTypes } from "@/api/quality/qcProduce";
import ItemOAInfo from "./oaNode.vue";
import moment from 'moment'; import moment from 'moment';
export default { export default {
name: "Unqualified", name: "Unqualified",
dicts: ["do_result","check_type"], dicts: ["do_result","check_type","oper_status"],
components: { ItemOAInfo},
data() { data() {
return { return {
// //
loading: true, loading: true,
// //
ids: [], ids: [],
selectRow:{},
// //
single: true, single: true,
// //
@ -423,6 +439,7 @@ export default {
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.selectRow = selection
this.single = selection.length!==1 this.single = selection.length!==1
this.multiple = !selection.length this.multiple = !selection.length
}, },
@ -447,7 +464,6 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
updateUnqualified(this.form).then(response => { updateUnqualified(this.form).then(response => {
this.$modal.msgSuccess("提交OA成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
@ -469,6 +485,12 @@ export default {
this.download('quality/unqualified/export', { this.download('quality/unqualified/export', {
...this.queryParams ...this.queryParams
}, `unqualified_${new Date().getTime()}.xlsx`) }, `unqualified_${new Date().getTime()}.xlsx`)
},
//oa
handleViewOA(){
this.$refs.itemOaInfo.showFlag = true;
const row = this.selectRow[0];
this.$refs.itemOaInfo.init(row);
} }
} }
}; };

@ -0,0 +1,148 @@
<template>
<div>
<el-dialog title="OA流程审批查看"
v-if="showFlag"
:visible.sync="showFlag"
:modal= false
width="1400px"
>
<el-row :gutter="20">
<el-col :span="24" :xs="24">
<el-table v-loading="loading" :data="itemList" ref="myTable" >
<el-table-column width="50" align="center" type="selection">
</el-table-column>
<!-- 序号 -->
<el-table-column label="请求id" align="left" prop="requestid" width="120"/>
<el-table-column label="工作流id" align="left" prop="workflowid" width="120"/>
<el-table-column label="操作节点id" align="left" prop="nodeid" width="120"/>
<el-table-column label="签字类型" align="left" prop="logtype" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.logtype" :value="scope.row.logtype"/>
</template>
</el-table-column>
<el-table-column label="操作日期" align="left" prop="operatedate" width="120"/>
<el-table-column label="操作时间" align="left" prop="operatetime" width="120"/>
<el-table-column label="操作者" align="left" prop="operator" width="120"/>
<el-table-column label="意见" align="left" prop="remark1" width="120"/>
<el-table-column label="客户端ip" align="left" prop="clientip" width="120"/>
<el-table-column label="操作者类型" align="left" prop="operatortype" width="120" :formatter="OPERATORTYPECodeFormate"/>
<el-table-column label="下一节点id" align="left" prop="destnodeid" width="120"/>
<el-table-column label="接收人" align="left" prop="receivedpersons_1" width="120"/>
<el-table-column label="显示顺序" align="left" prop="showorder" width="120"/>
<el-table-column label="代理人" align="left" prop="agentorbyagentid" width="120"/>
<el-table-column label="代理类型" align="left" prop="agenttype" width="120"/>
<el-table-column label="日志id" align="left" prop="logid" width="120"/>
<el-table-column label="签字信息" align="left" prop="remark" width="120"/>
<el-table-column label="相关附件" align="left" prop="annexdocids" width="120"/>
<el-table-column label="日志id" align="left" prop="requestlogid" width="120"/>
<el-table-column label="操作者部门" align="left" prop="operatordept" width="120"/>
<el-table-column label="相关文档" align="left" prop="signdocids" width="120"/>
<el-table-column label="相关流程" align="left" prop="signworkflowids" width="120"/>
<el-table-column label="接收者名称" align="left" prop="receivedpersons" width="120"/>
<el-table-column label="是否为手机版本" align="left" prop="ismobile" width="120"/>
<el-table-column label="手写签批" align="left" prop="handwrittensign" width="120"/>
<!--<el-table-column label="语音附件" align="left" prop="speechattachment" width="120"/>-->
<el-table-column label="接收人id" align="left" prop="receivedpersonids" width="120"/>
<el-table-column label="意见位置" align="left" prop="remarklocation" width="120"/>
</el-table>
</el-col>
</el-row>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelForm" >关闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getOAInfoList } from "@/api/quality/unqualified";
export default {
name: "itemSelectUser",
dicts: ['logtype'],
data() {
return {
showFlag : false,
//
selectedRows: {},
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// BOM
itemList: null,
//
bomCode: undefined,
defaultProps: {
id: "id",
label: "label"
},
//
queryParams: {
recordId:''
},
data:{},
dynamicValidateForm: {
domains: [{
value: ''
}]
},
//
valueOpen: false,
//id
recordId:''
};
},
created() {
},
methods: {
//
OPERATORTYPECodeFormate(row, column, cellValue){
if("1" == cellValue){
return "人力资源";
}else if("2" == cellValue){
return "客户";
}else{
return "";
}
},
init(row){
this.queryParams.taskId = row.requestid;
this.getList();
},
/** 查询表格列表*/
getList() {
this.loading = true;
getOAInfoList(this.queryParams).then(response => {
this.itemList = response;
this.loading = false;
}
);
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
cancelForm() {
this.showFlag = false;
}
}
};
</script>
Loading…
Cancel
Save