Skip to content

P
pda-ui
Commit 7a23f16e authored by chenzj's avatar chenzj
Browse files
Options

报工新增打印二维码

parent 52136460
Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 172 deletions
src/api/mes/pro/feedback.js
View file @ 7a23f16e
......@@ -58,3 +58,14 @@ export function execute(recordId){
method: 'put'
})
}
// 查询生产报工记录列表
export function listNextProcess(query) {
return request({
url: '/mobile/pro/protask/feedBackNextProcess',
method: 'get',
params: query
})
}
src/views/mes/md/workstation/index.vue
View file @ 7a23f16e
......@@ -253,6 +253,8 @@
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="工作中心名称" prop="workstationName">
<el-input
......@@ -276,6 +278,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="工作中心用途" prop="usageCode">
<el-select
......@@ -297,6 +301,8 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="所属工序" prop="processName">
<el-input v-model="form.processName" @blur="handleChangeProcessName" placeholder="请选输入工序" />
......@@ -311,7 +317,8 @@
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="负责人" prop="responsiblePerson">
<el-input
......@@ -347,7 +354,8 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="加工方式" prop="processingMethod">
<el-select
......@@ -373,6 +381,8 @@
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="看机人数" prop="watchingAircraftNum">
<el-input
......@@ -383,7 +393,16 @@
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="12">
<el-form-item label="转间时间" label-width="120px" prop="transferTime">
<el-input v-model="form.transferTime" placeholder="请输入转间时间">
<i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">MIN</i>
</el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否倒冲" prop="isBackflush">
<el-radio-group
v-model="form.isBackflush"
......@@ -407,7 +426,7 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="12">
<el-form-item label="是否启用" prop="enableFlag">
<el-radio-group
v-model="form.enableFlag"
......@@ -690,6 +709,7 @@ export default {
costCenterCode: null,
watchingAircraftNum: null,
factoryCode: null,
transferTime: null,
};
this.autoGenFlag = true;
this.resetForm("form");
......
src/views/mes/pro/feedback/index.vue
View file @ 7a23f16e
......@@ -3,69 +3,34 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="报工类型" prop="feedbackType">
<el-select v-model="queryParams.feedbackType" placeholder="请选择报工类型" clearable>
<el-option
v-for="dict in dict.type.mes_feedback_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in dict.type.mes_feedback_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="工作中心名称" prop="workstationName">
<el-input
v-model="queryParams.workstationName"
placeholder="请输入工作中心名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.workstationName" placeholder="请输入工作中心名称" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="外协单号" prop="assistProcessCode">
<el-input
v-model="queryParams.assistProcessCode"
placeholder="请输入外协单号"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.assistProcessCode" placeholder="请输入外协单号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="生产工单编号" prop="workorderCode">
<el-input
v-model="queryParams.workorderCode"
placeholder="请输入生产工单编号"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.workorderCode" placeholder="请输入生产工单编号" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品物料编码" prop="sapItemCode">
<el-input
v-model="queryParams.sapItemCode"
placeholder="请输入产品物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.sapItemCode" placeholder="请输入产品物料编码" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="产品物料名称" prop="itemName">
<el-input
v-model="queryParams.itemName"
placeholder="请输入产品物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.itemName" placeholder="请输入产品物料名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="报工人" prop="nickName">
<el-input
v-model="queryParams.nickName"
placeholder="请输入报工人名称"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.nickName" placeholder="请输入报工人名称" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="记录人" prop="recordUser">
<el-input
v-model="queryParams.recordUser"
placeholder="请输入记录人"
clearable
@keyup.enter.native="handleQuery"
/>
<el-input v-model="queryParams.recordUser" placeholder="请输入记录人" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
......@@ -74,36 +39,20 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes:pro:feedback:add']"
>新增</el-button>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['mes:pro:feedback:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes:pro:feedback:edit']"
>修改</el-button>
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['mes:pro:feedback:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes:pro:feedback:remove']"
>删除</el-button>
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['mes:pro:feedback:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-printer" size="mini" :disabled="single" @click="handleQrcode"
v-hasPermi="['mes:pro:feedback:edit']">打印二维码</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
......@@ -111,7 +60,7 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="报工类型" align="center" width="80" prop="feedbackType">
<template slot-scope="scope">
<dict-tag :options="dict.type.mes_feedback_type" :value="scope.row.feedbackType"/>
<dict-tag :options="dict.type.mes_feedback_type" :value="scope.row.feedbackType" />
</template>
</el-table-column>
<el-table-column label="工作中心" width="120" align="center" prop="workstationName" />
......@@ -139,38 +88,18 @@
<el-table-column label="审核人" width="100" align="center" prop="recordNick" />
<el-table-column label="操作" align="center" fixed="right" width="160px" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-query"
@click="handleView(scope.row)"
v-hasPermi="['mes:pro:feedback:query']"
>查看</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:feedback:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:feedback:remove']"
>删除</el-button>
<el-button size="mini" type="text" icon="el-icon-query" @click="handleView(scope.row)"
v-hasPermi="['mes:pro:feedback:query']">查看</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:feedback:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:feedback:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改生产报工记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
......@@ -179,22 +108,20 @@
<el-col :span="8">
<el-form-item label="报工类型" prop="feedbackType">
<el-select v-model="form.feedbackType" placeholder="请选择报工类型" @change="handleFeedbackTypeChange">
<el-option
v-for="dict in dict.type.mes_feedback_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
<el-option v-for="dict in dict.type.mes_feedback_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col v-if="form.feedbackType == 'ASSIST_PROCESS'" :span="8">
<el-form-item label="外协单号" prop="assistProcessCode">
<el-input v-model="form.assistProcessCode" placeholder="请选择外协单号" >
<el-button slot="append" icon="el-icon-search" @click="$refs.assistProcessSelect.showFlag = true"></el-button>
<el-input v-model="form.assistProcessCode" placeholder="请选择外协单号">
<el-button slot="append" icon="el-icon-search"
@click="$refs.assistProcessSelect.showFlag = true"></el-button>
</el-input>
</el-form-item>
<assistProcessSelect v-if="open" ref="assistProcessSelect" @onSelected="onAssistProcessSelect"></assistProcessSelect>
<assistProcessSelect v-if="open" ref="assistProcessSelect" @onSelected="onAssistProcessSelect">
</assistProcessSelect>
</el-col>
<el-col v-if="form.feedbackType == 'ASSIST_PROCESS'" :span="8">
<el-form-item label="是否关单" prop="closeType">
......@@ -203,23 +130,28 @@
<el-radio :label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<assistProcessSelect v-if="open" ref="assistProcessSelect" @onSelected="onAssistProcessSelect"></assistProcessSelect>
<assistProcessSelect v-if="open" ref="assistProcessSelect" @onSelected="onAssistProcessSelect">
</assistProcessSelect>
</el-col>
<el-col :span="8">
<el-form-item label="生产工单" prop="workorderCode">
<el-input :disabled="form.feedbackType == 'ASSIST_PROCESS'" v-model="form.workorderCode" placeholder="请选择生产工单" >
<el-button :disabled="form.feedbackType == 'ASSIST_PROCESS'" slot="append" icon="el-icon-search" @click="handleWorkorderSelect"></el-button>
<el-input :disabled="form.feedbackType == 'ASSIST_PROCESS'" v-model="form.workorderCode"
placeholder="请选择生产工单">
<el-button :disabled="form.feedbackType == 'ASSIST_PROCESS'" slot="append" icon="el-icon-search"
@click="handleWorkorderSelect"></el-button>
</el-input>
</el-form-item>
<WorkorderSelect v-if="open" ref="woSelect" @onSelected="onWorkorderSelected"></WorkorderSelect>
</el-col>
<el-col :span="8">
<el-form-item label="生产任务" prop="taskCode">
<el-input :disabled="form.feedbackType == 'ASSIST_PROCESS'" v-model="form.taskCode" placeholder="请选择生产任务" >
<el-button :disabled="form.feedbackType == 'ASSIST_PROCESS'" slot="append" icon="el-icon-search" @click="handleTaskSelect"></el-button>
<el-input :disabled="form.feedbackType == 'ASSIST_PROCESS'" v-model="form.taskCode" placeholder="请选择生产任务">
<el-button :disabled="form.feedbackType == 'ASSIST_PROCESS'" slot="append" icon="el-icon-search"
@click="handleTaskSelect"></el-button>
</el-input>
</el-form-item>
<ProtaskSelect v-if="open" ref="taskSelect" :workorderId="form.workorderId" @onSelected="onTaskSelected"> </ProtaskSelect>
<ProtaskSelect v-if="open" ref="taskSelect" :workorderId="form.workorderId" @onSelected="onTaskSelected">
</ProtaskSelect>
</el-col>
</el-row>
<el-row>
......@@ -254,12 +186,14 @@
</el-col>
<el-col :span="8">
<el-form-item label="良品报工" prop="quantityQualify">
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityQualify" placeholder="请输入良品报工" />
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityQualify"
placeholder="请输入良品报工" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不良品报工" prop="quantityUnqualify">
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityUnqualify" placeholder="请输入不良品报工" />
<el-input-number :min="0" @change="handleQuantityChanged" v-model="form.quantityUnqualify"
placeholder="请输入不良品报工" />
</el-form-item>
</el-col>
</el-row>
......@@ -273,7 +207,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="报工人" prop="nickName">
<el-input v-model="form.nickName" placeholder="请选择报工人" >
<el-input v-model="form.nickName" placeholder="请选择报工人">
<el-button slot="append" @click="handleUserSelect" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
......@@ -281,17 +215,14 @@
</el-col>
<el-col :span="8">
<el-form-item label="报工时间" prop="feedbackTime">
<el-date-picker clearable
v-model="form.feedbackTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
<el-date-picker clearable v-model="form.feedbackTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择报工时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="审核人" prop="recordNick">
<el-input v-model="form.recordNick" placeholder="请选择审核人" >
<el-input v-model="form.recordNick" placeholder="请选择审核人">
<el-button slot="append" @click="handleUser2Select" icon="el-icon-search"></el-button>
</el-input>
</el-form-item>
......@@ -307,8 +238,8 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view'">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="optType !='view' ">保 存</el-button>
<el-button type="primary" @click="cancel" v-if="optType == 'view'">返回</el-button>
<el-button type="primary" @click="submitForm" v-if="optType != 'view'">保 存</el-button>
<!-- <el-button type="primary" @click="handleSubmit" v-if="form.status =='PREPARE' && optType !='view' && form.recordId !=null ">提交审批</el-button>
<el-button type="success" @click="handleExecute" v-if="form.status =='APPROVING' && form.recordId !=null">审批通过</el-button>
<el-button type="danger" @click="handleReject" v-if="form.status =='APPROVING' && form.recordId !=null">审批不通过</el-button> -->
......@@ -319,16 +250,17 @@
</template>
<script>
import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback, execute } from "@/api/mes/pro/feedback";
import { listFeedback, getFeedback, delFeedback, addFeedback, updateFeedback, execute, listNextProcess } from "@/api/mes/pro/feedback";
import WorkorderSelect from "@/components/workorderSelect/single.vue"
import WorkstationSelect from "@/components/workstationSelect/simpletableSingle.vue"
import UserSingleSelect from "@/components/userSelect/single.vue"
import ProtaskSelect from "@/components/TaskSelect/taskSelectSingle.vue"
import assistProcessSelect from "./components/assistProcessSelect.vue"
import { postPrintPdf } from '@/utils/ruoyi'
import dayjs from 'dayjs'
export default {
name: "Feedback",
components: {WorkorderSelect,WorkstationSelect,UserSingleSelect,ProtaskSelect,assistProcessSelect},
components: { WorkorderSelect, WorkstationSelect, UserSingleSelect, ProtaskSelect, assistProcessSelect },
dicts: ['mes_order_status', 'mes_feedback_type'],
data() {
return {
......@@ -347,6 +279,8 @@ export default {
total: 0,
// 生产报工记录表格数据
feedbackList: [],
selectRow: [],
// 弹出层标题
title: "",
// 是否显示弹出层
......@@ -404,10 +338,10 @@ export default {
{ required: true, message: "是否关单不能为空", trigger: ['blur', 'change'] }
],
nickName: [
{ required: true, message: "请选择报工人", trigger: ['blur', 'change']}
{ required: true, message: "请选择报工人", trigger: ['blur', 'change'] }
],
feedbackTime: [
{ required: true, message: "请选择报工时间", trigger: "blur"}
{ required: true, message: "请选择报工时间", trigger: "blur" }
]
}
};
......@@ -417,8 +351,8 @@ export default {
},
methods: {
getSumNumber(row) {
const first = row.quantityQualify? Number(row.quantityQualify): 0
const last = row.quantityUnqualify? Number(row.quantityUnqualify): 0
const first = row.quantityQualify ? Number(row.quantityQualify) : 0
const last = row.quantityUnqualify ? Number(row.quantityUnqualify) : 0
return first + last
},
/** 查询生产报工记录列表 */
......@@ -491,7 +425,7 @@ export default {
};
this.resetForm("form");
},
handleQuantityChanged(){
handleQuantityChanged() {
this.form.quantityFeedback = this.form.quantityQualify + this.form.quantityUnqualify;
},
/** 搜索按钮操作 */
......@@ -507,7 +441,8 @@ export default {
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.recordId)
this.single = selection.length!==1
this.selectRow = selection
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
......@@ -523,7 +458,7 @@ export default {
const recordId = row.recordId || this.ids
getFeedback(recordId).then(response => {
this.form = response.data;
if(dayjs(response.data.feedbackTime, 'YYYY-MM-DD', true).isValid()){
if (dayjs(response.data.feedbackTime, 'YYYY-MM-DD', true).isValid()) {
this.form.feedbackTime = response.data.feedbackTime + ' 00:00:00'
}
this.open = true;
......@@ -532,12 +467,12 @@ export default {
});
},
// 查询明细按钮操作
handleView(row){
handleView(row) {
this.reset();
const recordId = row.recordId || this.ids;
getFeedback(recordId).then(response => {
this.form = response.data;
if(dayjs(response.data.feedbackTime, 'YYYY-MM-DD', true).isValid()){
if (dayjs(response.data.feedbackTime, 'YYYY-MM-DD', true).isValid()) {
this.form.feedbackTime = response.data.feedbackTime + ' 00:00:00'
}
this.open = true;
......@@ -552,21 +487,21 @@ export default {
if (this.form.recordId != null) {
updateFeedback(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open=false;
this.open = false;
this.getList();
});
} else {
addFeedback(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open=false;
this.open = false;
this.getList();
});
}
}
});
},
handleSubmit(){
handleSubmit() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.status = "APPROVING";
......@@ -581,18 +516,18 @@ export default {
});
},
//审批通过执行
handleExecute(){
handleExecute() {
const recordIds = this.form.recordId;
this.$modal.confirm('确认执行报工？').then(function() {
this.$modal.confirm('确认执行报工？').then(function () {
return execute(recordIds)//执行报工
}).then(() => {
this.getList();
this.$modal.msgSuccess("执行成功");
this.open = false;
}).catch(() => {});
}).catch(() => { });
},
//审批不通过，拒绝
handleReject(){
handleReject() {
this.form.status = "PREPARE";
if (this.form.recordId != null) {
updateFeedback(this.form).then(response => {
......@@ -605,13 +540,50 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const recordIds = row.recordId || this.ids;
this.$modal.confirm('是否确认删除生产报工记录编号为"' + recordIds + '"的数据项？').then(function() {
this.$modal.confirm('是否确认删除生产报工记录编号为"' + recordIds + '"的数据项？').then(function () {
return delFeedback(recordIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}).catch(() => { });
},
/** 二维码打印 */
handleQrcode() {
let workunitName = '';
let detail = []
if(this.selectRow.some(v => v.qrcode!=null)){
this.$message.warning('该数据是包装工序的报工，不能打印二维码')
return
}
this.selectRow.forEach((s, i) => {
listNextProcess({ taskId: s.taskId }).then(workunit => {
workunitName = workunit.data.workunitName;
detail.push({
"barcode": s.workorderCode,
"showText": '编排单号' + s.arrangeCode + '\n工单号' + s.workorderCode + '\n数量' + s.quantityQualify + '\n下道工序机台:' + workunitName,
"gp": i + 1
})
detail.push({
"barcode": s.workorderCode,
"showText": '编排单号' + s.arrangeCode + '\n工单号' + s.workorderCode + '\n数量' + s.quantityQualify + '\n下道工序机台:' + workunitName,
"gp": i + 1
})
postPrintPdf(
"qrcode-50*50-2",
{
detail
}
);
});
});
},
/** 导出按钮操作 */
handleExport() {
this.download('pro/feedback/export', {
......@@ -619,11 +591,11 @@ export default {
}, `feedback_${new Date().getTime()}.xlsx`)
},
//选择生产工单
handleWorkorderSelect(){
handleWorkorderSelect() {
this.$refs.woSelect.showFlag = true;
},
onWorkorderSelected(row){
if(row != undefined && row != null){
onWorkorderSelected(row) {
if (row != undefined && row != null) {
this.form.workorderId = row.workorderId;
this.form.workorderCode = row.workorderCode;
this.form.workorderName = row.workorderName;
......@@ -635,7 +607,7 @@ export default {
}
},
onAssistProcessSelect(row) {
if (row != undefined && row != null){
if (row != undefined && row != null) {
this.form.workorderId = row.workorderId;
this.form.workorderCode = row.workorderCode;
this.form.taskId = row.taskId;
......@@ -643,13 +615,13 @@ export default {
this.form.assistProcessCode = row.assistProcessCode;
}
},
handleTaskSelect(){
handleTaskSelect() {
this.$refs.taskSelect.showFlag = true;
this.$refs.taskSelect.getList();
},
onTaskSelected(row){
onTaskSelected(row) {
debugger;
if(row != undefined && row != null){
if (row != undefined && row != null) {
this.form.taskId = row.taskId;
this.form.taskCode = row.taskCode;
this.form.taskName = row.taskName;
......@@ -662,31 +634,31 @@ export default {
this.form.routeId = row.routeId;
this.form.routeCode = row.routeCode;
this.form.isCheck = row.isCheck;
if(row.isCheck == 'N'){
if (row.isCheck == 'N') {
this.form.quantityUncheck = 0;
}else {
this.form.quantityQualify =0;
} else {
this.form.quantityQualify = 0;
this.form.quantityUnqualify = 0;
}
}
},
//点击人员选择按钮
handleUserSelect(){
this.$refs.userSelect.showFlag = true;
handleUserSelect() {
this.$refs.userSelect.showFlag = true;
},
//人员选择返回
onUserSelected(row){
this.form.nickName = row.nickName;
this.form.userName = row.userName;
onUserSelected(row) {
this.form.nickName = row.nickName;
this.form.userName = row.userName;
},
//点击人员选择按钮
handleUser2Select(){
this.$refs.user2Select.showFlag = true;
handleUser2Select() {
this.$refs.user2Select.showFlag = true;
},
//人员选择返回
onUser2Selected(row){
this.form.recordUser = row.userName;
this.form.recordNick = row.nickName;
onUser2Selected(row) {
this.form.recordUser = row.userName;
this.form.recordNick = row.nickName;
},
}
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment