Skip to content

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

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

parents d11aeedd 1b457162
Show whitespace changes
Inline Side-by-side
Showing with 2210 additions and 1760 deletions
components/page/dataGrid.vue
View file @ 687df1cc
......@@ -143,8 +143,10 @@
</template>
<script>
import ColumnSlot from "./treeGrid/columnSolt";
export default {
name: "DataGrid",
components: { ColumnSlot },
data() {
return {
keys: "",
......@@ -155,7 +157,7 @@ export default {
pageIndex: 1,
pageSize: 20,
sortBy: "id",
isDesc:true,
isDesc: true,
conditions: [],
},
searchConditions: this.search,
......@@ -294,15 +296,16 @@ export default {
default: "",
},
},
provide() {
return {
tableRoot: this.slots,
};
},
created() {
this.columns.forEach((u) => {
if (!u.hide) {
u.hide = false;
}
});
this.columnsCur = this.$u.clone(this.columns);
},
mounted() {
this.initColumns();
if (this.data && this.data.length > 0) {
this.list = this.data;
return;
......@@ -350,7 +353,41 @@ export default {
this.getRoutingHeaderData();
this.getAllUser(); //获取所有用户
},
methods: {
//列初始化 slot 支持;
slots() {
return this.$scopedSlots;
},
initColumns() {
this.columns.forEach((u) => {
if (!u.hide) {
u.hide = false;
}
});
var items=this.$u.clone(this.columns);
var soct=this.$scopedSlots;
console.warn("that.$scopedSlots()",soct["action"]());
items.forEach((u) => {
if (u.slot) {
u.render = (h, params) => {
return h(
"span",
// soct[u.slot]({
// row: params.row,
// column: params.column,
// index: params.index,
// })
params.row.id
);
};
delete u.slot;
}
});
this.columnsCur = items;
console.log("cur", items,this.columnsCur);
},
//数据加载
load() {
if (this.action) {
......
components/page/treeGrid/columnSolt.js 0 → 100644
View file @ 687df1cc
export default {
name: 'ColumnSlot',
functional: true,
inject: ['tableRoot'],
props: {
row: Object,
index: Number,
column: {
type: Object,
default: null
}
},
render: (h, ctx) => {
return h('span', ctx.injections.tableRoot()[ctx.props.column.slot]({
row: ctx.props.row,
column: ctx.props.column,
index: ctx.props.index
}));
}
};
\ No newline at end of file
components/page/treeGrid/index.vue
View file @ 687df1cc
......@@ -14,21 +14,21 @@
<table>
<thead>
<tr>
<th v-for="(column,index) in cloneColumns" :key="index">
<th v-for="(column, index) in cloneColumns" :key="index">
<label v-if="column.type === 'selection'">
<input type="checkbox" v-model="checks" @click="handleCheckAll" />全选
<Checkbox v-model="all"></Checkbox>
</label>
<label v-else>
{{ renderHeader(column, index) }}
<span class="ivu-table-sort" v-if="column.sortable">
<Icon
type="arrow-up-b"
:class="{on: column._sortType === 'asc'}"
:class="{ on: column._sortType === 'asc' }"
@click.native="handleSort(index, 'asc')"
/>
<Icon
type="arrow-down-b"
:class="{on: column._sortType === 'desc'}"
:class="{ on: column._sortType === 'desc' }"
@click.native="handleSort(index, 'desc')"
/>
</span>
......@@ -38,96 +38,168 @@
</thead>
<tbody>
<tr
v-for="(item,index) in initItems"
v-for="(item, index) in initItems"
:key="item.id"
v-show="show(item)"
class="treetr"
:class="{'child-tr':item.parent}"
:class="{ 'child-tr': item.parent }"
:draggable="drag"
@dragstart="dragstart($event, index, item)"
@dragover="dragover($event, index, item)"
@drop="dragdrop($event, index, item)"
>
<td v-for="(column,snum) in columns" :key="column.key" :style="tdStyle(column)">
<!-- <label>
<input
v-if="column.type === 'selection'"
type="checkbox"
:value="item.id"
v-model="checkGroup"
@click="handleCheckClick(item,$event,index)"
/>
</label>-->
<td
v-for="(column, snum) in columns"
:key="column.key"
:style="tdStyle(column)"
>
<!-- 多选 -->
<label v-if="column.type === 'selection'" @click="handleCheckClick(item, $event, index)">
<Checkbox v-model="item.checked" ></Checkbox>
</label>
<!-- 图标 -->
<div v-if="column.type === 'icon'">
<i
class="icon-set"
size="small"
@click="RowClick(item,$event,index,action.text)"
v-for="action in (column.actions)"
@click="RowClick(item, $event, index, action.text)"
v-for="action in column.actions"
:key="action.text"
>
<Icon :type="action.type" :title="action.text" :style="action.style" />
<Icon
:type="action.type"
:title="action.text"
:style="action.style"
/>
</i>
</div>
<div v-if="column.type === 'icons'">
<Icon :type="item[column.key]" size="20" />
</div>
<state v-if="column.code" :code="column.code" :value="item[column.key]" />
<state
v-if="column.code"
:code="column.code"
:value="item[column.key]"
/>
<!-- 操作 -->
<div v-if="column.type === 'action'" class="action" style="text-align:left;">
<div
v-if="column.type === 'action'"
class="action"
style="text-align: left"
>
<op
v-for="action in (column.actions)"
v-for="action in column.actions"
:key="action.text"
@click="RowClick(item,$event,index,action.text)"
@click="RowClick(item, $event, index, action.text)"
:type="action.type"
size="small"
style=" margin:0 5px;"
:class="action.text=='删除'? 'remove' : (action.text=='新增' ? 'add': (action.text=='编辑' ?'edit':''))"
v-show="(item.type=='3'&&action.text=='新增')||(item.children.length>0&&action.text=='删除')?false:true"
>{{action.text}}</op>
style="margin: 0 5px"
:class="
action.text == '删除'
? 'remove'
: action.text == '新增'
? 'add'
: action.text == '编辑'
? 'edit'
: ''
"
v-show="
(item.type == '3' && action.text == '新增') ||
(item.children.length > 0 && action.text == '删除')
? false
: true
"
>{{ action.text }}</op
>
</div>
<!-- 类型 -->
<div v-if="column.type === 'menuRender'" style="text-align:center;">
<div v-if="column.type === 'menuRender'" style="text-align: center">
<Button
:ghost="item[column.key] ==0 ?false:true"
:ghost="item[column.key] == 0 ? false : true"
size="small"
:type="item[column.key] ==0 ? 'default' :item[column.key] == 1 ? 'info' :item[column.key] == 2?'error':'warning'"
>{{item[column.key] == 0 ? '子系统':item[column.key] == 1 ? '目录': item[column.key] == 2 ? '菜单' : '按钮'}}</Button>
:type="
item[column.key] == 0
? 'default'
: item[column.key] == 1
? 'info'
: item[column.key] == 2
? 'error'
: 'warning'
"
>{{
item[column.key] == 0
? "子系统"
: item[column.key] == 1
? "目录"
: item[column.key] == 2
? "菜单"
: "按钮"
}}</Button
>
</div>
<!-- 状态 -->
<div v-if="column.type === 'menuIsshow'" style="text-align:center;">
<div v-if="column.type === 'menuIsshow'" style="text-align: center">
<Button
:ghost="item[column.key] == 1 ? true :false"
:disabled="item[column.key] == 1 ? false :true"
:ghost="item[column.key] == 1 ? true : false"
:disabled="item[column.key] == 1 ? false : true"
size="small"
:type="item[column.key] == 1 ? 'info' :'default'"
>{{item[column.key] == 1 ? '显示': '隐藏'}}</Button>
:type="item[column.key] == 1 ? 'info' : 'default'"
>{{ item[column.key] == 1 ? "显示" : "隐藏" }}</Button
>
</div>
<!-- 打开方式 -->
<div v-if="column.type === 'menuTarget'">
<span
:style="item[column.key] == 0?'color:#006699':item[column.key] == 1?'color:black':''"
>{{item[column.key] == 0 ? '本页面': item[column.key] == 1?'新页面':''}}</span>
:style="
item[column.key] == 0
? 'color:#006699'
: item[column.key] == 1
? 'color:black'
: ''
"
>{{
item[column.key] == 0
? "本页面"
: item[column.key] == 1
? "新页面"
: ""
}}</span
>
</div>
<!-- 菜单名称、排序、请求地址 -->
<label @click="toggle(index,item)" v-if="!column.type&&!column.code&&!column.render">
<span v-if="snum==iconRow()">
<!-- 树图标 -->
<span @click="toggle(index, item)" v-if="snum == iconRow()">
<i v-html="item.spaceHtml"></i>
<a v-if="item.children&&item.children.length>0">
<a v-if="item.children && item.children.length > 0">
<i
class="ivu-icon"
:class="{'ivu-icon-ios-arrow-forward':!item.expanded,'ivu-icon-ios-arrow-down':item.expanded }"
></i>
</a>
<i v-else class="ms-tree-space"></i>
:class="{
'ivu-icon-ios-arrow-forward': !item.expanded,
'ivu-icon-ios-arrow-down': item.expanded,
}"
></i> </a
><i v-else class="ms-tree-space"></i>
</span>
{{renderBody(item,column) }}
<!-- 菜单名称、排序、请求地址 -->
<label
v-if="
!column.type && !column.code && !column.render && !column.slot
"
>
{{ renderBody(item, column) }}
</label>
<table-expand
v-if="column.render&&!column.type"
v-if="column.render && !column.type && !column.solt"
:row="item"
:column="column"
:index="snum"
:render="column.render"
></table-expand>
<column-slot
v-if="column.slot"
:row="item"
:column="column"
:index="snum"
></column-slot>
</td>
</tr>
</tbody>
......@@ -136,9 +208,10 @@
</template>
<script>
import TableExpand from "./expand";
import ColumnSlot from "./columnSolt";
export default {
name: "treeGrid",
components: { TableExpand },
components: { TableExpand, ColumnSlot },
props: {
columns: Array,
items: {
......@@ -148,10 +221,24 @@ export default {
},
},
iconName: false,
drag:{
type:Boolean,
default:false
},
spaceWidth:{
type:Number,
default:20
}
},
provide() {
return {
tableRoot: this.slots,
};
},
data() {
return {
color: "#19be6b",
all:true,
initItems: [], // 处理后数据数组
cloneColumns: [], // 处理后的表头数据
checkGroup: [], // 复选框数组
......@@ -160,6 +247,7 @@ export default {
tdsWidth: 0, // td总宽
timer: false, // 控制监听时长
dataLength: 0, // 树形数据长度
dragIndex:-1,//拖拽开始的序号
};
},
computed: {
......@@ -203,6 +291,7 @@ export default {
},
},
mounted() {
console.warn("treegrid", this.$scopedSlots);
if (this.items) {
this.dataLength = this.Length(this.items);
this.initData(this.deepCopy(this.items), 1, null);
......@@ -225,14 +314,30 @@ export default {
})();
},
methods: {
slots() {
return this.$scopedSlots;
},
//拖拽
dragstart(e,index, row ) {
this.dragIndex=index;
console.log(index)
},
dragover(e,index, row ) {
e.preventDefault();
},
dragdrop(e,index, row ) {
event.preventDefault();
this.$emit("on-drag-drop",this.dragIndex,index,this.initItems)
},
// 有无多选框折叠位置优化
iconRow() {
var num = 0;
for (let i = 0, len = this.columns.length; i < len; i++) {
if (this.columns[i].type == "selection") {
return 1;
if (this.columns[i].tree) {
num = i;
}
}
return 0;
return num;
},
// 设置td宽度,td的align
tdStyle(column) {
......@@ -349,11 +454,7 @@ export default {
// 数据处理 增加自定义属性监听
initData(items, level, parent) {
// this.initItems = []
let spaceHtml = "";
for (let i = 1; i < level; i++) {
spaceHtml +=
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i class='ms-tree-space'></i>";
}
let spaceHtml = "<i class='ms-tree-space' style='width:"+this.spaceWidth*level+"px'></i>";
items.forEach((item, index) => {
item = Object.assign({}, item, {
parent,
......
components/treeGrid/slot.js 0 → 100644
View file @ 687df1cc
export default {
name: 'TableSlot',
functional: true,
inject: ['tableRoot'],
props: {
row: Object,
index: Number,
column: {
type: Object,
default: null
}
},
render: (h, ctx) => {
return h('div', ctx.injections.tableRoot.$scopedSlots[ctx.props.column.slot]({
row: ctx.props.row,
column: ctx.props.column,
index: ctx.props.index
}));
}
};
\ No newline at end of file
pages/aps/aps/components/edit.vue
View file @ 687df1cc
......@@ -157,8 +157,8 @@ export default {
this.resources = this.$u.clone(r.result);
//alert(JSON.stringify(this.resources))
this.entity = v;
this.entity.resourceCode = v.firsT_EQUIP_CODE;
let code = v.firsT_EQUIP_CODE;
this.entity.resourceCode = v.first_equip;
let code = v.first_equip;
this.entity.resource = []
//let code = 'PCZYBZBH_20200804_1'
if (code && code != '') {
......
pages/aps/aps/components/excute.vue
View file @ 687df1cc
......@@ -144,9 +144,9 @@ export default {
key: "firsT_EQUIP_CODE",
title: this.l("first_equip"),
align: "left",
render: (h, params) => { //test:PCZYBZBH_20200804_1 params.row.firsT_EQUIP_CODE
return h("span", {}, this.getResourceName(params.row.firsT_EQUIP_CODE))
}
// render: (h, params) => { //test:PCZYBZBH_20200804_1 params.row.firsT_EQUIP_CODE
// return h("span", {}, this.getResourceName(params.row.firsT_EQUIP_CODE))
// }
},
{
key: "setup_time",
......
pages/aps/plan/add.vue
View file @ 687df1cc
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12">
<FormItem :label="l('upId')" prop="upId">
......@@ -138,10 +138,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish">
<Dictionary
code="mes_xingchi_plan.mes_order.is_supporting_finish"
v-model="entity.isSupportingFinish"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.is_supporting_finish" v-model="entity.isSupportingFinish"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
......@@ -191,10 +188,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.order_quotation_status"
v-model="entity.orderQuotationStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.order_quotation_status" v-model="entity.orderQuotationStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
......@@ -233,10 +227,7 @@
</FormItem>
</Col>
<Col :span="12">
<FormItem
:label="l('productingPreparationFinishDate')"
prop="productingPreparationFinishDate"
>
<FormItem :label="l('productingPreparationFinishDate')" prop="productingPreparationFinishDate">
<DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker>
</FormItem>
</Col>
......@@ -292,34 +283,22 @@
</Col>
<Col :span="12">
<FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.main_routing_set_status"
v-model="entity.mainRoutingSetStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.main_routing_set_status" v-model="entity.mainRoutingSetStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.major_routing_set_status"
v-model="entity.majorRoutingSetStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.major_routing_set_status" v-model="entity.majorRoutingSetStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.material_bill_set_status"
v-model="entity.materialBillSetStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.material_bill_set_status" v-model="entity.materialBillSetStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.routing_data_set_status"
v-model="entity.routingDataSetStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.routing_data_set_status" v-model="entity.routingDataSetStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
......@@ -329,18 +308,12 @@
</Col>
<Col :span="12">
<FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.main_routing_execute_status"
v-model="entity.mainRoutingExecuteStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.main_routing_execute_status" v-model="entity.mainRoutingExecuteStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.major_routing_execute_status"
v-model="entity.majorRoutingExecuteStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.major_routing_execute_status" v-model="entity.majorRoutingExecuteStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
......@@ -385,10 +358,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('isPreschedule')" prop="isPreschedule">
<Dictionary
code="mes_xingchi_plan.mes_order.is_preschedule"
v-model="entity.isPreschedule"
></Dictionary>
<Dictionary code="aps.plan.ispreschedule" v-model="entity.isPreschedule"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
......@@ -416,9 +386,11 @@
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</Form>
</template>
<script>
<script>
import Api from "./api";
export default {
name: "Add",
......@@ -426,7 +398,11 @@ export default {
return {
entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
name: [{
required: true,
message: "必填",
trigger: "blur"
}],
},
};
},
......
pages/aps/plan/edit.vue
View file @ 687df1cc
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12">
<FormItem :label="l('upId')" prop="upId">
......@@ -138,10 +138,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish">
<Dictionary
code="mes_xingchi_plan.mes_order.is_supporting_finish"
v-model="entity.isSupportingFinish"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.is_supporting_finish" v-model="entity.isSupportingFinish"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
......@@ -191,10 +188,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.order_quotation_status"
v-model="entity.orderQuotationStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.order_quotation_status" v-model="entity.orderQuotationStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
......@@ -233,10 +227,7 @@
</FormItem>
</Col>
<Col :span="12">
<FormItem
:label="l('productingPreparationFinishDate')"
prop="productingPreparationFinishDate"
>
<FormItem :label="l('productingPreparationFinishDate')" prop="productingPreparationFinishDate">
<DatePicker type="date" v-model="entity.productingPreparationFinishDate"></DatePicker>
</FormItem>
</Col>
......@@ -292,34 +283,22 @@
</Col>
<Col :span="12">
<FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.main_routing_set_status"
v-model="entity.mainRoutingSetStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.main_routing_set_status" v-model="entity.mainRoutingSetStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.major_routing_set_status"
v-model="entity.majorRoutingSetStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.major_routing_set_status" v-model="entity.majorRoutingSetStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.material_bill_set_status"
v-model="entity.materialBillSetStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.material_bill_set_status" v-model="entity.materialBillSetStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.routing_data_set_status"
v-model="entity.routingDataSetStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.routing_data_set_status" v-model="entity.routingDataSetStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
......@@ -329,18 +308,12 @@
</Col>
<Col :span="12">
<FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.main_routing_execute_status"
v-model="entity.mainRoutingExecuteStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.main_routing_execute_status" v-model="entity.mainRoutingExecuteStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
<FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.major_routing_execute_status"
v-model="entity.majorRoutingExecuteStatus"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.major_routing_execute_status" v-model="entity.majorRoutingExecuteStatus"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
......@@ -385,10 +358,7 @@
</Col>
<Col :span="12">
<FormItem :label="l('isPreschedule')" prop="isPreschedule">
<Dictionary
code="mes_xingchi_plan.mes_order.is_preschedule"
v-model="entity.isPreschedule"
></Dictionary>
<Dictionary code="aps.plan.ispreschedule" v-model="entity.isPreschedule"></Dictionary>
</FormItem>
</Col>
<Col :span="12">
......@@ -416,8 +386,9 @@
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
</Form>
</template>
<script>
import Api from "./api";
export default {
......@@ -426,7 +397,11 @@ export default {
return {
entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
name: [{
required: true,
message: "必填",
trigger: "blur"
}],
},
};
},
......@@ -435,7 +410,9 @@ export default {
},
methods: {
load(v) {
Api.get({ id: v }).then((r) => {
Api.get({
id: v
}).then((r) => {
this.entity = r.result;
this.$emit("on-load");
});
......
pages/aps/plan/index.vue
View file @ 687df1cc
......@@ -266,6 +266,14 @@ export default {
high: true,
hide: true,
},
{
key: "isPreschedule",
title: this.l("isPreschedule"),
align: "center",
width: 100,
high: true,
code: "aps.plan.ispreschedule",
},
{
key: "demandStart",
title: this.l("demandStart"),
......
pages/aps/plan/search.vue
View file @ 687df1cc
<template>
<Form ref="form" :model="condition" :label-width="90">
<Form ref="form" :model="condition" :label-width="90">
<Row>
<Col span="8" v-if="condition.id.show">
<FormItem :label="l('id')" prop="id">
......@@ -143,10 +143,7 @@
</Col>
<Col span="8" v-if="condition.isSupportingFinish.show">
<FormItem :label="l('isSupportingFinish')" prop="isSupportingFinish">
<Dictionary
code="aps.plan.supportingStatus"
v-model="condition.isSupportingFinish.value"
></Dictionary>
<Dictionary code="aps.plan.supportingStatus" v-model="condition.isSupportingFinish.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.demandStartDate.show">
......@@ -171,10 +168,7 @@
</Col>
<Col span="8" v-if="condition.isDeleted.show">
<FormItem :label="l('isDeleted')" prop="isDeleted">
<Dictionary
code="mes_xingchi_plan.mes_order.is_deleted"
v-model="condition.isDeleted.value"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.is_deleted" v-model="condition.isDeleted.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.creatorUserId.show">
......@@ -199,10 +193,7 @@
</Col>
<Col span="8" v-if="condition.orderQuotationStatus.show">
<FormItem :label="l('orderQuotationStatus')" prop="orderQuotationStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.order_quotation_status"
v-model="condition.orderQuotationStatus.value"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.order_quotation_status" v-model="condition.orderQuotationStatus.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.distributeMainRouting.show">
......@@ -241,10 +232,7 @@
</FormItem>
</Col>
<Col span="8" v-if="condition.productingPreparationFinishDate.show">
<FormItem
:label="l('productingPreparationFinishDate')"
prop="productingPreparationFinishDate"
>
<FormItem :label="l('productingPreparationFinishDate')" prop="productingPreparationFinishDate">
<DatePicker type="daterange" v-model="condition.productingPreparationFinishDate.value"></DatePicker>
</FormItem>
</Col>
......@@ -270,10 +258,7 @@
</Col>
<Col span="8" v-if="condition.divideMark.show">
<FormItem :label="l('divideMark')" prop="divideMark">
<Dictionary
code="mes_xingchi_plan.mes_order.divide_mark"
v-model="condition.divideMark.value"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.divide_mark" v-model="condition.divideMark.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.productCode.show">
......@@ -303,34 +288,22 @@
</Col>
<Col span="8" v-if="condition.mainRoutingSetStatus.show">
<FormItem :label="l('mainRoutingSetStatus')" prop="mainRoutingSetStatus">
<Dictionary
code="aps.plan.mainRoutingStatus"
v-model="condition.mainRoutingSetStatus.value"
></Dictionary>
<Dictionary code="aps.plan.mainRoutingStatus" v-model="condition.mainRoutingSetStatus.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.majorRoutingSetStatus.show">
<FormItem :label="l('majorRoutingSetStatus')" prop="majorRoutingSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.major_routing_set_status"
v-model="condition.majorRoutingSetStatus.value"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.major_routing_set_status" v-model="condition.majorRoutingSetStatus.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.materialBillSetStatus.show">
<FormItem :label="l('materialBillSetStatus')" prop="materialBillSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.material_bill_set_status"
v-model="condition.materialBillSetStatus.value"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.material_bill_set_status" v-model="condition.materialBillSetStatus.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.routingDataSetStatus.show">
<FormItem :label="l('routingDataSetStatus')" prop="routingDataSetStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.routing_data_set_status"
v-model="condition.routingDataSetStatus.value"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.routing_data_set_status" v-model="condition.routingDataSetStatus.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.rootId.show">
......@@ -340,18 +313,12 @@
</Col>
<Col span="8" v-if="condition.mainRoutingExecuteStatus.show">
<FormItem :label="l('mainRoutingExecuteStatus')" prop="mainRoutingExecuteStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.main_routing_execute_status"
v-model="condition.mainRoutingExecuteStatus.value"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.main_routing_execute_status" v-model="condition.mainRoutingExecuteStatus.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.majorRoutingExecuteStatus.show">
<FormItem :label="l('majorRoutingExecuteStatus')" prop="majorRoutingExecuteStatus">
<Dictionary
code="mes_xingchi_plan.mes_order.major_routing_execute_status"
v-model="condition.majorRoutingExecuteStatus.value"
></Dictionary>
<Dictionary code="mes_xingchi_plan.mes_order.major_routing_execute_status" v-model="condition.majorRoutingExecuteStatus.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.mainRoutingActualStartDate.show">
......@@ -396,10 +363,7 @@
</Col>
<Col span="8" v-if="condition.isPreschedule.show">
<FormItem :label="l('isPreschedule')" prop="isPreschedule">
<Dictionary
code="mes_xingchi_plan.mes_order.is_preschedule"
v-model="condition.isPreschedule.value"
></Dictionary>
<Dictionary code="aps.plan.ispreschedule" v-model="condition.isPreschedule.value"></Dictionary>
</FormItem>
</Col>
<Col span="8" v-if="condition.spareQty.show">
......@@ -423,8 +387,9 @@
</FormItem>
</Col>
</Row>
</Form>
</Form>
</template>
<script>
import Api from './api'
export default {
......@@ -432,87 +397,391 @@ export default {
data() {
return {
condition: {
id: { op: 'Equal', value: null, show: false },
upId: { op: 'Equal', value: null, show: false },
mesCode: { op: 'Equal', value: null, show: true },
taskType: { op: 'Equal', value: null, show: true },
productId: { op: 'Equal', value: null, show: false },
stage: { op: 'Equal', value: null, show: true },
materialId: { op: 'Equal', value: null, show: false },
quantity: { op: 'Equal', value: null, show: false },
guestName: { op: 'Equal', value: null, show: false },
printSupply: { op: 'Equal', value: null, show: false },
functionaryOffice: { op: 'Equal', value: null, show: false },
mainDepartmentId: { op: 'Equal', value: null, show: false },
remark: { op: 'Equal', value: null, show: false },
taskInputDate: { op: 'Range', value: null, show: true },
taskRequire: { op: 'Equal', value: null, show: false },
putintDocmentCode: { op: 'Equal', value: null, show: false },
technologyDocmentCode: { op: 'Equal', value: null, show: false },
outerDrawnNumber: { op: 'Equal', value: null, show: false },
modelVersion: { op: 'Equal', value: null, show: false },
taskCode: { op: 'Equal', value: null, show: false },
designer: { op: 'Equal', value: null, show: false },
officeFunctionary: { op: 'Equal', value: null, show: false },
mainRoutingPeople: { op: 'Equal', value: null, show: false },
status: { op: 'Equal', value: null, show: true },
workHours: { op: 'Equal', value: null, show: true },
printPeriod: { op: 'Equal', value: null, show: false },
equipment: { op: 'Equal', value: null, show: false },
materialWeight: { op: 'Equal', value: null, show: true },
isSupportingFinish: { op: 'Equal', value: null, show: true },
demandStartDate: { op: 'Range', value: null, show: true },
demandFinishDate: { op: 'Range', value: null, show: true },
actualStartDate: { op: 'Range', value: null, show: false },
actualFinishDate: { op: 'Range', value: null, show: false },
isDeleted: { op: 'Equal', value: null, show: false },
creatorUserId: { op: 'Equal', value: null, show: false },
creationTime: { op: 'Range', value: null, show: false },
lastModifierUserId: { op: 'Equal', value: null, show: false },
lastModificationTime: { op: 'Range', value: null, show: false },
orderQuotationStatus: { op: 'Equal', value: null, show: false },
distributeMainRouting: { op: 'Equal', value: null, show: false },
mainRoutingFinishDate: { op: 'Range', value: null, show: false },
majorRoutingPeople: { op: 'Equal', value: null, show: false },
majorRoutingFinishDate: { op: 'Range', value: null, show: false },
checkUpPeople: { op: 'Equal', value: null, show: false },
checkUpFinishDate: { op: 'Range', value: null, show: false },
productingPreparationPeople: { op: 'Equal', value: null, show: false },
id: {
op: 'Equal',
value: null,
show: false
},
upId: {
op: 'Equal',
value: null,
show: false
},
mesCode: {
op: 'Equal',
value: null,
show: true
},
taskType: {
op: 'Equal',
value: null,
show: true
},
productId: {
op: 'Equal',
value: null,
show: false
},
stage: {
op: 'Equal',
value: null,
show: true
},
materialId: {
op: 'Equal',
value: null,
show: false
},
quantity: {
op: 'Equal',
value: null,
show: false
},
guestName: {
op: 'Equal',
value: null,
show: false
},
printSupply: {
op: 'Equal',
value: null,
show: false
},
functionaryOffice: {
op: 'Equal',
value: null,
show: false
},
mainDepartmentId: {
op: 'Equal',
value: null,
show: false
},
remark: {
op: 'Equal',
value: null,
show: false
},
taskInputDate: {
op: 'Range',
value: null,
show: true
},
taskRequire: {
op: 'Equal',
value: null,
show: false
},
putintDocmentCode: {
op: 'Equal',
value: null,
show: false
},
technologyDocmentCode: {
op: 'Equal',
value: null,
show: false
},
outerDrawnNumber: {
op: 'Equal',
value: null,
show: false
},
modelVersion: {
op: 'Equal',
value: null,
show: false
},
taskCode: {
op: 'Equal',
value: null,
show: false
},
designer: {
op: 'Equal',
value: null,
show: false
},
officeFunctionary: {
op: 'Equal',
value: null,
show: false
},
mainRoutingPeople: {
op: 'Equal',
value: null,
show: false
},
status: {
op: 'Equal',
value: null,
show: true
},
workHours: {
op: 'Equal',
value: null,
show: true
},
printPeriod: {
op: 'Equal',
value: null,
show: false
},
equipment: {
op: 'Equal',
value: null,
show: false
},
materialWeight: {
op: 'Equal',
value: null,
show: true
},
isSupportingFinish: {
op: 'Equal',
value: null,
show: true
},
demandStartDate: {
op: 'Range',
value: null,
show: true
},
demandFinishDate: {
op: 'Range',
value: null,
show: true
},
actualStartDate: {
op: 'Range',
value: null,
show: false
},
actualFinishDate: {
op: 'Range',
value: null,
show: false
},
isDeleted: {
op: 'Equal',
value: null,
show: false
},
creatorUserId: {
op: 'Equal',
value: null,
show: false
},
creationTime: {
op: 'Range',
value: null,
show: false
},
lastModifierUserId: {
op: 'Equal',
value: null,
show: false
},
lastModificationTime: {
op: 'Range',
value: null,
show: false
},
orderQuotationStatus: {
op: 'Equal',
value: null,
show: false
},
distributeMainRouting: {
op: 'Equal',
value: null,
show: false
},
mainRoutingFinishDate: {
op: 'Range',
value: null,
show: false
},
majorRoutingPeople: {
op: 'Equal',
value: null,
show: false
},
majorRoutingFinishDate: {
op: 'Range',
value: null,
show: false
},
checkUpPeople: {
op: 'Equal',
value: null,
show: false
},
checkUpFinishDate: {
op: 'Range',
value: null,
show: false
},
productingPreparationPeople: {
op: 'Equal',
value: null,
show: false
},
productingPreparationFinishDate: {
op: 'Range',
value: null,
show: false
},
quotationPeople: { op: 'Equal', value: null, show: false },
quotationFinishDate: { op: 'Range', value: null, show: false },
routingMethod: { op: 'Equal', value: null, show: true },
outerEnvelopeSize: { op: 'Equal', value: null, show: false },
divideMark: { op: 'Equal', value: null, show: false },
productCode: { op: 'Equal', value: null, show: false },
productName: { op: 'Equal', value: null, show: true },
drawnNumber: { op: 'Equal', value: null, show: true },
qualifiedQuantity: { op: 'Equal', value: null, show: true },
uncertificateQuantity: { op: 'Equal', value: null, show: true },
mainRoutingSetStatus: { op: 'Equal', value: null, show: true },
majorRoutingSetStatus: { op: 'Equal', value: null, show: false },
materialBillSetStatus: { op: 'Equal', value: null, show: false },
routingDataSetStatus: { op: 'Equal', value: null, show: false },
rootId: { op: 'Equal', value: null, show: false },
mainRoutingExecuteStatus: { op: 'Equal', value: null, show: false },
majorRoutingExecuteStatus: { op: 'Equal', value: null, show: false },
mainRoutingActualStartDate: { op: 'Range', value: null, show: false },
mainRoutingActualFinishDate: { op: 'Range', value: null, show: false },
majorRoutingActualStartDate: { op: 'Range', value: null, show: false },
majorRoutingActualFinishDate: { op: 'Range', value: null, show: false },
batchNumber: { op: 'Equal', value: null, show: true },
projectNumber: { op: 'Equal', value: null, show: true },
urgencyLevel: { op: 'Equal', value: null, show: true },
materialName: { op: 'Equal', value: null, show: true },
isPreschedule: { op: 'Equal', value: null, show: false },
spareQty: { op: 'Equal', value: null, show: false },
demandStart: { op: 'Range', value: null, show: false },
demandFinish: { op: 'Range', value: null, show: false },
partNamePro: { op: 'Equal', value: null, show: false }
quotationPeople: {
op: 'Equal',
value: null,
show: false
},
quotationFinishDate: {
op: 'Range',
value: null,
show: false
},
routingMethod: {
op: 'Equal',
value: null,
show: true
},
outerEnvelopeSize: {
op: 'Equal',
value: null,
show: false
},
divideMark: {
op: 'Equal',
value: null,
show: false
},
productCode: {
op: 'Equal',
value: null,
show: false
},
productName: {
op: 'Equal',
value: null,
show: true
},
drawnNumber: {
op: 'Equal',
value: null,
show: true
},
qualifiedQuantity: {
op: 'Equal',
value: null,
show: true
},
uncertificateQuantity: {
op: 'Equal',
value: null,
show: true
},
mainRoutingSetStatus: {
op: 'Equal',
value: null,
show: true
},
majorRoutingSetStatus: {
op: 'Equal',
value: null,
show: false
},
materialBillSetStatus: {
op: 'Equal',
value: null,
show: false
},
routingDataSetStatus: {
op: 'Equal',
value: null,
show: false
},
rootId: {
op: 'Equal',
value: null,
show: false
},
mainRoutingExecuteStatus: {
op: 'Equal',
value: null,
show: false
},
majorRoutingExecuteStatus: {
op: 'Equal',
value: null,
show: false
},
mainRoutingActualStartDate: {
op: 'Range',
value: null,
show: false
},
mainRoutingActualFinishDate: {
op: 'Range',
value: null,
show: false
},
majorRoutingActualStartDate: {
op: 'Range',
value: null,
show: false
},
majorRoutingActualFinishDate: {
op: 'Range',
value: null,
show: false
},
batchNumber: {
op: 'Equal',
value: null,
show: true
},
projectNumber: {
op: 'Equal',
value: null,
show: true
},
urgencyLevel: {
op: 'Equal',
value: null,
show: true
},
materialName: {
op: 'Equal',
value: null,
show: true
},
isPreschedule: {
op: 'Equal',
value: null,
show: false
},
spareQty: {
op: 'Equal',
value: null,
show: false
},
demandStart: {
op: 'Range',
value: null,
show: false
},
demandFinish: {
op: 'Range',
value: null,
show: false
},
partNamePro: {
op: 'Equal',
value: null,
show: false
}
}
}
},
......
pages/qc/dataTrace/components/basicView.vue
View file @ 687df1cc
<template>
<div class="">
<Form :label-width="190" inline>
<div class="orderDetail">
<Row>
<Col span="12">
<FormItem label="订单编号：" style="width:100%">
<h3>{{baseData.mesCode}}</h3>
</FormItem>
<Col span="8">
<span class="fwBold">{{l('mesCode')}}</span>
<p>{{baseData.mesCode}}</p>
</Col>
<Col span="12" class="">
<FormItem label="产品名称：" style="width:100%">
<h4>{{baseData.productName}}</h4>
</FormItem>
<Col span="8">
<span class="fwBold">{{l('taskType')}}</span>
<p>
<state code="plan.order.taskType" :value="baseData.taskType" type="text"></state>
</p>
</Col>
<Col span="12" class="">
<FormItem label="产品图号：" style="width:100%">
<h4>{{baseData.drawnNumber}}</h4>
</FormItem>
<Col span="8">
<span class="fwBold">{{l('quantity')}}</span>
<p>{{baseData.quantity}}</p>
</Col>
<Col span="12" class="">
<FormItem label="任务类型：" style="width:100%">
<state code="plan.order.taskType" :value="baseData.taskType+''" type="text"></state>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="阶段：" style="width:100%">
<state code="plan.order.stage" :value="baseData.stage+''" type="text"></state>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="材料：" style="width:100%">
<state code="plan.order.material" :value="baseData.materialId+''" type="text"></state>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="数量：" style="width:100%">
<span>{{baseData.quantity}}</span>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="工艺方法：" style="width:100%">
<state code="plan.order.routingMethod" :value="baseData.routing_Method+''" type="text"></state>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="甲方客户：" style="width:100%">
<state code="plan.order.guestName" :value="baseData.guestName+''" type="text"></state>
</FormItem>
</Col>
<Col span="8" class="">
<FormItem label="外包络尺寸(mm)：" style="width:100%">
<span>{{baseData.outer_Envelope_Size}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="开始时间：" style="width:100%">
<span>{{baseData.demandStartDate}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="完成时间：" style="width:100%">
<span>{{baseData.demandFinishDate}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="任务节点要求：" style="width:100%">
<span>{{baseData.taskRequire}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="厂内责任机关：" style="width:100%">
<span>{{baseData.functionaryOffice}}</span>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="厂内责任主体部门：" style="width:100%">
<state code="plan.order.mainDepartment" :value="baseData.mainDepartmentId+''" type="text"></state>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="3D打印承制单位：" style="width:100%">
<state code="plan.order.printSupply" :value="baseData.printSupply+''" type="text"></state>
</FormItem>
</Col>
<Col span="12" class="">
<FormItem label="甲方投产输入文件(编号)：" style="width:100%">
<span>{{baseData.putintDocmentCode}}</span>
</FormItem>
</Row>
<Row>
<Col span="8">
<span class="fwBold">{{l('status')}}</span>
<p>
<state code="plan.order.status" :value="baseData.status" type="text"></state>
</p>
</Col>
<Col span="12" class="">
<FormItem label="甲方技术输入文件(编号)：" style="width:100%">
<span>{{baseData.technologyDocmentCode}}</span>
</FormItem>
<Col span="8">
<span class="fwBold">{{l('productName')}}</span>
<p>{{baseData.productName}}</p>
</Col>
<Col span="12" class="">
<FormItem label="外部图号/模型号：" style="width:100%">
<span>{{baseData.outerDrawnNumber}}</span>
</FormItem>
<Col span="8">
<span class="fwBold">{{l('drawnNumber')}}</span>
<p>{{baseData.drawnNumber}}</p>
</Col>
<Col span="12" class="">
<FormItem label="模型版本：" style="width:100%">
<span>{{baseData.modelVersion}}</span>
</FormItem>
</Row>
<Row>
<Col span="8">
<span class="fwBold">{{l('batchNumber')}}</span>
<p>{{baseData.batchNumber}}</p>
</Col>
<Col span="12" class="">
<FormItem label="甲方任务号：" style="width:100%">
<span>{{baseData.taskCode}}</span>
</FormItem>
<Col span="8">
<span class="fwBold">{{l('projectNumber')}}</span>
<p>{{baseData.projectNumber}}</p>
</Col>
<Col span="12" class="">
<FormItem label="甲方设计人员：" style="width:100%">
<span>{{baseData.designer}}</span>
</FormItem>
<Col span="8">
<span class="fwBold">{{l('urgencyLevel')}}</span>
<p>
<state code="plan.order.urgencyLevel" :value="baseData.urgencyLevel" type="text"></state>
</p>
</Col>
<Col span="12" class="">
<FormItem label="厂内机关负责人：" style="width:100%">
<span>{{baseData.officeFunctionary}}</span>
</FormItem>
</Row>
<Row>
<Col span="8">
<span class="fwBold">{{l('demandStartDate')}}</span>
<p>
<DTSpan type="date" v-model="baseData.demandStartDate"></DTSpan>
</p>
</Col>
<Col span="8">
<span class="fwBold">{{l('demandFinishDate')}}</span>
<p>
<DTSpan type="date" v-model="baseData.demandFinishDate"></DTSpan>
</p>
</Col>
<Col span="8">
<span class="fwBold">{{l('taskRequire')}}</span>
<p>{{baseData.taskRequire}}</p>
</Col>
<Col span="12" class="">
<FormItem label="厂内主工艺人员：" style="width:100%">
<span>{{baseData.mainRoutingPeople}}</span>
</FormItem>
</Row>
<Row class="lastRow">
<Col span="24">
<span class="fwBold">{{l('remark')}}</span>
<p>{{baseData.remark}}</p>
</Col>
</Row>
</Form>
</div>
</div>
</template>
<script>
export default {
props: ['baseData'],
data() {
return {
themeBg:'light',
basicData:{},
themeBg: 'light',
basicData: {},
}
},
methods: {
l(key) {
key = "mes_plan" + "." + key;
return this.$t(key);
}
},
}
</script>
<style scoped>
<style lang="less">
.orderDetail {
line-height: 30px;
width: 90%;
margin: 0 auto;
.ivu-row {
padding-top: 20px;
padding-bottom: 20px;
border-bottom: #ccc solid 1px;
}
.lastRow {
border-bottom: none;
}
}
</style>
pages/qc/dataTrace/components/reviewCount.vue
View file @ 687df1cc
<template>
<div class="reve_cont">
<div class="reve_cont">
<Row>
<Col span="4">
<Menu :active-name="actNum" ref="actNum" class="menuBg" @on-select="openView" :theme="themeBg">
......@@ -15,22 +15,27 @@
</Menu>
</Col>
<Col span="20" class="revieweBox">
<basicView ref="basicView" :baseData="basicData" v-show="basicmodal"/>
<basicView ref="basicView" :baseData="basicData" v-show="basicmodal" />
<mainView ref="mainView" :baseData="basicData" v-show="mainmodal" />
<!-- <dispatched ref="dispatched" :baseData="basicData" v-show="dispatchedmodal"/> -->
</Col>
</Row>
</div>
</div>
</template>
<script>
import service from '@/plugins/request'
import basicView from './basicView.vue';
import mainView from './mainView.vue';
import dispatched from './dispatched.vue';
export default {
components:{basicView,mainView,dispatched},
components: {
basicView,
mainView,
dispatched
},
props: {
basicData:null,
basicData: null,
actValue: {
type: Number,
default: 1
......@@ -41,21 +46,21 @@ export default {
},
data() {
return {
actNum:'1',
themeBg:'light',
actNum: '1',
themeBg: 'light',
basicmodal: true,
mainmodal: false,
dispatchedmodal: false,
headerid:'',//暂存传字段
routingType:'',//工艺类型（主/专业）
diHeaderid:'',//暂存传字段
diRoutingType:'',//工艺类型（主/专业）
disexecuteid:0,
mainexecuteid:0
headerid: '', //暂存传字段
routingType: '', //工艺类型（主/专业）
diHeaderid: '', //暂存传字段
diRoutingType: '', //工艺类型（主/专业）
disexecuteid: 0,
mainexecuteid: 0
}
},
mounted(){
this.$nextTick(()=>{
mounted() {
this.$nextTick(() => {
this.actNum == this.$route.path.slice(1)
this.$refs.actNum.updateActiveName();
// this.shop = this.$route.path.slice(1)
......@@ -63,30 +68,30 @@ export default {
})
},
methods: {
loaddata(pamasId){
this.basicmodal=true;
this.mainmodal= false;
loaddata(pamasId) {
this.basicmodal = true;
this.mainmodal = false;
// this.dispatchedmodal= false;
// console.warn(pamasId) 获取主工艺信息 10030
let url = `${designUrl}/orderrouting/getordersheaderinfo?orderId=` + pamasId;
if(pamasId){
if (pamasId) {
service.get(`${url}`).then((response) => {
console.log(response)
if(response.result.length>0){
if(response.result[0]){
if (response.result.length > 0) {
if (response.result[0]) {
this.$refs.mainView.craftData = response.result[0];
this.headerid = response.result[0].id;
this.routingType = response.result[0].routingType;
this.getmainorder(pamasId)
}
if(response.result[1]){
if (response.result[1]) {
this.$refs.dispatched.craftData = response.result[1];
this.diHeaderid = response.result[1].id;
this.diRoutingType = response.result[1].routingType;
this.getdisorder(pamasId)
}
this.$refs.dispatched.getmaterialsupport(pamasId)
}else{
//this.$refs.dispatched.getmaterialsupport(pamasId)
} else {
console.log('获取工艺信息为空.')
this.$refs.mainView.craftData = {};
this.$refs.dispatched.craftData = {};
......@@ -95,21 +100,21 @@ export default {
}
},
// 获取产品号和设备id orderexecute/getorderproductandequip 10050
getmainorder(pamasId){
getmainorder(pamasId) {
let headerid = this.headerid;
let routingType = this.routingType;
let url01 = `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` + pamasId
+`&headerid=`+headerid +`&routingType=`+ routingType;
let url01 = `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` + pamasId +
`&headerid=` + headerid + `&routingType=` + routingType;
service.get(`${url01}`).then((res) => {
if(res.success){
if(res.result.equipids){
if (res.success) {
if (res.result.equipids) {
let equipids = res.result.equipids;
this.mainexecuteid = res.result.executeid;
this.$refs.mainView.getlistall(equipids)
this.$refs.mainView.getqc(this.mainexecuteid);
let bandleList = res.result.productCode;
let codeList = [];// 编号List
bandleList.map((item,index)=>{
let codeList = []; // 编号List
bandleList.map((item, index) => {
codeList.push(item.productcodes)
})
this.$refs.mainView.mainCodeList = codeList
......@@ -125,28 +130,27 @@ export default {
console.log(err)
})
},
getdisorder(pamasId){
getdisorder(pamasId) {
let diHeaderid = this.diHeaderid;
let diRoutingType = this.diRoutingType;
let url02 = `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` + pamasId
+`&headerid=`+diHeaderid +`&routingType=`+ diRoutingType;
let url02 = `${PlanUrl}/orderexecute/getorderproductandequip?orderId=` + pamasId +
`&headerid=` + diHeaderid + `&routingType=` + diRoutingType;
service.get(`${url02}`).then((res) => {
if(res.success){
if(res.result.equipids){
if (res.success) {
if (res.result.equipids) {
let equipids = res.result.equipids;
this.disexecuteid = res.result.executeid;
this.$refs.dispatched.getlistall(equipids)
this.$refs.dispatched.getqc(this.disexecuteid);
let bandleList = res.result.productCode;
let boardList = [];// 板次List
bandleList.map((item,index)=>{
let boardList = []; // 板次List
bandleList.map((item, index) => {
boardList.push(item.boardNumber)
})
this.$refs.dispatched.disCodeList = boardList
console.warn(boardList)
}
else {
} else {
console.log('获取专业工艺信息数据为空.')
}
} else {
......@@ -157,10 +161,10 @@ export default {
})
},
// 更换左侧
openView(v){
if(v==2){
this.basicmodal= false;
this.mainmodal= true;
openView(v) {
if (v == 2) {
this.basicmodal = false;
this.mainmodal = true;
// this.dispatchedmodal= false;
this.$refs.mainView.getqc(this.mainexecuteid);
}
......@@ -170,18 +174,18 @@ export default {
// // this.dispatchedmodal= true;
//  this.$refs.dispatched.getqc(this.disexecuteid);
// }
else{
this.basicmodal= true;
this.mainmodal= false;
else {
this.basicmodal = true;
this.mainmodal = false;
// this.dispatchedmodal= false;
}
},
},
watch:{
watch: {
basicData: {
handler(v, o) {
this.loaddata(v.id)
if(v){
if (v) {
this.actNum == '1'
this.openView(1)
}
......@@ -191,15 +195,18 @@ export default {
},
}
</script>
<style scoped>
.menuBg{
.menuBg {
background: none;
height: 630px;
}
.menuBg .ivu-menu-item{
.menuBg .ivu-menu-item {
color: #000;
}
.revieweBox{
.revieweBox {
padding: 0 0 0 60px;
height: 630px;
}
......
pages/qc/dataTrace/index.vue
View file @ 687df1cc
<template>
<div class="content">
<div class="content">
<!-- 搜索+按钮 -->
<div class="title_box mb10">
<div class="table_title">
<Input
search
enter-button
style="width:300px;"
v-model="orderSearchForm.SimpleSearch"
placeholder="请输入查询条件"
@on-search="tableSearch"
></Input>
<Input search enter-button style="width:300px;" v-model="orderSearchForm.SimpleSearch" placeholder="请输入查询条件" @on-search="tableSearch"></Input>
</div>
<Button type="primary" class="title_btn" @click="searchModel">高级查询</Button>
</div>
<div class="tableBox mb10" :style="{height:tbHeight}">
<div class="table">
<div>
<div v-if="listTask.length==0" class="wu_data">暂无数据</div>
<Row :gutter="16" :style="{width:rowWidth}">
<Col span="6" v-for="(item,index) in listTask" :key="index">
<Col :span="6" v-for="(item,index) in listTask" :key="index">
<Card class="card">
<h3 slot="title">
订单编号：{{item.mesCode}}
......@@ -44,20 +37,7 @@
<h3>暂无数据</h3>
</div>
</div>
<Page
class="mr10 fr"
id="pageComent"
show-total
size="small"
show-elevator
show-sizer
:total="search.total"
:current="search.pageIndex"
:page-size="search.pageSize"
:page-size-opts="showPagesize"
@on-change="pageChange"
@on-page-size-change="pageSizeChange"
/>
<Page class="mr10 fr" id="pageComent" show-total size="small" show-elevator show-sizer :total="search.total" :current="search.pageIndex" :page-size="search.pageSize" :page-size-opts="showPagesize" @on-change="pageChange" @on-page-size-change="pageSizeChange" />
<!-- 高级搜索弹框 -->
<Modal v-model="showModel" title="高级搜索" :width="800" :mask-closable="false">
<Form :model="orderSearchForm" ref="orderSearchForm" :label-width="100" inline>
......@@ -65,23 +45,14 @@
<Col span="12">
<FormItem label="产品名称" style="width:100%">
<Select v-model="orderSearchForm.productName" placeholder="请选择" style="width:240px;">
<Option
v-for="(item,index) in list"
:key="index"
:value="item.value"
style="display:none"
>{{item.label}}</Option>
<Option v-for="(item,index) in list" :key="index" :value="item.value" style="display:none">{{item.label}}</Option>
<Tree key="mytree" :data="data1" ref="mytree" :render="renderContent"></Tree>
</Select>
</FormItem>
</Col>
<Col span="12">
<FormItem label="状态" style="width:100%">
<dictionary
code="plan.order.status"
v-model="orderSearchForm.status"
style="width:240px"
></dictionary>
<dictionary code="plan.order.status" v-model="orderSearchForm.status" style="width:240px"></dictionary>
<Input v-model="orderSearchForm.productId" style="width:240px" v-if="false" />
</FormItem>
</Col>
......@@ -89,20 +60,12 @@
<Row>
<Col span="12">
<FormItem label="工艺编号" style="width:100%">
<Input
v-model="orderSearchForm.processcode"
placeholder="请输入工艺编号"
style="width: 240px"
/>
<Input v-model="orderSearchForm.processcode" placeholder="请输入工艺编号" style="width: 240px" />
</FormItem>
</Col>
<Col span="12">
<FormItem label="工艺名称" style="width:100%">
<Input
v-model="orderSearchForm.processname"
placeholder="请输入工艺名称"
style="width: 240px"
/>
<Input v-model="orderSearchForm.processname" placeholder="请输入工艺名称" style="width: 240px" />
</FormItem>
</Col>
</Row>
......@@ -122,41 +85,25 @@
<Row>
<Col span="12">
<FormItem label="紧急程度" style="width:100%">
<dictionary
code="plan.order.urgencyLevel"
v-model="orderSearchForm.urgencyLevel"
style="width:240px"
></dictionary>
<dictionary code="plan.order.urgencyLevel" v-model="orderSearchForm.urgencyLevel" style="width:240px"></dictionary>
</FormItem>
</Col>
<Col span="12">
<FormItem label="任务类型" style="width:100%">
<dictionary
code="plan.order.taskType"
v-model="orderSearchForm.taskType"
style="width:240px"
></dictionary>
<dictionary code="plan.order.taskType" v-model="orderSearchForm.taskType" style="width:240px"></dictionary>
</FormItem>
</Col>
</Row>
<Row>
<Col span="12">
<FormItem label="阶段" style="width:100%">
<dictionary
code="plan.order.stage"
v-model="orderSearchForm.stage"
style="width:240px"
></dictionary>
<dictionary code="plan.order.stage" v-model="orderSearchForm.stage" style="width:240px"></dictionary>
</FormItem>
</Col>
<Col span="12">
<FormItem label="材料" style="width:100%">
<dictionary
code="plan.order.material"
v-model="orderSearchForm.materialId"
style="width:240px"
></dictionary>
<dictionary code="plan.order.material" v-model="orderSearchForm.materialId" style="width:240px"></dictionary>
</FormItem>
</Col>
</Row>
......@@ -168,11 +115,7 @@
</Col>
<Col span="12">
<FormItem label="甲方客户" style="width:100%">
<dictionary
code="plan.order.guestName"
v-model="orderSearchForm.guestName"
style="width:240px"
></dictionary>
<dictionary code="plan.order.guestName" v-model="orderSearchForm.guestName" style="width:240px"></dictionary>
</FormItem>
</Col>
</Row>
......@@ -184,11 +127,7 @@
</Col>
<Col span="12">
<FormItem label="厂内责任主体部门" style="width:100%">
<dictionary
code="plan.order.mainDepartment"
v-model="orderSearchForm.mainDepartmentId"
style="width:240px"
></dictionary>
<dictionary code="plan.order.mainDepartment" v-model="orderSearchForm.mainDepartmentId" style="width:240px"></dictionary>
</FormItem>
</Col>
</Row>
......@@ -207,11 +146,7 @@
<Row>
<Col span="12">
<FormItem label="甲方技术输入文件(编号)" style="width:100%">
<Input
v-model="orderSearchForm.technologyDocmentCode"
placeholder
style="width:240px"
/>
<Input v-model="orderSearchForm.technologyDocmentCode" placeholder style="width:240px" />
</FormItem>
</Col>
<Col span="12">
......@@ -246,14 +181,20 @@
<Button @click="reviewOk" type="primary" style="margin-left:10px;">确定</Button>
</div>
</Modal>
</div>
</div>
</template>
<script>
import service from "@/plugins/request";
import reviewCount from "./components/reviewCount.vue";
export default {
components: { reviewCount },
async fetch({ store, params }) {
components: {
reviewCount
},
async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
data() {
......@@ -264,7 +205,7 @@ export default {
total: 0, //总数
conditions: []
},
rowWidth:'',
rowWidth: '',
showPagesize: [20, 50, 100],
showModel: false,
list: [],
......@@ -277,7 +218,7 @@ export default {
orderSearchForm: {
//高级搜索字段内容
MaxResultCount: 20,
SkipCount: 1,
SkipCount: 0,
SimpleSearch: "", //搜索框内容
productId: null, //产品id
productName: "", //产品名称
......@@ -315,7 +256,10 @@ export default {
this.laode();
this.tbHeight = window.innerHeight - 208 + "px";
},
async fetch({ store, params }) {
async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典
},
methods: {
......@@ -325,7 +269,7 @@ export default {
service
.post(`${url}`, {
MaxResultCount: 20,
SkipCount: 1
SkipCount: 0
})
.then(res => {
// console.log(res)
......@@ -382,7 +326,7 @@ export default {
.then(res => {
this.listTask = res.result.items;
this.search.total = res.result.totalCount;
if(this.listTask.length<4){
if (this.listTask.length < 4) {
this.rowWidth = "100%"
}
});
......@@ -393,14 +337,19 @@ export default {
async openDetails(lemData) {
this.$router.push({
name: "qcimplement",
params: { transmitData: lemData }
params: {
transmitData: lemData
}
});
},
renderContent(h, { root, node, data }) {
renderContent(h, {
root,
node,
data
}) {
//渲染树的样式
return h(
"span",
{
"span", {
style: {
color: data.isProduct != "1" ? "#249E91" : "#333", //根据选中状态设置样式
cursor: "pointer"
......@@ -421,7 +370,10 @@ export default {
this.selectdata = [];
this.selectdata = data;
this.list = [];
this.list.push({ label: data[0].title, value: data[0].id });
this.list.push({
label: data[0].title,
value: data[0].id
});
if (data[0].isProduct == "1") {
this.orderSearchForm.productName = data[0].id;
this.orderSearchForm.productId = data[0].productId;
......@@ -474,22 +426,27 @@ export default {
}
};
</script>
<style scoped>
#pageComent .ivu-select-dropdown {
top: 0 !important;
bottom: 36px;
}
ul,
li {
list-style: none;
}
.table_title {
width: 320px;
float: left;
}
.title_btn {
margin-top: 1px;
}
.tableBox {
/* height: 582px; 笔记本高度*/
/* height: 778px; */
......@@ -497,31 +454,38 @@ li {
overflow-y: scroll;
overflow-x: hidden;
}
.table {
margin: 10px 0 0 0;
display: -webkit-flex;
display: flex;
flex-wrap: wrap;
}
.no_data {
height: 800px;
text-align: center;
line-height: 800px;
}
.card{
.card {
margin: 10px 0 10px 20px;
}
.wu_data {
margin: 200px auto;
font-size: 18px;
}
.card_line{
.card_line {
height: 30px;
line-height: 30px;
}
.footer01 {
text-align: center;
}
.footer_btn {
border-top: 1px solid #ccc;
display: block;
......
pages/test.vue
View file @ 687df1cc
......@@ -17,13 +17,13 @@
<template>
<div class="flex fd test_layout">
<div>
<Menu mode="horizontal" theme="light" active-name="0">
<Menu mode="horizontal" theme="light" active-name="a0">
<div class="layout-assistant">
<MenuItem name="0" to="/test/example">基础组件</MenuItem>
<MenuItem name="1" to="/test/user">人员选择</MenuItem>
<MenuItem name="2" to="/test/com">异步组件</MenuItem>
<MenuItem name="4" to="/test/resource">资源选择</MenuItem>
<MenuItem name="3" to="/test/view">详情拖拽排版</MenuItem>
<MenuItem name="a0" to="/test/example">基础组件</MenuItem>
<MenuItem name="a1" to="/test/user">人员选择</MenuItem>
<MenuItem name="a2" to="/test/com">异步组件</MenuItem>
<MenuItem name="a4" to="/test/resource">资源选择</MenuItem>
<MenuItem name="a3" to="/test/view">详情拖拽排版</MenuItem>
</div>
</Menu>
</div>
......
pages/test/api.js
View file @ 687df1cc
......@@ -13,10 +13,16 @@ export const exampleRouter = [
},
{
route: '/test/example/table',
title: 'treeGrid组件',
title: '表格',
name: 'components-table',
icon: 'md-aperture'
},
{
route: '/test/example/tree',
title: '树',
name: 'tree',
icon: 'md-aperture'
},
{
route: '/test/example/select',
title: 'select组件',
......
pages/test/example/table/index.vue
View file @ 687df1cc
......@@ -21,6 +21,9 @@
</FormItem>
</Form>
</template>
<template slot-scope="{row,column,index}" slot="action">
<strong>aaaa</strong>
</template>
</DataGrid>
</div>
</template>
......@@ -62,6 +65,7 @@ export default {
easy: true,
sortable:true,
high: true,
slot:"cardNo",
tooltip: true,
},
],
......
pages/test/example/tree/index.vue 0 → 100644
View file @ 687df1cc
<template>
<div class="tree">
<TreeGrid :columns="columns" :items="treeData">
<template slot-scope="{row,column,index}" slot="name">
<Icon type="md-folder" /> {{row.name}}
</template>
<template slot-scope="{row,column,index}" slot="action">
<strong>{{row.action}}</strong>
</template>
</TreeGrid>
<!-- <Input v-model="data" type="textarea" rows="20" placeholder=""></Input> -->
</div>
</template>
<script>
import Mock from "mockjs";
export default {
name: "",
data() {
return {
columns: [
{
type: "selection",
width:50,
align:"center"
},
{
key: "name",
title: "名称",
tree:true,
slot:"name"
},
{
key: "status",
title: "状态",
width: "100"
},
{
key: "action",
title: "操作",
width: "100",
sortable:true,
slot:"action"
},
],
treeData1: [],
treeData: [
{
action: "510000202006085435",
name: "书加部保处",
status: 0,
children: [
{ action: "430000200008054924", name: "越组大过越", status: 0 },
{ action: "350000200106195747", name: "反走和报山", status: 1 },
{ action: "46000019920810827X", name: "强级法量少务持", status: 1 },
{ action: "620000198005286979", name: "况题米", status: 1 },
{ action: "440000200901093872", name: "又多为", status: 0 },
],
},
{ action: "510000199304272074", name: "参什叫", status: 1 },
{ action: "710000199110144186", name: "情克应个该农", status: 1 },
{ action: "140000201204175550", name: "阶研其交式", status: 1 },
{ action: "500000198710051748", name: "议开你集", status: 1 },
],
data: "",
};
},
mounted() {
// this.init();
},
methods: {
init() {
var data = Mock.mock({
"data|5": [
{
action: "@id",
name: "@ctitle",
"status|1": [0, 1],
},
],
});
console.warn(data);
this.data = JSON.stringify(data.data);
this.treeData = data.data;
},
},
};
</script>
<style lang="less" >
</style>
\ No newline at end of file
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