Skip to content

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

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

parents fc0da149 c66e23ce
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 131 deletions
layouts/basic-layout/product.vue
View file @ 06208c45
......@@ -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/order/quotation/index.vue
View file @ 06208c45
<template>
<Layout class="quotation">
<!-- 左侧树 -->
<Sider hide-trigger :style="{background: '#fff'}" width="260">
<!-- <Sider hide-trigger :style="{background: '#fff'}" width="260">
<Tree-Type @func="getMsgFormSon" :style="{ height: treeHeight + 'px' }"></Tree-Type>
</Sider>
<!-- <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
</Sider> -->
<Sider hide-trigger v-if="showMenu" class="menu_side" 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> -->
</div>
<!-- 右侧内容 -->
<Content class="content" :class="!showMenu?'con_bord':''">
<Tabs v-model="selectName" @on-click="handleClick">
......@@ -397,9 +397,8 @@ export default {
this.showMenu = true;
},
productSearch(id, item, ids) {
console.log(item)
// this.productId = data.join(",");
// this.tableTata(this.selectName);
// console.log(item)
this.getMsgFormSon(ids)
// let where = { productId: { op: "In", value: ids } };
// this.$refs.grid.reload(where);
},
......@@ -407,7 +406,7 @@ export default {
this.tableTata(this.selectName);
},
getMsgFormSon(data) {
console.log(data)
// console.log(data)
this.productId = data.join(",");
this.tableTata(this.selectName);
},
......
pages/processDesign/setProcess/index.vue
View file @ 06208c45
<template>
<div>
<!-- 左侧树 -->
<!-- <div class="zh-tree" :style="{height:treeHeight+'px'}">
<div class="zh-tree" :style="{height:treeHeight+'px'}">
<h3 class="zh-title">产品结构</h3>
<div class="zh-box">
<Input search placeholder="请输入查询条件" v-model="treeInputSearch" />
......@@ -14,14 +13,6 @@
@on-select-change="selectTreeNode"
></Tree>
</div>
</div> -->
<Sider hide-trigger v-if="showMenu" class="menu_side" 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>
<!-- 右侧内容 -->
<div class="content-right">
......@@ -386,7 +377,7 @@ import orderData from './components/orderData.vue' //数据审查
import modelTable from '../Process/model.vue'
import processNew from '../Process/processNew.vue'
import service from '@/plugins/request'
import ProductTree from "@/components/page/productTree.vue";//左侧树列表
import OrderSendReview from './components/orderSendReview' //送审页面
import processview from '../Process/processview.vue'
import sendAudit from '../Process/sendAudit.vue'
......@@ -398,7 +389,7 @@ export default {
modelTable,
processNew,
orderMaterial,
OrderSendReview, ProductTree,
OrderSendReview,
processview,
sendAudit,
orderData
......@@ -407,7 +398,6 @@ export default {
return {
isview: false,
isdview: false,
showMenu: true,
ismview: false,
issendAudit: false,
createtype: 1,
......@@ -937,18 +927,6 @@ export default {
}
},
methods: {
onHide() {
// this.$Message.info("收起左侧树")
this.showMenu = false;
},
showMenuFn() {
//this.$Message.info("展开左侧树")
this.showMenu = true;
},
productSearch(id, item, ids) {
let where = { productId: { op: "In", value: ids } };
this.$refs.grid.reload(where);
},
// tab切换
tabChange(name) {
this.tabstatus = name
......
pages/processManage/setProcess/index.vue
View file @ 06208c45
<template>
<div>
<Layout class="lay100">
<!-- <div> -->
<!-- 左侧树 -->
<div class="zh-tree" :style="{height:treeHeight+'px'}">
<h3 class="zh-title">产品结构</h3>
<!-- <Sider hide-trigger v-if="showMenu" class="menu_side" width="300"> -->
<!-- <div class="zh-tree" :style="{height:treeHeight+'px'}"> -->
<!-- <h3 class="zh-title">产品结构</h3>
<div class="zh-box">
<Input search placeholder="请输入查询条件" v-model="treeInputSearch" />
......@@ -13,9 +15,18 @@
@on-select-change="selectTreeNode"
></Tree>
</div>
</Sider> -->
<!-- </div> -->
<Sider hide-trigger v-if="showMenu" class="menu_side" 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>
<!-- 右侧内容 -->
<div class="content-right">
<Content class="con" :class="!showMenu?'con_bord':''">
<div class="title_box">
<div class="table_title">
<div style="width:100px; float:left">
......@@ -235,7 +246,7 @@
@on-page-size-change="pageSizeChange"
/>
</div>
</div>
</Content>
<Modal
v-model="modal1"
:title="gymodaltitle"
......@@ -339,19 +350,18 @@
>
<processview ref="processview"></processview>
</Modal>
</div>
</Layout>
</template>
<script>
import DrawerSet from "./components/drawerSet.vue"; //抽屉列表
import TreeType from "./components/treeType.vue"; //左侧树列表
import orderMaterial from "./components/orderMaterial.vue"; //料单
import processMain from "./processMain.vue";
import processNew from "../Process/processNew.vue";
import service from "@/plugins/request";
import ProductTree from "@/components/page/productTree.vue"; //左侧树列表
import OrderSendReview from "./components/orderSendReview"; //送审页面
import processview from "../Process/processview.vue";
import sendAudit from "../Process/sendAudit.vue";
......@@ -359,7 +369,7 @@ import QS from "querystring";
export default {
components: {
DrawerSet,
TreeType,
ProductTree,
processMain,
processNew,
orderMaterial,
......@@ -369,6 +379,7 @@ export default {
},
data() {
return {
showMenu: true,
isview: false,
isdview: false,
ismview: false,
......@@ -687,7 +698,7 @@ export default {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
this.initTree();
// this.initTree();
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
......@@ -698,7 +709,7 @@ export default {
};
},
computed: {
searchList() {
searchList() {//产品树左侧
let nodeList = this.treeData;
var text = this.treeInputSearch;
var newNodeList = [];
......@@ -720,6 +731,21 @@ export default {
}
},
methods: {
onHide() {
this.showMenu = false;
},
showMenuFn() {
this.showMenu = true;
},
productSearch(id, item, ids) {
if (ids.length > 0) {
this.orderSearchForm.productId = ids.join(",");
} else {
this.orderSearchForm.productId = "-1";
this.orderSearchForm.productName = "";
}
this.easySearch(this.orderSearchForm);
},
// tab切换
tabChange(name) {
this.tabstatus = name;
......@@ -765,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) {
......@@ -780,23 +803,15 @@ console.log(this.orderSearchForm.SkipCount);
this.loaddata(this.orderSearchForm);
},
loaddata(params) {
var url = "";
// if(params==1||params==2){
// url =
// `${PlanUrl}/mesorder/getpagedmesordersforpdefm?ProcessUserType=` + params
// }else{
var url = "";
this.orderSearchForm.simpleSearch= typeof params == "string" ? params : params.simpleSearch, //快速搜索
this.orderSearchForm.ProcessUserType= this.tabstatus,
this.orderSearchForm.ProductingPreparation= this.ProductingPreparationPeople,
this.orderSearchForm.RoutingSetStatus= this.orderSearchForm.RoutingSetStatus
url =
`${PlanUrl}/mesorder/getpagedmesordersforpdefm?` +
QS.stringify(this.orderSearchForm);
// }
service.get(`${url}`).then(response => {
// console.log(response)
......@@ -847,33 +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) {
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 @ 06208c45
......@@ -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
// pageData.pageIndex = pageNum
this.laodePage(pageData)
},
pageSizeChange(val) {
let pageData = this.search;
pageData.SkipCount = 0
pageData.MaxResultCount = val
this.laodePage(pageData)
},
pageChange(pageNum) {
this.orderSearchForm.SkipCount =
(pageNum - 1) * this.orderSearchForm.MaxResultCount
// pageData.pageIndex = pageNum
this.laodePage(this.orderSearchForm)
},
pageSizeChange(val) {
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 => {
......@@ -373,8 +379,11 @@ content="开工"
});
},
// 搜索
tableSearch() {
},
tableSearch() {
this.orderSearchForm.SkipCount = 0
this.orderSearchForm.SimpleSearch = this.searchIterms
this.laodePage(this.orderSearchForm)
},
searchModel(){
this.showModel = true;
},
......
pages/resourceManagement/deviceManagementCP/components/newEquipment.vue
View file @ 06208c45
<template>
<div class="new-equipment">
<Modal v-model="modalShow" title="新增设备" width="1000" :mask-closable="false">
<Modal v-model="modalShow" :title="title" width="1000" :mask-closable="false">
<Form :model="formItem" :label-width="100" style="margin:10px;" :rules="ruleValidate">
<Row :gutter="16">
<Col span="11">
......@@ -55,39 +55,19 @@
<inputFile ref="refqcFile" v-model="imgName" :parms="qcfileparms" files />
</FormItem>
</Col>
<!-- <Col span="11" offset="1">
<FormItem label="是否关重" prop="isimportant">
<Select v-model="isimportant">
<Option :value="1">是</Option>
<Option :value="2">否</Option>
</Select>
<Col :span="12">
<FormItem label="属性">
<Checkbox v-model="property">排产资源</Checkbox>
</FormItem>
</Col> -->
</Col>
</Row>
<Row :gutter="16">
<!-- <Col span="11">
<FormItem label="能力系数">
<InputNumber
:min="0"
v-model="formItem.capability_value"
size="large"
style="width:240px"
></InputNumber>
</FormItem>
</Col> -->
<Col span="11" offset="1">
<Col span="12">
<FormItem label="位置" prop="location">
<Input v-model="formItem.location" placeholder="请输入位置"></Input>
</FormItem>
</Col>
</Row>
<Row :gutter="16">
<Col :span="12">
<FormItem label="属性">
<Checkbox v-model="property">排产资源</Checkbox>
</FormItem>
</Col>
</Row>
</Form>
<div slot="footer">
<!-- class="footers" -->
......@@ -133,7 +113,7 @@ export default {
shop_id: "",
shop_name: "",
// isimportant: 2,
location: "",
location: ""
// capability_value: 1
},
property: true,
......
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