Commit 9c532ada authored by renjintao's avatar renjintao

resourceMangement/productionResources

parent 7176f54e
<template> <template>
<div class="resources-p h100"> <div class="resources-p h100">
<DataGrid <DataGrid :columns="columns" ref="grid" :action="action" :high="false" @on-selection-change="onSelect">
:columns="columns"
ref="grid"
:action="action"
:high="false"
@on-selection-change="onSelect"
>
<template slot="easySearch"> <template slot="easySearch">
<Form ref="formInline" :model="easySearch" inline> <Form ref="formInline" :model="easySearch" inline>
<FormItem prop="keys"> <FormItem prop="keys">
...@@ -43,15 +37,16 @@ ...@@ -43,15 +37,16 @@
</template> </template>
</DataGrid> </DataGrid>
<Modal v-model="editModal" title="设置日历" footer-hide> <Modal v-model="editModal" title="设置日历" footer-hide width="1000">
<Set :eid="curId" @on-close="cancel" @on-ok="addOk" /> <Set :eid="curId" @on-close="cancel" @on-ok="addOk" />
</Modal> </Modal>
<Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel"> <Modal v-model="deletelModal" title="删除" @on-ok="removeOk" @on-cancel="cancel">
<p>确定删除?</p> <p>确定删除?</p>
</Modal> </Modal>
</div> </div>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
...@@ -66,7 +61,10 @@ export default { ...@@ -66,7 +61,10 @@ export default {
return { return {
action: Api.index, action: Api.index,
easySearch: { easySearch: {
keys: { op: "title,code,type,departTitle", value: null }, keys: {
op: "title,code,type,departTitle",
value: null
},
}, },
entity: { entity: {
isimportant: "1", isimportant: "1",
...@@ -77,11 +75,23 @@ export default { ...@@ -77,11 +75,23 @@ export default {
deletelModal: false, deletelModal: false,
curId: 0, curId: 0,
rules: { rules: {
isimportant: [{ required: true, message: "必填", trigger: "blur" }], isimportant: [{
capabilityValue: [{ required: true, message: "必填", trigger: "blur" }], required: true,
message: "必填",
trigger: "blur"
}],
capabilityValue: [{
required: true,
message: "必填",
trigger: "blur"
}],
},
columns: [{
key: "id",
title: this.l("id"),
hide: true,
align: "left"
}, },
columns: [
{ key: "id", title: this.l("id"), hide: true, align: "left" },
{ {
type: "selection", type: "selection",
width: 70, width: 70,
...@@ -185,20 +195,29 @@ export default { ...@@ -185,20 +195,29 @@ export default {
width: 140, width: 140,
align: "center", align: "center",
render: (h, params) => { render: (h, params) => {
return h("div", { class: "action" }, [ return h("div", {
class: "action"
}, [
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "edit" }, oprate: "edit"
on: { click: () => this.edit(params.row.id) }, },
on: {
click: () => this.edit(params.row.id)
},
}, },
"设置" "设置"
), ),
h( h(
"op", "op", {
{ attrs: {
attrs: { oprate: "remove", title: "删除" }, oprate: "remove",
on: { click: () => this.remove(params.row.id) }, title: "删除"
},
on: {
click: () => this.remove(params.row.id)
},
}, },
"删除" "删除"
), ),
...@@ -211,7 +230,10 @@ export default { ...@@ -211,7 +230,10 @@ export default {
mounted() { mounted() {
console.log(this); console.log(this);
}, },
async fetch({ store, params }) { async fetch({
store,
params
}) {
await store.dispatch("loadDictionary"); // 加载数据字典 await store.dispatch("loadDictionary"); // 加载数据字典
}, },
methods: { methods: {
...@@ -234,7 +256,9 @@ export default { ...@@ -234,7 +256,9 @@ export default {
this.curId = id; this.curId = id;
}, },
removeOk() { removeOk() {
Api.delete({ id: this.curId }).then((r) => { Api.delete({
id: this.curId
}).then((r) => {
if (r.success) { if (r.success) {
this.$refs.grid.load(); this.$refs.grid.load();
this.deletelModal = false; this.deletelModal = false;
...@@ -300,20 +324,25 @@ export default { ...@@ -300,20 +324,25 @@ export default {
}, },
}; };
</script> </script>
<style lang="less"> <style lang="less">
@import "../../../assets/css/custom.less"; @import "../../../assets/css/custom.less";
.resources-p { .resources-p {
.form-row { .form-row {
width: 600px; width: 600px;
margin-left: 50px; margin-left: 50px;
.ivu-form-item-label { .ivu-form-item-label {
color: @form-color; color: @form-color;
} }
} }
.ivu-footer-toolbar-right { .ivu-footer-toolbar-right {
width: 1100px; width: 1100px;
position: relative !important; position: relative !important;
} }
.btn { .btn {
position: absolute !important; position: absolute !important;
top: 12px !important; top: 12px !important;
......
<template> <template>
<Form ref="form" :model="formItem" :rules="rules" :label-width="90"> <Form ref="form" :model="formItem" :rules="rules" :label-width="110">
<Row> <Row>
<Col span="12"> <Col span="12">
<FormItem label="资源名称" prop="equip_name"> <FormItem label="资源名称" prop="equip_name">
...@@ -13,19 +13,15 @@ ...@@ -13,19 +13,15 @@
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem label="工作日历" prop="work"> <FormItem label="工作日历" prop="work">
<Select v-model="formItem1.calendarwork_pk" clearable placeholder="请选择..."> <Select v-model="formItem1.calendarwork_pk" filterable clearable placeholder="请选择...">
<Option v-for="item in workList" :value="item.id" :key="item.calName">{{ item.calName }}</Option> <Option v-for="item in workList" :value="item.id" :key="item.calName">{{ item.calName }}</Option>
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
<Col :span="12"> <Col :span="12">
<FormItem label="加班日历" prop="overtime"> <FormItem label="加班日历" prop="overtime">
<Select v-model="formItem2.calendarovertime_pk" clearable placeholder="请选择..."> <Select v-model="formItem2.calendarovertime_pk" filterable clearable placeholder="请选择...">
<Option <Option v-for="item in overtimeList" :value="item.id" :key="item.holidayCalName">{{ item.holidayCalName }}</Option>
v-for="item in overtimeList"
:value="item.id"
:key="item.holidayCalName"
>{{ item.holidayCalName }}</Option>
</Select> </Select>
</FormItem> </FormItem>
</Col> </Col>
...@@ -48,8 +44,9 @@ ...@@ -48,8 +44,9 @@
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button> <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button> <Button @click="handleClose" class="ml20">取消</Button>
</FormItem> </FormItem>
</Form> </Form>
</template> </template>
<script> <script>
import Api from "./api"; import Api from "./api";
export default { export default {
...@@ -76,7 +73,11 @@ export default { ...@@ -76,7 +73,11 @@ export default {
}, },
entity: {}, entity: {},
rules: { rules: {
name: [{ required: true, message: "必填", trigger: "blur" }], name: [{
required: true,
message: "必填",
trigger: "blur"
}],
}, },
}; };
}, },
...@@ -109,7 +110,9 @@ export default { ...@@ -109,7 +110,9 @@ export default {
}); });
}, },
load(v) { load(v) {
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.capabilityValue = r.result.capabilityValue;
......
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