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

2024-10-17

master
qiezi 1 year ago
parent
9c6f4ce8c9
commit
c979057312
8 changed files with 78 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/views/modules/customer/customerGroupInformation.vue
  2. 47
      src/views/modules/customer/customerInformationManagement.vue
  3. 25
      src/views/modules/quotation/sellForQuotation.vue
  4. 4
      src/views/modules/quotation/sellForQuotation/priceCheckDetail/priceCheckDetail.vue
  5. 4
      src/views/modules/quotation/sellForQuotation/quotationDetail/billOfMateriel.vue
  6. 15
      src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue
  7. 4
      src/views/modules/quotation/sellForQuotation/quotationDetail/quoteRouting.vue
  8. 22
      src/views/modules/quotation/sellForQuotation/quoteDetail.vue

14
src/views/modules/customer/customerGroupInformation.vue
View File

@ -13,11 +13,11 @@
<el-option label="否" value="N"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="'客户组'">
<el-form-item :label="'客户组分类'">
<!-- <dict-data-select v-if="modalFlag" v-model="modalData.ecnStage" style="width: 95px" dict-type="change_ecn_stage"></dict-data-select>-->
<el-select clearable v-model="searchData.type" style="width: 120px">
<el-option label="客户组1" value="1"></el-option>
<el-option label="客户组2" value="2"></el-option>
<el-option label="客户组分类(1)" value="1"></el-option>
<el-option label="客户组分类(2)" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="' '">
@ -99,10 +99,10 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="客户组" prop="type">
<el-form-item label="客户组分类" prop="type">
<el-select v-model="modalData.type" style="width: 100%">
<el-option label="客户组1" value="1"></el-option>
<el-option label="客户组2" value="2"></el-option>
<el-option label="客户组分类(1)" value="1"></el-option>
<el-option label="客户组分类(2)" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
@ -253,7 +253,7 @@ export default {
columnProp: "type",
headerAlign: "center",
align: "center",
columnLabel: '客户组',
columnLabel: '客户组分类',
columnHidden: false,
columnImage: false,
columnSortable: false,

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

@ -38,7 +38,7 @@
<!-- 客户列表 -->
<el-table
:height="height - 15"
:height="height"
:data="dataList"
border
ref="customerTable"
@ -127,44 +127,15 @@
dict-type="plm_customer_information_customer_customer_currency"></dict-data-select>
</el-form-item>
</el-form>
<!-- <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="联系人" prop="contactName" :rules="rules.contactName">-->
<!-- <el-input v-model="modalData.contactName" :readonly="detailModalFlag" style="width: 222px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="联系电话" prop="contactPhoneNumber1" :rules="rules.contactPhoneNumber1">-->
<!-- <el-input v-model="modalData.contactPhoneNumber1" :readonly="detailModalFlag" style="width: 222px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="公司名称">-->
<!-- <el-input v-model="modalData.companyName" :readonly="detailModalFlag" style="width: 457px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="岗位描述">-->
<!-- <el-input v-model="modalData.jobDescription" :readonly="detailModalFlag" style="width: 457px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="联系地址">-->
<!-- <el-input v-model="modalData.addressName" :readonly="detailModalFlag" style="width: 457px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<!-- <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">-->
<!-- <el-form-item label="备注信息">-->
<!-- <el-input v-model="modalData.remark" :readonly="detailModalFlag" style="width: 457px"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
<el-form-item>
<span style="cursor: pointer" slot="label" @click="getBaseList(120)"><a herf="#">客户组1</a></span>
<el-input v-model="modalData.customerGroupId1" @blur="customerGroupBlur(120)" style="width: 124px"></el-input>
<el-form-item label="客户组分类(1)">
<span style="cursor: pointer" v-if="modalData.title !== '客户详情'" slot="label" @click="getBaseList(120)"><a herf="#">客户组分类(1)</a></span>
<el-input v-model="modalData.customerGroupId1" :disabled="modalData.title === '客户详情'" @blur="customerGroupBlur(120)" style="width: 124px"></el-input>
<el-input v-model="modalData.customerGroupName1" disabled style="width: 330px"></el-input>
</el-form-item>
<el-form-item>
<span style="cursor: pointer" slot="label" @click="getBaseList(121)"><a herf="#">客户组2</a></span>
<el-input v-model="modalData.customerGroupId2" @blur="customerGroupBlur2(121)"
style="width: 124px"></el-input>
<el-form-item label="客户组分类(2)">
<span style="cursor: pointer" v-if="modalData.title !== '客户详情'" slot="label" @click="getBaseList(121)"><a herf="#">客户组分类(2)</a></span>
<el-input v-model="modalData.customerGroupId2" :disabled="modalData.title === '客户详情'" @blur="customerGroupBlur2(121)" style="width: 124px"></el-input>
<el-input v-model="modalData.customerGroupName2" disabled style="width: 330px"></el-input>
</el-form-item>
</el-form>
@ -204,7 +175,7 @@
</el-form>
<el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -2px;">-->
<el-form-item label="客户地址">
<el-input v-model="modalData.addressName" :readonly="detailModalFlag" style="width: 457px"></el-input>
<el-input v-model="modalData.addressName" disabled :readonly="detailModalFlag" style="width: 457px"></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
@ -1950,7 +1921,7 @@ export default {
mounted() {
this.$nextTick(() => {
this.height = window.innerHeight / 2 - 30
this.height = window.innerHeight / 2 - 50
/*第二个表格高度的动态调整*/
this.secondHeight = window.innerHeight / 2 - 206
})

25
src/views/modules/quotation/sellForQuotation.vue
View File

@ -130,11 +130,13 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{
`${scope.row[item.columnProp]}${index === 0 ? ("-" + scope.row['versionCode']) : ''}`
}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
<template v-if="item.columnProp === 'internalInquiryNo'">
<a @click="handleRouter(scope.row[item.columnProp])" v-if="scope.row[item.columnProp]">{{ scope.row[item.columnProp] }}</a>
</template>
<template v-else>
<span v-if="!item.columnHidden"> {{`${scope.row[item.columnProp]}${index === 0 ? ("-" + scope.row['versionCode']) : ''}`}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template>
</template>
</el-table-column>
</el-table>
@ -1509,6 +1511,19 @@ export default {
this.$message.error(error)
})
},
handleRouter(internalInquiryNo){
if (this.$router.resolve('quotation-requestForQuote').resolved.name === '404') {
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
} else {
this.$router.push({
name: 'quotation-requestForQuote',
params:{
quotationNo:internalInquiryNo,
}
})
}
}
},
computed: {},
watch: {

4
src/views/modules/quotation/sellForQuotation/priceCheckDetail/priceCheckDetail.vue
View File

@ -43,7 +43,7 @@ export default {
columnProp: 'associatedPartNo',
headerAlign: 'center',
align: 'left',
columnLabel: '关联零件号',
columnLabel: '关联料号',
columnHidden: false,
showOverflowTooltip: true,
columnImage: false,
@ -229,7 +229,7 @@ export default {
<el-form :model="priceCheckDetail" ref="priceCheckDetailForm" label-position="top">
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="关联零件号" prop="associatedPartNo">
<el-form-item label="关联料号" prop="associatedPartNo">
<el-input
type="textarea"
v-model="priceCheckDetail.associatedPartNo"

4
src/views/modules/quotation/sellForQuotation/quotationDetail/billOfMateriel.vue
View File

@ -573,6 +573,8 @@ export default {
<el-table-column label="物料描述" prop="componentPartDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="version" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
<el-table-column label="类型" prop="bomType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="生效日期" prop="effPhaseInDate" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="失效日期" prop="effPhaseOutDate" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
</el-table>
<el-table :data="BOMAlternativeList" :row-style="alternativeRowStyle" border :height="240" style="margin-top: 8px">
@ -580,7 +582,9 @@ export default {
<el-table-column label="物料描述" prop="componentPartDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="version" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
<el-table-column label="替代编码" prop="alternativeNo" header-align="center" align="left" show-overflow-tooltip min-width="60"/>
<el-table-column label="替代描述" prop="alternativeDescription" header-align="center" align="left" show-overflow-tooltip min-width="100"/>
<el-table-column label="类型" prop="bomType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="状态" prop="status" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="操作" min-width="80" header-align="center" align="center">
<template slot-scope="{row,$index}">
<span style="color: #888;cursor:no-drop;" v-if="row.version === parseInt(selectBom[0]) && row.bomType === selectBom[2] && row.alternativeNo === selectBom[1]">选择</span>

15
src/views/modules/quotation/sellForQuotation/quotationDetail/costPrice.vue
View File

@ -142,9 +142,16 @@ export default {
this.copyDetail.computeToolCost = new Decimal(this.copyDetail.computeToolCost.toFixed(4,Decimal.ROUND_HALF_UP)).toNumber()
this.copyDetail.adjustToolCost = new Decimal(this.copyDetail.adjustToolCost.toFixed(4,Decimal.ROUND_HALF_UP)).toNumber()
// 其他成本
this.copyPackCost = new Decimal(new Decimal(new Decimal(new Decimal(this.packCost)).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
this.copyShippingCost = new Decimal(new Decimal(new Decimal(this.shippingCost).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
if (this.packCost === 0 || isNaN(this.packCost)){
this.packCost = 0;
}else {
this.copyPackCost = new Decimal(new Decimal(new Decimal(new Decimal(this.packCost)).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
}
if (this.shippingCost === 0 || isNaN(this.shippingCost)){
this.shippingCost = 0;
}else {
this.copyShippingCost = new Decimal(new Decimal(new Decimal(this.shippingCost).mul(new Decimal(this.detail.quotationDetailQuantity))).toFixed(4,Decimal.ROUND_HALF_UP)).toSignificantDigits().toNumber()
}
this.copyDetail.detailOtherCost = new Decimal(this.copyPackCost).add(new Decimal(this.copyShippingCost)).toNumber()
// 管理成本
@ -209,6 +216,8 @@ export default {
.div(new Decimal(this.copyDetail.quotationDetailQuantity));
this.copyDetail.finalTaxedPrice = new Decimal(this.copyDetail.finalTaxedPrice.toFixed(4,Decimal.ROUND_HALF_UP)).toNumber()
}
},
watch:{
}
}
</script>

4
src/views/modules/quotation/sellForQuotation/quotationDetail/quoteRouting.vue
View File

@ -878,6 +878,8 @@ export default {
<el-table-column label="物料描述" prop="partDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="version" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
<el-table-column label="类型" prop="routingType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="生效日期" prop="phaseInDate" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="失效日期" prop="phaseInDate" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
</el-table>
<el-table :data="routingAlternativeList" :row-style="alternativeRowStyle" border :height="240" style="margin-top: 8px">
@ -885,7 +887,9 @@ export default {
<el-table-column label="物料描述" prop="partDesc" header-align="center" align="left" show-overflow-tooltip min-width="200"/>
<el-table-column label="版本" prop="version" header-align="center" align="center" show-overflow-tooltip min-width="60"/>
<el-table-column label="替代编码" prop="alternativeNo" header-align="center" align="left" show-overflow-tooltip min-width="60"/>
<el-table-column label="替代描述" prop="alternativeDescription" header-align="center" align="left" show-overflow-tooltip min-width="100"/>
<el-table-column label="类型" prop="routingType" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="状态" prop="status" header-align="center" align="center" show-overflow-tooltip min-width="100"/>
<el-table-column label="操作" min-width="80" header-align="center" align="center">
<template slot-scope="{row,$index}">
<span style="color: #888;cursor:no-drop;" v-if="row.version === versionData.version && row.routingType === versionData.routingType && row.alternativeNo === versionData.alternativeNo">选择</span>

22
src/views/modules/quotation/sellForQuotation/quoteDetail.vue
View File

@ -1109,8 +1109,21 @@ export default {
}
this.quotationDetail = {...row};
this.quotationDetailFlag = true;
},
handleRouter(internalInquiryNo){
if (this.$router.resolve('quotation-requestForQuote').resolved.name === '404') {
this.$alert('权限不足,访问失败', '警告', {confirmButtonText: '确定',})
} else {
this.$router.push({
name: 'quotation-requestForQuote',
params:{
quotationNo:internalInquiryNo,
}
})
}
}
},
}
</script>
@ -1158,8 +1171,13 @@ export default {
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope" >
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
<template v-if="item.columnProp === 'internalInquiryNo'">
<a @click="handleRouter(scope.row.internalInquiryNo)" v-if="scope.row[item.columnProp]">{{ scope.row[item.columnProp] }}</a>
</template>
<template v-else>
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp]}}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
</template>
</template>
</el-table-column>
</el-table>

Write Preview
Loading…
Cancel
Save