|
|
@ -541,9 +541,15 @@ |
|
|
</el-select> |
|
|
</el-select> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="6" v-show="isOneKeyCreateFieldVisible('proofingNumber')"> |
|
|
|
|
|
<el-form-item label="数量"> |
|
|
|
|
|
<el-input v-model.number="oneKeyForm.proofingNumber" style="width: 100%"></el-input> |
|
|
|
|
|
|
|
|
<el-col :span="6" v-show="isOneKeyCreateFieldVisible('requiredDeliveryDate')"> |
|
|
|
|
|
<el-form-item label="预计完成日期"> |
|
|
|
|
|
<el-date-picker |
|
|
|
|
|
v-model="oneKeyForm.requiredDeliveryDate" |
|
|
|
|
|
type="date" |
|
|
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
|
|
placeholder="选择日期" |
|
|
|
|
|
style="width: 100%"> |
|
|
|
|
|
</el-date-picker> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="6" v-show="isOneKeyCreateFieldVisible('planStartDate')"> |
|
|
<el-col :span="6" v-show="isOneKeyCreateFieldVisible('planStartDate')"> |
|
|
@ -560,20 +566,17 @@ |
|
|
</el-row> |
|
|
</el-row> |
|
|
|
|
|
|
|
|
<el-row :gutter="16"> |
|
|
<el-row :gutter="16"> |
|
|
<el-col :span="6" v-show="isOneKeyCreateFieldVisible('requiredDeliveryDate')"> |
|
|
|
|
|
<el-form-item label="预计完成日期"> |
|
|
|
|
|
<el-date-picker |
|
|
|
|
|
v-model="oneKeyForm.requiredDeliveryDate" |
|
|
|
|
|
type="date" |
|
|
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
|
|
placeholder="选择日期" |
|
|
|
|
|
style="width: 100%"> |
|
|
|
|
|
</el-date-picker> |
|
|
|
|
|
|
|
|
<el-col :span="6" v-show="isOneKeyCreateFieldVisible('proofingNumber')"> |
|
|
|
|
|
<el-form-item label="数量"> |
|
|
|
|
|
<el-input v-model.number="oneKeyForm.proofingNumber" style="width: 100%"></el-input> |
|
|
|
|
|
<div v-if="oneKeySelectedApplyOption" class="apply-qty-reference"> |
|
|
|
|
|
试验申请数量参考:{{ getApplyQuantityDisplayText(oneKeySelectedApplyOption.applyQuantity) }} |
|
|
|
|
|
</div> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="isOneKeyCreateFieldVisible('requiredDeliveryDate') ? 18 : 24" v-show="isOneKeyCreateFieldVisible('remark')"> |
|
|
<el-col :span="isOneKeyCreateFieldVisible('requiredDeliveryDate') ? 18 : 24" v-show="isOneKeyCreateFieldVisible('remark')"> |
|
|
<el-form-item label="备注"> |
|
|
<el-form-item label="备注"> |
|
|
<el-input type="textarea" :rows="2" v-model="oneKeyForm.remark" style="width: 100%"></el-input> |
|
|
|
|
|
|
|
|
<el-input v-model="oneKeyForm.remark" style="width: 100%"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
</el-row> |
|
|
</el-row> |
|
|
@ -676,8 +679,14 @@ |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="6"> |
|
|
<el-col :span="6"> |
|
|
<el-form-item label="数量" required> |
|
|
|
|
|
<el-input v-model="proofDialogData.proofingNumber" style="width: 100%" /> |
|
|
|
|
|
|
|
|
<el-form-item label="打样开始日期" required> |
|
|
|
|
|
<el-date-picker |
|
|
|
|
|
v-model="proofDialogData.planStartDate" |
|
|
|
|
|
type="date" |
|
|
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
|
|
placeholder="选择日期" |
|
|
|
|
|
style="width: 100%"> |
|
|
|
|
|
</el-date-picker> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="6"> |
|
|
<el-col :span="6"> |
|
|
@ -703,14 +712,11 @@ |
|
|
|
|
|
|
|
|
<el-row :gutter="16"> |
|
|
<el-row :gutter="16"> |
|
|
<el-col :span="6"> |
|
|
<el-col :span="6"> |
|
|
<el-form-item label="打样开始日期" required> |
|
|
|
|
|
<el-date-picker |
|
|
|
|
|
v-model="proofDialogData.planStartDate" |
|
|
|
|
|
type="date" |
|
|
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
|
|
placeholder="选择日期" |
|
|
|
|
|
style="width: 100%"> |
|
|
|
|
|
</el-date-picker> |
|
|
|
|
|
|
|
|
<el-form-item label="数量" required> |
|
|
|
|
|
<el-input v-model="proofDialogData.proofingNumber" style="width: 100%" /> |
|
|
|
|
|
<div v-if="proofDialogSelectedApplyOption" class="apply-qty-reference"> |
|
|
|
|
|
试验申请数量:{{ getApplyQuantityDisplayText(proofDialogSelectedApplyOption.applyQuantity) }} |
|
|
|
|
|
</div> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="6"> |
|
|
<el-col :span="6"> |
|
|
@ -726,7 +732,7 @@ |
|
|
</el-col> |
|
|
</el-col> |
|
|
<el-col :span="12"> |
|
|
<el-col :span="12"> |
|
|
<el-form-item label="备注"> |
|
|
<el-form-item label="备注"> |
|
|
<el-input v-model="proofDialogData.remark" style="width: 100%" type="textarea" :rows="2"></el-input> |
|
|
|
|
|
|
|
|
<el-input v-model="proofDialogData.remark" style="width: 100%" ></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
</el-row> |
|
|
</el-row> |
|
|
@ -1144,6 +1150,24 @@ export default { |
|
|
} |
|
|
} |
|
|
const visibleColumns = this.processColumns.filter(item => visibleCodes.indexOf(item.code) > -1) |
|
|
const visibleColumns = this.processColumns.filter(item => visibleCodes.indexOf(item.code) > -1) |
|
|
return visibleColumns.length > 0 ? visibleColumns : this.processColumns |
|
|
return visibleColumns.length > 0 ? visibleColumns : this.processColumns |
|
|
|
|
|
}, |
|
|
|
|
|
oneKeySelectedApplyOption () { |
|
|
|
|
|
const selectedApplyNo = this.oneKeyForm && !this.isBlankValue(this.oneKeyForm.proofingNo) |
|
|
|
|
|
? String(this.oneKeyForm.proofingNo).trim() |
|
|
|
|
|
: '' |
|
|
|
|
|
if (!selectedApplyNo) { |
|
|
|
|
|
return null |
|
|
|
|
|
} |
|
|
|
|
|
return this.oneKeyProofingApplyOptions.find(item => item && item.applyNo === selectedApplyNo) || null |
|
|
|
|
|
}, |
|
|
|
|
|
proofDialogSelectedApplyOption () { |
|
|
|
|
|
const selectedApplyNo = this.proofDialogData && !this.isBlankValue(this.proofDialogData.proofingNo) |
|
|
|
|
|
? String(this.proofDialogData.proofingNo).trim() |
|
|
|
|
|
: '' |
|
|
|
|
|
if (!selectedApplyNo) { |
|
|
|
|
|
return null |
|
|
|
|
|
} |
|
|
|
|
|
return this.proofDialogApplyOptions.find(item => item && item.applyNo === selectedApplyNo) || null |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
@ -2137,6 +2161,12 @@ export default { |
|
|
isBlankValue (value) { |
|
|
isBlankValue (value) { |
|
|
return value == null || String(value).trim() === '' |
|
|
return value == null || String(value).trim() === '' |
|
|
}, |
|
|
}, |
|
|
|
|
|
getApplyQuantityDisplayText (applyQuantity) { |
|
|
|
|
|
if (this.isBlankValue(applyQuantity)) { |
|
|
|
|
|
return '未维护' |
|
|
|
|
|
} |
|
|
|
|
|
return String(applyQuantity).trim() |
|
|
|
|
|
}, |
|
|
normalizeProjectNo (projectNo) { |
|
|
normalizeProjectNo (projectNo) { |
|
|
if (this.isBlankValue(projectNo)) { |
|
|
if (this.isBlankValue(projectNo)) { |
|
|
return '' |
|
|
return '' |
|
|
@ -2181,7 +2211,8 @@ export default { |
|
|
optionMap[applyNo] = true |
|
|
optionMap[applyNo] = true |
|
|
optionRows.push({ |
|
|
optionRows.push({ |
|
|
applyNo: applyNo, |
|
|
applyNo: applyNo, |
|
|
expectedFinishDate: this.formatDate(item.expectedFinishDate) |
|
|
|
|
|
|
|
|
expectedFinishDate: this.formatDate(item.expectedFinishDate), |
|
|
|
|
|
applyQuantity: this.isBlankValue(item.quantityReq) ? '' : String(item.quantityReq).trim() |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
return optionRows |
|
|
return optionRows |
|
|
@ -2238,7 +2269,8 @@ export default { |
|
|
// 历史记录可能早于 ERF 规范化,保留原打样单号避免编辑场景被强制清空。 |
|
|
// 历史记录可能早于 ERF 规范化,保留原打样单号避免编辑场景被强制清空。 |
|
|
nextOptions.unshift({ |
|
|
nextOptions.unshift({ |
|
|
applyNo: currentProofingNo, |
|
|
applyNo: currentProofingNo, |
|
|
expectedFinishDate: this.formatDate(this.oneKeyForm.requiredDeliveryDate) |
|
|
|
|
|
|
|
|
expectedFinishDate: this.formatDate(this.oneKeyForm.requiredDeliveryDate), |
|
|
|
|
|
applyQuantity: '' |
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
if (!hasCurrent && !keepCurrentIfMissing) { |
|
|
if (!hasCurrent && !keepCurrentIfMissing) { |
|
|
@ -3559,6 +3591,16 @@ export default { |
|
|
margin-bottom: 10px; |
|
|
margin-bottom: 10px; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
.apply-qty-reference { |
|
|
|
|
|
margin-top: 6px; |
|
|
|
|
|
padding: 4px 8px; |
|
|
|
|
|
border-radius: 4px; |
|
|
|
|
|
background: #ecf5ff; |
|
|
|
|
|
color: #2667a8; |
|
|
|
|
|
font-size: 12px; |
|
|
|
|
|
line-height: 18px; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
.big-label a { |
|
|
.big-label a { |
|
|
color: #35b4b4; |
|
|
color: #35b4b4; |
|
|
} |
|
|
} |
|
|
|