diff --git a/src/views/modules/proofing/requestForProofing.vue b/src/views/modules/proofing/requestForProofing.vue index bc6e766..136e893 100644 --- a/src/views/modules/proofing/requestForProofing.vue +++ b/src/views/modules/proofing/requestForProofing.vue @@ -200,7 +200,7 @@ - + @@ -300,6 +300,13 @@ + + + + + + + @@ -920,6 +927,7 @@ export default { this.modalData.consignee = '' this.modalData.consigneeContact = '' this.modalData.sendSamplesAddress = '' + this.modalData.sendSamplesUsage = '' } }, 'modalData.projectId'(newV, oldV) { @@ -1121,13 +1129,15 @@ export default { isReject: '', nodeId: '', proofingAmount: undefined, + sendSamplesUsage: '' }, proofingDetailData: { technicalConsiderations: '', isNeedToSendSamples: '', sendSamplesAddress: '', consignee: '', - consigneeContact: '' + consigneeContact: '', + sendSamplesUsage: '' }, proofingResultData: { proofingResultStatus: '', @@ -2055,6 +2065,13 @@ export default { message: '要求交付日期不能为空', trigger: ['change', 'blur'] } + ], + sendSamplesUsage: [ + { + required: true, + message: '要求样品用途不能为空', + trigger: ['change', 'blur'] + } ] }, enterResultRules: { @@ -2595,6 +2612,7 @@ export default { nodeId: row.nodeId, approvalUsername: row.approvalUsername, proofingAmount: row.proofingAmount, + sendSamplesUsage: row.sendSamplesUsage } this.searchDelegateAccessByUser(); this.modalDisableFlag = true @@ -2649,7 +2667,8 @@ export default { rejectFlag: row.rejectFlag, rejectStepId: row.rejectStepId, isReject: row.isReject, - nodeId: row.nodeId + nodeId: row.nodeId, + sendSamplesUsage: row.sendSamplesUsage } this.searchDelegateAccessByUser(); this.modalDisableFlag = true @@ -2726,7 +2745,6 @@ export default { * 客户信息新增/编辑 */ saveData() { - console.log(this.modalData) this.$refs.modalForm.validate((valid, obj) => { if (!valid) { let i = 1; @@ -3563,7 +3581,8 @@ export default { proofingResultStatus: 'B', nextToDo: '', createBy: this.$store.state.user.name, - nodeId: '' + nodeId: '', + sendSamplesUsage: '' }; this.selectionDelegateAccess = []; this.projectPartList = []; diff --git a/src/views/modules/sampleManagement/technicalSpecificationList.vue b/src/views/modules/sampleManagement/technicalSpecificationList.vue index 3c206b6..fe08f4c 100644 --- a/src/views/modules/sampleManagement/technicalSpecificationList.vue +++ b/src/views/modules/sampleManagement/technicalSpecificationList.vue @@ -717,127 +717,127 @@ { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1LabelLength', + serialNumber: '103002Table1Stage', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "labelLength", + columnProp: "stage", headerAlign: "center", - align: "right", - columnLabel: "标签长度", + align: "left", + columnLabel: "生产状态", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 110 }, { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1LabelWidth', + serialNumber: '103002Table1Status', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "labelWidth", + columnProp: "statusDesc", headerAlign: "center", - align: "right", - columnLabel: "标签宽度", + align: "left", + columnLabel: "状态", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 + columnWidth: 80 }, { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1Radius', + serialNumber: '103002Table1NodeName', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "radius", + columnProp: "nodeName", headerAlign: "center", - align: "right", - columnLabel: "圆角", + align: "left", + columnLabel: "节点名称", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 100 - }, - { + columnWidth: 150 + },{ userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1Stage', + serialNumber: '103002Table1SP', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "stage", + columnProp: "sp", headerAlign: "center", align: "left", - columnLabel: "生产状态", + columnLabel: "当前审批人", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 110 + columnWidth: 80 }, { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1Status', + serialNumber: '103002Table1LabelLength', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "statusDesc", + columnProp: "labelLength", headerAlign: "center", - align: "left", - columnLabel: "状态", + align: "right", + columnLabel: "标签长度", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1NodeName', + serialNumber: '103002Table1LabelWidth', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "nodeName", + columnProp: "labelWidth", headerAlign: "center", - align: "left", - columnLabel: "节点名称", + align: "right", + columnLabel: "标签宽度", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 150 - },{ + columnWidth: 100 + }, + { userId: this.$store.state.user.name, functionId: 103002, - serialNumber: '103002Table1SP', + serialNumber: '103002Table1Radius', tableId: "103002Table1", tableName: "技术参数卡列表", - columnProp: "sp", + columnProp: "radius", headerAlign: "center", - align: "left", - columnLabel: "当前审批人", + align: "right", + columnLabel: "圆角", columnHidden: false, columnImage: false, columnSortable: false, sortLv: 0, status: true, fixed: '', - columnWidth: 80 + columnWidth: 100 }, { userId: this.$store.state.user.name,