Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop
This commit is contained in:
commit
bd904eaa73
|
@ -143,7 +143,14 @@ export function deleteOperationwproduct(id) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//半成品摆放位置
|
||||||
|
export function wproductPlace(id, data) {
|
||||||
|
return request({
|
||||||
|
url: `/wpm/operation_wproduct/${id}/`,
|
||||||
|
method: 'put',
|
||||||
|
data
|
||||||
|
})
|
||||||
|
}
|
||||||
//删除操作记录
|
//删除操作记录
|
||||||
export function deleteOperation(id) {
|
export function deleteOperation(id) {
|
||||||
return request({
|
return request({
|
||||||
|
|
|
@ -20,22 +20,22 @@
|
||||||
<el-table-column label="子计划编号" width="100px">
|
<el-table-column label="子计划编号" width="100px">
|
||||||
<template slot-scope="scope">{{scope.row.number}}</template>
|
<template slot-scope="scope">{{scope.row.number}}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="产品名称" width="180px">
|
<el-table-column label="产品名称" width="180px" >
|
||||||
<template slot-scope="scope">{{ scope.row.product_.name }}</template>
|
<template slot-scope="scope" v-if="scope.row.product_">{{ scope.row.product_.name }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="产品型号">
|
<el-table-column label="产品型号" >
|
||||||
<template slot-scope="scope">{{ scope.row.product_.specification }}</template>
|
<template slot-scope="scope" v-if="scope.row.product_">{{ scope.row.product_.specification }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="名称" width="160px">
|
<el-table-column label="名称" width="160px">
|
||||||
<template slot-scope="scope">{{ scope.row.subproduction_.name }}</template>
|
<template slot-scope="scope" v-if="scope.row.subproduction_">{{ scope.row.subproduction_.name }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
|
|
||||||
<el-table-column label="工序名">
|
<el-table-column label="工序名" >
|
||||||
<template slot-scope="scope">{{ scope.row.process_.name }}</template>
|
<template slot-scope="scope" v-if="scope.row.process_" >{{ scope.row.process_.name }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="工序编号">
|
<el-table-column label="工序编号">
|
||||||
<template slot-scope="scope">{{ scope.row.process_.number }}</template>
|
<template slot-scope="scope" v-if="scope.row.process_">{{ scope.row.process_.number }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="子工序" width="200">
|
<el-table-column label="子工序" width="200">
|
||||||
<template slot-scope="scope" v-if="scope.row.steps">
|
<template slot-scope="scope" v-if="scope.row.steps">
|
||||||
|
@ -47,8 +47,8 @@
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="生产车间" width="100px">
|
<el-table-column label="生产车间" width="100px">
|
||||||
<template slot-scope="scope">{{ scope.row.workshop_.name }}</template>
|
<template slot-scope="scope" v-if="scope.row.workshop_">{{ scope.row.workshop_.name }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="生产数量">
|
<el-table-column label="生产数量">
|
||||||
<template slot-scope="scope">{{ scope.row.count }}</template>
|
<template slot-scope="scope">{{ scope.row.count }}</template>
|
||||||
|
|
|
@ -162,12 +162,13 @@
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="所属合同" prop="contract">
|
<el-form-item label="所属合同" prop="contract">
|
||||||
<el-select style="width: 100%" v-model="order.contract" placeholder="请选择">
|
<el-select style="width: 100%" v-model="order.contract" @change="selectcontract" placeholder="请选择">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in contractoptions"
|
v-for="item in contractoptions"
|
||||||
:key="item.value"
|
|
||||||
:label="item.label"
|
:key="item.id"
|
||||||
:value="item.value">
|
:label="item.name+'____'+item.number"
|
||||||
|
:value="item.id">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -184,7 +185,7 @@
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import { getOrderList, createOrder,updateOrder,deleteOrder,getContractList,getCustomerList } from "@/api/sam";
|
import { getOrderList, createOrder,updateOrder,deleteOrder,getContractList,getCustomerList,getContract } from "@/api/sam";
|
||||||
import { getMaterialList } from "@/api/mtm";
|
import { getMaterialList } from "@/api/mtm";
|
||||||
import checkPermission from "@/utils/permission";
|
import checkPermission from "@/utils/permission";
|
||||||
|
|
||||||
|
@ -193,6 +194,7 @@ import { genTree } from "@/utils";
|
||||||
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
|
||||||
const defaulteorder = {
|
const defaulteorder = {
|
||||||
need_mtest:false,
|
need_mtest:false,
|
||||||
|
customer:""
|
||||||
};
|
};
|
||||||
export default {
|
export default {
|
||||||
components: { Pagination },
|
components: { Pagination },
|
||||||
|
@ -253,7 +255,7 @@ export default {
|
||||||
|
|
||||||
getContractList({pageoff:true}).then((response) => {
|
getContractList({pageoff:true}).then((response) => {
|
||||||
|
|
||||||
this.contractoptions = genTree(response.data);
|
this.contractoptions = response.data;
|
||||||
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -265,7 +267,16 @@ export default {
|
||||||
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
selectcontract(selval)
|
||||||
|
{
|
||||||
|
getContract(selval).then((response) => {
|
||||||
|
if (response.data) {
|
||||||
|
console.log(response.data);
|
||||||
|
this.order.customer = response.data.customer_.name;
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
handleFilter() {
|
handleFilter() {
|
||||||
this.listQuery.page = 1;
|
this.listQuery.page = 1;
|
||||||
this.getList();
|
this.getList();
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue