|
|
|
@ -192,8 +192,7 @@ |
|
|
|
</el-pagination> |
|
|
|
|
|
|
|
<!-- 测试模态框 --> |
|
|
|
<el-dialog :title="modalData.title" @close="closeModalDiaLog" :close-on-click-modal="false" v-drag |
|
|
|
:visible.sync="modalFlag" top="10vh" width="60%"> |
|
|
|
<el-dialog :title="modalData.title" @close="closeModalDiaLog" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" top="10vh" width="60%"> |
|
|
|
<el-form label-position="top" ref="modalForm" :model="modalData" :rules="rules"> |
|
|
|
<el-row :gutter="15"> |
|
|
|
<el-col :span="8"> |
|
|
|
@ -360,7 +359,11 @@ |
|
|
|
</el-row> |
|
|
|
<el-row :gutter="15"> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-form-item label="备注" style="height: 90px"> |
|
|
|
<el-form-item style="height: 90px"> |
|
|
|
<template slot="label"> |
|
|
|
<span>备注</span> |
|
|
|
<el-button v-if="isAuth('107001:dataEntry')" style="margin-left: 6px;width: 70px;line-height: 0.6;font-size: 11px;" type="primary" @click="handleDataEntry">数据录入</el-button> |
|
|
|
</template> |
|
|
|
<el-input type="textarea" |
|
|
|
:disabled="(testInformationFlag('technicalConsiderations') === 'N' && modalData.flag === '2') || detailFlag" |
|
|
|
v-model="modalData.technicalConsiderations" :rows="3" resize='none' show-word-limit></el-input> |
|
|
|
@ -369,14 +372,13 @@ |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<div class="rq"> |
|
|
|
<el-button v-if="!modalData.testNo" @click="saveData" plain type="primary" style="position:absolute;margin-top: 10px;margin-right: 10px;right: 0;z-index: 1">下一步 |
|
|
|
</el-button> |
|
|
|
<el-button v-if="!modalData.testNo" @click="saveData" plain type="primary" style="position:absolute;margin-top: 10px;margin-right: 10px;right: 0;z-index: 1">下一步</el-button> |
|
|
|
<el-tabs v-model="activeTab" @tab-click="dialogTabClick"> |
|
|
|
<el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute" v-if="modalData.testNo"> |
|
|
|
<test-properties v-if="modalFlag" :disabled="detailFlag" v-model:data-list="testPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties> |
|
|
|
<test-properties :test-status="modalData.testStatus" v-if="modalFlag" :disabled="detailFlag" v-model:data-list="testPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="基本信息" :disabled="!activeTabList.includes('attribute')" name="attribute" v-else> |
|
|
|
<test-properties v-if="modalFlag" :disabled="detailFlag" v-model:data-list="copyTestPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties> |
|
|
|
<test-properties :test-status="modalData.testStatus" v-if="modalFlag" :disabled="detailFlag" v-model:data-list="copyTestPropertiesList" height="32vh" ref="dialogTestAttribute" :test-no="modalData.testNo"></test-properties> |
|
|
|
</el-tab-pane> |
|
|
|
<el-tab-pane label="物料属性" :disabled="!activeTabList.includes('partAttribute')" name="partAttribute"> |
|
|
|
<el-table |
|
|
|
@ -938,6 +940,21 @@ |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-dialog width="850px" top="25vh" title="数据录入" :close-on-click-modal="false" :visible.sync="dataEntryFlag" v-highlight-container> |
|
|
|
<el-form label-position="top"> |
|
|
|
<el-form-item label="备注" class="auto-form"> |
|
|
|
<el-input type="textarea" v-model="dataEntryForm.technicalConsiderations" :rows="3" resize='none'></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<span slot="footer" class="dialog-footer"> |
|
|
|
<div style="height:25px;margin-top: 45px"> |
|
|
|
<el-button type="primary" @click="refresh1()">刷新</el-button> |
|
|
|
<el-button type="primary" @click="submitDataEntry()">保存</el-button> |
|
|
|
<el-button @click="dataEntryFlag = false" type="primary">取消</el-button> |
|
|
|
</div> |
|
|
|
</span> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 上传文件的modal --> |
|
|
|
<test-upload-file ref="testUploadFile" @refreshPageTables="getFileContentData()" v-drag></test-upload-file> |
|
|
|
|
|
|
|
@ -963,6 +980,8 @@ import { |
|
|
|
getCustomerInformation, // 获取客户信息 |
|
|
|
submitChange, // 提交 |
|
|
|
testInformationEditStatus, // 下达 |
|
|
|
testInfoEditEntry, |
|
|
|
getTestRemarkEntry, |
|
|
|
} from '@/api/test/testInformation.js' |
|
|
|
import { |
|
|
|
getNodeAuthority, // 获取节点权限 |
|
|
|
@ -2346,6 +2365,10 @@ export default { |
|
|
|
partPageSize: 20, |
|
|
|
partPageTotal: 0, |
|
|
|
superAdmin: false, |
|
|
|
dataEntryForm: { |
|
|
|
technicalConsiderations: '', |
|
|
|
}, |
|
|
|
dataEntryFlag: false, |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
@ -2372,6 +2395,45 @@ export default { |
|
|
|
|
|
|
|
methods: { |
|
|
|
|
|
|
|
// 数据录入 |
|
|
|
handleDataEntry () { |
|
|
|
this.dataEntryForm.technicalConsiderations = this.modalData.technicalConsiderations |
|
|
|
this.dataEntryFlag = true |
|
|
|
}, |
|
|
|
|
|
|
|
// 刷新 |
|
|
|
refresh1 () { |
|
|
|
let tempData = { |
|
|
|
site: this.modalData.site, |
|
|
|
testNo: this.modalData.testNo |
|
|
|
} |
|
|
|
getTestRemarkEntry(tempData).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.dataEntryForm.technicalConsiderations = data.row.technicalConsiderations |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 保存 |
|
|
|
submitDataEntry () { |
|
|
|
let params = { |
|
|
|
site: this.modalData.site, |
|
|
|
testNo: this.modalData.testNo, |
|
|
|
technicalConsiderations: this.dataEntryForm.technicalConsiderations, |
|
|
|
updateBy: this.$store.state.user.name, |
|
|
|
} |
|
|
|
testInfoEditEntry(params).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.getDataList() |
|
|
|
this.modalData.technicalConsiderations = this.dataEntryForm.technicalConsiderations |
|
|
|
this.$message.success( '操作成功') |
|
|
|
this.dataEntryFlag = false |
|
|
|
} else { |
|
|
|
this.$message.error(data.msg) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
fetchNodeOptions() { |
|
|
|
getNodeList(this.searchData).then(({ data }) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
|
fengyuan_yang
6 months ago