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

取消按钮弹窗，直接显示在库存成本影响下面

master
赵宏斌 3 days ago
parent
f7c17bb797
commit
5f2329f399
2 changed files with 105 additions and 11 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. 54
      src/views/modules/changeManagement/changeRecord.vue
  2. 62
      src/views/modules/changeManagement/changeRequest.vue

54
src/views/modules/changeManagement/changeRecord.vue
View File

@ -469,11 +469,50 @@
<el-input v-model="costImpactData.remark" :disabled="showModalFlag||changeCostImpactFlag('remark') === 'N'" style="width: 611px"></el-input> <el-input v-model="costImpactData.remark" :disabled="showModalFlag||changeCostImpactFlag('remark') === 'N'" style="width: 611px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-top: 10px;">
<el-form-item label=" ">
<el-button type="primary" :disabled="showModalFlag" @click="chooseManuFacturingCostModal" style="width: 95px">制造成本变更</el-button>
</el-form-item>
<div>
<h3 class="large-bold-text">制造成本变更</h3>
</div>
<el-form ref="dataForm" label-position="right">
<el-row style="padding-top: 10px;height: 150px" :style="{borderTop:'1px solid #ccc'}">
<el-col :span="8">
<el-form-item label="制造成本是否变更">
<el-checkbox v-model="modalData.manuFacturingFlag" true-label="Y"></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="If yes,Please write down the detail in information"></el-form-item>
<el-checkbox-group v-model="selectedOptions1" @change="selectedOptions1Change">
<el-checkbox label="工艺变更费用">工艺变更费用</el-checkbox>
<el-checkbox label="材料变更费用">材料变更费用</el-checkbox>
<el-checkbox label="模具变更费用">模具变更费用</el-checkbox>
<el-checkbox label="其他">其他</el-checkbox>
</el-checkbox-group>
<el-form-item label="备注/remark">
<el-input type="textarea" v-model="modalData.manuFacturingCostRemark1" :rows="3" resize='none'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row style="padding-top: 10px;height: 150px" :style="{borderTop:'1px solid #ccc'}">
<el-col :span="8">
<el-form-item label="是否需要重新报价">
<el-checkbox v-model="modalData.quotationFlag" true-label="Y"></el-checkbox>
</el-form-item>
<el-form-item label="If yes,Please write down the detail in information"></el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="备注/remark">
<el-input type="textarea" v-model="modalData.manuFacturingCostRemark2" :rows="3" resize='none'></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<!-- <el-form :inline="true" label-position="top" style="margin-top: 10px;">-->
<!-- <el-form-item label=" ">-->
<!-- <el-button type="primary" :disabled="showModalFlag" @click="chooseManuFacturingCostModal" style="width: 95px">制造成本变更</el-button>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
</div> </div>
</el-tab-pane > </el-tab-pane >
@ -4184,9 +4223,12 @@
requestDetailSearch(this.modalData).then(({data}) => { requestDetailSearch(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.chooseDataList = data.rows this.chooseDataList = data.rows
this.$set(this.modalData,'manuFacturingFlag',data.rows[0].manuFacturingFlag) this.$set(this.modalData,'manuFacturingFlag',data.rows[0].manuFacturingFlag)
this.selectedOptions1 = data.rows[0].manuFacturingType.split(';')
this.$set(this.modalData,'manuFacturingType',data.rows[0].manuFacturingType)
// 回显多选框
if (data.rows[0].manuFacturingType != null) {
this.selectedOptions1 = data.rows[0].manuFacturingType.split(';')
}
this.$set(this.modalData,'manuFacturingCostRemark1',data.rows[0].manuFacturingCostRemark1) this.$set(this.modalData,'manuFacturingCostRemark1',data.rows[0].manuFacturingCostRemark1)
this.$set(this.modalData,'quotationFlag',data.rows[0].quotationFlag) this.$set(this.modalData,'quotationFlag',data.rows[0].quotationFlag)
this.$set(this.modalData,'manuFacturingCostRemark2',data.rows[0].manuFacturingCostRemark2) this.$set(this.modalData,'manuFacturingCostRemark2',data.rows[0].manuFacturingCostRemark2)

62
src/views/modules/changeManagement/changeRequest.vue
View File

@ -460,11 +460,49 @@
<el-input v-model="costImpactData.remark" style="width: 611px"></el-input> <el-input v-model="costImpactData.remark" style="width: 611px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" style="margin-top: 10px;">
<el-form-item label=" ">
<el-button type="primary" @click="chooseManuFacturingCostModal" style="width: 95px">制造成本变更</el-button>
</el-form-item>
<div>
<h3 class="large-bold-text">制造成本变更</h3>
</div>
<el-form ref="dataForm" label-position="right">
<el-row style="padding-top: 10px;height: 150px" :style="{borderTop:'1px solid #ccc'}">
<el-col :span="8">
<el-form-item label="制造成本是否变更">
<el-checkbox v-model="modalData.manuFacturingFlag" true-label="Y"></el-checkbox>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="If yes,Please write down the detail in information"></el-form-item>
<el-checkbox-group v-model="selectedOptions1" @change="selectedOptions1Change">
<el-checkbox label="工艺变更费用">工艺变更费用</el-checkbox>
<el-checkbox label="材料变更费用">材料变更费用</el-checkbox>
<el-checkbox label="模具变更费用">模具变更费用</el-checkbox>
<el-checkbox label="其他">其他</el-checkbox>
</el-checkbox-group>
<el-form-item label="备注/remark">
<el-input type="textarea" v-model="modalData.manuFacturingCostRemark1" :rows="3" resize='none'></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row style="padding-top: 10px;height: 150px" :style="{borderTop:'1px solid #ccc'}">
<el-col :span="8">
<el-form-item label="是否需要重新报价">
<el-checkbox v-model="modalData.quotationFlag" true-label="Y"></el-checkbox>
</el-form-item>
<el-form-item label="If yes,Please write down the detail in information"></el-form-item>
</el-col>
<el-col :span="16">
<el-form-item label="备注/remark">
<el-input type="textarea" v-model="modalData.manuFacturingCostRemark2" :rows="3" resize='none'></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form> </el-form>
<!-- <el-form :inline="true" label-position="top" style="margin-top: 10px;">-->
<!-- <el-form-item label=" ">-->
<!-- <el-button type="primary" @click="chooseManuFacturingCostModal" style="width: 95px">制造成本变更</el-button>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
</div> </div>
</el-tab-pane> </el-tab-pane>
@ -2572,8 +2610,14 @@
cqcOperatorId: '', cqcOperatorId: '',
cqcOperatorName: '', cqcOperatorName: '',
faiOperatorId: '', faiOperatorId: '',
faiOperatorName: ''
faiOperatorName: '',
manuFacturingFlag: 'N',
manuFacturingType: '',
manuFacturingCostRemark1: '',
quotationFlag: 'N',
manuFacturingCostRemark2: ''
} }
this.selectedOptions1 = []
this.changeTitle = '变更申请-' + this.modalData.changeNo this.changeTitle = '变更申请-' + this.modalData.changeNo
this.costImpactData = { this.costImpactData = {
site: this.$store.state.user.site, site: this.$store.state.user.site,
@ -2805,6 +2849,14 @@
return return
} }
} }
if (this.modalData.manuFacturingFlag === 'Y' && !this.selectedOptions1.length > 0){
this.$message.warning('请选择制造费用变更项！')
return
}
if (this.modalData.quotationFlag === 'Y' && (this.modalData.manuFacturingCostRemark2 == '' ||this.modalData.manuFacturingCostRemark2 == null)) {
this.$message.warning('请填写重新报价说明！')
return
}
this.saveDataLoading = true this.saveDataLoading = true
this.costImpactData.changeTotalCost = this.totalCost this.costImpactData.changeTotalCost = this.totalCost

Write Preview
Loading…
Cancel
Save