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

2024-07-23 更新

master
fengyuan_yang 2 years ago
parent
643ad5c968
commit
0a3636c0ba
5 changed files with 116 additions and 66 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. 48
      src/views/modules/changeManagement/changeRecord.vue
  2. 84
      src/views/modules/changeManagement/changeRequest.vue
  3. 17
      src/views/modules/customer/customerInformationManagement.vue
  4. 29
      src/views/modules/project/projectInfo/com_project_info_part.vue
  5. 4
      src/views/modules/sampleManagement/com_technical-add-or-update.vue

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

@ -103,11 +103,11 @@
:editable=false> :editable=false>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="ECN变更影响" prop="changeImpact" :rules="rules.changeImpact">
<dict-data-select v-model="modalData.changeImpact" :disabled="changeRequestFlag('changeImpact') === 'N'" style="width: 205px" dict-type="change_change_Impact"></dict-data-select>
</el-form-item>
<el-form-item label="变更影响描述" prop="changeImpactDesc" :rules="[{required: modalData.changeImpact === 'Y',message: ' ',trigger: ['blur','change']}]">
<el-input v-model="modalData.changeImpactDesc" :disabled="changeRequestFlag('changeImpactDesc') === 'N'" style="width: 423px"></el-input>
<!-- <el-form-item label="ECN变更影响" prop="changeImpact" :rules="rules.changeImpact">-->
<!-- <dict-data-select v-model="modalData.changeImpact" :disabled="changeRequestFlag('changeImpact') === 'N'" style="width: 205px" dict-type="change_change_Impact"></dict-data-select>-->
<!-- </el-form-item>-->
<el-form-item label="变更影响描述" prop="changeImpactDesc">
<el-input v-model="modalData.changeImpactDesc" :disabled="changeRequestFlag('changeImpactDesc') === 'N'" style="width: 641px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
@ -146,7 +146,7 @@
<!-- <dict-data-select v-model="modalData.printing" style="width: 205px" dict-type="change_printing"></dict-data-select>--> <!-- <dict-data-select v-model="modalData.printing" style="width: 205px" dict-type="change_printing"></dict-data-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="是否DF产品" prop="dfIsProduct" :rules="rules.dfIsProduct"> <el-form-item label="是否DF产品" prop="dfIsProduct" :rules="rules.dfIsProduct">
<dict-data-select v-model="modalData.dfIsProduct" :disabled="changeRequestFlag('dfIsProduct') === 'N'" style="width: 205px" dict-type="change_df_is_product"></dict-data-select>
<dict-data-select v-model="modalData.dfIsProduct" :disabled="changeRequestFlag('dfIsProduct') === 'N'" style="width: 202px" dict-type="change_df_is_product"></dict-data-select>
</el-form-item> </el-form-item>
<el-form-item label=" " :required="modalData.dfIsProduct === 'I'" prop="industrialEngineerId" :show-message="false"> <el-form-item label=" " :required="modalData.dfIsProduct === 'I'" prop="industrialEngineerId" :show-message="false">
<span v-if="changeRequestFlag('industrialEngineerId') === 'N'" slot="label">I/E</span> <span v-if="changeRequestFlag('industrialEngineerId') === 'N'" slot="label">I/E</span>
@ -163,7 +163,7 @@
<span v-if="changeRequestFlag('cqcOperatorId') === 'N'" slot="label">CQC</span> <span v-if="changeRequestFlag('cqcOperatorId') === 'N'" slot="label">CQC</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2007)"><a herf="#">CQC</a></span> <span v-else style="cursor: pointer" slot="label" @click="getBaseList(2007)"><a herf="#">CQC</a></span>
<el-input v-model="modalData.cqcOperatorId" clearable :disabled="changeRequestFlag('cqcOperatorId') === 'N'" style="width: 120px"></el-input> <el-input v-model="modalData.cqcOperatorId" clearable :disabled="changeRequestFlag('cqcOperatorId') === 'N'" style="width: 120px"></el-input>
<el-input v-model="modalData.cqcOperatorName" disabled style="width: 300px"></el-input>
<el-input v-model="modalData.cqcOperatorName" disabled style="width: 297px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
<span v-if="changeRequestFlag('faiOperatorId') === 'N'" slot="label">FAI</span> <span v-if="changeRequestFlag('faiOperatorId') === 'N'" slot="label">FAI</span>
@ -285,7 +285,8 @@
<el-input class="inlineNumber numInput" v-model="costImpactData.productionProductNumber" :disabled="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('productionProductNumber') === 'N'" type="number" style="width: 100px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.productionProductNumber" :disabled="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('productionProductNumber') === 'N'" type="number" style="width: 100px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="处理意见"> <el-form-item label="处理意见">
<dict-data-select v-model="costImpactData.productionProductOpinions" :disabled="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('productionProductOpinions') === 'N'" style="width: 200px" dict-type="change_production_product_opinions"></dict-data-select>
<!-- <dict-data-select v-model="costImpactData.productionProductOpinions" :disabled="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('productionProductOpinions') === 'N'" style="width: 200px" dict-type="change_production_product_opinions"></dict-data-select>-->
<el-input v-model="costImpactData.productionProductOpinions" :disabled="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('productionProductOpinions') === 'N'" style="width: 200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报废金额"> <el-form-item label="报废金额">
<el-input class="inlineNumber numInput" v-model="costImpactData.productionProductScrapAmount" :disabled="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('productionProductScrapAmount') === 'N'" @input="handleInput(costImpactData.productionProductScrapAmount,1)" type="number" style="width: 140px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.productionProductScrapAmount" :disabled="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('productionProductScrapAmount') === 'N'" @input="handleInput(costImpactData.productionProductScrapAmount,1)" type="number" style="width: 140px"></el-input>
@ -308,7 +309,8 @@
<el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductNumber" :disabled="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventoryProductNumber') === 'N'" type="number" style="width: 100px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductNumber" :disabled="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventoryProductNumber') === 'N'" type="number" style="width: 100px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="处理意见"> <el-form-item label="处理意见">
<dict-data-select v-model="costImpactData.inventoryProductOpinions" :disabled="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventoryProductOpinions') === 'N'" style="width: 200px" dict-type="change_inventory_product_opinions"></dict-data-select>
<!-- <dict-data-select v-model="costImpactData.inventoryProductOpinions" :disabled="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventoryProductOpinions') === 'N'" style="width: 200px" dict-type="change_inventory_product_opinions"></dict-data-select>-->
<el-input v-model="costImpactData.inventoryProductOpinions" :disabled="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventoryProductOpinions') === 'N'" style="width: 200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报废金额"> <el-form-item label="报废金额">
<el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductScrapAmount" :disabled="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventoryProductScrapAmount') === 'N'" @input="handleInput(costImpactData.inventoryProductScrapAmount,2)" type="number" style="width: 140px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductScrapAmount" :disabled="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventoryProductScrapAmount') === 'N'" @input="handleInput(costImpactData.inventoryProductScrapAmount,2)" type="number" style="width: 140px"></el-input>
@ -340,7 +342,8 @@
<el-input class="inlineNumber numInput" v-model="costImpactData.affectedNumber" :disabled="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affectedNumber') === 'N'" type="number" style="width: 100px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.affectedNumber" :disabled="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affectedNumber') === 'N'" type="number" style="width: 100px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="处理意见"> <el-form-item label="处理意见">
<dict-data-select v-model="costImpactData.affectedOpinions" :disabled="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affectedOpinions') === 'N'" style="width: 200px" dict-type="change_affected_opinions"></dict-data-select>
<!-- <dict-data-select v-model="costImpactData.affectedOpinions" :disabled="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affectedOpinions') === 'N'" style="width: 200px" dict-type="change_affected_opinions"></dict-data-select>-->
<el-input v-model="costImpactData.affectedOpinions" :disabled="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affectedOpinions') === 'N'" style="width: 200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报废金额"> <el-form-item label="报废金额">
<el-input class="inlineNumber numInput" v-model="costImpactData.affectedScrapAmount" :disabled="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affectedScrapAmount') === 'N'" @input="handleInput(costImpactData.affectedScrapAmount,3)" type="number" style="width: 140px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.affectedScrapAmount" :disabled="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affectedScrapAmount') === 'N'" @input="handleInput(costImpactData.affectedScrapAmount,3)" type="number" style="width: 140px"></el-input>
@ -664,7 +667,8 @@
<el-input class="inlineNumber numInput" v-model="currentCostImpactData.productionProductNumber" readonly :disabled="currentCostImpactData.productionProductFlag !== 'Y'" type="number" style="width: 100px"></el-input> <el-input class="inlineNumber numInput" v-model="currentCostImpactData.productionProductNumber" readonly :disabled="currentCostImpactData.productionProductFlag !== 'Y'" type="number" style="width: 100px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="处理意见"> <el-form-item label="处理意见">
<dict-data-select v-model="currentCostImpactData.productionProductOpinions" :disabled="currentCostImpactData.productionProductFlag !== 'Y'" style="width: 130px" dict-type="change_production_product_opinions"></dict-data-select>
<!-- <dict-data-select v-model="currentCostImpactData.productionProductOpinions" :disabled="currentCostImpactData.productionProductFlag !== 'Y'" style="width: 130px" dict-type="change_production_product_opinions"></dict-data-select>-->
<el-input v-model="currentCostImpactData.productionProductOpinions" :disabled="currentCostImpactData.productionProductFlag !== 'Y'" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报废金额"> <el-form-item label="报废金额">
<el-input class="inlineNumber numInput" v-model="currentCostImpactData.productionProductScrapAmount" :disabled="currentCostImpactData.productionProductFlag !== 'Y'" type="number" style="width: 140px"></el-input> <el-input class="inlineNumber numInput" v-model="currentCostImpactData.productionProductScrapAmount" :disabled="currentCostImpactData.productionProductFlag !== 'Y'" type="number" style="width: 140px"></el-input>
@ -684,7 +688,8 @@
<el-input class="inlineNumber numInput" v-model="currentCostImpactData.inventoryProductNumber" readonly :disabled="currentCostImpactData.inventoryProductFlag !== 'Y'" type="number" style="width: 100px"></el-input> <el-input class="inlineNumber numInput" v-model="currentCostImpactData.inventoryProductNumber" readonly :disabled="currentCostImpactData.inventoryProductFlag !== 'Y'" type="number" style="width: 100px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="处理意见"> <el-form-item label="处理意见">
<dict-data-select v-model="currentCostImpactData.inventoryProductOpinions" :disabled="currentCostImpactData.inventoryProductFlag !== 'Y'" style="width: 130px" dict-type="change_inventory_product_opinions"></dict-data-select>
<!-- <dict-data-select v-model="currentCostImpactData.inventoryProductOpinions" :disabled="currentCostImpactData.inventoryProductFlag !== 'Y'" style="width: 130px" dict-type="change_inventory_product_opinions"></dict-data-select>-->
<el-input v-model="currentCostImpactData.inventoryProductOpinions" :disabled="currentCostImpactData.inventoryProductFlag !== 'Y'" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报废金额"> <el-form-item label="报废金额">
<el-input class="inlineNumber numInput" v-model="currentCostImpactData.inventoryProductScrapAmount" :disabled="currentCostImpactData.inventoryProductFlag !== 'Y'" type="number" style="width: 140px"></el-input> <el-input class="inlineNumber numInput" v-model="currentCostImpactData.inventoryProductScrapAmount" :disabled="currentCostImpactData.inventoryProductFlag !== 'Y'" type="number" style="width: 140px"></el-input>
@ -712,7 +717,8 @@
<el-input class="inlineNumber numInput" v-model="currentCostImpactData.affectedNumber" readonly :disabled="currentCostImpactData.affectedFlag !== 'Y'" type="number" style="width: 100px"></el-input> <el-input class="inlineNumber numInput" v-model="currentCostImpactData.affectedNumber" readonly :disabled="currentCostImpactData.affectedFlag !== 'Y'" type="number" style="width: 100px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="处理意见"> <el-form-item label="处理意见">
<dict-data-select v-model="currentCostImpactData.affectedOpinions" :disabled="currentCostImpactData.affectedFlag !== 'Y'" style="width: 130px" dict-type="change_affected_opinions"></dict-data-select>
<!-- <dict-data-select v-model="currentCostImpactData.affectedOpinions" :disabled="currentCostImpactData.affectedFlag !== 'Y'" style="width: 130px" dict-type="change_affected_opinions"></dict-data-select>-->
<el-input v-model="currentCostImpactData.affectedOpinions" :disabled="currentCostImpactData.affectedFlag !== 'Y'" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报废金额"> <el-form-item label="报废金额">
<el-input class="inlineNumber numInput" v-model="currentCostImpactData.affectedScrapAmount" :disabled="currentCostImpactData.affectedFlag !== 'Y'" type="number" style="width: 140px"></el-input> <el-input class="inlineNumber numInput" v-model="currentCostImpactData.affectedScrapAmount" :disabled="currentCostImpactData.affectedFlag !== 'Y'" type="number" style="width: 140px"></el-input>
@ -3080,14 +3086,14 @@
this.$message.warning('请选择申请日期！') this.$message.warning('请选择申请日期！')
return return
} }
if (this.modalData.changeImpact === '' || this.modalData.changeImpact == null) {
this.$message.warning('请选择ECN变更影响！')
return
}
if ((this.modalData.changeImpactDesc === '' || this.modalData.changeImpactDesc == null) && this.modalData.changeImpact === 'Y') {
this.$message.warning('请填写变更影响描述！')
return
}
// if (this.modalData.changeImpact === '' || this.modalData.changeImpact == null) {
// this.$message.warning('请选择ECN变更影响！')
// return
// }
// if ((this.modalData.changeImpactDesc === '' || this.modalData.changeImpactDesc == null) && this.modalData.changeImpact === 'Y') {
// this.$message.warning('请填写变更影响描述！')
// return
// }
if (this.modalData.ecnStage === '' || this.modalData.ecnStage == null) { if (this.modalData.ecnStage === '' || this.modalData.ecnStage == null) {
this.$message.warning('请选择ECN阶段！') this.$message.warning('请选择ECN阶段！')
return return

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

@ -115,11 +115,11 @@
:editable=false> :editable=false>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="ECN变更影响" prop="changeImpact" :rules="rules.changeImpact">
<dict-data-select v-if="modalFlag" v-model="modalData.changeImpact" style="width: 205px" dict-type="change_change_Impact"></dict-data-select>
</el-form-item>
<el-form-item label="变更影响描述" prop="changeImpactDesc" :rules="[{required: modalData.changeImpact === 'Yes',message: ' ',trigger: ['blur','change']}]">
<el-input v-model="modalData.changeImpactDesc" style="width: 423px"></el-input>
<!-- <el-form-item label="ECN变更影响" prop="changeImpact" :rules="rules.changeImpact">-->
<!-- <dict-data-select v-if="modalFlag" v-model="modalData.changeImpact" style="width: 205px" dict-type="change_change_Impact"></dict-data-select>-->
<!-- </el-form-item>-->
<el-form-item label="变更影响描述" prop="changeImpactDesc">
<el-input v-model="modalData.changeImpactDesc" style="width: 641px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
@ -156,7 +156,7 @@
<!-- <dict-data-select v-model="modalData.printing" style="width: 205px" dict-type="change_printing"></dict-data-select>--> <!-- <dict-data-select v-model="modalData.printing" style="width: 205px" dict-type="change_printing"></dict-data-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item label="是否DF产品" prop="dfIsProduct" :rules="rules.dfIsProduct"> <el-form-item label="是否DF产品" prop="dfIsProduct" :rules="rules.dfIsProduct">
<dict-data-select v-if="modalFlag" v-model="modalData.dfIsProduct" style="width: 205px" dict-type="change_df_is_product"></dict-data-select>
<dict-data-select v-if="modalFlag" v-model="modalData.dfIsProduct" style="width: 202px" dict-type="change_df_is_product"></dict-data-select>
</el-form-item> </el-form-item>
<el-form-item label=" " prop="industrialEngineerId" :rules="[{required: modalData.dfIsProduct === 'Yes',message: ' ',trigger: ['blur','change']}]"> <el-form-item label=" " prop="industrialEngineerId" :rules="[{required: modalData.dfIsProduct === 'Yes',message: ' ',trigger: ['blur','change']}]">
<span style="cursor: pointer" slot="label" @click="getBaseList(2006)"><a herf="#">I/E</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(2006)"><a herf="#">I/E</a></span>
@ -171,7 +171,7 @@
<el-form-item label=" "> <el-form-item label=" ">
<span style="cursor: pointer" slot="label" @click="getBaseList(2007)"><a herf="#">CQC</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(2007)"><a herf="#">CQC</a></span>
<el-input v-model="modalData.cqcOperatorId" clearable style="width: 120px"></el-input> <el-input v-model="modalData.cqcOperatorId" clearable style="width: 120px"></el-input>
<el-input v-model="modalData.cqcOperatorName" disabled style="width: 300px"></el-input>
<el-input v-model="modalData.cqcOperatorName" disabled style="width: 297px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
<span style="cursor: pointer" slot="label" @click="getBaseList(2008)"><a herf="#">FAI</a></span> <span style="cursor: pointer" slot="label" @click="getBaseList(2008)"><a herf="#">FAI</a></span>
@ -276,8 +276,9 @@
</el-form> </el-form>
</div> </div>
<el-footer style="height:25px;text-align:center"> <el-footer style="height:25px;text-align:center">
<el-button v-if="basicInformationFlag" type="primary" @click="saveData">保存</el-button>
<el-button v-if="basicInformationFlag" type="primary" @click="saveData(1)">应用</el-button>
<el-button type="primary" @click="closeModalFlag">关闭</el-button> <el-button type="primary" @click="closeModalFlag">关闭</el-button>
<el-button v-if="basicInformationFlag" type="primary" @click="saveData(2)">保存并跳转</el-button>
</el-footer> </el-footer>
</el-tab-pane> </el-tab-pane>
@ -291,7 +292,8 @@
<el-input class="inlineNumber numInput" v-model="costImpactData.productionProductNumber" :disabled="costImpactData.productionProductFlag !== 'Y'" type="number" style="width: 100px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.productionProductNumber" :disabled="costImpactData.productionProductFlag !== 'Y'" type="number" style="width: 100px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="处理意见"> <el-form-item label="处理意见">
<dict-data-select v-if="modalFlag" v-model="costImpactData.productionProductOpinions" :disabled="costImpactData.productionProductFlag !== 'Y'" style="width: 200px" dict-type="change_production_product_opinions"></dict-data-select>
<!-- <dict-data-select v-if="modalFlag" v-model="costImpactData.productionProductOpinions" :disabled="costImpactData.productionProductFlag !== 'Y'" style="width: 200px" dict-type="change_production_product_opinions"></dict-data-select>-->
<el-input v-if="modalFlag" v-model="costImpactData.productionProductOpinions" :disabled="costImpactData.productionProductFlag !== 'Y'" style="width: 200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报废金额"> <el-form-item label="报废金额">
<el-input class="inlineNumber numInput" v-model="costImpactData.productionProductScrapAmount" :disabled="costImpactData.productionProductFlag !== 'Y'" @input="handleInput(costImpactData.productionProductScrapAmount,1)" type="number" style="width: 140px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.productionProductScrapAmount" :disabled="costImpactData.productionProductFlag !== 'Y'" @input="handleInput(costImpactData.productionProductScrapAmount,1)" type="number" style="width: 140px"></el-input>
@ -312,7 +314,8 @@
<el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductNumber" :disabled="costImpactData.inventoryProductFlag !== 'Y'" type="number" style="width: 100px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductNumber" :disabled="costImpactData.inventoryProductFlag !== 'Y'" type="number" style="width: 100px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="处理意见"> <el-form-item label="处理意见">
<dict-data-select v-if="modalFlag" v-model="costImpactData.inventoryProductOpinions" :disabled="costImpactData.inventoryProductFlag !== 'Y'" style="width: 200px" dict-type="change_inventory_product_opinions"></dict-data-select>
<!-- <dict-data-select v-if="modalFlag" v-model="costImpactData.inventoryProductOpinions" :disabled="costImpactData.inventoryProductFlag !== 'Y'" style="width: 200px" dict-type="change_inventory_product_opinions"></dict-data-select>-->
<el-input v-if="modalFlag" v-model="costImpactData.inventoryProductOpinions" :disabled="costImpactData.inventoryProductFlag !== 'Y'" style="width: 200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报废金额"> <el-form-item label="报废金额">
<el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductScrapAmount" :disabled="costImpactData.inventoryProductFlag !== 'Y'" @input="handleInput(costImpactData.inventoryProductScrapAmount,2)" type="number" style="width: 140px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductScrapAmount" :disabled="costImpactData.inventoryProductFlag !== 'Y'" @input="handleInput(costImpactData.inventoryProductScrapAmount,2)" type="number" style="width: 140px"></el-input>
@ -341,7 +344,8 @@
<el-input class="inlineNumber numInput" v-model="costImpactData.affectedNumber" :disabled="costImpactData.affectedFlag !== 'Y'" type="number" style="width: 100px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.affectedNumber" :disabled="costImpactData.affectedFlag !== 'Y'" type="number" style="width: 100px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="处理意见"> <el-form-item label="处理意见">
<dict-data-select v-if="modalFlag" v-model="costImpactData.affectedOpinions" :disabled="costImpactData.affectedFlag !== 'Y'" style="width: 200px" dict-type="change_affected_opinions"></dict-data-select>
<!-- <dict-data-select v-if="modalFlag" v-model="costImpactData.affectedOpinions" :disabled="costImpactData.affectedFlag !== 'Y'" style="width: 200px" dict-type="change_affected_opinions"></dict-data-select>-->
<el-input v-if="modalFlag" v-model="costImpactData.affectedOpinions" :disabled="costImpactData.affectedFlag !== 'Y'" style="width: 200px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报废金额"> <el-form-item label="报废金额">
<el-input class="inlineNumber numInput" v-model="costImpactData.affectedScrapAmount" :disabled="costImpactData.affectedFlag !== 'Y'" @input="handleInput(costImpactData.affectedScrapAmount,3)" type="number" style="width: 140px"></el-input> <el-input class="inlineNumber numInput" v-model="costImpactData.affectedScrapAmount" :disabled="costImpactData.affectedFlag !== 'Y'" @input="handleInput(costImpactData.affectedScrapAmount,3)" type="number" style="width: 140px"></el-input>
@ -364,8 +368,9 @@
</el-form> </el-form>
</div> </div>
<el-footer style="height:25px;text-align:center"> <el-footer style="height:25px;text-align:center">
<el-button v-if="InventoryCostImpactFlag" type="primary" @click="inventoryCostImpactSave">保存</el-button>
<el-button v-if="InventoryCostImpactFlag" type="primary" @click="inventoryCostImpactSave(1)">应用</el-button>
<el-button type="primary" @click="closeModalFlag">关闭</el-button> <el-button type="primary" @click="closeModalFlag">关闭</el-button>
<el-button v-if="InventoryCostImpactFlag" type="primary" @click="inventoryCostImpactSave(2)">保存并跳转</el-button>
</el-footer> </el-footer>
</el-tab-pane> </el-tab-pane>
@ -515,8 +520,9 @@
</div> </div>
</div> </div>
<el-footer style="height:25px;text-align:center"> <el-footer style="height:25px;text-align:center">
<el-button v-if="actionInformationFlag" type="primary" @click="executionInformationSave">保存</el-button>
<el-button v-if="actionInformationFlag" type="primary" @click="executionInformationSave(1)">应用</el-button>
<el-button type="primary" @click="closeModalFlag">关闭</el-button> <el-button type="primary" @click="closeModalFlag">关闭</el-button>
<el-button v-if="actionInformationFlag" type="primary" @click="executionInformationSave(2)">保存并跳转</el-button>
</el-footer> </el-footer>
</el-tab-pane> </el-tab-pane>
@ -568,8 +574,9 @@
</div> </div>
</div> </div>
<el-footer style="height:25px;text-align:center"> <el-footer style="height:25px;text-align:center">
<el-button v-if="CountersignatureFlag" type="primary" @click="countersignatureSave">保存</el-button>
<el-button v-if="CountersignatureFlag" type="primary" @click="countersignatureSave(1)">应用</el-button>
<el-button type="primary" @click="closeModalFlag">关闭</el-button> <el-button type="primary" @click="closeModalFlag">关闭</el-button>
<el-button v-if="CountersignatureFlag" type="primary" @click="countersignatureSave(2)">保存并跳转</el-button>
</el-footer> </el-footer>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -2006,8 +2013,17 @@
this.modalFlag = false this.modalFlag = false
}, },
// 跳转变更申请
toMenu () {
if (this.$router.resolve(`/changeManagement-changeRecord`).resolved.name === '404') {
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定'})
} else {
this.$router.push({name:`changeManagement-changeRecord`,params:{changeNo: this.modalData.changeNo}})
}
},
// 新增变更申请 // 新增变更申请
saveData () {
saveData (type) {
if (this.modalData.applicantId === '' || this.modalData.applicantId == null) { if (this.modalData.applicantId === '' || this.modalData.applicantId == null) {
this.$message.warning('请选择申请人员！') this.$message.warning('请选择申请人员！')
return return
@ -2016,14 +2032,14 @@
this.$message.warning('请选择申请日期！') this.$message.warning('请选择申请日期！')
return return
} }
if (this.modalData.changeImpact === '' || this.modalData.changeImpact == null) {
this.$message.warning('请选择ECN变更影响！')
return
}
if ((this.modalData.changeImpactDesc === '' || this.modalData.changeImpactDesc == null) && this.modalData.changeImpact === 'Yes') {
this.$message.warning('请填写变更影响描述！')
return
}
// if (this.modalData.changeImpact === '' || this.modalData.changeImpact == null) {
// this.$message.warning('请选择ECN变更影响！')
// return
// }
// if ((this.modalData.changeImpactDesc === '' || this.modalData.changeImpactDesc == null) && this.modalData.changeImpact === 'Yes') {
// this.$message.warning('请填写变更影响描述！')
// return
// }
if (this.modalData.ecnStage === '' || this.modalData.ecnStage == null) { if (this.modalData.ecnStage === '' || this.modalData.ecnStage == null) {
this.$message.warning('请选择ECN阶段！') this.$message.warning('请选择ECN阶段！')
return return
@ -2105,6 +2121,10 @@
duration: 1500, duration: 1500,
onClose: () => {} onClose: () => {}
}) })
if (type === 2) { // 保存并跳转
this.modalFlag = false
this.toMenu()
}
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -2114,7 +2134,7 @@
}, },
// 新增库存成本影响 // 新增库存成本影响
inventoryCostImpactSave () {
inventoryCostImpactSave (type) {
if (this.costImpactData.productionProductFlag === 'Y') { // 在生产品 if (this.costImpactData.productionProductFlag === 'Y') { // 在生产品
if (this.costImpactData.productionProductNumber == null || this.costImpactData.productionProductNumber === '') { if (this.costImpactData.productionProductNumber == null || this.costImpactData.productionProductNumber === '') {
this.$message.warning('请填写在生产品数量！') this.$message.warning('请填写在生产品数量！')
@ -2202,6 +2222,10 @@
duration: 1500, duration: 1500,
onClose: () => {} onClose: () => {}
}) })
if (type === 2) { // 保存并跳转
this.modalFlag = false
this.toMenu()
}
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -2211,7 +2235,7 @@
}, },
// 新增执行信息 // 新增执行信息
executionInformationSave () {
executionInformationSave (type) {
if (this.chooseItemList.length === 0) { if (this.chooseItemList.length === 0) {
this.$message.warning('请选择模板属性!') this.$message.warning('请选择模板属性!')
return; return;
@ -2254,6 +2278,10 @@
duration: 1500, duration: 1500,
onClose: () => {} onClose: () => {}
}) })
if (type === 2) { // 保存并跳转
this.modalFlag = false
this.toMenu()
}
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'
@ -2646,7 +2674,7 @@
}, },
// 新增会签信息 // 新增会签信息
countersignatureSave () {
countersignatureSave (type) {
if (this.chooseCSItemList.length === 0) { if (this.chooseCSItemList.length === 0) {
this.$message.warning('请选择模板属性!') this.$message.warning('请选择模板属性!')
return; return;
@ -2663,6 +2691,10 @@
duration: 1500, duration: 1500,
onClose: () => {} onClose: () => {}
}) })
if (type === 2) {
this.modalFlag = false
this.toMenu()
}
} else { } else {
this.$alert(data.msg, '错误', { this.$alert(data.msg, '错误', {
confirmButtonText: '确定' confirmButtonText: '确定'

17
src/views/modules/customer/customerInformationManagement.vue
View File

@ -111,7 +111,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
<el-form-item label="行业" prop="customerIndustry" :rules="rules.customerIndustry">
<el-form-item label="行业">
<dict-data-select v-if="modalFlag" v-model="modalData.customerIndustry" :disabled="detailModalFlag" style="width: 222px" dict-type="plm_customer_information_customer_industry"></dict-data-select> <dict-data-select v-if="modalFlag" v-model="modalData.customerIndustry" :disabled="detailModalFlag" style="width: 222px" dict-type="plm_customer_information_customer_industry"></dict-data-select>
</el-form-item> </el-form-item>
<el-form-item label="币种" prop="customerCurrency" :rules="rules.customerCurrency"> <el-form-item label="币种" prop="customerCurrency" :rules="rules.customerCurrency">
@ -1708,13 +1708,6 @@
trigger: ['blur','change'] trigger: ['blur','change']
} }
], ],
customerIndustry: [
{
required: true,
message: ' ',
trigger: ['blur','change']
}
],
customerCurrency: [ customerCurrency: [
{ {
required: true, required: true,
@ -2655,10 +2648,10 @@
this.$message.warning('请输入客户名称！') this.$message.warning('请输入客户名称！')
return return
} }
if (this.modalData.customerIndustry === '' || this.modalData.customerIndustry == null) {
this.$message.warning('请输入行业！')
return
}
// if (this.modalData.customerIndustry === '' || this.modalData.customerIndustry == null) {
// this.$message.warning('请输入行业！')
// return
// }
if (this.modalData.customerCurrency === '' || this.modalData.customerCurrency == null) { if (this.modalData.customerCurrency === '' || this.modalData.customerCurrency == null) {
this.$message.warning('请输入币种！') this.$message.warning('请输入币种！')
return return

29
src/views/modules/project/projectInfo/com_project_info_part.vue
View File

@ -589,7 +589,7 @@
<el-form-item :label="'物料名称'"> <el-form-item :label="'物料名称'">
<el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input> <el-input v-model="partData.partDesc" clearable style="width: 120px"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="' '">
<el-form-item label=" ">
<el-button type="primary" @click="getPartList">查询</el-button> <el-button type="primary" @click="getPartList">查询</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -598,7 +598,7 @@
<el-header style="width: 880px;height: 200px;padding: 0 0 0 0"> <el-header style="width: 880px;height: 200px;padding: 0 0 0 0">
<span style="font-size: 12px" >可选物料:</span> <span style="font-size: 12px" >可选物料:</span>
<el-table <el-table
height="200px"`
height="200px"
:data="partList1" :data="partList1"
border border
ref="partTable1" ref="partTable1"
@ -860,6 +860,22 @@
fixed: '', fixed: '',
columnWidth: 100 columnWidth: 100
}, },
{
userId: this.$store.state.user.name,
functionId: 101002001,
serialNumber: '101002001Table4PartNoSource',
tableId: "101002001Table4",
tableName: "项目物料",
columnProp: "partNoSource",
headerAlign: "center",
align: "center",
columnLabel: "料号来源",
columnHidden: false,
columnImage: false,
status: true,
fixed: '',
columnWidth: 100
},
{ {
userId: this.$store.state.user.name, userId: this.$store.state.user.name,
functionId: 101002001, functionId: 101002001,
@ -1673,7 +1689,8 @@
fixedLeadTimeHour: 0, fixedLeadTimeHour: 0,
density: 0, density: 0,
variableLeadTimeHour: 0, variableLeadTimeHour: 0,
customerNo: this.searchData.customerId
customerNo: this.searchData.customerId,
partNoSource: '料号新增'
} }
this.modalFlag = true this.modalFlag = true
this.modalDisableFlag = false this.modalDisableFlag = false
@ -1901,7 +1918,8 @@
fixedLeadTimeHour: data.rows.fixedLeadTimeHour, fixedLeadTimeHour: data.rows.fixedLeadTimeHour,
density: data.rows.density, density: data.rows.density,
variableLeadTimeHour: data.rows.variableLeadTimeHour, variableLeadTimeHour: data.rows.variableLeadTimeHour,
customerNo: this.searchData.customerId
customerNo: this.searchData.customerId,
partNoSource: '料号复制'
} }
this.modalFlag = true this.modalFlag = true
this.modalDisableFlag = false this.modalDisableFlag = false
@ -2170,7 +2188,8 @@
projectId: this.searchData.projectId, projectId: this.searchData.projectId,
customerNo: this.searchData.customerId, customerNo: this.searchData.customerId,
createBy: this.$store.state.user.name, createBy: this.$store.state.user.name,
partList: this.partList2
partList: this.partList2,
partNoSource: '料号导入'
} }
addProjectPart2(tempData).then(({data}) => { addProjectPart2(tempData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {

4
src/views/modules/sampleManagement/com_technical-add-or-update.vue
View File

@ -120,13 +120,13 @@
</span> </span>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
width="600px"
width="900px"
title="选择打样单" title="选择打样单"
:close-on-click-modal="false" :close-on-click-modal="false"
:visible.sync="proofingModelFlag"> :visible.sync="proofingModelFlag">
<el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole"> <el-form :inline="true" label-position="top" label-width="100px" :rules="dataRole">
<el-table <el-table
height="300"
height="450"
:data="proofingList" :data="proofingList"
border border
@row-dblclick="chooseProofingNo" @row-dblclick="chooseProofingNo"

Write Preview
Loading…
Cancel
Save