Skip to content

M
mes-ui
Commit 1781a29a authored by 康振飞's avatar 康振飞
Browse files
Options

工单列表状态筛选

parent 62ba4b0e
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 26 deletions
pages/produce/execute/components/orderlist.vue
View file @ 1781a29a
...@@ -15,14 +15,26 @@ ...@@ -15,14 +15,26 @@
<div class="card_box"> <div class="card_box">
<Card class="card_order" v-for="(item,index) in listTasks" <Card class="card_order" v-for="(item,index) in listTasks"
@click.native="goPage(item)" :key="index" @click.native="goPage(item)" :key="index"
:class="item.status=='未开工'? 'card_border1' : (item.status=='执行中' ? 'card_border2': (item.status=='暂停中' ?'card_border3': :class="item.status==12 ? 'card_border1' : (item.status==14 ? 'card_border2': (item.status==5 ?'card_border3':
(item.status=='交检中'?'card_border4':(item.status=='交接中'?'card_border5':''))))" (item.status==7?'card_border4':(item.status==-1?'card_border5':''))))"
> >
<p slot="title">{{item.mesCode}} <span class="fr" >{{item.status}}</span></p>
<!-- :class="item.status=='未开工'? 'card_border1' : (item.status=='执行中' ? 'card_border2': (item.status=='暂停中' ?'card_border3':
(item.status=='交检中'?'card_border4':(item.status=='交接中'?'card_border5':''))))" -->
<p slot="title">{{item.mesCode}}
<state
code="taskList.status"
ref="state" class="fr"
:value="item.status"
type="text"
></state>
<!-- <span >{{item.status}}</span> -->
</p>
<p class="order_tit">{{item.productName}}</p> <p class="order_tit">{{item.productName}}</p>
<p><Icon type="ios-pricetags" />{{item.taskName}}</p> <p><Icon type="ios-pricetags" />{{item.taskName}}</p>
<p>{{item.beginTime}}~{{item.endTime}}</p> <p>{{item.beginTime}}~{{item.endTime}}</p>
</Card> </Card>
<p>共 {{listTasks.length}} 个工单</p>
</div> </div>
</div> </div>
</template> </template>
...@@ -59,6 +71,7 @@ export default { ...@@ -59,6 +71,7 @@ export default {
}, },
], ],
listTasks:[], listTasks:[],
dataLength:0,
} }
}, },
created() { created() {
...@@ -71,13 +84,13 @@ export default { ...@@ -71,13 +84,13 @@ export default {
isAsc: true isAsc: true
} }
Api.getCardList(parmse).then(res=>{ Api.getCardList(parmse).then(res=>{
console.log(res)
if(res.success){ if(res.success){
this.listTasks = res.result this.listTasks = res.result
this.dataLength = res.result.length
// let len = res.result.length;
// this.$emit('getListLength',len)
} }
console.warn(this.listTasks)
}) })
// this.listTasks = this.listTask
}, },
gnFunto(number,type){ gnFunto(number,type){
this.gnFlag = number this.gnFlag = number
...@@ -101,5 +114,8 @@ export default { ...@@ -101,5 +114,8 @@ export default {
} }
}, },
}, },
watch:{
},
} }
</script> </script>
\ No newline at end of file
pages/produce/execute/execute.less
View file @ 1781a29a
...@@ -109,15 +109,20 @@ ...@@ -109,15 +109,20 @@
border: none; border: none;
.header { .header {
height: 34px; height: 34px;
line-height: 22px;
margin: 0 -16px; margin: 0 -16px;
padding: 0 15px 0; padding: 0 15px 0;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
.select_star{
margin-top: -6px;
}
.openAll{ .openAll{
margin: 0 0 0 55px; margin: 0 0 0 55px;
} }
} }
.select_t{ .select_t{
padding: 15px 0 0 0; padding: 15px 0 0 0;
text-align: right;
} }
} }
.ivu-drawer-body { .ivu-drawer-body {
......
pages/produce/execute/index.vue
View file @ 1781a29a
...@@ -15,14 +15,25 @@ ...@@ -15,14 +15,25 @@
:inner="true" :transfer="false" v-model="orderlistMode"> :inner="true" :transfer="false" v-model="orderlistMode">
<div slot="header"> <div slot="header">
<div class="header"> <div class="header">
<span class="gd_tt">工单列表</span> <a class="gd_tt" @click="goToOrder"><Icon type="ios-undo-outline" />工单列表</a>
<a class="openAll"><Icon type="ios-list" size="18" /> 展开全部列表</a> <Select v-model="odermodel" class="select_star fr" style="width:100px" @on-change="searchOrder">
<Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }}
<!-- <state
code="taskList.status"
ref="state" class="fr"
:value="item.value"
type="text"
></state> -->
</Option>
</Select>
<!-- <a class="openAll"><Icon type="ios-list" size="18" /> 展开全部列表</a> -->
</div> </div>
<div class="select_t"> <div class="select_t">
<Select v-model="odermodel" style="width:100px" @on-change="searchOrder"> <!-- <Select v-model="odermodel" style="width:100px" @on-change="searchOrder">
<Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }}</Option> <Option v-for="item in oderList" :value="item.value" :key="item.index">{{ item.label }}</Option>
</Select> </Select> -->
<Button class="fr">时间正序排列</Button> <!-- <span class="gd_length">{{listLength}}</span> -->
<Button class="">时间正序排列</Button>
</div> </div>
</div> </div>
<orderlist ref="orderlist"/> <orderlist ref="orderlist"/>
...@@ -43,52 +54,70 @@ export default { ...@@ -43,52 +54,70 @@ export default {
orderTitle:'进度汇报', orderTitle:'进度汇报',
orderindex:0, orderindex:0,
gdId:0, gdId:0,
listLength:0,//工单数量
starmodal: true, starmodal: true,
orderlistMode:false, orderlistMode:false,
functionalMode:false, functionalMode:false,
detail: null, detail: null,
odermodel:'全部', odermodel: -9,
oderList:[ oderList:[
{ {
value: '全部', value: -9,
label: '全部' label: '全部'
},{ },{
value: '未开工', value: 12,
label: '未开工' label: '未开工'
},{ },{
value: '执行中', value: 14,
label: '执行中' label: '执行中'
},{ },{
value: '暂停中', value: 0,
label: '暂停中' label: '已完成'
},{ },{
value: '交检中', value: 5,
label: '交检中' label: '暂停中'
},{ },{
value: '交接中', value: 7,
label: '交接中' label: '已终止'
},{ },{
value: '已完成', value: -1,
label: '已完成' label: '待派工'
}, },
// value: '交检中',
// label: '交检中'
// },{
// value: '交接中',
// label: '交接中'
// },{
], ],
} }
}, },
created() { created() {
this.detail = () => import("./starOrder/index"); this.detail = () => import("./starOrder/index");
}, },
async fetch({ store, params }) { async fetch({ store, params }) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
mounted() {}, mounted() {
},
comments:{ },
methods: { methods: {
starFun(){ starFun(){
this.$Message.success("开工...") this.$Message.success("开工...")
}, },
// getListLength(len){
// this.listLength = len
// },
// 返回工单列表
goToOrder(){
this.$router.push("/produce/orderlist");
},
searchOrder(value){ searchOrder(value){
let allList = this.$refs.orderlist.listTask; let allList = this.$refs.orderlist.listTasks;
let newitems = []; let newitems = [];
if(value=="全部"){ if(value=="-9"){
this.$refs.orderlist.loadTree(); this.$refs.orderlist.loadTree();
}else{ }else{
allList.map((u,i)=>{ allList.map((u,i)=>{
...@@ -114,5 +143,12 @@ export default { ...@@ -114,5 +143,12 @@ export default {
if(number==9){ this.detail = () => import("./testdata/index");}//测试数据 if(number==9){ this.detail = () => import("./testdata/index");}//测试数据
}, },
}, },
watch:{
listLength(val,newV){
console.log("111",val)
console.log("020202",newV)
// this.listLength =
}
},
} }
</script> </script>
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