From b27857438e4c60406faa17b474202e437687814b Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 11 四月 2024 15:02:10 +0800
Subject: [PATCH] 产量登记表模块 获取车辆号的接口修改联调+根据庄口，车间，组别的获取等级的接口联调
---
src/api/productManage/productRegisterForm.js | 2
src/views/productManage/productRegisterForm/addProductRegisterPage.vue | 172 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 163 insertions(+), 11 deletions(-)
diff --git a/src/api/productManage/productRegisterForm.js b/src/api/productManage/productRegisterForm.js
index b112837..1730181 100644
--- a/src/api/productManage/productRegisterForm.js
+++ b/src/api/productManage/productRegisterForm.js
@@ -34,7 +34,7 @@
// 鑾峰彇杞﹁締缂栧彿
export function getWorkshopManageCar(data) {
return request({
- url: "/api-jl/v1/system/getWorkshopManageCar",
+ url: "/api-jl/v1/system/getCarAndLevel",
method: "post",
data
})
diff --git a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
index 10b98b7..a942a8c 100644
--- a/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
+++ b/src/views/productManage/productRegisterForm/addProductRegisterPage.vue
@@ -72,6 +72,7 @@
v-model="ruleForm.marketId"
placeholder="璇烽�夋嫨"
class="select-width"
+ @change='getGroupNumber'
>
<el-option
v-for="item in marketList"
@@ -371,6 +372,7 @@
width="60"
align="center"
>
+
</el-table-column>
<el-table-column
prop="pieceNumber12"
@@ -455,6 +457,9 @@
</el-table-column>
</el-table-column>
<el-table-column prop="oneYield" label="鍙颁骇閲�" align="center">
+ <template slot-scope="scope">
+ {{getOneYield(scope.row)}}
+ </template>
</el-table-column>
<el-table-column
prop="peopleYield"
@@ -462,6 +467,9 @@
width="60"
align="center"
>
+ <template slot-scope="scope">
+ {{getPeopleYield(scope.row)}}
+ </template>
</el-table-column>
<el-table-column
prop="hourYield"
@@ -469,6 +477,9 @@
width="60"
align="center"
>
+ <template slot-scope="scope">
+ {{getHourYield(scope.row)}}
+ </template>
</el-table-column>
<el-table-column
prop="personReelingdiscount"
@@ -483,6 +494,9 @@
width="60"
align="center"
>
+ <template slot-scope="scope">
+ {{getallYield(scope.row,1)}}
+ </template>
</el-table-column>
<el-table-column
prop="oneYield1"
@@ -490,6 +504,9 @@
width="60"
align="center"
>
+ <template slot-scope="scope">
+ {{getoneYield(scope.row,1)}}
+ </template>
</el-table-column>
<el-table-column
prop="reelingdiscount1"
@@ -504,6 +521,9 @@
width="60"
align="center"
>
+ <template slot-scope="scope">
+ {{getallYield(scope.row,2)}}
+ </template>
</el-table-column>
<el-table-column
prop="oneYield2"
@@ -511,6 +531,9 @@
width="60"
align="center"
>
+ <template slot-scope="scope">
+ {{getoneYield(scope.row,2)}}
+ </template>
</el-table-column>
<el-table-column
prop="reelingdiscount2"
@@ -525,6 +548,9 @@
width="60"
align="center"
>
+ <template slot-scope="scope">
+ {{getallYield(scope.row,3)}}
+ </template>
</el-table-column>
<el-table-column
prop="oneYield3"
@@ -532,6 +558,9 @@
width="60"
align="center"
>
+ <template slot-scope="scope">
+ {{getoneYield(scope.row,3)}}
+ </template>
</el-table-column>
<el-table-column
prop="reelingdiscount3"
@@ -542,16 +571,18 @@
</el-table-column>
</el-table>
</div>
+
</div>
<!-- 浠櫒杩炴帴姝ｅ父寮圭獥 -->
<addProductDialog ref="addProductDialog"
- :marketList='marketList'
- :nameList='nameList'
- :form='ruleForm'
- :specList='specList'
- @changeForm='changeForm'
- @changeTableInput='changeTableInput' />
- </div>
+ :marketList='marketList'
+ :nameList='nameList'
+ :form='ruleForm'
+ :specList='specList'
+ @changeForm='changeForm'
+ @changeTableInput='changeTableInput' />
+ </div>
+
</template>
<script>
@@ -643,6 +674,105 @@
this.getSelectDataList();
},
methods: {
+ // 琛ㄦ牸鐨勮绠楅棶棰�
+ getOneYield(row){
+ let string='';
+ if(row.pieceNumber11||row.pieceNumber12||row.pieceNumber13||row.pieceNumber14||row.pieceNumber21||row.pieceNumber22||row.pieceNumber23||row.pieceNumber24||row.pieceNumber31||row.pieceNumber32||row.pieceNumber33||row.pieceNumber34){
+ if(row.pieceNumber11){
+ string=Number(row.pieceNumber11)
+ }
+ if(row.pieceNumber12){
+ string=string+Number(row.pieceNumber12)
+ }
+ if(row.pieceNumber13){
+ string=string+Number(row.pieceNumber13)
+ }
+ if(row.pieceNumber14){
+ string=string+Number(row.pieceNumber14)
+ }
+ if(row.pieceNumber21){
+ string=string+Number(row.pieceNumber21)
+ }
+ if(row.pieceNumber22){
+ string=string+Number(row.pieceNumber22)
+ }
+ if(row.pieceNumber23){
+ string=string+Number(row.pieceNumber23)
+ }
+ if(row.pieceNumber24){
+ string=string+Number(row.pieceNumber24)
+ }
+ if(row.pieceNumber31){
+ string=string+Number(row.pieceNumber31)
+ }
+ if(row.pieceNumber32){
+ string=string+Number(row.pieceNumber32)
+ }
+ if(row.pieceNumber33){
+ string=string+Number(row.pieceNumber33)
+ }
+ if(row.pieceNumber34){
+ string=string+Number(row.pieceNumber34)
+ }
+ }
+ return string;
+ },
+ getPeopleYield(row){
+ let string=0
+ if(row.perList){
+ if(row.perList.length>0){
+ let carNumber=row.perList[row.perList.length-1]
+ for(let i in this.tableData){
+ for(let j in row.perList){
+ if(row.perList[j]==this.tableData[i].carNumber){
+ string=string+this.tableData[i].oneYield
+ }
+ if(j==row.perList.length-1){
+ break;
+ }
+ }
+ }
+ for(let k in this.tableData){
+ if(this.tableData[k ].carNumber==carNumber){
+ this.$set(this.tableData[k],'peopleYield',string)
+ break;
+ }
+ }
+ }
+ }
+ },
+ getHourYield(row){
+ let hourYield=''
+ if(this.ruleForm.record&&this.ruleForm.record!=0){
+ hourYield=row.oneYield/this.ruleForm.record
+ }
+ return hourYield;
+ },
+ getallYield(row,val){
+ let string='';
+ if(row['pieceNumber'+val+'1']||row['pieceNumber'+val+'2']||row['pieceNumber'+val+'3']||row['pieceNumber'+val+'4']){
+ if(row['pieceNumber'+val+'1']){
+ string=Number(row['pieceNumber'+val+'1'])
+ }
+ if(row['pieceNumber'+val+'2']){
+ string=string+Number(row['pieceNumber'+val+'2'])
+ }
+ if(row['pieceNumber'+val+'3']){
+ string=string+Number(row['pieceNumber'+val+'3'])
+ }
+ if(row['pieceNumber'+val+'4']){
+ string=string+Number(row['pieceNumber'+val+'4'])
+ }
+ }
+ return string;
+ },
+ getoneYield(row,val){
+ let oneYield=''
+ if(this.ruleForm.record&&this.ruleForm.record!=0){
+ oneYield=row['allYield'+val]/this.ruleForm.record
+ }
+ return oneYield;
+ },
changeForm(form,val){
if(val){
this.ruleForm.createTime=form.createTime
@@ -716,14 +846,30 @@
}
}
});
- if(this.ruleForm.groupNumber){
+ if(this.ruleForm.groupNumber&&this.ruleForm.marketId){
+ let workshopName=''
+ for(let i in this.nameList){
+ if( this.nameList[i].number==this.ruleForm.workshopId){
+ workshopName= this.nameList[i].name
+ break;
+ }
+ }
+ let marketName=''
+ for(let i in this.marketList){
+ if( this.marketList[i].ID==this.ruleForm.marketId){
+ marketName= this.marketList[i].name
+ break;
+ }
+ }
getWorkshopManageCar({
- workshopNumber:this.ruleForm.workshopId+'',
+ workshopName:workshopName,
+ marketName:marketName,
groupNumber:this.ruleForm.groupNumber,
}).then((res) => {
if (res.code == 200) {
this.tableData=[]
- let data = JSON.parse(JSON.stringify(res.data)) || {};
+ this.ruleForm.level=res.data.level||''
+ let data = JSON.parse(JSON.stringify(res.data.car)) || [];
if(Object.keys(data).length>0){
for(let i in data){
for(let j in data[i]){
@@ -851,6 +997,12 @@
<style lang="scss" scoped>
.add-product-page {
height: 100%;
+ position:relative;
+ ::v-deep .el-table .el-table__cell {
+ padding: 6px 0 !important;
+ height: 35px;
+ text-align: center;
+ }
.top-view {
margin: 20px 30px;
height: 52px;
--
Gitblit v1.8.0