Skip to content

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

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

parents dcc121fe 15405870
Show whitespace changes
Inline Side-by-side
Showing with 255 additions and 135 deletions
package-lock.json
View file @ d2cda5bd
......@@ -5611,9 +5611,9 @@
"dev": true
},
"dayjs": {
"version": "1.8.26",
"resolved": "http://r.cnpmjs.org/dayjs/download/dayjs-1.8.26.tgz",
"integrity": "sha1-xtYszfBYynKo0Uu5OiNQEFjbnx4="
"version": "1.8.27",
"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.27.tgz",
"integrity": "sha512-Jpa2acjWIeOkg8KURUHICk0EqnEFSSF5eMEscsOgyJ92ZukXwmpmRkPSUka7KHSfbj5eKH30ieosYip+ky9emQ=="
},
"de-indent": {
"version": "1.0.2",
......@@ -8155,8 +8155,8 @@
},
"gantt-elastic-header": {
"version": "0.1.11",
"resolved": "http://r.cnpmjs.org/gantt-elastic-header/download/gantt-elastic-header-0.1.11.tgz",
"integrity": "sha1-i5/sjlFwm4L/WaA4bwZoUK5pxtE=",
"resolved": "https://registry.npmjs.org/gantt-elastic-header/-/gantt-elastic-header-0.1.11.tgz",
"integrity": "sha512-mDzraF/ZxrY9Pmp2Kjb1Hm8pFSeH2Ze5S0Lw/qiW63qyYxj0uLMp8w6xJq4rt2aB0lcHhonf0YMOjCjAk1WZfQ==",
"requires": {
"vue": "^2.6.10",
"vue-slider-component": "^3.0.31",
......
package.json
View file @ d2cda5bd
......@@ -18,7 +18,7 @@
"awe-dnd": "^0.3.4",
"better-scroll": "^1.12.1",
"cross-env": "^5.2.0",
"dayjs": "^1.8.26",
"dayjs": "^1.8.27",
"echarts": "^4.7.0",
"echarts-liquidfill": "^2.0.5",
"gantt-elastic": "^1.0.11",
......
pages/aps/dispatch/index.vue
View file @ d2cda5bd
......@@ -178,10 +178,8 @@
<Col span="8" class="dispatch_card02" v-for="(item,index) in listMan" :key="index">
<CheckboxGroup class="man_body">
<Checkbox v-model="item.checked" border class="checkUser">
<!-- <Tooltip :content="item.userName" placement="top-start"> -->
<span class="svg_name" :title="item.userName">{{item.userName}}</span>
<!-- <span class="svg">{{item.id}}</span> -->
<!-- </Tooltip> -->
</Checkbox>
</CheckboxGroup>
</Col>
......
pages/aps/stream/index.vue
View file @ d2cda5bd
......@@ -214,6 +214,7 @@ export default {
},
changeMode(a) {
this.mode = a;
this.tagTata(this.orderId);
},
//工序列表
tagTata(id) {
......@@ -223,6 +224,7 @@ export default {
u.seq = u.task_seq;
u.chaiCount = 0;
u.chai = false;
u.aps = 0;
});
this.result = r.result;
}
......@@ -277,7 +279,6 @@ export default {
//拆分工序
split(item, i) {
this.chaiModal = true;
this.curIndex = i;
this.maxnum = this.result[i].quantity - 1;
},
......@@ -285,6 +286,9 @@ export default {
okChai() {
let items = this.$u.clone(this.result);
let curItem = items[this.curIndex];
curItem.aps = this.mode;
console.log(curItem.aps);
let addItem = this.$u.clone(curItem);
curItem.quantity -= this.chaiNum;
curItem.chaiCount += 1;
......
pages/order/monitoring/index.vue
View file @ d2cda5bd
......@@ -25,7 +25,13 @@
<Record :eid="recordId" />
</Modal>
<Modal v-model="SpeedModal" title="工单信息" fullscreen footer-hide class="recordM">
<Speed :result="result" :load="loading" @on-close="clsoeSpeedModal" :executeId="dispatchExecuteId" :orderId="orderId" />
<Speed
:result="result"
:load="loading"
@on-close="clsoeSpeedModal"
:executeId="dispatchExecuteId"
:orderId="orderId"
/>
</Modal>
<Modal v-model="recycleModal" title="确定回收订单" width="600" class="suspend">
<Form ref="form" :model="recovery" :rules="rulesRecycle" :label-width="120">
......@@ -383,7 +389,10 @@ export default {
render: (h, params) => {
return h("div", { class: "action" }, [
h(
params.row.status == 5 && params.row.upSplitId == 0
(params.row.status == 5 && params.row.upSplitId == 0) ||
(params.row.status == 5 &&
params.row.upSplitId > 0 &&
params.row.splitCardStatus == 1)
? "Button"
: "", //订单状态暂停，启动
{
......@@ -408,7 +417,7 @@ export default {
""
),
h(
params.row.status == 6 && params.row.upSplitId == 0
params.row.status == 6
? "Button"
: "", //订单状态执行中，暂停
{
......@@ -434,7 +443,7 @@ export default {
""
),
h(
params.row.status == 5 && params.row.upSplitId > 0 ? "op" : "", //订单状态执行中，暂停
params.row.status == 5 && params.row.splitCardStatus == 0 ? "op" : "", //订单状态执行中，暂停
{
attrs: {
icon: "md-sync",
......@@ -542,9 +551,8 @@ export default {
}
});
},
clsoeSpeedModal()
{
this.SpeedModal=false;
clsoeSpeedModal() {
this.SpeedModal = false;
},
suspend(row) {
console.log(row);
......@@ -634,5 +642,4 @@ export default {
.ivu-btn-group {
height: 21px !important;
}
</style>
\ No newline at end of file
pages/order/monitoring/record.vue
View file @ d2cda5bd
<template>
<div class="record">
<Tabs value="name1">
<Tabs value="name1" @on-click="tabSwitch">
<TabPane label="订单暂停记录" name="name1">
<DataGrid :columns="columns" ref="grid" :action="action" :tool="false" :height="tdHeight"></DataGrid>
</TabPane>
......@@ -132,13 +132,13 @@ export default {
title: "工艺文件编号",
align: "left",
width: 200,
tooltip:true,
tooltip: true
},
{
key: "processname",
title: "工艺名称",
align: "left",
tooltip:true,
tooltip: true
},
{
key: "taskSeq",
......@@ -151,14 +151,14 @@ export default {
title: "工序名称",
align: "left",
width: 350,
tooltip:true,
tooltip: true
},
{
key: "desc",
title: "暂停原因",
align: "left",
tooltip:true,
tooltip: true
},
{
key: "creatorUserId",
......@@ -183,7 +183,7 @@ export default {
},
mounted() {
this.$refs.grid.reload(this.easySearch);
this.loadList()
this.loadList();
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
......@@ -201,7 +201,7 @@ export default {
methods: {
loadList() {
let params = {
FilterText: 'order_id="'+this.eid+'"'
FilterText: 'order_id="' + this.eid + '"'
};
Api.pauseCauseGetpaged(params)
.then(res => {
......@@ -215,6 +215,12 @@ export default {
this.$Message.error("连接失败");
});
},
tabSwitch(val) {
//tab切换
if (val == "name2") {
this.loadList();
}
},
search() {
this.$refs.grid.reload(this.easySearch);
},
......@@ -231,7 +237,7 @@ export default {
eid(v) {
this.condition.orderId.value = v;
this.$refs.grid.reload(this.condition);
this.loadList()
this.loadList();
}
}
};
......
pages/order/monitoring/speed.vue
View file @ d2cda5bd
......@@ -310,11 +310,11 @@ export default {
split(row, index) {
//工单分卡
this.getProduct(row.id);
(this.initeId = {
this.initeId = {
routingDetailId: row.detailId,
dispatchId: row.id
}),
(this.modalSplit = true);
};
this.modalSplit = true;
},
onchangeAction(val) {
//选择移入排产时显示排产模型下拉框
......@@ -353,7 +353,7 @@ export default {
.then(res => {
if (res.success) {
this.$Message.success("分卡成功");
this.$emit("on-close")
this.$emit("on-close");
} else {
this.$Message.error("分卡失败");
}
......
pages/produce/execute/ProcessCase/index.vue
View file @ d2cda5bd
......@@ -5,13 +5,10 @@
<div class="sear_btn">
<Input search class="search_box mr10" enter-button placeholder="请输入文件名" />
<a @click="allChecked" ><Icon type="md-checkbox-outline" />全选</a>
<a @click="copyCard" ><Icon type="ios-browsers-outline" />复制</a>
<a @click="deliteCard" ><Icon type="ios-trash-outline" />删除</a>
<!-- <a @click="copyCard" ><Icon type="ios-browsers-outline" />复制</a> -->
<a @click="importCard" ><Icon type="ios-log-in" />导入</a>
<a @click="exportCard" ><Icon type="ios-log-out" />导出</a>
<a @click="addCard" ><Icon type="ios-add-circle-outline" />新建</a>
<span>共 {{cardlist.length}} 个案例；</span>
<span>已选择 {{checkCards}} 个案例</span>
</div>
<a class="slip fr" @click="starFun" ><Icon type="md-swap" /></a>
</div>
......@@ -38,7 +35,8 @@
v-for="(item,index) in cardlist" :label="item.id" :key="index">
<div class="file">
<Icon type="ios-paper" v-if="item.id%3==0"/>
<Icon type="ios-film" v-else/>
<!-- <Icon type="ios-film" v-else/> -->
<Icon type="md-film" v-else/>
</div>
<div class="list">
<ul>
......@@ -49,8 +47,13 @@
</div>
</Checkbox>
</CheckboxGroup>
</div>
<FooterToolbar style="height:65px" v-show="checkCards!=0">
<span>已选择 {{checkCards}} 个案例</span>
<Button class="span ml20" type="primary" @click="deliteCard"><Icon type="ios-trash-outline" />删除</Button>
<Button class="span ml20" type="primary" @click="exportCard"><Icon type="ios-log-out" />导出</Button>
<Button @click="cancel">取消</Button>
</FooterToolbar>
</div>
</template>
<script>
......@@ -60,6 +63,7 @@ export default {
return{
caseLise:[],
checkCards:0,
footerToolbar:false,
cardlist:[
{
name:'工艺文档名称',
......@@ -252,12 +256,15 @@ export default {
addCard(){
this.$Message.success("新建工艺案例")
},
changeCards(list){
changeCards(list){//多选方法
this.checkCards = list.length
},
changeCard(value){
console.log(111)
},
cancel(){//底部取消
this.checkCards = 0;
}
},
}
</script>
pages/produce/execute/ProcessCheck/index.vue
View file @ d2cda5bd
<template>
<div class="wu_bg">
<div class="wu_top">
工艺查看
<!-- <div class="wu_top">
工艺查看 /technology/details/setup/setupDetails
</div> -->
<Layout class="tech_box">
<Header>
<div class="tech_body">
<Menu mode="horizontal" theme="light" active-name="1">
<MenuItem name="1" to="/produce/execute/ProcessCheck/setupDetails">工艺规程</MenuItem>
<MenuItem name="2" to="/produce/execute/ProcessCheck/setupDetails">作业指导书</MenuItem>
<MenuItem name="3" to="/produce/execute/ProcessCheck/setupDetails">工步导航</MenuItem>
<MenuItem name="4" to="/produce/execute/ProcessCheck/setupDetails">工艺提醒</MenuItem>
</Menu>
</div>
</Header>
<Layout class="bottom_box" >
<nuxt-child keep-alive></nuxt-child>
</Layout>
</Layout>
</div>
</template>
<script>
......
pages/produce/execute/ProcessCheck/setupDetails.vue 0 → 100644
View file @ d2cda5bd
<template>
<div class="">
<div class="">
工艺规程
</div>
</div>
</template>
<script>
export default {
name:'starOrder',
data(){
return{
starmodal: false,
}
},
created() {
// this.treeHeight = window.innerHeight - 120;
},
async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 120;
})();
};
},
methods: {
starFun(){
this.$Message.success("开工...")
},
},
}
</script>
pages/produce/execute/execute.less
View file @ d2cda5bd
......@@ -334,6 +334,48 @@
.wu_bg{
height: calc(100vh - 165px);
}
.tech_box{
height: calc(100vh - 165px);
.tech_body{
// padding: 0 20px;
.ivu-layout-header{
height: 0;
}
.ivu-menu-horizontal{
height: 40px;
line-height: 40px;
.ivu-menu-item{
width: 115px;
text-align: center;
}
a.ivu-menu-item-active::before{
content: "";
display: block;
border-width: 5px 6px 0;
border-style: solid;
border-color: #2d8cf0 transparent transparent;
width: 0;
height: 0;
position: absolute;
bottom: -6px;
left: 43%;
}
a.ivu-menu-item-active::after{
content: "";
display: block;
border-width: 4px 4px 0;
border-style: solid;
border-color: #fff transparent transparent;
width: 0;
height: 0;
position: absolute;
bottom: -4px;
left: 44%;
}
}
}
}
.case_top{
padding: 15px 70px 10px;
.sear_btn{
......@@ -355,7 +397,7 @@
}
}
.slip{
margin-right: 20px;
margin-right: 10px;
i.ivu-icon{
font-size: 32px;
transform:rotate(90deg);
......@@ -367,13 +409,13 @@
}
}
.case_box{
padding: 10px 20px;
padding: 10px 20px 44px;
height: calc(100vh - 210px);
overflow-y: auto;
.file_card{
background: #F5F6FA;
margin: 10px 50px;
width: 360px;
margin: 15px 50px;
width: 367px;
padding: 18px;
height: 110px;
line-height: 24px;
......@@ -387,7 +429,7 @@
float: left;
margin: 0 8px 0 0;
i{
font-size: 58px;
font-size: 62px;
}
}
}
......
pages/technology/details.vue
View file @ d2cda5bd
<style lang="less">
@import './technolog.less';
.details_box{
@import "./technolog.less";
.details_box {
background: #f5f7f9;
display: flex;
margin: 0 20px;
flex-direction: column;
.details_body{
.details_body {
flex-grow: 1;
// width: 561px;
text-align: center;
......@@ -17,21 +17,21 @@
border-left: 1px solid #ccc;
background: #f5f7f9;
z-index: 888;
.ivu-menu-item{
.ivu-menu-item {
width: 140px;
border-right: 1px solid #E0E0E0;
border-bottom: 1px solid #E0E0E0;
border-top: 1px solid #E0E0E0;
background: rgba(243,243,243,1);
border-right: 1px solid #e0e0e0;
border-bottom: 1px solid #e0e0e0;
border-top: 1px solid #e0e0e0;
background: rgba(243, 243, 243, 1);
}
.ivu-menu-item-active.ivu-menu-item-selected{
.ivu-menu-item-active.ivu-menu-item-selected {
background: #fff;
border-top: 2px solid #2d8cf0;
border-bottom: 1px solid #fff;
}
}
}
.bottom_box{
.bottom_box {
padding: 5px 20px;
background: white;
border: 1px solid #ccc;
......@@ -60,31 +60,32 @@
<script>
import Api from "./api";
export default {
layout:"empty",
layout: "empty",
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
headerId:-1
}
showMenu: true,
treeHeight: "",
actNum: "1",
headerId: -1
};
},
created() {
console.log("xiang",this.$route,this.router)
this.headerId=this.$route.query.id;
console.log("xiang", this.$route, this.router);
this.headerId = this.$route.query.id;
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
await store.dispatch("loadDictionary"); // 加载数据字典
},
computed: { },
methods: {
},
watch:{
}
}
mounted() {},
computed: {},
methods: {},
watch: {}
};
</script>
<style>
/* 弹框title */
.ivu-modal-header-inner {
color: #2680eb !important;
}
</style>
pages/technology/details/add.vue
View file @ d2cda5bd
<template>
<div class="details">
<Form ref="form" :model="entity" :rules="rules" :label-width="110">
<Form ref="form" :model="entity" :rules="rules" :label-width="120">
<Row>
<!--
<Col :span="12">
......@@ -75,23 +75,23 @@
-->
<Col :span="8">
<FormItem :label="l('taskSeq')" prop="taskSeq">
<InputNumber v-model="maxNum" style="width:100%"></InputNumber>
<InputNumber v-model="maxNum" style="width:235px"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input>
<Input v-model="entity.name" style="width:235px"></Input>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('equipType')" prop="equipTypeId">
<EquipSelect v-model="entity.equipTypeId" @on-change="equipChange"></EquipSelect>
<EquipSelect v-model="entity.equipTypeId" @on-change="equipChange" style="width:235px"></EquipSelect>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('resourceType')" prop="resourceType">
<!-- <Dictionary code="Process.routing_detail.resource_type" v-model="entity.resourceType"></Dictionary> -->
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange"></ResourceSelect>
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange" style="width:235px"></ResourceSelect>
</FormItem>
</Col>
<Col :span="8">
......@@ -147,14 +147,15 @@
</Col>
<Col :span="8">
<FormItem :label="l('efficiencyValue')" prop="efficiencyValue">
<InputNumber v-model="entity.efficiencyValue" style="width:100%"></InputNumber>
<InputNumber v-model="entity.efficiencyValue" style="width:235px"></InputNumber>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('singleOut')" prop="singleOut">
<InputNumber v-model="entity.singleOut" style="width:100%"></InputNumber>
<InputNumber v-model="entity.singleOut" style="width:235px"></InputNumber>
</FormItem>
</Col>
<Divider />
<Col :span="24">
<FormItem :label="l('taskContent')" prop="taskContent">
<i-quill v-model="entity.taskContent" :height="200" v-paste="handleImg" border />
......
pages/technology/details/edit.vue
View file @ d2cda5bd
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Form ref="form" :model="entity" :rules="rules" :label-width="120" class="eid-form">
<Row>
<Col :span="8">
<FormItem :label="l('taskSeq')" prop="taskSeq">
<InputNumber v-model="entity.taskSeq"></InputNumber>
<InputNumber v-model="entity.taskSeq" style="width:235px"></InputNumber >
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('name')" prop="name">
<Input v-model="entity.name"></Input>
<Input v-model="entity.name" style="width:235px"></Input>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('equipType')" prop="equipTypeId">
<EquipSelect v-model="entity.equipTypeId" @on-change="equipChange"></EquipSelect>
<EquipSelect v-model="entity.equipTypeId" @on-change="equipChange" style="width:235px"></EquipSelect>
</FormItem>
</Col>
<Col :span="8">
<FormItem :label="l('resourceType')" prop="resourceType">
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange"></ResourceSelect>
<ResourceSelect v-model="entity.resourceId" @on-change="resourceChange" style="width:235px"></ResourceSelect>
</FormItem>
</Col>
<Col :span="8">
......@@ -82,6 +82,7 @@
<InputNumber v-model="entity.singleOut"></InputNumber>
</FormItem>
</Col>
<Divider />
<Col :span="24">
<FormItem :label="l('taskContent')" prop="taskContent">
<i-quill v-model="entity.taskContent" :height="200" border v-paste="handleImg" />
......
pages/technology/details/index.vue
View file @ d2cda5bd
......@@ -5,7 +5,7 @@
<Button type="primary" @click="add">新增</Button>
</template>
</DataGrid>
<Modal v-model="modal" :title="title" width="1200" footer-hide>
<Modal v-model="modal" :title="title" width="1300" footer-hide>
<component
:is="detail"
:eid="curId"
......
pages/technology/details/setup/setupDetails/details.vue
View file @ d2cda5bd
......@@ -2,7 +2,7 @@
@import '../../../technolog.less';
</style>
<template>
<div>主材</div>
<div>主材121</div>
</template>
<script>
......
pages/technology/technolog.less
View file @ d2cda5bd
......@@ -75,13 +75,13 @@
height: 40px;
line-height: 40px;
.ivu-menu-item{
width: 97px;
width: 115px;
text-align: center;
}
a.ivu-menu-item-active::before{
content: "";
display: block;
border-width: 5px 5px 0;
border-width: 5px 6px 0;
border-style: solid;
border-color: #2d8cf0 transparent transparent;
width: 0;
......
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