|
|
@ -120,17 +120,7 @@ |
|
|
:min-width="item.columnWidth" |
|
|
:min-width="item.columnWidth" |
|
|
:label="item.columnLabel"> |
|
|
:label="item.columnLabel"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<div v-if="item.columnProp === 'testResultStatus'"> |
|
|
|
|
|
<span v-if="!item.columnHidden"> |
|
|
|
|
|
<span v-show="scope.row.testResultStatus === 'B'">草稿</span> |
|
|
|
|
|
<span v-show="scope.row.testResultStatus === 'C'">已下达</span> |
|
|
|
|
|
<span v-show="scope.row.testResultStatus === 'E'">已完成测试</span> |
|
|
|
|
|
<span v-show="scope.row.testResultStatus === 'S'">已提交测试</span> |
|
|
|
|
|
<span v-show="scope.row.testResultStatus === 'R'">客户已反馈</span> |
|
|
|
|
|
</span> |
|
|
|
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div v-else> |
|
|
|
|
|
|
|
|
<div> |
|
|
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|
|
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span> |
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span> |
|
|
</div> |
|
|
</div> |
|
|
@ -143,7 +133,7 @@ |
|
|
width="100" |
|
|
width="100" |
|
|
label="操作"> |
|
|
label="操作"> |
|
|
<template slot-scope="scope"> |
|
|
<template slot-scope="scope"> |
|
|
<a type="text" size="small" style="cursor:pointer;" @click="updateModal(scope.row)">编辑</a> |
|
|
|
|
|
|
|
|
<a type="text" size="small" style="cursor:pointer;" v-if="scope.row.testStatus !== '已完成'" @click="updateModal(scope.row)">编辑</a> |
|
|
<a type="text" size="small" style="cursor:pointer;" v-if="scope.row.testResultStatus === 'B'" @click="updateModalStatus(scope.row,'C')">下达</a> |
|
|
<a type="text" size="small" style="cursor:pointer;" v-if="scope.row.testResultStatus === 'B'" @click="updateModalStatus(scope.row,'C')">下达</a> |
|
|
</template> |
|
|
</template> |
|
|
</el-table-column> |
|
|
</el-table-column> |
|
|
@ -252,7 +242,7 @@ |
|
|
<el-col :span="10"> |
|
|
<el-col :span="10"> |
|
|
<el-form-item prop="testPartNo" label="物料编码"> |
|
|
<el-form-item prop="testPartNo" label="物料编码"> |
|
|
<span slot="label" v-if="modalData.projectId && modalData.flag === '1'" @click="projectPartModelFlag = true"><a herf="#">物料编码</a></span> |
|
|
<span slot="label" v-if="modalData.projectId && modalData.flag === '1'" @click="projectPartModelFlag = true"><a herf="#">物料编码</a></span> |
|
|
<el-input :disabled="!modalData.projectId || modalData.flag !== '1'" v-model="modalData.testPartNo"></el-input> |
|
|
|
|
|
|
|
|
<el-input :disabled="!modalData.projectId || modalData.flag !== '1'" v-model="modalData.testPartNo" @blur="handleQueryProjectPart"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="14"> |
|
|
<el-col :span="14"> |
|
|
@ -447,7 +437,7 @@ |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="4"> |
|
|
<el-col :span="4"> |
|
|
<el-form-item label=" "> |
|
|
<el-form-item label=" "> |
|
|
<el-button type="primary" @click="getProjectPartList()">查询</el-button> |
|
|
|
|
|
|
|
|
<el-button type="primary" @click="getProjectPartList">查询</el-button> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
</el-row> |
|
|
</el-row> |
|
|
@ -1168,7 +1158,7 @@ |
|
|
import {getTestPropertiesList,searchTestPropertiesItem} from "../../../api/test/testProperties"; |
|
|
import {getTestPropertiesList,searchTestPropertiesItem} from "../../../api/test/testProperties"; |
|
|
import TestFile from "./file/testFile.vue"; |
|
|
import TestFile from "./file/testFile.vue"; |
|
|
import {queryCustomer} from "../../../api/customer/customerInformation"; |
|
|
import {queryCustomer} from "../../../api/customer/customerInformation"; |
|
|
import {queryProjectByCustomer} from "../../../api/project/project"; |
|
|
|
|
|
|
|
|
import {queryProjectByCustomer, queryProjectPart} from "../../../api/project/project"; |
|
|
export default { |
|
|
export default { |
|
|
computed: { |
|
|
computed: { |
|
|
testInformationFlag () { |
|
|
testInformationFlag () { |
|
|
@ -3663,6 +3653,26 @@ |
|
|
this.$message.error(error) |
|
|
this.$message.error(error) |
|
|
}) |
|
|
}) |
|
|
}, |
|
|
}, |
|
|
|
|
|
handleQueryProjectPart(){ |
|
|
|
|
|
let params = { |
|
|
|
|
|
site:this.$store.state.user.site, |
|
|
|
|
|
projectId:this.modalData.projectId, |
|
|
|
|
|
testPartNo:this.modalData.testPartNo |
|
|
|
|
|
} |
|
|
|
|
|
queryProjectPart(params).then(({data})=>{ |
|
|
|
|
|
if (data && data.code === 0 ){ |
|
|
|
|
|
if (data.rows && data.rows.length === 1){ |
|
|
|
|
|
this.modalData.partName = data.rows[0].partDesc |
|
|
|
|
|
}else { |
|
|
|
|
|
this.modalData.partName = '' |
|
|
|
|
|
} |
|
|
|
|
|
}else { |
|
|
|
|
|
this.$message.warning(data.msg) |
|
|
|
|
|
} |
|
|
|
|
|
}).catch((error)=>{ |
|
|
|
|
|
this.$message.error(error) |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
</script> |
|
|
</script> |
|
|
|