Skip to content

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

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

parents e9ec59aa e0eceacd
Show whitespace changes
Inline Side-by-side
Showing with 997 additions and 71 deletions
assets/css/iview-reset.less
View file @ bbd112a3
......@@ -339,7 +339,9 @@
color: #fff;
}
}
.ivu-select-dropdown{
z-index: 910!important;
}
.manyTabs {
.ivu-tabs-bar {
position: absolute;
......
pages/aps/aps/duration.vue
View file @ bbd112a3
......@@ -38,6 +38,7 @@ export default {
return {
editDuration: null,
tempModal: false,
setTimeModal:false,
columnsDuration: [
{
key: "projectNo",
......
pages/resourceManagement/EquipmentCalendar/index.vue
View file @ bbd112a3
......@@ -5,7 +5,7 @@
<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" class="tree-content" :style="{height:treeHeight-104 +'px'}" @on-select-change="selectTreeNode"></Tree>
</div>
</div>
<!-- 右侧内容 -->
......@@ -1058,6 +1058,10 @@ export default {
.table {
margin-top: 15px;
}
.tree-content{
overflow-y: auto;
// height: 692px;
}
</style>
<style>
.single-page-con {
......
pages/technology/details.vue 0 → 100644
View file @ bbd112a3
<style lang="less">
@import './technolog.less';
</style>
<template>
<Layout class="details_box">
<Header>
<h4 class="details_top tc">
<a class="back_href" @click="back"> <Icon type="ios-undo-outline" />返回工艺规程</a>
<div>工艺信息</div>
</h4>
<div class="details_body">
<Menu mode="horizontal" theme="light" active-name="1">
<MenuItem name="1" to="/technology/details/working">工序</MenuItem>
<MenuItem name="2" to="/technology/details/controlcard">质控卡</MenuItem>
<MenuItem name="3" to="/technology/details/process">工艺BOM</MenuItem>
<MenuItem name="4" to="/technology/details/setup/setupDetails">生产准备</MenuItem>
</Menu>
</div>
</Header>
<Layout class="bottom_box" >
<nuxt-child keep-alive></nuxt-child>
</Layout>
</Layout>
</template>
<script>
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
this.$router.push({
name: "technology",
// params: { transmitData: lemData }
});
},
}
}
</script>
pages/technology/details/controlcard/index.vue 0 → 100644
View file @ bbd112a3
<style lang="less">
@import '../../technolog.less';
</style>
<template>
<div>质控卡内容</div>
</template>
<script>
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
},
}
}
</script>
pages/technology/details/index.vue
View file @ bbd112a3
<style lang="less">
@import '../technolog.less';
</style>
<template>
<Layout class="pt10 details_box">
<Header>
<h4 class="details_top tc">
<a class="back_href" @click="back"> <Icon type="ios-undo-outline" />返回工艺规程</a>
<div>工艺信息</div>
</h4>
<div class="details_body">
<Menu mode="horizontal" theme="light" active-name="1">
<MenuItem name="1">工序</MenuItem>
<MenuItem name="2" to="/technology/details/component/gongxu">质控卡</MenuItem>
<MenuItem name="3">工艺BOM</MenuItem>
<MenuItem name="4">生产准备</MenuItem>
<!-- -->
</Menu>
</div>
</Header>
<!-- <Content> -->
<Layout class="bottom_box">
<nuxt-child keep-alive></nuxt-child>
</Layout>
<!-- </Content> -->
</Layout>
<workingView></workingView>
</template>
<script>
import workingView from './working/index'
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
this.$router.push({
name: "technology",
// params: { transmitData: lemData }
});
},
}
components:{workingView},
}
</script>
<style lang="less">
.footer02 {
background: #4c5968;
opacity: 0.9;
position: absolute;
bottom: 9px;
box-shadow: 0px -5px 6px rgba(0,0,0,0.3);
width: 83%;
z-index: 99;
padding: 10px;
color: #fff;
margin: 10px 0 10px 0;
}
</style>
\ No newline at end of file
pages/technology/details/process/index.vue 0 → 100644
View file @ bbd112a3
<style lang="less">
@import '../../technolog.less';
</style>
<template>
<div>工艺BOM</div>
</template>
<script>
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
},
}
}
</script>
pages/technology/details/setup/setupDetails.vue 0 → 100644
View file @ bbd112a3
<style lang="less">
@import '../../technolog.less';
</style>
<template>
<Layout class="setdetail_box">
<Header>
<div class="setdetail_body">
<Menu mode="horizontal" theme="light" active-name="1">
<MenuItem name="1" to="/technology/details/setup/setupDetails">主材</MenuItem>
<MenuItem name="2" to="/technology/details/setup/setupDetails">辅材</MenuItem>
<MenuItem name="3" to="/technology/details/setup/setupDetails">工具</MenuItem>
<MenuItem name="4" to="/technology/details/setup/setupDetails">量具</MenuItem>
<MenuItem name="5" to="/technology/details/setup/setupDetails">工装</MenuItem>
<MenuItem name="6" to="/technology/details/setup/setupDetails">刀具</MenuItem>
<MenuItem name="7" to="/technology/details/setup/setupDetails">设备</MenuItem>
<MenuItem name="8" to="/technology/details/setup/setupDetails">NC程序</MenuItem>
<MenuItem name="9" to="/technology/details/setup/setupDetails">工艺附件</MenuItem>
</Menu>
</div>
</Header>
<Layout class="bottom_box" >
<nuxt-child keep-alive></nuxt-child>
</Layout>
</Layout>
</template>
<script>
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
this.$router.push({
name: "technology",
// params: { transmitData: lemData }
});
},
}
}
</script>
pages/technology/details/setup/setupDetails/details.vue 0 → 100644
View file @ bbd112a3
<style lang="less">
@import '../../../technolog.less';
</style>
<template>
<div>主材</div>
</template>
<script>
export default {
components: {},
data() {
return {
showMenu:true,
treeHeight: '',
actNum:'1',
}
},
created() {
this.treeHeight = window.innerHeight - 140
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
mounted() {
window.onresize = () => {
///浏览器窗口大小变化
return (() => {
this.treeHeight = window.innerHeight - 140
})()
}
},
computed: { },
methods: {
back(){
this.$router.push({
name: "technology",
// params: { transmitData: lemData }
});
},
}
}
</script>
pages/technology/details/component/gongxu.vue → pages/technology/details/working/index.vue
View file @ bbd112a3
......@@ -2,7 +2,7 @@
@import '../../technolog.less';
</style>
<template>
<div>1231323</div>
<div>工序</div>
</template>
<script>
......
pages/technology/index.vue
View file @ bbd112a3
......@@ -54,13 +54,11 @@ export default {
},
methods: {
hideMenu(){
hideMenu(){// this.$Message.info("收起左侧树")
this.showMenu = false
this.$Message.info("收起左侧树")
},
showMenuFn(){
showMenuFn(){//this.$Message.info("展开左侧树")
this.showMenu = true
this.$Message.info("展开左侧树")
},
}
}
......
pages/technology/routing_header/add.vue 0 → 100644
View file @ bbd112a3
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12"><FormItem :label="l('classId')" prop="classId"> <InputNumber v-model="entity.classId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('unicode')" prop="unicode"> <Input v-model="entity.unicode"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('name')" prop="name"> <Input v-model="entity.name"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('code')" prop="code"> <Input v-model="entity.code"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('productId')" prop="productId"> <InputNumber v-model="entity.productId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('version')" prop="version"> <Input v-model="entity.version"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('author')" prop="author"> <InputNumber v-model="entity.author"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('departmentId')" prop="departmentId"> <InputNumber v-model="entity.departmentId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('isMain')" prop="isMain"> <InputNumber v-model="entity.isMain"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('upId')" prop="upId"> <InputNumber v-model="entity.upId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('upDetailId')" prop="upDetailId"> <InputNumber v-model="entity.upDetailId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('routingType')" prop="routingType"> <InputNumber v-model="entity.routingType"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('status')" prop="status"> <Dictionary code="mes.routing_header.status" v-model="entity.status"></Dictionary>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('approvalStatus')" prop="approvalStatus"> <Dictionary code="mes.routing_header.approval_status" v-model="entity.approvalStatus"></Dictionary>
</FormItem></Col>
<Col :span="24"><FormItem :label="l('remark')" prop="remark"> <Input v-model="entity.remark" type="textarea" :rows="5"></Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('approvalStatusRemark')" prop="approvalStatusRemark"> <Input v-model="entity.approvalStatusRemark"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('auditUserId1')" prop="auditUserId1"> <Input v-model="entity.auditUserId1"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('auditUserId2')" prop="auditUserId2"> <Input v-model="entity.auditUserId2"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('platesnum')" prop="platesnum"> <InputNumber v-model="entity.platesnum"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('isEffect')" prop="isEffect"> <Input v-model="entity.isEffect"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('versionnotes')" prop="versionnotes"> <Input v-model="entity.versionnotes"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('phase')" prop="phase"> <InputNumber v-model="entity.phase"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('versionid')" prop="versionid"> <InputNumber v-model="entity.versionid"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('isSendPpm')" prop="isSendPpm"> <InputNumber v-model="entity.isSendPpm"></InputNumber>
</FormItem></Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
export default {
name: 'Add',
data() {
return {
disabled: false,
entity: {},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
},
props: {
v: Object,
eid: Number
},
methods: {
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
Api.create(this.entity).then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
} else {
this.$Message.error('保存失败')
}
}).catch(err => {
this.disabled = false;
this.$Message.error('保存失败')
console.warn(err)
})
}
})
},
handleClose() {
this.$emit('on-close')
},
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.entity.id = 0;
})
},
l(key) {
key = "routing_header" + "." + key;
return this.$t(key)
}
},
watch: {
v() {
this.entity = this.$u.clone(this.v)
},
eid(v) {
if (v > 0) {
}
}
}
}
</script>
\ No newline at end of file
pages/technology/routing_header/api.js 0 → 100644
View file @ bbd112a3
import Api from '@/plugins/request'
export default {
index:`${technologyUrl}routingheader/paged`,
paged(params){
return Api.post(`${technologyUrl}routingheader/paged`,params);
},
get(params){
return Api.get(`${technologyUrl}routingheader/get`,params);
},
create(params){
return Api.post(`${technologyUrl}routingheader/create`,params);
},
update(params){
return Api.post(`${technologyUrl}routingheader/update`,params);
},
//删除：
delete(params) {
return Api.post(`${technologyUrl}routingheader/batchdelete`,params);
}
}
\ No newline at end of file
pages/technology/routing_header/detail.vue 0 → 100644
View file @ bbd112a3
<template>
<div class="detail">
<Row>
<Filed :span="12" :name="l('classId')">{{entity.classId}}</Filed>
<Filed :span="12" :name="l('unicode')">{{entity.unicode}}</Filed>
<Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
<Filed :span="12" :name="l('code')">{{entity.code}}</Filed>
<Filed :span="12" :name="l('productId')">{{entity.productId}}</Filed>
<Filed :span="12" :name="l('version')">{{entity.version}}</Filed>
<Filed :span="12" :name="l('author')">{{entity.author}}</Filed>
<Filed :span="12" :name="l('departmentId')">{{entity.departmentId}}</Filed>
<Filed :span="12" :name="l('isMain')">{{entity.isMain}}</Filed>
<Filed :span="12" :name="l('upId')">{{entity.upId}}</Filed>
<Filed :span="12" :name="l('upDetailId')">{{entity.upDetailId}}</Filed>
<Filed :span="12" :name="l('routingType')">{{entity.routingType}}</Filed>
<Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
<Filed :span="12" :name="l('approvalStatus')">{{entity.approvalStatus}}</Filed>
<Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
<Filed :span="12" :name="l('approvalStatusRemark')">{{entity.approvalStatusRemark}}</Filed>
<Filed :span="12" :name="l('auditUserId1')">{{entity.auditUserId1}}</Filed>
<Filed :span="12" :name="l('auditUserId2')">{{entity.auditUserId2}}</Filed>
<Filed :span="12" :name="l('platesnum')">{{entity.platesnum}}</Filed>
<Filed :span="12" :name="l('isEffect')">{{entity.isEffect}}</Filed>
<Filed :span="12" :name="l('versionnotes')">{{entity.versionnotes}}</Filed>
<Filed :span="12" :name="l('phase')">{{entity.phase}}</Filed>
<Filed :span="12" :name="l('versionid')">{{entity.versionid}}</Filed>
<Filed :span="12" :name="l('isSendPpm')">{{entity.isSendPpm}}</Filed>
</Row>
</div>
</template>
<script>
import Api from './api'
export default {
name: 'Add',
data() {
return {
entity: {},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }],
code: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
},
props: {
eid: Number
},
methods: {
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.$emit('on-load')
})
},
handleClose() {
this.$emit('on-close')
},
l(key) {
key = "routing_header" + "." + key;
return this.$t(key)
}
},
watch: {
eid(v) {
if (v != 0) {
this.load(v);
}
}
}
}
</script>
\ No newline at end of file
pages/technology/routing_header/edit.vue 0 → 100644
View file @ bbd112a3
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12"><FormItem :label="l('classId')" prop="classId"> <InputNumber v-model="entity.classId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('unicode')" prop="unicode"> <Input v-model="entity.unicode"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('name')" prop="name"> <Input v-model="entity.name"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('code')" prop="code"> <Input v-model="entity.code"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('productId')" prop="productId"> <InputNumber v-model="entity.productId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('version')" prop="version"> <Input v-model="entity.version"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('author')" prop="author"> <InputNumber v-model="entity.author"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('departmentId')" prop="departmentId"> <InputNumber v-model="entity.departmentId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('isMain')" prop="isMain"> <InputNumber v-model="entity.isMain"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('upId')" prop="upId"> <InputNumber v-model="entity.upId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('upDetailId')" prop="upDetailId"> <InputNumber v-model="entity.upDetailId"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('routingType')" prop="routingType"> <InputNumber v-model="entity.routingType"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('status')" prop="status"> <Dictionary code="mes.routing_header.status" v-model="entity.status"></Dictionary>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('approvalStatus')" prop="approvalStatus"> <Dictionary code="mes.routing_header.approval_status" v-model="entity.approvalStatus"></Dictionary>
</FormItem></Col>
<Col :span="24"><FormItem :label="l('remark')" prop="remark"> <Input v-model="entity.remark" type="textarea" :rows="5"></Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('approvalStatusRemark')" prop="approvalStatusRemark"> <Input v-model="entity.approvalStatusRemark"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('auditUserId1')" prop="auditUserId1"> <Input v-model="entity.auditUserId1"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('auditUserId2')" prop="auditUserId2"> <Input v-model="entity.auditUserId2"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('platesnum')" prop="platesnum"> <InputNumber v-model="entity.platesnum"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('isEffect')" prop="isEffect"> <Input v-model="entity.isEffect"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('versionnotes')" prop="versionnotes"> <Input v-model="entity.versionnotes"> </Input>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('phase')" prop="phase"> <InputNumber v-model="entity.phase"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('versionid')" prop="versionid"> <InputNumber v-model="entity.versionid"></InputNumber>
</FormItem></Col>
<Col :span="12"><FormItem :label="l('isSendPpm')" prop="isSendPpm"> <InputNumber v-model="entity.isSendPpm"></InputNumber>
</FormItem></Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</template>
<script>
import Api from './api'
export default {
name: 'Edit',
data() {
return {
disabled: false,
entity: {
},
rules: {
name: [{ required: true, message: '必填', trigger: 'blur' }]
}
}
},
props: {
eid: Number
},
methods: {
load(v) {
Api.get({ id: v }).then(r => {
this.entity = r.result;
this.$emit('on-load')
})
},
handleSubmit() {
this.$refs.form.validate((v) => {
if (v) {
this.disabled = true;
Api.update(this.entity).then((r) => {
this.disabled = false;
if (r.success) {
this.$Message.success('保存成功')
this.$emit('on-ok')
} else {
this.$Message.error('保存失败')
}
}).catch(err => {
this.disabled = false;
this.$Message.error('保存失败')
console.warn(err)
})
}
})
},
handleClose() {
this.$emit('on-close')
},
l(key) {
key = "routing_header" + "." + key;
return this.$t(key)
}
},
watch: {
eid(v) {
if (v != 0) {
this.load(v);
}
}
}
}
</script>
\ No newline at end of file
pages/technology/routing_header/index.vue 0 → 100644
View file @ bbd112a3
<template>
<div>
<DataGrid :columns="columns" ref="grid" :action="action"><template slot="easySearch"><Form ref="formInline" :model="easySearch" inline><FormItem prop="keys"><Input placeholder="请输入关键字unicode/工艺名称/工艺编号" v-model="easySearch.keys.value" /> </FormItem>
<FormItem><Button type="primary" @click="search">查询</Button></FormItem>
</Form></template>
<template slot="searchForm">
<Search />
</template>
<template slot="buttons">
<Button type="primary" @click="add">新增</Button>
</template>
</DataGrid>
<Modal v-model="modal" :title="title" footer-hide>
<component :is="detail" :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal>
</div>
</template>
<script>
import Api from './api'
import Search from './search'
export default {
name: 'list',
components:{
Search
},
head: {
title: "&#x5DE5;&#x827A;&#x89C4;&#x7A0B;",
author: "henq",
description: "routing_header 2020/4/23 17:58:42",
},
data() {
return {
action: Api.index,
easySearch: {
keys:{op:"unicode,name,code",value:null}
},
modal: false,
title:"新增",
detail:null,
curId: 0,
columns: [
{ key:"id",title:this.l("id") ,hide:true ,align:"left" },
{ key:"creationTime",title:this.l("creationTime") ,align:"left" ,high:true },
{ key:"creatorUserId",title:this.l("creatorUserId") ,align:"left" ,high:true },
{ key:"lastModificationTime",title:this.l("lastModificationTime") ,align:"left" ,high:true },
{ key:"lastModifierUserId",title:this.l("lastModifierUserId") ,align:"left" ,high:true },
{ key:"deleterUserId",title:this.l("deleterUserId") ,align:"left" ,high:true },
{ key:"deletionTime",title:this.l("deletionTime") ,align:"left" ,high:true },
{ key:"classId",title:this.l("classId") ,align:"left" ,high:true },
{ key:"unicode",title:this.l("unicode") ,align:"left" ,easy:true ,high:true },
{ key:"name",title:this.l("name") ,align:"left" ,easy:true ,high:true },
{ key:"code",title:this.l("code") ,align:"left" ,easy:true ,high:true },
{ key:"productId",title:this.l("productId") ,align:"left" ,high:true },
{ key:"version",title:this.l("version") ,align:"left" ,high:true },
{ key:"author",title:this.l("author") ,align:"left" ,high:true },
{ key:"departmentId",title:this.l("departmentId") ,align:"left" ,high:true },
{ key:"isMain",title:this.l("isMain") ,align:"left" ,high:true },
{ key:"upId",title:this.l("upId") ,align:"left" ,high:true },
{ key:"upDetailId",title:this.l("upDetailId") ,align:"left" ,high:true },
{ key:"routingType",title:this.l("routingType") ,align:"left" ,high:true },
{ key:"status",title:this.l("status") ,align:"left" ,high:true ,code:'mes.routing_header.status' },
{ key:"approvalStatus",title:this.l("approvalStatus") ,align:"left" ,high:true ,code:'mes.routing_header.approval_status' },
{ key:"remark",title:this.l("remark") ,align:"left" ,high:true },
{ key:"approvalStatusRemark",title:this.l("approvalStatusRemark") ,align:"left" ,high:true },
{ key:"auditUserId1",title:this.l("auditUserId1") ,align:"left" ,high:true },
{ key:"auditUserId2",title:this.l("auditUserId2") ,align:"left" ,high:true },
{ key:"isDeleted",title:this.l("isDeleted") ,align:"left" ,high:true },
{ key:"platesnum",title:this.l("platesnum") ,align:"left" ,high:true },
{ key:"isEffect",title:this.l("isEffect") ,align:"left" ,high:true },
{ key:"versionnotes",title:this.l("versionnotes") ,align:"left" ,high:true },
{ key:"phase",title:this.l("phase") ,align:"left" ,high:true },
{ key:"versionid",title:this.l("versionid") ,align:"left" ,high:true },
{ key:"isSendPpm",title:this.l("isSendPpm") ,align:"left" ,high:true },
{
title: '操作',
key: 'action',
width: 140,
align: 'center',
render: (h, params) => {
return h('div', { class: "action" }, [
h('op', { attrs: { oprate: 'detail' }, on: { click: () => this.detail(params.row.id) } }, '查看'),
h('op', { attrs: { oprate: 'copy' }, on: { click: () => this.copy(params.row.id) } }, '克隆'),
h('op', { attrs: { oprate: 'edit'}, on: { click: () => this.edit(params.row.id) } }, '编辑'),
h('op', { attrs: { oprate: 'remove' }, on: { click: () => this.remove(params.row.id) } }, '删除')
])
}
},
]
}
},
mounted(){
console.log(this);
},
async fetch({ store, params }) {
await store.dispatch('loadDictionary') // 加载数据字典
},
methods:{
addOk() {
this.$refs.grid.load()
this.modal = false
this.curId = 0;
},
search() {
this.$refs.grid.reload(this.easySearch)
},
add(id) {
this.curId = 0;
this.title = "新增";
this.detail = import('./add')
this.modal = true;
},
copy(id) {
this.curId = id;
this.title = "克隆";
this.detail = import('./add')
this.modal = true;
},
detail(id) {
this.curId = id;
this.title = "详情";
this.detail = import('./detail')
this.modal = true;
},
edit(id) {
this.curId = id;
this.title = "编辑";
this.detail = import('./edit')
this.modal = true;
},
remove(id) {
this.deletelModal = true;
this.curId = id;
},
removeOk() {
Api.delete([this.curId]).then((r) => {
if (r.success) {
this.$refs.grid.load();
this.$Message.success('删除成功')
}
})
},
removeCancel() {
this.deletelModal = false;
},
cancel() {
this.curId = 0;
this.modal = false
},
l(key) {
/*
routing_header:{
id:'',
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'最近修改时间',
lastModifierUserId:'最近修改人',
deleterUserId:'上传人',
deletionTime:'删除时间',
classId:'类id',
unicode:'unicode',
name:'工艺名称',
code:'工艺编号',
productId:'产品id',
version:'版本',
author:'作者',
departmentId:'主制车间',
isMain:'主工艺',
upId:'父工艺',
upDetailId:'',
routingType:'工艺类型',
status:'状态',
approvalStatus:'审批状态',
remark:'备注',
approvalStatusRemark:'审批备注',
auditUserId1:'审批人',
auditUserId2:'审批人',
isDeleted:'是否删除',
platesnum:'板数',
isEffect:'是否有效',
versionnotes:'版本说明',
phase:'阶段',
versionid:'版本ID',
isSendPpm:'是否发送PPM',
}
*/
let vkey = "routing_header" + "." + key;
return this.$t(vkey)||key
}
}
}
</script>
<style lang="less">
</style>
\ No newline at end of file
pages/technology/routing_header/search.vue 0 → 100644
View file @ bbd112a3
<template>
<Form ref="form" :model="condition" :label-width="90">
<Row>
<Col :span="12" :v-if="condition.id.show"><FormItem :label="l('id')" prop="id"> <Input v-model="condition.id.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.creationTime.show"><FormItem :label="l('creationTime')" prop="creationTime"> <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
</FormItem></Col>
<Col :span="12" :v-if="condition.creatorUserId.show"><FormItem :label="l('creatorUserId')" prop="creatorUserId"> <Input v-model="condition.creatorUserId.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.lastModificationTime.show"><FormItem :label="l('lastModificationTime')" prop="lastModificationTime"> <DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
</FormItem></Col>
<Col :span="12" :v-if="condition.lastModifierUserId.show"><FormItem :label="l('lastModifierUserId')" prop="lastModifierUserId"> <Input v-model="condition.lastModifierUserId.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.deleterUserId.show"><FormItem :label="l('deleterUserId')" prop="deleterUserId"> <Input v-model="condition.deleterUserId.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.deletionTime.show"><FormItem :label="l('deletionTime')" prop="deletionTime"> <DatePicker type="daterange" v-model="condition.deletionTime.value"></DatePicker>
</FormItem></Col>
<Col :span="12" :v-if="condition.classId.show"><FormItem :label="l('classId')" prop="classId"> <Input v-model="condition.classId.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.unicode.show"><FormItem :label="l('unicode')" prop="unicode"> <Input v-model="condition.unicode.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.code.show"><FormItem :label="l('code')" prop="code"> <Input v-model="condition.code.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.productId.show"><FormItem :label="l('productId')" prop="productId"> <Input v-model="condition.productId.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.version.show"><FormItem :label="l('version')" prop="version"> <Input v-model="condition.version.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.author.show"><FormItem :label="l('author')" prop="author"> <Input v-model="condition.author.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.departmentId.show"><FormItem :label="l('departmentId')" prop="departmentId"> <Input v-model="condition.departmentId.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.isMain.show"><FormItem :label="l('isMain')" prop="isMain"> <Input v-model="condition.isMain.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.upId.show"><FormItem :label="l('upId')" prop="upId"> <Input v-model="condition.upId.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.upDetailId.show"><FormItem :label="l('upDetailId')" prop="upDetailId"> <Input v-model="condition.upDetailId.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.routingType.show"><FormItem :label="l('routingType')" prop="routingType"> <Input v-model="condition.routingType.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.status.show"><FormItem :label="l('status')" prop="status"> <Dictionary code="mes.routing_header.status" v-model="condition.status.value"></Dictionary>
</FormItem></Col>
<Col :span="12" :v-if="condition.approvalStatus.show"><FormItem :label="l('approvalStatus')" prop="approvalStatus"> <Dictionary code="mes.routing_header.approval_status" v-model="condition.approvalStatus.value"></Dictionary>
</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.approvalStatusRemark.show"><FormItem :label="l('approvalStatusRemark')" prop="approvalStatusRemark"> <Input v-model="condition.approvalStatusRemark.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.auditUserId1.show"><FormItem :label="l('auditUserId1')" prop="auditUserId1"> <Input v-model="condition.auditUserId1.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.auditUserId2.show"><FormItem :label="l('auditUserId2')" prop="auditUserId2"> <Input v-model="condition.auditUserId2.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.isDeleted.show"><FormItem :label="l('isDeleted')" prop="isDeleted"> <Input v-model="condition.isDeleted.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.platesnum.show"><FormItem :label="l('platesnum')" prop="platesnum"> <Input v-model="condition.platesnum.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.isEffect.show"><FormItem :label="l('isEffect')" prop="isEffect"> <Input v-model="condition.isEffect.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.versionnotes.show"><FormItem :label="l('versionnotes')" prop="versionnotes"> <Input v-model="condition.versionnotes.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.phase.show"><FormItem :label="l('phase')" prop="phase"> <Input v-model="condition.phase.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.versionid.show"><FormItem :label="l('versionid')" prop="versionid"> <Input v-model="condition.versionid.value"> </Input>
</FormItem></Col>
<Col :span="12" :v-if="condition.isSendPpm.show"><FormItem :label="l('isSendPpm')" prop="isSendPpm"> <Input v-model="condition.isSendPpm.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:false},
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},
deleterUserId:{op:"Equal",value:null,show:true},
deletionTime:{op:"Range",value:null,show:true},
classId:{op:"Equal",value:null,show:true},
unicode:{op:"Equal",value:null,show:true},
name:{op:"Equal",value:null,show:true},
code:{op:"Equal",value:null,show:true},
productId:{op:"Equal",value:null,show:true},
version:{op:"Equal",value:null,show:true},
author:{op:"Equal",value:null,show:true},
departmentId:{op:"Equal",value:null,show:true},
isMain:{op:"Equal",value:null,show:true},
upId:{op:"Equal",value:null,show:true},
upDetailId:{op:"Equal",value:null,show:true},
routingType:{op:"Equal",value:null,show:true},
status:{op:"Equal",value:null,show:true},
approvalStatus:{op:"Equal",value:null,show:true},
remark:{op:"Equal",value:null,show:true},
approvalStatusRemark:{op:"Equal",value:null,show:true},
auditUserId1:{op:"Equal",value:null,show:true},
auditUserId2:{op:"Equal",value:null,show:true},
isDeleted:{op:"Equal",value:null,show:true},
platesnum:{op:"Equal",value:null,show:true},
isEffect:{op:"Equal",value:null,show:true},
versionnotes:{op:"Equal",value:null,show:true},
phase:{op:"Equal",value:null,show:true},
versionid:{op:"Equal",value:null,show:true},
isSendPpm:{op:"Equal",value:null,show:true},
},
}
},
methods: {
handleClose() {
this.$emit('on-close')
},
l(key) {
key = "routing_header" + "." + key;
return this.$t(key)
}
}
}
</script>
\ No newline at end of file
pages/technology/technolog.less
View file @ bbd112a3
......@@ -57,21 +57,88 @@
padding: 2px 18px;
box-shadow: #98929294 2px 1px 5px 1px;
}
.product-layout .i-layout-content {
padding: 4px 10px!important;
}
.details_box{
background: #f5f7f9;
.ivu-layout-header {
height: 32px;
line-height: 37px;
}
.details_top{
height: 32px;
line-height: 32px;
position: relative;
background: #fff;
background: #f5f7f9;
border-bottom: 1px solid #ccc;
.back_href{
position: absolute;
left: 110px;
left: 20px;
top: 0;
.ivu-icon{
font-size: 20px;
}
}
}
.details_body{
// width: 561px;
text-align: center;
.ivu-menu-horizontal {
height: 50px;
line-height: 50px;
border-left: 1px solid #ccc;
background: #f5f7f9;
.ivu-menu-item{
width: 140px;
border-right: 1px solid #ccc;
border-bottom: 1px solid #ccc;
background: #f5f7f9;
}
.ivu-menu-item-active.ivu-menu-item-selected{
background: #fff;
border-top: 2px solid #2d8cf0;
border-bottom: 1px solid #fff;
}
}
}
.bottom_box{
margin-top: 50px;
padding: 5px 20px;
}
}
.setdetail_body{
// padding: 0 20px;
.ivu-layout-header{
height: 0;
}
.ivu-menu-horizontal{
height: 40px;
line-height: 40px;
a.ivu-menu-item-active::before{
content: "";
display: block;
border-width: 5px 5px 0;
border-style: solid;
border-color: #2d8cf0 transparent transparent;
width: 0;
height: 0;
position: absolute;
bottom: -6px;
left: 40%;
}
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: 41%;
}
}
}
\ No newline at end of file
plugins/request/index.js
View file @ bbd112a3
......@@ -126,10 +126,10 @@ service.interceptors.response.use(
},
error => {
if (error && error.response) {
if(error.response.status=="401"){
window.location.href = '/account/login';
return;
}
// if(error.response.status=="401"){
// window.location.href = '/account/login';
// return;
// }
switch (error.response.status) {
case 400: error.message = '请求错误'; break;
case 401: error.message = '未授权，请登录'; break;
......
static/config.js
View file @ bbd112a3
......@@ -49,6 +49,7 @@ const systemApi = {
window.iconImg = `http://${hostAddress}:3006/imgicon/`; //待办任务图标路径
window.apsManualUrl = `http://${apsAdress}:10091/api/services/app`;//aps手工排产
window.apsUrl = `http://${apsAdress}:10110/api/services/app`;//aps排产
window.technologyUrl =`http://localhost:10031/api/services/app/`;
//oidc配置：
window.authConfig = {
authority: `http://${address}:10010`,
......
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