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

增加 制造成本变更 按钮

master
赵宏斌 3 days ago
parent
b6c53e3366
commit
c6d0311c0a
2 changed files with 152 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      src/views/modules/changeManagement/changeRecord.vue
  2. 76
      src/views/modules/changeManagement/changeRequest.vue

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

@ -469,6 +469,11 @@
<el-input v-model="costImpactData.remark" :disabled="showModalFlag||changeCostImpactFlag('remark') === 'N'" style="width: 611px"></el-input>
</el-form-item>
</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>
</el-tab-pane >
@ -688,6 +693,46 @@
</template>
</el-footer>
</el-dialog>
<el-dialog title="制造成本变更" :close-on-click-modal="false" v-drag :visible.sync="manuFacturingCostFlag" width="900px">
<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-footer style="height:30px;text-align:center">
<el-button type="primary" @click="saveManuFacturingCostData">保存</el-button>
<el-button type="primary" @click="manuFacturingCostFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- 页签 -->
<el-tabs v-model="activeTable" style="width: 100%; height: 100%;" type="border-card" @tab-click="refreshCurrentTabTable" class="customer-tab">
@ -1671,6 +1716,7 @@
plmChangeExecutionInfoArr: [],
plmChangeItemArr: [],
plmChangeCountersignatureItemArr: [],
selectedOptions1:[],
// ======== 数据对象 ========
modalData: {
site: this.$store.state.user.site,
@ -3079,6 +3125,7 @@
modalFlag: false,
showModalFlag: false,
modalDisableFlag: false,
manuFacturingCostFlag: false,
ecnTypeModalFlag: false,
chooseModelFlag: false,
chooseModelFlag2: false,
@ -3252,6 +3299,30 @@
})
this.chooseModelFlag2 = true
},
chooseManuFacturingCostModal () {
this.manuFacturingCostFlag = true
},
// 选择变更费用
selectedOptions1Change(){
this.modalData.manuFacturingType = this.selectedOptions1.join(';')
},
// 保存 制造费用变更
saveManuFacturingCostData(){
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.manuFacturingCostFlag = false
console.log(this.modalData.manuFacturingFlag)
console.log(this.modalData.manuFacturingType)
console.log(this.modalData.manuFacturingCostRemark1)
console.log(this.modalData.quotationFlag)
console.log(this.modalData.manuFacturingCostRemark2)
},
// 选择会签模板属性
chooseCSModel () {
@ -4113,6 +4184,12 @@
requestDetailSearch(this.modalData).then(({data}) => {
if (data && data.code === 0) {
this.chooseDataList = data.rows
this.$set(this.modalData,'manuFacturingFlag',data.rows[0].manuFacturingFlag)
this.selectedOptions1 = data.rows[0].manuFacturingType.split(';')
this.$set(this.modalData,'manuFacturingCostRemark1',data.rows[0].manuFacturingCostRemark1)
this.$set(this.modalData,'quotationFlag',data.rows[0].quotationFlag)
this.$set(this.modalData,'manuFacturingCostRemark2',data.rows[0].manuFacturingCostRemark2)
} else {
this.$alert(data.msg, '错误', {
confirmButtonText: '确定'

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

@ -460,6 +460,11 @@
<el-input v-model="costImpactData.remark" style="width: 611px"></el-input>
</el-form-item>
</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>
</el-tab-pane>
@ -643,6 +648,47 @@
</el-footer>
</el-dialog>
<el-dialog title="制造成本变更" :close-on-click-modal="false" v-drag :visible.sync="manuFacturingCostFlag" width="900px">
<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-footer style="height:30px;text-align:center">
<el-button type="primary" @click="saveManuFacturingCostData">保存</el-button>
<el-button type="primary" @click="manuFacturingCostFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
<!-- ECN种类模态框 -->
<el-dialog title="ECN种类" :close-on-click-modal="false" v-drag :visible.sync="EcnTypeModalFlag" width="900px">
<el-form ref="dataForm" label-position="right">
@ -1171,6 +1217,8 @@
codeNo: '',
buNo: '',
},
// 多选框
selectedOptions1: [],
// ======== 数据对象 ========
modalData: {
site: this.$store.state.user.site,
@ -1207,7 +1255,12 @@
cqcOperatorName: '',
faiOperatorId: '',
faiOperatorName: '',
showInQueryFlag: ''
showInQueryFlag: '',
manuFacturingType: '',
manuFacturingFlag: 'N',
quotationFlag: 'N',
manuFacturingCostRemark1: '',
manuFacturingCostRemark2: ''
},
costImpactData: {
site: this.$store.state.user.site,
@ -2211,6 +2264,7 @@
modalFlag: false,
modalDisableFlag: false,
EcnTypeModalFlag: false,
manuFacturingCostFlag: false,
chooseModelFlag: false,
chooseModelFlag2: false,
chooseCSModelFlag: false,
@ -2617,6 +2671,22 @@
this.saveDataLoading = false
})
},
// 选择变更费用
selectedOptions1Change(){
this.modalData.manuFacturingType = this.selectedOptions1.join(';')
},
// 保存 制造费用变更
saveManuFacturingCostData(){
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.manuFacturingCostFlag = false
},
// 跳转变更申请
toMenu () {
@ -2832,6 +2902,10 @@
chooseEcnTypeModal () {
this.EcnTypeModalFlag = true
},
// 制造成本变更模态框
chooseManuFacturingCostModal () {
this.manuFacturingCostFlag = true
},
// 查询ECN种类数据
getEcnTypeData () {

Write Preview
Loading…
Cancel
Save