Skip to content

M
mes-ui
Commit 330b2550 authored by 佟礼's avatar 佟礼
Browse files
Options

Merge branch 'product' of 39.98.128.195:zhouyx/mes-ui into product

parents 7f353f0c ea431ce7
Show whitespace changes
Inline Side-by-side
Showing with 500 additions and 391 deletions
components/modalTree/storeHouseLeft.vue
View file @ 330b2550
...@@ -43,7 +43,15 @@ export default { ...@@ -43,7 +43,15 @@ export default {
default: 0 default: 0
} }
}, },
mounted() {}, mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.divHeight = window.innerHeight - 180 + "px";
})();
};
},
created() { created() {
this.loadTree() this.loadTree()
var theight = window.innerHeight - 180 + 'px' var theight = window.innerHeight - 180 + 'px'
......
components/page/dataGrid.vue
View file @ 330b2550
...@@ -450,7 +450,7 @@ export default { ...@@ -450,7 +450,7 @@ export default {
}, },
selectAll(status) { selectAll(status) {
this.$refs.table.selectAll(status) this.$refs.table.selectAll(status)
} },
}, },
computed: { computed: {
columnsNow() { columnsNow() {
......
components/page/state.vue
View file @ 330b2550
<template> <template>
<div class="ib"> <div class="ib">
<div class="ib" v-if="!isMore"> <div class="ib" v-if="!isMore">
<span v-if="type=='text'" :style="style">{{name}}</span> <span v-if="type=='text'" :style="style">{{name}}</span>
<Tag v-if="type=='tag'" :color="tagcolor">{{name}}</Tag> <Tag v-if="type=='tag'" :color="tagcolor">{{name}}</Tag>
...@@ -10,34 +9,32 @@ ...@@ -10,34 +9,32 @@
<div class="ib" v-else v-for="(li,i) in items" :key="i"> <div class="ib" v-else v-for="(li,i) in items" :key="i">
<span v-if="type=='text'" :style="li.style">{{li.name}}</span> <span v-if="type=='text'" :style="li.style">{{li.name}}</span>
<Tag v-if="type=='tag'" :color="li.tagcolor">{{li.name}}</Tag> <Tag v-if="type=='tag'" :color="li.tagcolor">{{li.name}}</Tag>
<Badge v-if="type=='dot'" :color="li.tagcolor" :text="li.name" /> <Badge v-if="type=='dot'" :color="li.tagcolor" :text="li.name" />&nbsp;
&nbsp; </div>
</div> </div>
</div>
</template> </template>
<script> <script>
export default { export default {
name: 'state', name: "state",
data() { data() {
return { return {
name: '', name: "",
isMore:false, isMore: false,
item: {}, item: {},
items: [], items: [],
data: [] data: []
} };
}, },
props: { props: {
default: { default: {
type: String, type: String,
default: '' default: ""
}, },
type: { type: {
type: String, type: String,
default: 'text', default: "text",
validator: function(value) { validator: function(value) {
return ['text', 'tag', 'dot','icon'].indexOf(value) != -1 return ["text", "tag", "dot", "icon"].indexOf(value) != -1;
} }
}, },
code: { code: {
...@@ -62,35 +59,39 @@ export default { ...@@ -62,35 +59,39 @@ export default {
} }
}, },
created() { created() {
this.data = this.$store.getters.dictionaryByKey(this.code) || [] this.data = this.$store.getters.dictionaryByKey(this.code) || [];
}, },
methods: { methods: {
setName(v) { setName(v) {
if ((v+"").indexOf(',')==-1) { if ((v + "").indexOf(",") == -1) {
var item var item;
this.data.map((u) => { this.data.map(u => {
if (u.code == v) { if (u.code == v) {
item = u item = u;
} }
}) });
if (item) { if (item) {
this.name = item.name this.name = item.name;
this.item = item this.item = item;
} else {
if (this.value == "undefined") {
this.name = ' '
} else { } else {
this.name = this.value this.name = this.value;
}
} }
} else { } else {
this.isMore=true; this.isMore = true;
var items=[]; var items = [];
var ul=(v+"").split(',') var ul = (v + "").split(",");
this.data.map((u) => { this.data.map(u => {
if (ul.indexOf(u.code)>-1) { if (ul.indexOf(u.code) > -1) {
u.tagcolor=u.color|'default' u.tagcolor = u.color | "default";
u.style={color: u.color|'inherit'} u.style = { color: u.color | "inherit" };
items.push(u) items.push(u);
} }
}) });
this.items=items; this.items = items;
} }
} }
}, },
...@@ -99,36 +100,36 @@ export default { ...@@ -99,36 +100,36 @@ export default {
if ( if (
this.color && this.color &&
this.item && this.item &&
this.item.color != '' && this.item.color != "" &&
this.item.color != null this.item.color != null
) { ) {
return this.item.color return this.item.color;
} }
return 'default' return "default";
}, },
style() { style() {
if (!this.color) { if (!this.color) {
return {} return {};
} }
return { return {
color: color:
this.item && this.item.color != '' && this.item.color != null this.item && this.item.color != "" && this.item.color != null
? this.item.color ? this.item.color
: 'inherit' : "inherit"
} };
} }
}, },
watch: { watch: {
value(v) { value(v) {
this.setName(v) this.setName(v);
// this.$forceUpdate() // this.$forceUpdate()
}, },
data(v){ data(v) {
if(v.length>0){ if (v.length > 0) {
this.setName(this.value) this.setName(this.value);
this.$forceUpdate() this.$forceUpdate();
} }
} }
} }
} };
</script> </script>
\ No newline at end of file
i18n/locale/zh-CN.js
View file @ 330b2550
...@@ -897,7 +897,7 @@ export default { ...@@ -897,7 +897,7 @@ export default {
part_task_pk: '计划编号', part_task_pk: '计划编号',
priority: '优先级', priority: '优先级',
plan_qty: '排产数量', plan_qty: '排产数量',
spare_qty: '', spare_qty: '备件数量',
plan_start: '计划排产开始', plan_start: '计划排产开始',
plan_finish: '计划排产结束', plan_finish: '计划排产结束',
notes: '备注', notes: '备注',
...@@ -1043,6 +1043,7 @@ export default { ...@@ -1043,6 +1043,7 @@ export default {
multi_machine: '多台分配', multi_machine: '多台分配',
notes: '备注', notes: '备注',
insert_flag: '插单', insert_flag: '插单',
important_flag:"插单",
outside_time: '外协时间', outside_time: '外协时间',
discrete_percent: '离散百分比%', discrete_percent: '离散百分比%',
taskseq_des: '', taskseq_des: '',
......
layouts/basic-layout/product.vue
View file @ 330b2550
<template> <template>
<Layout class="product-layout"> <Layout class="product-layout">
<Header> <Header>
<span class="menu"> <a class="menu">
<a class="home"> <span class="home">
<Icon type="ios-keypad" /> <Icon type="ios-keypad" />
<ul class="top-menu"> <div class="top_menu_box">
<li v-for="(item,i) in filterSider"> <table class="t_table_box">
<ul> <tr v-for="(item,i) in filterSider">
<li class="title">{{item.title}}</li> <td class="t_title">
<b class="title"
>{{item.title}}</b>
</td>
<td>
<ul class="table_row_ul">
<li v-for="(li,j) in item.children"> <li v-for="(li,j) in item.children">
<a>{{li.title}}</a> <a @click="goPage(li,j)" :class="{'active': li.id === isActive}">{{li.title}}</a>
</li>
</ul>
</li> </li>
</ul> </ul>
</a> </td>
</tr>
</table>
</div>
</span> </span>
</a>
<i-header-breadcrumb v-if="showBreadcrumb && !headerMenu && !isMobile" ref="breadcrumb" /> <i-header-breadcrumb v-if="showBreadcrumb && !headerMenu && !isMobile" ref="breadcrumb" />
<i-header-search v-if="showSearch && !headerMenu && !isMobile && !showBreadcrumb" /> <i-header-search v-if="showSearch && !headerMenu && !isMobile && !showBreadcrumb" />
<div class="header-right"> <div class="header_right">
<i-header-search <i-header-search
v-if="(showSearch && isMobile) || (showSearch && (headerMenu || showBreadcrumb))" v-if="(showSearch && isMobile) || (showSearch && (headerMenu || showBreadcrumb))"
/> />
...@@ -84,6 +93,7 @@ export default { ...@@ -84,6 +93,7 @@ export default {
}, },
data() { data() {
return { return {
isActive:0,
showDrawer: false, showDrawer: false,
ticking: false, ticking: false,
headerVisible: true, headerVisible: true,
...@@ -262,7 +272,11 @@ export default { ...@@ -262,7 +272,11 @@ export default {
this.keepAlivePush(pageName); this.keepAlivePush(pageName);
} }
}); });
} },
goPage(u) {
this.$router.push(u.path)
this.isActive = u.id
},
}, },
mounted() { mounted() {
document.addEventListener("scroll", this.handleScroll, { passive: true }); document.addEventListener("scroll", this.handleScroll, { passive: true });
...@@ -275,6 +289,7 @@ export default { ...@@ -275,6 +289,7 @@ export default {
} }
}; };
</script> </script>
<style lang="less"> <style lang="less">
.product-layout { .product-layout {
.ivu-layout-header { .ivu-layout-header {
...@@ -283,6 +298,10 @@ export default { ...@@ -283,6 +298,10 @@ export default {
padding: 0; padding: 0;
.menu { .menu {
margin: 0 10px; margin: 0 10px;
display: block;
float: left;
width: 100px;
height: 60px;
.home { .home {
position: relative; position: relative;
height: 30px; height: 30px;
...@@ -293,68 +312,102 @@ export default { ...@@ -293,68 +312,102 @@ export default {
color: white; color: white;
line-height: 30px; line-height: 30px;
text-align: center; text-align: center;
-webkit-transition: width 0.5s, height 0.5s, -webkit-transform 0.5s; /* Safari */
transition: width 0.5s, height 0.5s, transform 0.5s;
i {
-webkit-transition: font-size 0.5s, margin 0.5s, -webkit-transform 0.5s; /* Safari */
transition: font-size 0.5s, margin 0.5s, transform 0.5s;
}
} }
.top-menu { .top_menu_box {
display: none; display: none;
border-radius: 5px;
position: absolute; position: absolute;
z-index: 99999; z-index: 99999;
left: 70%; left: 56%;
top: 70%; top: 57%;
background: #f5f6fa; min-width: 1084px;
border-radius: 4px;
min-width: 1800px;
min-height: 300px; min-height: 300px;
color: #2680eb; box-shadow: 0px 5px 17px 5px rgba(0,0,0,0.28);
background: #f5f6fa;
.t_table_box{
border-collapse:collapse;
border-radius: 5px;
tr:first-of-type {
border-top-right-radius: 5px;
td:first-of-type {
border-top-left-radius: 5px;
}
}
tr:last-of-type {
border-bottom-right-radius: 5px;
td:first-of-type {
border-bottom-left-radius: 5px;
}
}
tr{
// line-height: 35px;
td{
padding: 9px 10px 0px;
.table_row_ul{
list-style: none; list-style: none;
border-bottom: 1px solid #E0E0E0;
text-align: left; text-align: left;
li { li{
width: 100%;
display: block;
float: left;
ul {
width: 100%;
list-style: none; list-style: none;
li {
display: inline-block; display: inline-block;
list-style: none; a {
margin-right: 10px; float: left;
width: 150px; padding: 0px 10px;
a{ line-height: 30px;
display: inline-block; margin: 0px 6px;
padding: 0 10px; border-radius: 4px;
height: 30px;
} }
a:hover{ a:hover{
background: #2680EB; background: #2680eb;
color: white; color: white;
border-radius: 4px;
} }
a:visited{
background: #2680eb;
color: white;
} }
.title { a.active{
display: inline-block; background: #2680eb;
background: #515a6e;
width: 104px;
color: white; color: white;
text-align: center;
font-weight: bold;
height: 47px;
} }
.title:hover{
color: #ddd;
} }
} }
} }
} }
.home:hover .top-menu { .t_title{
min-width: 120px;
background: #515a6e;
.title{
padding: 5px 10px;
}
}
}
}
}
.menu:hover .home {
margin-top: 10px;
height: 60px;
width: 60px;
z-index: 88888;
}
.menu:hover .home .top_menu_box {
display: block; display: block;
} }
.menu:hover .home i {
font-size: 33px;
margin: 13px 0 0;
} }
.ivu-breadcrumb { .ivu-breadcrumb {
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
} }
} }
.header-right { .header_right {
float: right; float: right;
height: 50px; height: 50px;
color: white; color: white;
...@@ -364,6 +417,9 @@ export default { ...@@ -364,6 +417,9 @@ export default {
height: 50px; height: 50px;
line-height: 50px; line-height: 50px;
} }
.i-layout-header-trigger:hover {
background: #343b4a;
}
.ivu-tooltip { .ivu-tooltip {
color: white; color: white;
height: 50px; height: 50px;
......
layouts/default.vue
View file @ 330b2550
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
</template> </template>
<script> <script>
import MainLayout from "./basic-layout"; import MainLayout from "./basic-layout";
// import MainLayout from "./basic-layout/product";
// 配置 // 配置
import Setting from "@/setting"; import Setting from "@/setting";
// 方法 // 方法
......
pages/account/login/index.vue
View file @ 330b2550
<template> <template>
<div class="account"> <div class="account">
<Carousel v-model="value1" autoplay :autoplay-speed="5000" loop class="zmd"> <Carousel v-model="value1" autoplay :autoplay-speed="5000" loop class="zmd">
<CarouselItem> <!-- <CarouselItem>
<div class="bg bg0">1</div> <div class="bg bg0">1</div>
</CarouselItem> </CarouselItem> -->
<CarouselItem> <CarouselItem>
<div class="bg bg1">1</div> <div class="bg bg1">1</div>
</CarouselItem> </CarouselItem>
......
pages/aps/aps/components/excute.vue
View file @ 330b2550
...@@ -57,21 +57,38 @@ export default { ...@@ -57,21 +57,38 @@ export default {
{ key: "id", title: this.l("id"), hide: true, align: "left" }, { key: "id", title: this.l("id"), hide: true, align: "left" },
{ title: " ", width: 130 }, { title: " ", width: 130 },
{ {
key: "insert_flag", key: "important_flag",//insert_flag?
title: this.l("insert_flag"), title: this.l("important_flag"),
align: "center", align: "center",
high: true, high: true,
width: 60, width: 60,
render: (h, params) => { render: (h, params) => {
return h("Icon", { return h(
"Tooltip",
{
props: {
content:
params.row.important_flag == 1 ? "取消插单" : "进行插单",
placement: "top"
},
class: "ico"
},
[
h("Icon", {
attrs: { attrs: {
type: type:
params.row.insert_flag == 1 ? "ios-flag" : "ios-flag-outline", params.row.important_flag == 1
? "ios-flag"
: "ios-flag-outline",
size: 20, size: 20,
color: params.row.insert_flag == 1 ? "#2680EB" : "#aaa" color: params.row.important_flag == 1 ? "#2680EB" : "#aaa"
}, },
on: { click: () => this.changeFlag(params.row.id, params.index) } on: {
}); click: () => this.changeFlag(params.row.id, params.index)
}
})
]
);
} }
}, },
{ {
...@@ -107,21 +124,31 @@ export default { ...@@ -107,21 +124,31 @@ export default {
key: "put_into_qty", key: "put_into_qty",
title: this.l("put_into_qty"), title: this.l("put_into_qty"),
align: "left", align: "left",
high: true high: true,
hide: true
}, },
{ {
key: "plan_start", key: "plan_start",
title: this.l("plan_start"), title: this.l("plan_start"),
align: "center", align: "center",
high: true, high: true,
width: 140 width: 140,
hide: true
}, },
{ {
key: "plan_finish", key: "plan_finish",
title: this.l("plan_finish"), title: this.l("plan_finish"),
align: "center", align: "center",
high: true, high: true,
width: 140 width: 140,
hide: true
},
{
key:"first_equip",
title:this.l("first_equip"),
align:"left",
easy:true,
high:true,
}, },
{ {
key: "setup_time", key: "setup_time",
...@@ -138,9 +165,8 @@ export default { ...@@ -138,9 +165,8 @@ export default {
{ {
key: "outside_time", key: "outside_time",
title: this.l("outside_time"), title: this.l("outside_time"),
align: "center", align: "right",
high: true, high: true,
width: 140
}, },
{ {
key: "transport_time", key: "transport_time",
...@@ -165,7 +191,7 @@ export default { ...@@ -165,7 +191,7 @@ export default {
{ {
key: "machine_rule", key: "machine_rule",
title: this.l("machine_rule"), title: this.l("machine_rule"),
align: "left", align: "center",
easy: true, easy: true,
high: true, high: true,
width: 140 width: 140
...@@ -178,16 +204,16 @@ export default { ...@@ -178,16 +204,16 @@ export default {
hide: true hide: true
}, },
{ {
key: "first_equip", key: "equip_type",
title: this.l("first_equip"), title: this.l("equip_type"),
align: "left", align: "left",
easy: true, easy: true,
high: true, high: true,
hide: true hide: true
}, },
{ {
key: "equip_type", key: "first_equip",
title: this.l("equip_type"), title: this.l("first_equip"),
align: "left", align: "left",
easy: true, easy: true,
high: true, high: true,
...@@ -217,20 +243,20 @@ export default { ...@@ -217,20 +243,20 @@ export default {
{ {
key: "isdiscrete", key: "isdiscrete",
title: this.l("isdiscrete"), title: this.l("isdiscrete"),
align: "left", align: "center",
easy: true, easy: true,
high: true high: true
}, },
{ {
key: "discrete_value", key: "discrete_value",
title: this.l("discrete_value"), title: this.l("discrete_value"),
align: "left", align: "right",
high: true high: true
}, },
{ {
key: "multi_machine", key: "multi_machine",
title: this.l("multi_machine"), title: this.l("multi_machine"),
align: "left", align: "center",
easy: true, easy: true,
high: true high: true
}, },
...@@ -348,7 +374,7 @@ export default { ...@@ -348,7 +374,7 @@ export default {
Api.getbyorderid(params).then(res => { Api.getbyorderid(params).then(res => {
if (res.success) { if (res.success) {
this.gridHeight = 50; this.gridHeight = 50;
this.gridHeight = (res.result.length +1) * 48; this.gridHeight = (res.result.length + 1) * 48;
this.data1 = res.result; this.data1 = res.result;
} }
}); });
...@@ -357,7 +383,7 @@ export default { ...@@ -357,7 +383,7 @@ export default {
//插单事件start---- //插单事件start----
changeFlag(id, index) { changeFlag(id, index) {
this.rowIndex = index; this.rowIndex = index;
if (this.data1[this.rowIndex].insert_flag == 1) { if (this.data1[this.rowIndex].important_flag == 1) {
this.insertTItle = "取消插单"; this.insertTItle = "取消插单";
} else { } else {
this.insertTItle = "插单"; this.insertTItle = "插单";
...@@ -366,13 +392,12 @@ export default { ...@@ -366,13 +392,12 @@ export default {
}, },
insertOk() { insertOk() {
//this.loadData(this.row) //this.loadData(this.row)
if (this.data1[this.rowIndex].insert_flag == 1) { if (this.data1[this.rowIndex].important_flag == 1) {
//根据插单数据状态进行插单或取消插单操作 //根据插单数据状态进行插单或取消插单操作
this.data1[this.rowIndex].insert_flag = 0; this.data1[this.rowIndex].important_flag = 0;
} else { } else {
this.data1[this.rowIndex].insert_flag = 1; this.data1[this.rowIndex].important_flag = 1;
} }
this.setParsModal = false; this.setParsModal = false;
this.detailModal = false; this.detailModal = false;
this.editModal = false; this.editModal = false;
......
pages/aps/aps/index.vue
View file @ 330b2550
...@@ -15,9 +15,15 @@ ...@@ -15,9 +15,15 @@
> >
<template slot="easySearch"></template> <template slot="easySearch"></template>
<template slot="searchBack"> <template slot="searchBack">
<Select placeholder="选择历史方案" style="width: 150px"></Select> <Select placeholder="选择历史方案" style="width: 150px;"></Select>
<DatePicker type="date" placeholder="设置基准日期" style="width: 150px"></DatePicker> <DatePicker
<a style="font-weight:bold" @click="addModal=true"> type="date"
placeholder="设置基准日期"
style="width: 150px"
v-model="entity.setTime"
@on-change="getTime"
></DatePicker>
<a style="font-weight:bold;" @click="addModal=true">
<Icon type="ios-options" size="14" />&nbsp;工序参数调整 <Icon type="ios-options" size="14" />&nbsp;工序参数调整
</a> </a>
</template> </template>
...@@ -25,7 +31,7 @@ ...@@ -25,7 +31,7 @@
<Search /> <Search />
</template> </template>
<template slot="buttons"> <template slot="buttons">
<Button type="primary" @click="apsModal=true">APS排产</Button> <Button type="primary" @click="openApsModal">APS排产</Button>
</template> </template>
<template slot="batch"> <template slot="batch">
<Button type="primary" class="mr10 ml10" @click="removeOk">移出排产</Button> <Button type="primary" class="mr10 ml10" @click="removeOk">移出排产</Button>
...@@ -55,6 +61,9 @@ export default { ...@@ -55,6 +61,9 @@ export default {
easySearch: { easySearch: {
keys: { op: "notes", value: null } keys: { op: "notes", value: null }
}, },
entity: {
setTime: ""
},
addModal: false, addModal: false,
editModal: false, editModal: false,
detailModal: false, detailModal: false,
...@@ -146,6 +155,7 @@ export default { ...@@ -146,6 +155,7 @@ export default {
title: this.l("plan_start"), title: this.l("plan_start"),
align: "center", align: "center",
high: true, high: true,
hide: true,
resizable: true, resizable: true,
width: 140 width: 140
}, },
...@@ -154,6 +164,7 @@ export default { ...@@ -154,6 +164,7 @@ export default {
title: this.l("plan_finish"), title: this.l("plan_finish"),
align: "center", align: "center",
high: true, high: true,
hide: true,
sortable: true, sortable: true,
resizable: true, resizable: true,
width: 140 width: 140
...@@ -170,9 +181,8 @@ export default { ...@@ -170,9 +181,8 @@ export default {
key: "demand_start", key: "demand_start",
title: this.l("demand_start"), title: this.l("demand_start"),
align: "center", align: "center",
hide: true,
resizable: true, resizable: true,
width: 100 width: 140
}, },
{ {
key: "demand_finish", key: "demand_finish",
...@@ -186,7 +196,8 @@ export default { ...@@ -186,7 +196,8 @@ export default {
key: "badjustflag", key: "badjustflag",
title: this.l("badjustflag"), title: this.l("badjustflag"),
align: "left", align: "left",
high: true high: true,
hide:true,
}, },
{ {
title: "操作", title: "操作",
...@@ -270,7 +281,7 @@ export default { ...@@ -270,7 +281,7 @@ export default {
if (r.success) { if (r.success) {
this.$Message.success("恢复成功"); this.$Message.success("恢复成功");
this.list = []; this.list = [];
this.loadList() this.loadList();
} }
}); });
}, },
...@@ -315,17 +326,38 @@ export default { ...@@ -315,17 +326,38 @@ export default {
this.deletedlModal = false; this.deletedlModal = false;
this.apsModal = false; this.apsModal = false;
}, },
onDragDrop(a, b) { onDragDrop(a, b) {//拖拽排序
this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b])); //this.list.splice(b, 1, ...this.list.splice(a, 1, this.list[b]));
let tempArray=this.list[a]
this.list.splice(a,1)
this.list.splice(b,0,tempArray)
}, },
openParms(id) { openParms(id) {
this.addModal = true; this.addModal = true;
}, },
getUserDepart() {
alert("5656565");
// Api.getUserDepart().then(res=>{
// console.log("11111",res)
// return res
// })
},
l(key) { l(key) {
let vkey = "mes_part_task_plan_simulate" + "." + key; let vkey = "mes_part_task_plan_simulate" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
}, },
//a确定aps排产 getTime(value) {
this.entity.getTime = value;
},
openApsModal() {
if (this.entity.setTime != "") {
this.apsModal = true;
} else {
this.$Message.error("请设置基准日期");
}
},
//确定aps排产
apsOk() { apsOk() {
//APS排产前订单优先级功能 //APS排产前订单优先级功能
let parmsOrderpriority = { alls: [] }; let parmsOrderpriority = { alls: [] };
...@@ -341,25 +373,38 @@ export default { ...@@ -341,25 +373,38 @@ export default {
Api.orderpriority(parmsOrderpriority).then(res => { Api.orderpriority(parmsOrderpriority).then(res => {
if (res.success) { if (res.success) {
if (res.result) { if (res.result) {
this.$Message.success("排序成功"); //this.$Message.success("排序成功");
//apsp排产前检查 //apsp排产前检查
Api.apsdatachecked().then(res1=>{ Api.apsdatachecked().then(res1 => {
if(res1.success) if (res1.success) {
{ if (res1.result.res) {
if(res1.result) // this.$Message.success("数据校验成功");
{ //排产计算
this.$Message.success("数据校验成功"); let paramsTime = {
setTime: this.entity.setTime
};
Api.apsprepareandcalc(paramsTime).then(res2 => {
if (res2.success) {
if (res2.result.res) {
this.$Message.success("排产计算成功");
this.$router.push({
name: "aps-results"
// params: { customerId: id }
});
} else {
this.$Message.error(res2.result.msg);
} }
else } else {
{ this.$Message.error("操作失败：排产计算");
this.$Message.success("数据校验失败");
} }
});
} else {
this.$Message.success("数据校验失败");
} }
else{ } else {
this.$Message.error("操作失败：数据校验"); this.$Message.error("操作失败：数据校验");
} }
}) });
} else { } else {
this.$Message.error("排序失败，请重新APS排产操作"); this.$Message.error("排序失败，请重新APS排产操作");
} }
...@@ -367,7 +412,6 @@ export default { ...@@ -367,7 +412,6 @@ export default {
this.$Message.error("操作失败：排序"); this.$Message.error("操作失败：排序");
} }
}); });
//APS排产前数据合法性校验
} }
} }
}; };
......
pages/aps/plan/dispatch.vue
View file @ 330b2550
<template> <template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90"> <Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row> <Row>
<Col span="24"> <Col span="12">
<FormItem :label="l('DistributeMainRouting')" prop="DistributeMainRouting"> <FormItem :label="l('DistributeMainRouting')" prop="DistributeMainRouting">
<UserSelect ref="userSelected" v-model="entity.DistributeMainRouting" /> <UserSelect ref="userSelected" v-model="entity.DistributeMainRouting" />
</FormItem> </FormItem>
</Col> </Col>
<Col span="24"> <Col span="12">
<FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate"> <FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate">
<DatePicker <DatePicker
v-model="entity.MainRoutingFinishDate" v-model="entity.MainRoutingFinishDate"
......
pages/aps/plan/index.vue
View file @ 330b2550
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<Input <Input
search search
enter-button enter-button
placeholder="请输入关键字订单编号/任务类型/甲方客户/3D打印承制单位(基础数据)/厂内责任机关(基础数据)/厂内主主体责任部门(基础数据)/备注/任务接点要求/上传文件名称/上传文件名称/外部图号/模型号/模型版本/甲方任务号/手输/手输/手输/设备/工艺方法/外包络尺寸（mm）/产品序号:No1~No99///批次号/项目号/紧急程度/材料名称/(APS)产品名称增强" placeholder="请输入关键字订单编号/项目名称"
v-model="easySearch.keys.value" v-model="easySearch.keys.value"
@on-search="search" @on-search="search"
/> />
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { keys: {
op: "mesCode,taskType,stage,projectNumber,materialName", op: "mesCode,projectNumber",
value: null value: null
} }
}, },
...@@ -197,7 +197,7 @@ export default { ...@@ -197,7 +197,7 @@ export default {
{ {
key: "quantity", key: "quantity",
title: this.l("quantity"), title: this.l("quantity"),
align: "left", align: "right",
high: true high: true
}, },
{ {
...@@ -290,22 +290,6 @@ export default { ...@@ -290,22 +290,6 @@ export default {
? "移入排产" ? "移入排产"
: "" : ""
) )
// h(
// 'op',
// {
// attrs: { oprate: 'edit' },
// on: { click: () => this.edit(params.row.id) }
// },
// '编辑'
// ),
// h(
// 'op',
// {
// attrs: { oprate: 'remove' },
// on: { click: () => this.remove(params.row.id) }
// },
// '删除'
// )
]); ]);
} }
} }
......
pages/aps/plan/search.vue
View file @ 330b2550
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</Col> </Col>
<Col span="8" v-if="condition.status.show"> <Col span="8" v-if="condition.status.show">
<FormItem :label="l('status')" prop="status"> <FormItem :label="l('status')" prop="status">
<Dictionary code="mes_xingchi_plan.mes_order.status" v-model="condition.status.value"></Dictionary> <Dictionary code="plan.order.status" v-model="condition.status.value"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8" v-if="condition.workHours.show"> <Col span="8" v-if="condition.workHours.show">
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<Col span="8" v-if="condition.isSupportingFinish.show"> <Col span="8" v-if="condition.isSupportingFinish.show">
<FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish"> <FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish">
<Dictionary <Dictionary
code="mes_xingchi_plan.mes_order.is_supporting_finish" code="aps.plan.supportingStatus"
v-model="condition.isSupportingFinish.value" v-model="condition.isSupportingFinish.value"
></Dictionary> ></Dictionary>
</FormItem> </FormItem>
...@@ -304,7 +304,7 @@ ...@@ -304,7 +304,7 @@
<Col span="8" v-if="condition.mainRoutingSetStatus.show"> <Col span="8" v-if="condition.mainRoutingSetStatus.show">
<FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus"> <FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus">
<Dictionary <Dictionary
code="mes_xingchi_plan.mes_order.main_routing_set_status" code="aps.plan.mainRoutingStatus"
v-model="condition.mainRoutingSetStatus.value" v-model="condition.mainRoutingSetStatus.value"
></Dictionary> ></Dictionary>
</FormItem> </FormItem>
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
</Col> </Col>
<Col span="8" v-if="condition.urgencyLevel.show"> <Col span="8" v-if="condition.urgencyLevel.show">
<FormItem :label="l('urgencyLevel')" prop="urgencyLevel"> <FormItem :label="l('urgencyLevel')" prop="urgencyLevel">
<Input v-model="condition.urgencyLevel.value"></Input> <Dictionary code="plan.order.urgencyLevel" v-model="condition.urgencyLevel.value"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<Col span="8" v-if="condition.materialName.show"> <Col span="8" v-if="condition.materialName.show">
...@@ -508,7 +508,7 @@ export default { ...@@ -508,7 +508,7 @@ export default {
projectNumber: { op: 'Equal', value: null, show: true }, projectNumber: { op: 'Equal', value: null, show: true },
urgencyLevel: { op: 'Equal', value: null, show: true }, urgencyLevel: { op: 'Equal', value: null, show: true },
materialName: { op: 'Equal', value: null, show: true }, materialName: { op: 'Equal', value: null, show: true },
isPreschedule: { op: 'Equal', value: null, show: true }, isPreschedule: { op: 'Equal', value: null, show: false },
spareQty: { op: 'Equal', value: null, show: false }, spareQty: { op: 'Equal', value: null, show: false },
demandStart: { op: 'Range', value: null, show: false }, demandStart: { op: 'Range', value: null, show: false },
demandFinish: { op: 'Range', value: null, show: false }, demandFinish: { op: 'Range', value: null, show: false },
......
pages/basicData/userManagent/index.vue
View file @ 330b2550
...@@ -781,13 +781,12 @@ export default { ...@@ -781,13 +781,12 @@ export default {
var url = `${systemUrl}/MyUserRole/CreateOrUpdate` var url = `${systemUrl}/MyUserRole/CreateOrUpdate`
service service
.post( .post(
`${url}`, `${url}`, {
JSON.stringify({
myUserRole: { myUserRole: {
userId: this.selectedRow.id, userId: this.selectedRow.id,
RoleIds: this.allChecked.join(',') RoleIds: this.allChecked.join(',')
} }
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/bug/component/add.vue
View file @ 330b2550
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
methods: { methods: {
initial() { initial() {
this.bugForm.pagePath = window.location.href this.bugForm.pagePath = window.location.href
this.bugForm.createor = localStorage.getItem('userName') this.bugForm.createor = this.$store.state.userInfo.userName
}, },
//初始化编辑信息 //初始化编辑信息
editeInfo(value) { editeInfo(value) {
...@@ -150,7 +150,7 @@ export default { ...@@ -150,7 +150,7 @@ export default {
pagePath: window.location.href, pagePath: window.location.href,
content: '', content: '',
imgPaths: [], imgPaths: [],
createor: localStorage.getItem('userName'), createor: this.$store.state.userInfo.userName,
level: 1, level: 1,
name: '' name: ''
} }
......
pages/bug/index.vue
View file @ 330b2550
...@@ -330,9 +330,7 @@ export default { ...@@ -330,9 +330,7 @@ export default {
//选项卡切换 //选项卡切换
tab(data) { tab(data) {
if (data == '0') { if (data == '0') {
this.easySearch.creatorUserId.value = JSON.parse( this.easySearch.creatorUserId.value = this.$store.state.userInfo.userId
sessionStorage.getItem('userInfo')
).userId
} else { } else {
this.easySearch.creatorUserId.value = null this.easySearch.creatorUserId.value = null
} }
...@@ -349,7 +347,7 @@ export default { ...@@ -349,7 +347,7 @@ export default {
//修改事件 //修改事件
addSave() { addSave() {
let param = this.$refs.edit.addBugInfo() let param = this.$refs.edit.addBugInfo()
param.auditUser = localStorage.getItem('userName') param.auditUser = this.$store.state.userInfo.userName
if (param.id != null) { if (param.id != null) {
//增加确定 //增加确定
this.$http.bug.createorupdate(param).then((res) => { this.$http.bug.createorupdate(param).then((res) => {
...@@ -373,7 +371,7 @@ export default { ...@@ -373,7 +371,7 @@ export default {
//确定/关闭操作 //确定/关闭操作
detailSave() { detailSave() {
let param = this.$refs.detail.addBugInfo() let param = this.$refs.detail.addBugInfo()
param.auditUser = localStorage.getItem('userName') param.auditUser = this.$store.state.userInfo.userName
param.ids = [param.id] param.ids = [param.id]
if (param.id != null) { if (param.id != null) {
//增加确定 //增加确定
...@@ -398,7 +396,7 @@ export default { ...@@ -398,7 +396,7 @@ export default {
} else { } else {
param = this.$refs.detail.addBugInfo() param = this.$refs.detail.addBugInfo()
} }
param.auditUser = localStorage.getItem('userName') param.auditUser = this.$store.state.userInfo.userName
param.ids = [param.id] param.ids = [param.id]
param.statusNew = 5 param.statusNew = 5
if (param.id != null) { if (param.id != null) {
...@@ -440,7 +438,7 @@ export default { ...@@ -440,7 +438,7 @@ export default {
//this.showBt = false //this.showBt = false
this.selectBatch = 100 this.selectBatch = 100
} }
this.listBatch.auditUser = localStorage.getItem('userName') this.listBatch.auditUser = this.$store.state.userInfo.userName
}, },
//批量操作 //批量操作
statuChange(value) { statuChange(value) {
......
pages/crm/contract/add.vue
View file @ 330b2550
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('projectId')" prop="projectId"> <FormItem :label="l('projectId')" prop="projectId">
<InputNumber v-model="entity.projectId" style="width:240px"></InputNumber> <InputNumber v-model="entity.projectId" :min="1" style="width:240px"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
...@@ -50,7 +50,9 @@ export default { ...@@ -50,7 +50,9 @@ export default {
data() { data() {
return { return {
disabled: false, disabled: false,
entity: {}, entity: {
projectId:1
},
rules: { rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }] name: [{ required: true, message: '必填', trigger: 'blur' }]
}, },
......
pages/crm/contract/edit.vue
View file @ 330b2550
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<Row> <Row>
<Col :span="12"> <Col :span="12">
<FormItem :label="l('projectId')" prop="projectId"> <FormItem :label="l('projectId')" prop="projectId">
<InputNumber v-model="entity.projectId" style="width:240px"></InputNumber> <InputNumber v-model="entity.projectId" :min="1" style="width:240px"></InputNumber>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
......
pages/crm/customer/shopIndex.vue
View file @ 330b2550
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
:action="action" :action="action"
:conditions="easySearch" :conditions="easySearch"
style="margin-top: 45px;" style="margin-top: 45px;"
:height="tdHeight"
> >
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
...@@ -103,6 +104,7 @@ export default { ...@@ -103,6 +104,7 @@ export default {
editModal: false, editModal: false,
detailModal: false, detailModal: false,
deletelModal: false, deletelModal: false,
tdHeight: "",
curId: 0, curId: 0,
curId1: 0, curId1: 0,
curShopName: '', curShopName: '',
...@@ -250,8 +252,17 @@ export default { ...@@ -250,8 +252,17 @@ export default {
}, },
mounted() { mounted() {
this.loadData() this.loadData()
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.tdHeight = window.screenHeight - 265;
})();
};
},
created() {
this.tdHeight = window.innerHeight - 265;
}, },
created() {},
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典 await store.dispatch('loadDictionary') // 加载数据字典
}, },
...@@ -352,6 +363,6 @@ export default { ...@@ -352,6 +363,6 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.full { .full {
margin-top: 0; margin-top:0;
} }
</style> </style>
\ No newline at end of file
pages/crm/customer/shopTreeLeft.vue
View file @ 330b2550
...@@ -16,21 +16,22 @@ ...@@ -16,21 +16,22 @@
</Button> </Button>
</ButtonGroup> </ButtonGroup>
</h3> </h3>
<div class="tree"> <div class="tree" :style="{height:divHeight}">
<Tree ref="tree" :data="tree" @on-select-change="change" :render="renderContent" /> <Tree ref="tree" :data="tree" @on-select-change="change" :render="renderContent" />
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'shopTreeLeft', name: "shopTreeLeft",
data() { data() {
return { return {
expand: true, expand: true,
ids: [], ids: [],
tree: [] tree: [],
} divHeight: ""
};
}, },
props: { props: {
CId: { CId: {
...@@ -38,57 +39,67 @@ export default { ...@@ -38,57 +39,67 @@ export default {
default: 0 default: 0
} }
}, },
mounted() {}, mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
window.screenHeight = window.innerHeight;
this.divHeight = window.innerHeight - 240 + "px";
})();
};
},
created() { created() {
this.loadTree() this.loadTree();
var theight = window.innerHeight - 240 + "px";
this.divHeight = theight;
}, },
methods: { methods: {
toggle() { toggle() {
this.expand = !this.expand this.expand = !this.expand;
this.getTrees(this.tree) this.getTrees(this.tree);
//this.loadTree() //this.loadTree()
}, },
async loadTree() { async loadTree() {
//alert(this.CId) //alert(this.CId)
Api.getshoptree({ Id: this.CId }).then((r) => { Api.getshoptree({ Id: this.CId }).then(r => {
if (r.success) { if (r.success) {
if (r.result.length > 0) { if (r.result.length > 0) {
this.tree = r.result this.tree = r.result;
this.change1(this.tree) this.change1(this.tree);
} else { } else {
this.tree = [ (this.tree = [
{ title: '暂无组织信息', value: -100, expand: true, children: [] } { title: "暂无组织信息", value: -100, expand: true, children: [] }
], ]),
this.$emit('storeIds', [-100]) this.$emit("storeIds", [-100]);
this.$emit('treeData', r.result) this.$emit("treeData", r.result);
} }
} }
}) });
}, },
//重构左侧树 //重构左侧树
getTrees(trees) { getTrees(trees) {
var expand = this.expand var expand = this.expand;
trees.forEach((data, index) => { trees.forEach((data, index) => {
var that = this var that = this;
data.expand = expand data.expand = expand;
if (data.children.length > 0) { if (data.children.length > 0) {
this.getTrees(data.children) this.getTrees(data.children);
} }
}) });
return trees return trees;
}, },
renderContent(h, { root, node, data }) { renderContent(h, { root, node, data }) {
return h( return h(
'span', "span",
{ {
style: { style: {
color: '#000', //根据选中状态设置样式 color: "#000", //根据选中状态设置样式
cursor: 'pointer', cursor: "pointer",
background: node.node.selected ? '#AAD8D4' : '#ffffff', background: node.node.selected ? "#AAD8D4" : "#ffffff",
paddingLeft: '10px', paddingLeft: "10px",
paddingRight: '10px', paddingRight: "10px",
paddingTop: '3px', paddingTop: "3px",
paddingBottom: '3px' paddingBottom: "3px"
}, },
on: { on: {
// click: () => { // click: () => {
...@@ -99,47 +110,47 @@ export default { ...@@ -99,47 +110,47 @@ export default {
} }
}, },
data.title data.title
) );
}, },
//得到此树节点下所有是产品的Id //得到此树节点下所有是产品的Id
getAllIds(trees) { getAllIds(trees) {
trees.forEach((data, index) => { trees.forEach((data, index) => {
var that = this var that = this;
this.ids.push(data.value) this.ids.push(data.value);
if (data.children.length > 0) { if (data.children.length > 0) {
this.getAllIds(data.children) this.getAllIds(data.children);
} }
}) });
}, },
change(value) { change(value) {
if (value.length > 0) { if (value.length > 0) {
this.ids = [] this.ids = [];
this.getAllIds(value) this.getAllIds(value);
if (this.ids.length > 0) { if (this.ids.length > 0) {
this.$emit('storeIds', this.ids) this.$emit("storeIds", this.ids);
//this.easySearch.storeId.value = this.ids //this.easySearch.storeId.value = this.ids
} else { } else {
this.$emit('storeIds', [-1]) this.$emit("storeIds", [-1]);
} }
} else { } else {
this.$emit('storeIds', [-1]) this.$emit("storeIds", [-1]);
} }
this.$emit('treeData', value) this.$emit("treeData", value);
}, },
change1(value) { change1(value) {
if (value.length > 0) { if (value.length > 0) {
this.ids = [] this.ids = [];
this.getAllIds(value) this.getAllIds(value);
if (this.ids.length > 0) { if (this.ids.length > 0) {
this.$emit('storeIds', this.ids) this.$emit("storeIds", this.ids);
} else { } else {
this.$emit('storeIds', [-1]) this.$emit("storeIds", [-1]);
} }
} else { } else {
this.$emit('storeIds', [-1]) this.$emit("storeIds", [-1]);
} }
} }
} }
} };
</script> </script>
pages/mordent/andon/parameter/component/add.vue
View file @ 330b2550
...@@ -85,7 +85,7 @@ export default { ...@@ -85,7 +85,7 @@ export default {
methods: { methods: {
initial() { initial() {
this.bugForm.pagePath = window.location.href this.bugForm.pagePath = window.location.href
this.bugForm.createor = localStorage.getItem('userName') this.bugForm.createor = this.$store.state.userInfo.userName
}, },
//初始化编辑信息 //初始化编辑信息
editeInfo(value) { editeInfo(value) {
......
pages/mordent/andon/parameter/index.vue
View file @ 330b2550
...@@ -345,7 +345,7 @@ export default { ...@@ -345,7 +345,7 @@ export default {
//this.showBt = false //this.showBt = false
this.selectBatch = 100 this.selectBatch = 100
} }
this.listBatch.auditUser = localStorage.getItem('userName') this.listBatch.auditUser = this.$store.state.userInfo.userName
}, },
canselFooter() { canselFooter() {
this.footerBar = false this.footerBar = false
......
pages/mordent/dispose/index.vue
View file @ 330b2550
...@@ -383,10 +383,9 @@ export default { ...@@ -383,10 +383,9 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
routingQcCard: this.cardModeldata routingQcCard: this.cardModeldata
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processDesign/ChangeSingle/processchangesingle/index.vue
View file @ 330b2550
...@@ -404,7 +404,7 @@ export default { ...@@ -404,7 +404,7 @@ export default {
"equip_type_name": this.formItem.equip_type_name, "equip_type_name": this.formItem.equip_type_name,
"notes": this.formItem.notes, "notes": this.formItem.notes,
}; };
service.post(`${url}`, JSON.stringify({equipType: paramsdata})).then(res=>{ service.post(`${url}`, {equipType: paramsdata}).then(res=>{
if(res.success) { if(res.success) {
this.laodaction(); this.laodaction();
this.$Message.success('编辑成功') this.$Message.success('编辑成功')
...@@ -427,7 +427,7 @@ export default { ...@@ -427,7 +427,7 @@ export default {
"equip_type_name": this.formItem.equip_type_name, "equip_type_name": this.formItem.equip_type_name,
"notes": this.formItem.notes, "notes": this.formItem.notes,
}; };
service.post(`${url}`, JSON.stringify({equipType: paramsdata})).then(res=>{ service.post(`${url}`, {equipType: paramsdata}).then(res=>{
if(res.success) { if(res.success) {
this.laodaction(); this.laodaction();
this.$Message.success('新增成功') this.$Message.success('新增成功')
......
pages/processDesign/ChangeSingle/technicalcoordination/index.vue
View file @ 330b2550
...@@ -472,7 +472,7 @@ export default { ...@@ -472,7 +472,7 @@ export default {
this.formdata.change_process_file = ""; this.formdata.change_process_file = "";
this.formdata.compilation_temporary_process = ""; this.formdata.compilation_temporary_process = "";
this.formdata.inspection_date = ""; this.formdata.inspection_date = "";
this.formdata.inspection_person_name = localStorage.getItem("userName"); this.formdata.inspection_person_name = this.$store.state.userInfo.userName;
this.formdata.status = 1; this.formdata.status = 1;
this.formdata.note = ""; this.formdata.note = "";
...@@ -489,10 +489,7 @@ export default { ...@@ -489,10 +489,7 @@ export default {
var url = `${designUrl}/technicalcoordination/createorupdate`; var url = `${designUrl}/technicalcoordination/createorupdate`;
service service
.post( .post( `${url}`,{ technicalCoordination: this.formdata } )
`${url}`,
JSON.stringify({ technicalCoordination: this.formdata })
)
.then(res => { .then(res => {
if (res.success) { if (res.success) {
this.loadchangelist(); this.loadchangelist();
......
pages/processDesign/ChangeSingle/technicalcoordination/techSendReview.vue
View file @ 330b2550
...@@ -131,13 +131,13 @@ export default { ...@@ -131,13 +131,13 @@ export default {
// service // service
// .post( // .post(
// `${url}`, // `${url}`,
// JSON.stringify({ // {
// idList: [this.data3[0].id], // idList: [this.data3[0].id],
// schemaId: '2c921502-41a2-4fa5-b659-71d0e1e19ffc', // schemaId: '2c921502-41a2-4fa5-b659-71d0e1e19ffc',
// operatorIdList: this.userlist, // operatorIdList: this.userlist,
// data: {}, // data: {},
// userId: 0 // userId: 0
// }) // }
// ) // )
// .then((response) => { // .then((response) => {
// if (response.success) { // if (response.success) {
......
pages/processDesign/ChangeSingle/unqualifiedorder/index.vue
View file @ 330b2550
...@@ -485,7 +485,7 @@ export default { ...@@ -485,7 +485,7 @@ export default {
saveOk() { saveOk() {
var url = `${designUrl}/unqualifiedorder/createorupdate`; var url = `${designUrl}/unqualifiedorder/createorupdate`;
service service
.post(`${url}`, JSON.stringify({ unqualifiedOrder: this.formdata })) .post(`${url}`, { unqualifiedOrder: this.formdata })
.then(res => { .then(res => {
console.log(res); console.log(res);
if (res.success) { if (res.success) {
......
pages/processDesign/Process/changeSendReview.vue
View file @ 330b2550
...@@ -131,14 +131,13 @@ export default { ...@@ -131,14 +131,13 @@ export default {
// service // service
// .post( // .post(
// `${url}`, // `${url}`,
// JSON.stringify({ // {
// idList: [this.data3[0].id], // idList: [this.data3[0].id],
// schemaId: 'd0cdafe3-2341-4499-a4f5-278ef0f30740', // schemaId: 'd0cdafe3-2341-4499-a4f5-278ef0f30740',
// operatorIdList: this.userlist, // operatorIdList: this.userlist,
// data: {}, // data: {},
// userId: 0 // userId: 0
// }) // })
// )
// .then((response) => { // .then((response) => {
// if (response.success) { // if (response.success) {
// this.$Message.success('送审成功') // this.$Message.success('送审成功')
......
pages/processDesign/Process/detailfiles.vue
View file @ 330b2550
...@@ -102,10 +102,9 @@ export default { ...@@ -102,10 +102,9 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
routingFile: dataValidate routingFile: dataValidate
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processDesign/Process/index.vue
View file @ 330b2550
...@@ -678,15 +678,12 @@ export default { ...@@ -678,15 +678,12 @@ export default {
} }
if (a.formValidate.code != null) { if (a.formValidate.code != null) {
var url = `${designUrl}/routingheader/createorupdate` var url = `${designUrl}/routingheader/createorupdate`
// JSON.stringify({Process:this.formValidate})
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
routingHeaderEntity: a.formValidate, routingHeaderEntity: a.formValidate,
FileList: filelist FileList: filelist
}) })
)
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
if (!next) { if (!next) {
......
pages/processDesign/Process/processNew.vue
View file @ 330b2550
...@@ -419,10 +419,9 @@ export default { ...@@ -419,10 +419,9 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
routingDetail: this.formprocessValidate routingDetail: this.formprocessValidate
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processDesign/Process/quotationBox2.vue
View file @ 330b2550
...@@ -335,11 +335,10 @@ this.isadd03=false; ...@@ -335,11 +335,10 @@ this.isadd03=false;
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
orderBill: this.formValidate, orderBill: this.formValidate,
orderBillLlist: orderBillLlist orderBillLlist: orderBillLlist
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processDesign/Process/quotationBox3.vue
View file @ 330b2550
...@@ -351,10 +351,10 @@ this.formValidate.product_handover_date =new Date(); ...@@ -351,10 +351,10 @@ this.formValidate.product_handover_date =new Date();
service service
.post( .post(
`${url}`, `${url}`,
JSON.stringify({ {
orderBill: this.formValidate, orderBill: this.formValidate,
orderBillLlist: orderBillLlist orderBillLlist: orderBillLlist
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processDesign/Process/routingchangeorder.vue
View file @ 330b2550
...@@ -372,7 +372,7 @@ export default { ...@@ -372,7 +372,7 @@ export default {
// "handling_opinions_id": 0, // "handling_opinions_id": 0,
}; };
console.log(paramsdata); console.log(paramsdata);
service.post(`${url}`, JSON.stringify({routingHeaderChangeorder: paramsdata})).then(res=>{ service.post(`${url}`, {routingHeaderChangeorder: paramsdata}).then(res=>{
if(res.success) { if(res.success) {
this.$Message.success('新增成功') this.$Message.success('新增成功')
this.modelChange = false; this.modelChange = false;
...@@ -417,7 +417,7 @@ export default { ...@@ -417,7 +417,7 @@ export default {
// "handling_opinions_id": 0, // "handling_opinions_id": 0,
}; };
console.log(paramsdata); console.log(paramsdata);
service.post(`${url}`, JSON.stringify({routingHeaderChangeorder: paramsdata})).then(res=>{ service.post(`${url}`, {routingHeaderChangeorder: paramsdata}).then(res=>{
if(res.success) { if(res.success) {
this.$Message.success('编辑成功') this.$Message.success('编辑成功')
this.modelChange = false; this.modelChange = false;
...@@ -444,13 +444,13 @@ export default { ...@@ -444,13 +444,13 @@ export default {
// service // service
// .post( // .post(
// `${url}`, // `${url}`,
// JSON.stringify({ // {
// idList: [this.data3[0].id], // idList: [this.data3[0].id],
// schemaId: 'd0cdafe3-2341-4499-a4f5-278ef0f30740', // schemaId: 'd0cdafe3-2341-4499-a4f5-278ef0f30740',
// operatorIdList: this.userlist, // operatorIdList: this.userlist,
// data: {}, // data: {},
// userId: 0 // userId: 0
// }) // }
// ) // )
// .then((response) => { // .then((response) => {
// if (response.success) { // if (response.success) {
...@@ -478,13 +478,13 @@ export default { ...@@ -478,13 +478,13 @@ export default {
// service // service
// .post( // .post(
// `${url}`, // `${url}`,
// JSON.stringify({ // {
// idList: [this.data3[0].id], // idList: [this.data3[0].id],
// schemaId: 'd0cdafe3-2341-4499-a4f5-278ef0f30740', // schemaId: 'd0cdafe3-2341-4499-a4f5-278ef0f30740',
// operatorIdList: this.userlist, // operatorIdList: this.userlist,
// data: {}, // data: {},
// userId: 0 // userId: 0
// }) // }
// ) // )
// .then((response) => { // .then((response) => {
// if (response.success) { // if (response.success) {
......
pages/processDesign/Process/stepModel.vue
View file @ 330b2550
...@@ -163,10 +163,9 @@ let isvalidate = false; ...@@ -163,10 +163,9 @@ let isvalidate = false;
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
routingStep: this.newModeldata routingStep: this.newModeldata
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
...@@ -218,10 +217,9 @@ this.newModeldata.name=""; ...@@ -218,10 +217,9 @@ this.newModeldata.name="";
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
routingStep: this.data01[index] routingStep: this.data01[index]
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processDesign/Process/testingModel.vue
View file @ 330b2550
...@@ -348,9 +348,9 @@ export default { ...@@ -348,9 +348,9 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,
JSON.stringify({ {
routingQcCard: this.cardModeldata routingQcCard: this.cardModeldata
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processDesign/ProcessRecord/index.vue
View file @ 330b2550
...@@ -336,7 +336,7 @@ export default { ...@@ -336,7 +336,7 @@ export default {
file: this.formItem.file file: this.formItem.file
} }
service service
.post(`${url}`, JSON.stringify({ processRecord: paramsdata })) .post(`${url}`, { processRecord: paramsdata })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.laodaction() this.laodaction()
......
pages/processDesign/productTree/addclass.vue
View file @ 330b2550
...@@ -34,7 +34,7 @@ export default { ...@@ -34,7 +34,7 @@ export default {
name: 'add', name: 'add',
data() { data() {
return { return {
formValidate: { name: '',upid:'', upname: '',disabled:false }, formValidate: { name: '',upid:'', upname: '',disabled:false ,isProduct:0},
ruleValidate: { ruleValidate: {
name: [{ required: true }] name: [{ required: true }]
}, },
......
pages/processDesign/productTree/index.vue
View file @ 330b2550
...@@ -454,7 +454,7 @@ export default { ...@@ -454,7 +454,7 @@ export default {
} }
var url = `${designUrl}/productinfo/createorupdate`; var url = `${designUrl}/productinfo/createorupdate`;
service service
.post(`${url}`, JSON.stringify({ ProductInfo: this.formValidate0 })) .post(`${url}`, { ProductInfo: this.formValidate0 })
.then(response => { .then(response => {
if (response.success) { if (response.success) {
this.$Message.success("保存成功"); this.$Message.success("保存成功");
...@@ -642,8 +642,7 @@ export default { ...@@ -642,8 +642,7 @@ export default {
this.formValidate1 = this.$refs.addclass.formValidate; this.formValidate1 = this.$refs.addclass.formValidate;
service service
.post( .post(
`${url}`, `${url}`,{ ProductLevel: this.formValidate1 }
JSON.stringify({ ProductLevel: this.formValidate1 })
) )
.then(response => { .then(response => {
if (response.result.status) { if (response.result.status) {
......
pages/processDesign/setProcess/components/orderData.vue
View file @ 330b2550
...@@ -226,10 +226,9 @@ export default { ...@@ -226,10 +226,9 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
orderDataReview: this.formValidate orderDataReview: this.formValidate
}) }
) )
.then((response) => { .then((response) => {
console.log(response) console.log(response)
......
pages/processDesign/setProcess/components/orderMaterial.vue
View file @ 330b2550
...@@ -648,11 +648,10 @@ this.formValidate.productingPreparationPeople=this.productingPreparationPeople; ...@@ -648,11 +648,10 @@ this.formValidate.productingPreparationPeople=this.productingPreparationPeople;
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
orderMaterial: this.formValidate, orderMaterial: this.formValidate,
orderMaterialList: this.formValidate1 orderMaterialList: this.formValidate1
}) }
) )
.then((response) => { .then((response) => {
let itemId = response.result.orderMaterial.id let itemId = response.result.orderMaterial.id
......
pages/processDesign/setProcess/index.vue
View file @ 330b2550
...@@ -1303,14 +1303,13 @@ export default { ...@@ -1303,14 +1303,13 @@ export default {
if (a.formValidate.code != null) { if (a.formValidate.code != null) {
let orders = a.dataTop let orders = a.dataTop
var url = `${designUrl}/routingheader/createorupdate` var url = `${designUrl}/routingheader/createorupdate`
// JSON.stringify({Process:this.formValidate})
service service
.post( .post(
`${url}`, `${url}`,
JSON.stringify({ {
routingHeaderEntity: a.formValidate, routingHeaderEntity: a.formValidate,
FileList: filelist FileList: filelist
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
...@@ -1427,13 +1426,11 @@ export default { ...@@ -1427,13 +1426,11 @@ export default {
} }
var url = `${designUrl}/orderrouting/createorupdate` var url = `${designUrl}/orderrouting/createorupdate`
// JSON.stringify({Process:this.formValidate})
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
orderRouting: orderRoutingobj orderRouting: orderRoutingobj
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
...@@ -1502,9 +1499,8 @@ export default { ...@@ -1502,9 +1499,8 @@ export default {
}, },
saveOK() { saveOK() {
var url = `${PlanUrl}/OrderMaterial/createorupdate` var url = `${PlanUrl}/OrderMaterial/createorupdate`
// JSON.stringify({Process:this.formValidate})
service service
.post(`${url}`, JSON.stringify({ orderMaterial: this.formValidate })) .post(`${url}`,{ orderMaterial: this.formValidate })
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
this.$Message.success('保存成功') this.$Message.success('保存成功')
......
pages/processManage/Process/index.vue
View file @ 330b2550
...@@ -668,7 +668,6 @@ export default { ...@@ -668,7 +668,6 @@ export default {
} }
if (a.formValidate.code != null) { if (a.formValidate.code != null) {
var url = `${designUrl}/routingheader/createorupdate` var url = `${designUrl}/routingheader/createorupdate`
// JSON.stringify({Process:this.formValidate})
service service
.post( .post(
`${url}`, `${url}`,
......
pages/processManage/Process/stepModel.vue
View file @ 330b2550
...@@ -225,10 +225,9 @@ this.newModeldata.name=""; ...@@ -225,10 +225,9 @@ this.newModeldata.name="";
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
routingStep: this.data01[index] routingStep: this.data01[index]
}) }
) )
.then((response) => { .then((response) => {
if (response.success) { if (response.success) {
......
pages/processManage/setProcess/components/orderData.vue
View file @ 330b2550
...@@ -226,10 +226,9 @@ export default { ...@@ -226,10 +226,9 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
orderDataReview: this.formValidate orderDataReview: this.formValidate
}) }
) )
.then((response) => { .then((response) => {
console.log(response) console.log(response)
......
pages/processManage/setProcess/components/orderMaterial.vue
View file @ 330b2550
...@@ -513,11 +513,10 @@ export default { ...@@ -513,11 +513,10 @@ export default {
service service
.post( .post(
`${url}`, `${url}`,{
JSON.stringify({
orderMaterial: this.formValidate, orderMaterial: this.formValidate,
orderMaterialList: this.formValidate1 orderMaterialList: this.formValidate1
}) }
) )
.then(response => { .then(response => {
let itemId = response.result.orderMaterial.id; let itemId = response.result.orderMaterial.id;
......
pages/processManage/setProcess/index.vue
View file @ 330b2550
...@@ -1084,7 +1084,6 @@ export default { ...@@ -1084,7 +1084,6 @@ export default {
if (a.formValidate.code != null) { if (a.formValidate.code != null) {
let orders = a.dataTop let orders = a.dataTop
var url = `${designUrl}/routingheader/createorupdate` var url = `${designUrl}/routingheader/createorupdate`
// JSON.stringify({Process:this.formValidate})
service service
.post( .post(
`${url}`, `${url}`,
...@@ -1206,7 +1205,6 @@ export default { ...@@ -1206,7 +1205,6 @@ export default {
} }
var url = `${designUrl}/orderrouting/createorupdate` var url = `${designUrl}/orderrouting/createorupdate`
// JSON.stringify({Process:this.formValidate})
service service
.post( .post(
`${url}`, `${url}`,
...@@ -1278,7 +1276,6 @@ export default { ...@@ -1278,7 +1276,6 @@ export default {
saveOK() { saveOK() {
var url = `${PlanUrl}/OrderMaterial/createorupdate` var url = `${PlanUrl}/OrderMaterial/createorupdate`
// JSON.stringify({Process:this.formValidate})
service service
.post(`${url}`, { orderMaterial: this.formValidate }) .post(`${url}`, { orderMaterial: this.formValidate })
.then((response) => { .then((response) => {
......
pages/qc/dataTrace/components/dispatched.vue
View file @ 330b2550
...@@ -311,7 +311,6 @@ export default { ...@@ -311,7 +311,6 @@ export default {
] ]
} }
let url02 = `${resourceUrl}/materialpowder/itempaged` let url02 = `${resourceUrl}/materialpowder/itempaged`
// ,JSON.stringify({Dictionary:this.formValidate1})JSON.stringify(parme)
service.post(`${url02}`, parme).then((res) => { service.post(`${url02}`, parme).then((res) => {
if (res.success && res.result.totalCount != 0) { if (res.success && res.result.totalCount != 0) {
this.Powder = res.result.items[0] this.Powder = res.result.items[0]
......
pages/qcimplement/components/backCheck.vue
View file @ 330b2550
...@@ -113,7 +113,7 @@ export default { ...@@ -113,7 +113,7 @@ export default {
this.mod.routingHeaderId = entryModel.routingHeaderId this.mod.routingHeaderId = entryModel.routingHeaderId
this.mod.routingDetailId = entryModel.routingDetailId this.mod.routingDetailId = entryModel.routingDetailId
this.mod.checkName = localStorage.getItem('userName') this.mod.checkName = this.$store.state.userInfo.userName
this.mod.check_Status = 3 this.mod.check_Status = 3
this.product_code = '' this.product_code = ''
this.board_code = '' this.board_code = ''
......
pages/resource/Store/add.vue
View file @ 330b2550
...@@ -86,7 +86,6 @@ export default { ...@@ -86,7 +86,6 @@ export default {
user_ids: this.entity.user_ids.join(',') //库管员id user_ids: this.entity.user_ids.join(',') //库管员id
} }
console.log(paramsdata) console.log(paramsdata)
// JSON.stringify({ storeroomLocation: paramsdata })
Api.create({ storeroomLocation: paramsdata }).then( Api.create({ storeroomLocation: paramsdata }).then(
(r) => { (r) => {
this.disabled = false this.disabled = false
......
pages/resource/material/placode/inventory.vue
View file @ 330b2550
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem :label="l('creator')"> <FormItem :label="l('creator')">
<User :value="entity.creator"></User> <User :value="creatorUserId"></User>
<label slot="append" v-if="false">{{entity.creatorUserId}}</label>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
...@@ -189,8 +188,8 @@ export default { ...@@ -189,8 +188,8 @@ export default {
objList.storeId = data.storeId objList.storeId = data.storeId
objList.storeTitle = data.storeTitle objList.storeTitle = data.storeTitle
objList.materialType = 2 objList.materialType = 2
objList.creator = this.entity.creator objList.creator = this.creator
objList.creatorUserId = this.entity.creatorUserId objList.creatorUserId = this.creatorUserId
this.listUp.push(objList) this.listUp.push(objList)
} }
}) })
...@@ -201,8 +200,8 @@ export default { ...@@ -201,8 +200,8 @@ export default {
storeTitle: this.conditions.storeTitle.value, storeTitle: this.conditions.storeTitle.value,
remark: this.entity.remark, remark: this.entity.remark,
materialType: 2, materialType: 2,
creator: this.entity.creator, creator: this.creator,
creatorUserId: this.entity.creatorUserId creatorUserId: this.creatorUserId
}, },
item: this.listUp item: this.listUp
} }
......
pages/resource/material/powder/inventory.vue
View file @ 330b2550
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem :label="l('creator')"> <FormItem :label="l('creator')">
<User :value="entity.creator"></User> <User :value="creatorUserId"></User>
<label slot="append" v-if="false">{{entity.creatorUserId}}</label>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
...@@ -181,8 +180,8 @@ export default { ...@@ -181,8 +180,8 @@ export default {
objList.storeId = data.storeId objList.storeId = data.storeId
objList.storeTitle = data.storeTitle objList.storeTitle = data.storeTitle
objList.materialType = 1 objList.materialType = 1
objList.creator = this.entity.creator objList.creator = this.creator
objList.creatorUserId = this.entity.creatorUserId objList.creatorUserId = this.creatorUserId
this.listUp.push(objList) this.listUp.push(objList)
} }
}) })
...@@ -193,8 +192,8 @@ export default { ...@@ -193,8 +192,8 @@ export default {
storeTitle: this.conditions.storeTitle.value, storeTitle: this.conditions.storeTitle.value,
remark: this.entity.remark, remark: this.entity.remark,
materialType: 1, materialType: 1,
creator: this.entity.creator, creator: this.creator,
creatorUserId: this.entity.creatorUserId creatorUserId: this.creatorUserId
}, },
item: this.listUp item: this.listUp
} }
......
pages/resource/material/scraper/inventory.vue
View file @ 330b2550
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem :label="l('creator')"> <FormItem :label="l('creator')">
<User :value="entity.creator"></User> <User :value="creatorUserId"></User>
<label slot="append" v-if="false">{{entity.creatorUserId}}</label>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="12">
...@@ -182,8 +181,8 @@ export default { ...@@ -182,8 +181,8 @@ export default {
objList.storeId = data.storeId objList.storeId = data.storeId
objList.storeTitle = data.storeTitle objList.storeTitle = data.storeTitle
objList.materialType = 3 objList.materialType = 3
objList.creator = this.entity.creator objList.creator = this.creator
objList.creatorUserId = this.entity.creatorUserId objList.creatorUserId = this.creatorUserId
this.listUp.push(objList) this.listUp.push(objList)
} }
}) })
...@@ -194,8 +193,8 @@ export default { ...@@ -194,8 +193,8 @@ export default {
storeTitle: this.conditions.storeTitle.value, storeTitle: this.conditions.storeTitle.value,
remark: this.entity.remark, remark: this.entity.remark,
materialType: 3, materialType: 3,
creator: this.entity.creator, creator: this.creator,
creatorUserId: this.entity.creatorUserId creatorUserId: this.creatorUserId
}, },
item: this.listUp item: this.listUp
} }
......
pages/resource/resource/return.vue
View file @ 330b2550
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
}, },
resource: [], resource: [],
selectList: [], selectList: [],
libraryTube: localStorage.getItem('userName') //库管员 libraryTube: this.$store.state.userInfo.userName //库管员
} }
}, },
props: {}, props: {},
......
pages/resourceManagement/EquipmentCalendar/components/newEquipment.vue
View file @ 330b2550
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div slot="footer"> <div slot="footer">
<!-- class="footers" --> <!-- class="footers" -->
<Button @click="close">取消</Button> <Button @click="close">取消</Button>
<Button @click="saveOk" type="success">保存</Button> <Button @click="saveOk" type="primary">保存</Button>
</div> </div>
</Modal> </Modal>
<Department <Department
...@@ -149,7 +149,7 @@ export default { ...@@ -149,7 +149,7 @@ export default {
console.log(this.formItem1) console.log(this.formItem1)
console.log(this.formItem2) console.log(this.formItem2)
console.log(this.editId) console.log(this.editId)
service.post(`${url}`, JSON.stringify({ equipCalendarWork: this.formItem1,equipCalendarOverTime: this.formItem2 })) service.post(`${url}`,{ equipCalendarWork: this.formItem1,equipCalendarOverTime: this.formItem2 })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
......
pages/resourceManagement/EquipmentCalendar/index.vue
View file @ 330b2550
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
<div class="search-form"> <div class="search-form">
<Row> <Row>
<Col span="1" style=" text-align: right;"> <Col span="1" style=" text-align: right;">
<Button type="success" @click="newMainBack">维保反馈</Button> <Button type="primary" @click="newMainBack">维保反馈</Button>
<!-- <Button type="success" @click="deleted">删除</Button> --> <!-- <Button type="success" @click="deleted">删除</Button> -->
</Col> </Col>
</Row> </Row>
...@@ -812,7 +812,7 @@ export default { ...@@ -812,7 +812,7 @@ export default {
}; };
console.log(paramsdata); console.log(paramsdata);
service service
.post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata })) .post(`${url}`,{equipMaintainPlan: paramsdata })
.then(res => { .then(res => {
if (res.success) { if (res.success) {
this.changestatus(this.eid); this.changestatus(this.eid);
...@@ -854,7 +854,7 @@ export default { ...@@ -854,7 +854,7 @@ export default {
}; };
console.log(paramsdata); console.log(paramsdata);
service service
.post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata })) .post(`${url}`,{equipMaintainPlan: paramsdata })
.then(res => { .then(res => {
if (res.success) { if (res.success) {
this.changestatus(this.eid); this.changestatus(this.eid);
...@@ -1000,7 +1000,7 @@ export default { ...@@ -1000,7 +1000,7 @@ export default {
}; };
console.log(paramsdata); console.log(paramsdata);
service service
.post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata })) .post(`${url}`,{equipMaintainPlan: paramsdata })
.then(res => { .then(res => {
if (res.success) { if (res.success) {
this.changestatus(this.eid); this.changestatus(this.eid);
......
pages/resourceManagement/Storehouse/index.vue
View file @ 330b2550
...@@ -350,7 +350,7 @@ export default { ...@@ -350,7 +350,7 @@ export default {
} }
console.log(paramsdata) console.log(paramsdata)
service service
.post(`${url}`, JSON.stringify({ storeroomLocation: paramsdata })) .post(`${url}`, { storeroomLocation: paramsdata })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.laodaction() this.laodaction()
...@@ -391,7 +391,7 @@ export default { ...@@ -391,7 +391,7 @@ export default {
} }
// this.limtList = // this.limtList =
service service
.post(`${url}`, JSON.stringify({ storeroomLocation: paramsdata })) .post(`${url}`,{ storeroomLocation: paramsdata })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.laodaction() this.laodaction()
...@@ -414,7 +414,7 @@ export default { ...@@ -414,7 +414,7 @@ export default {
user_ids: this.formItem02.Storekeeper.join(',') //库管员 user_ids: this.formItem02.Storekeeper.join(',') //库管员
} }
service service
.post(`${url}`, JSON.stringify({ storeroomLocation: paramsdata })) .post(`${url}`, { storeroomLocation: paramsdata })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.laodaction() this.laodaction()
......
pages/resourceManagement/deviceManagement/components/newEquipment.vue
View file @ 330b2550
...@@ -197,7 +197,7 @@ export default { ...@@ -197,7 +197,7 @@ export default {
"eqstyle": str, "eqstyle": str,
}; };
// console.log(paramsdata); // console.log(paramsdata);
service.post(`${url}`, JSON.stringify({equipInfo: paramsdata})).then(res=>{ service.post(`${url}`, {equipInfo: paramsdata}).then(res=>{
if(res.success) { if(res.success) {
this.$emit('getMessage'); this.$emit('getMessage');
this.modalShow=false; this.modalShow=false;
...@@ -229,7 +229,7 @@ export default { ...@@ -229,7 +229,7 @@ export default {
"eqstyle": str, "eqstyle": str,
}; };
//console.log(this.formItem.equip_type); //console.log(this.formItem.equip_type);
service.post(`${url}`, JSON.stringify({equipInfo: paramsdata})).then(res=>{ service.post(`${url}`, {equipInfo: paramsdata}).then(res=>{
if(res.success) { if(res.success) {
this.$emit('getMessage'); this.$emit('getMessage');
this.modalShow=false; this.modalShow=false;
......
pages/resourceManagement/deviceManagement/index.vue
View file @ 330b2550
...@@ -869,7 +869,7 @@ export default { ...@@ -869,7 +869,7 @@ export default {
} }
console.log(paramsdata) console.log(paramsdata)
service service
.post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata })) .post(`${url}`, { equipMaintainPlan: paramsdata })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.changestatus(this.eid) this.changestatus(this.eid)
...@@ -911,7 +911,7 @@ export default { ...@@ -911,7 +911,7 @@ export default {
} }
console.log(paramsdata) console.log(paramsdata)
service service
.post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata })) .post(`${url}`, { equipMaintainPlan: paramsdata })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.changestatus(this.eid) this.changestatus(this.eid)
...@@ -1055,7 +1055,7 @@ export default { ...@@ -1055,7 +1055,7 @@ export default {
} }
console.log(paramsdata) console.log(paramsdata)
service service
.post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata })) .post(`${url}`, { equipMaintainPlan: paramsdata })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.changestatus(this.eid) this.changestatus(this.eid)
......
pages/resourceManagement/deviceManagementCP/components/newEquipment.vue
View file @ 330b2550
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<div slot="footer"> <div slot="footer">
<!-- class="footers" --> <!-- class="footers" -->
<Button @click="close">取消</Button> <Button @click="close">取消</Button>
<Button @click="saveOk" type="success">保存</Button> <Button @click="saveOk" type="primary">保存</Button>
</div> </div>
</Modal> </Modal>
<Department <Department
...@@ -224,7 +224,7 @@ export default { ...@@ -224,7 +224,7 @@ export default {
"capability_value":this.formItem.capability_value, "capability_value":this.formItem.capability_value,
}; };
// console.log(paramsdata); // console.log(paramsdata);
service.post(`${url}`, JSON.stringify({equipInfo: paramsdata})).then(res=>{ service.post(`${url}`, {equipInfo: paramsdata}).then(res=>{
if(res.success) { if(res.success) {
this.$emit('getMessage'); this.$emit('getMessage');
this.modalShow=false; this.modalShow=false;
...@@ -260,7 +260,7 @@ export default { ...@@ -260,7 +260,7 @@ export default {
}; };
//console.log(this.formItem.equip_type); //console.log(this.formItem.equip_type);
service.post(`${url}`, JSON.stringify({equipInfo: paramsdata})).then(res=>{ service.post(`${url}`, {equipInfo: paramsdata}).then(res=>{
if(res.success) { if(res.success) {
this.$emit('getMessage'); this.$emit('getMessage');
this.modalShow=false; this.modalShow=false;
......
pages/resourceManagement/deviceManagementCP/index.vue
View file @ 330b2550
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
<div class="search-form"> <div class="search-form">
<Row> <Row>
<Col span="1" style=" text-align: right;"> <Col span="1" style=" text-align: right;">
<Button type="success" @click="newMainBack">维保反馈</Button> <Button type="primary" @click="newMainBack">维保反馈</Button>
<!-- <Button type="success" @click="deleted">删除</Button> --> <!-- <Button type="success" @click="deleted">删除</Button> -->
</Col> </Col>
</Row> </Row>
...@@ -898,7 +898,7 @@ export default { ...@@ -898,7 +898,7 @@ export default {
} }
console.log(paramsdata) console.log(paramsdata)
service service
.post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata })) .post(`${url}`, { equipMaintainPlan: paramsdata })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.changestatus(this.eid) this.changestatus(this.eid)
...@@ -940,7 +940,7 @@ export default { ...@@ -940,7 +940,7 @@ export default {
} }
console.log(paramsdata) console.log(paramsdata)
service service
.post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata })) .post(`${url}`, { equipMaintainPlan: paramsdata })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.changestatus(this.eid) this.changestatus(this.eid)
...@@ -1088,7 +1088,7 @@ export default { ...@@ -1088,7 +1088,7 @@ export default {
} }
console.log(paramsdata) console.log(paramsdata)
service service
.post(`${url}`, JSON.stringify({ equipMaintainPlan: paramsdata })) .post(`${url}`, { equipMaintainPlan: paramsdata })
.then((res) => { .then((res) => {
if (res.success) { if (res.success) {
this.changestatus(this.eid) this.changestatus(this.eid)
......
pages/resourceManagement/deviceType/index.vue
View file @ 330b2550
...@@ -239,7 +239,7 @@ export default { ...@@ -239,7 +239,7 @@ export default {
notes: this.formItem.notes notes: this.formItem.notes
}; };
service service
.post(`${url}`, JSON.stringify({ equipType: paramsdata })) .post(`${url}`,{ equipType: paramsdata })
.then(res => { .then(res => {
if (res.success) { if (res.success) {
this.laodaction(); this.laodaction();
...@@ -264,7 +264,7 @@ export default { ...@@ -264,7 +264,7 @@ export default {
notes: this.formItem.notes notes: this.formItem.notes
}; };
service service
.post(`${url}`, JSON.stringify({ equipType: paramsdata })) .post(`${url}`,{equipType: paramsdata })
.then(res => { .then(res => {
if (res.success) { if (res.success) {
this.laodaction(); this.laodaction();
......
src/assets/css/base.css
View file @ 330b2550
...@@ -646,7 +646,7 @@ html [type=button] { ...@@ -646,7 +646,7 @@ html [type=button] {
} }
.waitTask { .waitTask {
/*flex 布局*/ /*flex 布局*/
display: flex; display: flex!important;
align-items: center; align-items: center;
width: 200px; width: 200px;
height: 100px; height: 100px;
......
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