This commit is contained in:
xingquansheng
2019-09-21 17:08:22 +08:00
parent 52e223101a
commit 50c66e917e
36 changed files with 401 additions and 386 deletions

View File

@@ -31,7 +31,7 @@
type="date"
placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()"></el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()"></el-button>
</div>
</el-card>
<el-card>
@@ -41,14 +41,14 @@
:row-key="getRowKeys"
:expand-row-keys="expands"
style="width: 100%"
height="700"
height="460"
border
stripe
size="mini"
@expand-change="selectMachine">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="tableData2" border style="width: 612px; text-align: center" size="mini">
<el-table :data="tableData2" class="" border stripe style="width: 612px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -68,12 +68,12 @@
<template slot-scope="scope">
<el-button
size="mini"
type="warning"
type="text"
icon="el-icon-edit"
@click="editMachine(scope.row);flag = 2">编辑</el-button>
<el-button
size="mini"
type="danger"
type="text"
icon="el-icon-delete"
@click="deleteMachine(scope.row)">删除</el-button>
</template>
@@ -88,7 +88,7 @@
</template>
</template>
</el-table-column>
<el-table-column align="center" label="项目名称" width="150">
<el-table-column align="center" label="项目名称" min-width="150">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
@@ -98,7 +98,7 @@
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<el-table-column align="center" label="合同信息备注" width="150">
<el-table-column align="center" label="合同信息备注" min-width="200">
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
@@ -108,16 +108,19 @@
<el-button
size="mini"
type="warning"
plain
icon="el-icon-plus"
@click.stop="addMachine(scope.row);flag = 1">机床</el-button>
<el-button
size="mini"
plain
type="primary"
icon="el-icon-edit"
@click.stop="handleEdit(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click.stop="handleDelete(scope.row)">删除</el-button>
</template>
@@ -135,7 +138,7 @@
</div>
</el-card>
<!--新增合同信息对话框-->
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
<el-row>
<el-col :span="24">
@@ -172,8 +175,7 @@
<el-button type="primary" @click="submit('form')"> </el-button>
</div>
</el-dialog>
<el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
<el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
<el-form-item v-show="flag != 2" label="项目名称" prop="项目名称">
<el-input v-model="form1.项目名称" size="small" style="width:200px"/>