meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

样式

Browse Source
This commit is contained in:
zhangdingyu
2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/views/MarketingCenter/CreateProject/index.vue
View File

@@ -3,18 +3,13 @@
<el-card>
<div>
<span>项目名称：</span>
<<<<<<< HEAD
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="margin-top: 3px">
=======
<el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-option
v-for="item in entryName"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<<<<<<< HEAD
<span style="margin-left: 10px">机床型号：</span>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
</div>
@@ -23,31 +18,14 @@
<el-date-picker
v-model="startTime"
style="width: 200px;"
=======
<span style="">机床型号：</span>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
</div>
<div style="margin-top: 20px">
<span style="margin-top: 20px">开始日期：</span>
<el-date-picker
v-model="startTime"
style="width: 205px;"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
value-format="yyyy-MM-dd"
size="small"
type="date"
placeholder="请选择开始日期"/>
<<<<<<< HEAD
<span style="margin-left: 10px">结束日期：</span>
<el-date-picker
v-model="endTime"
style="width: 200px;"
=======
<span style="">结束日期：</span>
<el-date-picker
v-model="endTime"
style="width: 205px;"
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -63,20 +41,12 @@
:row-key="getRowKeys"
:expand-row-keys="expands"
style="width: 100%"
<<<<<<< HEAD
height="700"
border
stripe
size="mini"
@expand-change="selectMachine">
<el-table-column type="expand" label="详情">
=======
height="500"
border
size="mini"
@expand-change="selectMachine">
<el-table-column type="expand">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-table :data="tableData2" border style="width: 612px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center" width="150">
@@ -111,49 +81,29 @@
</el-table>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同编号" width="150">
=======
<el-table-column align="center" label="合同编号">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<template>
<el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
</template>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="项目名称" width="150">
=======
<el-table-column align="center" label="项目名称">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="项目下达日期" width="150">
=======
<el-table-column align="center" label="项目下达日期">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同签订日期 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column align="center" label="合同信息备注" width="150">
=======
<el-table-column align="center" label="合同信息备注" width="200">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
{{ scope.row.合同信息备注 }}
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="操作" align="center" width="350">
=======
<el-table-column label="操作" fixed="right" align="center">
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<template slot-scope="scope">
<el-button
size="mini"
@@ -198,10 +148,7 @@
<el-date-picker
v-model="form.contractSigningDate"
style="width: 200px"
<<<<<<< HEAD
format="yyyy-MM-dd"
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
value-format="yyyy-MM-dd"
size="small"
type="date"
@@ -228,12 +175,9 @@
<el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
<el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
<<<<<<< HEAD
<el-form-item v-show="flag != 2" label="项目名称" prop="项目名称">
<el-input v-model="form1.项目名称" size="small" style="width:200px"/>
</el-form-item>
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
<el-form-item label="设备型号" prop="设备型号">
<el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
</el-form-item>
@@ -254,10 +198,7 @@
<script>
import elInput from 'element-ui/packages/input'
<<<<<<< HEAD
import { getNowTime } from '@/utils/tool'
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
import { initProject, searchTable1, selectMachine, addList, editchar, delList, submitMachine, editMachine, delMachine } from '@/api/MarketingCenter/CreateProject'
export default {
components: {
@@ -300,10 +241,7 @@ export default {
dialogFormVisible2: false,
title1: '',
form1: {
<<<<<<< HEAD
项目名称: '',
=======
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
设备型号: '',
设备名称: '',
机床数量: 1
@@ -368,14 +306,9 @@ export default {
ADD() {
this.addForm('form')
this.dialogFormVisible1 = true
<<<<<<< HEAD
this.form.contractSigningDate = getNowTime()// new Date()
this.temp = 1
this.title = '新增项目'
=======
this.temp = 1
this.title = '增加'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
// 提交添加或者修改
submit(formName) {
@@ -409,11 +342,7 @@ export default {
},
handleEdit(row) {
this.editForm(row, 'form')
<<<<<<< HEAD
this.title = '编辑项目'
=======
this.title = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.dialogFormVisible1 = true
this.form.contractSigningDate = row.合同签订日期
this.form.contractNumber = row.合同编号
@@ -439,14 +368,9 @@ export default {
addMachine(row) {
this.projectNum = row.项目流水号
this.dialogFormVisible2 = true
<<<<<<< HEAD
this.title1 = '新增机床'
this.addForm('form1')
this.form1.项目名称 = row.项目名称
=======
this.title1 = '新增'
this.addForm('form1')
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
},
submitMachine() {
function a() {
@@ -473,11 +397,7 @@ export default {
this.flag = 2
this.editForm(row, 'form1')
this.dialogFormVisible2 = true
<<<<<<< HEAD
this.title1 = '编辑机床'
=======
this.title1 = '编辑'
>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
this.c = row.机床流水号
this.form1.设备型号 = row.机床图号
this.form1.设备名称 = row.机床名称