wilson
/
ccl_plm-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2025-07-29

master
fengyuan_yang 6 months ago
parent
d449c8c249
commit
9525294039
2 changed files with 61 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      src/views/modules/proofing/requestForProofing.vue
  2. 74
      src/views/modules/sampleManagement/technicalSpecificationList.vue

29
src/views/modules/proofing/requestForProofing.vue
View File

@ -200,7 +200,7 @@
</el-pagination> </el-pagination>
<!-- 打样模态框 --> <!-- 打样模态框 -->
<el-dialog :title="modalData.title" @close="closeModalDiaLog" @open="openModalDialog" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" top="10vh" width="1200px">
<el-dialog :title="modalData.title" @close="closeModalDiaLog" @open="openModalDialog" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" top="5vh" width="1200px">
<el-form label-position="top" ref="modalForm" :model="modalData" :rules="rules"> <el-form label-position="top" ref="modalForm" :model="modalData" :rules="rules">
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="8"> <el-col :span="8">
@ -300,6 +300,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="15">
<el-col :span="24">
<el-form-item label="样品用途" class="auto" prop="sendSamplesUsage" :show-message="false">
<el-input v-model="modalData.sendSamplesUsage" :disabled="detailVisible" clearable></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="15"> <el-row :gutter="15">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="样品寄送地址" class="auto"> <el-form-item label="样品寄送地址" class="auto">
@ -920,6 +927,7 @@ export default {
this.modalData.consignee = '' this.modalData.consignee = ''
this.modalData.consigneeContact = '' this.modalData.consigneeContact = ''
this.modalData.sendSamplesAddress = '' this.modalData.sendSamplesAddress = ''
this.modalData.sendSamplesUsage = ''
} }
}, },
'modalData.projectId'(newV, oldV) { 'modalData.projectId'(newV, oldV) {
@ -1121,13 +1129,15 @@ export default {
isReject: '', isReject: '',
nodeId: '', nodeId: '',
proofingAmount: undefined, proofingAmount: undefined,
sendSamplesUsage: ''
}, },
proofingDetailData: { proofingDetailData: {
technicalConsiderations: '', technicalConsiderations: '',
isNeedToSendSamples: '', isNeedToSendSamples: '',
sendSamplesAddress: '', sendSamplesAddress: '',
consignee: '', consignee: '',
consigneeContact: ''
consigneeContact: '',
sendSamplesUsage: ''
}, },
proofingResultData: { proofingResultData: {
proofingResultStatus: '', proofingResultStatus: '',
@ -2055,6 +2065,13 @@ export default {
message: '要求交付日期不能为空', message: '要求交付日期不能为空',
trigger: ['change', 'blur'] trigger: ['change', 'blur']
} }
],
sendSamplesUsage: [
{
required: true,
message: '要求样品用途不能为空',
trigger: ['change', 'blur']
}
] ]
}, },
enterResultRules: { enterResultRules: {
@ -2595,6 +2612,7 @@ export default {
nodeId: row.nodeId, nodeId: row.nodeId,
approvalUsername: row.approvalUsername, approvalUsername: row.approvalUsername,
proofingAmount: row.proofingAmount, proofingAmount: row.proofingAmount,
sendSamplesUsage: row.sendSamplesUsage
} }
this.searchDelegateAccessByUser(); this.searchDelegateAccessByUser();
this.modalDisableFlag = true this.modalDisableFlag = true
@ -2649,7 +2667,8 @@ export default {
rejectFlag: row.rejectFlag, rejectFlag: row.rejectFlag,
rejectStepId: row.rejectStepId, rejectStepId: row.rejectStepId,
isReject: row.isReject, isReject: row.isReject,
nodeId: row.nodeId
nodeId: row.nodeId,
sendSamplesUsage: row.sendSamplesUsage
} }
this.searchDelegateAccessByUser(); this.searchDelegateAccessByUser();
this.modalDisableFlag = true this.modalDisableFlag = true
@ -2726,7 +2745,6 @@ export default {
* 客户信息新增/编辑 * 客户信息新增/编辑
*/ */
saveData() { saveData() {
console.log(this.modalData)
this.$refs.modalForm.validate((valid, obj) => { this.$refs.modalForm.validate((valid, obj) => {
if (!valid) { if (!valid) {
let i = 1; let i = 1;
@ -3563,7 +3581,8 @@ export default {
proofingResultStatus: 'B', proofingResultStatus: 'B',
nextToDo: '', nextToDo: '',
createBy: this.$store.state.user.name, createBy: this.$store.state.user.name,
nodeId: ''
nodeId: '',
sendSamplesUsage: ''
}; };
this.selectionDelegateAccess = []; this.selectionDelegateAccess = [];
this.projectPartList = []; this.projectPartList = [];

74
src/views/modules/sampleManagement/technicalSpecificationList.vue
View File

@ -717,127 +717,127 @@
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1LabelLength',
serialNumber: '103002Table1Stage',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "labelLength",
columnProp: "stage",
headerAlign: "center", headerAlign: "center",
align: "right",
columnLabel: "标签长度",
align: "left",
columnLabel: "生产状态",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100
columnWidth: 110
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1LabelWidth',
serialNumber: '103002Table1Status',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "labelWidth",
columnProp: "statusDesc",
headerAlign: "center", headerAlign: "center",
align: "right",
columnLabel: "标签宽度",
align: "left",
columnLabel: "状态",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100
columnWidth: 80
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1Radius',
serialNumber: '103002Table1NodeName',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "radius",
columnProp: "nodeName",
headerAlign: "center", headerAlign: "center",
align: "right",
columnLabel: "圆角",
align: "left",
columnLabel: "节点名称",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 100
},
{
columnWidth: 150
},{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1Stage',
serialNumber: '103002Table1SP',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "stage",
columnProp: "sp",
headerAlign: "center", headerAlign: "center",
align: "left", align: "left",
columnLabel: "生产状态",
columnLabel: "当前审批人",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 110
columnWidth: 80
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1Status',
serialNumber: '103002Table1LabelLength',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "statusDesc",
columnProp: "labelLength",
headerAlign: "center", headerAlign: "center",
align: "left",
columnLabel: "状态",
align: "right",
columnLabel: "标签长度",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80
columnWidth: 100
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1NodeName',
serialNumber: '103002Table1LabelWidth',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "nodeName",
columnProp: "labelWidth",
headerAlign: "center", headerAlign: "center",
align: "left",
columnLabel: "节点名称",
align: "right",
columnLabel: "标签宽度",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 150
},{
columnWidth: 100
},
{
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 103002, functionId: 103002,
serialNumber: '103002Table1SP',
serialNumber: '103002Table1Radius',
tableId: "103002Table1", tableId: "103002Table1",
tableName: "技术参数卡列表", tableName: "技术参数卡列表",
columnProp: "sp",
columnProp: "radius",
headerAlign: "center", headerAlign: "center",
align: "left",
columnLabel: "当前审批人",
align: "right",
columnLabel: "圆角",
columnHidden: false, columnHidden: false,
columnImage: false, columnImage: false,
columnSortable: false, columnSortable: false,
sortLv: 0, sortLv: 0,
status: true, status: true,
fixed: '', fixed: '',
columnWidth: 80
columnWidth: 100
}, },
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,

Write Preview
Loading…
Cancel
Save