Skip to content

M
mes-ui
Commit 08208291 authored by 周远喜's avatar 周远喜
Browse files
Options

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

parents c8ed0b19 63313342
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 101 deletions
assets/css/base.less
View file @ 08208291
......@@ -740,7 +740,7 @@ textarea::-webkit-input-placeholder {
// 纵横树的样式
.zh-tree {
position: relative;
// position: relative;
display: block;
width: 250px;
float: left;
......@@ -762,15 +762,15 @@ textarea::-webkit-input-placeholder {
}
.zh-box {
height: 100%-210px;
width: 100%;
overflow-y: auto;
height: 100%;
// overflow-y: auto;
padding: 15px;
margin-bottom: -5000px;
padding-bottom: 5000px;
// margin-bottom: -5000px;
// padding-bottom: 5000px;
// .tree-content {
// //color:#fff;
// overflow-y: auto;
// }
}
}
......
components/modalTree/technologyTree.vue
View file @ 08208291
......@@ -8,8 +8,7 @@
:type="expand ? 'md-arrow-dropright' : 'md-arrow-dropdown'"
size="16"
@click="toggle"
title="展开/合并"
/>
title="展开/合并"/>
</Button>
<Button>
<Icon type="md-refresh" size="16" @click="loadTree" title="刷新" />
......
package-lock.json
View file @ 08208291
......@@ -8774,8 +8774,7 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
"dev": true,
"optional": true
"dev": true
},
"figures": {
"version": "2.0.0",
......@@ -8803,7 +8802,6 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"optional": true,
"requires": {
"ansi-regex": "^3.0.0"
}
......@@ -9454,8 +9452,7 @@
"dependencies": {
"deepmerge": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
"integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
"bundled": true
}
}
},
......@@ -15222,8 +15219,7 @@
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true,
"optional": true
"dev": true
},
"rx-lite-aggregates": {
"version": "4.0.8",
......@@ -18450,8 +18446,7 @@
},
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"optional": true
"bundled": true
},
"aproba": {
"version": "1.2.0",
......@@ -18488,8 +18483,7 @@
},
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"optional": true
"bundled": true
},
"concat-map": {
"version": "0.0.1",
......@@ -18498,8 +18492,7 @@
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"optional": true
"bundled": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -18602,8 +18595,7 @@
},
"inherits": {
"version": "2.0.4",
"bundled": true,
"optional": true
"bundled": true
},
"ini": {
"version": "1.3.5",
......@@ -18613,7 +18605,6 @@
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -18626,20 +18617,17 @@
"minimatch": {
"version": "3.0.4",
"bundled": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
},
"minimist": {
"version": "0.0.8",
"bundled": true,
"optional": true
"bundled": true
},
"minipass": {
"version": "2.9.0",
"bundled": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.2",
"yallist": "^3.0.0"
......@@ -18656,7 +18644,6 @@
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -18737,8 +18724,7 @@
},
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"optional": true
"bundled": true
},
"object-assign": {
"version": "4.1.1",
......@@ -18748,7 +18734,6 @@
"once": {
"version": "1.4.0",
"bundled": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -18824,8 +18809,7 @@
},
"safe-buffer": {
"version": "5.1.2",
"bundled": true,
"optional": true
"bundled": true
},
"safer-buffer": {
"version": "2.1.2",
......@@ -18855,7 +18839,6 @@
"string-width": {
"version": "1.0.2",
"bundled": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......@@ -18873,7 +18856,6 @@
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
......@@ -18912,13 +18894,11 @@
},
"wrappy": {
"version": "1.0.2",
"bundled": true,
"optional": true
"bundled": true
},
"yallist": {
"version": "3.1.1",
"bundled": true,
"optional": true
"bundled": true
}
}
},
......
pages/mesPlan/add.vue
View file @ 08208291
......@@ -37,7 +37,6 @@
</Col>
</Row>
<Row>
<Col span="8">
<FormItem label="数量" style="width:100%" prop="quantity">
<InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
......@@ -72,7 +71,7 @@
<Input v-model="orderSearchForm.projectNumber" style="width:240px" />
</FormItem>
</Col>
<Col span="8">
<Col span="8">
<FormItem label="批次号" style="width:100%">
<Input v-model="orderSearchForm.batchNumber" style="width:240px" />
</FormItem>
......@@ -90,7 +89,7 @@
<Row>
<Col span="24">
<FormItem label="任务节点要求" style="width:100%">
<Input v-model="orderSearchForm.taskRequire" placeholder />
<Input v-model="orderSearchForm.taskRequire" placeholder />
</FormItem>
</Col>
<Col span="24">
......@@ -169,20 +168,20 @@ export default {
type: "number",
trigger: "change"
}
],
]
},
disabled:false,
disabled: false
};
},
mounted(){
this.loadTree()
mounted() {
this.loadTree();
},
methods: {
handleSubmit() {
this.$refs.formValidate.validate(v => {
if (v) {
this.disabled = true;
this.orderSearchForm.status=1
this.orderSearchForm.status = 1;
Api.mesplancreate(this.orderSearchForm)
.then(r => {
this.disabled = false;
......@@ -202,7 +201,7 @@ export default {
});
},
handleClose() {
this.resetFields()
this.resetFields();
this.$emit("on-close");
},
l(key) {
......@@ -225,33 +224,20 @@ export default {
}
},
resetFields() {
this.orderSearchForm = {
productId: null, //产品id
productName: "", //产品名称
drawnNumber: null, //图号
taskType: null, //任务类型
stage: null, //阶段
materialId: null, //材料
quantity: 1, //数量
guestName: "", //甲方客户
printSupply: "", //3D打印承制单位
functionaryOffice: "", //厂内责任机关
mainDepartmentId: "", //厂内责任主体部门ID
taskRequire: "", //任务接点要求
putintDocmentCode: "", //甲方投产输入文件编号
technologyDocmentCode: "", //甲方技术输入文件编号
outerDrawnNumber: "", //外部图号/模型号
modelVersion: "", //模型版本
taskCode: "", //甲方任务号
designer: "", //甲方设计人员
officeFunctionary: "", //厂内机关负责人
mainRoutingPeople: "", //厂内主工艺人员
routing_Method: null, //工艺方法
outer_Envelope_Size: "", //包装尺寸
demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间
remark: "" //备注
};
this.orderSearchForm = {
productId: null, //产品id
productName: "", //产品名称
drawnNumber: null, //图号
taskType: null, //任务类型
quantity: 1, //数量
taskRequire: "", //任务接点要求
demandStartDate: this.getFormatDate(nowDate), //开始时间
demandFinishDate: this.getFormatDateEnd(tomorrowDate), //完成时间
remark: "", //备注
projectNumber: "", //项目号
batchNumber: "", //批次号
urgencyLevel: null //紧急程度
};
},
loadTree() {
//打开新增订单窗口加载产品
......@@ -312,7 +298,8 @@ export default {
"-" +
this.p(d.getMonth() + 1) +
"-" +
this.p(d.getDate())+ " 00:00:01";
this.p(d.getDate()) +
" 00:00:01";
return resDate;
},
getFormatDateEnd(dates) {
......@@ -322,13 +309,14 @@ export default {
"-" +
this.p(d.getMonth() + 1) +
"-" +
this.p(d.getDate())+ " 23:59:59";
this.p(d.getDate()) +
" 23:59:59";
return resDate;
},
p(s) {
return s < 10 ? "0" + s : s;
}
//时间相关end
//时间相关end
}
};
</script>
pages/qc/check/waitReview/index.vue
View file @ 08208291
......@@ -200,7 +200,7 @@ export default {
"certificateUploadPath": this.setNumForm.imgName,
};
service.post(`${url}`,parmse).then((res) => {
if(res.status == 200){
if(res.success){
this.$Message.success('订单已复验。')
this.detailModal = false;
this.$refs.grid.load()
......
pages/qc/dataTrace/components/reviewCount.vue
View file @ 08208291
......@@ -9,15 +9,15 @@
<MenuItem name="2" replace>
主工艺
</MenuItem>
<MenuItem name="3" replace>
<!-- <MenuItem name="3" replace>
专业工艺
</MenuItem>
</MenuItem> -->
</Menu>
</Col>
<Col span="20" class="revieweBox">
<basicView ref="basicView" :baseData="basicData" v-show="basicmodal"/>
<mainView ref="mainView" :baseData="basicData" v-show="mainmodal" />
<dispatched ref="dispatched" :baseData="basicData" v-show="dispatchedmodal"/>
<!-- <dispatched ref="dispatched" :baseData="basicData" v-show="dispatchedmodal"/> -->
</Col>
</Row>
</div>
......@@ -66,7 +66,7 @@ export default {
loaddata(pamasId){
this.basicmodal=true;
this.mainmodal= false;
this.dispatchedmodal= false;
// this.dispatchedmodal= false;
// console.warn(pamasId) 获取主工艺信息 10030
let url = `${designUrl}/orderrouting/getordersheaderinfo?orderId=` + pamasId;
if(pamasId){
......@@ -161,18 +161,19 @@ export default {
if(v==2){
this.basicmodal= false;
this.mainmodal= true;
this.dispatchedmodal= false;
// this.dispatchedmodal= false;
this.$refs.mainView.getqc(this.mainexecuteid);
}else if(v==3){
this.basicmodal= false;
this.mainmodal= false;
this.dispatchedmodal= true;
 this.$refs.dispatched.getqc(this.disexecuteid);
}else{
}
// else if(v==3){
// this.basicmodal= false;
// this.mainmodal= false;
// // this.dispatchedmodal= true;
//  this.$refs.dispatched.getqc(this.disexecuteid);
// }
else{
this.basicmodal= true;
this.mainmodal= false;
this.dispatchedmodal= false;
// this.dispatchedmodal= false;
}
},
},
......
pages/resourceManagement/deviceManagementCP/index.vue
View file @ 08208291
......@@ -5,7 +5,10 @@
<h3 class="zh-title">组织架构</h3>
<div class="zh-box">
<Input search placeholder="请输入查询条件" clearable v-model="treeInputSearch" />
<Tree :data="searchList" class="tree-content" @on-select-change="selectTreeNode"></Tree>
<Tree :data="searchList"
:style="{height:(treeHeight-115)+'px'}"
style="overflow-y:auto;overflow-x:hiden;width:215px;"
@on-select-change="selectTreeNode"></Tree>
</div>
</div>
<!-- 右侧内容 -->
......@@ -572,8 +575,8 @@ export default {
"op",
{
attrs: {
oprate: "detail",
class: "edit",
oprate: "edit",
// class: "edit",
title: "编辑"
},
on: {
......@@ -1068,11 +1071,9 @@ export default {
this.formItemMain1.actual_finish = this.atimee;
this.formItemMain1.failure_notes = this.failurenotes;
}
console.log(this.formItemMain1.plan_start);
},
saveOkBack() {
// console.log(str);
let url = `${systemUrl}/equipmaintainplan/createorupdate`;
let paramsdata = {
id: this.eid1,
......
pages/resourceManagement/productionResources/index.vue
View file @ 08208291
......@@ -43,7 +43,7 @@
</template>
</DataGrid>
<Modal v-model="editModal" title="编辑" footer-hide>
<Modal v-model="editModal" title="设置日历" footer-hide>
<Set :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
......
pages/resourceManagement/productionResources/set.vue
View file @ 08208291
......@@ -97,8 +97,8 @@ export default {
Api.get({ id: v }).then(r => {
this.formItem.equip_name = r.result.title;
this.formItem.equip_id = r.result.code;
this.formItem1.equip_pk = r.result.id;
this.formItem2.equip_pk = r.result.id;
this.formItem1.calendarwork_pk = r.result.calKey;
this.formItem2.calendarovertime_pk = r.result.holidayKey;
});
},
handleSubmit() {
......
pages/technology/details.vue
View file @ 08208291
......@@ -58,6 +58,7 @@
</template>
<script>
import Api from "./api";
export default {
layout:"empty",
components: {},
......
pages/technology/details/routingqccard/index.vue
View file @ 08208291
<template>
<div>
{{info}}
<DataGrid :columns="columns" ref="grid" :action="action">
<template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline>
......@@ -39,6 +40,9 @@ export default {
author: "henq",
description: "routing_qc_card 4/27/2020 10:31:00 AM"
},
props: {
info: { type: String }
},
data() {
return {
action: Api.index,
......
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