Skip to content

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

bug

parent 669c07ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 885 additions and 802 deletions
pages/aps/complete/index.vue
View file @ f3cf84a3
<template> <template>
<div class="scheduling"> <div>
<div class="aps-l"> <div class="back-href">
<Row class="row-p"> <a @click="viewClose">
<Col :span="10" class="chan-chi">整机排产-排产池</Col> <Icon type="ios-undo-outline" size="24" />返回计划管理
<Col :span="14" class="l-ringht"> </a>
<!-- <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small"> </div>
<div class="scheduling">
<div class="aps-l">
<Row class="row-p">
<Col :span="10" class="chan-chi">整机排产-排产池</Col>
<Col :span="14" class="l-ringht">
<!-- <RadioGroup v-model="status" type="button" @on-change="changeStatus" size="small">
<Radio label="0">未排产</Radio>--> <Radio label="0">未排产</Radio>-->
<!-- <Radio label="2">已排查</Radio> --> <!-- <Radio label="2">已排查</Radio> -->
<!-- <Radio label="-1">全部</Radio> --> <!-- <Radio label="-1">全部</Radio> -->
<!-- </RadioGroup> --> <!-- </RadioGroup> -->
</Col> </Col>
</Row> </Row>
<div class="left-down"> <div class="left-down">
<div <div
class="left-body" class="left-body"
v-for="(li, index) in list" v-for="(li, index) in list"
:key="index" :key="index"
:class="li.checked == true ? 'addclass' : ''" :class="li.checked == true ? 'addclass' : ''"
> >
<Row class="title-i"> <Row class="title-i">
<Col :span="20" class="order-code"> <Col :span="20" class="order-code">
<Checkbox <Checkbox
v-model="li.checked" v-model="li.checked"
@on-change="checkData(li)" @on-change="checkData(li)"
:disabled="li.status == 0 ? false : true" :disabled="li.status == 0 ? false : true"
>订单号：{{ li.mesCode }}</Checkbox >订单号：{{ li.mesCode }}</Checkbox
> >
</Col> </Col>
<Col :span="4" class="order-ringht"> <Col :span="4" class="order-ringht">
<Icon type="md-close" @click="close(li.id)" /> <Icon type="md-close" @click="close(li.id)" />
</Col> </Col>
</Row> </Row>
<div class="fa">产品名称：{{ li.productName }}</div> <div class="fa">产品名称：{{ li.productName }}</div>
<div class="time-s">产品数量：{{ li.quantity }}</div> <div class="time-s">产品数量：{{ li.quantity }}</div>
<!-- <div class="time-s"> <!-- <div class="time-s">
<span>工序：{{li.drawnNumber}}</span> <span>工序：{{li.drawnNumber}}</span>
</div> --> </div> -->
<div class="time-s"> <div class="time-s">
{{ li.demandFinishDate }} ~ {{ li.demandStartDate }} {{ li.demandFinishDate }} ~ {{ li.demandStartDate }}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="aps-r" v-show="showSet">
<div class="aps-r" v-show="showSet"> <div class="r-title">排产设置盘</div>
<div class="r-title">排产设置盘</div> <Form :model="formItem" :label-width="100">
<Form :model="formItem" :label-width="100"> <FormItem label="工时">
<FormItem label="工时"> <DatePicker
<DatePicker type="datetimerange"
type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd HH:mm:ss" placeholder="请选择工时"
placeholder="请选择工时" @on-change="changeFormat"
@on-change="changeFormat" v-model="formItem.time"
v-model="formItem.time" style="width: 300px"
style="width: 300px" ></DatePicker>
></DatePicker> </FormItem>
</FormItem> <FormItem label="类型">
<FormItem label="类型"> <RadioGroup v-model="formItem.radio">
<RadioGroup v-model="formItem.radio"> <Radio label="0">人员</Radio>
<Radio label="0">人员</Radio> <Radio label="1">班组</Radio>
<Radio label="1">班组</Radio> </RadioGroup>
</RadioGroup> </FormItem>
</FormItem> <FormItem v-if="formItem.radio == 0">
<FormItem v-if="formItem.radio == 0"> <UserSelect v-model="user" :multiple="true" />
<UserSelect v-model="user" :multiple="true" /> </FormItem>
</FormItem> <FormItem label="班组" v-if="formItem.radio == 1">
<FormItem label="班组" v-if="formItem.radio == 1"> <!-- <DepartmentSelect :type="3" v-model="formItem.shopId"/> -->
<!-- <DepartmentSelect :type="3" v-model="formItem.shopId"/> --> <Select
<Select v-model="formItem.shopId"
v-model="formItem.shopId" placeholder="请选择"
placeholder="请选择" style="width: 300px"
style="width: 300px" >
> <Option
<Option v-for="(item, index) in listClass"
v-for="(item, index) in listClass" :key="index"
:key="index" :value="item.value"
:value="item.value" :label="item.label"
:label="item.label" style="display: none"
style="display: none" ></Option>
></Option> <Tree
<Tree key="mytree"
key="mytree" :data="workShop"
:data="workShop" ref="mytree"
ref="mytree" :render="renderContent"
:render="renderContent" ></Tree>
></Tree> </Select>
</Select> </FormItem>
</FormItem> <FormItem label="备注">
<FormItem label="备注"> <Input
<Input v-model="formItem.remark"
v-model="formItem.remark" type="textarea"
type="textarea" :autosize="{ minRows: 2, maxRows: 5 }"
:autosize="{ minRows: 2, maxRows: 5 }" placeholder="请输入备注信息"
placeholder="请输入备注信息" ></Input>
></Input> </FormItem>
</FormItem> <FormItem>
<FormItem> <Button style="margin-left: 8px" @click="closeOk">取消</Button>
<Button style="margin-left: 8px" @click="closeOk">取消</Button> <Button type="primary" @click="lowerHair" v-noClick>下发</Button>
<Button type="primary" @click="lowerHair" v-noClick>下发</Button> </FormItem>
</FormItem> </Form>
</Form> </div>
</div> </div>
</div> </div>
</template> </template>
...@@ -126,7 +133,7 @@ export default { ...@@ -126,7 +133,7 @@ export default {
showSet: false, showSet: false,
// userName: "" // userName: ""
}, },
user:'', user: "",
showSet: false, showSet: false,
// listGroup: [ // listGroup: [
// { // {
...@@ -169,6 +176,9 @@ export default { ...@@ -169,6 +176,9 @@ export default {
this.orderlist(0); this.orderlist(0);
}, },
methods: { methods: {
viewClose() {
this.$router.push("/aps/plan");
},
// 过滤条件 // 过滤条件
changeStatus(name) { changeStatus(name) {
this.status = name; this.status = name;
...@@ -338,6 +348,9 @@ export default { ...@@ -338,6 +348,9 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import "../../../assets/css/custom.less"; @import "../../../assets/css/custom.less";
.back-href {
height: 35px;
}
.addclass { .addclass {
border-color: rgba(38, 128, 235, 0.2) !important; border-color: rgba(38, 128, 235, 0.2) !important;
.title-i { .title-i {
......
pages/aps/stream/index.vue
View file @ f3cf84a3
This diff is collapsed.
pages/qc/certificate/waitOpened/add.vue
View file @ f3cf84a3
...@@ -211,7 +211,7 @@ export default { ...@@ -211,7 +211,7 @@ export default {
disabled: false, disabled: false,
entity: { entity: {
id: 0, id: 0,
status: "", status: 0,
items: [], items: [],
}, },
rules: { rules: {
...@@ -225,6 +225,7 @@ export default { ...@@ -225,6 +225,7 @@ export default {
columns: [ columns: [
{ {
title: "序号", title: "序号",
// key: "index",
type: "index", type: "index",
width: 80, width: 80,
align: "center", align: "center",
...@@ -308,7 +309,8 @@ export default { ...@@ -308,7 +309,8 @@ export default {
let item = []; let item = [];
item = this.checkList; item = this.checkList;
if (item) { if (item) {
item.forEach((c) => { item.forEach((c, index) => {
c.index = index;
return delete c.id; return delete c.id;
}); });
} }
......
pages/resource/resource/index.vue
View file @ f3cf84a3
This diff is collapsed.
pages/technology/details/routingsupporting/index.vue
View file @ f3cf84a3
...@@ -94,15 +94,15 @@ export default { ...@@ -94,15 +94,15 @@ export default {
import: true, import: true,
}, },
{ // {
key: "materialType", // key: "materialType",
title: this.l("materialType"), // title: this.l("materialType"),
align: "center", // align: "center",
easy: true, // easy: true,
high: true, // high: true,
code: "mes_xingchi_resource.material.materialReType", // code: "mes_xingchi_resource.material.materialReType",
width: 100, // width: 100,
}, // },
{ {
key: "materialNumber", key: "materialNumber",
title: this.l("materialNumber"), title: this.l("materialNumber"),
......
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