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

2024-05-31 更新

master
fengyuan_yang 2 years ago
parent
c5896638d4
commit
948f7e45ad
4 changed files with 261 additions and 193 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. 160
      src/views/modules/changeManagement/changeRecord.vue
  2. 10
      src/views/modules/processManagement/processBindingInfo.vue
  3. 101
      src/views/modules/quotation/requestForQuote.vue
  4. 85
      src/views/modules/test/requestForTest.vue

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

@ -81,9 +81,9 @@
<div style="height: 675px"> <div style="height: 675px">
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-top: -5px;">
<el-form-item prop="applicantId" :rules="rules.applicantId"> <el-form-item prop="applicantId" :rules="rules.applicantId">
<span v-if="changeRequestFlag('applicant_id') === 'N'" slot="label">申请人</span>
<span v-if="changeRequestFlag('applicantId') === 'N'" slot="label">申请人</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(103, 1)"><a herf="#">申请人</a></span> <span v-else style="cursor: pointer" slot="label" @click="getBaseList(103, 1)"><a herf="#">申请人</a></span>
<el-input v-model="modalData.applicantId" :disabled="changeRequestFlag('applicant_id') === 'N'" style="width: 120px"></el-input>
<el-input v-model="modalData.applicantId" :disabled="changeRequestFlag('applicantId') === 'N'" style="width: 120px"></el-input>
<el-input v-model="modalData.applicantName" disabled style="width: 300px"></el-input> <el-input v-model="modalData.applicantName" disabled style="width: 300px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="申请部门"> <el-form-item label="申请部门">
@ -94,7 +94,7 @@
<el-form :inline="true" label-position="top" :model="modalData" :rules="rules"> <el-form :inline="true" label-position="top" :model="modalData" :rules="rules">
<el-form-item label="申请日期" prop="applyDate" :rules="rules.applyDate"> <el-form-item label="申请日期" prop="applyDate" :rules="rules.applyDate">
<el-date-picker <el-date-picker
:disabled="changeRequestFlag('apply_date') === 'N'"
:disabled="changeRequestFlag('applyDate') === 'N'"
style="width: 205px" style="width: 205px"
v-model="modalData.applyDate" v-model="modalData.applyDate"
type="date" type="date"
@ -104,36 +104,36 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="ECN变更影响" prop="changeImpact" :rules="rules.changeImpact"> <el-form-item label="ECN变更影响" prop="changeImpact" :rules="rules.changeImpact">
<dict-data-select v-model="modalData.changeImpact" :disabled="changeRequestFlag('change_impact') === 'N'" style="width: 205px" dict-type="change_change_Impact"></dict-data-select>
<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>
<el-form-item label="变更影响描述" prop="changeImpactDesc" :rules="[{required: modalData.changeImpact === 'Y',message: ' ',trigger: ['blur','change']}]"> <el-form-item label="变更影响描述" prop="changeImpactDesc" :rules="[{required: modalData.changeImpact === 'Y',message: ' ',trigger: ['blur','change']}]">
<el-input v-model="modalData.changeImpactDesc" :disabled="changeRequestFlag('change_impact_desc') === 'N'" style="width: 423px"></el-input>
<el-input v-model="modalData.changeImpactDesc" :disabled="changeRequestFlag('changeImpactDesc') === 'N'" style="width: 423px"></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">
<el-form-item label="ECN阶段" prop="ecnStage" :rules="rules.ecnStage"> <el-form-item label="ECN阶段" prop="ecnStage" :rules="rules.ecnStage">
<dict-data-select v-model="modalData.ecnStage" :disabled="changeRequestFlag('ecn_stage') === 'N'" style="width: 95px" dict-type="change_ecn_stage"></dict-data-select>
<dict-data-select v-model="modalData.ecnStage" :disabled="changeRequestFlag('ecnStage') === 'N'" style="width: 95px" dict-type="change_ecn_stage"></dict-data-select>
</el-form-item> </el-form-item>
<el-form-item label="变更类别" prop="changeType" :rules="rules.changeType"> <el-form-item label="变更类别" prop="changeType" :rules="rules.changeType">
<dict-data-select v-model="modalData.changeType" :disabled="changeRequestFlag('change_type') === 'N'" style="width: 95px" dict-type="change_change_type"></dict-data-select>
<dict-data-select v-model="modalData.changeType" :disabled="changeRequestFlag('changeType') === 'N'" style="width: 95px" dict-type="change_change_type"></dict-data-select>
</el-form-item> </el-form-item>
<el-form-item label="ECN种类" prop="ecnType" :rules="rules.ecnType"> <el-form-item label="ECN种类" prop="ecnType" :rules="rules.ecnType">
<dict-data-select v-model="modalData.ecnType" :disabled="changeRequestFlag('ecn_type') === 'N'" style="width: 100px" dict-type="change_ecn_type"></dict-data-select>
<dict-data-select v-model="modalData.ecnType" :disabled="changeRequestFlag('ecnType') === 'N'" style="width: 100px" dict-type="change_ecn_type"></dict-data-select>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
<el-button :disabled="changeRequestFlag('ecn_type') === 'N'" type="primary" @click="chooseEcnTypeModal" style="width: 90px">ECN种类</el-button>
<el-button :disabled="changeRequestFlag('ecnType') === 'N'" type="primary" @click="chooseEcnTypeModal" style="width: 90px">ECN种类</el-button>
</el-form-item> </el-form-item>
<el-form-item prop="tpEngineerId" :rules="rules.tpEngineerId"> <el-form-item prop="tpEngineerId" :rules="rules.tpEngineerId">
<span v-if="changeRequestFlag('tp_engineer_id') === 'N'" slot="label">审批人员</span>
<span v-if="changeRequestFlag('tpEngineerId') === 'N'" slot="label">审批人员</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2005)"><a herf="#">审批人员</a></span> <span v-else style="cursor: pointer" slot="label" @click="getBaseList(2005)"><a herf="#">审批人员</a></span>
<el-input v-model="modalData.tpEngineerId" clearable :disabled="changeRequestFlag('tp_engineer_id') === 'N'" style="width: 120px"></el-input>
<el-input v-model="modalData.tpEngineerId" clearable :disabled="changeRequestFlag('tpEngineerId') === 'N'" style="width: 120px"></el-input>
<el-input v-model="modalData.tpEngineerName" disabled style="width: 300px"></el-input> <el-input v-model="modalData.tpEngineerName" disabled style="width: 300px"></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">
<el-form-item label="变更生效日期" prop="changePhaseInDate" :rules="rules.changePhaseInDate"> <el-form-item label="变更生效日期" prop="changePhaseInDate" :rules="rules.changePhaseInDate">
<el-date-picker <el-date-picker
:disabled="changeRequestFlag('change_phase_in_date') === 'N'"
:disabled="changeRequestFlag('changePhaseInDate') === 'N'"
style="width: 205px" style="width: 205px"
v-model="modalData.changePhaseInDate" v-model="modalData.changePhaseInDate"
type="date" type="date"
@ -146,12 +146,12 @@
<!-- <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('df_is_product') === '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: 205px" 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('industrial_engineer_id') === 'N'" slot="label">I/E</span>
<span v-if="changeRequestFlag('industrialEngineerId') === 'N'" slot="label">I/E</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2006)"><a herf="#">I/E</a></span> <span v-else style="cursor: pointer" slot="label" @click="getBaseList(2006)"><a herf="#">I/E</a></span>
<el-input v-model="modalData.industrialEngineerId" clearable :disabled="changeRequestFlag('industrial_engineer_id') === 'N'" style="width: 120px"></el-input>
<el-input v-model="modalData.industrialEngineerId" clearable :disabled="changeRequestFlag('industrialEngineerId') === 'N'" style="width: 120px"></el-input>
<el-input v-model="modalData.industrialEngineerName" disabled style="width: 300px"></el-input> <el-input v-model="modalData.industrialEngineerName" disabled style="width: 300px"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="制造成本是否变更" prop="manufacturingCostIsChange" :rules="rules.manufacturingCostIsChange">--> <!-- <el-form-item label="制造成本是否变更" prop="manufacturingCostIsChange" :rules="rules.manufacturingCostIsChange">-->
@ -160,21 +160,21 @@
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="modalData"> <el-form :inline="true" label-position="top" :model="modalData">
<el-form-item label=" "> <el-form-item label=" ">
<span v-if="changeRequestFlag('cqc_operator_id') === '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('cqc_operator_id') === '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: 300px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label=" "> <el-form-item label=" ">
<span v-if="changeRequestFlag('fai_operator_id') === 'N'" slot="label">FAI</span>
<span v-if="changeRequestFlag('faiOperatorId') === 'N'" slot="label">FAI</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2008)"><a herf="#">FAI</a></span> <span v-else style="cursor: pointer" slot="label" @click="getBaseList(2008)"><a herf="#">FAI</a></span>
<el-input v-model="modalData.faiOperatorId" clearable :disabled="changeRequestFlag('fai_operator_id') === 'N'" style="width: 120px"></el-input>
<el-input v-model="modalData.faiOperatorId" clearable :disabled="changeRequestFlag('faiOperatorId') === 'N'" style="width: 120px"></el-input>
<el-input v-model="modalData.faiOperatorName" disabled style="width: 300px"></el-input> <el-input v-model="modalData.faiOperatorName" disabled style="width: 300px"></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">
<el-form-item label="变更要求描述" prop="changeRequestDesc" :rules="rules.changeRequestDesc"> <el-form-item label="变更要求描述" prop="changeRequestDesc" :rules="rules.changeRequestDesc">
<el-input type="textarea" v-model="modalData.changeRequestDesc" :disabled="changeRequestFlag('change_request_desc') === 'N'" :rows="3" resize='none' show-word-limit style="width: 643px;height: 30px"></el-input>
<el-input type="textarea" v-model="modalData.changeRequestDesc" :disabled="changeRequestFlag('changeRequestDesc') === 'N'" :rows="3" resize='none' show-word-limit style="width: 643px;height: 30px"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="是否重新报价" prop="isReQuote" :rules="rules.isReQuote">--> <!-- <el-form-item label="是否重新报价" prop="isReQuote" :rules="rules.isReQuote">-->
<!-- <dict-data-select v-model="modalData.isReQuote" style="width: 205px" dict-type="change_is_re_quote"></dict-data-select>--> <!-- <dict-data-select v-model="modalData.isReQuote" style="width: 205px" dict-type="change_is_re_quote"></dict-data-select>-->
@ -228,8 +228,8 @@
min-width="170" min-width="170"
label="新物料编码"> label="新物料编码">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input :disabled="changeRequestDetailFlag('new_part_no') === 'N'" @input="(val)=>partInput(scope.row, val)" :ref="`newPartNo${scope.$index}`" v-model="scope.row.newPartNo" @keyup.enter.native="focusNextInput(scope.$index, 'newPartNo')" style="width:77%"></el-input>
<el-button :disabled="changeRequestDetailFlag('new_part_no') === 'N'" type="primary" @click="choosePartNo(scope.row)" style="width:18%;padding: 3px 7px">·&nbsp;·&nbsp;·</el-button>
<el-input :disabled="changeRequestDetailFlag('newPartNo') === 'N'" @input="(val)=>partInput(scope.row, val)" :ref="`newPartNo${scope.$index}`" v-model="scope.row.newPartNo" @keyup.enter.native="focusNextInput(scope.$index, 'newPartNo')" style="width:77%"></el-input>
<el-button :disabled="changeRequestDetailFlag('newPartNo') === 'N'" type="primary" @click="choosePartNo(scope.row)" style="width:18%;padding: 3px 7px">·&nbsp;·&nbsp;·</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -239,7 +239,7 @@
min-width="90" min-width="90"
label="新图纸编码"> label="新图纸编码">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input :disabled="changeRequestDetailFlag('new_drawing_no') === 'N'" :ref="`newDrawingNo${scope.$index}`" v-model="scope.row.newDrawingNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDrawingNo')" style="width:98%"></el-input>
<el-input :disabled="changeRequestDetailFlag('newDrawingNo') === 'N'" :ref="`newDrawingNo${scope.$index}`" v-model="scope.row.newDrawingNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDrawingNo')" style="width:98%"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -249,7 +249,7 @@
min-width="90" min-width="90"
label="新图稿编码"> label="新图稿编码">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input :disabled="changeRequestDetailFlag('new_draft_no') === 'N'" :ref="`newDraftNo${scope.$index}`" v-model="scope.row.newDraftNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDraftNo')" style="width:98%"></el-input>
<el-input :disabled="changeRequestDetailFlag('newDraftNo') === 'N'" :ref="`newDraftNo${scope.$index}`" v-model="scope.row.newDraftNo" @keyup.enter.native="focusNextInput(scope.$index, 'newDraftNo')" style="width:98%"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -279,79 +279,79 @@
<div style="height: 675px"> <div style="height: 675px">
<el-form :inline="true" label-position="top" :model="costImpactData" style="margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="costImpactData" style="margin-top: -5px;">
<el-form-item style="margin-top: 20px;width: 155px"> <el-form-item style="margin-top: 20px;width: 155px">
<el-checkbox :disabled="changeCostImpactFlag('production_product_flag') === 'N'" v-model="costImpactData.productionProductFlag" true-label="Y">在生产品</el-checkbox>
<el-checkbox :disabled="changeCostImpactFlag('productionProductFlag') === 'N'" v-model="costImpactData.productionProductFlag" true-label="Y">在生产品</el-checkbox>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量">
<el-input class="inlineNumber numInput" v-model="costImpactData.productionProductNumber" :disabled="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('production_product_number') === '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('production_product_opinions') === '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-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('production_product_scrap_amount') === '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>
</el-form-item> </el-form-item>
<!-- <el-form-item label=" " style="margin-left: -10px">--> <!-- <el-form-item label=" " style="margin-left: -10px">-->
<!-- <el-input v-model="costImpactData.productionProductRemark" :disabled="costImpactData.productionProductFlag !== 'Y'" style="width: 300px"></el-input>--> <!-- <el-input v-model="costImpactData.productionProductRemark" :disabled="costImpactData.productionProductFlag !== 'Y'" style="width: 300px"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<span v-if="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('production_product_executor') === 'N'" slot="label">执行人</span>
<span v-if="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('productionProductExecutor') === 'N'" slot="label">执行人</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(103, 3)"><a herf="#">执行人</a></span> <span v-else style="cursor: pointer" slot="label" @click="getBaseList(103, 3)"><a herf="#">执行人</a></span>
<el-input v-model="costImpactData.productionProductExecutorName" readonly :disabled="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('production_product_executor') === 'N'" style="width: 130px"></el-input>
<el-input v-model="costImpactData.productionProductExecutorName" readonly :disabled="costImpactData.productionProductFlag !== 'Y' || changeCostImpactFlag('productionProductExecutor') === 'N'" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="costImpactData" style="margin-top: 10px;"> <el-form :inline="true" label-position="top" :model="costImpactData" style="margin-top: 10px;">
<el-form-item style="margin-top: 20px;width: 155px"> <el-form-item style="margin-top: 20px;width: 155px">
<el-checkbox :disabled="changeCostImpactFlag('inventory_product_flag') === 'N'" v-model="costImpactData.inventoryProductFlag" true-label="Y">成品库存</el-checkbox>
<el-checkbox :disabled="changeCostImpactFlag('inventoryProductFlag') === 'N'" v-model="costImpactData.inventoryProductFlag" true-label="Y">成品库存</el-checkbox>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量">
<el-input class="inlineNumber numInput" v-model="costImpactData.inventoryProductNumber" :disabled="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventory_product_number') === '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('inventory_product_opinions') === '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-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('inventory_product_scrap_amount') === '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>
</el-form-item> </el-form-item>
<!-- <el-form-item label=" " style="margin-left: -10px">--> <!-- <el-form-item label=" " style="margin-left: -10px">-->
<!-- <el-input v-model="costImpactData.inventoryProductRemark" :disabled="costImpactData.inventoryProductFlag !== 'Y'" style="width: 300px"></el-input>--> <!-- <el-input v-model="costImpactData.inventoryProductRemark" :disabled="costImpactData.inventoryProductFlag !== 'Y'" style="width: 300px"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<span v-if="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventory_product_executor') === 'N'" slot="label">执行人</span>
<span v-if="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventoryProductExecutor') === 'N'" slot="label">执行人</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(103, 4)"><a herf="#">执行人</a></span> <span v-else style="cursor: pointer" slot="label" @click="getBaseList(103, 4)"><a herf="#">执行人</a></span>
<el-input v-model="costImpactData.inventoryProductExecutorName" readonly :disabled="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventory_product_executor') === 'N'" style="width: 130px"></el-input>
<el-input v-model="costImpactData.inventoryProductExecutorName" readonly :disabled="costImpactData.inventoryProductFlag !== 'Y' || changeCostImpactFlag('inventoryProductExecutor') === 'N'" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="costImpactData" style="margin-top: 10px;"> <el-form :inline="true" label-position="top" :model="costImpactData" style="margin-top: 10px;">
<el-form-item style="margin-top: 20px;width: 155px"> <el-form-item style="margin-top: 20px;width: 155px">
<el-checkbox :disabled="changeCostImpactFlag('new_order_flag') === 'N'" v-model="costImpactData.newOrderFlag" true-label="Y">新订单</el-checkbox>
<el-checkbox :disabled="changeCostImpactFlag('newOrderFlag') === 'N'" v-model="costImpactData.newOrderFlag" true-label="Y">新订单</el-checkbox>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量">
<el-input class="inlineNumber numInput" v-model="costImpactData.newOrderNumber" :disabled="costImpactData.newOrderFlag !== 'Y' || changeCostImpactFlag('new_order_number') === 'N'" type="number" style="width: 100px"></el-input>
<el-input class="inlineNumber numInput" v-model="costImpactData.newOrderNumber" :disabled="costImpactData.newOrderFlag !== 'Y' || changeCostImpactFlag('newOrderNumber') === 'N'" type="number" style="width: 100px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="costImpactData" style="margin-top: 10px;"> <el-form :inline="true" label-position="top" :model="costImpactData" style="margin-top: 10px;">
<el-form-item style="margin-top: 20px;width: 155px"> <el-form-item style="margin-top: 20px;width: 155px">
<el-checkbox :disabled="changeCostImpactFlag('affected_flag') === 'N'" v-model="costImpactData.affectedFlag" true-label="Y">影响的原材料及其库存量</el-checkbox>
<el-checkbox :disabled="changeCostImpactFlag('affectedFlag') === 'N'" v-model="costImpactData.affectedFlag" true-label="Y">影响的原材料及其库存量</el-checkbox>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量">
<el-input class="inlineNumber numInput" v-model="costImpactData.affectedNumber" :disabled="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affected_number') === '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('affected_opinions') === '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-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('affected_scrap_amount') === '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>
</el-form-item> </el-form-item>
<!-- <el-form-item label=" " style="margin-left: -10px">--> <!-- <el-form-item label=" " style="margin-left: -10px">-->
<!-- <el-input v-model="costImpactData.affectedRemark" :disabled="costImpactData.affectedFlag !== 'Y'" style="width: 300px"></el-input>--> <!-- <el-input v-model="costImpactData.affectedRemark" :disabled="costImpactData.affectedFlag !== 'Y'" style="width: 300px"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<el-form-item> <el-form-item>
<span v-if="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affected_executor') === 'N'" slot="label">执行人</span>
<span v-if="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affectedExecutor') === 'N'" slot="label">执行人</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(103, 5)"><a herf="#">执行人</a></span> <span v-else style="cursor: pointer" slot="label" @click="getBaseList(103, 5)"><a herf="#">执行人</a></span>
<el-input v-model="costImpactData.affectedExecutorName" readonly :disabled="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affected_executor') === 'N'" style="width: 130px"></el-input>
<el-input v-model="costImpactData.affectedExecutorName" readonly :disabled="costImpactData.affectedFlag !== 'Y' || changeCostImpactFlag('affectedExecutor') === 'N'" style="width: 130px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="costImpactData" style="margin-top: 10px;"> <el-form :inline="true" label-position="top" :model="costImpactData" style="margin-top: 10px;">
@ -400,7 +400,7 @@
min-width="60" min-width="60"
label="可选值"> label="可选值">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select :disabled="changeFAItemFlag('choose_value') === 'N'" v-model="scope.row.chooseValue" placeholder="请选择">
<el-select :disabled="changeFAItemFlag('chooseValue') === 'N'" v-model="scope.row.chooseValue" placeholder="请选择">
<el-option v-for="item in scope.row.availableValueList" :key="item.availableValue" :label="item.availableValue" :value="item.availableValue"></el-option> <el-option v-for="item in scope.row.availableValueList" :key="item.availableValue" :label="item.availableValue" :value="item.availableValue"></el-option>
</el-select> </el-select>
</template> </template>
@ -411,7 +411,7 @@
min-width="120" min-width="120"
label="备注"> label="备注">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input :disabled="changeFAItemFlag('item_remark') === 'N'" v-model="scope.row.itemRemark"></el-input>
<el-input :disabled="changeFAItemFlag('itemRemark') === 'N'" v-model="scope.row.itemRemark"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column--> <!-- <el-table-column-->
@ -431,27 +431,27 @@
</div> </div>
<el-form :inline="true" label-position="top" :model="executionInfoData"> <el-form :inline="true" label-position="top" :model="executionInfoData">
<el-form-item label="原菲林编号"> <el-form-item label="原菲林编号">
<el-input :disabled="changeExecutionInfoFlag('original_film_no') === 'N'" v-model="executionInfoData.originalFilmNo" style="width: 230px"></el-input>
<el-input :disabled="changeExecutionInfoFlag('originalFilmNo') === 'N'" v-model="executionInfoData.originalFilmNo" style="width: 230px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="原啤刀编号"> <el-form-item label="原啤刀编号">
<el-input :disabled="changeExecutionInfoFlag('original_die_cutting_rule_no') === 'N'" v-model="executionInfoData.originalDieCuttingRuleNo" style="width: 230px"></el-input>
<el-input :disabled="changeExecutionInfoFlag('originalDieCuttingRuleNo') === 'N'" v-model="executionInfoData.originalDieCuttingRuleNo" style="width: 230px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="原网板/印版编号"> <el-form-item label="原网板/印版编号">
<el-input :disabled="changeExecutionInfoFlag('original_stencil_no') === 'N'" v-model="executionInfoData.originalStencilNo" style="width: 230px"></el-input>
<el-input :disabled="changeExecutionInfoFlag('originalStencilNo') === 'N'" v-model="executionInfoData.originalStencilNo" style="width: 230px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="ECN执行日期"> <el-form-item label="ECN执行日期">
<el-date-picker :disabled="changeExecutionInfoFlag('execution_date') === 'N'" style="width: 130px" v-model="executionInfoData.executionDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期" :editable=false></el-date-picker>
<el-date-picker :disabled="changeExecutionInfoFlag('executionDate') === 'N'" style="width: 130px" v-model="executionInfoData.executionDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期" :editable=false></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-form :inline="true" label-position="top" :model="executionInfoData" style="margin-top: -5px;"> <el-form :inline="true" label-position="top" :model="executionInfoData" style="margin-top: -5px;">
<el-form-item label="新菲林编号"> <el-form-item label="新菲林编号">
<el-input :disabled="changeExecutionInfoFlag('new_film_no') === 'N'" v-model="executionInfoData.newFilmNo" style="width: 230px"></el-input>
<el-input :disabled="changeExecutionInfoFlag('newFilmNo') === 'N'" v-model="executionInfoData.newFilmNo" style="width: 230px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新啤刀编号"> <el-form-item label="新啤刀编号">
<el-input :disabled="changeExecutionInfoFlag('new_die_cutting_rule_no') === 'N'" v-model="executionInfoData.newDieCuttingRuleNo" style="width: 230px"></el-input>
<el-input :disabled="changeExecutionInfoFlag('newDieCuttingRuleNo') === 'N'" v-model="executionInfoData.newDieCuttingRuleNo" style="width: 230px"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="新网板/印版编号"> <el-form-item label="新网板/印版编号">
<el-input :disabled="changeExecutionInfoFlag('new_stencil_no') === 'N'" v-model="executionInfoData.newStencilNo" style="width: 230px"></el-input>
<el-input :disabled="changeExecutionInfoFlag('newStencilNo') === 'N'" v-model="executionInfoData.newStencilNo" style="width: 230px"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="text-align: center ;font-size: 11px"> <div style="text-align: center ;font-size: 11px">
@ -497,7 +497,7 @@
min-width="150" min-width="150"
label="备注"> label="备注">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input :disabled="changeItemFlag('item_remark') === 'N'" v-model="scope.row.itemRemark" style="width:98%"></el-input>
<el-input :disabled="changeItemFlag('itemRemark') === 'N'" v-model="scope.row.itemRemark" style="width:98%"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -549,7 +549,7 @@
min-width="100" min-width="100"
label="备注"> label="备注">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input :disabled="changeCountersignatureItemFlag('item_remark') === 'N'" v-model="scope.row.itemRemark" style="width:98%"></el-input>
<el-input :disabled="changeCountersignatureItemFlag('itemRemark') === 'N'" v-model="scope.row.itemRemark" style="width:98%"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -899,6 +899,9 @@
}, },
changeRequestFlag () { changeRequestFlag () {
return (value) => { return (value) => {
if (!this.plmChangeRequestArr){
return 'N'
}
let arr = this.plmChangeRequestArr.filter(a => a.fieldId === value) let arr = this.plmChangeRequestArr.filter(a => a.fieldId === value)
if (arr.length > 0) { if (arr.length > 0) {
return arr[0].updateFlag return arr[0].updateFlag
@ -908,6 +911,9 @@
}, },
changeRequestDetailFlag () { changeRequestDetailFlag () {
return (value) => { return (value) => {
if (!this.plmChangeRequestDetailArr){
return 'N'
}
let arr = this.plmChangeRequestDetailArr.filter(a => a.fieldId === value) let arr = this.plmChangeRequestDetailArr.filter(a => a.fieldId === value)
if (arr.length > 0) { if (arr.length > 0) {
return arr[0].updateFlag return arr[0].updateFlag
@ -917,6 +923,9 @@
}, },
changeCostImpactFlag () { changeCostImpactFlag () {
return (value) => { return (value) => {
if (!this.plmChangeCostImpactArr){
return 'N'
}
let arr = this.plmChangeCostImpactArr.filter(a => a.fieldId === value) let arr = this.plmChangeCostImpactArr.filter(a => a.fieldId === value)
if (arr.length > 0) { if (arr.length > 0) {
return arr[0].updateFlag return arr[0].updateFlag
@ -926,6 +935,9 @@
}, },
changeFAItemFlag () { changeFAItemFlag () {
return (value) => { return (value) => {
if (!this.plmChangeFAItemArr){
return 'N'
}
let arr = this.plmChangeFAItemArr.filter(a => a.fieldId === value) let arr = this.plmChangeFAItemArr.filter(a => a.fieldId === value)
if (arr.length > 0) { if (arr.length > 0) {
return arr[0].updateFlag return arr[0].updateFlag
@ -935,6 +947,9 @@
}, },
changeExecutionInfoFlag () { changeExecutionInfoFlag () {
return (value) => { return (value) => {
if (!this.plmChangeExecutionInfoArr){
return 'N'
}
let arr = this.plmChangeExecutionInfoArr.filter(a => a.fieldId === value) let arr = this.plmChangeExecutionInfoArr.filter(a => a.fieldId === value)
if (arr.length > 0) { if (arr.length > 0) {
return arr[0].updateFlag return arr[0].updateFlag
@ -944,6 +959,9 @@
}, },
changeItemFlag () { changeItemFlag () {
return (value) => { return (value) => {
if (!this.plmChangeItemArr){
return 'N'
}
let arr = this.plmChangeItemArr.filter(a => a.fieldId === value) let arr = this.plmChangeItemArr.filter(a => a.fieldId === value)
if (arr.length > 0) { if (arr.length > 0) {
return arr[0].updateFlag return arr[0].updateFlag
@ -953,6 +971,9 @@
}, },
changeCountersignatureItemFlag () { changeCountersignatureItemFlag () {
return (value) => { return (value) => {
if (!this.plmChangeCountersignatureItemArr){
return 'N'
}
let arr = this.plmChangeCountersignatureItemArr.filter(a => a.fieldId === value) let arr = this.plmChangeCountersignatureItemArr.filter(a => a.fieldId === value)
if (arr.length > 0) { if (arr.length > 0) {
return arr[0].updateFlag return arr[0].updateFlag
@ -1954,13 +1975,12 @@
} }
await getNodeAuthority(tempData).then(({data}) => { await getNodeAuthority(tempData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.plmChangeRequestArr = data.rows.plmChangeRequest
this.plmChangeRequestDetailArr = data.rows.plmChangeRequestDetail
this.plmChangeCostImpactArr = data.rows.plmChangeCostImpact
this.plmChangeFAItemArr = data.rows.plmChangeFAItem
this.plmChangeExecutionInfoArr = data.rows.plmChangeExecutionInfo
this.plmChangeItemArr = data.rows.plmChangeItem
this.plmChangeCountersignatureItemArr = data.rows.plmChangeCountersignatureItem
this.plmChangeRequestArr = data.rows.plm_change_request
this.plmChangeRequestDetailArr = data.rows.plm_change_request_detail
this.plmChangeCostImpactArr = data.rows.plm_change_cost_impact
this.plmChangeFAItemArr = data.rows.plm_change_FA_item
this.plmChangeExecutionInfoArr = data.rows.plm_change_execution_info
this.plmChangeItemArr = data.rows.plm_change_item
} }
}) })
}, },
@ -2437,15 +2457,12 @@
// 提交 // 提交
submitData () { submitData () {
// if (this.modalData.nodeConclusion == null || this.modalData.nodeConclusion === '') {
// this.$message.warning('请选择节点结论！')
// return
// }
// this.$confirm(`是否确认提交?`, '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
for (let i = 0; i < this.plmChangeRequestArr.length; i++) {
if (!this.modalData[this.plmChangeRequestArr[i].fieldId] && this.plmChangeRequestArr[i].required === 'Y') {
this.$message.warning(this.plmChangeRequestArr[i].fieldName + '不能为空!')
return
}
}
let tempData = { let tempData = {
site: this.modalData.site, site: this.modalData.site,
userName: this.$store.state.user.name, userName: this.$store.state.user.name,
@ -2465,7 +2482,6 @@
}) })
} }
}) })
// })
}, },
// 获取选择的ECN种类 // 获取选择的ECN种类

10
src/views/modules/processManagement/processBindingInfo.vue
View File

@ -1174,13 +1174,19 @@
passTable: [], passTable: [],
addTable: [] addTable: []
} }
}else if (row.menuId === '103001'){// 打样
} else if (row.menuId === '103001'){ // 打样
this.queryTableParam = { this.queryTableParam = {
tableType: 'plm_proofing', tableType: 'plm_proofing',
passTable: [], passTable: [],
addTable: [] addTable: []
} }
}else {
} else if (row.menuId === '107001') { // 测试
this.queryTableParam = {
tableType: 'plm_test_information',
passTable: [],
addTable: ['plm_test_so_bom']
}
} else {
return return
} }
this.getTableList() this.getTableList()

101
src/views/modules/quotation/requestForQuote.vue
View File

@ -180,8 +180,7 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="customerNo" label="客户编码"> <el-form-item prop="customerNo" label="客户编码">
<span style="cursor: pointer" slot="label" v-if="modalData.flag === '1'" @click="getBaseList(102,1)"><a
herf="#">客户编码</a></span>
<span style="cursor: pointer" slot="label" v-if="modalData.flag === '1'" @click="getBaseList(102,1)"><a herf="#">客户编码</a></span>
<el-row :gutter="10"> <el-row :gutter="10">
<el-col :span="8"> <el-col :span="8">
<el-input :disabled="modalData.flag !== '1'" v-model="modalData.customerNo"></el-input> <el-input :disabled="modalData.flag !== '1'" v-model="modalData.customerNo"></el-input>
@ -194,19 +193,20 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="要求完成日期" prop="requiredCompletionDate"> <el-form-item label="要求完成日期" prop="requiredCompletionDate">
<el-date-picker v-model="modalData.requiredCompletionDate" style="width: 100%" type="date"
value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="modalData.requiredCompletionDate" :disabled="quotationInformationFlag('requiredCompletionDate') === 'N' && modalData.flag === '2'"
style="width: 100%" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="优先等级" > <el-form-item label="优先等级" >
<dict-data-select v-if="modalFlag" v-model="modalData.priorityLevel"
dict-type="priority_Level"></dict-data-select>
<dict-data-select v-if="modalFlag" :disabled="quotationInformationFlag('priorityLevel') === 'N' && modalData.flag === '2'"
v-model="modalData.priorityLevel" dict-type="priority_Level"></dict-data-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="modalData.flag !== '1'"> <el-col :span="4" v-if="modalData.flag !== '1'">
<el-form-item label="询价金额"> <el-form-item label="询价金额">
<el-input-number :step="0" :controls="false" v-model="modalData.quotationAmount"></el-input-number>
<el-input-number :step="0" :disabled="quotationInformationFlag('quotationAmount') === 'N' && modalData.flag === '2'"
:controls="false" v-model="modalData.quotationAmount"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -228,8 +228,8 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="Quote Type"> <el-form-item label="Quote Type">
<dict-data-select v-if="modalFlag" v-model="modalData.quoteType" clearable dict-type="quote_type"
:use-default-value="modalData.flag === '1'"></dict-data-select>
<dict-data-select v-if="modalFlag" :disabled="quotationInformationFlag('quoteType') === 'N' && modalData.flag === '2'" v-model="modalData.quoteType"
clearable dict-type="quote_type" :use-default-value="modalData.flag === '1'"></dict-data-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" v-if="false"> <el-col :span="4" v-if="false">
@ -245,14 +245,16 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item prop="trackerName"> <el-form-item prop="trackerName">
<span style="cursor: pointer" slot="label" @click="getBaseList(2000)"><a herf="#">采购专员</a></span>
<el-input v-model="modalData.trackerName" readonly></el-input>
<span v-if="quotationInformationFlag('tracker') === 'N' && modalData.flag === '2'" slot="label">采购专员</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2000)"><a herf="#">采购专员</a></span>
<el-input :disabled="quotationInformationFlag('tracker') === 'N' && modalData.flag === '2'" v-model="modalData.trackerName" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item prop="quoterName"> <el-form-item prop="quoterName">
<span style="cursor: pointer" slot="label" @click="getBaseList(2002)"><a herf="#">报价专员</a></span>
<el-input v-model="modalData.quoterName" readonly></el-input>
<span v-if="quotationInformationFlag('quoter') === 'N' && modalData.flag === '2'" slot="label">报价专员</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2002)"><a herf="#">报价专员</a></span>
<el-input :disabled="quotationInformationFlag('quoter') === 'N' && modalData.flag === '2'" v-model="modalData.quoterName" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -271,13 +273,13 @@
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="Delivery Terms" prop="deliveryTerms"> <el-form-item label="Delivery Terms" prop="deliveryTerms">
<dict-data-select v-if="modalFlag" v-model="modalData.deliveryTerms" clearable dict-type="delivery_terms"
:use-default-value="modalData.flag === '1'"></dict-data-select>
<dict-data-select v-if="modalFlag" :disabled="quotationInformationFlag('deliveryTerms') === 'N' && modalData.flag === '2'" v-model="modalData.deliveryTerms"
clearable dict-type="delivery_terms" :use-default-value="modalData.flag === '1'"></dict-data-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="客户询价单号" prop="customerQuoteNo"> <el-form-item label="客户询价单号" prop="customerQuoteNo">
<el-input v-model="modalData.customerQuoteNo"></el-input>
<el-input :disabled="quotationInformationFlag('customerQuoteNo') === 'N' && modalData.flag === '2'" v-model="modalData.customerQuoteNo"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -294,6 +296,7 @@
<el-form-item label="技术注意事项" style="display: block;min-height: 90px"> <el-form-item label="技术注意事项" style="display: block;min-height: 90px">
<el-input <el-input
type="textarea" type="textarea"
:disabled="quotationInformationFlag('technicalConsiderations') === 'N' && modalData.flag === '2'"
v-model="modalData.technicalConsiderations" v-model="modalData.technicalConsiderations"
:autosize="{minRows: 3, maxRows: 3}" :autosize="{minRows: 3, maxRows: 3}"
resize='none'> resize='none'>
@ -1030,6 +1033,9 @@ export default {
}, },
quotationInformationFlag () { quotationInformationFlag () {
return (value) => { return (value) => {
if (!this.plmQuotationInformationArr){
return 'N'
}
let arr = this.plmQuotationInformationArr.filter(a => a.fieldId === value) let arr = this.plmQuotationInformationArr.filter(a => a.fieldId === value)
if (arr.length > 0) { if (arr.length > 0) {
return arr[0].updateFlag return arr[0].updateFlag
@ -1157,6 +1163,7 @@ export default {
page: 1, page: 1,
limit: 10, limit: 10,
menuId: this.$route.meta.menuId, menuId: this.$route.meta.menuId,
quotationNo: ''
}, },
// 其它 // 其它
dataListLoading: false, dataListLoading: false,
@ -2060,6 +2067,32 @@ export default {
created() { created() {
this.getDataList() this.getDataList()
}, },
activated () {
if (this.$route.params.type === 'tokenLogin') {
if (this.$route.params.docNo) {
this.searchData.quotationNo = this.$route.params.docNo
}
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
quotationInformationSearch(this.searchData).then(({data}) => {
if (data.code === 0) {
this.dataList = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll(this.dataList.length)
//判断是否全部存在数据
if (this.totalPage > 0) {
//设置选中行
// this.$refs.quotationTable.setCurrentRow(this.dataList[0])
// this.refreshCurrentTabTable() //加载当前的页签的table
this.quotationClickRow(this.dataList[0])
this.updateModal(this.dataList[0])
}
}
})
}
},
methods: { methods: {
// ======== 分页相关方法 ======== // ======== 分页相关方法 ========
/** /**
@ -2448,28 +2481,8 @@ export default {
return return
} }
this.confirmProjectPart(); this.confirmProjectPart();
// 验证详情
this.$refs[this.modalData.flag === '1'?'saveDetailForm':'editDetailForm'].validate((valid) => {
if (!valid){
if (this.priceCheckDetail.associatedPartNo === ''|| this.savePriceDetail.associatedPartNo === ''){
this.$message.warning('请输入关联零件号信息！')
return
}
if (this.priceCheckDetail.materialRequired === '' || this.savePriceDetail.materialRequired === ''){
this.$message.warning('请输入所需材料！')
return
}
if (this.priceCheckDetail.yearlyOrMonthlyRequirement === '' || this.savePriceDetail.yearlyOrMonthlyRequirement === ''){
this.$message.warning('请输入年度/月度需求！')
return
}
if (this.priceCheckDetail.runningWidth === '' || this.savePriceDetail.yearlyOrMonthlyRequirement === ''){
this.$message.warning('请输入运行宽度！')
return
}
}else {
if (this.modalData.flag === '1') { if (this.modalData.flag === '1') {
this.modalData.priceCheckDetail = this.savePriceDetail
quotationInformationSave(this.modalData).then(({data}) => { quotationInformationSave(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()
@ -2488,7 +2501,6 @@ export default {
} }
}) })
} else { } else {
this.modalData.priceCheckDetail = this.priceCheckDetail
quotationInformationEdit(this.modalData).then(({data}) => { quotationInformationEdit(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()
@ -2509,8 +2521,6 @@ export default {
} }
} }
}) })
}
})
}, },
/** /**
* 询价信息删除 * 询价信息删除
@ -3313,14 +3323,9 @@ export default {
// 提交 // 提交
submitData () { submitData () {
let tempData = {
site: this.modalData.site,
userName: this.$store.state.user.name,
quotationNo: this.modalData.quotationNo,
menuId: this.$route.meta.menuId,
nodeConclusion: this.modalData.nodeConclusion
}
submitChange(tempData).then(({data}) => {
this.modalData.userName = this.$store.state.user.name
this.modalData.menuId = this.$route.meta.menuId
submitChange(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.$message({message: '操作成功', type: 'success'}) this.$message({message: '操作成功', type: 'success'})

85
src/views/modules/test/requestForTest.vue
View File

@ -184,23 +184,27 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item label="测试数量" prop="testNumber"> <el-form-item label="测试数量" prop="testNumber">
<div class="right"> <div class="right">
<el-input type="number" class="inlineNumber" v-model="modalData.testNumber" @input="modalData.testNumber = modalData.testNumber.replace(/^(0+)|[^\d]+/g, '')"></el-input>
<el-input type="number" class="inlineNumber" :disabled="testInformationFlag('testNumber') === 'N' && modalData.flag === '2'"
v-model="modalData.testNumber" @input="modalData.testNumber = modalData.testNumber.replace(/^(0+)|[^\d]+/g, '')"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="优先等级" > <el-form-item label="优先等级" >
<dict-data-select v-if="modalFlag" v-model="modalData.priorityLevel" dict-type="priority_Level"></dict-data-select>
<dict-data-select v-if="modalFlag" :disabled="testInformationFlag('priorityLevel') === 'N' && modalData.flag === '2'"
v-model="modalData.priorityLevel" dict-type="priority_Level"></dict-data-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="要求交付日期" prop="requiredDeliveryDate"> <el-form-item label="要求交付日期" prop="requiredDeliveryDate">
<el-date-picker v-model="modalData.requiredDeliveryDate" style="width: 100%" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
<el-date-picker v-model="modalData.requiredDeliveryDate" :disabled="testInformationFlag('requiredDeliveryDate') === 'N' && modalData.flag === '2'"
style="width: 100%" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="印刷方式" prop="printType"> <el-form-item label="印刷方式" prop="printType">
<dict-data-select v-if="modalFlag" clearable v-model="modalData.printType" dict-type="print_type"></dict-data-select>
<dict-data-select v-if="modalFlag" :disabled="testInformationFlag('printType') === 'N' && modalData.flag === '2'"
clearable v-model="modalData.printType" dict-type="print_type"></dict-data-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -238,7 +242,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="标签名称" prop="productName"> <el-form-item label="标签名称" prop="productName">
<el-input v-model="modalData.productName"></el-input>
<el-input :disabled="testInformationFlag('productName') === 'N' && modalData.flag === '2'" v-model="modalData.productName"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -261,27 +265,31 @@
<el-col :span="4"> <el-col :span="4">
<el-form-item prop="trackerName"> <el-form-item prop="trackerName">
<!-- <span slot="label" @click="getBaseList(103,1)"><a herf="#">Artwork</a></span>--> <!-- <span slot="label" @click="getBaseList(103,1)"><a herf="#">Artwork</a></span>-->
<span style="cursor: pointer" slot="label" @click="getBaseList(2041)"><a herf="#">Artwork</a></span>
<el-input v-model="modalData.trackerName" readonly></el-input>
<span v-if="testInformationFlag('tracker') === 'N' && modalData.flag === '2'" slot="label">报价专员</span>
<span v-else style="cursor: pointer" slot="label" @click="getBaseList(2041)"><a herf="#">Artwork</a></span>
<el-input :disabled="testInformationFlag('tracker') === 'N' && modalData.flag === '2'" v-model="modalData.trackerName" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item prop="engineerName"> <el-form-item prop="engineerName">
<!-- <span slot="label" @click="getBaseList(103,2)"><a herf="#">TP工程师</a></span>--> <!-- <span slot="label" @click="getBaseList(103,2)"><a herf="#">TP工程师</a></span>-->
<span slot="label" @click="getBaseList(2042)"><a herf="#">TP工程师</a></span>
<el-input v-model="modalData.engineerName" readonly></el-input>
<span v-if="testInformationFlag('engineer') === 'N' && modalData.flag === '2'" slot="label">TP工程师</span>
<span v-else slot="label" @click="getBaseList(2042)"><a herf="#">TP工程师</a></span>
<el-input :disabled="testInformationFlag('engineer') === 'N' && modalData.flag === '2'" v-model="modalData.engineerName" readonly></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="CQC"> <el-form-item label="CQC">
<span slot="label"><a herf="#" @click="getBaseList(2007)">CQC</a></span>
<el-input v-model="modalData.artworkName"></el-input>
<span v-if="testInformationFlag('artwork') === 'N' && modalData.flag === '2'" slot="label">CQC</span>
<span v-else slot="label"><a herf="#" @click="getBaseList(2007)">CQC</a></span>
<el-input :disabled="testInformationFlag('artwork') === 'N' && modalData.flag === '2'" v-model="modalData.artworkName"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="FAI"> <el-form-item label="FAI">
<span slot="label"><a herf="#" @click="getBaseList(2008)">FAI</a></span>
<el-input v-model="modalData.plannerName"></el-input>
<span v-if="testInformationFlag('planner') === 'N' && modalData.flag === '2'" slot="label">FAI</span>
<span v-else slot="label"><a herf="#" @click="getBaseList(2008)">FAI</a></span>
<el-input :disabled="testInformationFlag('planner') === 'N' && modalData.flag === '2'" v-model="modalData.plannerName"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -299,7 +307,8 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="技术注意事项" style="height: 90px"> <el-form-item label="技术注意事项" style="height: 90px">
<el-input type="textarea" v-model="modalData.technicalConsiderations" :rows="3" resize='none' show-word-limit></el-input>
<el-input type="textarea" :disabled="testInformationFlag('technicalConsiderations') === 'N' && modalData.flag === '2'"
v-model="modalData.technicalConsiderations" :rows="3" resize='none' show-word-limit></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -1112,6 +1121,9 @@
computed: { computed: {
testInformationFlag () { testInformationFlag () {
return (value) => { return (value) => {
if (!this.plmTestInformationArr){
return 'N'
}
let arr = this.plmTestInformationArr.filter(a => a.fieldId === value) let arr = this.plmTestInformationArr.filter(a => a.fieldId === value)
if (arr.length > 0) { if (arr.length > 0) {
return arr[0].updateFlag return arr[0].updateFlag
@ -1219,6 +1231,7 @@
page: 1, page: 1,
limit: 10, limit: 10,
menuId: this.$route.meta.menuId, menuId: this.$route.meta.menuId,
testNo: ''
}, },
// 其它 // 其它
dataListLoading: false, dataListLoading: false,
@ -2173,6 +2186,39 @@
created () { created () {
this.getDataList() this.getDataList()
}, },
activated () {
if (this.$route.params.type === 'tokenLogin') {
if (this.$route.params.docNo) {
this.searchData.testNo = this.$route.params.docNo
}
this.searchData.limit = this.pageSize
this.searchData.page = this.pageIndex
testInformationSearch(this.searchData).then(({data}) => {
if (data.code === 0) {
this.dataList = data.page.list
this.pageIndex = data.page.currPage
this.pageSize = data.page.pageSize
this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll( this.dataList.length)
// 判断是否全部存在数据
if (this.totalPage > 0) {
//设置选中行
this.$refs.testTable.setCurrentRow(this.dataList[0])
// 加载当前的页签的table
this.refreshCurrentTabTable()
this.testClickRow(this.dataList[0])
this.updateModal(this.dataList[0])
} else {
//设置选中行
this.$refs.testTable.setCurrentRow({})
// 加载当前的页签的table
this.refreshCurrentTabTable()
this.testClickRow({})
}
}
})
}
},
methods: { methods: {
searchTestPropertiesItem(){ searchTestPropertiesItem(){
let params={ let params={
@ -3353,14 +3399,9 @@
// 提交 // 提交
submitData () { submitData () {
let tempData = {
site: this.modalData.site,
userName: this.$store.state.user.name,
testNo: this.modalData.testNo,
menuId: this.$route.meta.menuId,
nodeConclusion: this.modalData.nodeConclusion
}
submitChange(tempData).then(({data}) => {
this.modalData.userName = this.$store.state.user.name
this.modalData.menuId = this.$route.meta.menuId
submitChange(this.modalData).then(({data}) => {
if (data && data.code === 0) { if (data && data.code === 0) {
this.getDataList() this.getDataList()
this.$message({message: '操作成功', type: 'success'}) this.$message({message: '操作成功', type: 'success'})

Write Preview
Loading…
Cancel
Save