Skip to content

M
mes-ui
Commit f7d5a377 authored by 仇晓婷's avatar 仇晓婷
Browse files
Options

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

parents 57ecbe05 597d7f60
Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 103 deletions
assets/css/base.less
View file @ f7d5a377
......@@ -1296,6 +1296,9 @@ html [type=button] {
.detail .ivu-row .filed-col p .html p{
margin: 0 10px 0 0;
}
.con_bord {
margin: 10px 20px;
}
.lay100 {
height: calc(100vh - 105px);
background-color: #f5f6fa;
......@@ -1303,7 +1306,7 @@ html [type=button] {
padding: 5px 5px 0px 10px;
}
.con_bord {
// margin: 15px 32px;
margin: 10px 20px;
box-shadow: #c7c7c7 1px 2px 7px 3px;
}
background: rgba(245, 246, 250, 1);
......
components/page/dataGrid.vue
View file @ f7d5a377
......@@ -130,7 +130,9 @@ export default {
search: {
pageIndex: 1,
pageSize: 20,
conditions: []
conditions: [],
sortBy:null,
isDesc: true,
},
pageSizeOpts: [20, 50, 100],
tableHeight: 0,
......
layouts/basic-layout/product.vue
View file @ f7d5a377
......@@ -399,8 +399,8 @@ export default {
z-index: 99999;
left: 56%;
top: 57%;
min-width: 1084px;
// min-width: 777px;
// min-width: 1084px;
min-width: 777px;
min-height: 300px;
box-shadow: 0px 5px 17px 5px rgba(0, 0, 0, 0.28);
background: #f5f6fa;
......
pages/processManage/setProcess/index.vue
View file @ f7d5a377
......@@ -2,9 +2,9 @@
<Layout class="lay100">
<!-- <div> -->
<!-- 左侧树 -->
<Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
<!-- <Sider hide-trigger v-if="showMenu" class="menu_side" width="300"> -->
<!-- <div class="zh-tree" :style="{height:treeHeight+'px'}"> -->
<h3 class="zh-title">产品结构</h3>
<!-- <h3 class="zh-title">产品结构</h3>
<div class="zh-box">
<Input search placeholder="请输入查询条件" v-model="treeInputSearch" />
......@@ -15,7 +15,7 @@
@on-select-change="selectTreeNode"
></Tree>
</div>
</Sider>
</Sider> -->
<!-- </div> -->
<Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
<ProductTree @on-hide="onHide" @on-select="productSearch" />
......@@ -698,7 +698,7 @@ export default {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
this.initTree();
// this.initTree();
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
......@@ -738,13 +738,13 @@ export default {
this.showMenu = true;
},
productSearch(id, item, ids) {
console.log(id)
console.log(item)
console.log(ids)
// this.productId = data.join(",");
// this.tableTata(this.selectName);
// let where = { productId: { op: "In", value: ids } };
// this.$refs.grid.reload(where);
if (ids.length > 0) {
this.orderSearchForm.productId = ids.join(",");
} else {
this.orderSearchForm.productId = "-1";
this.orderSearchForm.productName = "";
}
this.easySearch(this.orderSearchForm);
},
// tab切换
tabChange(name) {
......@@ -791,12 +791,9 @@ export default {
deleted() {},
// 分页
pageChange(num) {
//console.log(num);
this.page = num;
this.orderSearchForm.SkipCount =
(num - 1) * this.orderSearchForm.MaxResultCount;
console.log(this.orderSearchForm.SkipCount);
this.orderSearchForm.SkipCount = (num - 1) * this.orderSearchForm.MaxResultCount;
// console.log(this.orderSearchForm.SkipCount);
this.loaddata(this.orderSearchForm);
},
pageSizeChange(limit) {
......@@ -807,22 +804,14 @@ console.log(this.orderSearchForm.SkipCount);
},
loaddata(params) {
var url = "";
// if(params==1||params==2){
// url =
// `${PlanUrl}/mesorder/getpagedmesordersforpdefm?ProcessUserType=` + params
// }else{
this.orderSearchForm.simpleSearch= typeof params == "string" ? params : params.simpleSearch, //快速搜索
this.orderSearchForm.ProcessUserType= this.tabstatus,
this.orderSearchForm.ProductingPreparation= this.ProductingPreparationPeople,
this.orderSearchForm.RoutingSetStatus= this.orderSearchForm.RoutingSetStatus
url =
`${PlanUrl}/mesorder/getpagedmesordersforpdefm?` +
QS.stringify(this.orderSearchForm);
// }
service.get(`${url}`).then(response => {
// console.log(response)
......@@ -873,34 +862,34 @@ console.log(this.orderSearchForm.SkipCount);
}
}
},
initTree() {
var sumData = [];
this.$http.order.getallselecttree().then(res => {
if (res.result) {
for (var i = 0; i < res.result.length; i++) {
sumData = sumData.concat(res.result[i]);
}
this.treeData = sumData;
this.data2 = JSON.parse(JSON.stringify(sumData));
} else {
this.$Message.error("加载产品树失败!");
}
});
},
selectTreeNode(value) {
console.log(value)
if (value.length > 0) {
this.ids = [];
this.getAllIds(value);
if (this.ids.length > 0) {
this.orderSearchForm.productId = this.ids.join(",");
} else {
this.orderSearchForm.productId = "-1";
this.orderSearchForm.productName = "";
}
this.easySearch(this.orderSearchForm);
}
},
// initTree() {
// var sumData = [];
// this.$http.order.getallselecttree().then(res => {
// if (res.result) {
// for (var i = 0; i < res.result.length; i++) {
// sumData = sumData.concat(res.result[i]);
// }
// this.treeData = sumData;
// this.data2 = JSON.parse(JSON.stringify(sumData));
// } else {
// this.$Message.error("加载产品树失败!");
// }
// });
// },
// selectTreeNode(value) {
// console.log(value)
// if (value.length > 0) {
// this.ids = [];
// this.getAllIds(value);
// if (this.ids.length > 0) {
// this.orderSearchForm.productId = this.ids.join(",");
// } else {
// this.orderSearchForm.productId = "-1";
// this.orderSearchForm.productName = "";
// }
// this.easySearch(this.orderSearchForm);
// }
// },
getAllIds(trees) {
trees.forEach((data, index) => {
var that = this;
......
pages/produce/taskList.vue
View file @ f7d5a377
......@@ -241,12 +241,14 @@ export default {
SkipCount: 1,
MaxResultCount: 10,
orderSearchForm: {
status: 0,
SimpleSearch: '',
productId: null, //产品id
productName: '', //产品名称
taskType: '', //任务类型
stage: '', //阶段
materialId: '', //材料
quantity: 1, //数量
guestName: '', //甲方客户
printSupply: '', //3D打印承制单位
functionaryOffice: '', //厂内责任机关
......@@ -268,7 +270,9 @@ export default {
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
urgencyLevel: null, //紧急程度
SkipCount: 1,
MaxResultCount: 10
},
mColumn:[
{ type: 'expand',width: 60,
......@@ -352,19 +356,21 @@ content="开工"
});
},
// 分页
pageChange(pageNum) {
let pageData = this.search;
pageData.SkipCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount
pageData.MaxResultCount = (pageNum - 1) * this.orderSearchForm.MaxResultCount
this.orderSearchForm.SkipCount =
(pageNum - 1) * this.orderSearchForm.MaxResultCount
// pageData.pageIndex = pageNum
this.laodePage(pageData)
this.laodePage(this.orderSearchForm)
},
pageSizeChange(val) {
let pageData = this.search;
pageData.SkipCount = 0
pageData.MaxResultCount = val
this.laodePage(pageData)
this.orderSearchForm.SkipCount = 0
this.orderSearchForm.MaxResultCount = val
this.laodePage(this.orderSearchForm)
},
laodePage(pageData){
let url = `${PlanUrl}/orderexecute/waitexecuteorderlist`;
service.post(`${url}`,pageData).then(res => {
......@@ -374,6 +380,9 @@ content="开工"
},
// 搜索
tableSearch() {
this.orderSearchForm.SkipCount = 0
this.orderSearchForm.SimpleSearch = this.searchIterms
this.laodePage(this.orderSearchForm)
},
searchModel(){
this.showModel = true;
......
pages/technology/details/index.vue
View file @ f7d5a377
......@@ -70,7 +70,7 @@ export default {
});
}
},
{ key: "taskSeq", title: this.l("taskSeq"), align: "left",width:80 },
{ key: "taskSeq", title: this.l("taskSeq"), align: "left",width:100,sortable:true },
{
key: "name",
title: this.l("name"),
......
pages/technology/details/routingqccard/index.vue
View file @ f7d5a377
......@@ -49,8 +49,9 @@ export default {
"checkParams,standard",
value: null
},
routingHeaderId: { op: "Equal", value: -1 }
routingHeaderId: { op: "Equal", value: -1 },
},
sortType: 'normal',
modal: false,
title: "新增",
detail: null,
......@@ -78,7 +79,8 @@ export default {
title: this.l("routingDetailNo"),
align: "left",
high: true,
width: 80
width: 100,
sortable:true
},
{
key: "routingDetailName",
......@@ -357,7 +359,7 @@ export default {
l(key) {
let vkey = "routing_qc_card" + "." + key;
return this.$t(vkey) || key;
}
},
}
};
</script>
......
pages/technology/details/routingsupporting/index.vue
View file @ f7d5a377
......@@ -78,7 +78,8 @@ export default {
title: this.l("routingDetailNo"),
align: "left",
high: true,
width: 80
width: 100,
sortable:true
},
{
key: "routingDetailName",
......
pages/technology/index.vue
View file @ f7d5a377
......@@ -121,30 +121,7 @@ export default {
uId: "",
columns: [
{ key: "id", title: this.$t("id"), hide: true, align: "left" },
{
key: "creationTime",
title: this.$t("creationTime"),
align: "left",
hide: true
},
{
key: "creatorUserId",
title: this.$t("creatorUserId"),
align: "left",
hide: true
},
{
key: "lastModificationTime",
title: this.$t("lastModificationTime"),
align: "left",
hide: true
},
{
key: "lastModifierUserId",
title: this.$t("lastModifierUserId"),
align: "left",
hide: true
},
{ key: "classId", title: this.l("classId"), align: "left", hide: true },
{
key: "unicode",
......@@ -244,6 +221,30 @@ export default {
width: 140,
high: true,
code: "Process.Status"
},
{
key: "creationTime",
title: this.$t("creationTime"),
align: "left",
hide: true
},
{
key: "creatorUserId",
title: this.$t("creatorUserId"),
align: "left",
hide: true
},
{
key: "lastModificationTime",
title: this.$t("lastModificationTime"),
align: "left",
hide: true
},
{
key: "lastModifierUserId",
title: this.$t("lastModifierUserId"),
align: "left",
hide: true
},
{
title: "操作",
......
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