Browse Source

2024-09-10

master
qiezi 2 years ago
parent
commit
282bc168d1
  1. 7
      src/api/quotation/quoteProperties.js
  2. 72
      src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue
  3. 36
      src/views/modules/quotation/requestForQuote.vue
  4. 17
      src/views/modules/quotation/sellForQuotation.vue
  5. 419
      src/views/modules/quotation/sellForQuotation/quotationDetail/quoteDetailProperties.vue
  6. 4
      src/views/modules/quotation/sellForQuotation/quotationDetail/toolQuotation.vue
  7. 18
      src/views/modules/quotation/sellForQuotation/quoteDetail.vue
  8. 4
      src/views/modules/sys/dict-data.vue
  9. 4
      src/views/modules/sys/dict.vue
  10. 2
      src/views/modules/test/testSoRouting/testRoutingTable.vue

7
src/api/quotation/quoteProperties.js

@ -9,3 +9,10 @@ export const saveQuoteProperties = (data) => createAPI(`/quote/detail/properties
export const removeQuoteProperties = (data) => createAPI(`/quote/detail/properties/remove`,'post',data)
export const updateQuoteProperties = (data) => createAPI(`/quote/detail/properties/update`,'post',data)
export const queryQuoteDetailProperties = (data) => createAPI(`/quote/detail/properties/query`,'post',data)
export const editQuoteDetailProperties = (data) => createAPI(`/quote/detail/properties/edit`,'post',data)
export const queryQuoteDetailPropertiesItem = (data) => createAPI(`/quote/detail/properties/item`,'post',data)
export const deleteQuoteDetailProperties = (data) => createAPI(`/quote/detail/properties/delete`,'post',data)
export const newQuoteDetailProperties = (data) => createAPI(`/quote/detail/properties/new`,'post',data)

72
src/views/modules/quotation/inquiry/inquiryQuoteDetail.vue

@ -4,13 +4,9 @@ import {queryQuoteByInquiryNo} from "../../../../api/quotation/quote";
export default {
name: "inquiryQuoteDetail",
props:{
inquiryNo:{
type: String,
required: true
},
site:{
type: String,
required: true
quotation: {
type:Object,
required:true
},
height:{
type: [String,Number],
@ -498,8 +494,8 @@ export default {
methods:{
handleQuery(){
let params = {
internalInquiryNo: this.inquiryNo,
site: this.site
internalInquiryNo: this.quotation.quotationNo,
site: this.quotation.site
}
this.queryLoading = true;
queryQuoteByInquiryNo(params).then(({data})=>{
@ -529,39 +525,43 @@ export default {
}
},
watch:{
inquiryNo(newVal, oldVal){
this.handleQuery();
},
site(newVal, oldVal){
this.handleQuery();
"quotation.quotationNo"(newVal,oldVal){
if (newVal){
this.handleQuery();
}else {
this.dataList = [];
}
}
}
}
</script>
<template>
<el-table :height="height" :data="dataList" border v-loading="queryLoading" style="margin-top: 5px">
<el-table-column label="操作" min-width="80px" fixed="left" align="center">
<template slot-scope="scope">
<a @click="handleClickDetail(scope.row)">详情</a>
</template>
</el-table-column>
<el-table-column
v-for="(item,index) in columns" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed===''?false:item.fixed"
: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>
</el-table-column>
</el-table>
<div>
<el-table :height="height" :data="dataList" border v-loading="queryLoading" style="margin-top: 5px">
<el-table-column label="操作" min-width="80px" fixed="left" align="center">
<template slot-scope="scope">
<a @click="handleClickDetail(scope.row)">详情</a>
</template>
</el-table-column>
<el-table-column
v-for="(item,index) in columns" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed===''?false:item.fixed"
: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>
</el-table-column>
</el-table>
</div>
</template>
<style scoped>

36
src/views/modules/quotation/requestForQuote.vue

@ -244,19 +244,14 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item prop="quoterName">
<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 label="客户询价单号" prop="customerQuoteNo">
<el-input :disabled="quotationInformationFlag('customerQuoteNo') === 'N' && modalData.flag === '2'" v-model="modalData.customerQuoteNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item prop="trackerName" v-if="modalData.sourcing === 'Y'">
<span style="cursor: pointer" slot="label" @click="getBaseList(2000)"><a herf="#">采购专员</a></span>
<el-input v-model="modalData.trackerName" readonly></el-input>
</el-form-item>
<el-form-item label="采购专员" v-else>
<el-input :disabled="quotationInformationFlag('tracker') === 'N' && modalData.flag === '2'" v-model="modalData.trackerName" readonly></el-input>
<el-form-item label="是否需要Sourcing">
<dict-data-select v-if="modalFlag" :disabled="quotationInformationFlag('sourcing') === 'N' && modalData.flag === '2'"
v-model="modalData.sourcing" dict-type="sourcing"></dict-data-select>
</el-form-item>
</el-col>
</el-row>
@ -280,14 +275,19 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="客户询价单号" prop="customerQuoteNo">
<el-input :disabled="quotationInformationFlag('customerQuoteNo') === 'N' && modalData.flag === '2'" v-model="modalData.customerQuoteNo"></el-input>
<el-form-item prop="quoterName">
<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-col>
<el-col :span="4">
<el-form-item label="是否需要Sourcing">
<dict-data-select v-if="modalFlag" :disabled="quotationInformationFlag('sourcing') === 'N' && modalData.flag === '2'"
v-model="modalData.sourcing" dict-type="sourcing"></dict-data-select>
<el-form-item prop="trackerName" v-if="modalData.sourcing === 'Y'">
<span style="cursor: pointer" slot="label" @click="getBaseList(2000)"><a herf="#">采购专员</a></span>
<el-input v-model="modalData.trackerName" readonly></el-input>
</el-form-item>
<el-form-item label="采购专员" v-else>
<el-input :disabled="quotationInformationFlag('tracker') === 'N' && modalData.flag === '2'" v-model="modalData.trackerName" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
@ -987,7 +987,7 @@
</el-form>
</el-tab-pane>
<el-tab-pane label="报价明细" name="quote_detail" >
<inquiry-quote-detail :site="quotationCurrentRow.site" :inquiry-no="quotationCurrentRow.quotationNo"></inquiry-quote-detail>
<inquiry-quote-detail :quotation="quotationCurrentRow"></inquiry-quote-detail>
</el-tab-pane>
</el-tabs>
@ -2255,11 +2255,13 @@ export default {
this.totalPage = data.page.totalCount
this.$refs.selectDiv.setLengthAll(this.dataList.length)
//判断是否全部存在数据
if (this.totalPage > 0) {
if (this.dataList.length > 0) {
//设置选中行
// this.$refs.quotationTable.setCurrentRow(this.dataList[0])
// this.refreshCurrentTabTable() //加载当前的页签的table
this.quotationClickRow(this.dataList[0])
}else {
this.quotationCurrentRow = {}
}
}
this.dataListLoading = false

17
src/views/modules/quotation/sellForQuotation.vue

@ -109,9 +109,10 @@
fixed
width="160">
<template slot-scope="scope">
<el-link style="cursor: pointer" v-if="scope.row.quotationStatus !== '下达'"
<el-link style="cursor: pointer" v-if="scope.row.quotationStatus === '草稿'"
@click="handleUpdateStatus(scope.row)">下达
</el-link>
<el-link style="cursor: pointer" v-if="scope.row.quotationStatus === '下达'" @click="handleUpdateStatus(scope.row,true)">取消下达</el-link>
<el-link style="cursor: pointer" v-if="scope.row.quotationStatus === '草稿'" @click="editQuotationHeader(scope.row)">编辑</el-link>
<el-link style="cursor: pointer" v-if="scope.row.quotationStatus === '草稿'" @click="deleteQuotationHeader(scope.row)">删除</el-link>
<el-link style="cursor: pointer" @click="quotationAgain(scope.row)">重新报价</el-link>
@ -411,12 +412,13 @@ export default {
},
props:{
height:{
type:Number,
default:290
type:[Number,String],
default:'30vh'
}
},
data() {
return {
initPage:false,
// 搜索条件对象
searchData: {
site: this.$store.state.user.site,// 工厂编号
@ -1165,15 +1167,15 @@ export default {
this.$message.error('查询项目信息失败')
})
},
handleUpdateStatus(row) {
this.$confirm(`是否确认下达?`, '提示', {
handleUpdateStatus(row, status) {
this.$confirm(`是否确认${status?'取消下达':'下达'}?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(()=>{
let params = {
...row,
quotationStatus:'下达'
quotationStatus:status?'草稿':'下达',
}
updateQuoteStatus(params).then(({data})=>{
if (data && data.code === 0){
@ -1287,9 +1289,10 @@ export default {
}).catch((error)=>{
this.$message.error(error)
})
}else {
}else if (this.initPage === false){
this.initData();//初始化数据
}
this.initPage = true;
}
},
computed: {},

419
src/views/modules/quotation/sellForQuotation/quotationDetail/quoteDetailProperties.vue

@ -0,0 +1,419 @@
<script>
import {
deleteQuoteDetailProperties,
editQuoteDetailProperties, newQuoteDetailProperties,
queryQuoteDetailProperties,
queryQuoteDetailPropertiesItem
} from "../../../../../api/quotation/quoteProperties";
import {Decimal} from "decimal.js";
import item from "../../../code/item.vue";
export default {
name: "quoteDetailProperties",
props:{
quotationDetail: {
type: Object,
required: true
},
height:{
type: [String, Number],
default: 400
},
packCost:{
type:Number,
default:0,
},
shippingCost:{
type:Number,
default:0,
},
},
data(){
return{
propertyVisible:false,
dataList:[],
propertyList:[],
selectionPropertyList:[],
property:{
itemNo:'',
itemDesc:'',
},
selectionDataList:[],
columns: [
{
userId: this.$store.state.user.name,
functionId: 102003,
serialNumber: '102003Table7ItemNo',
tableId: "102003Table7",
tableName: "物料属性项目表",
columnProp: 'itemNo',
headerAlign: "center",
align: "left",
columnLabel: '属性编码',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 90,
},
{
userId: this.$store.state.user.name,
functionId: 102003,
serialNumber: '102003Table7PropertiesItemDesc',
tableId: "102003Table7",
tableName: "物料属性项目表",
columnProp: 'itemDesc',
headerAlign: "center",
align: "left",
columnLabel: '属性名称',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 90,
},
{
userId: this.$store.state.user.name,
functionId: 102003,
serialNumber: '102003Table7ValueType',
tableId: "102003Table7",
tableName: "物料属性项目表",
columnProp: 'valueType',
headerAlign: "center",
align: "center",
columnLabel: '属性类型',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth: 70,
},
{
userId: this.$store.state.user.name,
functionId: 100002001,
serialNumber: '100002001TableTextValue',
tableId: "100002001Table",
tableName: "属性表",
columnProp: 'textValue',
headerAlign: "center",
align: "left",
columnLabel: '属性值',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
columnWidth:120,
},
],
saveFlag: false,
saveLoading: false,
}
},
methods:{
handleQuery(){
let params = {
quotationDetailId: this.quotationDetail.quotationDetailId,
site: this.quotationDetail.site,
}
this.dataList = []
queryQuoteDetailProperties(params).then(({data}) => {
if (data && data.code === 0){
this.dataList = data.rows;
this.$emit("update:packCost",this.getPackInfoCost())
this.$emit("update:shippingCost",this.getShippingInfoCost())
}else {
this.$message.warning(data.msg);
}
}).catch((error)=>{
this.$message.error(error);
})
},
handleEdit(){
if (this.dataList.length === 0){
this.$message.warning("没有属性信息,请先新增属性信息");
return;
}
if (this.saveFlag){
let params = this.dataList.map(item => {
return {
quotationDetailId: this.quotationDetail.quotationDetailId,
site: this.quotationDetail.site,
orderNo: item.orderNo,
textValue: item.textValue,
numValue: item.numValue,
subCodeSeqNo: item.subCodeSeqNo,
codeNo: item.codeNo,
functionType: item.functionType,
}
})
this.saveLoading = true;
editQuoteDetailProperties(params).then(({data})=>{
if (data && data.code === 0){
this.$message.success(data.msg);
this.saveFlag = false;
this.handleQuery();
}else {
this.$message.warning(data.msg);
}
this.saveLoading = false;
}).catch((error)=>{
this.saveLoading = false;
this.$message.error(error);
})
}else {
this.saveFlag = true;
}
},
getPackInfoCost(){
let boxOfBags = this.dataList.find((item)=>item.itemNo.toUpperCase() === 'PACK-BAGS/BOX');
let boxCost = this.dataList.find((item)=>item.itemNo.toUpperCase() === 'PACK-BOX-COST');
let packOtherCost = this.dataList.find((item)=>item.itemNo.toUpperCase() === 'PACK-OTHER-COST');
let numOfBag = this.dataList.find((item)=>item.itemNo.toUpperCase() === 'PACK-PCS/PE-BAG');
let bagCost = this.dataList.find((item)=>item.itemNo.toUpperCase() === 'PACK-PE-BAG-COST');
if (!boxCost || !boxOfBags || !numOfBag || !bagCost){
// this.$message.warning("缺少包装信息")
return 0;
}
if (boxCost.numValue === null || boxCost.numValue === undefined || boxOfBags.numValue === null || boxOfBags.numValue === undefined
|| numOfBag.numValue === null || numOfBag.numValue === undefined || bagCost.numValue === null || bagCost.numValue === undefined){
// this.$message.warning("缺少包装信息")
return 0;
}
let num1 = new Decimal(bagCost.numValue).div(new Decimal(numOfBag.numValue));
let num2 = new Decimal(boxCost.numValue).div(new Decimal(boxOfBags.numValue));
return num1.add(num2).toSignificantDigits().toNumber()
},
getShippingInfoCost(){
let shippingCost = this.dataList.find((item)=>item.itemNo.toUpperCase() === 'SHIPPING-COST');
let shippingDeliverQuantity = this.dataList.find((item)=>item.itemNo.toUpperCase() === 'SHIPPING-DELIVER-QUANTITY');
let shippingOtherCost = this.dataList.find((item)=>item.itemNo.toUpperCase() === 'SHIPPING-OTHER-COST');
if (!shippingCost || !shippingDeliverQuantity){
// this.$message.warning("缺少交付/运输信息")
return 0;
}
if (shippingCost.numValue === null || shippingCost.numValue === undefined || shippingDeliverQuantity.numValue === null || shippingDeliverQuantity.numValue === undefined){
// this.$message.warning("缺少交付/运输信息")
return 0;
}
return new Decimal(shippingCost.numValue).div(new Decimal(shippingDeliverQuantity.numValue)).toSignificantDigits().toNumber()
},
handleQueryAllProperty(){
let params = {
site: this.$store.state.user.site,
quotationDetailId: this.quotationDetail.quotationDetailId,
itemNo: this.property.itemNo,
itemDesc: this.property.itemDesc,
}
this.propertyList = [];
queryQuoteDetailPropertiesItem(params).then(({data})=>{
if (data && data.code === 0){
this.propertyList = data.rows;
this.propertyVisible = true;
}else {
this.$message.warning(data.msg);
}
}).catch((error)=>{
this.$message.error(error);
})
},
handleAdd(){
if (this.selectionPropertyList.length === 0){
this.$message.warning("请先选择要添加的属性");
return;
}
newQuoteDetailProperties(this.selectionPropertyList).then(({data})=>{
if (data && data.code === 0){
this.$message.success(data.msg);
this.handleQuery();
this.handleQueryAllProperty();
}else {
this.$message.warning(data.msg);
}
}).catch((error)=>{
this.$message.error(error);
})
},
handleDelete(){
if (this.selectionDataList.length === 0){
this.$message.warning("请先选择要删除的属性");
return;
}
let params = this.selectionDataList.map(item => {
return {
quotationDetailId: this.quotationDetail.quotationDetailId,
site: this.quotationDetail.site,
orderNo: item.orderNo,
subCodeSeqNo: item.subCodeSeqNo,
codeNo: item.codeNo,
recordType: item.functionType,
}
})
deleteQuoteDetailProperties(params).then(({data})=>{
if (data && data.code === 0){
this.$message.success(data.msg);
this.handleQuery();
this.handleQueryAllProperty();
}else {
this.$message.warning(data.msg);
}
}).catch((error)=>{
this.$message.error(error);
})
},
selectionChangeDataList(val){
this.selectionDataList = val;
},
selectionChangePropertyList(val){
this.selectionPropertyList = val;
}
},
created() {
this.saveFlag = false;
this.handleQuery();
}
}
</script>
<template>
<div>
<div>
<el-button type="primary" @click="handleQueryAllProperty">新增</el-button>
<el-button type="primary" @click="handleEdit">{{saveFlag?'保存':'编辑'}}</el-button>
</div>
<div class="rq">
<el-table
:height="height"
:data="dataList"
border
style="width: 100%;margin-top: 5px">
<el-table-column
v-for="(item,index) in columns" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed===''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<div v-if="item.columnProp !== 'textValue' && item.columnProp !== 'numValue'">
<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>
</div>
<div v-else-if="saveFlag">
<span v-if="scope.row.valueType === '文本'">
<el-input v-model="scope.row.textValue"></el-input>
</span>
<span v-if="scope.row.valueType === '数字'">
<el-input-number v-model="scope.row.numValue" :controls="false" :step="0"></el-input-number>
</span>
</div>
<div v-else>
<span v-if="scope.row.valueType === '文本'">
{{scope.row.textValue}}
</span>
<span v-if="scope.row.valueType === '数字'" style="float: right">
{{scope.row.numValue}}
</span>
</div>
</template>
</el-table-column>
</el-table>
</div>
<el-dialog title="属性信息" :visible.sync="propertyVisible" append-to-body width="1000px">
<el-form :model="property" label-position="top" :inline="true">
<el-form-item label="属性编码">
<el-input v-model="property.itemNo"></el-input>
</el-form-item>
<el-form-item label="属性名称">
<el-input v-model="property.itemDesc"></el-input>
</el-form-item>
<el-form-item label=" ">
<el-button type="primary" @click="handleQueryAllProperty">查询</el-button>
</el-form-item>
</el-form>
<el-row :gutter="20">
<el-col :span="11">
<span style="font-size: 12px">可选属性:</span>
<el-table
height="400px"
:data="propertyList"
ref="searchTable"
@selection-change="selectionChangePropertyList"
@row-click=""
border>
<el-table-column
type="selection"
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
prop="itemNo"
header-align="center"
align="left"
label="属性编码">
</el-table-column>
<el-table-column
prop="itemDesc"
header-align="center"
align="left"
label="属性名称">
</el-table-column>
</el-table>
</el-col>
<!--按钮-->
<el-col :span="2">
<div style="text-align: center;display: flex;flex-direction: column;align-items: center;justify-content: center;height: 400px">
<div><el-button type="primary" @click="handleAdd">新增<i class="el-icon-d-arrow-right el-icon--right"></i></el-button></div>
<div><el-button type="primary" @click="handleDelete" icon="el-icon-d-arrow-left" style="margin-top: 10px">删除</el-button></div>
</div>
</el-col>
<!--表格2-->
<el-col :span="11">
<span style="font-size: 12px">已有属性:</span>
<el-table
height="400px"
:data="dataList"
ref="dataTable"
@selection-change="selectionChangeDataList"
@row-click=""
border>
<el-table-column
type="selection"
header-align="center"
align="center"
width="50">
</el-table-column>
<el-table-column
prop="itemNo"
header-align="center"
align="left"
label="属性编码">
</el-table-column>
<el-table-column
prop="itemDesc"
header-align="center"
align="left"
label="属性名称">
</el-table-column>
</el-table>
</el-col>
</el-row>
</el-dialog>
</div>
</template>
<style scoped>
</style>

4
src/views/modules/quotation/sellForQuotation/quotationDetail/toolQuotation.vue

@ -255,7 +255,7 @@ export default {
this.saveQuotationToolFlag= true;
},
clickDeleteToolTableBtn(row){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
this.$confirm('确定要删除该记录吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -275,7 +275,7 @@ export default {
this.$message.warning("请选择要删除的工具记录")
return;
}
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
this.$confirm('确定要删除该记录吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

18
src/views/modules/quotation/sellForQuotation/quoteDetail.vue

@ -14,18 +14,19 @@ import {searchQuoteBomHeader, searchQuoteBomList} from "../../../../api/quotatio
import QuoteRouting from "./quotationDetail/quoteRouting.vue";
import {searchQuoteRoutingHeader} from "../../../../api/quotation/quoteOfRouting";
import {queryQuoteDetailBom, queryQuoteDetailRouting} from "../../../../api/quotation/quote";
import QuoteDetailProperties from "./quotationDetail/quoteDetailProperties.vue";
export default {
name:'quoteDetail',
components: {QuoteRouting, BillOfMateriel, CostPrice, PropertyTemplates, ToolQuotation},
components: {QuoteDetailProperties, QuoteRouting, BillOfMateriel, CostPrice, PropertyTemplates, ToolQuotation},
props:{
header:{
type:Object,
request:true,
},
height:{
type:Number,
default:300,
type:[Number,String],
default:'32vh',
},
},
watch:{
@ -780,7 +781,7 @@ export default {
},
// 删除 报价明细
deleteQuotationDetailData(row){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
this.$confirm('确定要删除该记录吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -911,7 +912,7 @@ export default {
},
openQuotationDetail(){
this.$nextTick(()=>{
this.$refs.property.getPropertyTemplatesItem();// 属性
// this.$refs.property.getPropertyTemplatesItem();// 属性
this.$refs.tool.initQuotationToolData();//刀具
this.searchQuoteBomList();//bom
})
@ -1005,7 +1006,7 @@ export default {
quotationDetailStatus:status
}
updateQuoteDetailStatus(params).then(({data}) => {
if (data.code === 200) {
if (data.code === 0) {
this.initData();
this.$message.success(data.msg);
} else {
@ -1112,7 +1113,7 @@ export default {
fixed
width="140" align="center">
<template slot-scope="{row,$index}">
<el-link style="cursor: pointer" v-if="row.quotationDetailStatus !== '下达'" @click="editQuotationDetailStatus(row,'下达')">下达</el-link>
<!-- <el-link style="cursor: pointer" v-if="row.quotationDetailStatus !== '下达'" @click="editQuotationDetailStatus(row,'下达')">下达</el-link>-->
<el-link style="cursor: pointer" v-if="row.quotationDetailStatus === '草稿'" @click="editQuotationDetail(row,$index+1)">编辑</el-link>
<el-link style="cursor: pointer" v-if="row.quotationDetailStatus === '草稿'" @click="deleteQuotationDetailData(row)">删除</el-link>
<el-dropdown trigger="click">
@ -1242,7 +1243,8 @@ export default {
<tool-quotation ref="tool" :total-cost.sync="ToolCost" v-if="quotationDetailFlag" :height="fullscreen?660:420" :detail="quotationDetail"></tool-quotation>
</el-tab-pane>
<el-tab-pane name="property" label="其他成本">
<property-templates ref="property" :pack-cost.sync="packInfoCost" :shipping-cost.sync="shippingInfoCost" v-if="quotationDetailFlag" :height="fullscreen?660:420" :detail="quotationDetail" ></property-templates>
<quote-detail-properties :quotation-detail="quotationDetail" :pack-cost.sync="packInfoCost" :shipping-cost.sync="shippingInfoCost" v-if="quotationDetailFlag"></quote-detail-properties>
<!-- <property-templates ref="property" :pack-cost.sync="packInfoCost" :shipping-cost.sync="shippingInfoCost" v-if="quotationDetailFlag" :height="fullscreen?660:420" :detail="quotationDetail" ></property-templates>-->
</el-tab-pane>
<el-tab-pane name="cost" label="成本&价格">
<cost-price ref="cost" :tool-cost.sync="ToolCost"

4
src/views/modules/sys/dict-data.vue

@ -145,7 +145,7 @@ export default {
})
},
delDictData(row){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
this.$confirm('确定要删除该记录吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -173,7 +173,7 @@ export default {
this.$alert('系统参数,无法删除', '警告', {confirmButtonText: '确定',});
return;
}
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
this.$confirm('确定要删除该记录吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

4
src/views/modules/sys/dict.vue

@ -139,7 +139,7 @@ export default {
})
},
delDictType(row){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
this.$confirm('确定要删除该记录吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@ -159,7 +159,7 @@ export default {
});
},
delBatchDictType(){
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
this.$confirm('确定要删除该记录吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

2
src/views/modules/test/testSoRouting/testRoutingTable.vue

@ -557,7 +557,7 @@ export default {
this.$message.warning("请选择要删除的工艺路线")
return
}
this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
this.$confirm('确定要删除该记录吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

Loading…
Cancel
Save