|
|
|
@ -249,41 +249,41 @@ |
|
|
|
layout="total, sizes, prev, pager, next, jumper"> |
|
|
|
</el-pagination> |
|
|
|
|
|
|
|
<el-dialog title="转正式料号" :visible.sync="formalPartNoFlag" width="421px" v-drag :close-on-click-modal="false"> |
|
|
|
<el-dialog title="转正式料号" :visible.sync="formalPartNoFlag" width="436px" v-drag :close-on-click-modal="false"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="客户编码" prop="customerNo" > |
|
|
|
<el-input v-model="modalData.customerNo" style="width: 110px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="客户名称" prop="customerDesc" > |
|
|
|
<el-form-item label="客户名称" style="margin-left: 15px" prop="customerDesc" > |
|
|
|
<el-input v-model="modalData.customerDesc" style="width: 260px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: 8px;"> |
|
|
|
<el-form-item label="项目编码" prop="projectNo" > |
|
|
|
<el-input v-model="modalData.projectNo" style="width: 110px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="项目名称" prop="projectDesc" > |
|
|
|
<el-form-item label="项目名称" style="margin-left: 15px" prop="projectDesc" > |
|
|
|
<el-input v-model="modalData.projectDesc" style="width: 160px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="BU" prop="bu" > |
|
|
|
<el-input v-model="modalData.bu" style="width: 86px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: 8px;"> |
|
|
|
<el-form-item label="项目料号" prop="testPartNo" > |
|
|
|
<el-input v-model="modalData.testPartNo" style="width: 110px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="料号描述" prop="partDesc" > |
|
|
|
<el-form-item label="料号描述" style="margin-left: 15px" prop="partDesc" > |
|
|
|
<el-input v-model="modalData.partDesc" style="width: 260px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: 8px;"> |
|
|
|
<el-form-item label="ERP正式料号" prop="finalPartNo" :rules="rules.finalPartNo"> |
|
|
|
<el-input v-model="modalData.finalPartNo" |
|
|
|
@blur="getFinalPartDesc()" |
|
|
|
style="width: 110px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="ERP正式料号描述" prop="finalPartDesc"> |
|
|
|
<el-form-item label="ERP正式料号描述" style="margin-left: 15px" prop="finalPartDesc"> |
|
|
|
<el-input v-model="modalData.finalPartDesc" style="width: 260px" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
@ -1010,15 +1010,15 @@ |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-dialog title="新增打样" :visible.sync="visible" v-drag width="519px" style="margin-top: 20vh" :close-on-click-modal="false"> |
|
|
|
<el-dialog title="新增打样" :visible.sync="visible" v-drag width="564px" style="margin-top: 100px" :close-on-click-modal="false"> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form-item label="项目编码" prop="projectNo" > |
|
|
|
<el-input v-model="newProofingRecordData.projectNo" style="width: 110px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="项目名称" prop="projectDesc" > |
|
|
|
<el-form-item label="项目名称" style="margin-left: 15px" prop="projectDesc" > |
|
|
|
<el-input v-model="newProofingRecordData.projectDesc" style="width: 234px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="BU" prop="bu" :rules="rules.bu"> |
|
|
|
<el-form-item label="BU" prop="bu" style="margin-left: 15px" :rules="rules.bu"> |
|
|
|
<el-select v-model="newProofingRecordData.bu" placeholder="请选择" style="width: 110px" disabled> |
|
|
|
<el-option |
|
|
|
v-for = "i in userBuList" |
|
|
|
@ -1032,23 +1032,23 @@ |
|
|
|
<!-- <el-input v-model="newProofingRecordData.bu" readonly style="width: 110px;" class="red-text"></el-input>--> |
|
|
|
<!-- </el-form-item>--> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" style="margin-left: 7px;margin-top: 8px;"> |
|
|
|
<el-form-item label="客户编码" prop="customerNo" > |
|
|
|
<el-input v-model="newProofingRecordData.customerNo" style="width: 110px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="客户名称" prop="customerDesc" > |
|
|
|
<el-input v-model="newProofingRecordData.customerDesc" style="width: 234px;" disabled></el-input> |
|
|
|
<el-form-item label="客户名称" style="margin-left: 15px" prop="customerDesc" > |
|
|
|
<el-input v-model="newProofingRecordData.customerDesc" style="width: 248px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" :rules="rules" style="margin-left: 7px;margin-top: 8px;"> |
|
|
|
<el-form-item label="项目料号" prop="testPartNo" :rules="rules.testPartNo" > |
|
|
|
<el-input v-model="newProofingRecordData.testPartNo" style="width: 110px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="料号描述" prop="partDesc" > |
|
|
|
<el-input v-model="newProofingRecordData.partDesc" style="width: 234px;" disabled></el-input> |
|
|
|
<el-form-item label="料号描述" style="margin-left: 15px" prop="partDesc" > |
|
|
|
<el-input v-model="newProofingRecordData.partDesc" style="width: 248px;" disabled></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" :rules="rules" style="margin-left: 7px;margin-top: 8px;"> |
|
|
|
<el-form-item label="项目分类" prop="cProjectTypeDb"> |
|
|
|
<el-select v-model="newProofingRecordData.cProjectTypeDb" placeholder="请选择" clearable style="width: 110px"> |
|
|
|
<el-option |
|
|
|
@ -1059,7 +1059,7 @@ |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="项目阶段" prop="projectPhase" :rules="rules.projectPhase"> |
|
|
|
<el-form-item label="项目阶段" prop="projectPhase" style="margin-left: 15px" :rules="rules.projectPhase"> |
|
|
|
<el-select v-model="newProofingRecordData.projectPhase" placeholder="请选择" clearable style="width: 110px"> |
|
|
|
<el-option |
|
|
|
v-for = "i in projectPhaseList" |
|
|
|
@ -1069,14 +1069,14 @@ |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="打样单号" prop="proofingNo" :rules="rules.proofingNo" > |
|
|
|
<el-form-item label="打样单号" prop="proofingNo" style="margin-left: 15px" :rules="rules.proofingNo" > |
|
|
|
<el-input v-model="newProofingRecordData.proofingNo" style="width: 110px;"></el-input> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="数量" prop="proofingNumber" :rules="rules.proofingNo" > |
|
|
|
<el-form-item label="数量" prop="proofingNumber" style="margin-left: 15px" :rules="rules.proofingNo" > |
|
|
|
<el-input v-model="newProofingRecordData.proofingNumber" style="width: 110px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" :rules="rules" style="margin-left: 7px;margin-top: 8px;"> |
|
|
|
<el-form-item label="打样开始日期" prop="" :rules="rules.planStartDate" > |
|
|
|
<el-date-picker |
|
|
|
v-model="newProofingRecordData.planStartDate" |
|
|
|
@ -1086,7 +1086,7 @@ |
|
|
|
> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="预计完成日期" prop="" :rules="rules.requiredDeliveryDate" > |
|
|
|
<el-form-item label="预计完成日期" prop="" style="margin-left: 15px" :rules="rules.requiredDeliveryDate" > |
|
|
|
<el-date-picker |
|
|
|
v-model="newProofingRecordData.requiredDeliveryDate" |
|
|
|
type="date" |
|
|
|
@ -1095,7 +1095,7 @@ |
|
|
|
> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="实际完成日期" prop="" > |
|
|
|
<el-form-item label="实际完成日期" style="margin-left: 15px" prop="" > |
|
|
|
<el-date-picker |
|
|
|
v-model="newProofingRecordData.actualityDeliveryDate" |
|
|
|
type="date" |
|
|
|
@ -1105,15 +1105,15 @@ |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-form :inline="true" label-position="top" :model="newProofingRecordData" :rules="rules" style="margin-left: 7px;margin-top: 8px;"> |
|
|
|
<el-form-item label="备注" prop="remark"> |
|
|
|
<el-input v-model="newProofingRecordData.remark" style="width: 483px"></el-input> |
|
|
|
<el-input v-model="newProofingRecordData.remark" style="width: 527px"></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
<el-footer style="height:40px;margin-top: 15px;text-align:center"> |
|
|
|
<el-button @click="visible = false">取 消</el-button> |
|
|
|
<el-button type="primary" @click="newProofingRecord()">确 定</el-button> |
|
|
|
</div> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<upload-file-list-1 folder="projectPMPDocumentFiles" title="上传文档" :file-list.sync="fileList" :label="'文档类型ID:'" :no="otherDocumentCurrentRow.documentTypeId" :no-type="otherDocumentCurrentRow.documentType" |
|
|
|
@ -3857,6 +3857,7 @@ import {updateColumnSize} from "../../../api/table"; |
|
|
|
this.modalData = { |
|
|
|
site: row.site, |
|
|
|
bu: row.site + '_' + row.buNo, |
|
|
|
buNo: row.buNo, |
|
|
|
username: this.$store.state.user.name, |
|
|
|
customerNo: row.customerNo, |
|
|
|
customerDesc: row.customerDesc, |
|
|
|
|