Skip to content

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

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

parents 49df4b2a d5afbeb0
Hide whitespace changes
Inline Side-by-side
Showing with 82 additions and 41 deletions
pages/processManage/Process/processNew.vue
View file @ 40cb288a
......@@ -122,7 +122,7 @@
</FormItem> -->
<FormItem :label="l('performancehours')" >
<FormItem :label="l('performanceHours')" >
<InputNumber v-model="formprocessValidate.performance_hours"></InputNumber>
</FormItem>
......@@ -278,7 +278,7 @@ export default {
},
{
key: 'performance_hours',
title: this.l('performancehours')
title: this.l('performanceHours')
},
// {
// key: 'check_flag',
......
pages/resourceManagement/deviceManagementCP/components/newEquipment.vue
View file @ 40cb288a
......@@ -55,17 +55,17 @@
<inputFile ref="refqcFile" v-model="imgName" :parms="qcfileparms" files />
</FormItem>
</Col>
<Col span="11" offset="1">
<!-- <Col span="11" offset="1">
<FormItem label="是否关重" prop="isimportant">
<Select v-model="isimportant">
<Option :value="1">是</Option>
<Option :value="2">否</Option>
</Select>
</FormItem>
</Col>
</Col> -->
</Row>
<Row :gutter="16">
<Col span="11">
<!-- <Col span="11">
<FormItem label="能力系数">
<InputNumber
:min="0"
......@@ -74,7 +74,7 @@
style="width:240px"
></InputNumber>
</FormItem>
</Col>
</Col> -->
<Col span="11" offset="1">
<FormItem label="位置" prop="location">
<Input v-model="formItem.location" placeholder="请输入位置"></Input>
......@@ -132,12 +132,12 @@ export default {
equip_ip: "",
shop_id: "",
shop_name: "",
isimportant: 2,
// isimportant: 2,
location: "",
capability_value: 1
// capability_value: 1
},
property: true,
isimportant: 2,
// isimportant: 2,
ruleValidate: {
equip_id: [
{
......@@ -234,9 +234,9 @@ export default {
equip_ip: this.formItem.equip_ip,
shop_id: this.formItem.shop_id,
eqstyle: str,
isimportant: this.isimportant,
// isimportant: this.isimportant,
location: this.formItem.location,
capability_value: this.formItem.capability_value,
// capability_value: this.formItem.capability_value,
property: this.property,
shop_name: this.formItem.shop_name
};
......@@ -277,9 +277,9 @@ export default {
equip_ip: this.formItem.equip_ip,
shop_id: this.formItem.shop_id,
eqstyle: str,
isimportant: this.isimportant,
// isimportant: this.isimportant,
location: this.formItem.location,
capability_value: this.formItem.capability_value,
// capability_value: this.formItem.capability_value,
property: this.property,
shop_name: this.formItem.shop_name
};
......
pages/resourceManagement/deviceManagementCP/index.vue
View file @ 40cb288a
......@@ -5,10 +5,12 @@
<h3 class="zh-title">组织架构</h3>
<div class="zh-box">
<Input search placeholder="请输入查询条件" clearable v-model="treeInputSearch" />
<Tree :data="searchList"
:style="{height:(treeHeight-115)+'px'}"
style="overflow-y:auto;overflow-x:hiden;width:215px;"
@on-select-change="selectTreeNode"></Tree>
<Tree
:data="searchList"
:style="{height:(treeHeight-115)+'px'}"
style="overflow-y:auto;overflow-x:hiden;width:215px;"
@on-select-change="selectTreeNode"
></Tree>
</div>
</div>
<!-- 右侧内容 -->
......@@ -535,23 +537,23 @@ export default {
title: "所属部门",
key: "shop_name"
},
{
title: "是否关重",
key: "isimportant",
render: (h, params) => {
let statuse = params.row.isimportant;
let text = statuse == 1 ? "是" : statuse == 2 ? "否" : "";
return h("span", {}, text);
}
},
// {
// title: "是否关重",
// key: "isimportant",
// render: (h, params) => {
// let statuse = params.row.isimportant;
// let text = statuse == 1 ? "是" : statuse == 2 ? "否" : "";
// return h("span", {}, text);
// }
// },
{
title: "位置",
key: "location"
},
{
title: "能力系数",
key: "capability_value"
},
// {
// title: "能力系数",
// key: "capability_value"
// },
{
title: "操作",
key: "action",
......@@ -577,7 +579,7 @@ export default {
attrs: {
oprate: "edit",
// class: "edit",
title: "编辑"
title: "编辑"
},
on: {
click: () => {
......@@ -591,7 +593,8 @@ export default {
"op",
{
attrs: {
oprate: "delete",title: "删除"
oprate: "delete",
title: "删除"
},
style: {
color: "red"
......@@ -608,7 +611,8 @@ export default {
"op",
{
attrs: {
oprate: "detail",title: "保养"
oprate: "detail",
title: "保养"
},
on: {
click: () => {
......@@ -622,7 +626,8 @@ export default {
"op",
{
attrs: {
oprate: "detail",title: "维修"
oprate: "detail",
title: "维修"
},
on: {
click: () => {
......
pages/resourceManagement/productionResources/index.vue
View file @ 40cb288a
......@@ -23,8 +23,8 @@
<Col span="8">
<FormItem :label="l('isimportant')" prop="isimportant">
<RadioGroup v-model="entity.isimportant">
<Radio label="0">是</Radio>
<Radio label="1">否</Radio>
<Radio label="1">是</Radio>
<Radio label="2">否</Radio>
</RadioGroup>
</FormItem>
</Col>
......@@ -132,6 +132,23 @@ export default {
easy: true,
high: true
},
{
key: "isimportant",
title: this.l("isimportant"),
align: "left",
render: (h, params) => {
let statuse = params.row.isimportant;
let text = statuse == 1 ? "是" : statuse == 2 ? "否" : "";
return h("span", {}, text);
}
},
{
key: "capabilityValue",
title: this.l("capabilityValue"),
align: "left",
easy: true,
high: true
},
{
key: "calId",
title: this.l("calId"),
......@@ -173,12 +190,12 @@ export default {
attrs: { oprate: "edit" },
on: { click: () => this.edit(params.row.id) }
},
"设置日历"
"设置"
),
h(
"op",
{
attrs: { oprate: "remove",title: "删除" },
attrs: { oprate: "remove", title: "删除" },
on: { click: () => this.remove(params.row.id) }
},
"删除"
......
pages/resourceManagement/productionResources/set.vue
View file @ 40cb288a
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Form ref="form" :model="formItem" :rules="rules" :label-width="90">
<Row>
<Col span="12">
<FormItem label="资源名称" prop="equip_name">
......@@ -29,6 +29,19 @@
</Select>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="是否关重" prop="isimportant">
<RadioGroup v-model="formItem.isimportant">
<Radio label="1">是</Radio>
<Radio label="2">否</Radio>
</RadioGroup>
</FormItem>
</Col>
<Col :span="12">
<FormItem label="能力值" prop="capabilityValue">
<Input v-model="formItem.capabilityValue" placeholder="请输入能力值"></Input>
</FormItem>
</Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
......@@ -47,7 +60,9 @@ export default {
overtimeList: [],
formItem: {
equip_name: "",
equip_id: ""
equip_id: "",
isimportant: "",
capabilityValue: ""
},
formItem1: {
id: 0,
......@@ -97,6 +112,8 @@ export default {
Api.get({ id: v }).then(r => {
this.formItem.equip_name = r.result.title;
this.formItem.equip_id = r.result.code;
this.formItem.capabilityValue = r.result.capabilityValue;
this.formItem.isimportant = r.result.isimportant + "";
this.formItem1.calendarwork_pk = r.result.calKey;
this.formItem2.calendarovertime_pk = r.result.holidayKey;
this.formItem1.equip_pk = r.result.id;
......@@ -109,7 +126,9 @@ export default {
this.disabled = true;
Api.update({
equipCalendarWork: this.formItem1,
equipCalendarOverTime: this.formItem2
equipCalendarOverTime: this.formItem2,
isimportant: this.formItem.isimportant,
capabilityValue: this.formItem.capabilityValue
})
.then(r => {
this.disabled = false;
......
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