Skip to content

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

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

parents 01e40f49 fcf4cd58
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 23 deletions
components/page/filed.vue
View file @ 87028f68
<template> <template>
<Col :span="span" class="filed-col"> <Col :span="span" class="filed-col">
<div class="label"> <div class="label">
<label v-text="name"></label> <label v-text="name"></label>
</div> </div>
<div class="value"> <div class="value">
<slot></slot> <slot></slot>
...@@ -40,7 +40,7 @@ export default { ...@@ -40,7 +40,7 @@ export default {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
line-height: 40px; line-height: 40px;
>.label { > .label {
background: #f7f7f7; background: #f7f7f7;
flex-grow: 0; flex-grow: 0;
width: 120px; width: 120px;
...@@ -49,25 +49,27 @@ export default { ...@@ -49,25 +49,27 @@ export default {
border-right: 1px solid #ddd; border-right: 1px solid #ddd;
flex-shrink: 0; flex-shrink: 0;
} }
>.value { > .value {
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
flex-grow: 1; flex-grow: 1;
padding-left: 10px; padding-left: 10px;
>div{ > div {
line-height: 30px; line-height: 30px;
} }
} }
} }
} }
} }
.new_detail { .new-detail {
.ivu-row { .ivu-row {
width: 100% !important; width: 100% !important;
.filed-col { .filed-col {
box-sizing: border-box; box-sizing: border-box;
line-height: 70px; line-height: 70px;
>.label { display: flex;
flex-direction: row;
> .label {
display: inline-block; display: inline-block;
width: 100px; width: 100px;
text-align: right; text-align: right;
...@@ -75,7 +77,7 @@ export default { ...@@ -75,7 +77,7 @@ export default {
height: 100%; height: 100%;
font-weight: bold; font-weight: bold;
} }
>p { > .value {
text-align: left; text-align: left;
height: 100%; height: 100%;
word-break: break-all; word-break: break-all;
......
components/page/inputFile.vue
View file @ 87028f68
<!--一次只能上传一个文件 -->
<template> <template>
<div> <div>
<Input v-model="newName" placeholder="请选择上传文件"> <Input v-model="newName" placeholder="请选择上传文件">
<Button v-if="view" icon="ios-eye" slot="prepend"> </Button> <Button v-if="view" icon="ios-eye" slot="prepend" @click="downFile(newName)"> </Button>
<Button type="primary" icon="ios-cloud-upload-outline" slot="append" @click="handler">上传</Button> <Button type="primary" icon="ios-cloud-upload-outline" slot="append" @click="handler">上传</Button>
</Input> </Input>
<Upload <Upload
...@@ -47,6 +46,7 @@ export default { ...@@ -47,6 +46,7 @@ export default {
this.parms, this.parms,
formatList: ["png", "jpg", "gif"], formatList: ["png", "jpg", "gif"],
newName: "", newName: "",
newPath: "",
per: 0, per: 0,
vshowPro: false vshowPro: false
}; };
...@@ -65,6 +65,10 @@ export default { ...@@ -65,6 +65,10 @@ export default {
parms: { parms: {
type: String, type: String,
default: "" default: ""
},
showButton: {
type: Boolean,
default: true
} }
}, },
methods: { methods: {
...@@ -90,6 +94,7 @@ export default { ...@@ -90,6 +94,7 @@ export default {
objImag.filePath = file.response.data.downloadPath; objImag.filePath = file.response.data.downloadPath;
filesList.push(objImag); filesList.push(objImag);
this.newName = file.response.data.downloadPath; this.newName = file.response.data.downloadPath;
this.newPath = file.response.data.downloadPath;
this.$emit("on-change", JSON.stringify(filesList)); this.$emit("on-change", JSON.stringify(filesList));
this.per = 100; this.per = 100;
setTimeout(() => { setTimeout(() => {
...@@ -137,6 +142,20 @@ export default { ...@@ -137,6 +142,20 @@ export default {
]; ];
} }
return this.formatList; return this.formatList;
},
downFile(path) {
let truePath = path.trim();
if (truePath.length > 2) {
if (
truePath.substring(0, 7).toLowerCase() == "http://" ||
truePath.substring(0, 8).toLowerCase() == "https://"
) {
window.open(truePath, "_blank");
} else {
this.fileUrlPath = this.downUrl + path;
window.open(this.fileUrlPath, "_blank");
}
}
} }
}, },
mounted() { mounted() {
...@@ -158,5 +177,4 @@ export default { ...@@ -158,5 +177,4 @@ export default {
}; };
</script> </script>
<style lang="less"> <style lang="less">
</style> </style>
\ No newline at end of file
pages/produce/execute/execute.less
View file @ 87028f68
...@@ -217,6 +217,7 @@ ...@@ -217,6 +217,7 @@
margin: 20px 72px; margin: 20px 72px;
width: 300px; width: 300px;
height: 240px; height: 240px;
border-color: #2680EB;
.ivu-card-head{ .ivu-card-head{
background: #d3e6fb; background: #d3e6fb;
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
...@@ -259,6 +260,7 @@ ...@@ -259,6 +260,7 @@
} }
.gs_card:hover { .gs_card:hover {
border-color: #2680EB; border-color: #2680EB;
box-shadow: 0px 6px 9px #484040b5;
} }
.gs_add{ .gs_add{
border: 1px dashed #2680EB; border: 1px dashed #2680EB;
...@@ -271,4 +273,43 @@ ...@@ -271,4 +273,43 @@
} }
} }
} }
}
.add_user{
.gd_userB{
border: 1px solid #ccc;
padding: 10px;
height: 440px;
overflow-x: auto;
.user_item {
max-width: 160px;
display: inline-block;
width: 160px;
height: 56px;
border-radius: 28px 4px 4px 28px;
border: 1px solid #2d8cf0;
margin: 15px 23px;
i {
font-size: 56px;
float: left;
color: #2680EB;
}
.gd_user {
padding: 6px;
}
.user_bg {
// border: 3px solid #ceb0b0;
border-radius: 25px 4px 4px 25px;
height: 54px;
background: #2680eb;
color: #fff;
i {
font-size: 56px;
color: #ffffff;
}
.gd_user {
padding: 6px;
}
}
}
}
} }
\ No newline at end of file
pages/produce/execute/taskTime/add.vue
View file @ 87028f68
<template> <template>
<div> <div class="add_user">
<Form ref="form" :model="entity" :rules="rules" :label-width="100"> <Form ref="form" :model="entity" :rules="rules" :label-width="100">
<Row> <Row>
<Col span="12"> <Col span="8">
<FormItem label="所属车间"> <FormItem label="所属车间">
<Input v-model="entity.projectNo" disabled></Input> <Select v-model="entity.che" style="width:200px">
<Option v-for="item in cityList" :value="item.value" :key="item.value">
{{ item.label }}
</Option>
</Select>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="8">
<FormItem label="所属班组"> <FormItem label="所属班组">
<Input v-model="entity.productName" disabled></Input> <Select v-model="entity.productName" style="width:200px">
<Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
</Select>
</FormItem> </FormItem>
</Col> </Col>
<Col span="12"> <Col span="8">
<FormItem label="数字"> <FormItem label="">
<InputNumber v-model="entity.outSideTime" style="width:150px;" :min="0"></InputNumber> <Input search enter-button placeholder="请输入编号" />
</FormItem> </FormItem>
</Col> </Col>
<Col span="24" class="mb20">
<div class="gd_userB">
<a class="user_item" @click="checkItem(index)" v-for="(item,index) in listMan" :key="index">
<div :class="{user_bg:item.checked}" >
<Icon type="md-contact" />
<div class="gd_user">
<span class="user_name">{{item.userName}}</span>
<span class="user_number">{{item.userCode}}</span>
</div>
</div>
</a>
</div>
</Col>
<Col span="24">
<FormItem label="分配工时">
<InputNumber :max="30" :min="0" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp;
<InputNumber :max="23" :min="0" v-model="value1"></InputNumber> 小时 &nbsp;&nbsp;&nbsp;&nbsp;
<InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟 &nbsp;&nbsp;&nbsp;&nbsp;
</FormItem>
</Col>
</Row> </Row>
</Form> </Form>
<Row> <Row>
...@@ -33,13 +59,51 @@ export default { ...@@ -33,13 +59,51 @@ export default {
data(){ data(){
return{ return{
admor:1, admor:1,
value1:1,
u_bgFlag:false,
entity: { entity: {
}, },
rules: { rules: {
outSideTime: [ outSideTime: [
{ required: true, message: "必填", type: "number", trigger: "change" } { required: true, message: "必填", type: "number", trigger: "change" }
] ]
} },
cityList:[
{
value: '车间A1',
label: '车间A1'
},{
value: '车间A2',
label: '车间A2'
},{
value: '车间A3',
label: '车间A3'
},{
value: '车间A4',
label: '车间A4'
},{
value: '车间A5',
label: '车间A5'
},
],
listMan:[
{
checked:false,
userName:'张珊珊1',
userCode:'08965481',
id: 1
},{
checked:false,
userName:'张珊珊2',
userCode:'08965482',
id: 2
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
}
],
} }
}, },
methods: { methods: {
...@@ -49,6 +113,9 @@ export default { ...@@ -49,6 +113,9 @@ export default {
handleClose(){ handleClose(){
this.$emit("on-close"); this.$emit("on-close");
}, },
checkItem(i){
this.listMan[i].checked = !this.listMan[i].checked;
},
}, },
} }
</script> </script>
\ No newline at end of file
pages/technology/details/routinghcorder/index.vue
View file @ 87028f68
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
<Input placeholder="请输入关键字更改单编号" v-model="easySearch.keys.value" /> <Input placeholder="请输入关键字更改单编号" v-model="easySearch.keys.value" v-width="260"/>
</FormItem> </FormItem>
<FormItem> <FormItem>
<Button type="primary" @click="search">查询</Button> <Button type="primary" @click="search">查询</Button>
......
pages/technology/details/routingqccard/add.vue
View file @ 87028f68
...@@ -116,7 +116,6 @@ ...@@ -116,7 +116,6 @@
<Dictionary code="QC.status" v-model="entity.status" type="radio"></Dictionary> <Dictionary code="QC.status" v-model="entity.status" type="radio"></Dictionary>
</FormItem> </FormItem>
</Col> </Col>
<!-- <!--
<files ref="refFile" :parms="parms" files singleFile /> <files ref="refFile" :parms="parms" files singleFile />
<Col :span="12"> <Col :span="12">
...@@ -299,7 +298,6 @@ export default { ...@@ -299,7 +298,6 @@ export default {
this.routingDetailList = tempD; this.routingDetailList = tempD;
}); });
}, },
l(key) { l(key) {
key = "routing_qc_card" + "." + key; key = "routing_qc_card" + "." + key;
return this.$t(key); return this.$t(key);
......
pages/technology/details/routingqccard/index.vue
View file @ 87028f68
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<Input <Input
placeholder="请输入检测要求/标准指标" placeholder="请输入检测要求/标准指标"
v-model="easySearch.keys.value" v-model="easySearch.keys.value"
v-width="200" v-width="260"
/> />
</FormItem> </FormItem>
<FormItem> <FormItem>
......
pages/technology/details/routingsupporting/index.vue
View file @ 87028f68
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<Input <Input
placeholder="请输入关键字物料名称" placeholder="请输入关键字物料名称"
v-model="easySearch.keys.value" v-model="easySearch.keys.value"
v-width="260"
/> />
</FormItem> </FormItem>
<FormItem> <FormItem>
......
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