|
|
|
|
@ -27,67 +27,50 @@ |
|
|
|
|
</template> |
|
|
|
|
<template #menu="scope"> |
|
|
|
|
<el-button type="text" @click="handleView(scope.row, 'view')">详情</el-button> |
|
|
|
|
<el-button type="text" @click="issueRow(scope.row, 'add')" v-show="scope.row.trStatus == 1"> |
|
|
|
|
<el-button type="text" @click="issueRow(scope.row, 'add')" v-show="scope.row.status == 1"> |
|
|
|
|
下发 |
|
|
|
|
</el-button> |
|
|
|
|
<el-button |
|
|
|
|
type="text" |
|
|
|
|
v-show="scope.row.trStatus == 3 || scope.row.trStatus == 4" |
|
|
|
|
v-show="scope.row.status == 3" |
|
|
|
|
@click="handleWrite(scope.row, 'drug')" |
|
|
|
|
>填报</el-button |
|
|
|
|
> |
|
|
|
|
<el-button |
|
|
|
|
type="text" |
|
|
|
|
v-show="scope.row.trStatus == 2" |
|
|
|
|
v-show="scope.row.status == 2" |
|
|
|
|
@click="handleReceive(scope.row, 'check')" |
|
|
|
|
>接收</el-button |
|
|
|
|
> |
|
|
|
|
<!-- <el-button type="text" v-show="scope.row.trStatus == 5" @click="handleReport(scope.row,'check')">报告</el-button> --> |
|
|
|
|
</template> |
|
|
|
|
<template #tpId="{ row }"> |
|
|
|
|
{{ row.textProject.tpProject }} |
|
|
|
|
</template> |
|
|
|
|
<template #tpCondition="{ row }"> |
|
|
|
|
{{ row.textProject.tpCondition }} |
|
|
|
|
</template> |
|
|
|
|
<template #tpStandard="{ row }"> |
|
|
|
|
{{ row.textProject.tpStandard }} |
|
|
|
|
</template> |
|
|
|
|
<template #craftMan="{ row }"> |
|
|
|
|
{{ row.craftMan.userName }} |
|
|
|
|
</template> |
|
|
|
|
<template #mecMan="{ row }"> |
|
|
|
|
{{ row.mecMan.userName }} |
|
|
|
|
</template> |
|
|
|
|
<template #expirationDays="{ row }"> |
|
|
|
|
<template #countDayToPlanedFinish="{ row }"> |
|
|
|
|
<div |
|
|
|
|
:style="{ |
|
|
|
|
width: '100%', |
|
|
|
|
height: '49px', |
|
|
|
|
lineHeight: '49px', |
|
|
|
|
background: |
|
|
|
|
row.expirationDays === 0 |
|
|
|
|
row.countDayToPlanedFinish === 0 |
|
|
|
|
? '#ff0000' |
|
|
|
|
: row.expirationDays >= 7 |
|
|
|
|
: row.countDayToPlanedFinish >= 7 |
|
|
|
|
? '#fffd00' |
|
|
|
|
: row.expirationDays > 0 && row.expirationDays <= 3 |
|
|
|
|
: row.countDayToPlanedFinish > 0 && row.countDayToPlanedFinish <= 3 |
|
|
|
|
? '#ffad00' |
|
|
|
|
: '#fff', |
|
|
|
|
}" |
|
|
|
|
> |
|
|
|
|
{{ row.expirationDays }} |
|
|
|
|
{{ row.countDayToPlanedFinish }} |
|
|
|
|
</div> |
|
|
|
|
</template> |
|
|
|
|
</avue-crud> |
|
|
|
|
<el-dialog append-to-body title="任务下发" v-model="issueDialog" width="550px"> |
|
|
|
|
<el-form ref="issueForm" :model="issueForm" label-width="80px" :rules="formRules"> |
|
|
|
|
<el-form-item label="工艺员" prop="userId"> |
|
|
|
|
<el-select v-model="issueForm.userId"> |
|
|
|
|
<el-form-item label="工艺员" prop="processUserId"> |
|
|
|
|
<el-select v-model="issueForm.processUserId"> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in userData" |
|
|
|
|
:key="item.userId" |
|
|
|
|
:label="item.userName" |
|
|
|
|
:value="item.userId" |
|
|
|
|
:key="item.id" :label="item.name" :value="item.id" |
|
|
|
|
></el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
@ -101,26 +84,27 @@ |
|
|
|
|
</el-dialog> |
|
|
|
|
<el-dialog append-to-body title="试验填报" v-model="writeDialog" width="550px"> |
|
|
|
|
<el-form ref="writeForm" :model="writeForm" label-width="120" :rules="writeRules"> |
|
|
|
|
<el-form-item label="是否进行试验" prop="isTest"> |
|
|
|
|
<el-radio-group v-model="writeForm.isTest"> |
|
|
|
|
<el-form-item label="是否进行试验" prop="isDone"> |
|
|
|
|
<el-radio-group v-model="writeForm.isDone"> |
|
|
|
|
<el-radio :label="1">是</el-radio> |
|
|
|
|
<el-radio :label="0">否</el-radio> |
|
|
|
|
<el-radio :label="2">否</el-radio> |
|
|
|
|
</el-radio-group> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="试验时间" prop="testTime"> |
|
|
|
|
<el-date-picker v-model="writeForm.testTime" type="date" placeholder="请选择试验时间"> |
|
|
|
|
<el-form-item label="试验时间" prop="testDate" v-if="writeForm.isDone == 1"> |
|
|
|
|
<el-date-picker v-model="writeForm.testDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="date" placeholder="请选择试验时间"> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="试验结果" prop="testResult"> |
|
|
|
|
<el-form-item label="试验结果" prop="testResult" v-if="writeForm.isDone == 1"> |
|
|
|
|
<el-upload |
|
|
|
|
class="upload-demo" |
|
|
|
|
action="https://jsonplaceholder.typicode.com/posts/" |
|
|
|
|
action="/api/blade-resource/oss/endpoint/put-file-attach" |
|
|
|
|
:on-success="handleSuccess" |
|
|
|
|
:on-remove="handleRemove" |
|
|
|
|
multiple |
|
|
|
|
:limit="3" |
|
|
|
|
:limit="1" |
|
|
|
|
:on-exceed="handleExceed" |
|
|
|
|
:file-list="fileList" |
|
|
|
|
accept=".rar,.zip,.doc,.docx,.pdf,.jpg" |
|
|
|
|
> |
|
|
|
|
<div> |
|
|
|
|
<el-button type="primary">点击上传</el-button> |
|
|
|
|
@ -130,6 +114,9 @@ |
|
|
|
|
</div> |
|
|
|
|
</el-upload> |
|
|
|
|
</el-form-item> |
|
|
|
|
<el-form-item label="未试验原因" prop="reasonForNo" v-if="writeForm.isDone == 2"> |
|
|
|
|
<el-input type="textarea" v-model="writeForm.reasonForNo" placeholder="请填写未试验原因"></el-input> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
<template #footer> |
|
|
|
|
<span class="dialog-footer"> |
|
|
|
|
@ -150,15 +137,15 @@ |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import viewDialog from './components/viewDialog.vue'; |
|
|
|
|
import { getList, remove } from '@/api/qualityManagement/periodicTesting/projectCycle.js'; |
|
|
|
|
import { getList, remove,issueTask,acceptTask,issueAllTask,writeTask } from '@/api/qualityManagement/periodicTesting/testTask.js'; |
|
|
|
|
import { getUserList} from '@/api/qualityManagement/periodicTesting/projectCycle.js'; |
|
|
|
|
|
|
|
|
|
export default { |
|
|
|
|
components: { |
|
|
|
|
viewDialog, |
|
|
|
|
}, |
|
|
|
|
data() { |
|
|
|
|
var checkFile = (rule, value, callback) => { |
|
|
|
|
console.log('form----------------', this.writeForm); |
|
|
|
|
console.log('form----------------', this.fileList); |
|
|
|
|
if (this.fileList.length == 0) { |
|
|
|
|
return callback(new Error('请上传文件')); |
|
|
|
|
} else { |
|
|
|
|
@ -174,55 +161,22 @@ export default { |
|
|
|
|
}, |
|
|
|
|
viewDialog: false, |
|
|
|
|
fileList: [], |
|
|
|
|
writeForm: {}, |
|
|
|
|
writeRules: { |
|
|
|
|
isTest: [{ required: true, message: '请选择是否进行试验', trigger: 'blur' }], |
|
|
|
|
testTime: [{ required: true, message: '请选择试验时间', trigger: 'blur' }], |
|
|
|
|
testResult: [{ validator: checkFile, trigger: 'blur' }], |
|
|
|
|
writeForm: { |
|
|
|
|
}, |
|
|
|
|
// writeRules: { |
|
|
|
|
// isDone: [{ required: true, message: '请选择是否进行试验', trigger: 'blur' }], |
|
|
|
|
// testDate: [{ required: true, message: '请选择试验时间', trigger: 'blur' }], |
|
|
|
|
// testResult: [{ validator: checkFile, trigger: 'blur' }], |
|
|
|
|
// }, |
|
|
|
|
showDialog: false, |
|
|
|
|
rowId: '', |
|
|
|
|
rowObj: {}, |
|
|
|
|
issueDialog: false, |
|
|
|
|
form: {}, |
|
|
|
|
formRules: { |
|
|
|
|
userId: [{ required: true, message: '请选择检测员', trigger: 'blur' }], |
|
|
|
|
processUserId: [{ required: true, message: '请选择工艺员', trigger: 'blur' }], |
|
|
|
|
}, |
|
|
|
|
userData: [ |
|
|
|
|
{ |
|
|
|
|
jobName: '软件工程师', |
|
|
|
|
deptName: 'MES开发部', |
|
|
|
|
ldapName: null, |
|
|
|
|
userSex: 1, |
|
|
|
|
deptId: 1, |
|
|
|
|
mobile: null, |
|
|
|
|
userName: '测试', |
|
|
|
|
userId: 521, |
|
|
|
|
userCode: '0001', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
jobName: null, |
|
|
|
|
deptName: 'MES开发部', |
|
|
|
|
ldapName: 'jinna', |
|
|
|
|
userSex: 2, |
|
|
|
|
deptId: 1, |
|
|
|
|
mobile: null, |
|
|
|
|
userName: '靳娜', |
|
|
|
|
userId: 21, |
|
|
|
|
userCode: 'jinna', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
jobName: null, |
|
|
|
|
deptName: 'MES开发部', |
|
|
|
|
ldapName: 'zd001', |
|
|
|
|
userSex: 1, |
|
|
|
|
deptId: 1, |
|
|
|
|
mobile: null, |
|
|
|
|
userName: '张迪', |
|
|
|
|
userId: 601, |
|
|
|
|
userCode: 'zd001', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
userData: [], |
|
|
|
|
writeDialog: false, |
|
|
|
|
query: {}, |
|
|
|
|
loading: true, |
|
|
|
|
@ -268,9 +222,23 @@ export default { |
|
|
|
|
gridBtn: false, |
|
|
|
|
searchMenuPosition: 'right', |
|
|
|
|
column: [ |
|
|
|
|
// [ |
|
|
|
|
// {"label": "任务编号",prop:"code"}, |
|
|
|
|
// {"label": "试验项目",prop:"cycleTestItemName"}, |
|
|
|
|
// {"label": "试验条件",prop:"cycleTestItemCondition"}, |
|
|
|
|
// {"label": "试验标准",prop:"cycleTestItemStandard"}, |
|
|
|
|
// {"label": "试验件",prop:"testType"}, |
|
|
|
|
// {"label": "工艺员",prop:"processUserName"}, |
|
|
|
|
// {"label": "状态",prop:""}, |
|
|
|
|
// {"label": "临期天数",prop:"remind"}, |
|
|
|
|
// {"label": "任务生成时间",prop:""}, |
|
|
|
|
// {"label": "任务下发时间",prop:""}, |
|
|
|
|
// {"label": "任务接成时间",prop:""}, |
|
|
|
|
// {"label": "任务完成时间",prop:""}, |
|
|
|
|
// ] |
|
|
|
|
{ |
|
|
|
|
label: '任务编号', |
|
|
|
|
prop: 'trNum', |
|
|
|
|
prop: 'code', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
@ -289,44 +257,68 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验项目', |
|
|
|
|
prop: 'tpId', |
|
|
|
|
sortable: true, |
|
|
|
|
prop: 'cycleTestItemId', |
|
|
|
|
search: true, |
|
|
|
|
hide:true, |
|
|
|
|
type: 'select', |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
span: 24, |
|
|
|
|
width: 200, |
|
|
|
|
search: true, |
|
|
|
|
rules: [ |
|
|
|
|
{ |
|
|
|
|
required: true, |
|
|
|
|
message: '请输入试验项目', |
|
|
|
|
trigger: 'blur', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
props: { |
|
|
|
|
label: 'tpProject', |
|
|
|
|
value: 'tpId', |
|
|
|
|
dicUrl:'/api/blade-desk/QA/CycleTestItem/listForSelect', |
|
|
|
|
props: { label: 'name', value: 'id' }, |
|
|
|
|
dicFormatter: (res) => { |
|
|
|
|
return res.data |
|
|
|
|
}, |
|
|
|
|
dicData: [ |
|
|
|
|
{ |
|
|
|
|
deleted: false, |
|
|
|
|
keyValue: 1, |
|
|
|
|
tpCondition: '96小时', |
|
|
|
|
tpId: 1, |
|
|
|
|
tpProject: '盐雾试验', |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
deleted: false, |
|
|
|
|
keyValue: 21, |
|
|
|
|
tpCondition: '68小时', |
|
|
|
|
tpId: 21, |
|
|
|
|
tpProject: '盐雾试验1', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验项目', |
|
|
|
|
prop: 'cycleTestItemName', |
|
|
|
|
search: false, |
|
|
|
|
type: 'select', |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
width: 200, |
|
|
|
|
}, |
|
|
|
|
// { |
|
|
|
|
// label: '试验项目', |
|
|
|
|
// prop: 'tpId', |
|
|
|
|
// sortable: true, |
|
|
|
|
// type: 'select', |
|
|
|
|
// filter: true, |
|
|
|
|
// span: 24, |
|
|
|
|
// width: 200, |
|
|
|
|
// search: true, |
|
|
|
|
// rules: [ |
|
|
|
|
// { |
|
|
|
|
// required: true, |
|
|
|
|
// message: '请输入试验项目', |
|
|
|
|
// trigger: 'blur', |
|
|
|
|
// }, |
|
|
|
|
// ], |
|
|
|
|
// props: { |
|
|
|
|
// label: 'tpProject', |
|
|
|
|
// value: 'tpId', |
|
|
|
|
// }, |
|
|
|
|
// dicData: [ |
|
|
|
|
// { |
|
|
|
|
// deleted: false, |
|
|
|
|
// keyValue: 1, |
|
|
|
|
// tpCondition: '96小时', |
|
|
|
|
// tpId: 1, |
|
|
|
|
// tpProject: '盐雾试验', |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// deleted: false, |
|
|
|
|
// keyValue: 21, |
|
|
|
|
// tpCondition: '68小时', |
|
|
|
|
// tpId: 21, |
|
|
|
|
// tpProject: '盐雾试验1', |
|
|
|
|
// }, |
|
|
|
|
// ], |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
label: '试验条件', |
|
|
|
|
prop: 'tpCondition', |
|
|
|
|
prop: 'cycleTestItemCondition', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
@ -342,7 +334,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验标准', |
|
|
|
|
prop: 'tpStandard', |
|
|
|
|
prop: 'cycleTestItemStandard', |
|
|
|
|
type: 'textarea', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -359,27 +351,22 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试验件', |
|
|
|
|
prop: 'testPieceTitle', |
|
|
|
|
prop: 'testType', |
|
|
|
|
type: 'select', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
span: 24, |
|
|
|
|
width: 200, |
|
|
|
|
dicData: [ |
|
|
|
|
{ |
|
|
|
|
label: '零件', |
|
|
|
|
value: 1, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '试片', |
|
|
|
|
value: 0, |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
dicUrl:'/blade-system/dict/dictionary?code=testPiece', |
|
|
|
|
props: { label: 'dictValue', value: 'dictKey' }, |
|
|
|
|
dicFormatter: (res) => { |
|
|
|
|
return res.data |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '工艺员', |
|
|
|
|
prop: 'craftMan', |
|
|
|
|
prop: 'processUserName', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
filter: true, |
|
|
|
|
@ -406,7 +393,7 @@ export default { |
|
|
|
|
// }, |
|
|
|
|
{ |
|
|
|
|
label: '状态', |
|
|
|
|
prop: 'trStatus', |
|
|
|
|
prop: 'status', |
|
|
|
|
search: true, |
|
|
|
|
type: 'select', |
|
|
|
|
sortable: true, |
|
|
|
|
@ -422,17 +409,22 @@ export default { |
|
|
|
|
trigger: 'blur', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
dicData: [ |
|
|
|
|
{ label: '待下发', value: 1 }, |
|
|
|
|
{ label: '待接收', value: 2 }, |
|
|
|
|
{ label: '待试验', value: 3 }, |
|
|
|
|
{ label: '已超期', value: 4 }, |
|
|
|
|
{ label: '已完成', value: 5 }, |
|
|
|
|
], |
|
|
|
|
dicUrl:'/blade-system/dict/dictionary?code=CycleTestTask-Status', |
|
|
|
|
props: { label: 'dictValue', value: 'dictKey' }, |
|
|
|
|
dicFormatter: (res) => { |
|
|
|
|
return res.data |
|
|
|
|
}, |
|
|
|
|
// dicData: [ |
|
|
|
|
// { label: '待下发', value: 1 }, |
|
|
|
|
// { label: '待接收', value: 2 }, |
|
|
|
|
// { label: '待试验', value: 3 }, |
|
|
|
|
// { label: '已超期', value: 4 }, |
|
|
|
|
// { label: '已完成', value: 5 }, |
|
|
|
|
// ], |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '临期天数', |
|
|
|
|
prop: 'expirationDays', |
|
|
|
|
prop: 'countDayToPlanedFinish', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
editDisplay: false, |
|
|
|
|
@ -450,8 +442,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '任务生成时间', |
|
|
|
|
prop: 'createTime', |
|
|
|
|
|
|
|
|
|
prop: 'genDatetime', |
|
|
|
|
finishTime: '', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
@ -470,7 +461,7 @@ export default { |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '任务下发时间', |
|
|
|
|
prop: 'issueTime', |
|
|
|
|
prop: 'issueDate', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
editDisplay: false, |
|
|
|
|
@ -487,8 +478,8 @@ export default { |
|
|
|
|
], |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '任务接成时间', |
|
|
|
|
prop: 'receiveTime', |
|
|
|
|
label: '任务接收时间', |
|
|
|
|
prop: 'acceptDate', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
editDisplay: false, |
|
|
|
|
@ -499,14 +490,14 @@ export default { |
|
|
|
|
rules: [ |
|
|
|
|
{ |
|
|
|
|
required: true, |
|
|
|
|
message: '请输入任务接成时间', |
|
|
|
|
message: '请输入任务接收时间', |
|
|
|
|
trigger: 'blur', |
|
|
|
|
}, |
|
|
|
|
], |
|
|
|
|
}, |
|
|
|
|
{ |
|
|
|
|
label: '任务完成时间', |
|
|
|
|
prop: 'finishTime', |
|
|
|
|
prop: 'finishDate', |
|
|
|
|
search: false, |
|
|
|
|
sortable: true, |
|
|
|
|
editDisplay: false, |
|
|
|
|
@ -526,17 +517,51 @@ export default { |
|
|
|
|
}, |
|
|
|
|
selectionList: [], |
|
|
|
|
dialogType: '', |
|
|
|
|
issueType:'one' |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
mounted() {}, |
|
|
|
|
computed: { |
|
|
|
|
writeRules(){ |
|
|
|
|
const rules = { |
|
|
|
|
isDone: [{ required: true, message: '请选择是否进行试验', trigger: 'change' }], |
|
|
|
|
testDate:[], |
|
|
|
|
testResult:[] |
|
|
|
|
}; |
|
|
|
|
console.log('this.writeForm.isDone-------------',this.writeForm.isDone) |
|
|
|
|
if (this.writeForm.isDone == 1) { |
|
|
|
|
rules.testDate = [{ required: true, message: '请选择试验时间', trigger: 'blur' }]; |
|
|
|
|
rules.testResult = [ |
|
|
|
|
{ required: true, message: '请上传文件', trigger: 'blur' }, |
|
|
|
|
{ validator: this.checkFile, trigger: 'blur' } |
|
|
|
|
]; |
|
|
|
|
} else { |
|
|
|
|
rules.testDate = []; // 非必填 |
|
|
|
|
rules.testResult = []; // 非必填 |
|
|
|
|
} |
|
|
|
|
return rules; |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
mounted() { |
|
|
|
|
this.getUsers() |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
getUsers(){ |
|
|
|
|
getUserList('1993624442365915137').then(res =>{ |
|
|
|
|
this.userData = res.data.data |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
// 文件上传完成 |
|
|
|
|
handleSuccess(response, file, fileList) { |
|
|
|
|
this.fileList = fileList; |
|
|
|
|
this.fileList.push(response.data); |
|
|
|
|
this.writeForm.testResult = this.fileList.map(item => item.attachId).join(',') |
|
|
|
|
}, |
|
|
|
|
// 文件删除 |
|
|
|
|
handleRemove(file, fileList) { |
|
|
|
|
this.fileList = fileList; |
|
|
|
|
this.writeForm.testResult = fileList |
|
|
|
|
}, |
|
|
|
|
handleExceed(){ |
|
|
|
|
this.$message.error('试验结果最多上传一个') |
|
|
|
|
}, |
|
|
|
|
// 查看详情 |
|
|
|
|
handleView(row, type) { |
|
|
|
|
@ -561,8 +586,10 @@ export default { |
|
|
|
|
// 报告 |
|
|
|
|
handleReport() {}, |
|
|
|
|
// 填报 |
|
|
|
|
handleWrite() { |
|
|
|
|
this.writeForm = {}; |
|
|
|
|
handleWrite(row) { |
|
|
|
|
this.writeForm = { |
|
|
|
|
id:row.id, |
|
|
|
|
}; |
|
|
|
|
this.fileList = []; |
|
|
|
|
this.writeDialog = true; |
|
|
|
|
this.$refs.writeForm.resetFields(); |
|
|
|
|
@ -572,26 +599,53 @@ export default { |
|
|
|
|
if (this.selectionList.length == 0) { |
|
|
|
|
this.$message.error('请至少选择一条数据'); |
|
|
|
|
} else { |
|
|
|
|
this.issueType = 'all' |
|
|
|
|
this.issueDialog = true; |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// 单个下发 |
|
|
|
|
issueRow(row) { |
|
|
|
|
this.issueType = 'one' |
|
|
|
|
this.issueDialog = true; |
|
|
|
|
this.issueForm.id = row.id |
|
|
|
|
this.issueForm.processUserId = row.processUserId |
|
|
|
|
}, |
|
|
|
|
// 接收 |
|
|
|
|
handleReceive() { |
|
|
|
|
handleReceive(row) { |
|
|
|
|
this.$confirm('确定接收此项任务?', { |
|
|
|
|
confirmButtonText: '确定', |
|
|
|
|
cancelButtonText: '取消', |
|
|
|
|
type: 'warning', |
|
|
|
|
}).then(() => {}); |
|
|
|
|
}).then(() => { |
|
|
|
|
acceptTask({id:row.id}).then(res =>{ |
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
this.$message.success('接收成功') |
|
|
|
|
this.onLoad(this.page) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
writeSubmit() { |
|
|
|
|
this.$refs.writeForm.validate(valid => { |
|
|
|
|
console.log('valid=============================', valid); |
|
|
|
|
console.log('fileList=============================', this.fileList); |
|
|
|
|
if (valid) { |
|
|
|
|
this.writeDialog = false; |
|
|
|
|
let params ={ |
|
|
|
|
id:this.writeForm.id, |
|
|
|
|
isDone:this.writeForm.isDone, |
|
|
|
|
testDate:this.writeForm.isDone == 1 ? this.writeForm.testDate : '', |
|
|
|
|
testAttachId:this.writeForm.isDone == 1 ? this.fileList.map(item => item.attachId).join(',') : '', |
|
|
|
|
reasonForNo:this.writeForm.isDone == 2 ? this.writeForm.reasonForNo ? this.writeForm.reasonForNo : '' : '' |
|
|
|
|
} |
|
|
|
|
console.log('params==============',params) |
|
|
|
|
writeTask(params).then(res =>{ |
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
this.$message.success('填报成功') |
|
|
|
|
this.writeDialog = false; |
|
|
|
|
this.writeForm = {} |
|
|
|
|
this.onLoad(this.page) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
@ -616,7 +670,26 @@ export default { |
|
|
|
|
submit() { |
|
|
|
|
this.$refs.issueForm.validate(valid => { |
|
|
|
|
if (valid) { |
|
|
|
|
this.issueDialog = false; |
|
|
|
|
if(this.issueType == 'one'){ |
|
|
|
|
issueTask(this.issueForm).then(res =>{ |
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
this.$message.success('下发成功') |
|
|
|
|
this.issueDialog = false |
|
|
|
|
this.onLoad(this.page) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}else{ |
|
|
|
|
issueAllTask({ |
|
|
|
|
ids:this.selectionList.map(item => item.id).join(','), |
|
|
|
|
processUserId:this.issueForm.processUserId |
|
|
|
|
}).then(res =>{ |
|
|
|
|
if(res.data.code == 200){ |
|
|
|
|
this.$message.success('下发成功') |
|
|
|
|
this.issueDialog = false |
|
|
|
|
this.onLoad(this.page) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
@ -636,7 +709,7 @@ export default { |
|
|
|
|
this.data = res.data.data.records; |
|
|
|
|
|
|
|
|
|
this.loading = false; |
|
|
|
|
this.page.total = this.data.length; |
|
|
|
|
this.page.total = res.data.data.total |
|
|
|
|
// this.selectionClear(); |
|
|
|
|
}); |
|
|
|
|
}, |
|
|
|
|
|
