Skip to content

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

料单

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