|
|
@@ -33,66 +33,104 @@
|
|
|
</el-col>
|
|
|
<!--列表-->
|
|
|
<el-table ref="productTbl" v-if="showTable" @cell-mouse-enter="hoverCall" @cell-mouse-leave="handCall" :cell-class-name="tableCellClassName" :default-expand-all="defaultExpandAllFlg" :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;" @sort-change="tableSort" @expand-change="expandChange" >
|
|
|
- <!-- todo 展开 -->
|
|
|
+
|
|
|
<el-table-column type="expand">
|
|
|
<template slot-scope="props">
|
|
|
<el-form label-position="left" inline class="demo-table-expand">
|
|
|
<el-form-item label="派工单">
|
|
|
- <span>版本号</span>
|
|
|
- <el-select v-model="procedureVersion" placeholder="请选择版本号">
|
|
|
+ <span>版本号:</span>
|
|
|
+ <el-select v-model="procedureVersion" placeholder="请选择版本号" @change="changeProcedureVersion(props.row)">
|
|
|
<el-option
|
|
|
v-for="item in props.row.tableProdProcedure.versions"
|
|
|
:key="item"
|
|
|
:label="item"
|
|
|
- :value="item">
|
|
|
+ :value="item"
|
|
|
+ >
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item >
|
|
|
- <template>
|
|
|
- <el-table
|
|
|
- :data="props.row.tableProdProcedure.procedureList"
|
|
|
- border
|
|
|
+ <el-table
|
|
|
+ :data="props.row.tableProdProcedure.procedureList"
|
|
|
+ border
|
|
|
+ style="width: 100%">
|
|
|
+ <el-table-column
|
|
|
+ prop="name"
|
|
|
+ label="工序名称"
|
|
|
+ width="180">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="unitPrice"
|
|
|
+ label="单件工时"
|
|
|
+ width="180">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="workingTime"
|
|
|
+ abel="单件工价">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ abel="质检类型">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.checkType == 0">自检</span>
|
|
|
+ <span v-if="scope.row.checkType==1">互检</span>
|
|
|
+ <span v-if="scope.row.checkType == 2">专检</span>
|
|
|
+ </template>
|
|
|
+ <!-- -->
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item label="物料单">
|
|
|
+ <span>版本号：</span>
|
|
|
+ <el-select v-model="prodMaterialVersion" placeholder="请选择版本号" @change="changeMaterialVersion(props.row)">
|
|
|
+ <el-option
|
|
|
+ v-for="item in props.row.tableProdMaterial.versions"
|
|
|
+ :key="item"
|
|
|
+ :label="item"
|
|
|
+ :value="item"
|
|
|
+ >
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item >
|
|
|
+ <el-table
|
|
|
+ :data="props.row.tableProdMaterial.materialList"
|
|
|
+ border
|
|
|
style="width: 100%">
|
|
|
- <el-table-column
|
|
|
- prop="name"
|
|
|
- label="工序名称"
|
|
|
+ <el-table-column
|
|
|
+ prop="name"
|
|
|
+ label="零件名称"
|
|
|
width="180">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="unitPrice"
|
|
|
- label="单件工时"
|
|
|
+ prop="companyCode"
|
|
|
+ label="公司编码"
|
|
|
width="180">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="workingTime"
|
|
|
- label="单件工价">
|
|
|
+ prop="companyDrawingNo"
|
|
|
+ label="公司图号">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="checkType"
|
|
|
- label="质检类型">
|
|
|
- <span v-if="checkType==0">自检</span>
|
|
|
- <span v-if="checkType == 1">互检</span>
|
|
|
- <span v-if="checkType == 2">专检</span>
|
|
|
+ prop="materialQuality"
|
|
|
+ label="材质">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="thickness"
|
|
|
+ label="厚度">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="numberProduct"
|
|
|
+ label="数量（个/产品）">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="numberVehicle"
|
|
|
+ label="数量（个/辆）">
|
|
|
</el-table-column>
|
|
|
- </el-table>
|
|
|
- </template>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="商品 ID">
|
|
|
- <span>{{ props.row.id }}</span>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="店铺 ID">
|
|
|
- <span>{{ props.row.shopId }}</span>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="商品分类">
|
|
|
- <span>{{ props.row.category }}</span>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="店铺地址">
|
|
|
- <span>{{ props.row.address }}</span>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="商品描述">
|
|
|
- <span>{{ props.row.desc }}</span>
|
|
|
- </el-form-item>
|
|
|
+ </el-table>
|
|
|
+
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -801,6 +839,27 @@ a {
|
|
|
})
|
|
|
},
|
|
|
methods: {
|
|
|
+
|
|
|
+ changeProcedureVersion(row){
|
|
|
+ let index = null
|
|
|
+ for (var i in this.list) {
|
|
|
+ if (this.list[i].id === row.id) {
|
|
|
+ index = i
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.getProdProcedureVersion(row.id,index)
|
|
|
+ },
|
|
|
+ changeMaterialVersion(row) {
|
|
|
+ let index = null
|
|
|
+ for (var i in this.list) {
|
|
|
+ if (this.list[i].id === row.id) {
|
|
|
+ index = i
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ this.getProdMaterialVersion(row.id, index)
|
|
|
+ },
|
|
|
// 获取row的key值
|
|
|
getRowKeys(row) {
|
|
|
return row.id;
|
|
|
@@ -821,32 +880,37 @@ a {
|
|
|
console.log(index, '索引')
|
|
|
this.http.post("/prod-procedure/getVersions", { productId: row.id },
|
|
|
res => {
|
|
|
- console.log("=======1", this.list[index])
|
|
|
- //console.log("version", this.procedureVersion)
|
|
|
this.list[index].tableProdProcedure.versions = res.data
|
|
|
this.procedureVersion = res.data[res.data.length - 1]
|
|
|
this.getProdProcedureVersion(row.id, index)
|
|
|
- console.log("version",this.procedureVersion)
|
|
|
+
|
|
|
})
|
|
|
this.http.post("/prod-material/getVersions", { productId: row.id },
|
|
|
res => {
|
|
|
this.list[index].tableProdMaterial.versions = res.data
|
|
|
this.prodMaterialVersion = res.data[res.data.length - 1]
|
|
|
- this.getProdProcedureVersion(row.id, index)
|
|
|
+ this.getProdMaterialVersion(row.id, index)
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
getProdProcedureVersion(id,index){
|
|
|
- this.http.post("/prod-procedure/getInfo",{ version: this.procedureVersion,productId: id },
|
|
|
- res=>{
|
|
|
- this.list[index].tableProdProcedure.procedureList=res.data;
|
|
|
- })
|
|
|
+ if(this.procedureVersion!=null&&this.procedureVersion!=''){
|
|
|
+ this.http.post("/prod-procedure/getInfo", { version: this.procedureVersion, productId: id },
|
|
|
+ res => {
|
|
|
+ this.list[index].tableProdProcedure.procedureList = res.data;
|
|
|
+ console.log(this.list[index].tableProdProcedure.procedureList)
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
getProdMaterialVersion( id,index) {
|
|
|
- this.http.post("/prod-material/getInfo", { version: this.prodMaterialVersion, productId: id },
|
|
|
- res => {
|
|
|
- this.list[index].tableProdMaterial.materialList = res.data;
|
|
|
- })
|
|
|
+ if(this.prodMaterialVersion!=null&& this.prodMaterialVersion!=''){
|
|
|
+ this.http.post("/prod-material/getInfo", { version: this.prodMaterialVersion, productId: id },
|
|
|
+ res => {
|
|
|
+ this.list[index].tableProdMaterial.materialList = res.data;
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
},
|
|
|
submitSequence(addSequence){
|
|
|
this.addLoading = true;
|
