Skip to content

M
mes-ui
Commit ae72e548 authored by renjintao's avatar renjintao
Browse files
Options

ordermaterial

parent 31c166a5
Hide whitespace changes
Inline Side-by-side
Showing with 211 additions and 48 deletions
pages/processManage/setProcess/components/orderMaterialNew.vue 0 → 100644
View file @ ae72e548
<style lang="less">
@import "../../../processDesign/Process/menu.less";
</style>
<template>
<div class="new_box">
<span class="mr10">订单编号：{{mescodes}}</span>
<Button v-if="materialbillStatuss==-1" type="primary" @click="saveBill">生成料单</Button>
<Table stripe ref="table" border :columns="columns" :data="datas" class="tableCommon mt5"></Table>
</div>
</template>
<script>
import Api from "@/plugins/request";
export default {
name: "orderMaterialNew",
data() {
return {
isview: false,
mescodes: this.mesCode,
materialbillStatuss: this.materialbillStatus,
routingHeaderId: this.mainRoutingID,
orderId:this.id,
orderCount:this.quantity,
datas: [],
columns: [
{
key: "routingDetailNo",
title: this.l("routingDetailNo"),
align: "left",
width: 100
},
{
key: "routingDetailName",
title: this.l("routingDetailName"),
align: "left"
},
{
key: "materialType",
title: this.l("materialType"),
align: "center",
code: "mes_xingchi_resource.material.materialReType",
width: 100
},
{
key: "materialNumber",
title: this.l("materialNumber"),
align: "left"
},
{
key: "nameMaterial",
title: this.l("nameMaterial"),
align: "left"
},
{
key: "quantity",
title: this.l("quantity"),
align: "right",
width: 80
},
{
key: "brand",
title: this.l("brand"),
align: "left"
},
{
key: "specifications",
title: this.l("specifications"),
align: "left"
},
{
key: "xhgg",
title: this.l("xhgg"),
align: "left",
easy: true,
high: true,
hide: true
},
{
key: "texture",
title: this.l("texture"),
align: "left"
},
{
key: "procurementStandards",
title: this.l("procurementStandards"),
align: "left"
},
{
key: "qualityGrade",
title: this.l("qualityGrade"),
align: "left"
},
{
key: "drawNum",
title: this.l("drawNum"),
align: "left"
}
]
};
},
props: {
mesCode: String,
materialbillStatus: Number,
mainRoutingID: Number,
id: Number,
quantity: Number,
},
mounted() {
},
created() {},
methods: {
saveBill() {},
loaddata() {
let params = {
routingHeaderId: this.routingHeaderId,
orderId: this.orderId,
orderCount: this.orderCount
};
Api.post(
`${technologyUrl}materiallist/createnew`,
params
).then(res => {});
},
l(key) {
key = "routingsupporting" + "." + key;
return this.$t(key);
}
},
watch: {
mainRoutingID(v) {
this.routingHeaderId = v;
this.loaddata();
},
mesCode(v) {
this.mescodes = v;
},
materialbillStatus(v) {
this.materialbillStatuss = v;
},
id(v)
{
this.orderId=v
},
quantity(v)
{
this.orderCount=v
}
}
};
</script>
\ No newline at end of file
pages/processManage/setProcess/index.vue
View file @ ae72e548
<template>
<Layout class="lay100">
<!-- <div> -->
<Layout class="lay100">
<!-- <div> -->
<!-- 左侧树 -->
<!-- <Sider hide-trigger v-if="showMenu" class="menu_side" width="300"> -->
<!-- <div class="zh-tree" :style="{height:treeHeight+'px'}"> -->
<!-- <h3 class="zh-title">产品结构</h3>
<!-- <h3 class="zh-title">产品结构</h3>
<div class="zh-box">
<Input search placeholder="请输入查询条件" v-model="treeInputSearch" />
......@@ -15,7 +15,7 @@
@on-select-change="selectTreeNode"
></Tree>
</div>
</Sider> -->
</Sider>-->
<!-- </div> -->
<Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
<ProductTree @on-hide="onHide" @on-select="productSearch" />
......@@ -293,23 +293,25 @@
</Modal>
<Modal
v-model="modalliao"
title="创建料单"
title="料单"
class="model_tabel"
:width="1040"
fullscreen="true"
:mask-closable="false"
:loading="myloading"
>
<orderMaterial ref="orderMaterial"></orderMaterial>
<div v-if="!ismview" slot="footer" v-model="greateArtmodel">
<Button type="text" size="large" @click="saveCancelModel">取消</Button>
<Button type="primary" size="large" @click="Seveld" class="mr20">确定</Button>
<!-- <Button type="primary" size="large" @click="nextStep">送审</Button> footer-hide-->
<!-- <Checkbox v-model="checked" label="送审">送审</Checkbox> -->
</div>
<div v-else slot="footer" v-model="greateArtmodel">
<Button type="text" size="large" @click="saveCancelModel">取消</Button>
<orderMaterial
ref="orderMaterial"
:mesCode="mesCode"
:materialbillStatus="materialbillStatus"
:mainRoutingID="mainRoutingID"
:id="id"
:quantity="quantity"
></orderMaterial>
<div slot="footer">
<Button type="text" size="large" @click="saveCancelModel">关闭</Button>
</div>
</Modal>
<!-- 料单送审 -->
<Modal
v-model="modalInfo"
......@@ -356,7 +358,7 @@
<script>
import DrawerSet from "./components/drawerSet.vue"; //抽屉列表
import orderMaterial from "./components/orderMaterial.vue"; //料单
import orderMaterial from "./components/orderMaterialNew.vue"; //料单
import processMain from "./processMain.vue";
import processNew from "../Process/processNew.vue";
......@@ -452,8 +454,8 @@ export default {
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null, //紧急程度
MaxResultCount:10,
SkipCount:0,
MaxResultCount: 10,
SkipCount: 0
},
formValidate: {
id: "",
......@@ -491,27 +493,24 @@ export default {
value: "",
column: [],
historycolumn: [
{ type: "selection", width: 70, align: "center", fixed: "left" },
{ type: "selection", width: 70, align: "center" },
{
title: "序号",
key: "id",
width: 80,
align: "center",
fixed: "left"
align: "center"
},
{
title: "订单编号",
key: "mesCode",
width: 180,
align: "center",
fixed: "left"
align: "center"
},
{
title: "任务类型",
key: "taskTypeName",
width: 120,
align: "center",
fixed: "left",
render: (h, params) => {
return h("state", {
props: {
......@@ -526,8 +525,7 @@ export default {
title: "产品名称",
key: "productName",
width: 120,
align: "center",
fixed: "left"
align: "center"
},
{ title: "图号", key: "drawnNumber", width: 120 },
{ title: "项目号", key: "projectNumber", width: 120 },
......@@ -644,13 +642,13 @@ export default {
});
}
}
if (gh != null && gh.length > 0) {
content1 = gh[0].name;
editColor1 = gh[0].color;
} if(params.row.materialbillStatus>1)
{
content1 = "查看";
}
if (params.row.materialbillStatus > 1) {
content1 = "查看";
}
return h("div", [
h(
......@@ -667,8 +665,7 @@ export default {
on: {
click: e => {
e.stopPropagation();
this.savematerialbill(params);
this.savematerialbillNew(params);
}
}
},
......@@ -684,7 +681,13 @@ export default {
orderselected: null,
addpdefm: null,
detailInfo: {} //送审所需信息
detailInfo: {}, //送审所需信息
//料单设置
mainRoutingID: null,
mesCode: "",
materialbillStatus: null,
id: null,
quantity: null
};
},
created() {
......@@ -709,7 +712,8 @@ export default {
};
},
computed: {
searchList() {//产品树左侧
searchList() {
//产品树左侧
let nodeList = this.treeData;
var text = this.treeInputSearch;
var newNodeList = [];
......@@ -739,12 +743,12 @@ export default {
},
productSearch(id, item, ids) {
if (ids.length > 0) {
this.orderSearchForm.productId = ids.join(",");
} else {
this.orderSearchForm.productId = "-1";
this.orderSearchForm.productName = "";
}
this.easySearch(this.orderSearchForm);
this.orderSearchForm.productId = ids.join(",");
} else {
this.orderSearchForm.productId = "-1";
this.orderSearchForm.productName = "";
}
this.easySearch(this.orderSearchForm);
},
// tab切换
tabChange(name) {
......@@ -792,7 +796,8 @@ export default {
// 分页
pageChange(num) {
this.page = num;
this.orderSearchForm.SkipCount = (num - 1) * this.orderSearchForm.MaxResultCount;
this.orderSearchForm.SkipCount =
(num - 1) * this.orderSearchForm.MaxResultCount;
// console.log(this.orderSearchForm.SkipCount);
this.loaddata(this.orderSearchForm);
},
......@@ -803,12 +808,12 @@ export default {
this.loaddata(this.orderSearchForm);
},
loaddata(params) {
var url = "";
this.orderSearchForm.simpleSearch= typeof params == "string" ? params : params.simpleSearch, //快速搜索
this.orderSearchForm.ProcessUserType= this.tabstatus,
this.orderSearchForm.ProductingPreparation= this.ProductingPreparationPeople,
this.orderSearchForm.RoutingSetStatus= this.orderSearchForm.RoutingSetStatus
var url = "";
(this.orderSearchForm.simpleSearch =
typeof params == "string" ? params : params.simpleSearch), //快速搜索
(this.orderSearchForm.ProcessUserType = this.tabstatus),
(this.orderSearchForm.ProductingPreparation = this.ProductingPreparationPeople),
(this.orderSearchForm.RoutingSetStatus = this.orderSearchForm.RoutingSetStatus);
url =
`${PlanUrl}/mesorder/getpagedmesordersforpdefm?` +
QS.stringify(this.orderSearchForm);
......@@ -1584,7 +1589,14 @@ export default {
console.log(err);
});
},
savematerialbillNew(params) {
this.modalliao = true;
this.mesCode = params.row.mesCode;
this.materialbillStatus = params.row.materialbillStatus;
this.mainRoutingID = params.row.mainRoutingID;
this.id=params.row.id;
this.quantity=params.row.quantity;
},
savematerialbill(params) {
this.modalliao = true;
let ld = this.$refs.orderMaterial;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment