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

2023-12-07 plm报价

master
zelian_wu 2 years ago
parent
d5452bceeb
commit
6fbc519341
5 changed files with 174 additions and 102 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. 1
      src/api/part/partInformation.js
  2. 1
      src/api/part/toolHeader.js
  3. 1
      src/api/project/project.js
  4. 4
      src/views/modules/quotation/sellForQuotation.vue
  5. 269
      src/views/modules/quotation/sellForQuotation/quotationDetail.vue

1
src/api/part/partInformation.js
View File

@ -60,5 +60,6 @@ export const getPartAgent = data => createAPI(`/plm/partInformation/getPartAgent
* @returns {*} * @returns {*}
*/ */
export const searchPartList = (data) => createAPI(`/plm/partInformation/searchPartList`,'get',data); export const searchPartList = (data) => createAPI(`/plm/partInformation/searchPartList`,'get',data);
export const searchPart = (data) => createAPI(`/plm/partInformation/searchPart`,'get',data);

1
src/api/part/toolHeader.js
View File

@ -6,3 +6,4 @@ import { createAPI } from "@/utils/httpRequest.js";
* @returns {*} * @returns {*}
*/ */
export const searchToolHeader = data => createAPI(`/plm/toolHeader/searchToolHeader`,'get',data); export const searchToolHeader = data => createAPI(`/plm/toolHeader/searchToolHeader`,'get',data);
export const searchTool = data => createAPI(`/plm/toolHeader/searchTool`,'get',data);

1
src/api/project/project.js
View File

@ -30,6 +30,7 @@ export const saveProjectContactList= data => createAPI(`/project/saveProjectCont
export const deleteProjectInfo= data => createAPI(`/project/deleteProjectInfo`,'post',data) export const deleteProjectInfo= data => createAPI(`/project/deleteProjectInfo`,'post',data)
export const getProjectInfoPartList= data => createAPI(`/project/getProjectInfoPartList`,'post',data) export const getProjectInfoPartList= data => createAPI(`/project/getProjectInfoPartList`,'post',data)
export const getProjectPartList= data => createAPI(`/project/getProjectPartList`,'get',data) export const getProjectPartList= data => createAPI(`/project/getProjectPartList`,'get',data)
export const getProjectPart= data => createAPI(`/project/getProjectPart`,'get',data)
export const saveProjectPart= data => createAPI(`/project/saveProjectPart`,'post',data) export const saveProjectPart= data => createAPI(`/project/saveProjectPart`,'post',data)
export const deleteProjectPartWithId= data => createAPI(`/project/deleteProjectPartWithId`,'post',data) export const deleteProjectPartWithId= data => createAPI(`/project/deleteProjectPartWithId`,'post',data)
export const getPlmToolPurchaseRequestDataByProject= data => createAPI(`/project/getPlmToolPurchaseRequestDataByProject`,'post',data) export const getPlmToolPurchaseRequestDataByProject= data => createAPI(`/project/getPlmToolPurchaseRequestDataByProject`,'post',data)

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

@ -306,7 +306,7 @@
<el-col :span="8"> <el-col :span="8">
<!-- <el-form-item prop="quoter" label="销售员">--> <!-- <el-form-item prop="quoter" label="销售员">-->
<el-form-item label="销售员"> <el-form-item label="销售员">
<span slot="label" style="" v-if="insertData.internalInquiryNo ==''" @click="getBaseList(103,2)"><a herf="#">销售员</a></span>
<span slot="label" style="" @click="getBaseList(103,2)"><a herf="#">销售员</a></span>
<el-input v-model="insertData.quoterName" @clear="clearQuoter" placeholder="请输入内容" clearable /> <el-input v-model="insertData.quoterName" @clear="clearQuoter" placeholder="请输入内容" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -779,8 +779,8 @@ export default {
this.insertData.projectId=row.projectId;//项目编码 this.insertData.projectId=row.projectId;//项目编码
this.insertData.projectName=row.projectName;//项目名称 this.insertData.projectName=row.projectName;//项目名称
this.insertData.tracker=row.tracker;//跟单员 this.insertData.tracker=row.tracker;//跟单员
this.insertData.trackerName=row.trackerName;
this.insertData.quoter=row.quoter;//销售编号 this.insertData.quoter=row.quoter;//销售编号
this.insertData.quoterName=row.quoterName;//销售员
this.insertData.quotationStatus=row.quotationStatus;//状态 this.insertData.quotationStatus=row.quotationStatus;//状态
this.insertData.internalInquiryNo=row.quotationNo;//内部询价单号 this.insertData.internalInquiryNo=row.quotationNo;//内部询价单号
this.insertData.currency=row.customerCurrency;//内部询价单号 this.insertData.currency=row.customerCurrency;//内部询价单号

269
src/views/modules/quotation/sellForQuotation/quotationDetail.vue
View File

@ -256,7 +256,7 @@
<el-form :model="quotationPartFormTable" :rules="quotationPartRules" ref="quotationPartTableForm"> <el-form :model="quotationPartFormTable" :rules="quotationPartRules" ref="quotationPartTableForm">
<el-table style="margin-top: 5px" v-loading="initQuotationPartLoading" <el-table style="margin-top: 5px" v-loading="initQuotationPartLoading"
element-loading-text="拼命加载中" element-loading-text="拼命加载中"
element-loading-spinner="el-icon-loading" stripe
element-loading-spinner="el-icon-loading" stripe border
:data="quotationPartFormTable.quotationPartList" height="400" :data="quotationPartFormTable.quotationPartList" height="400"
@selection-change="handleSelectionChangeQuotationPartTable"> @selection-change="handleSelectionChangeQuotationPartTable">
<el-table-column <el-table-column
@ -270,19 +270,19 @@
<el-link style="cursor: pointer" @click="deleteQuotationPart(row,$index)">删除</el-link> <el-link style="cursor: pointer" @click="deleteQuotationPart(row,$index)">删除</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column label="材料编码" align="center" show-overflow-tooltip prop="quotationPartNo"/>
<el-table-column label="材料名称" align="center" show-overflow-tooltip prop="quotationPartDesc"/>
<el-table-column label="计量单位" align="center" show-overflow-tooltip prop="umId">
<el-table-column type="index" width="50" header-align="center" align="right" label="序号"/>
<el-table-column label="材料编码" header-align="center" align="left" show-overflow-tooltip prop="quotationPartNo"/>
<el-table-column label="材料名称" header-align="center" align="left" show-overflow-tooltip prop="quotationPartDesc"/>
<el-table-column label="计量单位" header-align="center" align="left" show-overflow-tooltip prop="umId">
<template slot-scope="{row,$index}"> <template slot-scope="{row,$index}">
{{getUmName(row.umId)}} {{getUmName(row.umId)}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单位用量" align="center" show-overflow-tooltip prop="unitDosage"/>
<el-table-column label="损耗率%" align="center" show-overflow-tooltip prop="attritionRate"/>
<el-table-column label="调机用量" align="center" show-overflow-tooltip prop="transferAmount"/>
<el-table-column label="单位成本" align="center" show-overflow-tooltip prop="unitCost"/>
<el-table-column label="备注" align="center" show-overflow-tooltip prop="remark"/>
<el-table-column label="单位用量" header-align="center" align="right" show-overflow-tooltip prop="unitDosage"/>
<el-table-column label="损耗率%" header-align="center" align="right" show-overflow-tooltip prop="attritionRate"/>
<el-table-column label="调机用量" header-align="center" align="right" show-overflow-tooltip prop="transferAmount"/>
<el-table-column label="单位成本" header-align="center" align="right" show-overflow-tooltip prop="unitCost"/>
<el-table-column label="备注" header-align="center" align="left" show-overflow-tooltip prop="remark"/>
</el-table> </el-table>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
@ -291,7 +291,7 @@
<el-button type="primary" @click="clickOtherQuotationDetailsBtn(2)">从其他报价单复制</el-button> <el-button type="primary" @click="clickOtherQuotationDetailsBtn(2)">从其他报价单复制</el-button>
<el-button type="primary" @click="deleteSelectionQuotationRoutingBtn">删 除</el-button> <el-button type="primary" @click="deleteSelectionQuotationRoutingBtn">删 除</el-button>
<el-form ref="quotationRoutingTableForm" :model="quotationRoutingFormTable" :rules="quotationRoutingRules"> <el-form ref="quotationRoutingTableForm" :model="quotationRoutingFormTable" :rules="quotationRoutingRules">
<el-table style="margin-top: 5px" v-loading="initQuotationRoutingLoading" element-loading-text = "数据正在加载中"
<el-table style="margin-top: 5px" v-loading="initQuotationRoutingLoading" element-loading-text = "数据正在加载中" stripe border
element-loading-spinner = "el-icon-loading" :data="quotationRoutingFormTable.quotationRoutingList" element-loading-spinner = "el-icon-loading" :data="quotationRoutingFormTable.quotationRoutingList"
height="400" @selection-change="handleSelectionChangeQuotationRoutingTable"> height="400" @selection-change="handleSelectionChangeQuotationRoutingTable">
<el-table-column <el-table-column
@ -300,28 +300,27 @@
fixed fixed
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column label="操作" width="80" align="center" fixed>
<el-table-column label="操作" width="120" align="center" fixed>
<template slot-scope="{row,$index}"> <template slot-scope="{row,$index}">
<el-link style="cursor: pointer" @click="editQuotationRoutingBtn(row)">编辑</el-link> <el-link style="cursor: pointer" @click="editQuotationRoutingBtn(row)">编辑</el-link>
<el-link style="cursor: pointer" @click="deleteQuotationRoutingBtn(row,$index)">删除</el-link> <el-link style="cursor: pointer" @click="deleteQuotationRoutingBtn(row,$index)">删除</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="50" align="center" label="序号" prop="itemNo" show-overflow-tooltip/>
<el-table-column align="center" label="工序编码" prop="quotationRoutingNo" show-overflow-tooltip/>
<el-table-column align="center" width="120" label="工序名称" prop="quotationRoutingDesc" show-overflow-tooltip/>
<el-table-column align="center" label="加工中心编码" width="120" prop="machiningCenterNo" show-overflow-tooltip/>
<el-table-column label="加工中心名称" align="center" width="120" prop="machiningCenterDesc" show-overflow-tooltip/>
<el-table-column label="加工中心类别" align="center" width="120" prop="machiningCenterType" show-overflow-tooltip/>
<el-table-column label="调机时间" align="center" width="120" prop="machiningSetupTime" show-overflow-tooltip/>
<el-table-column label="单位产出量" align="center" width="120" prop="unitOutputQuantity" show-overflow-tooltip/>
<el-table-column label="产出单位" align="center" width="120" prop="outputUnit" show-overflow-tooltip/>
<el-table-column label="效率%" align="center" width="120" prop="routingEfficiency" show-overflow-tooltip/>
<el-table-column label="操作工人数" align="center" width="120" prop="operatorsNumber" show-overflow-tooltip/>
<el-table-column label="单位机器成本" align="center" width="120" prop="unitMachineryCost" show-overflow-tooltip/>
<el-table-column label="单位人工成本" align="center" width="120" prop="unitLaborCost" show-overflow-tooltip/>
<el-table-column label="单位制造费用" align="center" width="120" prop="unitManufacturingCost" show-overflow-tooltip/>
<el-table-column label="单位报价成本" align="center" width="120" prop="unitQuotedCost" show-overflow-tooltip/>
<el-table-column label="备注" align="center" width="140" prop="remark" show-overflow-tooltip/>
<el-table-column width="50" header-align="center" align="right" label="序号" prop="itemNo" show-overflow-tooltip/>
<el-table-column header-align="center" align="left" width="120" label="工序名称" prop="quotationRoutingDesc" show-overflow-tooltip/>
<el-table-column header-align="center" align="left" label="加工中心编码" width="120" prop="machiningCenterNo" show-overflow-tooltip/>
<el-table-column label="加工中心名称" header-align="center" align="left" width="120" prop="machiningCenterDesc" show-overflow-tooltip/>
<el-table-column label="加工中心类别" header-align="center" align="left" width="120" prop="machiningCenterType" show-overflow-tooltip/>
<el-table-column label="调机时间" header-align="center" align="right" width="120" prop="machiningSetupTime" show-overflow-tooltip/>
<el-table-column label="单位产出量" header-align="center" align="right" width="120" prop="unitOutputQuantity" show-overflow-tooltip/>
<el-table-column label="产出单位" header-align="center" align="left" width="120" prop="outputUnit" show-overflow-tooltip/>
<el-table-column label="效率%" header-align="center" align="right" width="120" prop="routingEfficiency" show-overflow-tooltip/>
<el-table-column label="操作工人数" header-align="center" align="right" width="120" prop="operatorsNumber" show-overflow-tooltip/>
<el-table-column label="单位机器成本" header-align="center" align="right" width="120" prop="unitMachineryCost" show-overflow-tooltip/>
<el-table-column label="单位人工成本" header-align="center" align="right" width="120" prop="unitLaborCost" show-overflow-tooltip/>
<el-table-column label="单位制造费用" header-align="center" align="right" width="120" prop="unitManufacturingCost" show-overflow-tooltip/>
<el-table-column label="单位报价成本" header-align="center" align="right" width="120" prop="unitQuotedCost" show-overflow-tooltip/>
<el-table-column label="备注" header-align="center" align="left" width="140" prop="remark" show-overflow-tooltip/>
</el-table> </el-table>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
@ -336,25 +335,25 @@
<el-form :model="quotationToolFormTable" :rules="quotationToolRules" ref="quotationToolTableForm"> <el-form :model="quotationToolFormTable" :rules="quotationToolRules" ref="quotationToolTableForm">
<el-table style="margin-top: 5px" ref="quotationToolTable" v-loading="initQuotationToolLoading" element-loading-text = "数据正在加载中" <el-table style="margin-top: 5px" ref="quotationToolTable" v-loading="initQuotationToolLoading" element-loading-text = "数据正在加载中"
element-loading-spinner = "el-icon-loading" @selection-change="handleSelectionChangeQuotationToolTable" element-loading-spinner = "el-icon-loading" @selection-change="handleSelectionChangeQuotationToolTable"
:data="quotationToolFormTable.quotationToolList" height="400">
:data="quotationToolFormTable.quotationToolList" height="400" stripe border>
<el-table-column <el-table-column
type="selection" type="selection"
align="center" align="center"
width="55"> width="55">
</el-table-column> </el-table-column>
<el-table-column label="操作" width="80" align="center" >
<el-table-column label="操作" width="120" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-link style="cursor: pointer" @click="clickEditToolTableBtn(scope.row)">编辑</el-link> <el-link style="cursor: pointer" @click="clickEditToolTableBtn(scope.row)">编辑</el-link>
<el-link style="cursor: pointer" @click="clickDeleteToolTableBtn(scope.row,scope.$index)">删除</el-link> <el-link style="cursor: pointer" @click="clickDeleteToolTableBtn(scope.row,scope.$index)">删除</el-link>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="50" type="index" align="center" label="序号" show-overflow-tooltip/>
<el-table-column label="工具编码" align="center" prop="toolNo" show-overflow-tooltip/>
<el-table-column label="工具描述" align="center" prop="toolDescription" show-overflow-tooltip/>
<el-table-column label="工具数量" align="center" prop="toolQuantity" show-overflow-tooltip/>
<el-table-column label="单位成本" align="center" prop="unitCost" show-overflow-tooltip/>
<el-table-column label="预计使用寿命" align="center" prop="expectedServiceLife" show-overflow-tooltip/>
<el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
<el-table-column width="50" type="index" header-align="center" align="right" label="序号" show-overflow-tooltip/>
<el-table-column label="工具编码" header-align="center" align="left" prop="toolNo" show-overflow-tooltip/>
<el-table-column label="工具描述" header-align="center" align="left" prop="toolDescription" show-overflow-tooltip/>
<el-table-column label="工具数量" header-align="center" align="right" prop="toolQuantity" show-overflow-tooltip/>
<el-table-column label="单位成本" header-align="center" align="right" prop="unitCost" show-overflow-tooltip/>
<el-table-column label="预计使用寿命" header-align="center" align="right" prop="expectedServiceLife" show-overflow-tooltip/>
<el-table-column label="备注" header-align="center" align="left" prop="remark" show-overflow-tooltip/>
</el-table> </el-table>
</el-form> </el-form>
</el-tab-pane> </el-tab-pane>
@ -630,13 +629,13 @@
</el-col> </el-col>
<el-col :span="6" :offset="1"> <el-col :span="6" :offset="1">
<el-form-item label=" "> <el-form-item label=" ">
<el-button type="primary" @click="initToolHeader">重 置</el-button>
<el-button type="primary" @click="initToolHeader">搜 索</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<!--筛选的数据--> <!--筛选的数据-->
<el-table :data="computedToolHeaderTable" ref="toolHeaderTable" :style="{marginTop:'10px'}"
<el-table :data="toolHeaderList" ref="toolHeaderTable" :style="{marginTop:'10px'}"
height="300px" stripe border @selection-change="handleSelectionChangeToolHeaderTable" height="300px" stripe border @selection-change="handleSelectionChangeToolHeaderTable"
@row-dblclick="dblclickToolHeader"> @row-dblclick="dblclickToolHeader">
<el-table-column label="工具编号" prop="toolNo"/> <el-table-column label="工具编号" prop="toolNo"/>
@ -649,15 +648,15 @@
<el-form :rules="quotationRoutingRules" ref="quotationRoutingForm" :model="quotationRouting" label-position="top"> <el-form :rules="quotationRoutingRules" ref="quotationRoutingForm" :model="quotationRouting" label-position="top">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工序编码" prop="quotationRoutingNo">
<span slot="label" @click="componentPartModelFlag = true" style="cursor: pointer"><a>工序编码</a></span>
<el-input v-model="quotationRouting.quotationRoutingNo" clearable/>
<el-form-item label="工序名称" prop="quotationRoutingDesc">
<el-input v-model="quotationRouting.quotationRoutingDesc" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" :offset="2"> <el-col :span="12" :offset="2">
<el-form-item label="工序名称" prop="quotationRoutingDesc">
<span slot="label" @click="componentPartModelFlag = true" style="cursor: pointer"><a>工序名称</a></span>
<el-input :disabled="quotationRouting.quotationRoutingNo !=='*'" v-model="quotationRouting.quotationRoutingDesc" clearable/>
<el-form-item label="序号" prop="itemNo">
<div class="right"><!--value=value.replace(/[\d]/g,'')-->
<el-input v-model="quotationRouting.itemNo" type="number" step="10" @change="changeRegValue" onKeypress="return (/[\d]/g.test(String.fromCharCode(event.keyCode)))"/>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -871,13 +870,13 @@
</el-col> </el-col>
<el-col :span="4" :offset="1"> <el-col :span="4" :offset="1">
<el-form-item label=" "> <el-form-item label=" ">
<el-button type="primary" @click="initPartList">重 置</el-button>
<el-button type="primary" @click="initPartList">查 询</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<!--筛选的数据--> <!--筛选的数据-->
<el-table :data="computedPartTable" ref="partDataTable" :style="{marginTop:'10px'}"
<el-table :data="partList" ref="partDataTable" :style="{marginTop:'10px'}"
height="300px" stripe border width="30%" @selection-change="handleSelectionChangePartTable" height="300px" stripe border width="30%" @selection-change="handleSelectionChangePartTable"
@row-dblclick="dblClickPartTable" @row-dblclick="dblClickPartTable"
@row-click="(row)=>toggleRowSelectionTable(row,'partDataTable')"> @row-click="(row)=>toggleRowSelectionTable(row,'partDataTable')">
@ -899,12 +898,12 @@
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="项目编号" prop="toolNo"> <el-form-item label="项目编号" prop="toolNo">
<el-input v-model="projectPartData.projectId" clearable/>
<el-input v-model="projectPartData.testPartNo" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :offset="1"> <el-col :span="4" :offset="1">
<el-form-item label="项目名称" prop="toolDescription"> <el-form-item label="项目名称" prop="toolDescription">
<el-input v-model="projectPartData.projectName" clearable/>
<el-input v-model="projectPartData.partName" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" :offset="1"> <el-col :span="4" :offset="1">
@ -1011,7 +1010,6 @@
<el-table-column label="报价单号" width="120" prop="quotationNo" show-overflow-tooltip/> <el-table-column label="报价单号" width="120" prop="quotationNo" show-overflow-tooltip/>
<el-table-column label="产品编码" width="120" prop="productNo" show-overflow-tooltip/> <el-table-column label="产品编码" width="120" prop="productNo" show-overflow-tooltip/>
<el-table-column label="产品名称" width="120" prop="productDesc" show-overflow-tooltip/> <el-table-column label="产品名称" width="120" prop="productDesc" show-overflow-tooltip/>
<el-table-column label="工序编码" width="120" prop="quotationRoutingNo" show-overflow-tooltip/>
<el-table-column label="工序名称" width="120" prop="quotationRoutingDesc" show-overflow-tooltip/> <el-table-column label="工序名称" width="120" prop="quotationRoutingDesc" show-overflow-tooltip/>
<el-table-column label="加工中心编码" width="120" prop="machiningCenterNo" show-overflow-tooltip/> <el-table-column label="加工中心编码" width="120" prop="machiningCenterNo" show-overflow-tooltip/>
<el-table-column label="加工中心名称" width="120" prop="machiningCenterDesc" show-overflow-tooltip/> <el-table-column label="加工中心名称" width="120" prop="machiningCenterDesc" show-overflow-tooltip/>
@ -1113,10 +1111,10 @@ import {
quotationDetailList, quotationDetailList,
} from '@/api/quotation/quotationHeader.js'; } from '@/api/quotation/quotationHeader.js';
import {searchUmInformationList,} from '@/api/part/umInformation.js'; import {searchUmInformationList,} from '@/api/part/umInformation.js';
import {searchToolHeader,} from '@/api/part/toolHeader.js';
import {searchToolHeader,searchTool} from '@/api/part/toolHeader.js';
import {searchWorkCenter,} from '@/api/part/workCenter.js'; import {searchWorkCenter,} from '@/api/part/workCenter.js';
import {searchPartList,} from '@/api/part/partInformation.js';
import {getProjectPartList} from '@/api/project/project.js';
import {searchPartList,searchPart} from '@/api/part/partInformation.js';
import {getProjectPartList,getProjectPart} from '@/api/project/project.js';
import { import {
queryOperationList, // 查询工序列表 queryOperationList, // 查询工序列表
} from '@/api/part/routingManagement.js' } from '@/api/part/routingManagement.js'
@ -1126,6 +1124,78 @@ export default {
props: ['quotationHeader'], props: ['quotationHeader'],
name: "quotationDetail", name: "quotationDetail",
data() { data() {
// 后台校验
// 产品编码校验
const validateProductNo = (rule, value, callback) =>{
if (value === '' || value === null || value === undefined){
callback(new Error(' '))
return
}
this.projectPartData.testPartNo = value
getProjectPart(this.projectPartData).then(({data})=>{
if (data === 200){
if (data.data.length === 1){
callback()
return
}
}
this.projectPartData.testPartNo = undefined;
callback(new Error(" "))
}).catch((error)=>{
this.projectPartData.testPartNo = undefined
callback(new Error(' '))
})
};
// 校验材料
const validatePartNo = (rule, value, callback) =>{
if (value === '' || value === null || value === undefined){
callback(new Error(' '))
return
}
if (value === '*'){
callback();
return;
}
this.partData.partNo = value
searchPart(this.partData).then(({data})=>{
if (data.code === 200) {
if (data.data.length === 1){
callback()
return
}
}
this.partData.partNo = null;
callback(new Error(' '))
}).catch((error)=>{
this.partData.partNo = null;
callback(new Error(' '))
})
};
// 校验工具编号
const validateToolNo = (rule, value, callback) => {
if (value === '' || value === null || value === undefined){
callback(new Error(' '))
return
}
if (value === '*'){
callback();
return;
}
this.toolHeader.toolNo = value;
searchTool(this.toolHeader).then(({data})=>{
if (data.code === 200) {
if (data.data.length === 1){
callback()
return
}
}
this.toolHeader.toolNo = null;
callback(new Error(' '))
}).catch((error)=>{
this.toolHeader.toolNo = null;
callback(new Error(' '))
})
};
return { return {
// ===============================================集合 ================================== // ===============================================集合 ==================================
tableData: [],// 报价详情 tableData: [],// 报价详情
@ -1265,7 +1335,7 @@ export default {
quotationRoutingId:undefined,//主键 quotationRoutingId:undefined,//主键
quotationDetailId:undefined,//外键 quotationDetailId:undefined,//外键
site:this.$store.state.user.site,//工厂编码 site:this.$store.state.user.site,//工厂编码
itemNo:undefined,//序号
itemNo:0,//序号
quotationRoutingNo:undefined,//报价工序编码 quotationRoutingNo:undefined,//报价工序编码
quotationRoutingDesc:undefined,//报价工序名称 quotationRoutingDesc:undefined,//报价工序名称
machiningCenterNo:undefined,//加工中心编码 machiningCenterNo:undefined,//加工中心编码
@ -1295,19 +1365,21 @@ export default {
}, },
// 工具列表筛选对象 // 工具列表筛选对象
toolHeader:{ toolHeader:{
site:this.$store.state.user.site,
toolNo:undefined,// 编号 toolNo:undefined,// 编号
toolDescription:undefined,// 描述 toolDescription:undefined,// 描述
}, },
// 材料列表筛选对象 // 材料列表筛选对象
partData:{ partData:{
site:this.$store.state.user.site,
partNo:undefined,// 编号 partNo:undefined,// 编号
partDesc:undefined, partDesc:undefined,
}, },
// 项目物料筛选列表 // 项目物料筛选列表
projectPartData:{ projectPartData:{
site:this.$store.state.user.site, site:this.$store.state.user.site,
projectId:undefined,// 项目编号
projectName:undefined,// 项目名称
testPartNo:undefined,// 项目编号
partName:undefined,// 项目名称
}, },
// 其他报价明细搜索条件 // 其他报价明细搜索条件
otherDetail:{ otherDetail:{
@ -1349,6 +1421,7 @@ export default {
productNo: [ productNo: [
{required: true, message: ' ', trigger: 'change'}, {required: true, message: ' ', trigger: 'change'},
{required: true, message: ' ', trigger: 'blur'}, {required: true, message: ' ', trigger: 'blur'},
{required: true,validator:validateProductNo,trigger: 'blur'},
], ],
productDesc: [ productDesc: [
{required: true, message: ' ', trigger: 'change'}, {required: true, message: ' ', trigger: 'change'},
@ -1375,6 +1448,7 @@ export default {
toolNo: [ toolNo: [
{required: true, message: ' ', trigger: 'change', label: "工具编号"}, {required: true, message: ' ', trigger: 'change', label: "工具编号"},
{required: true, message: ' ', trigger: 'blur'}, {required: true, message: ' ', trigger: 'blur'},
{required: true, validator:validateToolNo, trigger: 'blur'},
], ],
toolDescription: [ toolDescription: [
{required: true, message: ' ', trigger: 'change'}, {required: true, message: ' ', trigger: 'change'},
@ -1438,7 +1512,7 @@ export default {
{required: true, message: ' ', trigger: 'change'}, {required: true, message: ' ', trigger: 'change'},
{required: true, message: ' ', trigger: 'blur'}, {required: true, message: ' ', trigger: 'blur'},
], ],
quotationRoutingDesc: [
itemNo: [
{required: true, message: ' ', trigger: 'change'}, {required: true, message: ' ', trigger: 'change'},
{required: true, message: ' ', trigger: 'blur'}, {required: true, message: ' ', trigger: 'blur'},
], ],
@ -1496,6 +1570,7 @@ export default {
quotationPartNo:[ quotationPartNo:[
{required: true, message: ' ', trigger: 'change'}, {required: true, message: ' ', trigger: 'change'},
{required: true, message: ' ', trigger: 'blur'}, {required: true, message: ' ', trigger: 'blur'},
{required: true,validator:validatePartNo, trigger: 'blur'},
], ],
quotationPartDesc:[ quotationPartDesc:[
{required: true, message: ' ', trigger: 'change'}, {required: true, message: ' ', trigger: 'change'},
@ -1525,7 +1600,6 @@ export default {
// =========================================参数列表================================= // =========================================参数列表=================================
// 报价明细 参数列表 // 报价明细 参数列表
quotationDetailColumns: [ quotationDetailColumns: [
{label: "productNo", value: "产品编码"},
{label: "productDesc", value: "产品名称"}, {label: "productDesc", value: "产品名称"},
{label: "quotationDetailQuantity", value: "报价数量"}, {label: "quotationDetailQuantity", value: "报价数量"},
{label: "internalInquiryNo", value: "内部询价单号"}, {label: "internalInquiryNo", value: "内部询价单号"},
@ -1725,12 +1799,12 @@ export default {
// ===============================================新增================================================ // ===============================================新增================================================
// 新增 报价明细 // 新增 报价明细
insertQuotationDetailBtn() { insertQuotationDetailBtn() {
this.insertQuotationDetailLoading = true;
this.$refs['insertQuotationDetailForm'].validate((validate, objects) => { this.$refs['insertQuotationDetailForm'].validate((validate, objects) => {
if (validate) { if (validate) {
this.insertQuotationDetailLoading = true;
insertQuotationDetail(this.insertQuotationDetail).then(({data}) => { insertQuotationDetail(this.insertQuotationDetail).then(({data}) => {
this.insertQuotationDetailLoading = false; this.insertQuotationDetailLoading = false;
if (data.code == 200) {
if (data.code === 200) {
this.quotationLeadIntoDetailFlag = false; this.quotationLeadIntoDetailFlag = false;
// 保存成功后 // 保存成功后
if (this.insertQuotationDetailData.flag) { if (this.insertQuotationDetailData.flag) {
@ -1772,7 +1846,7 @@ export default {
insertQuotationToolData(){ insertQuotationToolData(){
saveQuotationTool(this.quotationTool).then(({data}) => { saveQuotationTool(this.quotationTool).then(({data}) => {
this.saveQuotationToolLoading = false; this.saveQuotationToolLoading = false;
if (data.code == 200) {
if (data.code === 200) {
this.initQuotationToolData(); this.initQuotationToolData();
this.$message.success(data.msg); this.$message.success(data.msg);
this.saveQuotationToolFlag = false;// 关闭弹框 this.saveQuotationToolFlag = false;// 关闭弹框
@ -1787,7 +1861,7 @@ export default {
batchInsertQuotationToolData(batchInsertQuotationToolList){ batchInsertQuotationToolData(batchInsertQuotationToolList){
batchInsertQuotationTool(batchInsertQuotationToolList).then(({data})=>{ batchInsertQuotationTool(batchInsertQuotationToolList).then(({data})=>{
this.saveBatchLoading = false; this.saveBatchLoading = false;
if (data.code == 200){
if (data.code === 200){
this.initQuotationToolData(); this.initQuotationToolData();
this.otherQuotationDetailDialogFlag = false; this.otherQuotationDetailDialogFlag = false;
this.saveQuotationToolFlag = false; this.saveQuotationToolFlag = false;
@ -1806,7 +1880,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteQuotationTool(row).then(({data})=>{ deleteQuotationTool(row).then(({data})=>{
if (data.code == 200){
if (data.code === 200){
this.initQuotationToolData(); this.initQuotationToolData();
this.$message.success(data.msg); this.$message.success(data.msg);
}else { }else {
@ -1827,7 +1901,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
batchDeleteQuotationTool(this.selectionQuotationToolList).then(({data})=>{ batchDeleteQuotationTool(this.selectionQuotationToolList).then(({data})=>{
if (data.code == 200){
if (data.code === 200){
this.initQuotationToolData(); this.initQuotationToolData();
this.$message.success(data.msg); this.$message.success(data.msg);
}else { }else {
@ -1844,7 +1918,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteQuotationRouting(row).then(({data})=>{ deleteQuotationRouting(row).then(({data})=>{
if (data.code == 200){
if (data.code === 200){
this.initQuotationRoutingData(); this.initQuotationRoutingData();
this.$message.success(data.msg); this.$message.success(data.msg);
}else { }else {
@ -1865,7 +1939,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
batchDeleteQuotationRouting(this.selectionQuotationRoutingList).then(({data})=>{ batchDeleteQuotationRouting(this.selectionQuotationRoutingList).then(({data})=>{
if (data.code == 200){
if (data.code === 200){
this.initQuotationRoutingData(); this.initQuotationRoutingData();
this.$message.success(data.msg); this.$message.success(data.msg);
}else { }else {
@ -1882,7 +1956,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteQuotationPart(row).then(({data})=>{ deleteQuotationPart(row).then(({data})=>{
if (data.code == 200){
if (data.code === 200){
this.initQuotationPart(); this.initQuotationPart();
this.$message.success(data.msg); this.$message.success(data.msg);
}else { }else {
@ -1903,7 +1977,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
batchDeleteQuotationPart(this.selectionQuotationPartList).then(({data})=>{ batchDeleteQuotationPart(this.selectionQuotationPartList).then(({data})=>{
if (data.code == 200){
if (data.code === 200){
this.initQuotationPart(); this.initQuotationPart();
this.$message.success(data.msg); this.$message.success(data.msg);
}else { }else {
@ -1920,7 +1994,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
deleteQuotationDetail(row).then(({data})=>{ deleteQuotationDetail(row).then(({data})=>{
if (data.code == 200){
if (data.code === 200){
this.initData(); this.initData();
this.$message.success(data.msg); this.$message.success(data.msg);
}else { }else {
@ -1967,7 +2041,7 @@ export default {
this.editQuotationDetailLoading = true; this.editQuotationDetailLoading = true;
updateQuotationDetail(params).then(({data}) => { updateQuotationDetail(params).then(({data}) => {
this.editQuotationDetailLoading = false; this.editQuotationDetailLoading = false;
if (data.code == 200) {
if (data.code === 200) {
this.quotationDetailFlag = false; this.quotationDetailFlag = false;
this.initData(); this.initData();
this.$message.success(data.msg); this.$message.success(data.msg);
@ -2037,7 +2111,7 @@ export default {
this.saveQuotationRoutingLoading = true; this.saveQuotationRoutingLoading = true;
insertQuotationRouting(this.quotationRouting).then(({data})=>{ insertQuotationRouting(this.quotationRouting).then(({data})=>{
this.saveQuotationRoutingLoading = false; this.saveQuotationRoutingLoading = false;
if (data.code == 200){
if (data.code === 200){
this.initQuotationRoutingData(); this.initQuotationRoutingData();
this.$message.success(data.msg); this.$message.success(data.msg);
this.quotationRoutingDialogFlag = false; this.quotationRoutingDialogFlag = false;
@ -2052,7 +2126,7 @@ export default {
batchInsertQuotationRoutingData(quotationRoutingList){ batchInsertQuotationRoutingData(quotationRoutingList){
batchInsertQuotationRouting(quotationRoutingList).then(({data})=>{ batchInsertQuotationRouting(quotationRoutingList).then(({data})=>{
this.saveBatchLoading = false; this.saveBatchLoading = false;
if (data.code == 200){
if (data.code === 200){
this.initQuotationRoutingData(); this.initQuotationRoutingData();
this.$message.success(data.msg); this.$message.success(data.msg);
this.otherQuotationDetailDialogFlag = false; this.otherQuotationDetailDialogFlag = false;
@ -2080,7 +2154,7 @@ export default {
batchInsertQuotationPartData(quotationPrtList){ batchInsertQuotationPartData(quotationPrtList){
batchInsertQuotationPart(quotationPrtList).then(({data})=>{ batchInsertQuotationPart(quotationPrtList).then(({data})=>{
this.saveBatchLoading = false; this.saveBatchLoading = false;
if (data.code == 200){
if (data.code === 200){
this.initQuotationPart(); this.initQuotationPart();
this.$message.success(data.msg); this.$message.success(data.msg);
this.otherQuotationDetailDialogFlag = false; this.otherQuotationDetailDialogFlag = false;
@ -2096,7 +2170,7 @@ export default {
insertQuotationPartData(){ insertQuotationPartData(){
insertQuotationPart(this.quotationPart).then(({data})=>{ insertQuotationPart(this.quotationPart).then(({data})=>{
this.saveQuotationPartLoading = false; this.saveQuotationPartLoading = false;
if (data.code == 200){
if (data.code === 200){
this.initQuotationPart(); this.initQuotationPart();
this.$message.success(data.msg); this.$message.success(data.msg);
this.quotationPartDialogFlag = false; this.quotationPartDialogFlag = false;
@ -2159,7 +2233,7 @@ export default {
batchInsertQuotationDetailData(quotationDetailList){ batchInsertQuotationDetailData(quotationDetailList){
batchInsertQuotationDetail(quotationDetailList).then(({data})=>{ batchInsertQuotationDetail(quotationDetailList).then(({data})=>{
this.saveBatchLoading = false; this.saveBatchLoading = false;
if (data.code == 200){
if (data.code === 200){
this.initData(); this.initData();
this.otherQuotationDetailDialogFlag = false; this.otherQuotationDetailDialogFlag = false;
this.$message.success(data.msg); this.$message.success(data.msg);
@ -2203,7 +2277,7 @@ export default {
this.initQuotationDetailLoading = true; this.initQuotationDetailLoading = true;
searchQuotationDetailPageByHeaderId(params).then(({data}) => { searchQuotationDetailPageByHeaderId(params).then(({data}) => {
this.initQuotationDetailLoading = false; this.initQuotationDetailLoading = false;
if (data.code == 200) {
if (data.code === 200) {
this.tableData = data.data.records; this.tableData = data.data.records;
this.total = data.data.total; this.total = data.data.total;
}else { }else {
@ -2224,13 +2298,8 @@ export default {
}, },
// 获取工具列表 // 获取工具列表
initToolHeader(){ initToolHeader(){
this.toolHeader.toolNo = undefined;
this.toolHeader.toolDescription = undefined;
let params = {
site:this.$store.state.user.site,
};
searchToolHeader(params).then(({data})=>{
if (data.code == 200) {
searchToolHeader(this.toolHeader).then(({data})=>{
if (data.code === 200) {
this.toolHeaderList = data.data; this.toolHeaderList = data.data;
this.toolHeaderList = this.toolHeaderList.map(item =>{ this.toolHeaderList = this.toolHeaderList.map(item =>{
let utilObj = { let utilObj = {
@ -2249,7 +2318,7 @@ export default {
site:this.$store.state.user.site, site:this.$store.state.user.site,
}; };
searchUmInformationList(params).then(({data})=>{ searchUmInformationList(params).then(({data})=>{
if (data.code == 200) {
if (data.code === 200) {
this.umInformationList = data.data; this.umInformationList = data.data;
this.umInformationList = this.umInformationList.map(item=>{ this.umInformationList = this.umInformationList.map(item=>{
let utilObj = { let utilObj = {
@ -2270,7 +2339,7 @@ export default {
this.initQuotationRoutingLoading = true; this.initQuotationRoutingLoading = true;
searchQuotationRoutingByDetailId(params).then(({data})=>{ searchQuotationRoutingByDetailId(params).then(({data})=>{
this.initQuotationRoutingLoading = false; this.initQuotationRoutingLoading = false;
if (data.code == 200) {
if (data.code === 200) {
this.quotationRoutingFormTable.quotationRoutingList = data.data; this.quotationRoutingFormTable.quotationRoutingList = data.data;
// 计算价格 // 计算价格
let list = this.quotationRoutingFormTable.quotationRoutingList; let list = this.quotationRoutingFormTable.quotationRoutingList;
@ -2297,7 +2366,7 @@ export default {
this.initQuotationPartLoading = true; this.initQuotationPartLoading = true;
searchQuotationPart(params).then(({data})=>{ searchQuotationPart(params).then(({data})=>{
this.initQuotationPartLoading = false; this.initQuotationPartLoading = false;
if (data.code == 200){
if (data.code === 200){
this.quotationPartFormTable.quotationPartList = data.data; this.quotationPartFormTable.quotationPartList = data.data;
this.computeQuotationPartCost();// 计算材料 this.computeQuotationPartCost();// 计算材料
} }
@ -2313,7 +2382,7 @@ export default {
this.initQuotationToolLoading = true; this.initQuotationToolLoading = true;
searchQuotationTool(params).then(({data}) => { searchQuotationTool(params).then(({data}) => {
this.initQuotationToolLoading = false; this.initQuotationToolLoading = false;
if (data.code == 200) {
if (data.code === 200) {
this.quotationToolFormTable.quotationToolList = data.data; this.quotationToolFormTable.quotationToolList = data.data;
this.computeQuotationToolCost();// 计算工具价格 this.computeQuotationToolCost();// 计算工具价格
} }
@ -2327,20 +2396,15 @@ export default {
site:this.$store.state.user.site, site:this.$store.state.user.site,
}; };
searchWorkCenter(params).then(({data})=>{ searchWorkCenter(params).then(({data})=>{
if (data.code == 200) {
if (data.code === 200) {
this.workCenterList = data.data; this.workCenterList = data.data;
} }
}) })
}, },
// 查询 材料信息 // 查询 材料信息
initPartList(){ initPartList(){
this.partData.partNo = undefined;
this.partData.partDesc = undefined;
let params = {
site:this.$store.state.user.site
};
searchPartList(params).then(({data})=>{
if (data.code == 200) {
searchPartList(this.partData).then(({data})=>{
if (data.code === 200) {
this.partList = data.data; this.partList = data.data;
} }
}) })
@ -2355,7 +2419,7 @@ export default {
internalInquiryNo:this.otherDetail.internalInquiryNo, internalInquiryNo:this.otherDetail.internalInquiryNo,
}; };
searchQuotationDetail(params).then(({data})=>{ searchQuotationDetail(params).then(({data})=>{
if (data.code == 200){
if (data.code === 200){
this.otherQuotationDetailList = data.data; this.otherQuotationDetailList = data.data;
} }
}) })
@ -2370,7 +2434,7 @@ export default {
internalInquiryNo:this.otherDetail.internalInquiryNo, internalInquiryNo:this.otherDetail.internalInquiryNo,
} }
quotationDetailList(params).then(({data})=>{ quotationDetailList(params).then(({data})=>{
if (data.code == 200){
if (data.code === 200){
this.otherQuotationDetailList = data.data; this.otherQuotationDetailList = data.data;
} }
}) })
@ -2539,7 +2603,7 @@ export default {
quotationRoutingId:undefined,//主键 quotationRoutingId:undefined,//主键
quotationDetailId:undefined,//外键 quotationDetailId:undefined,//外键
site:this.$store.state.user.site,//工厂编码 site:this.$store.state.user.site,//工厂编码
itemNo:undefined,//序号
itemNo:0,//序号
quotationRoutingNo:undefined,//报价工序编码 quotationRoutingNo:undefined,//报价工序编码
quotationRoutingDesc:undefined,//报价工序名称 quotationRoutingDesc:undefined,//报价工序名称
machiningCenterNo:undefined,//加工中心编码 machiningCenterNo:undefined,//加工中心编码
@ -2803,7 +2867,7 @@ export default {
for (let i = 0; i < labels.length; i++) { for (let i = 0; i < labels.length; i++) {
let quotationToolColumn = labels[i]; let quotationToolColumn = labels[i];
if (quotationToolColumn.label === filed) { if (quotationToolColumn.label === filed) {
this.$message.warning(quotationToolColumn.value+"填写不正确");
this.$message.warning(quotationToolColumn.value+"为空或填写不正确");
return return
} }
} }
@ -2818,7 +2882,7 @@ export default {
for (let i = 0; i < labels.length; i++) { for (let i = 0; i < labels.length; i++) {
let quotationToolColumn = labels[i]; let quotationToolColumn = labels[i];
if (quotationToolColumn.label === filed) { if (quotationToolColumn.label === filed) {
this.$message.warning(tableName+"存在:"+quotationToolColumn.value+"填写不正确");
this.$message.warning(tableName+"存在:"+quotationToolColumn.value+"为空或填写不正确");
return return
} }
} }
@ -2865,6 +2929,11 @@ export default {
break break
} }
}, },
changeRegValue(value){
if (value < 0){
this.quotationRouting.itemNo = 0
}
},
}, },
created() { created() {
// 创建时 父组件值绑定zi // 创建时 父组件值绑定zi

Write Preview
Loading…
Cancel
Save