Skip to content

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

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

parents 9231cad3 65e81f94
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1783 additions and 228 deletions
assets/css/iview-reset.less
View file @ c6783e18
......@@ -327,7 +327,7 @@
height:65px;
.ivu-footer-toolbar-right {
float: left;
padding-left: 200px;
padding-left: 280px;
}
}
}
......
components/page/dataGrid.vue
View file @ c6783e18
......@@ -102,7 +102,7 @@
</Drawer>
<FooterToolbar style="height:65px" v-if="batch" v-show="footerToolbar">
<div class="tip">
已选则{{selectItems.length}}项
已选{{selectItems.length}}项
<slot name="batch"></slot>
</div>
......
pages/aps/dispatch/index.vue
View file @ c6783e18
......@@ -17,7 +17,7 @@
</p>
<div class="dispatch_part_body" :style="{height:byheight}">
<!-- {{ids}} -->
<Row :gutter="15" class="card_body">
<Row :gutter="15" class="card_body01">
<Col span="8" class="dispatch_card" v-for="(item,index) in listTask" :key="index">
<Card>
<p slot="title" class="card_top">
......
pages/aps/plan/api.js
View file @ c6783e18
......@@ -25,4 +25,7 @@ export default {
routingdistribute(params) {//工艺派发
return Api.post(`${PlanUrl}/messchedule/routingdistribute`, params);
},
moveintoaps() {//跳转进入排产池前判断
return Api.post(`${PlanUrl}/messchedule/moveintoaps`);
},
}
\ No newline at end of file
pages/aps/plan/index.vue
View file @ c6783e18
This diff is collapsed.
pages/basicData/dataDictionary/components/add.vue 0 → 100644
View file @ c6783e18
<template>
<Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :show-message="false" :label-width="90">
<Row>
<FormItem label="类型" prop="typeid">
<Select v-model="formValidate.typeid" placeholder="请选择" style="width:240px;">
<Option v-for="(item,index) in alltype " :key="item.index" :value="item.value">{{item.label}}</Option>
</Select>
</FormItem>
</Row>
<Row>
<FormItem label="名称" prop="name">
<Input v-model="formValidate.name" style="width:240px;"></Input>
</FormItem>
</Row>
<Row>
<FormItem label="描述" prop="description">
<Input v-model="formValidate.description" style="width:240px;"></Input>
</FormItem>
</Row>
<!-- <FormItem label="编号" prop="number">
<Input v-model="formValidate.number" number></Input>
</FormItem> -->
</Form>
</template>
<script>
export default {
name:'addDictionary',
props:['alltype'],
data(){
return {
formValidate:{typeid:'',name:'',description:''},
ruleValidate:{
name:[{required: true}],
// number:[{required: true,type:'number'}],
typeid:[{required: true}]
}
}
}
}
</script>
<style scoped>
.ivu-form-item {width:48%;display:inline-block;}
.ivu-form-item:nth-child(odd) {
margin-left: 10px
}
</style>
\ No newline at end of file
pages/basicData/dataDictionary/index.vue 0 → 100644
View file @ c6783e18
<template>
<div>
<div class="contentRight">
<label>类型：</label>
<Select v-model="model1" @on-change="change" placeholder="请选择" style="width: 200px">
<Option v-for="(item,index) in selectdata" :key="item.index" :value="item.value">{{item.label}}</Option>
</Select>
<div style="float:right" class="paddingbtn">
<Button type="primary" @click="add('formValidate')">新增</Button>
<!-- <Button type="primary" @click="edit">编辑</Button>
<Button type="primary" @click="del">删除</Button> -->
</div>
<tb :tbPro="tbPro" ref="table" v-on:rowclick="rowclick" class="margin-top-10"></tb>
</div>
<Modal v-model="modal1" title="新增字典数据" :width="440" :mask-closable="false"
:loading="myloading"
ok-text="保存" cancel-text="取消" @on-ok="ok('formValidate')" @on-cancel='cancel'
>
<add-dictionary ref="datadictionary" :alltype="selectdata"></add-dictionary>
<!-- <div slot="footer" style="text-align:center">
<Button type="primary" @click="ok('formValidate')">保存</Button>
<Button
type="primary"
style="border-color: rgb(204, 204, 204);background-color:white;color:black"
@click="cancel"
>取消</Button>
</div> -->
</Modal>
<myconfirm ref="mysel" v-on:confirmok="okmysel" v-on:confirmcancel="cancelmysel"></myconfirm>
</div>
</template>
<script>
import tb from '../roleManagent/components/tb'
import addDictionary from './components/add'
import myconfirm from '../../processDesign/productTree/components/myconfirm'
import service from '@/plugins/request'
export default {
components:{tb,addDictionary,myconfirm},
data(){
return {
myloading:true,
model1:'',
modal1:false,
isEdit:false,
formValidate1:{},
keyid:0,
clickdata:{},
//xia la
selectdata:[
{
value:'产品类型',
label:'产品类型'
},
{
value:'产品分类',
label:'产品分类'
},
{
value:'工艺类型',
label:'工艺类型'
},
{
value:'工艺阶段',
label:'工艺阶段'
},
{
value:'产品型号',
label:'产品型号'
},
],
//表格数据和属性
tbPro:{
height:"",
isBorder: true,
stripe: true,//斑马纹
highlight:true,//高亮显示
columns: [
{
type: 'index',
width: 60,
align: 'center'
},
{
title: '名称',
key: 'name'
},
{
title: '描述',
key: 'description'
},
{
title: '编码',
key: 'code'
},
{
title: '操作',
key: 'action',
align: 'center',
width:400,
render: (h, params) => {
return h('div', [
h(
'span',
{
props: {
type: 'text',
ghost:true
},
style: {
color: '#249E91',
marginRight:"5px",
cursor:"pointer"
},
on: {
click: () => {
this.edit(params)
}
}
},
'编辑'
),
h(
'span',
{
props: {
type: 'text',
ghost:true
},
style: {
color: '#F56C6C',
marginRight:"5px",
cursor:"pointer"
},
on: {
click: () => {
this.del(params)
}
}
},
'删除'
)
])
}
}
],
data: [
]
}
}
},
created(){
var url=`${systemUrl}/DictionaryType/GetPaged`
service.get(`${url}`).then(response=>{
//console.log(response.data.result.items)
this.selectdata=response.data.result.items
this.model1=this.selectdata[0].value
this.loaddata(this.model1)
});
this.tbPro.height = window.innerHeight - 180;
},
mounted(){
window.onresize = () => {
return (() => {
this.tbPro.height = window.innerHeight - 180;
})()
}
},
computed:{
alldata:function(){
return this.tbPro.data
}
},
methods:{
loaddata(id){
var url=`${systemUrl}/Dictionary/GetPaged`
service.get(`${url}`,{params:{TypeId:id}}).then(response=>{
this.tbPro.data=response.data.result.items
})
},
change(data){
// console.log(data);
this.loaddata(data)
},
add:function(name){
this.isEdit=false;
var a = this.$refs.datadictionary;
a.$refs[name].resetFields();
this.modal1=true;
this.$refs.datadictionary.formValidate={typeid:'',description:'',name:''}
},
edit(params){
var a = this.$refs.datadictionary;
a.$refs['formValidate'].resetFields();
this.modal1=true;
this.isEdit=true;
let {typeId,name,description,id,code}=params.row;
// console.log(typeId)
// console.log(number);
this.$refs.datadictionary.formValidate={typeid:typeId,name:name,description:description,id:id,code:code}
},
del(params){
console.log(params)
this.keyid=params.row.id
console.log(this.keyid)
this.$refs.mysel.confirmmodal=true;
},
okmysel(bl){
var url=`${systemUrl}/Dictionary/Delete?id=${this.keyid}`
service.delete(`${url}`).then(response=>{
if(response.data.success)
{
this.$Message.success('删除成功')
this.loaddata(this.model1)
}
}).catch(error=>{
this.$Message.error('删除失败')
})
this.$refs.mysel.confirmmodal=bl
},
cancelmysel(bl){
this.$refs.mysel.confirmmodal=bl
},
//保存增加修改
ok(name){
var a = this.$refs.datadictionary;
var url=`${systemUrl}/Dictionary/CreateOrUpdate`
var ar=this.alldata.find((val)=>{
return (val.name==this.$refs.datadictionary.formValidate.name)
})
if(ar){
this.$Message.error('已存在字典项的名字');
setTimeout(() => {
this.myloading = false
this.$nextTick(() => {
this.myloading = true
})
}, 500)
return;
}
a.$refs[name].validate((valid) => {
if (valid) {
this.formValidate1 = this.$refs.datadictionary.formValidate
if (this.isedit)
{
//this.formValidate1.id=
}
service.post(`${url}`,JSON.stringify({Dictionary:this.formValidate1})).then(response=>{
if(response.data.success){
this.$Message.success('保存成功')
this.loaddata(this.model1)
this.modal1 = false
}
}).catch(error=>{
//console.log(123)
// console.log(error)
this.$Message.error('保存失败')
})
} else {
setTimeout(() => {
this.myloading = false
this.$nextTick(() => {
this.myloading = true
})
}, 500)
this.$Message.error('请输入必填项')
}
})
},
cancel(){
this.modal1=false;
},
rowclick(data,index){
console.log(typeof(data));
this.clickdata=data;
// console.log(this.clickdata);
}
}
}
</script>
<style scoped>
</style>
pages/basicData/privilegeManagent/components/add.vue 0 → 100644
View file @ c6783e18
<template id="addPRi">
<Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :show-message="false" :label-width="80" >
<FormItem label="父权限" prop="up_id">
<Select v-model="formValidate.up_id" style="width:240px;">
<Option v-for="(item,index) in list " :key="index" :value="item.value" style="display:none">{{item.label}} </Option>
<Tree v-show="isShow" :data="seldata" @on-select-change="handleSelect"></Tree>
</Select>
</FormItem>
<FormItem label="权限名称" prop="name">
<Input v-model="formValidate.name" style="width:240px;"></Input>
</FormItem>
<FormItem label="系统" prop="from_system">
<Select v-model="formValidate.from_system" @on-change="selectSys" style="width:240px;">
<Option v-for="(item,index) in allsystem " :key="index+1" :value="item.value">{{item.label}}</Option>
</Select>
</FormItem>
<FormItem label="操作类型" prop="type">
<Select v-model="formValidate.type" placeholder="请选择" style="width:240px;">
<Option value=1>菜单</Option>
<Option value=2>系统</Option>
<Option value=3>页面</Option>
</Select>
</FormItem>
<FormItem label="地址" prop="url">
<Input v-model="formValidate.url" style="width:240px;"></Input>
<!-- <Select v-model="formValidate.url" placeholder="请选择">
<Option v-for="(item,index) in allpages " :key="item.value" :value="item.value">{{item.label}}</Option>
</Select> -->
</FormItem>
<!-- <FormItem label="密级" prop="secret_class">
<Select v-model="formValidate.secret_class" placeholder="请选择" style="width:240px;">
<Option v-for="(item,index) in mijis " :key="item.value" :value="item.value">{{item.label}}</Option>
</Select>
</FormItem> -->
<FormItem label="状态" prop="status">
<Select v-model="formValidate.status" placeholder="请选择" style="width:240px;">
<Option value=0>启用</Option>
<Option value=1>禁用</Option>
</Select>
</FormItem>
<!-- <FormItem label="打开方式" prop="target">
<Select v-model="formValidate.target" placeholder="请选择" style="width:240px;">
<Option value="系统内">系统内</Option>
<Option value="新页面">新页面</Option>
</Select>
</FormItem> -->
<FormItem label="排序" prop="priority">
<Input v-model="formValidate.priority" style="width:240px;"></Input>
</FormItem>
</Form>
</template>
<script>
import service from '@/plugins/request'
export default {
name:'addPrivilege',
tit:'',
props:[
'seldata'
],
data(){
return {
formValidate:{name:'',up_id:-1,from_system:'',type:'',url:'',status:'',target:'',priority:'',secret_class:''},
ruleValidate: {
up_id:[{required: true}],
name:[{required: true}],
from_system:[{required: true}],
type:[{required: true}],
url:[{required: true}]
// priority:[ { required: true, message: '排序不能为空' },
// { type: 'number', message: '请输入排序,只能填写数字' }]
},
list:[],
isShow:true,
allsystem:[
{
value:'0',
label:'三车间MES'
},
{
value:'1',
label:'机加MES'
}
],
allpages:[
{
value:'/a/index.html',
label:'/a/index.html'
},
{
value:'/a/port.html',
label:'/a/port.html'
},
{
value:'/a/default.html',
label:'/a/default.html'
}
],
mijis:[
{
value:'机密',
label:'机密'
},
{
value:'一般',
label:'一般'
},
{
value:'内部',
label:'内部'
}
]
}
},
created(){
this.formValidate.from_system=this.allsystem[0].value
//this.gettree(this.formValidate.from_system);
},
computed:{
},
methods:{
selectSys(){
this.$emit('selectSys',this.formValidate.from_system)
},
handleSelect(data){
this.list=[];
this.list.push({label:data[0].title,value:data[0].value});
console.log(this.list);
this.formValidate.up_id=data[0].value;
},
getdata(){
return this.formValidate
}
}
}
</script>
<style scoped>
.ivu-form-item {width:48%;display:inline-block;}
.ivu-form-item:nth-child(odd) {
margin-left: 10px
}
</style>
\ No newline at end of file
pages/basicData/privilegeManagent/components/treeGrid.vue 0 → 100644
View file @ c6783e18
This diff is collapsed.
pages/basicData/privilegeManagent/index.vue 0 → 100644
View file @ c6783e18
This diff is collapsed.
pages/basicData/user/index.vue
View file @ c6783e18
......@@ -537,7 +537,7 @@ export default {
var url = `${systemUrl}/MyRole/GetRolesAsync`;
var data = [];
service.get(`${url}`, { params: { role_type: type } }).then(response => {
data = response.data.result.items;
data = response.result.items;
if (type == 1) {
this.authList = data;
}
......@@ -554,7 +554,7 @@ export default {
this.show3 = true;
var url = `${systemUrl}/MyUserRole/GetPaged`;
service.get(`${url}`, { params: { userId: id } }).then(response => {
var data = response.data.result.items;
var data = response.result.items;
var dt1 = data.filter(function(ite) {
return ite.role_type == 0;
});
......@@ -582,7 +582,7 @@ export default {
})
)
.then(response => {
if (response.data.success) {
if (response.success) {
this.$Message.success("保存成功");
this.authModel.extra = [];
this.authModel.default = [];
......
pages/dispatched/index.vue
View file @ c6783e18
......@@ -189,9 +189,9 @@ export default {
let urlget = `${PlanUrl}/dispatch/getschemes?RoutingId=` + usId +
'&IsMain=0' + order_ids
service.get(`${urlget}`).then((res) => {
if (res.data.result) {
if (res.result) {
var savedUl = []
res.data.result.map((u) => {
res.result.map((u) => {
let detailnew = {
detailId: u.routingDetailId, //工序id--后端接收
detailNumber: u.routingDetailNumber, //工序序号
......@@ -223,7 +223,7 @@ export default {
let urlList = `${designUrl}/routingdetail/getlistbyheaderid?headerID=` + usId
service.get(`${urlList}`).then((res) => {
var ul = []
res.data.result.map((u) => {
res.result.map((u) => {
let detail = {
detailId: u.id, //工序id--后端接收
detailNumber: u.task_seq,//工序序号
......
pages/implement/components/entryMovie.vue
View file @ c6783e18
......@@ -188,8 +188,8 @@ export default {
var url =
`${PlanUrl}/orderexecutemovie/getpaged?` + QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
this.moviedata = response.data.result.items
this.datatotal = response.data.result.totalCount
this.moviedata = response.result.items
this.datatotal = response.result.totalCount
})
},
onPageChanged(page_index) {
......@@ -217,7 +217,7 @@ export default {
})
)
.then((response) => {
if (response.data.success) {
if (response.success) {
this.$Message.success('保存成功')
this.procedure = false
this.cleardata()
......@@ -252,7 +252,7 @@ export default {
service
.delete(`${url}`)
.then((response) => {
if (response.data.success) {
if (response.success) {
this.$Message.success('删除成功')
this.loaddata()
} else {
......
pages/implement/components/entryPause.vue
View file @ c6783e18
......@@ -171,8 +171,8 @@ export default {
QS.stringify(this.datasearch)
service.get(`${url}`).then((response) => {
this.data1 = response.data.result.items
this.datatotal = response.data.result.totalCount
this.data1 = response.result.items
this.datatotal = response.result.totalCount
})
},
onPageChanged(page_index) {
......@@ -198,7 +198,7 @@ export default {
})
)
.then((response) => {
if (response.data.success) {
if (response.success) {
this.$Message.success('保存成功')
this.loaddata()
this.cleardata()
......
pages/implement/index.vue
View file @ c6783e18
......@@ -369,11 +369,11 @@ export default {
this.currententry = null
var url = `${PlanUrl}/orderexecute/getentrylist?ExecuteId=` + ExecuteId
service.get(`${url}`).then((response) => {
this.entryData = response.data.result.entryList
this.entryData = response.result.entryList
this.entryHistoryData = this.entryData
let data = []
for (var i = 0; i < this.entryData.length; i++) {
if (this.entryData[i].id == response.data.result.currentID) {
if (this.entryData[i].id == response.result.currentID) {
data = this.entryData[i]
this.currententry = data
this.currentID = this.entryData[i].id
......@@ -431,8 +431,8 @@ export default {
'&headerID=' +
this.data.routing_header_id
service.get(`${url}`).then((response) => {
if (response.data.result != null) {
let ordata = response.data.result
if (response.result != null) {
let ordata = response.result
for (let j = 0; j < this.data.row.length; j++) {
let obj = this.data.row[j]
var gh = ordata.filter(function(number) {
......@@ -456,9 +456,9 @@ export default {
`${designUrl}/orderbillrel/getorderbilllistbyorders?orderids=` +
this.data.orderIDs
service.get(`${url}`).then((response) => {
if (response.data.result != null) {
if (response.data.result.length > 0) {
this.loadMaterial(response.data.result)
if (response.result != null) {
if (response.result.length > 0) {
this.loadMaterial(response.result)
}
}
})
......@@ -468,9 +468,9 @@ export default {
var url =
`${designUrl}/ordermaterial/getbyid?Id=` + Bill[0].material_bill_id
service.get(`${url}`).then((response) => {
if (response.data.result != null) {
if (response.result != null) {
this.material_bill_id = Bill[0].material_bill_id
this.material_bill = response.data.result.orderMaterial
this.material_bill = response.result.orderMaterial
}
})
},
......@@ -541,7 +541,7 @@ export default {
})
)
.then((response) => {
if (response.data.success) {
if (response.success) {
this.updateentrystatus(row.id, 14)
}
})
......@@ -566,7 +566,7 @@ export default {
})
)
.then((response) => {
if (response.data.success) {
if (response.success) {
this.updateentrystatus(row.id, 14)
}
})
......
pages/produce/taskList.vue
View file @ c6783e18
......@@ -268,13 +268,12 @@ export default {
content="开工"
}else if(params.row.status==13||params.row.status==14)
{
content="查看"
content="查看"
}else if(params.row.status==6)
{
content="继续"
content="继续"
}else{
content="查看";
content="查看";
}
return h('div', { class: 'action' },[
......@@ -310,8 +309,8 @@ content="查看";
"skipCount":0,
"maxResultCount": 10
}).then(res => {
this.mDatas = res.data.result.items
this.search.total = res.data.result.totalCount
this.mDatas = res.result.items
this.search.total = res.result.totalCount
});
},
// 分页
......
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