Skip to content

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

Merge branch 'product' of git.mes123.com:zhouyx/mes-ui into product-rjt

parents eee16d85 05844552
Hide whitespace changes
Inline Side-by-side
Showing with 1138 additions and 176 deletions
pages/aps/aps/options.vue
View file @ 6d4133a0
...@@ -161,8 +161,8 @@ export default { ...@@ -161,8 +161,8 @@ export default {
taskSeq: "", taskSeq: "",
flog: 5, //参数应用范围 flog: 5, //参数应用范围
calId:"", calId:"",
planState: false, planState: true,
planMethod: "重叠", // 平行 重叠 planMethod: "平行", // 平行 重叠
over: false, over: false,
overTime: "不加班", //"六日加班", 不加班 加班 overTime: "不加班", //"六日加班", 不加班 加班
efficiencyValue: 11, // 效率系数, 必须大于 0 efficiencyValue: 11, // 效率系数, 必须大于 0
...@@ -387,6 +387,30 @@ export default { ...@@ -387,6 +387,30 @@ export default {
}, },
count(v, n) { count(v, n) {
this.entity.discrete = 1; this.entity.discrete = 1;
},
"entity.multiple"(v){
/*
planState: false,
planMethod: "重叠", // 平行 重叠
*/
if(v){
this.entity.planState=v;
}
},
"entity.planState"(v){
/*
planState: false,
planMethod: "重叠", // 平行 重叠
*/
if(!v){
this.entity.multiple=v;
}
// this.planMethod=!v?"重叠":"平行"
} }
} }
}; };
......
pages/aps/dispatch/index.vue
View file @ 6d4133a0
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
<Radio label="2">已排产</Radio> <Radio label="2">已排产</Radio>
</RadioGroup> </RadioGroup>
共 {{listTask.length}} 条 共 {{listTask.length}} 条
<!-- <Button :disabled="disablFlag" @click="allCheack" class="ml10">全选</Button>
<Button :disabled="disablFlager" @click="uncheack" class="ml10">全不选</Button> -->
<span class="check"> <span class="check">
<RadioGroup v-model="listShow" type="button" size="small"> <RadioGroup v-model="listShow" type="button" size="small">
<Radio label="订单" title="订单分类"> <Radio label="订单" title="订单分类">
...@@ -305,6 +307,8 @@ export default { ...@@ -305,6 +307,8 @@ export default {
button2: "设备", button2: "设备",
listShow: "订单", listShow: "订单",
shebei: "", shebei: "",
disablFlag: false,//全选
disablFlager: true,//不选
curTask:null, curTask:null,
dateRange: {//禁选工时时间区间 dateRange: {//禁选工时时间区间
disabledDate(date) { disabledDate(date) {
...@@ -412,6 +416,9 @@ export default { ...@@ -412,6 +416,9 @@ export default {
setShebeiId(id) { setShebeiId(id) {
this.shebeiId = id; this.shebeiId = id;
this.footerToolbar = true; this.footerToolbar = true;
// console.log(this.showOperate)
// console.log(this.ids.length)
// console.log(this.shebeiId)
}, },
// 获取查询人员 // 获取查询人员
getselectuser(id) { getselectuser(id) {
...@@ -468,6 +475,11 @@ export default { ...@@ -468,6 +475,11 @@ export default {
savedUl.push(detailnew); savedUl.push(detailnew);
}); });
this.listTask = savedUl; this.listTask = savedUl;
// if(savedUl.length<1){
// this.disablFlag = true
// }else{
// this.disablFlag = false
// }
}); });
}, },
// 时间改变方法 // 时间改变方法
...@@ -487,6 +499,43 @@ export default { ...@@ -487,6 +499,43 @@ export default {
changeStatus(a) { changeStatus(a) {
this.getUserInfoFn(); this.getUserInfoFn();
}, },
// 全选、全不选切换
allCheack(){
let fameData = this.listTask
console.log(fameData)
this.listTask.map(u => {
u.checked = true
this.ids.push(u.id);
})
this.ids.length = this.listTask.length
this.showOperate = true
console.log(this.listTask)
// console.log(this.ids.length)
// console.log(this.shebeiId)
// console.log(this.footerToolbar)
// console.log(this.showOperate)
this.footerToolbar = true
this.disablFlag = true
this.disablFlager = false
},
uncheack(){
console.log(this.listTask)
this.listTask.map(u => {
u.checked = false
})
if(this.ids.length>0){
// this.ids = this.ids.splice(0, this.ids.length)
this.ids.length = 0
}
console.log(this.listTask)
// console.log(this.footerToolbar)
// console.log(this.showOperate)
// console.log(this.shebeiId)
// console.log(this.ids)
this.footerToolbar = false
this.disablFlag = false
this.disablFlager = true
},
// 打开抽屉 // 打开抽屉
openDrawer() { openDrawer() {
let chekids = this.ids; let chekids = this.ids;
...@@ -508,7 +557,8 @@ export default { ...@@ -508,7 +557,8 @@ export default {
} else { } else {
this.pentity.taskTime = [timebegin, timend]; this.pentity.taskTime = [timebegin, timend];
this.manModal = true; this.manModal = true;
}// console.log("选中的数据", this.newList); }
console.log("选中的数据", this.newList);
}, },
// 设备派工 // 设备派工
sendSheBei() { sendSheBei() {
...@@ -614,13 +664,26 @@ export default { ...@@ -614,13 +664,26 @@ export default {
} }
}, },
computed: { computed: {
ids() { ids(){
let ids = []; // get(){
this.listTask.map(u => { // console.warn("oldids");
if (u.checked) { ids.push(u.id);} let ids = [];
}); this.listTask.map(u => {
if (ids.length > 0) {this.footerToolbar = true;} if (u.checked) { ids.push(u.id);}
return ids; });
if (ids.length > 0) {this.footerToolbar = true;}
return ids;
// },
// set(newVal){
// console.warn("newids");
// let ids = [];
// this.listTask.map(u => {
// if (u.checked) { ids.push(u.id);}
// });
// if (ids.length > 0) {this.footerToolbar = true;}
// return ids;
// this.ids = newVal
// }
}, },
listOrder() { listOrder() {
let orders = this.$u.group(this.listTask, u => { let orders = this.$u.group(this.listTask, u => {
...@@ -638,12 +701,31 @@ export default { ...@@ -638,12 +701,31 @@ export default {
this.footerToolbar = true; this.footerToolbar = true;
return peploeId; return peploeId;
}, },
showOperate() { showOperate(){
// get(){
// console.info(this.ids.length)
// console.info(this.shebeiId)
// debugger
return ( return (
this.ids.length > 0 && (this.shebeiId > 0 || this.peploeId.length > 0) this.ids.length > 0 && (this.shebeiId > 0 || this.peploeId.length > 0)
); )
// },
// set(newVal){
// console.log("newVal")
// this.showOperate = newVal;
// return (
// this.ids.length > 0 && (this.shebeiId > 0 || this.peploeId.length > 0)
// )
// }
} }
}, },
watch: {} watch: {
// ids(n,o){
// console.info(n)
// console.info(o)
// console.warn(this.listTask);
// console.info(this.shebeiId)
// }
}
}; };
</script> </script>
\ No newline at end of file
pages/go/index.vue
View file @ 6d4133a0
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
}, },
mounted() { mounted() {
let map = $(go.Diagram, 'gomap', { let map = $(go.Diagram, 'gomap', {
'undoManager.isEnabled': true // enable Ctrl-Z to undo and Ctrl-Y to redo 'undoManager.isEnabled': false // enable Ctrl-Z to undo and Ctrl-Y to redo
}) })
var myModel = $(go.Model) var myModel = $(go.Model)
map.nodeTemplate = $( map.nodeTemplate = $(
......
pages/home/api.js
View file @ 6d4133a0
...@@ -22,4 +22,7 @@ export default { ...@@ -22,4 +22,7 @@ export default {
list(params) { list(params) {
return Api.post(`${systemUrl}/newmessage/list`, params); //获取列表信息 return Api.post(`${systemUrl}/newmessage/list`, params); //获取列表信息
}, },
favoriteList(params) {
return Api.post(`${systemUrl}/favorite/list`, params); //获取收藏列表信息
},
} }
\ No newline at end of file
pages/home/index.vue
View file @ 6d4133a0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="home"> <div class="home">
<div class="card-user"> <div class="card-user">
<div class="img-header"> <div class="img-header">
<img :src="avatorPath" width="90px" height="90px" v-if="imgPath" /> <Avatar :src="avatorPath" size="90" v-if="imgPath" />
<img src="@/assets/images/home/user.png" width="90px" height="90px" v-else /> <img src="@/assets/images/home/user.png" width="90px" height="90px" v-else />
</div> </div>
<div class="user-text"> <div class="user-text">
...@@ -16,6 +16,10 @@ ...@@ -16,6 +16,10 @@
<div class="bg-b"> <div class="bg-b">
<Icon type="ios-arrow-back" /> <Icon type="ios-arrow-back" />
</div> </div>
<!-- <div class="bg" v-for="(item,index) in listFavorite" :key="index">
<Icon :type="item.icon" />
<p>{{item.title}}</p>
</div>-->
<div class="bg"> <div class="bg">
<Icon type="ios-cube" /> <Icon type="ios-cube" />
<p>电子对账单</p> <p>电子对账单</p>
...@@ -99,6 +103,7 @@ export default { ...@@ -99,6 +103,7 @@ export default {
data() { data() {
return { return {
listTask: [], listTask: [],
listFavorite: [],
imgUrl: iconImg, imgUrl: iconImg,
userData: {}, userData: {},
avatorPath: "", avatorPath: "",
...@@ -108,6 +113,7 @@ export default { ...@@ -108,6 +113,7 @@ export default {
created() { created() {
this.get(); this.get();
this.getUserInfoFn(); this.getUserInfoFn();
this.getList();
}, },
methods: { methods: {
getUserInfoFn() { getUserInfoFn() {
...@@ -144,6 +150,12 @@ export default { ...@@ -144,6 +150,12 @@ export default {
this.listTask = list; this.listTask = list;
}); });
}, },
getList() {
let conditions = [];
Api.favoriteList({ conditions: conditions }).then((r) => {
this.listFavorite = r.result;
});
},
goPage(u) { goPage(u) {
// alert(u.menuUrl) // alert(u.menuUrl)
this.$router.push(u.menuUrl); this.$router.push(u.menuUrl);
...@@ -167,6 +179,10 @@ export default { ...@@ -167,6 +179,10 @@ export default {
margin-top: -10px; margin-top: -10px;
float: left; float: left;
} }
.ivu-avatar > img {
width: 100%;
height: 100%;
}
.user-text { .user-text {
float: left; float: left;
p { p {
......
pages/materiel/classification/api.js
View file @ 6d4133a0
...@@ -6,7 +6,7 @@ export default { ...@@ -6,7 +6,7 @@ export default {
}, },
// indexSlecet:`${systemUrl}/coderule/paged`, // indexSlecet:`${systemUrl}/coderule/paged`,
pagedSlecet(params){ pagedSlecet(params){
return Api.post(`${systemUrl}/coderule/paged`,params); return Api.post(`${material}/coderule/paged`,params);
}, },
listTable(params){ listTable(params){
return Api.post(`${material}/custompropertydefinition/list`,params); return Api.post(`${material}/custompropertydefinition/list`,params);
......
pages/materiel/masterData/api.js
View file @ 6d4133a0
...@@ -6,7 +6,7 @@ export default { ...@@ -6,7 +6,7 @@ export default {
return Api.post(`${material}/material/paged`,params); return Api.post(`${material}/material/paged`,params);
}, },
pagedSlecet(params){ pagedSlecet(params){
return Api.post(`${systemUrl}/coderule/paged`,params); return Api.post(`${material}/coderule/paged`,params);
}, },
list(params){ list(params){
return Api.post(`${material}/category/list`,params); return Api.post(`${material}/category/list`,params);
......
pages/order/monitoring/index.vue
View file @ 6d4133a0
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
Record, Record,
Search, Search,
Suspend, Suspend,
Speed Speed,
}, },
data() { data() {
return { return {
...@@ -85,7 +85,7 @@ export default { ...@@ -85,7 +85,7 @@ export default {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: "mesCode", value: null }, keys: { op: "mesCode", value: null },
productingpreparationpeople: { op: "Equal", value: null } productingpreparationpeople: { op: "Equal", value: null },
}, },
suspendModal: false, suspendModal: false,
recordModal: false, recordModal: false,
...@@ -98,7 +98,7 @@ export default { ...@@ -98,7 +98,7 @@ export default {
title: "序号", title: "序号",
type: "index", type: "index",
width: 70, width: 70,
align: "center" align: "center",
}, },
{ {
key: "status", key: "status",
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
align: "center", align: "center",
easy: true, easy: true,
high: true, high: true,
width: 100 width: 100,
}, },
{ {
key: "mesCode", key: "mesCode",
...@@ -122,11 +122,11 @@ export default { ...@@ -122,11 +122,11 @@ export default {
{ {
props: { props: {
content: "开工预警：" + params.row.startWarning + "条", content: "开工预警：" + params.row.startWarning + "条",
trigger: "hover" trigger: "hover",
}, },
style: { style: {
cursor: "pointer" cursor: "pointer",
} },
}, },
[ [
h( h(
...@@ -135,25 +135,25 @@ export default { ...@@ -135,25 +135,25 @@ export default {
props: { props: {
type: "warning", type: "warning",
// count: 2, // count: 2,
count: params.row.startWarning count: params.row.startWarning,
}, },
style: { style: {
marginTop: "12px", marginTop: "12px",
marginLeft: "5px" marginLeft: "5px",
} },
}, },
[ [
h("Icon", { h("Icon", {
props: { props: {
type: "md-alert" type: "md-alert",
}, },
style: { style: {
fontSize: "16px", fontSize: "16px",
color: "#f1cb08" color: "#f1cb08",
} },
}) }),
] ]
) ),
] ]
), ),
h( h(
...@@ -161,8 +161,8 @@ export default { ...@@ -161,8 +161,8 @@ export default {
{ {
props: { props: {
content: "完工预警：" + params.row.finishWarning + "条", content: "完工预警：" + params.row.finishWarning + "条",
trigger: "hover" trigger: "hover",
} },
}, },
[ [
h( h(
...@@ -171,38 +171,38 @@ export default { ...@@ -171,38 +171,38 @@ export default {
props: { props: {
type: "info", type: "info",
// count: 2, // count: 2,
count: params.row.finishWarning count: params.row.finishWarning,
}, },
style: { style: {
marginTop: "12px", marginTop: "12px",
marginLeft: "5px" marginLeft: "5px",
} },
}, },
[ [
h("Icon", { h("Icon", {
props: { props: {
type: "md-alert" type: "md-alert",
}, },
style: { style: {
fontSize: "16px", fontSize: "16px",
color: "#31F8E6", color: "#31F8E6",
marginLeft: "5px" marginLeft: "5px",
} },
}) }),
] ]
) ),
] ]
) ),
] ],
]); ]);
} },
}, },
{ {
key: "productName", key: "productName",
title: this.l("productName"), title: this.l("productName"),
align: "left", align: "left",
easy: true, easy: true,
high: true high: true,
}, },
{ {
...@@ -217,7 +217,7 @@ export default { ...@@ -217,7 +217,7 @@ export default {
this.sliceStr(params.row.demandStartDate + " ", 0, 10), this.sliceStr(params.row.demandStartDate + " ", 0, 10),
params.row.demandStartDate params.row.demandStartDate
); );
} },
}, },
{ {
key: "demandFinishDate", key: "demandFinishDate",
...@@ -231,7 +231,7 @@ export default { ...@@ -231,7 +231,7 @@ export default {
this.sliceStr(params.row.demandFinishDate + " ", 0, 10), this.sliceStr(params.row.demandFinishDate + " ", 0, 10),
params.row.demandFinishDate params.row.demandFinishDate
); );
} },
}, },
{ {
key: "actualStartDate", key: "actualStartDate",
...@@ -247,7 +247,7 @@ export default { ...@@ -247,7 +247,7 @@ export default {
? "" ? ""
: params.row.actualStartDate : params.row.actualStartDate
); );
} },
}, },
{ {
key: "actualFinishDate", key: "actualFinishDate",
...@@ -263,7 +263,7 @@ export default { ...@@ -263,7 +263,7 @@ export default {
? "" ? ""
: params.row.actualFinishDate : params.row.actualFinishDate
); );
} },
}, },
{ {
key: "routingType", key: "routingType",
...@@ -272,7 +272,7 @@ export default { ...@@ -272,7 +272,7 @@ export default {
code: "mes_xingchi_plan.order_material.routingType", code: "mes_xingchi_plan.order_material.routingType",
easy: true, easy: true,
high: true, high: true,
width: 100 width: 100,
}, },
{ {
title: this.l("jindu"), title: this.l("jindu"),
...@@ -285,8 +285,8 @@ export default { ...@@ -285,8 +285,8 @@ export default {
"ButtonGroup", "ButtonGroup",
{ {
props: { props: {
shape: "circle" shape: "circle",
} },
}, },
[ [
h( h(
...@@ -294,13 +294,13 @@ export default { ...@@ -294,13 +294,13 @@ export default {
{ {
style: { style: {
background: "#e4e6ed ", background: "#e4e6ed ",
borderColor: "#e4e6ed " borderColor: "#e4e6ed ",
}, },
on: { on: {
click: () => { click: () => {
this.speed(params.row); this.speed(params.row);
} },
} },
}, },
params.row.unstartCount //未开工数 params.row.unstartCount //未开工数
), ),
...@@ -309,13 +309,13 @@ export default { ...@@ -309,13 +309,13 @@ export default {
{ {
style: { style: {
background: "#ffc000", background: "#ffc000",
borderColor: "#ffc000" borderColor: "#ffc000",
}, },
on: { on: {
click: () => { click: () => {
this.speed(params.row); this.speed(params.row);
} },
} },
}, },
params.row.startCount //开工数 params.row.startCount //开工数
), ),
...@@ -325,14 +325,14 @@ export default { ...@@ -325,14 +325,14 @@ export default {
{ {
style: { style: {
background: "#ff7a8b", background: "#ff7a8b",
borderColor: "#ff7a8b" borderColor: "#ff7a8b",
}, },
on: { on: {
click: () => { click: () => {
this.speed(params.row); this.speed(params.row);
} },
} },
}, },
params.row.stopCount //暂停数 params.row.stopCount //暂停数
), ),
...@@ -341,27 +341,27 @@ export default { ...@@ -341,27 +341,27 @@ export default {
{ {
style: { style: {
background: "#27c149", background: "#27c149",
borderColor: "#27c149" borderColor: "#27c149",
// color: '#fff' // color: '#fff'
}, },
on: { on: {
click: () => { click: () => {
this.speed(params.row); this.speed(params.row);
} },
} },
}, },
params.row.finishCount //完成数 params.row.finishCount //完成数
) ),
] ]
) ),
]); ]);
} },
}, },
{ {
key: "remark", key: "remark",
title: this.l("remark"), title: this.l("remark"),
align: "center", align: "center",
hide: true hide: true,
}, },
{ {
title: "暂停记录", title: "暂停记录",
...@@ -374,12 +374,12 @@ export default { ...@@ -374,12 +374,12 @@ export default {
"op", "op",
{ {
attrs: { oprate: "record", class: "edit" }, attrs: { oprate: "record", class: "edit" },
on: { click: () => this.record(params.row.id) } on: { click: () => this.record(params.row.id) },
}, },
"暂停记录" "暂停记录"
) ),
]); ]);
} },
}, },
{ {
title: "操作", title: "操作",
...@@ -400,73 +400,73 @@ export default { ...@@ -400,73 +400,73 @@ export default {
type: "error", type: "error",
size: "small", size: "small",
icon: "md-play", icon: "md-play",
ghost: true ghost: true,
}, },
style: { style: {
fontSize: "18px", fontSize: "18px",
width: "50px", width: "50px",
height: "25px", height: "25px",
paddingTop: "0" paddingTop: "0",
}, },
on: { on: {
click: () => { click: () => {
this.start(params.row); this.start(params.row);
} },
} },
}, },
"" ""
), ),
h( h(
params.row.status == 6 params.row.status == 6 ? "Button" : "", //订单状态执行中，暂停
? "Button"
: "", //订单状态执行中，暂停
{ {
props: { props: {
type: "success", type: "success",
size: "small", size: "small",
icon: "ios-pause", icon: "ios-pause",
ghost: true, ghost: true,
tooltip: "暂停" tooltip: "暂停",
}, },
style: { style: {
fontSize: "18px", fontSize: "18px",
width: "50px", width: "50px",
height: "25px", height: "25px",
paddingTop: "0" paddingTop: "0",
}, },
on: { on: {
click: () => { click: () => {
this.suspend(params.row); this.suspend(params.row);
} },
} },
}, },
"" ""
), ),
h( h(
params.row.status == 5 && params.row.splitCardStatus == 0 ? "op" : "", //订单状态执行中，暂停 params.row.status == 5 && params.row.splitCardStatus == 0
? "op"
: "", //订单状态执行中，暂停
{ {
attrs: { attrs: {
icon: "md-sync", icon: "md-sync",
type: "icon", type: "icon",
title: "回收订单", title: "回收订单",
oprate: "edit", oprate: "edit",
msg: "确认要恢复工序吗？" msg: "确认要恢复工序吗？",
}, },
on: { on: {
click: () => { click: () => {
this.recycle(params.row); this.recycle(params.row);
} },
} },
} }
) ),
]); ]);
} },
} },
], ],
loading: false, loading: false,
recovery: { recovery: {
orderId: null, orderId: null,
demandFinishDate: "" //计划完成时间 demandFinishDate: "", //计划完成时间
}, },
mesCode: "", mesCode: "",
rulesRecycle: { rulesRecycle: {
...@@ -475,10 +475,10 @@ export default { ...@@ -475,10 +475,10 @@ export default {
required: true, required: true,
message: "请选择计划完成时间", message: "请选择计划完成时间",
trigger: "change", trigger: "change",
type: "date" type: "date",
} },
] ],
} },
}; };
}, },
mounted() {}, mounted() {},
...@@ -509,15 +509,15 @@ export default { ...@@ -509,15 +509,15 @@ export default {
this.orderId = row.id; this.orderId = row.id;
Api.info({ Api.info({
routingHeaderId: row.routingHeaderId, routingHeaderId: row.routingHeaderId,
dispatchExecuteId: row.dispatchExecuteId dispatchExecuteId: row.dispatchExecuteId,
}) })
.then(r => { .then((r) => {
if (r.success) { if (r.success) {
this.result = r.result; this.result = r.result;
this.loading = false; this.loading = false;
} }
}) })
.catch(err => { .catch((err) => {
this.$Message.error("连接错误"); this.$Message.error("连接错误");
}); });
} }
...@@ -536,8 +536,8 @@ export default { ...@@ -536,8 +536,8 @@ export default {
Api.start({ Api.start({
id: row.id, id: row.id,
status: 6, status: 6,
laster: this.laster laster: this.laster,
}).then(r => { }).then((r) => {
if (r.success) { if (r.success) {
this.$refs.grid.load(); this.$refs.grid.load();
this.$Message.success("启动成功"); this.$Message.success("启动成功");
...@@ -548,7 +548,7 @@ export default { ...@@ -548,7 +548,7 @@ export default {
}, },
onCancel: () => { onCancel: () => {
this.$Message.info("已取消"); this.$Message.info("已取消");
} },
}); });
}, },
clsoeSpeedModal() { clsoeSpeedModal() {
...@@ -562,7 +562,7 @@ export default { ...@@ -562,7 +562,7 @@ export default {
}, },
removeOk() { removeOk() {
Api.delete({ id: this.curId }).then(r => { Api.delete({ id: this.curId }).then((r) => {
if (r.success) { if (r.success) {
this.$refs.grid.load(); this.$refs.grid.load();
this.deletelModal = false; this.deletelModal = false;
...@@ -576,7 +576,7 @@ export default { ...@@ -576,7 +576,7 @@ export default {
this.mesCode = row.mesCode; this.mesCode = row.mesCode;
this.recovery = { this.recovery = {
orderId: row.id, orderId: row.id,
demandFinishDate: row.demandFinishDate demandFinishDate: row.demandFinishDate,
}; };
}, },
changeFinishiDate() { changeFinishiDate() {
...@@ -584,14 +584,14 @@ export default { ...@@ -584,14 +584,14 @@ export default {
this.recovery.demandFinishDate = ""; this.recovery.demandFinishDate = "";
this.recovery.demandFinishDate = this.getFormatDateEnd(temTime); this.recovery.demandFinishDate = this.getFormatDateEnd(temTime);
Api.orderrecovery(this.recovery) Api.orderrecovery(this.recovery)
.then(res => { .then((res) => {
if (res.success) { if (res.success) {
this.$Message.success("回收成功"); this.$Message.success("回收成功");
this.$refs.grid.reload(this.easySearch); this.$refs.grid.reload(this.easySearch);
this.recycleModal = false; this.recycleModal = false;
} }
}) })
.catch(err => { .catch((err) => {
this.$Message.error("数据连接错误"); this.$Message.error("数据连接错误");
}); });
}, },
...@@ -599,7 +599,7 @@ export default { ...@@ -599,7 +599,7 @@ export default {
this.mesCode = ""; this.mesCode = "";
this.recovery = { this.recovery = {
orderId: null, orderId: null,
demandFinishDate: "" //计划完成时间 demandFinishDate: "", //计划完成时间
}; };
this.recycleModal = false; this.recycleModal = false;
}, },
...@@ -631,8 +631,8 @@ export default { ...@@ -631,8 +631,8 @@ export default {
l(key) { l(key) {
let vkey = "mes_order_watch" + "." + key; let vkey = "mes_order_watch" + "." + key;
return this.$t(vkey) || key; return this.$t(vkey) || key;
} },
} },
}; };
</script> </script>
<style lang="less"> <style lang="less">
......
pages/processDesign/ChangeSingle/technicalcoordination/techInfos.vue
View file @ 6d4133a0
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<Filed :span="12" :name="'任务号'">{{info.changeInfo.taskCode}}</Filed> <Filed :span="12" :name="'任务号'">{{info.changeInfo.taskCode}}</Filed>
<Filed :span="12" :name="'数量'">{{info.changeInfo.quantity}}</Filed> <Filed :span="12" :name="'数量'">{{info.changeInfo.quantity}}</Filed>
<Filed :span="12" :name="'阶段'">{{info.changeInfo.phase}}</Filed> <Filed :span="12" :name="'阶段'">{{info.changeInfo.phase}}</Filed>
</Row> <!-- </Row>
<Row> <Row> -->
<Filed :span="12" :name="'产品名称'">{{info.changeInfo.product_name}}</Filed> <Filed :span="12" :name="'产品名称'">{{info.changeInfo.product_name}}</Filed>
<Filed :span="12" :name="'产品标识'">{{info.changeInfo.product_mark}}</Filed> <Filed :span="12" :name="'产品标识'">{{info.changeInfo.product_mark}}</Filed>
<Filed :span="12" :name="'协调内容'">{{info.changeInfo.coordinate_content}}</Filed> <Filed :span="12" :name="'协调内容'">{{info.changeInfo.coordinate_content}}</Filed>
......
pages/processManage/setProcess/index.vue
View file @ 6d4133a0
...@@ -490,7 +490,6 @@ export default { ...@@ -490,7 +490,6 @@ export default {
organizType: 0, organizType: 0,
organizName: "" organizName: ""
}, },
newColumn: [], newColumn: [],
value: "", value: "",
column: [], column: [],
......
pages/technology/productMix/product/search.vue
View file @ 6d4133a0
<template> <template>
<Form ref="form" :model="condition" :label-width="90"> <Form ref="form" :model="condition" :label-width="90">
<Row> <Row>
<Col :span="12" :v-if="condition.id.show"><FormItem :label="$t('id')" prop="id"> <Input v-model="condition.id.value"> </Input> <Col :span="12" :v-if="condition.id.show">
</FormItem></Col> <FormItem :label="$t('id')" prop="id">
<Col :span="12" :v-if="condition.creationTime.show"><FormItem :label="$t('creationTime')" prop="creationTime"> <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker> <Input v-model="condition.id.value"></Input>
</FormItem></Col> </FormItem>
<Col :span="12" :v-if="condition.creatorUserId.show"><FormItem :label="$t('creatorUserId')" prop="creatorUserId"> <Input v-model="condition.creatorUserId.value"> </Input> </Col>
</FormItem></Col> <Col :span="12" :v-if="condition.creationTime.show">
<Col :span="12" :v-if="condition.lastModificationTime.show"><FormItem :label="$t('lastModificationTime')" prop="lastModificationTime"> <DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker> <FormItem :label="$t('creationTime')" prop="creationTime">
</FormItem></Col> <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
<Col :span="12" :v-if="condition.lastModifierUserId.show"><FormItem :label="$t('lastModifierUserId')" prop="lastModifierUserId"> <Input v-model="condition.lastModifierUserId.value"> </Input> </FormItem>
</FormItem></Col> </Col>
<Col :span="12" :v-if="condition.mmcode.show"><FormItem :label="l('mmcode')" prop="mmcode"> <Input v-model="condition.mmcode.value"> </Input> <Col :span="12" :v-if="condition.creatorUserId.show">
</FormItem></Col> <FormItem :label="$t('creatorUserId')" prop="creatorUserId">
<Col :span="12" :v-if="condition.drawingNo.show"><FormItem :label="l('drawingNo')" prop="drawingNo"> <Input v-model="condition.drawingNo.value"> </Input> <Input v-model="condition.creatorUserId.value"></Input>
</FormItem></Col> </FormItem>
<Col :span="12" :v-if="condition.name.show"><FormItem :label="l('name')" prop="name"> <Input v-model="condition.name.value"> </Input> </Col>
</FormItem></Col> <Col :span="12" :v-if="condition.lastModificationTime.show">
<Col :span="12" :v-if="condition.productCode.show"><FormItem :label="l('productCode')" prop="productCode"> <Input v-model="condition.productCode.value"> </Input> <FormItem :label="$t('lastModificationTime')" prop="lastModificationTime">
</FormItem></Col> <DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
<Col :span="12" :v-if="condition.status.show"><FormItem :label="l('status')" prop="status"> <Input v-model="condition.status.value"> </Input> </FormItem>
</FormItem></Col> </Col>
<Col :span="24" :v-if="condition.remark.show"><FormItem :label="l('remark')" prop="remark"> <Input v-model="condition.remark.value"> </Input> <Col :span="12" :v-if="condition.lastModifierUserId.show">
</FormItem></Col> <FormItem :label="$t('lastModifierUserId')" prop="lastModifierUserId">
<Col :span="12" :v-if="condition.madeCompany.show"><FormItem :label="l('madeCompany')" prop="madeCompany"> <Input v-model="condition.madeCompany.value"> </Input> <Input v-model="condition.lastModifierUserId.value"></Input>
</FormItem></Col> </FormItem>
<Col :span="24" :v-if="condition.productUrl.show"><FormItem :label="l('productUrl')" prop="productUrl"> <Input v-model="condition.productUrl.value"> </Input> </Col>
</FormItem></Col> <Col :span="12" :v-if="condition.mmcode.show">
<Col :span="24" :v-if="condition.productUrlList.show"><FormItem :label="l('productUrlList')" prop="productUrlList"> <Input v-model="condition.productUrlList.value"> </Input> <FormItem :label="l('mmcode')" prop="mmcode">
</FormItem></Col> <Input v-model="condition.mmcode.value"></Input>
</Row> </FormItem>
</Form> </Col>
<Col :span="12" :v-if="condition.drawingNo.show">
<FormItem :label="l('drawingNo')" prop="drawingNo">
<Input v-model="condition.drawingNo.value"></Input>
</FormItem>
</Col>
<Col :span="12" :v-if="condition.name.show">
<FormItem :label="l('name')" prop="name">
<Input v-model="condition.name.value"></Input>
</FormItem>
</Col>
<Col :span="12" :v-if="condition.productCode.show">
<FormItem :label="l('productCode')" prop="productCode">
<Input v-model="condition.productCode.value"></Input>
</FormItem>
</Col>
<Col :span="12" :v-if="condition.status.show">
<FormItem :label="l('status')" prop="status">
<Input v-model="condition.status.value"></Input>
</FormItem>
</Col>
<Col :span="24" :v-if="condition.remark.show">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="condition.remark.value"></Input>
</FormItem>
</Col>
<Col :span="12" :v-if="condition.madeCompany.show">
<FormItem :label="l('madeCompany')" prop="madeCompany">
<Input v-model="condition.madeCompany.value"></Input>
</FormItem>
</Col>
<Col :span="24" :v-if="condition.productUrl.show">
<FormItem :label="l('productUrl')" prop="productUrl">
<Input v-model="condition.productUrl.value"></Input>
</FormItem>
</Col>
<Col :span="24" :v-if="condition.productUrlList.show">
<FormItem :label="l('productUrlList')" prop="productUrlList">
<Input v-model="condition.productUrlList.value"></Input>
</FormItem>
</Col>
</Row>
</Form>
</template> </template>
<script> <script>
import Api from './api' import Api from "./api";
export default { export default {
name: 'Add', name: "Add",
data() { data() {
return { return {
condition: { condition: {
id:{op:"Equal",value:null,show:true}, id: { op: "Equal", value: null, show: true },
creationTime:{op:"Range",value:null,show:true}, creationTime: { op: "Range", value: null, show: true },
creatorUserId:{op:"Equal",value:null,show:true}, creatorUserId: { op: "Equal", value: null, show: true },
lastModificationTime:{op:"Range",value:null,show:true}, lastModificationTime: { op: "Range", value: null, show: true },
lastModifierUserId:{op:"Equal",value:null,show:true}, lastModifierUserId: { op: "Equal", value: null, show: true },
mmcode:{op:"Equal",value:null,show:true}, mmcode: { op: "Equal", value: null, show: true },
drawingNo:{op:"Equal",value:null,show:true}, drawingNo: { op: "Equal", value: null, show: true },
name:{op:"Equal",value:null,show:true}, name: { op: "Equal", value: null, show: true },
productCode:{op:"Equal",value:null,show:true}, productCode: { op: "Equal", value: null, show: true },
status:{op:"Equal",value:null,show:true}, status: { op: "Equal", value: null, show: true },
remark:{op:"Equal",value:null,show:true}, remark: { op: "Equal", value: null, show: true },
madeCompany:{op:"Equal",value:null,show:true}, madeCompany: { op: "Equal", value: null, show: true },
productUrl:{op:"Equal",value:null,show:true}, productUrl: { op: "Equal", value: null, show: true },
productUrlList:{op:"Equal",value:null,show:true}, productUrlList: { op: "Equal", value: null, show: true },
}, },
} };
}, },
methods: { methods: {
handleClose() { handleClose() {
this.$emit('on-close') this.$emit("on-close");
}, },
l(key) { l(key) {
key = "product_info" + "." + key; key = "product_info" + "." + key;
return this.$t(key) return this.$t(key);
} },
} },
} };
</script> </script>
\ No newline at end of file
pages/technology/setProcess/api.js 0 → 100644
View file @ 6d4133a0
import Api from '@/plugins/request'
export default {
index: `${PlanUrl}/mesorders/getpagedmesordersforpdefm`,
paged(params) {
return Api.post(`${PlanUrl}/mesorders/getpagedmesordersforpdefm`, params);
},
index1: `${technologyUrl}routingheader/paged`,
paged1(params) {
return Api.post(`${technologyUrl}routingheader/paged`, params);
},
routingset(params) {
return Api.post(`${technologyUrl}orderrouting/routingset`, params);
},
ordersetroutingids(params) {
return Api.post(`${technologyUrl}orderrouting/ordersetroutingids`, params);
},
}
pages/technology/setProcess/details.vue 0 → 100644
View file @ 6d4133a0
<template>
<div class="datails">
<Table border ref="selection" :columns="columns" :data="data1"></Table>
</div>
</template>
<script>
import Api from "./api";
export default {
props: {
eid: {
ids: Array,
},
},
data() {
return {
data1: [],
// easySearch: {
// keys: { op: "unicode,name,code", value: null },
// },
columns: [
// { type: "selection", width: 70, align: "center" },
{
title: "#",
type: "index",
width: 50,
align: "center",
},
{
key: "code",
title: this.l("code"),
align: "left",
},
{
key: "name",
title: this.l("name"),
align: "left",
tooltip: true,
},
{
key: "phase",
title: this.l("phase"),
align: "center",
width: 100,
render: (h, params) => {
return h("state", {
attrs: {
value: params.row.phase,
code: "Process.Routing.phase",
},
});
},
},
{
key: "versionid",
title: this.l("version"),
align: "center",
width: 100,
render: (h, params) => {
return h("state", {
attrs: {
value: params.row.versionid,
code: "Process.Routing.version",
},
});
},
},
{
title: this.l("approvalStatus"),
key: "approvalStatus",
align: "center",
width: "120",
render: (h, params) => {
return h("state", {
attrs: {
value: params.row.approvalStatus,
code: "process.RoutingStatus",
},
});
},
},
{
key: "routingType",
title: this.l("routingType"),
align: "center",
width: 100,
render: (h, params) => {
return h("state", {
attrs: {
value: params.row.routingType,
code: "Process.Routing.routingType",
},
});
},
},
{
key: "drawingNo",
title: this.l("drawingNo"),
align: "left",
width: 100,
},
{
key: "productName",
title: this.l("productName"),
align: "left",
tooltip: true,
},
{
key: "departmentName",
title: this.l("departmentName"),
align: "left",
tooltip: true,
},
{
key: "isEffect",
title: this.l("isEffect"),
align: "center",
width: 80,
render: (h, params) => {
return h("state", {
attrs: {
value: params.row.isEffect,
code: "Process.Status",
},
});
},
},
],
};
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
this.getData();
},
methods: {
getData() {
// console.log(this.eid.ids);
let ids = this.eid.ids;
let conditions = [
{
conditionalType: "In",
fieldName: "id",
fieldValue: ids.join(","),
},
];
let data = {
conditions: conditions,
};
Api.paged1(data).then((r) => {
this.data1 = r.result.items;
});
},
l(key) {
let vkey = "routingHeader" + "." + key;
return this.$t(vkey) || key;
},
},
};
</script>
<style lang="less">
</style>
\ No newline at end of file
pages/technology/setProcess/index.vue 0 → 100644
View file @ 6d4133a0
<template>
<div class="product-mix">
<Layout>
<Sider hide-trigger v-if="showMenu" width="300">
<ProductTree @on-hide="onHide" @on-select="productSearch" />
</Sider>
<div v-if="!showMenu" class="show_menu">
<a class="menu_play fr" @click="showMenuFn" title="展开">
<Icon type="ios-arrow-forward" size="24" />
</a>
</div>
<Content :class="!showMenu?'con_bord':''">
<DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
<FormItem prop="productingpreparationpeople" style="width:200px">
<departmentSelect v-model="easySearch.productingpreparationpeople.value" :type="3"></departmentSelect>
</FormItem>
<FormItem prop="keys">
<Input placeholder="请输入订单编号/产品名称" v-model="easySearch.keys.value" clearable />
</FormItem>
<FormItem>
<Button type="primary" @click="search">查询</Button>
</FormItem>
</Form>
</template>
<template slot="searchForm">
<Search />
</template>
</DataGrid>
</Content>
</Layout>
<Modal
v-model="modal"
:title="title"
width="1200"
footer-hide
fullscreen
:mask-closable="false"
>
<component :is="detail" :eid="child" @on-close="cancel" @on-ok="ok" />
</Modal>
</div>
</template>
<script>
import Api from "./api";
import ProductTree from "@/components/page/productTree.vue"; //左侧树列表
import Search from "./search";
export default {
components: {
ProductTree,
Search,
},
data() {
return {
action: Api.index,
showMenu: true,
title: "",
child: {
curId: 0,
productingPreparationPeople: 0,
orderIds: 0,
ids: [],
},
detail: null,
modal: false,
easySearch: {
keys: { op: "mescode,productName", value: null },
productingpreparationpeople: { op: "Equal", value: null },
},
columns: [
// { type: "selection", width: 70, align: "center" },
{
title: "序号",
key: "id",
// type: "index",
width: 80,
align: "center",
},
{
title: "订单编号",
key: "mesCode",
align: "center",
},
{
title: "任务类型",
key: "taskType",
align: "center",
code: "plan.order.taskType",
},
{
title: "产品名称",
key: "productName",
align: "center",
},
{ title: "图号", key: "drawnNumber" },
{ title: "项目号", key: "projectNumber" },
{ title: "批次号", key: "batchNumber" },
{ title: "数量", key: "quantity", align: "center" },
{
title: "工艺规程",
key: "mainRoutingStatus",
render: (h, params) => {
return h(
params.row.mainRoutingStatus == 1 ||
params.row.mainRoutingStatus == -1
? "a"
: "div",
[
h("state", {
props: {
code: "process.RoutingStatus",
type: "text",
value: params.row.mainRoutingStatus,
},
nativeOn: {
click: () => {
this.record(params.row);
},
},
}),
]
);
},
},
// {
// title: "料单",
// key: "materialbillStatus",
// code: "process.RoutingStatus",
// },
],
};
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
record(row) {
if (row.mainRoutingStatus == -1) {
//未设置-1
this.child.curId = row.productId;
this.child.productingPreparationPeople =
row.productingPreparationPeople;
this.child.orderIds = row.id;
this.title = "工艺列表";
this.detail = () => import("./set");
this.modal = true;
} else if (row.mainRoutingStatus == 1) {
//受控中，查看
this.title = "查看工艺";
this.detail = () => import("./details");
this.modal = true;
Api.ordersetroutingids({ id: row.id }).then((r) => {
if (r.result) {
this.child.ids = r.result;
}
});
}
},
onHide() {
this.showMenu = false;
},
showMenuFn() {
this.showMenu = true;
},
productSearch(id, item, ids) {
let where = { productId: { op: "In", value: ids } };
this.$refs.grid.reload(where);
},
search() {
this.$refs.grid.reload(this.easySearch);
},
search2() {
this.$refs.grid.modalSearch = true;
},
ok() {
this.$refs.grid.load();
this.modal = false;
this.child.curId = 0;
},
cancel() {
this.child.curId = 0;
this.modal = false;
},
},
};
</script>
<style lang="less">
.product-mix {
font-family: Microsoft YaHei;
padding-top: 3px;
.ivu-layout-sider {
background: rgba(255, 255, 255, 1);
margin-right: 10px;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
height: 89vh;
overflow: auto;
}
.ivu-layout-content {
// margin-left: 5px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
overflow: auto;
padding: 10px;
height: 89vh;
}
}
</style>
\ No newline at end of file
pages/technology/setProcess/search.vue 0 → 100644
View file @ 6d4133a0
<template>
<Form ref="form" :model="condition" :label-width="90">
<Row>
<Col :span="12" :v-if="condition.id.show">
<FormItem :label="$t('id')" prop="id">
<Input v-model="condition.id.value"></Input>
</FormItem>
</Col>
<Col :span="12" :v-if="condition.drawingNo.show">
<FormItem :label="l('drawingNo')" prop="drawingNo">
<Input v-model="condition.drawingNo.value"></Input>
</FormItem>
</Col>
<Col :span="12" :v-if="condition.name.show">
<FormItem :label="l('name')" prop="name">
<Input v-model="condition.name.value"></Input>
</FormItem>
</Col>
<Col :span="12" :v-if="condition.productCode.show">
<FormItem :label="l('productCode')" prop="productCode">
<Input v-model="condition.productCode.value"></Input>
</FormItem>
</Col>
<!-- <Col :span="12" :v-if="condition.status.show">
<FormItem :label="l('status')" prop="status">
<Input v-model="condition.status.value"></Input>
</FormItem>
</Col> -->
<Col :span="24" :v-if="condition.remark.show">
<FormItem :label="l('remark')" prop="remark">
<Input v-model="condition.remark.value"></Input>
</FormItem>
</Col>
</Row>
</Form>
</template>
<script>
// import Api from "./api";
export default {
name: "Add",
data() {
return {
condition: {
id: { op: "Equal", value: null, show: true },
creationTime: { op: "Range", value: null, show: true },
creatorUserId: { op: "Equal", value: null, show: true },
lastModificationTime: { op: "Range", value: null, show: true },
lastModifierUserId: { op: "Equal", value: null, show: true },
mmcode: { op: "Equal", value: null, show: true },
drawingNo: { op: "Equal", value: null, show: true },
name: { op: "Equal", value: null, show: true },
productCode: { op: "Equal", value: null, show: true },
status: { op: "Equal", value: null, show: true },
remark: { op: "Equal", value: null, show: true },
madeCompany: { op: "Equal", value: null, show: true },
productUrl: { op: "Equal", value: null, show: true },
productUrlList: { op: "Equal", value: null, show: true },
},
};
},
methods: {
handleClose() {
this.$emit("on-close");
},
l(key) {
key = "product_info" + "." + key;
return this.$t(key);
},
},
};
</script>
\ No newline at end of file
pages/technology/setProcess/set.vue 0 → 100644
View file @ 6d4133a0
<template>
<div class="set">
<!-- {{eid.curId}} -->
<Layout>
<Sider v-show="showMenu" width="300">
<ProductTree @on-hide="onHide" @on-select="productSearch" />
</Sider>
<div v-show="!showMenu" class="show_menu">
<a class="menu_play fr" @click="showMenuFn" title="展开">
<Icon type="ios-arrow-forward" size="24" />
</a>
</div>
<Content :class="!showMenu?'con_bord':''">
<div class="row-form">
<Input placeholder="请输入产品名称/工艺名称/工艺编号" v-model="value" v-width="300" clearable />
<Button type="primary" @click="search">查询</Button>
</div>
<Table
border
ref="selection"
:columns="columns"
:data="data1"
@on-selection-change="selectInfo"
></Table>
</Content>
</Layout>
<FooterToolbar extra v-if="footerBar">
<Row class="footer">
<Checkbox @on-change="handleSelectAll(single)" v-model="single">全选</Checkbox>
<span class="footerSpan">已选 {{selectCount}} 项</span>
&nbsp;&nbsp;&nbsp;&nbsp;
<Button type="primary" @click="modalDispatch">设置工艺</Button>
<Button @click="canselFooter">取消</Button>
</Row>
</FooterToolbar>
</div>
</template>
<script>
import Api from "./api";
import ProductTree from "@/components/page/productTree.vue"; //左侧树列表
export default {
components: {
ProductTree,
},
props: {
eid: {
curId: Number,
productingPreparationPeople: Number,
orderIds: Number,
},
},
data() {
return {
value: "",
footerBar: false,
single: false,
selectCount: 0,
selectList: [],
showMenu: false,
title: "",
name: "",
data1: [],
routingList: [],
// easySearch: {
// keys: { op: "unicode,name,code", value: null },
// },
columns: [
{ type: "selection", width: 70, align: "center" },
{
title: "#",
type: "index",
width: 70,
align: "center",
},
{
key: "code",
title: this.l("code"),
align: "left",
},
{
key: "name",
title: this.l("name"),
align: "left",
tooltip: true,
},
{
key: "phase",
title: this.l("phase"),
align: "center",
width: 100,
render: (h, params) => {
return h("state", {
attrs: {
value: params.row.phase,
code: "Process.Routing.phase",
},
});
},
},
{
key: "versionid",
title: this.l("version"),
align: "center",
width: 100,
render: (h, params) => {
return h("state", {
attrs: {
value: params.row.versionid,
code: "Process.Routing.version",
},
});
},
},
{
title: this.l("approvalStatus"),
key: "approvalStatus",
align: "center",
width: "120",
render: (h, params) => {
return h("state", {
attrs: {
value: params.row.approvalStatus,
code: "process.RoutingStatus",
},
});
},
},
{
key: "routingType",
title: this.l("routingType"),
align: "center",
width: 100,
render: (h, params) => {
return h("state", {
attrs: {
value: params.row.routingType,
code: "Process.Routing.routingType",
},
});
},
},
{
key: "drawingNo",
title: this.l("drawingNo"),
align: "left",
width: 100,
},
{
key: "productName",
title: this.l("productName"),
align: "left",
tooltip: true,
},
{
key: "departmentName",
title: this.l("departmentName"),
align: "left",
tooltip: true,
},
{
key: "isEffect",
title: this.l("isEffect"),
align: "center",
width: 80,
render: (h, params) => {
return h("state", {
attrs: {
value: params.row.isEffect,
code: "Process.Status",
},
});
},
},
],
};
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
this.getData();
},
methods: {
getData() {
let conditions = [
{
conditionalType: "In",
fieldName: "productId",
fieldValue: this.eid.curId,
},
];
let data = {
conditions: conditions,
};
Api.paged1(data).then((r) => {
this.data1 = r.result.items;
});
},
onHide() {
this.showMenu = false;
},
showMenuFn() {
this.showMenu = true;
},
productSearch(id, item, ids) {
// let where = { productId: { op: "In", value: ids } };
// this.$refs.grid.reload(where);
let conditions = [
{
conditionalType: "In",
fieldName: "productId",
fieldValue: ids.join(","),
},
];
let data = {
conditions: conditions,
};
Api.paged1(data).then((r) => {
this.data1 = r.result.items;
});
},
search() {
let conditions = [
{
conditionalType: "code,name,productName",
fieldName: "keys",
fieldValue: this.value,
},
];
let data = {
conditions: conditions,
};
Api.paged1(data).then((r) => {
this.data1 = r.result.items;
});
},
selectInfo(value) {
// console.log(value);
if (value.length > 0) {
this.footerBar = true;
} else {
this.footerBar = false;
}
this.selectList = [];
this.routingList = [];
this.selectList = value;
let name = [];
this.selectList.map((e, index) => {
name.push(e.code);
this.routingList.push({
routingHeaderId: e.id,
priority: index,
});
});
this.name = name;
this.selectCount = this.selectList.length;
// console.log(this.routingList);
},
handleSelectAll(status) {
this.$refs.selection.selectAll(status);
},
canselFooter() {
this.footerBar = false;
this.handleSelectAll(false);
},
modalDispatch() {
this.$Modal.confirm({
title: "设置工艺",
content: this.name.join(" , "),
onOk: () => {
let data = {
routingType: 1,
productingPreparationPeople: this.eid.productingPreparationPeople,
orderIds: this.eid.orderIds,
routingList: this.routingList,
};
Api.routingset(data).then((r) => {
this.$Message.success("工艺设置成功");
});
},
onCancel: () => {
this.$Message.error("取消工艺设置");
},
});
},
l(key) {
let vkey = "routingHeader" + "." + key;
return this.$t(vkey) || key;
},
},
};
</script>
<style lang="less">
.set {
font-family: Microsoft YaHei;
padding-top: 3px;
width: 100%;
.ivu-layout {
width: 100%;
// display: flex;
// display: -webkit-flex;
.ivu-layout-sider {
background: rgba(255, 255, 255, 1);
margin-right: 10px;
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
height: 89vh;
overflow: auto;
}
.ivu-layout-content {
// margin-left: 5px;
background: rgba(255, 255, 255, 1);
box-shadow: 0px 2px 10px rgba(0, 0, 0, 0.15);
overflow: auto;
padding: 10px;
height: 89vh;
}
.row-form {
margin-bottom: 10px;
}
}
.ivu-footer-toolbar-right {
margin-right: 72% !important;
}
.ivu-footer-toolbar {
background: rgba(0, 0, 0, 0.7) !important;
.footer {
color: #fff !important;
}
}
}
</style>
\ No newline at end of file
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