Commit 40cb288a authored by renjintao's avatar renjintao

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

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