Skip to content

M
mes-ui
Commit a04ff2eb authored by renjintao's avatar renjintao
Browse files
Options

grid

parents fbecf61c e95f6e53
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 39 deletions
pages/materiel/masterData/add.vue
View file @ a04ff2eb
...@@ -50,8 +50,10 @@ export default { ...@@ -50,8 +50,10 @@ export default {
return { return {
arr: [], arr: [],
entity: { entity: {
upId: 0, code: 0,
code: 0 categoryId: 0, //左侧树点击的id
customProperties: {},
rootCategoryId: 0 //左侧树点击的数据的最顶层id
}, },
disabled: false, disabled: false,
......
pages/materiel/masterData/api.js
View file @ a04ff2eb
...@@ -7,16 +7,16 @@ export default { ...@@ -7,16 +7,16 @@ export default {
return Api.post(`${systemUrl}/category/list`,params); return Api.post(`${systemUrl}/category/list`,params);
}, },
get(params){ get(params){
return Api.get(`${systemUrl}/category/get`,params); return Api.get(`${systemUrl}/material/get`,params);
}, },
create(params){ create(params){
return Api.post(`${systemUrl}/category/create`,params); return Api.post(`${systemUrl}/material/create`,params);
}, },
update(params){ update(params){
return Api.post(`${systemUrl}/category/update`,params); return Api.post(`${systemUrl}/material/update`,params);
}, },
delete(id) { delete(id) {
return Api.delete(`${systemUrl}/category/delete`,{params:{id:id}}); return Api.delete(`${systemUrl}/material/delete`,{params:{id:id}});
}, },
} }
\ No newline at end of file
pages/materiel/masterData/masterData.vue
View file @ a04ff2eb
...@@ -50,6 +50,7 @@ export default { ...@@ -50,6 +50,7 @@ export default {
title: "新增", title: "新增",
curId: 0, curId: 0,
detail: null, detail: null,
nodeInfo: {},
easySearch: { easySearch: {
keys: { op: "unicode,name,code", value: null } keys: { op: "unicode,name,code", value: null }
}, },
...@@ -133,10 +134,10 @@ export default { ...@@ -133,10 +134,10 @@ export default {
add() { add() {
this.curId = 0; this.curId = 0;
this.title = "新增"; this.title = "新增";
this.detail = () => import("./Add"); this.detail = () => import("./add");
this.modal = true; this.modal = true;
}, },
edit(row) {},
remove(id) { remove(id) {
this.$Modal.confirm({ this.$Modal.confirm({
title: "删除", title: "删除",
......
pages/produce/execute/ProcessCase/detail.vue
View file @ a04ff2eb
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<Filed :span="24" :name="l('title')">{{entity.title}}</Filed> <Filed :span="24" :name="l('title')">{{entity.title}}</Filed>
<Filed :span="24" :name="l('creationTime')">{{entity.creationTime}}</Filed> <Filed :span="24" :name="l('creationTime')">{{entity.creationTime}}</Filed>
<Filed :span="24" :name="l('creator')">{{entity.creator}}</Filed> <Filed :span="24" :name="l('creator')">{{entity.creator}}</Filed>
<Filed :span="12" :name="l('filePaths')"> <Filed :span="24" :name="l('filePaths')">
<files <files
ref="refFile" ref="refFile"
:parms="parms" :parms="parms"
...@@ -46,8 +46,6 @@ export default { ...@@ -46,8 +46,6 @@ export default {
}, },
methods: { methods: {
clickData(data,liUrl) { clickData(data,liUrl) {
console.log(liUrl)
console.log(data)
window.open(data, "_blank"); window.open(data, "_blank");
}, },
load(v) { load(v) {
......
pages/produce/execute/api.js
View file @ a04ff2eb
...@@ -41,6 +41,9 @@ export default { ...@@ -41,6 +41,9 @@ export default {
//刷卡交接 //刷卡交接
handon(params) { handon(params) {
return Api.post(`${PlanUrl}/orderexecutehandon/handon`, params); return Api.post(`${PlanUrl}/orderexecutehandon/handon`, params);
//工时分配--下一步人员
getentryusers(params) {
return Api.get(`${PlanUrl}/orderexecutenew/entryusers`, params);
}, },
} }
\ No newline at end of file
pages/produce/execute/execute.less
View file @ a04ff2eb
...@@ -297,7 +297,8 @@ ...@@ -297,7 +297,8 @@
float: left; float: left;
margin: 20px 72px; margin: 20px 72px;
width: 300px; width: 300px;
height: 240px; // height: 240px;
height: 180px;
border-color: #2680EB; border-color: #2680EB;
.ivu-card-head{ .ivu-card-head{
background: #d3e6fb; background: #d3e6fb;
...@@ -310,10 +311,13 @@ ...@@ -310,10 +311,13 @@
.gs_p{ .gs_p{
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
font-size: 20px;
text-align: center;
} }
.gs_time{ .gs_time{
text-align: center; text-align: center;
color: #2680EB; color: #2680EB;
line-height: 46px;
.b_size{ .b_size{
font-size: 32px; font-size: 32px;
} }
...@@ -322,9 +326,9 @@ ...@@ -322,9 +326,9 @@
background: #d3e6fb; background: #d3e6fb;
margin: 0 -16px; margin: 0 -16px;
height: 59px; height: 59px;
border-bottom-left-radius: 4px; // border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px; // border-bottom-right-radius: 4px;
border-top: 1px solid #2680eb; // border-top: 1px solid #2680eb;
a{ a{
display: inline-block; display: inline-block;
height: 59px; height: 59px;
...@@ -336,7 +340,7 @@ ...@@ -336,7 +340,7 @@
.gs_del{ .gs_del{
background: #2680EB; background: #2680EB;
color: #fff; color: #fff;
border-bottom-right-radius: 4px; // border-bottom-right-radius: 4px;
} }
} }
} }
...@@ -348,7 +352,8 @@ ...@@ -348,7 +352,8 @@
border: 1px dashed #2680EB; border: 1px dashed #2680EB;
color: #2680EB; color: #2680EB;
text-align: center; text-align: center;
line-height: 275px; // line-height: 275px;
line-height: 220px;
border-radius: 4px; border-radius: 4px;
i{ i{
font-size: 80px; font-size: 80px;
...@@ -369,13 +374,14 @@ ...@@ -369,13 +374,14 @@
height: 56px; height: 56px;
border-radius: 28px 4px 4px 28px; border-radius: 28px 4px 4px 28px;
border: 1px solid #2d8cf0; border: 1px solid #2d8cf0;
margin: 15px 23px; margin: 15px 14px;
i { i {
font-size: 56px; font-size: 56px;
float: left; float: left;
color: #2680EB; color: #2680EB;
} }
.gd_user { .gd_user {
line-height: 22px;
padding: 6px; padding: 6px;
color: #707070; color: #707070;
} }
......
pages/produce/execute/taskTime/add.vue
View file @ a04ff2eb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="add_user"> <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="8"> <!-- <Col span="8">
<FormItem label="所属车间"> <FormItem label="所属车间">
<Select v-model="entity.che" style="width:200px"> <Select v-model="entity.che" style="width:200px">
<Option v-for="item in cityList" :value="item.value" :key="item.value"> <Option v-for="item in cityList" :value="item.value" :key="item.value">
...@@ -23,25 +23,37 @@ ...@@ -23,25 +23,37 @@
<FormItem label=""> <FormItem label="">
<Input search enter-button placeholder="请输入编号" /> <Input search enter-button placeholder="请输入编号" />
</FormItem> </FormItem>
</Col> </Col> -->
<Col span="24" class="mb20"> <Col span="24" class="mb20">
<div class="gd_userB"> <FormItem label="既定人员" >
<a class="user_item" @click="checkItem(index)" v-for="(item,index) in listMan" :key="index"> <div class="gd_userB">
<div :class="{user_bg:item.checked}" > <a class="user_item" @click="checkItem(index)" v-for="(item,index) in listMan" :key="index">
<Icon type="md-contact" /> <div :class="{user_bg:item.checked}" >
<div class="gd_user"> <Icon type="md-contact" />
<span class="user_name">{{item.userName}}</span> <div class="gd_user">
<span class="user_number">{{item.userCode}}</span> <span class="user_name">{{item.userName}}</span>
<span class="user_number">{{item.userCode}}</span>
</div>
</div> </div>
</div> </a>
</a> </div>
</div> </FormItem>
</Col>
<Col span="24">
<FormItem label="添加人员" style="width:90%" >
<UserSelect
ref="userSelected"
v-model="entity.userse"
:multiple="true"
/>
<!-- :roleTitle="roleTitle" -->
</FormItem>
</Col> </Col>
<Col span="24"> <Col span="24">
<FormItem label="分配工时"> <FormItem label="分配工时" prop="setTime">
<InputNumber :max="30" :min="0" v-model="value1"></InputNumber> 天 &nbsp;&nbsp;&nbsp;&nbsp; <!-- <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="100" :min="1" v-model="value1"></InputNumber> 工时 &nbsp;&nbsp;&nbsp;&nbsp;
<InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟 &nbsp;&nbsp;&nbsp;&nbsp; <!-- <InputNumber :max="59" :min="1" v-model="value1"></InputNumber> 分钟 &nbsp;&nbsp;&nbsp;&nbsp; -->
</FormItem> </FormItem>
</Col> </Col>
</Row> </Row>
...@@ -58,9 +70,7 @@ ...@@ -58,9 +70,7 @@
export default { export default {
data(){ data(){
return{ return{
admor:1,
value1:1, value1:1,
u_bgFlag:false,
entity: { entity: {
}, },
rules: { rules: {
...@@ -68,6 +78,7 @@ export default { ...@@ -68,6 +78,7 @@ export default {
{ required: true, message: "必填", type: "number", trigger: "change" } { required: true, message: "必填", type: "number", trigger: "change" }
] ]
}, },
// roleTitle: "操作工",
cityList:[ cityList:[
{ {
value: '车间A1', value: '车间A1',
...@@ -102,6 +113,36 @@ export default { ...@@ -102,6 +113,36 @@ export default {
userName:'张珊珊3', userName:'张珊珊3',
userCode:'08965483', userCode:'08965483',
id: 3 id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
},{
checked:false,
userName:'张珊珊3',
userCode:'08965483',
id: 3
} }
], ],
} }
...@@ -116,6 +157,23 @@ export default { ...@@ -116,6 +157,23 @@ export default {
checkItem(i){ checkItem(i){
this.listMan[i].checked = !this.listMan[i].checked; this.listMan[i].checked = !this.listMan[i].checked;
}, },
testChange () { // 该方法在input内容改变是就会触发进行检测
this.numberChange(this.myNumber ) // 调用函数
},
// 封装控制小数点位数的函数
numberChange (VauleNumber) { // VauleNumber你想要控制位数的数字
let newNumber= null
if (VauleNumber >= 0) {
let reg = /.*\..*/
if (reg.test(VauleNumber)) {
newNumber= parseFloat(VauleNumber.toFixed(1))
} else {
newNumber= VauleNumber
}
}
return newNumber
}
}, },
} }
</script> </script>
\ No newline at end of file
pages/produce/execute/taskTime/index.vue
View file @ a04ff2eb
...@@ -21,16 +21,22 @@ ...@@ -21,16 +21,22 @@
</div> </div>
</div> </div>
<div class="gs_card_box"> <div class="gs_card_box">
<Card class="gs_card" v-for="i of 1" :key="i"> <Card class="gs_card" v-for="i of 8" :key="i">
<p slot="title" class="gs_title"> <p slot="title" class="gs_title">
张三 张三
<span class="fr">02816335{{i}}</span> <span class="fr">02816335{{i}}</span>
</p> </p>
<p class="gs_p">所属车间：车间A{{i}}</p> <!-- <p class="gs_p">所属车间：车间A{{i}}</p>
<p class="gs_p">所属班组：班组B{{i}}</p> <p class="gs_p">所属班组：班组B{{i}}</p> -->
<p class="gs_time"> <p class="gs_time">
<span class="b_size">100</span> 工时 <span class="b_size">100</span> 工时
</p> </p>
<!-- <p class="gs_p">
<span class="b_size">100</span> 分
</p>
<p class="gs_p">
<span class="b_size">100</span> 秒
</p> -->
<p class="gs_footer"> <p class="gs_footer">
<!-- <a class="gs_edit" @click="editItem"> <!-- <a class="gs_edit" @click="editItem">
<Icon type="md-create" /> <Icon type="md-create" />
...@@ -54,6 +60,7 @@ ...@@ -54,6 +60,7 @@
</template> </template>
<script> <script>
import addview from "./add"; import addview from "./add";
import Api from "../api";
export default { export default {
name:'starOrder', name:'starOrder',
components: {addview,}, components: {addview,},
...@@ -82,6 +89,9 @@ export default { ...@@ -82,6 +89,9 @@ export default {
methods: { methods: {
addItem(){ addItem(){
this.addmodal = true this.addmodal = true
let id = this.$route.query.id
console.log(id)
// Api.getentryusers().then()
}, },
editItem(){ editItem(){
this.$Message.success("编辑工时...") this.$Message.success("编辑工时...")
......
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