Browse Source

选择打样单后,将工程实验单的创建时间回写到打样开始日期里

ecss-tx
han\hanst 2 weeks ago
parent
commit
109716d76e
  1. 33
      src/views/modules/sampleTracking/projectProofTracking.vue

33
src/views/modules/sampleTracking/projectProofTracking.vue

@ -154,7 +154,7 @@
:data="dataList" :data="dataList"
border class="data-table" border class="data-table"
stripe highlight-current-row stripe highlight-current-row
height="700"
height="670"
v-loading="dataListLoading" v-loading="dataListLoading"
@sort-change="handleTrackingTableSortChange" @sort-change="handleTrackingTableSortChange"
@selection-change="selectionChange" @selection-change="selectionChange"
@ -4347,9 +4347,11 @@ export default {
return return
} }
optionMap[applyNo] = true optionMap[applyNo] = true
// /
optionRows.push({ optionRows.push({
applyNo: applyNo, applyNo: applyNo,
expectedFinishDate: this.formatDate(item.expectedFinishDate), expectedFinishDate: this.formatDate(item.expectedFinishDate),
createTime: this.formatDate(item.createTime),
applyQuantity: this.isBlankValue(item.quantityReq) ? '' : String(item.quantityReq).trim() applyQuantity: this.isBlankValue(item.quantityReq) ? '' : String(item.quantityReq).trim()
}) })
}) })
@ -4366,6 +4368,7 @@ export default {
this.oneKeyProofingApplyOptions = [] this.oneKeyProofingApplyOptions = []
this.oneKeyForm.proofingNo = '' this.oneKeyForm.proofingNo = ''
this.oneKeyForm.requiredDeliveryDate = '' this.oneKeyForm.requiredDeliveryDate = ''
this.oneKeyForm.planStartDate = ''
this.oneKeyProjectNoSnapshot = '' this.oneKeyProjectNoSnapshot = ''
this.oneKeyForm.testPartNo = '' this.oneKeyForm.testPartNo = ''
this.oneKeyForm.partDesc = '' this.oneKeyForm.partDesc = ''
@ -4388,7 +4391,7 @@ export default {
handleOneKeyProofingNoChange (proofingNo) { handleOneKeyProofingNoChange (proofingNo) {
const selectedNo = this.isBlankValue(proofingNo) ? '' : String(proofingNo).trim() const selectedNo = this.isBlankValue(proofingNo) ? '' : String(proofingNo).trim()
if (this.oneKeyDialogMode !== 'create') { if (this.oneKeyDialogMode !== 'create') {
// /
// /
if (!selectedNo) { if (!selectedNo) {
this.oneKeyForm.proofingNo = '' this.oneKeyForm.proofingNo = ''
return return
@ -4401,6 +4404,7 @@ export default {
} }
if (!selectedNo) { if (!selectedNo) {
this.oneKeyForm.requiredDeliveryDate = '' this.oneKeyForm.requiredDeliveryDate = ''
this.oneKeyForm.planStartDate = ''
return return
} }
const matched = this.oneKeyProofingApplyOptions.find(item => item && item.applyNo === selectedNo) const matched = this.oneKeyProofingApplyOptions.find(item => item && item.applyNo === selectedNo)
@ -4409,6 +4413,8 @@ export default {
} }
this.oneKeyForm.proofingNo = matched.applyNo this.oneKeyForm.proofingNo = matched.applyNo
this.oneKeyForm.requiredDeliveryDate = matched.expectedFinishDate || '' this.oneKeyForm.requiredDeliveryDate = matched.expectedFinishDate || ''
//
this.oneKeyForm.planStartDate = matched.createTime || ''
this.syncOneKeyBaselineByRequiredDeliveryDate(this.oneKeyForm.requiredDeliveryDate, false) this.syncOneKeyBaselineByRequiredDeliveryDate(this.oneKeyForm.requiredDeliveryDate, false)
}, },
handleOneKeyRequiredDeliveryDateChange (dateVal) { handleOneKeyRequiredDeliveryDateChange (dateVal) {
@ -4452,12 +4458,14 @@ export default {
nextOptions.unshift({ nextOptions.unshift({
applyNo: currentProofingNo, applyNo: currentProofingNo,
expectedFinishDate: this.formatDate(this.oneKeyForm.requiredDeliveryDate), expectedFinishDate: this.formatDate(this.oneKeyForm.requiredDeliveryDate),
createTime: this.formatDate(this.oneKeyForm.planStartDate),
applyQuantity: '' applyQuantity: ''
}) })
} }
if (!hasCurrent && !keepCurrentIfMissing) { if (!hasCurrent && !keepCurrentIfMissing) {
this.oneKeyForm.proofingNo = '' this.oneKeyForm.proofingNo = ''
this.oneKeyForm.requiredDeliveryDate = '' this.oneKeyForm.requiredDeliveryDate = ''
this.oneKeyForm.planStartDate = ''
} }
} }
this.oneKeyProofingApplyOptions = nextOptions this.oneKeyProofingApplyOptions = nextOptions
@ -4481,6 +4489,7 @@ export default {
const selectedNo = this.isBlankValue(proofingNo) ? '' : String(proofingNo).trim() const selectedNo = this.isBlankValue(proofingNo) ? '' : String(proofingNo).trim()
if (!selectedNo) { if (!selectedNo) {
this.proofDialogData.requiredDeliveryDate = '' this.proofDialogData.requiredDeliveryDate = ''
this.proofDialogData.planStartDate = ''
return return
} }
const matched = this.proofDialogApplyOptions.find(item => item && item.applyNo === selectedNo) const matched = this.proofDialogApplyOptions.find(item => item && item.applyNo === selectedNo)
@ -4489,6 +4498,8 @@ export default {
} }
this.proofDialogData.proofingNo = matched.applyNo this.proofDialogData.proofingNo = matched.applyNo
this.proofDialogData.requiredDeliveryDate = matched.expectedFinishDate || '' this.proofDialogData.requiredDeliveryDate = matched.expectedFinishDate || ''
//
this.proofDialogData.planStartDate = matched.createTime || ''
}, },
loadProofDialogApplyOptions (projectNo) { loadProofDialogApplyOptions (projectNo) {
const normalizedProjectNo = this.normalizeProjectNo(projectNo) const normalizedProjectNo = this.normalizeProjectNo(projectNo)
@ -4499,6 +4510,7 @@ export default {
this.proofDialogApplyOptions = [] this.proofDialogApplyOptions = []
this.proofDialogData.proofingNo = '' this.proofDialogData.proofingNo = ''
this.proofDialogData.requiredDeliveryDate = '' this.proofDialogData.requiredDeliveryDate = ''
this.proofDialogData.planStartDate = ''
return Promise.resolve([]) return Promise.resolve([])
} }
this.proofDialogApplyLoading = true this.proofDialogApplyLoading = true
@ -6121,10 +6133,23 @@ export default {
</script> </script>
<style > <style >
.data-table .cell {
.el-table.el-table--medium.data-table th,
.el-table.data-table th {
height: 24px;
padding-top: 0;
padding-bottom: 0;
}
.el-table.data-table th .cell {
height: 24px;
line-height: 24px;
font-size: 12px;
}
.el-table.data-table td .cell {
height: 26px;
line-height: 26px; line-height: 26px;
font-size: 12px; font-size: 12px;
height: 28px;
} }
.search-form { .search-form {

Loading…
Cancel
Save