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

BUG

master
常熟吴彦祖 2 weeks ago
parent
c887360684
commit
1518bbc3f4
3 changed files with 71 additions and 71 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. 32
      src/views/modules/supplier/com_inquiry_QuotationList.vue
  2. 32
      src/views/modules/supplier/purDetailList.vue
  3. 78
      src/views/modules/supplier/quoPurDetailList.vue

32
src/views/modules/supplier/com_inquiry_QuotationList.vue
View File

@ -37,17 +37,17 @@
<span v-if="!item.columnHidden">{{ scope.row[item.columnProp] }}</span>
</template>
</el-table-column>
<el-table-column
header-align="center"
align="center"
width="180"
fixed="right"
label="Actions">
<template slot-scope="scope">
<!-- <a type="text" size="small" @click="editModel(scope.row)">Edit |</a>
<a type="text" size="small" @click="deleteData(scope.row)"> Delete</a> -->
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="180"-->
<!-- fixed="right"-->
<!-- label="Actions">-->
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; <a type="text" size="small" @click="editModel(scope.row)">Edit |</a>-->
<!-- <a type="text" size="small" @click="deleteData(scope.row)"> Delete</a> &ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<!-- 新增/编辑弹窗 -->
@ -277,7 +277,7 @@ export default {
}
this.dataListLoading = false
})
},
// 新增
addModal() {
@ -327,7 +327,7 @@ export default {
submitData() {
this.$refs.formRef.validate((valid) => {
if (!valid) return
// TODO: 请替换为实际接口调用
// const api = this.formData.id ? updateQuotation : createQuotation
// api(this.formData).then(({ data }) => {
@ -339,7 +339,7 @@ export default {
// this.$message.warning(data.msg)
// }
// })
// 模拟保存，实际使用时请删除
this.$message.success('保存成功')
this.dialogVisible = false
@ -360,7 +360,7 @@ export default {
// this.searchTable()
// }
// })
// 模拟删除，实际使用时请删除
this.$message.success('删除成功')
this.searchTable()
@ -381,4 +381,4 @@ export default {
.customer-css {
padding: 10px;
}
</style>
</style>

32
src/views/modules/supplier/purDetailList.vue
View File

@ -51,7 +51,7 @@
<el-form-item label=" ">
<el-button class="customer-bun-min" type="primary" @click="getMainData">查询</el-button>
<el-button @click="resetSearch" style="margin-left: 2px">重置</el-button>
</el-form-item>
</el-col>
</el-row>
@ -85,17 +85,17 @@
</template>
</el-table-column>
<!-- 操作列 -->
<el-table-column
fixed="right"
header-align="center"
align="center"
width="180"
label="Action">
<template slot-scope="scope">
<!-- <el-link style="cursor: pointer" @click="editInquiry(scope.row)">编辑 |</el-link>
<el-link style="cursor: pointer" @click="deleteInquiry(scope.row)">删除</el-link> -->
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- fixed="right"-->
<!-- header-align="center"-->
<!-- align="center"-->
<!-- width="180"-->
<!-- label="Action">-->
<!-- <template slot-scope="scope">-->
<!-- &lt;!&ndash; <el-link style="cursor: pointer" @click="editInquiry(scope.row)">编辑 |</el-link>-->
<!-- <el-link style="cursor: pointer" @click="deleteInquiry(scope.row)">删除</el-link> &ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
<!-- 分页 -->
@ -173,7 +173,7 @@ export default {
{ columnProp: 'umid', columnLabel: '计量单位', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'spec', columnLabel: '规格型号', columnWidth: '150', headerAlign: 'center', align: 'left', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'qty', columnLabel: '询价数量', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'materialCost', columnLabel: '材料费用', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'produceFee', columnLabel: '加工费', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'surfaceFee', columnLabel: '表面处理费', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
@ -334,8 +334,8 @@ export default {
}
this.$refs.attachments.init(inData)
}
}
}
</script>
@ -403,4 +403,4 @@ export default {
margin-bottom: 10px;
}
}
</style>
</style>

78
src/views/modules/supplier/quoPurDetailList.vue
View File

@ -79,9 +79,9 @@
width="180"
label="Action">
<template slot-scope="scope">
<el-link
v-if="scope.row.status === '待报价'"
style="cursor: pointer"
<el-link
v-if="scope.row.status === '待报价'||scope.row.status === '未接受'"
style="cursor: pointer"
@click="openQuoteDialog(scope.row)">
报价
</el-link>
@ -113,21 +113,21 @@
</el-tabs>
<!-- 报价信息新增弹出框 -->
<el-dialog
title="报价信息"
:visible.sync="quoteDialogVisible"
width="600px"
top="3vh"
:close-on-click-modal="false"
<el-dialog
title="报价信息"
:visible.sync="quoteDialogVisible"
width="600px"
top="3vh"
:close-on-click-modal="false"
class="part-dialog">
<div class="dialog-content">
<el-form
:model="quoteForm"
:rules="quoteRules"
ref="quoteForm"
label-position="top"
<el-form
:model="quoteForm"
:rules="quoteRules"
ref="quoteForm"
label-position="top"
class="part-form">
<!-- 基础信息 -->
<div class="form-section">
<el-row :gutter="20">
@ -140,7 +140,7 @@
<el-form-item label="物料名称" prop="partDesc">
<el-input v-model="quoteForm.partDesc" :disabled="true" placeholder="物料名称"></el-input>
</el-form-item>
</el-col>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="18">
@ -164,8 +164,8 @@
<el-form-item label="计量单位" prop="umid">
<el-input v-model="quoteForm.umid" :disabled="true" placeholder="计量单位"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-col>
</el-row>
</div>
<!-- 费用信息 -->
@ -238,7 +238,7 @@
<el-form-item label="运费" prop="freight">
<el-input-number v-model="quoteForm.freight" :precision="2" :min="0" style="width: 100%"></el-input-number>
</el-form-item>
</el-col>
</el-col>
</el-row>
</div>
@ -258,7 +258,7 @@
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
@ -276,7 +276,7 @@ import {
getQuoPurDetailPage
} from '@/api/supplier/purQuotation.js'
import {
import {
createPurReplyHist
} from '@/api/supplier/purReplyHist.js'
@ -325,7 +325,7 @@ export default {
{ columnProp: 'spec', columnLabel: '规格型号', columnWidth: '150', headerAlign: 'center', align: 'left', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'qty', columnLabel: '询价数量', columnWidth: '100', headerAlign: 'center', align: 'right', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'remark2', columnLabel: '特殊要求', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'buyer', columnLabel: '采购员', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'paymentTerm', columnLabel: '付款方式', columnWidth: '80', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
{ columnProp: 'deliveryTerm', columnLabel: '交易条款', columnWidth: '120', headerAlign: 'center', align: 'center', fixed: false, columnHidden: false, columnSortable: false, showOverflowTooltip: true },
@ -458,8 +458,8 @@ export default {
this.currentRow = row ? JSON.parse(JSON.stringify(row)) : { site: '', orderNo: '', itemNo: '' }
this.refreshCurrentTabTable()
},
tabClick() {
this.refreshCurrentTabTable()
},
@ -503,12 +503,12 @@ export default {
this.$message.warning('请选择要报价的询价单')
return
}
// 检查是否有上次填写的数据且是当前行的数据
const hasLastData = this.lastQuoteData &&
this.lastQuoteData.orderNo === row.orderNo &&
const hasLastData = this.lastQuoteData &&
this.lastQuoteData.orderNo === row.orderNo &&
this.lastQuoteData.itemNo === row.itemNo
// 填充表单数据
this.quoteForm = {
// 基础信息
@ -544,15 +544,15 @@ export default {
site: this.$store.state.user.site,
createdBy: this.$store.state.user.name
}
// 计算含税单价
this.calculatePrice()
this.quoteDialogVisible = true
},
calculatePrice(){
//未税单价=材料成本+加工费+表面费用+利润
this.quoteForm.price = this.quoteForm.materialCost + this.quoteForm.produceFee +
this.quoteForm.price = this.quoteForm.materialCost + this.quoteForm.produceFee +
this.quoteForm.surfaceFee + this.quoteForm.profit
this.calculateTax()
@ -564,22 +564,22 @@ export default {
this.quoteForm.tax = this.quoteForm.price * (1 + this.quoteForm.taxRate / 100)
}
},
// 提交报价
submitQuote() {
this.$refs.quoteForm.validate((valid) => {
if (valid) {
// 计算总成本（可选）
const totalCost = this.quoteForm.materialCost + this.quoteForm.produceFee +
this.quoteForm.surfaceFee + this.quoteForm.profit +
this.quoteForm.mouldFee + this.quoteForm.additionalCost +
const totalCost = this.quoteForm.materialCost + this.quoteForm.produceFee +
this.quoteForm.surfaceFee + this.quoteForm.profit +
this.quoteForm.mouldFee + this.quoteForm.additionalCost +
this.quoteForm.freight + this.quoteForm.duty
const submitData = {
...this.quoteForm,
totalCost: totalCost
}
createPurReplyHist(submitData).then(({ data }) => {
if (data && data.code === 0) {
this.$message.success('报价提交成功')
@ -601,7 +601,7 @@ export default {
}
})
},
// 取消报价（保存当前填写的数据用于下次残留）
cancelQuote() {
// 保存当前填写的数据（只保存可编辑的字段）
@ -746,4 +746,4 @@ export default {
height: 28px;
}
}
</style>
</style>
Write Preview
Loading…
Cancel
Save