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

更新

Browse Source
This commit is contained in:
liushuai
2019-09-19 19:52:46 +08:00
parent faab73c1fa
commit aef7132f40
49 changed files with 733 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/api/Inventory/MaterialOut.js
View File

@@ -142,6 +142,18 @@ export function pickingSubmit(...params) {
} }
}) })
} }
// 备注
export function updateRemark(...params) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间装配管理_领料单明细_编辑数据',
param: `领料单明细流水号=${params[0]}&备注=${params[1]}`
}
})
}
// 归还 // 归还
export function sendBack(...params) { export function sendBack(...params) {
return request({ return request({

4
src/api/ManufacturingCenter/ActualTimeSupplement.js
View File

@@ -72,14 +72,14 @@ export function getParts(stepNumber, a, b, c, d, e, f, g) {
}) })
} }
// 提交新增 // 提交新增
export function submitAdd(num1, time, num2, person) { export function submitAdd(num1, time, num2, person, num3) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间生产管理_修补工时_增加数据', name: '车间生产管理_修补工时_增加数据',
param: `工序流水号=${num1}&修补工时=${time}&数量=${num2}&修补人员编号=${person}` param: `工序流水号=${num1}&修补工时=${time}&数量=${num2}&修补人员编号=${person}&操作者编号=${num3}`
} }
}) })
} }

4
src/api/WorkshopProcurement/AccountingPrice.js
View File

@@ -25,14 +25,14 @@ export function searchParts(pageCurrent, pageSize, check1, num) {
}) })
} }
// 保存 // 保存
export function Preservation(id, num, num1) { export function Preservation(id, num) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '2', type: '2',
name: '车间管理_核算总额_编辑数据', name: '车间管理_核算总额_编辑数据',
param: `请购单明细流水号组=${id}&核算总额组=${num}&核算单价组=${num1}` param: `采购合同明细流水号=${id}&单价=${num}`
} }
}) })
} }

BIN
src/assets/img/img10.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
src/assets/img/img5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
src/assets/img/img6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
src/assets/img/img7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
src/assets/img/img8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
src/assets/img/img9.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

9
src/styles/index.scss
View File

@@ -109,7 +109,7 @@ el-form-item__content{
//background-color: #2e296a!important; //background-color: #2e296a!important;
} }
.el-card__body{ .el-card__body{
padding: 0px !important; padding: 10px !important;
margin: 0px !important; margin: 0px !important;
} }
.app-container{ .app-container{
@@ -167,3 +167,10 @@ el-card{
border-color: #ff9759; border-color: #ff9759;
} }
} }
.el-input__inner:focus {
border: 1px solid #1b55a0!important;
height: 29px;
}
.el-input--small .el-input__inner {
height: 29px;
}

2
src/utils/request.js
View File

@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://123.56.95.229:8023/submit/MESCommonBase.ashx`, baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间
}) })

14
src/views/Assembly/SparePartsOutStockRecord/index.vue
View File

@@ -3,7 +3,7 @@
<el-card> <el-card>
<el-row> <el-row>
<span>机床编号:</span> <span>机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()"> <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin: 3px 0" clearable @change="machineChange()">
<el-option <el-option
v-for="item in machineNumber" v-for="item in machineNumber"
:key="item.value" :key="item.value"
@@ -13,7 +13,7 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div> <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option> </el-option>
</el-select> </el-select>
<span>组号:</span> <span style="margin-left: 10px">组号:</span>
<el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable> <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
<el-option <el-option
v-for="item in groupNumber" v-for="item in groupNumber"
@@ -21,9 +21,9 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>零件图号:</span> <span style="margin-left: 10px">零件图号:</span>
<el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 200px" size="small" clearable/> <el-input v-model="PartDrawingNumber" filterable placeholder="零件图号" style="width: 200px" size="small" clearable/>
<span class="demonstration">时间区间:</span> <span class="demonstration" style="margin-left: 10px">时间区间:</span>
<el-date-picker <el-date-picker
v-model="startTime" v-model="startTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
@@ -39,11 +39,11 @@
style="width: 160px" style="width: 160px"
type="date" type="date"
placeholder="选择日期"/> placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=10; pageCurrent=1;selecttable()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=20; pageCurrent=1;selecttable()">查询</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px"> <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 3px" height="700px">
<el-table-column label="项目名称" align="center"> <el-table-column label="项目名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
@@ -103,7 +103,7 @@ export default {
tableData1: [], tableData1: [],
loading: false, loading: false,
total: null, // 总条数 total: null, // 总条数
pageSize: 10, // 每页显示条数 pageSize: 20, // 每页显示条数
pageCurrent: 1 // 后台获取页 pageCurrent: 1 // 后台获取页
} }
}, },

32
src/views/BasicData/WorkshopProcessMaintenance/index.vue
View File

@@ -61,7 +61,7 @@
@expand-change="searchTechnologicalRequirementsOfProcessNum"> @expand-change="searchTechnologicalRequirementsOfProcessNum">
<el-table-column type="expand" label="详情"> <el-table-column type="expand" label="详情">
<template slot-scope="scope"> <template slot-scope="scope">
<el-table :data="tableData3" border stripe style="width: 40%"> <el-table :data="tableData3" class="subTableHeader" border stripe size="mini" style="width: 40%">
<el-table-column label="工艺要求" align="center"> <el-table-column label="工艺要求" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺要求 }} {{ scope.row.工艺要求 }}
@@ -124,7 +124,7 @@
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
<el-dialog :visible.sync="dialogFormVisible1" title="新增工艺分类" center style="min-height: 300px" width="400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="新增工艺分类" center style="min-height: 300px" width="400px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" > <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" >
<el-form-item label="工艺分类" prop="ProcessClassification"> <el-form-item label="工艺分类" prop="ProcessClassification">
<el-input v-model="form1.ProcessClassification" size="small" clearable style="width:200px"/> <el-input v-model="form1.ProcessClassification" size="small" clearable style="width:200px"/>
@@ -136,7 +136,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="编辑工艺分类" center style="min-height: 300px" width="400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="编辑工艺分类" center style="min-height: 300px" width="400px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" > <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" >
<el-form-item label="工艺分类" prop="ProcessClassification"> <el-form-item label="工艺分类" prop="ProcessClassification">
<el-input v-model="form1.ProcessClassification" size="small" clearable style="width:200px"/> <el-input v-model="form1.ProcessClassification" size="small" clearable style="width:200px"/>
@@ -148,7 +148,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible3" title="新增工艺" center style="min-height: 300px" width="400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="新增工艺" center style="min-height: 300px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" > <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" >
<el-form-item label="工艺名称" prop="Process"> <el-form-item label="工艺名称" prop="Process">
<el-input v-model="form2.Process" size="small" clearable style="width:200px"/> <el-input v-model="form2.Process" size="small" clearable style="width:200px"/>
@@ -163,7 +163,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible4" title="编辑工艺" center style="min-height: 300px" width="400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="编辑工艺" center style="min-height: 300px" width="400px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" > <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" >
<el-form-item label="工艺名称" prop="Process"> <el-form-item label="工艺名称" prop="Process">
<el-input v-model="form2.Process" size="small" clearable style="width:200px"/> <el-input v-model="form2.Process" size="small" clearable style="width:200px"/>
@@ -178,7 +178,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible5" title="新增工艺要求" center style="min-height: 300px" width="400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible5" title="新增工艺要求" center style="min-height: 300px" width="400px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" > <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" >
<el-form-item label="工艺要求" prop="Process"> <el-form-item label="工艺要求" prop="Process">
<el-input v-model="form3.TechnologicalRequirements" size="small" clearable style="width:200px"/> <el-input v-model="form3.TechnologicalRequirements" size="small" clearable style="width:200px"/>
@@ -190,7 +190,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible6" title="编辑工艺要求" center style="min-height: 300px" width="400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible6" title="编辑工艺要求" center style="min-height: 300px" width="400px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" > <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" >
<el-form-item label="工艺要求" prop="TechnologicalRequirements"> <el-form-item label="工艺要求" prop="TechnologicalRequirements">
<el-input v-model="form3.TechnologicalRequirements" size="small" clearable style="width:200px"/> <el-input v-model="form3.TechnologicalRequirements" size="small" clearable style="width:200px"/>
@@ -496,7 +496,7 @@ export default {
return row.工艺编号 return row.工艺编号
}, },
delProcess(row) { delProcess(row) {
this.$confirm('此操作将永久删除该行, 是否继续?', '提示', { this.$confirm('此操作将永久删除' + row.工艺名称 + '行, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
@@ -590,3 +590,19 @@ export default {
/* }!**!*/ /* }!**!*/
</style> </style>
<style lang="scss">
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
}
</style>

25
src/views/Inventory/Inboundscanning/index.vue
View File

@@ -1,20 +1,30 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<span style="margin: 5px">零件图号</span> <el-row>
<el-input v-model="Partpaint" clearable size="small" style="width:200px" /> <span style="margin-left: 10px">零件图号</span>
<el-input v-model="Partpaint" clearable size="small" style="width:200px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
<el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button> <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
<el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" @click="Empty()">清空</el-button> <el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>
<el-button type="primary" size="small" class="el-icon-success" style="margin: 0 0 0 10px" @click="Innumber">入库</el-button> <el-button type="warning" size="small" class="el-icon-success" style="margin: 0 0 0 10px" plain @click="Innumber">入库</el-button>
</el-row>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="listLoading" :data="tableDataNum" border size="mini" style="width: 100%" height="650px"> <el-table
v-loading="listLoading"
:data="tableDataNum"
stripe="true"
highlight-current-row
border
size="mini"
style="width: 100%;margin: 3px 0px"
height="650px">
<el-table-column <el-table-column
label="序号" label="序号"
align="center" align="center"
type="index" type="index"
width="50"/> width="55"/>
<el-table-column label="项目名称" align="center" min-width="100"> <el-table-column label="项目名称" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.项目名称 }} {{ scope.row.项目名称 }}
@@ -73,6 +83,7 @@
:disabled="scope.row.是否禁用" :disabled="scope.row.是否禁用"
size="mini" size="mini"
type="danger" type="danger"
plain
class="el-icon-delete" class="el-icon-delete"
@click="handleDelete(scope.$index, scope.row)">移除</el-button> @click="handleDelete(scope.$index, scope.row)">移除</el-button>
</template> </template>
@@ -310,6 +321,6 @@ export default {
<style scoped> <style scoped>
.el-card { .el-card {
margin-bottom: 15px; margin-bottom: 3px;
} }
</style> </style>

23
src/views/Inventory/MaterialOut/index.vue
View File

@@ -85,21 +85,26 @@
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总数量" align="center" min-width="70"> <el-table-column label="总数量" align="center" min-width="40">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.总数量 }} {{ scope.row.总数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备件数量" align="center" min-width="70"> <el-table-column label="备件数量" align="center" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.备件数量 }} {{ scope.row.备件数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="已领数量" align="center" min-width="70"> <el-table-column label="已领数量" align="center" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.出库数量 }} {{ scope.row.出库数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" min-width="140">
<template slot-scope="scope">
<el-input v-model="scope.row.备注" size="mini" @change="UpdateRemark(scope.row)"/>
</template>
</el-table-column>
<el-table-column v-if="true" label="备料确认" align="center" width="100"> <el-table-column v-if="true" label="备料确认" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已确认</el-tag> <el-tag v-if="Number(scope.row.是否备料确认)===1" size="mini" type="success">已确认</el-tag>
@@ -294,7 +299,7 @@
</template> </template>
<script> <script>
import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, errorRecord, searchStockNumber3, initOutType, pickingSubmit } from '@/api/Inventory/MaterialOut' import { sendBack, initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber1, searchStockNumber2, submitOutStore, updateRemark, errorRecord, searchStockNumber3, initOutType, pickingSubmit } from '@/api/Inventory/MaterialOut'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import request from '@/utils/request' import request from '@/utils/request'
export default { export default {
@@ -460,6 +465,15 @@ export default {
} }
}) })
}, },
UpdateRemark(row) {
updateRemark(row.领料单明细流水号, row.备注).then(response => {
if (response.data[0].result === '1') {
this.$message.success('编辑成功')
} else {
this.$message.error('编辑失败')
}
})
},
// 多选 // 多选
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = [] this.multipleSelection = []
@@ -609,6 +623,7 @@ export default {
row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow row && row.领料单编号 ? this.pickingListNumberShow = row.领料单编号 : this.pickingListNumberShow
row && row.姓名 ? this.form3.personName = row.姓名 : this.form3.personName row && row.姓名 ? this.form3.personName = row.姓名 : this.form3.personName
searchListDetail(this.pickingListNum).then(res => { searchListDetail(this.pickingListNum).then(res => {
console.log(res.data)
this.pickListTable2 = res.data this.pickListTable2 = res.data
}) })
}, },

16
src/views/Inventory/OutPartSelect/index.vue
View File

@@ -1,8 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<span>机床号:</span> <span style="margin-left: 10px">机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()"> <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-option <el-option
v-for="item in Machines" v-for="item in Machines"
:key="item.value" :key="item.value"
@@ -26,11 +26,19 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="listLoading1" :data="tableData1" class="table" border height="650"> <el-table
v-loading="listLoading1"
:data="tableData1"
class="table"
stripe="true"
size="mini"
highlight-current-row
border
height="380">
<el-table-column <el-table-column
label="序号" label="序号"
align="center" align="center"
width="50" width="55"
type="index"/> type="index"/>
<el-table-column align="center" label="零件名称" width="150px"> <el-table-column align="center" label="零件名称" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">

16
src/views/Inventory/StockInquiry/index.vue
View File

@@ -1,8 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<span>机床号:</span> <span style="margin-left: 10px">机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()"> <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;margin-bottom: 10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-option <el-option
v-for="item in Machines" v-for="item in Machines"
:key="item.value" :key="item.value"
@@ -26,11 +26,19 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="listLoading1" :data="tableData1" class="table" border height="650"> <el-table
v-loading="listLoading1"
:data="tableData1"
stripe="true"
size="mini"
highlight-current-row
class="table"
border
height="380">
<el-table-column <el-table-column
label="序号" label="序号"
align="center" align="center"
width="50" width="55"
type="index"/> type="index"/>
<el-table-column align="center" label="零件名称" width="150px"> <el-table-column align="center" label="零件名称" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">

32
src/views/ManufacturingCenter/ActualTimeSupplement/index.vue
View File

@@ -7,7 +7,7 @@
v-model="startTime1" v-model="startTime1"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="small" size="small"
style="width: 160px" style="width: 160px;margin-top: 10px"
type="date" type="date"
placeholder="选择日期"/> placeholder="选择日期"/>
<span class="demonstration">~</span> <span class="demonstration">~</span>
@@ -37,7 +37,7 @@
</el-row> </el-row>
<el-row> <el-row>
<span>操作者:</span> <span>操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px"/> <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px; margin-top: 10px;margin-bottom: 10px"/>
<span>零件图号:</span> <span>零件图号:</span>
<el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:200px"/> <el-input v-model="partNumber" placeholder="零件图号" size="small" clearable style="width:200px"/>
<span>工艺名称:</span> <span>工艺名称:</span>
@@ -48,8 +48,15 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table :data="tableData" height="650" style="width: 100%;" border> <el-table
<el-table-column label="序号" type="index" align="center" width="50"/> :data="tableData"
height="440"
stripe="true"
size="mini"
highlight-current-row
style="width: 100%;"
border>
<el-table-column label="序号" type="index" align="center" width="55"/>
<el-table-column label="零件图号" align="center" min-width="150px"> <el-table-column label="零件图号" align="center" min-width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
@@ -60,12 +67,12 @@
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="完成数量" align="center" min-width="80px"> <el-table-column label="完成数量" align="center" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.完成数量 }} {{ scope.row.完成数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工艺名称" align="center" min-width="80px"> <el-table-column label="工艺名称" align="center" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
@@ -85,7 +92,7 @@
{{ scope.row.加工完成时间 || '—' }} {{ scope.row.加工完成时间 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实际工时" align="center" min-width="80px"> <el-table-column label="实际工时" align="center" min-width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.实际加工时间段 || '—' }} {{ scope.row.实际加工时间段 || '—' }}
</template> </template>
@@ -116,20 +123,22 @@
{{ scope.row.修补人 || '—' }} {{ scope.row.修补人 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="240px" fixed="right"> <el-table-column label="操作" align="center" min-width="300" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.isEditing" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button> <el-button v-if="scope.row.isEditing" type="mini" plain size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
<el-button v-if="scope.row.isEditing" class="cancel-btn" size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button> <el-button v-if="scope.row.isEditing" class="cancel-btn" plain size="mini" type="warning" @click="cancelEdit(scope.row)">取消</el-button>
<el-button <el-button
v-else v-else
:disabled="!(scope.row.加工开始时间 || scope.row.加工完成时间)" :disabled="!(scope.row.加工开始时间 || scope.row.加工完成时间)"
size="mini" size="mini"
plain
type="primary" type="primary"
class="el-icon-edit" class="el-icon-edit"
@click="handleEdit(scope.row)">编辑</el-button> @click="handleEdit(scope.row)">编辑</el-button>
<el-button <el-button
:disabled="!!(scope.row.加工开始时间 || scope.row.加工完成时间)" :disabled="!!(scope.row.加工开始时间 || scope.row.加工完成时间)"
size="mini" size="mini"
plain
type="danger" type="danger"
class="el-icon-delete" class="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
@@ -526,4 +535,7 @@ export default {
span{ span{
margin: 10px 0 10px 10px; margin: 10px 0 10px 10px;
} }
.el-card{
margin: 0px;
}
</style> </style>

28
src/views/ManufacturingCenter/CreatePreparationBill/index.vue
View File

@@ -3,48 +3,48 @@
<el-card> <el-card>
<el-row> <el-row>
<span>零件图号:</span> <span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/> <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button> <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
<el-checkbox v-model="all" size="mini">查询全部</el-checkbox> <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportTable('BL')">导出备料单</el-button> <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
<el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button> <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
<el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button> <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="tableData" height="760" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"/> align="center"/>
<el-table-column label="打印状态" width="100" align="center"> <el-table-column label="打印状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.备料打印!=='0'" type="success" size="small">已导出</el-tag> <el-tag v-if="scope.row.备料打印!=='0'" type="success" size="mini">已导出</el-tag>
<el-tag v-else type="warning" size="small">未导出</el-tag> <el-tag v-else type="warning" size="mini">未导出</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" align="center" width="220px"> <el-table-column label="零件名称" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center" width="240px"> <el-table-column label="零件图号" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" width="100px"> <el-table-column label="数量" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="材料" align="center" width="100px"> <el-table-column label="材料" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.材料 }} {{ scope.row.材料 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="重量" align="center" width="100px"> <el-table-column label="重量" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.重量 }} {{ scope.row.重量 }}
</template> </template>
@@ -119,7 +119,7 @@ export default {
Data: [], Data: [],
tableData: [], // 表格数据 tableData: [], // 表格数据
total: null, // 总条数 total: null, // 总条数
pageSize: 10, // 每页显示条数 pageSize: 30, // 每页显示条数
pageCurrent: 1 // 后台获取页 pageCurrent: 1 // 后台获取页
} }
}, },

3
src/views/ManufacturingCenter/GroupMatching/index.vue
View File

@@ -1118,4 +1118,7 @@ export default {
span{ span{
margin: 10px 0 10px 10px; margin: 10px 0 10px 10px;
} }
.el-card{
margin: 1px;
}
</style> </style>

38
src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
View File

@@ -23,10 +23,21 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading0" :data="tableData" :row-key="getRowKeys" :expand-row-keys="expands" height="650" style="width: 100%;" border @expand-change="searchTable2"> <el-table
<el-table-column type="expand"> v-loading="loading0"
:data="tableData"
:row-key="getRowKeys"
:expand-row-keys="expands"
stripe="true"
size="mini"
highlight-current-row
border
height="500"
style="width: 100%;"
@expand-change="searchTable2">
<el-table-column label="明细" align="center" type="expand" width="55">
<template slot-scope="scope"> <template slot-scope="scope">
<el-table :data="tableData2" border style="text-align: center" size="mini"> <el-table :data="tableData2" class="subTableHeader" border style="text-align: center" size="mini">
<el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" > <el-table-column label="零件加工计划进度(工艺名称,计划完成时间,实际完成时间,员工名称)" >
<el-table-column label="[1]" align="center" width="120px"> <el-table-column label="[1]" align="center" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -242,29 +253,29 @@
</el-table> </el-table>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件名称" align="center" width="220px"> <el-table-column label="零件名称" align="center" width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center" width="270px"> <el-table-column label="零件图号" align="center" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号_短 }} {{ scope.row.零件图号_短 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="待加工工序" align="center"> <el-table-column label="待加工工序" align="center" min-width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.工艺名称 }} {{ scope.row.工艺名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="300" align="center"> <el-table-column label="操作" width="490px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
<el-button size="mini" icon="el-icon-arrow-up" type="primary" @click="upOne(scope.row)"/> <el-button size="mini" icon="el-icon-arrow-up" type="primary" plain @click="upOne(scope.row)"/>
<el-button size="mini" icon="el-icon-arrow-down" type="primary" @click="downOne(scope.row)"/> <el-button size="mini" icon="el-icon-arrow-down" type="primary" plain @click="downOne(scope.row)"/>
<el-button size="mini" icon="el-icon-upload2" type="primary" @click="TOP(scope.row)"/> <el-button size="mini" icon="el-icon-upload2" type="primary" plain @click="TOP(scope.row)"/>
<el-button size="mini" icon="el-icon-download" type="primary" @click="Down(scope.row)"/> <el-button size="mini" icon="el-icon-download" type="primary" plain @click="Down(scope.row)"/>
<el-button size="mini" icon="el-icon-delete" type="danger" @click="outParts(scope.row)"/> <el-button size="mini" icon="el-icon-delete" type="danger" plain @click="outParts(scope.row)"/>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
@@ -657,4 +668,7 @@ export default {
background-color: lightgreen; background-color: lightgreen;
border: 1px solid #1f2d3d; border: 1px solid #1f2d3d;
} }
.el-card{
margin: 0px;
}
</style> </style>

115
src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
View File

@@ -1,33 +1,14 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<span>机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
<el-option
v-for="item in Machines"
:key="item.value"
:label="item.label"
:value="item.value">
<div style="float: left">{{ item.label }}</div>
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
</el-option>
</el-select>
<span>组号:</span>
<el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
<el-option
v-for="item in Groups"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>零件图号:</span> <span>零件图号:</span>
<el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/> <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button> <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button> <el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit2()">自家备料确认</el-button>
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="back()">打回</el-button> <el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="back()">打回</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange2"> <el-table v-loading="loading" :data="tableData" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange2">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="零件名称" align="center" width="220px"> <el-table-column label="零件名称" align="center" width="220px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -52,6 +33,7 @@
:page-sizes="[10, 20, 30, 40, 100]" :page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize" :page-size="pageSize"
:total="total" :total="total"
style="margin: 3px 0"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange" @size-change="handleSizeChange"
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
@@ -60,12 +42,12 @@
<el-card> <el-card>
<span>零件图号:</span> <span>零件图号:</span>
<el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px"/> <el-input v-model="partName2" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
<el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button> <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="total2=0;pageSize2=10; pageCurrent2=1;searchTable2()">查询</el-button>
<el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">外购备料确认</el-button> <el-button size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">外购备料确认</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange"> <el-table v-loading="loading2" :data="tableData2" height="350" style="width: 100%;margin: 3px 0" size="mini" border stripe highlight-current-row element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="零件名称" align="center" width="220px"> <el-table-column label="零件名称" align="center" width="220px">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -110,17 +92,11 @@
</template> </template>
<script> <script>
import { getMachines, getGroups, searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement' import { searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import Cookie from 'js-cookie'
export default { export default {
data() { data() {
return { return {
Machine: '',
Machines: [],
Group: '',
Groups: [],
arrest2: [], arrest2: [],
editTime: '', editTime: '',
bianliang1: [], bianliang1: [],
@@ -152,21 +128,10 @@ export default {
'userId' 'userId'
]) ])
}, },
watch: { created() {
// 如果路由有变化，会再次执行该方法 this.searchTable()
'$route': { this.searchTable2()
handler(route) {
const _this = this
if (route.name === 'MaterialArrivalManagement') {
_this.getMachine()
}
}
}
}, },
// created() {
// this.searchTable()
// this.searchTable2()
// },
methods: { methods: {
handleSelectionChange2(val) { handleSelectionChange2(val) {
this.arrest2 = val this.arrest2 = val
@@ -186,67 +151,17 @@ export default {
}) })
} }
}, },
getMachine() {
if (Cookie.get('machineValue') !== undefined) {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
}).then(() => {
this.Machine = parseInt(Cookie.get('machineValue'))
this.getGroup()
this.Group = parseInt(Cookie.get('group'))
this.searchTable()
Cookie.remove('machineValue')
Cookie.remove('group')
this.searchTable2()
})
} else {
this.Machine = ''
this.Machines = []
this.Group = ''
this.Groups = []
getMachines().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Machines.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号,
value2: response.data[i].项目名称
})
}
})
this.searchTable()
}
},
getGroup() {
this.Group = ''
this.Groups = []
getGroups(this.Machine).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.Groups.push({
label: response.data[i].组号,
value: response.data[i].组件流水号
})
}
})
},
// 查询表格数据 // 查询表格数据
searchTable() { searchTable() {
this.loading = true this.loading = true
this.tableData = [] this.tableData = []
this.Data = [] this.Data = []
if (this.Machine) { this.Machinecheck = true } else { this.Machinecheck = false } if (this.partName !== '' && this.partName !== null) {
if (this.Group) { this.Groupcheck = true } else { this.Groupcheck = false } this.partNamecheck = true
if (this.partName) { this.partNamecheck = true } else { this.partNamecheck = false } } else {
searchtable(this.Machinecheck, this.Machine, this.Groupcheck, this.Group, this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => { this.partNamecheck = false
}
searchtable(this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
if (response.data.total === 0) { if (response.data.total === 0) {
this.loading = false this.loading = false
} else { } else {

3
src/views/ManufacturingCenter/OwnTimeStatistics/index.vue
View File

@@ -201,4 +201,7 @@ export default {
span{ span{
margin: 10px 0 10px 10px; margin: 10px 0 10px 10px;
} }
.el-card{
margin: 1px;
}
</style> </style>

81
src/views/ManufacturingCenter/ParseQuery/index.vue
View File

@@ -12,10 +12,9 @@
placeholder="请输入内容" placeholder="请输入内容"
@clear="clearMachine" @clear="clearMachine"
@select="handleSelect"/> @select="handleSelect"/>
<el-tag style="margin-left: 10px; color: black" type="info">未开始</el-tag> <el-tag style="margin-left: 10px; background: #EAEAEA; color: black">未开始</el-tag>
<el-tag style="background: orange; color: black">进行中</el-tag> <el-tag style="background: #7eaced; color: black">进行中</el-tag>
<el-tag style="background: lightgreen; color: black">已完成</el-tag> <el-tag style="background: #ff9759; color: black">已完成</el-tag>
<el-tag style="background: red; color: black">已拖期</el-tag>
</el-card> </el-card>
<el-card> <el-card>
<div class="main"> <div class="main">
@@ -23,139 +22,139 @@
<div :class="[isActive ? color[22] : 'white']" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;"> <div :class="[isActive ? color[22] : 'white']" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div> <div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv23">发货<br>{{ `${data[0].发货百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[22] : 'white']" type="text" @click="searchDiv23">发货<br>{{ `${data[0].发货百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[21] : 'white']" class="module" style="position: relative;left: 1580px;top:220px; width: 80px;height: 48px;"> <div :class="[isActive ? color[21] : 'white']" class="module" style="position: relative;left: 1580px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：质检部<br>对机床进行总装调试</div> <div slot="content">角色：质检部<br>对机床进行总装调试</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv22">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[21] : 'white']" type="text" @click="searchDiv22">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[20] : 'white']" class="module" style="position: relative;left: 1390px;top:220px; width: 80px;height: 48px;"> <div :class="[isActive ? color[20] : 'white']" class="module" style="position: relative;left: 1390px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：质检部<br>对机床重要部件进行检测</div> <div slot="content">角色：质检部<br>对机床重要部件进行检测</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv21">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[20] : 'white']" type="text" @click="searchDiv21">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[19] : 'white']" class="module" style="position: relative;left: 1185px;top:105px; width: 80px;height: 48px;"> <div :class="[isActive ? color[19] : 'white']" class="module" style="position: relative;left: 1185px;top:105px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div> <div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv6">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[19] : 'white']" type="text" @click="searchDiv6">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[18] : 'white']" class="module" style="position: relative;left: 1100px;top:176px; width: 80px;height: 48px;"> <div :class="[isActive ? color[18] : 'white']" class="module" style="position: relative;left: 1100px;top:176px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content"><br>角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div> <div slot="content"><br>角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv5">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[18] : 'white']" type="text" @click="searchDiv5">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[17] : 'white']" class="module" style="position: relative;left: 1015px;top:247px; width: 80px;height: 48px;"> <div :class="[isActive ? color[17] : 'white']" class="module" style="position: relative;left: 1015px;top:247px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div> <div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv7">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[17] : 'white']" type="text" @click="searchDiv7">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[16] : 'white']" class="module" style="position: relative;left: 930px;top:319px; width: 80px;height: 48px;"> <div :class="[isActive ? color[16] : 'white']" class="module" style="position: relative;left: 930px;top:319px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div> <div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv8">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[16] : 'white']" type="text" @click="searchDiv8">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[15] : 'white']" class="module" style="position: relative;left: 695px;top:220px; width: 80px;height: 48px;"> <div :class="[isActive ? color[15] : 'white']" class="module" style="position: relative;left: 695px;top:220px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div> <div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv9">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[15] : 'white']" type="text" @click="searchDiv9">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[14] : 'white']" class="module" style="position: relative;left: 455px;top:55px; width: 80px;height: 48px;"> <div :class="[isActive ? color[14] : 'white']" class="module" style="position: relative;left: 455px;top:55px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：质检部<br>对自制件进行检测</div> <div slot="content">角色：质检部<br>对自制件进行检测</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv12">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[14] : 'white']" type="text" @click="searchDiv12">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[13] : 'white']" class="module" style="position: relative;left: 373px;top:283px; width: 80px;height: 48px;"> <div :class="[isActive ? color[13] : 'white']" class="module" style="position: relative;left: 373px;top:283px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：质检部<br>对采购件进行检测</div> <div slot="content">角色：质检部<br>对采购件进行检测</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv19">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[13] : 'white']" type="text" @click="searchDiv19">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[12] : 'white']" class="module" style="position: relative;left: 160px;top:110px; width: 80px;height: 48px;"> <div :class="[isActive ? color[12] : 'white']" class="module" style="position: relative;left: 160px;top:110px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div> <div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv10">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[12] : 'white']" type="text" @click="searchDiv10">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[11] : 'white']" class="module" style="position: relative;left: -25px;top:-1px; width: 80px;height: 48px;"> <div :class="[isActive ? color[11] : 'white']" class="module" style="position: relative;left: -25px;top:-1px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：外协员<br>进行外协加工</div> <div slot="content">角色：外协员<br>进行外协加工</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv18">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[11] : 'white']" type="text" @click="searchDiv18">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[10] : 'white']" class="module" style="position: relative;left: -230px;top:54px; width: 80px;height: 48px;"> <div :class="[isActive ? color[10] : 'white']" class="module" style="position: relative;left: -230px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：计划员<br>针对做完工艺定额的零件进行排查</div> <div slot="content">角色：计划员<br>针对做完工艺定额的零件进行排查</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv15">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[10] : 'white']" type="text" @click="searchDiv15">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[9] : 'white']" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;"> <div :class="[isActive ? color[9] : 'white']" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：工艺部<br>制定零件定额</div> <div slot="content">角色：工艺部<br>制定零件定额</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv14">定额<br>{{ `${data[0].定额百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[9] : 'white']" type="text" @click="searchDiv14">定额<br>{{ `${data[0].定额百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[8] : 'white']" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;"> <div :class="[isActive ? color[8] : 'white']" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：工艺部<br>制定零件工艺</div> <div slot="content">角色：工艺部<br>制定零件工艺</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv13">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[8] : 'white']" type="text" @click="searchDiv13">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[7] : 'white']" class="module" style="position: relative;left: -805px;top:1px; width: 80px;height: 48px;"> <div :class="[isActive ? color[7] : 'white']" class="module" style="position: relative;left: -805px;top:1px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div> <div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv11">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[7] : 'white']" type="text" @click="searchDiv11">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[0] : 'white']" class="module" style="position: relative;left: -1350px;top:222px; width: 80px;height: 48px;"> <div :class="[isActive ? color[0] : 'white']" class="module" style="position: relative;left: -1350px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div> <div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[0] : 'white']" type="text" @click="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[1] : 'white']" class="module" style="position: relative;left: -1336px;top:222px; width: 80px;height: 48px;"> <div :class="[isActive ? color[1] : 'white']" class="module" style="position: relative;left: -1336px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div> <div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv2">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[1] : 'white']" type="text" @click="searchDiv2">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[6] : 'white']" class="module" style="position: relative;left: -1057px;top:110px; width: 80px;height: 48px;"> <div :class="[isActive ? color[6] : 'white']" class="module" style="position: relative;left: -1057px;top:110px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div> <div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv20">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[6] : 'white']" type="text" @click="searchDiv20">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[2] : 'white']" class="module" style="position: relative;left: -1405px;top:222px; width: 80px;height: 48px;"> <div :class="[isActive ? color[2] : 'white']" class="module" style="position: relative;left: -1405px;top:222px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div> <div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv3">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[2] : 'white']" type="text" @click="searchDiv3">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[3] : 'white']" class="module" style="position: relative;left: -1350px;top:63px; width: 80px;height: 48px;"> <div :class="[isActive ? color[3] : 'white']" class="module" style="position: relative;left: -1350px;top:63px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div> <div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv4">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[3] : 'white']" type="text" @click="searchDiv4">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[5] : 'white']" class="module" style="position: relative;left: -1435px;top:223px; width: 80px;height: 48px;"> <div :class="[isActive ? color[5] : 'white']" class="module" style="position: relative;left: -1435px;top:223px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：制造部长<br>计划员分配零件后，<br>将分配到制造部的采购件进行采购</div> <div slot="content">角色：制造部长<br>计划员分配零件后，<br>将分配到制造部的采购件进行采购</div>
<el-button :disabled="disabled" type="text" style="color: black;line-height: 19px" @click="searchDiv17">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[5] : 'white']" type="text" @click="searchDiv17">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
<div :class="[isActive ? color[4] : 'white']" class="module" style="position: relative;left: -548px;top:300px; width: 80px;height: 48px;"> <div :class="[isActive ? color[4] : 'white']" class="module" style="position: relative;left: -548px;top:300px; width: 80px;height: 48px;">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div> <div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div>
<el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button> <el-button :disabled="disabled" :class="[isActive ? color[4] : 'white']" type="text" @click="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
@@ -2212,6 +2211,7 @@ export default {
}).then(res => { }).then(res => {
this.isActive = true this.isActive = true
this.data = res.data this.data = res.data
console.log(res)
if (res.data[0].签订合同状态 === 1) { this.color[0] = 'white' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'yellow' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'green' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' } if (res.data[0].签订合同状态 === 1) { this.color[0] = 'white' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'yellow' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'green' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' }
if (res.data[0].产品设计状态 === 1) { this.color[1] = 'white' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'yellow' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'green' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' } if (res.data[0].产品设计状态 === 1) { this.color[1] = 'white' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'yellow' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'green' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' }
if (res.data[0].零件分配状态 === 1) { this.color[2] = 'white' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'yellow' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'green' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' } if (res.data[0].零件分配状态 === 1) { this.color[2] = 'white' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'yellow' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'green' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' }
@@ -2298,7 +2298,7 @@ export default {
res.data[0].付款百分比 !== '' && res.data[0].付款百分比 !== null ? this.dataDiv1.付款百分比 = res.data[0].付款百分比 : this.dataDiv1.付款百分比 = 0 res.data[0].付款百分比 !== '' && res.data[0].付款百分比 !== null ? this.dataDiv1.付款百分比 = res.data[0].付款百分比 : this.dataDiv1.付款百分比 = 0
if (res.data[0].价值评估 === '高') { if (res.data[0].价值评估 === '高') {
this.valueDiv1 = 6 this.valueDiv1 = 6
} else if (res.data[0].价值评估 === '高') { } else if (res.data[0].价值评估 === '中') {
this.valueDiv1 = 3 this.valueDiv1 = 3
} else { } else {
this.valueDiv1 = 1 this.valueDiv1 = 1
@@ -2424,6 +2424,14 @@ export default {
shadowBlur: 10, shadowBlur: 10,
shadowOffsetX: 0, shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)' shadowColor: 'rgba(0, 0, 0, 0.5)'
},
normal: {
color: function(params) {
var colorList = [
'gray', '#ff9759', '#7eaced'
]
return colorList[params.dataIndex]
}
} }
} }
} }
@@ -4324,13 +4332,19 @@ export default {
background: red; background: red;
} }
.yellow{ .yellow{
background: orange; background: #7eaced;
color: black;
font-weight: bold;
} }
.green{ .green{
background: lightgreen; background: #ff9759;
color: black;
font-weight: bold;
} }
.white{ .white{
background: white; background: #EAEAEA;
color: black;
font-weight: bold;
} }
.el-card{ .el-card{
margin: 5px 10px 5px 10px; margin: 5px 10px 5px 10px;
@@ -4343,7 +4357,6 @@ export default {
} }
.module{ .module{
border-radius: 6px; border-radius: 6px;
border: 1px solid black;
/*background-color: white;*/ /*background-color: white;*/
display: inline-block; display: inline-block;
} }
@@ -4352,12 +4365,12 @@ export default {
} }
.process{ .process{
text-align: center; text-align: center;
margin-left: 80px; margin-left: 30px;
margin-top: 20px; margin-top: 20px;
width: 1858px; width: 1858px;
height: 400px; height: 400px;
/*border: 1px solid red;*/ /*border: 1px solid red;*/
background: url('../../../assets/img/img4.png') repeat; background: url('../../../assets/img/img10.png') repeat;
background-repeat:no-repeat; background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%; background-size:100% 100%;-moz-background-size:100% 100%;
} }

4
src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
View File

@@ -98,7 +98,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</el-card> </el-card>
<el-dialog :visible.sync="dialogFormVisiblePeople" title="工艺流程单" center> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" :title="title" center>
<div v-if="tableData2.length"> <div v-if="tableData2.length">
<table class="tg"> <table class="tg">
<tr> <tr>
@@ -193,6 +193,7 @@ export default {
tableData2: [], tableData2: [],
tableData3: [], tableData3: [],
dialogFormVisiblePeople: false, dialogFormVisiblePeople: false,
title: '',
机床号: '', 机床号: '',
组号: '', 组号: '',
零件图号: '', 零件图号: '',
@@ -286,6 +287,7 @@ export default {
searchtable1(row.工艺计划流水号).then(response => { searchtable1(row.工艺计划流水号).then(response => {
this.tableData2 = response.data this.tableData2 = response.data
this.dialogFormVisiblePeople = true this.dialogFormVisiblePeople = true
this.title = row.零件名称 + '工艺流程单'
}) })
}, },
handleSelectionChange(val) { handleSelectionChange(val) {

11
src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
View File

@@ -201,6 +201,7 @@
:data="tableData" :data="tableData"
class="processTable" class="processTable"
border border
highlight-current-row
style="width: 100%;min-height: 400px;" style="width: 100%;min-height: 400px;"
size="mini"> size="mini">
<el-table-column prop="num" label="序号" width="45" align="center" type="index"/> <el-table-column prop="num" label="序号" width="45" align="center" type="index"/>
@@ -279,7 +280,7 @@
</el-table> </el-table>
</el-card> </el-card>
<el-dialog :visible.sync="dialogMaterial" title="物料选择" center width="400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogMaterial" title="物料选择" center width="400px">
<el-input v-model="input" placeholder="材质" size="small" style="width:200px"/> <el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询 <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询
</el-button> </el-button>
@@ -306,7 +307,7 @@
<el-button type="primary" size="small" @click="selectMaterial2()">提交</el-button> <el-button type="primary" size="small" @click="selectMaterial2()">提交</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="工艺名称、工艺要求选择" center width="400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="工艺名称、工艺要求选择" center width="400px">
<el-form ref="form2" :model="form2" label-position="left" label-width="125px" class="demo-ruleForm"> <el-form ref="form2" :model="form2" label-position="left" label-width="125px" class="demo-ruleForm">
<el-form-item label="工艺名称分类"> <el-form-item label="工艺名称分类">
<el-select v-model="processNameClassValue" filterable placeholder="分类" size="small" @change="cChange()"> <el-select v-model="processNameClassValue" filterable placeholder="分类" size="small" @change="cChange()">
@@ -341,7 +342,7 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
<el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm"> <el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@@ -396,7 +397,7 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="已完工艺选择" center width="800px">
<el-form ref="form1" :model="form1" label-position="left" label-width="80px" class="demo-ruleForm"> <el-form ref="form1" :model="form1" label-position="left" label-width="80px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
@@ -471,7 +472,7 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible3" title="工艺定额人员" center style="min-height: 300px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="工艺定额人员" center style="min-height: 300px">
<el-table :data="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson"> <el-table :data="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson">
<el-table-column align="center" label="考勤编号" width="150"> <el-table-column align="center" label="考勤编号" width="150">
<template slot-scope="scope"> <template slot-scope="scope">

2
src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
View File

@@ -89,7 +89,7 @@
</div> </div>
</el-card> </el-card>
<el-dialog :visible.sync="dialogFormVisible" title="选择工艺定额人员" center> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="选择工艺定额人员" center>
<el-table <el-table
:data="tableData2" :data="tableData2"
style="width: 100%;max-height: 200px" style="width: 100%;max-height: 200px"

9
src/views/ManufacturingCenter/ProcessingStatus/index.vue
View File

@@ -3,7 +3,7 @@
<el-card> <el-card>
<el-row> <el-row>
<span>机床号:</span> <span>机床号:</span>
<el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()"> <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 180px" placeholder="机床号" @change="getGroup()">
<el-option <el-option
v-for="item in Machines" v-for="item in Machines"
:key="item.value" :key="item.value"
@@ -534,6 +534,7 @@ export default {
this.length = 0 this.length = 0
getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, 1, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => { getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, 1, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
this.length = parseInt(response.data.total) this.length = parseInt(response.data.total)
console.log(response.data.rows, 11111)
for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组 for (let i = 0; i < response.data.rows.length; i++) { // 声明二维数组
this.num111.push(response.data.rows[i].工艺计划流水号) this.num111.push(response.data.rows[i].工艺计划流水号)
this.零件图号.push(response.data.rows[i].零件图号) this.零件图号.push(response.data.rows[i].零件图号)
@@ -639,4 +640,10 @@ export default {
background-color: lightgreen; background-color: lightgreen;
border: 1px solid #1f2d3d; border: 1px solid #1f2d3d;
} }
.el-card{
margin: 0px;
}
.table h4{
height: 19px;
}
</style> </style>

19
src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
View File

@@ -1,6 +1,5 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-row> <el-row>
<span>机床号:</span> <span>机床号:</span>
@@ -24,12 +23,14 @@
</el-select> </el-select>
<span>零件号:</span> <span>零件号:</span>
<el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/> <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
</el-row>
<el-row>
<span class="demonstration">计划下达时间:</span> <span class="demonstration">计划下达时间:</span>
<el-date-picker <el-date-picker
v-model="startTime" v-model="startTime"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="small" size="small"
style="width: 160px" style="width: 160px;margin-top: 10px;margin-bottom: 10px"
type="date" type="date"
placeholder="选择日期"/> placeholder="选择日期"/>
<span class="demonstration">~</span> <span class="demonstration">~</span>
@@ -47,14 +48,18 @@
<el-card> <el-card>
<el-table <el-table
v-loading="listLoading1" v-loading="listLoading1"
id="ProcessingStatusEdit"
:data="tableData1" :data="tableData1"
:stripe="true"
class="table" class="table"
size="mini"
highlight-current-row
border border
height="650"> height="650">
<el-table-column <el-table-column
label="序号" label="序号"
align="center" align="center"
width="50" width="55"
type="index"/> type="index"/>
<el-table-column <el-table-column
align="center" align="center"
@@ -772,4 +777,12 @@ export default {
background-color: lightgreen; background-color: lightgreen;
border: 1px solid #1f2d3d; border: 1px solid #1f2d3d;
} }
.el-card{
margin:1px;
}
</style>
<style>
.ProcessingStatusEdit td, .el-table th {
padding: 0px 0;
}
</style> </style>

10
src/views/ManufacturingCenter/RepairTimeEntry/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<span>人员名称:</span> <span>人员名称:</span>
<el-input v-model="personnelNumber" placeholder="请选择人员名称" class="input-with-select" readonly clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/> <el-input v-model="personnelNumber" placeholder="请双击选择人员名称" class="input-with-select" clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
<el-button type="success" class="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button> <el-button type="success" class="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
<el-button type="primary" class="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="editType1('form');param = 0">新增</el-button> <el-button type="primary" class="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="editType1('form');param = 0">新增</el-button>
</el-card> </el-card>
@@ -81,7 +81,7 @@
</div> </div>
</el-card> </el-card>
<el-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px"> <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm"> <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@@ -174,7 +174,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogFormVisible1" title="人员信息" center width="750px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="人员信息" center width="750px">
<div style="height: 500px"> <div style="height: 500px">
<div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px"> <div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
<el-tree <el-tree
@@ -409,8 +409,8 @@ export default {
value: i + 1 value: i + 1
}) })
} }
this.form.yearNumberValue = this.a this.form.yearNumberValue = new Date().getFullYear()
this.form.monthNumberValue = 1 this.form.monthNumberValue = new Date().getMonth() + 1
}, },
// 查询 // 查询
searchTable() { searchTable() {

25
src/views/ManufacturingCenter/StatusQuery/index.vue
View File

@@ -1,12 +1,12 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-row>
<span>项目名称:</span> <span>项目名称:</span>
<el-select <el-select
v-model="entryNameValue" v-model="entryNameValue"
placeholder="项目名称" placeholder="项目名称"
style="width:200px" style="width:200px;margin-top: 10px"
size="small" size="small"
clearable clearable
filterable filterable
@@ -25,8 +25,10 @@
<el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px"> <el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
<el-button slot="append" icon="el-icon-search" @click="searchGroupList" /> <el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
</el-input> </el-input>
</el-row>
<el-row>
<span>零件号:</span> <span>零件号:</span>
<el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/> <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px;margin-top: 10px"/>
<span>零件状态:</span> <span>零件状态:</span>
<el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px"> <el-select v-model="partStateValue" placeholder="零件状态" size="small" clearable style="width:200px">
<el-option <el-option
@@ -44,34 +46,35 @@
<!--:value="item.value"/>--> <!--:value="item.value"/>-->
<!--</el-select>--> <!--</el-select>-->
<el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
</el-row>
</el-card> </el-card>
<el-card> <el-card>
<el-table <el-table
v-loading="loading0" v-loading="loading0"
:data="tableData" :data="tableData"
style="width: 100%;max-height: 600px" style="width: 100%;max-height: 600px"
height="600" height="600"
stripe="true"
size="mini" size="mini"
highlight-current-row highlight-current-row
border> border>
<el-table-column align="center" label="序号" type="index" width="60px"/> <el-table-column align="center" label="序号" type="index" width="55px"/>
<el-table-column align="center" label="机床图号" width="170px"> <el-table-column align="center" label="机床图号" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="组号" width="140px"> <el-table-column align="center" label="组号" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.组号 }} {{ scope.row.组号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件图号" width="200px"> <el-table-column align="center" label="零件图号" min-width="160px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="零件名称" width="180px"> <el-table-column align="center" label="零件名称" min-width="170px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
@@ -120,7 +123,6 @@
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
</div> </div>
</el-card> </el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible4" center style="min-height: 300px" width="400px"> <el-dialog :title="title" :visible.sync="dialogFormVisible4" center style="min-height: 300px" width="400px">
<el-form label-position="left" label-width="110px" class="demo-ruleForm"> <el-form label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="零件状态"> <el-form-item label="零件状态">
@@ -490,4 +492,7 @@ export default {
span{ span{
margin: 10px 0 10px 10px; margin: 10px 0 10px 10px;
} }
.el-card{
margin: 0px;
}
</style> </style>

31
src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
View File

@@ -1,9 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-row> <el-row>
<span>操作者:</span> <span style="margin-left: 10px">操作者:</span>
<el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px"/> <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:200px"/>
<span class="demonstration">完成加工时间:</span> <span class="demonstration">完成加工时间:</span>
<el-date-picker <el-date-picker
@@ -27,7 +26,17 @@
</el-card> </el-card>
<el-card> <el-card>
<el-col :span="6"> <el-col :span="6">
<el-table v-loading="loading" :data="tableData" highlight-current-row height="500" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2"> <el-table
v-loading="loading"
:data="tableData"
highlight-current-row
height="380"
size="mini"
stripe="true"
style="width: 100%;"
border
element-loading-text="拼命加载中"
@row-click="searchTable2">
<el-table-column label="操作者" align="center" width="110px"> <el-table-column label="操作者" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
@@ -56,7 +65,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="17" style="margin-left: 30px;"> <el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading2" :data="tableData2" height="500" style="width: 100%;" border element-loading-text="拼命加载中"> <el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="零件图号" align="center" width="150px"> <el-table-column label="零件图号" align="center" width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件图号 }} {{ scope.row.零件图号 }}
@@ -106,8 +115,8 @@
</el-col> </el-col>
</el-card> </el-card>
<el-card> <el-card>
<span>机床编号:</span> <span style="margin-left: 10px">机床编号:</span>
<el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable4();searchTable6()"> <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-top: 10px" clearable @change="searchTable4();searchTable6()">
<el-option <el-option
v-for="item in machineNumber" v-for="item in machineNumber"
:key="item.value" :key="item.value"
@@ -117,12 +126,12 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div> <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option> </el-option>
</el-select> </el-select>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button> <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet3()">组件导出</el-button> <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="exportUninquirySheet3()">组件导出</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-col :span="6"> <el-col :span="6">
<el-table v-loading="loading3" :data="tableData3" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5"> <el-table v-loading="loading3" :data="tableData3" stripe="true" size="mini" highlight-current-row height="380" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable5">
<el-table-column label="机床编号" align="center" width="110px"> <el-table-column label="机床编号" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
@@ -151,7 +160,7 @@
</div> </div>
</el-col> </el-col>
<el-col :span="17" style="margin-left: 30px;"> <el-col :span="17" style="margin-left: 30px;">
<el-table v-loading="loading4" :data="tableData4" height="580" style="width: 100%;" border element-loading-text="拼命加载中"> <el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe="true" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
<el-table-column label="机床编号" align="center"> <el-table-column label="机床编号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
@@ -484,6 +493,6 @@ export default {
<style scoped> <style scoped>
.el-card{ .el-card{
margin-bottom: 10px; margin-bottom: 1px;
} }
</style> </style>

50
src/views/MarketingCenter/BidBond/index.vue
View File

@@ -4,27 +4,28 @@
<el-card> <el-card>
<!--<el-radio v-model="radio" label="1">未收回</el-radio>--> <!--<el-radio v-model="radio" label="1">未收回</el-radio>-->
<!--<el-radio v-model="radio" label="2">已收回</el-radio>--> <!--<el-radio v-model="radio" label="2">已收回</el-radio>-->
<span>招标企业：</span> <span>招标企业:</span>
<el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px" placeholder="请输入招标企业"/> <el-input v-model="TenderingEnterprise" clearable size="small" style="width:200px;margin: 3px 0" placeholder="请输入招标企业"/>
<span style="margin-left: 10px">保金类型：</span> <span style="margin-left: 10px">保金类型:</span>
<el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="width: 150px"> <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="width: 200px">
<el-option <el-option
v-for="item in TypeOfGoldDeposit" v-for="item in TypeOfGoldDeposit"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span style="margin-left: 10px">投标人：</span> <span style="margin-left: 10px">投标人:</span>
<el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/> <el-input v-model="Bidder" clearable size="small" style="width:200px" placeholder="请选择" @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
<span style="margin-left: 10px">开始日期：</span> <el-row>
<span>开始日期: </span>
<el-date-picker <el-date-picker
v-model="startTime" v-model="startTime"
style="width: 200px;" style="width: 200px;margin: 3px 0"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
size="small" size="small"
type="date" type="date"
placeholder="请选择开始日期"/> placeholder="请选择开始日期"/>
<span style="margin-left: 10px">结束日期：</span> <span style="margin-left: 10px">结束日期: </span>
<el-date-picker <el-date-picker
v-model="endTime" v-model="endTime"
style="width: 200px;" style="width: 200px;"
@@ -34,6 +35,7 @@
placeholder="请选择结束日期"/> placeholder="请选择结束日期"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button> <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
</el-row>
</el-card> </el-card>
<!--投标保证金表格--> <!--投标保证金表格-->
@@ -43,7 +45,7 @@
:data="tableData1" :data="tableData1"
style="width: 100%; margin-top: 3px" style="width: 100%; margin-top: 3px"
height="770" height="770"
highlight-current-row="" highlight-current-row
border border
stripe stripe
size="mini"> size="mini">
@@ -77,7 +79,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="保证金金额" width="100"> <el-table-column align="center" label="保证金金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag style="width: 80px" size="small">{{ scope.row.保证金金额 }}</el-tag> <el-tag style="width: 80px" size="mini">{{ scope.row.保证金金额 }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="中标服务费" width="100"> <el-table-column align="center" label="中标服务费" width="100">
@@ -85,7 +87,7 @@
{{ scope.row.中标服务费 }} {{ scope.row.中标服务费 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="转履约保证金金额" width="150"> <el-table-column align="center" label="转履约保证金金额" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.转履约保证金金额 }} {{ scope.row.转履约保证金金额 }}
</template> </template>
@@ -97,8 +99,8 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="实收回金额" width="100"> <el-table-column align="center" label="实收回金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否收回) === 2" size="small" type="success" style="width: 66px">{{ scope.row.应收回金额 }}</el-tag> <el-tag v-if="parseInt(scope.row.是否收回) === 2" size="mini" type="success" style="width: 66px">{{ scope.row.应收回金额 }}</el-tag>
<el-tag v-else slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag> <el-tag v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="投标人" width="100"> <el-table-column align="center" label="投标人" width="100">
@@ -128,11 +130,11 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="状态" width="120"> <el-table-column align="center" label="状态" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="small" style="width: 66px">未公布</el-tag> <el-tag v-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="mini" style="width: 66px">未公布</el-tag>
<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.是否收回)===2" slot="reference" type="success" size="small" style="width: 66px">已收回</el-tag> <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.是否收回)===2" slot="reference" type="success" size="mini" style="width: 66px">已收回</el-tag>
<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===0" slot="reference" type="primary" size="small" style="width: 66px">未开始</el-tag> <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===0" slot="reference" type="primary" size="mini" style="width: 66px">未开始</el-tag>
<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===1" slot="reference" type="warning" size="small" style="width: 66px">即将拖期</el-tag> <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===1" slot="reference" type="warning" size="mini" style="width: 66px">即将拖期</el-tag>
<el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="small" style="width: 66px">已拖期</el-tag> <el-tag v-else-if="scope.row.预计收回日期!==''&&scope.row.预计收回日期!==null&&parseInt(scope.row.状态) ===2" slot="reference" type="danger" size="mini" style="width: 66px">已拖期</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="备注"> <el-table-column align="center" label="备注">
@@ -200,7 +202,7 @@
</div> </div>
</el-card> </el-card>
<el-dialog :visible.sync="dialogFormVisiblePeople" title="人员信息" center width="750px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="人员信息" center width="750px">
<div style="height: 420px"> <div style="height: 420px">
<div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px"> <div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
<el-tree <el-tree
@@ -241,7 +243,7 @@
</el-dialog> </el-dialog>
<!--收回投标保证金--> <!--收回投标保证金-->
<el-dialog :visible.sync="dialogFormVisible1" title="收回投标保证金" center style="min-height: 300px" width="20%"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="收回投标保证金" center style="min-height: 300px" width="40%">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm"> <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="实际收回日期" prop="收回日期"> <el-form-item label="实际收回日期" prop="收回日期">
<el-date-picker <el-date-picker
@@ -261,7 +263,7 @@
</el-dialog> </el-dialog>
<!--投标保证金对话框--> <!--投标保证金对话框-->
<el-dialog :title="title" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="40%"> <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="80%">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm"> <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@@ -348,7 +350,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="请输入" center style="min-height: 300px" width="23%"> <el-dialog v-el-drag-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="请输入" center style="min-height: 300px" width="23%">
<el-form ref="Timeform" :model="Timeform" :rules="TimeRules" label-width="150px"> <el-form ref="Timeform" :model="Timeform" :rules="TimeRules" label-width="150px">
<el-form-item label="投标结果公布日期" prop="投标结果公布日期"> <el-form-item label="投标结果公布日期" prop="投标结果公布日期">
<el-date-picker <el-date-picker
@@ -369,7 +371,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogPerformanceBondVisible" title="转履约保证金" center style="min-height: 300px" width="40%"> <el-dialog v-el-drag-dialog :visible.sync="dialogPerformanceBondVisible" title="转履约保证金" center style="min-height: 300px" width="80%">
<el-form ref="PerformanceBondform" :model="PerformanceBondform" :rules="PerformanceBondrules" label-position="left" label-width="120px" class="demo-ruleForm"> <el-form ref="PerformanceBondform" :model="PerformanceBondform" :rules="PerformanceBondrules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">

13
src/views/MarketingCenter/CRM/index.vue
View File

@@ -77,7 +77,7 @@
</el-table> </el-table>
</el-card> </el-card>
<el-row> <el-row>
<el-col :span="3"> <el-col :span="4">
<el-card> <el-card>
<el-table <el-table
v-loading="loading1" v-loading="loading1"
@@ -95,7 +95,7 @@
<el-radio :label="scope.row.省份流水号" v-model="radio" @change="pageCurrent = 1;pageSize = 30;getCurrentRow(scope.row.省份流水号, scope.row.省份)"/> <el-radio :label="scope.row.省份流水号" v-model="radio" @change="pageCurrent = 1;pageSize = 30;getCurrentRow(scope.row.省份流水号, scope.row.省份)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="地区" width="auto"> <el-table-column align="center" label="地区" width="auto" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.省份 }} {{ scope.row.省份 }}
</template> </template>
@@ -103,7 +103,7 @@
</el-table> </el-table>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="21"> <el-col :span="20">
<el-card> <el-card>
<el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button> <el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
<el-table v-loading="loading2" :data="tableData2" highlight-current-row height="640" size="mini" stripe style="width: 100%;margin-top: 2px" border> <el-table v-loading="loading2" :data="tableData2" highlight-current-row height="640" size="mini" stripe style="width: 100%;margin-top: 2px" border>
@@ -201,6 +201,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-dialog <el-dialog
v-el-drag-dialog
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
title="提示" title="提示"
width="30%"> width="30%">
@@ -211,7 +212,7 @@
</span> </span>
</el-dialog> </el-dialog>
<!--选择人员--> <!--选择人员-->
<el-dialog :visible.sync="dialogFormVisiblePeople" title="人员信息" center width="750px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="人员信息" center width="750px">
<div style="height: 420px"> <div style="height: 420px">
<div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px"> <div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
<el-tree <el-tree
@@ -251,7 +252,7 @@
<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button> <el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
</el-dialog> </el-dialog>
<el-dialog :title="title1" :visible.sync="dialogFormVisible1" center width="400px"> <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible1" center width="400px">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm" style="margin: auto"> <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm" style="margin: auto">
<el-form-item label="营销经理" prop="营销经理"> <el-form-item label="营销经理" prop="营销经理">
<el-input v-model="form1.营销经理" clearable size="small" style="width:200px" placeholder="请选择营销经理" readonly @dblclick.native="dialogFormVisiblePeople = true;searchPer()"/> <el-input v-model="form1.营销经理" clearable size="small" style="width:200px" placeholder="请选择营销经理" readonly @dblclick.native="dialogFormVisiblePeople = true;searchPer()"/>
@@ -263,7 +264,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :title="title2" :visible.sync="dialogFormVisible2" center width="700px"> <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogFormVisible2" center width="700px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="90px" class="demo-ruleForm" style="margin: auto"> <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="90px" class="demo-ruleForm" style="margin: auto">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">

24
src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
View File

@@ -11,7 +11,7 @@
</el-select> </el-select>
<span style="margin-left: 10px">机床型号：</span> <span style="margin-left: 10px">机床型号：</span>
<el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/> <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
<span style="margin-left: 10px">销售经理：</span> <span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/> <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
<span style="margin-left: 10px">开始日期：</span> <span style="margin-left: 10px">开始日期：</span>
<el-date-picker <el-date-picker
@@ -48,7 +48,7 @@
@expand-change="selectMachine"> @expand-change="selectMachine">
<el-table-column type="expand" label="详情"> <el-table-column type="expand" label="详情">
<template slot-scope="scope"> <template slot-scope="scope">
<el-table :data="tableData2" border stripe style="width: 400px; text-align: center" size="mini"> <el-table :data="tableData2" class="subTableHeader" border stripe style="width: 400px; text-align: center" size="mini">
<el-table-column label="设备型号" align="center"> <el-table-column label="设备型号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
@@ -65,7 +65,7 @@
<el-table-column align="center" label="合同编号" width="130"> <el-table-column align="center" label="合同编号" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<template> <template>
<el-tag slot="reference" type="small">{{ scope.row.合同编号 }}</el-tag> <el-tag slot="reference" type="mini">{{ scope.row.合同编号 }}</el-tag>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
@@ -143,7 +143,7 @@
</el-card> </el-card>
<!--营销经理选择--> <!--营销经理选择-->
<el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%">
<span>责权省份: </span> <span>责权省份: </span>
<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" size="small" @change="changeProvince"> <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" size="small" @change="changeProvince">
<el-option <el-option
@@ -949,3 +949,19 @@ export default {
background-color: white; background-color: white;
} }
</style> </style>
<style lang="scss">
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
}
</style>

5
src/views/MarketingCenter/ContractInformationManagement/index.vue
View File

@@ -92,7 +92,6 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="合同编号" width="130"> <el-table-column align="center" label="合同编号" width="130">
@@ -110,7 +109,7 @@
<h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4> <h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4>
<h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4> <h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4>
</div> </div>
<el-tag slot="reference" size="small">{{ scope.row.合同编号 }}</el-tag> <el-tag slot="reference" size="mini">{{ scope.row.合同编号 }}</el-tag>
</el-popover> </el-popover>
</template> </template>
</template> </template>
@@ -506,7 +505,7 @@
</el-dialog> </el-dialog>
<!--客户选择--> <!--客户选择-->
<el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="800px"> <el-dialog v-el-drag-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="800px">
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/> <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 330px; margin-top: 10px" size="mini" @row-click="handleCustomerChange"> <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 330px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">

10
src/views/MarketingCenter/InvoiceRecord/index.vue
View File

@@ -11,7 +11,7 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span style="margin-left: 10px">营销经理：</span> <span style="margin-left: 10px">营销经理：</span>
<el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/> <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
<span style="margin-left: 10px">开始日期：</span> <span style="margin-left: 10px">开始日期：</span>
<el-date-picker <el-date-picker
v-model="startTime" v-model="startTime"
@@ -44,7 +44,7 @@
@row-click="fetchTableData2"> @row-click="fetchTableData2">
<el-table-column align="center" label="合同编号" width="140"> <el-table-column align="center" label="合同编号" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag size="small" type="primary">{{ scope.row.合同编号 }}</el-tag> <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip> <el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
@@ -201,7 +201,7 @@
</el-card> </el-card>
<!--营销经理选择--> <!--营销经理选择-->
<el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
<span>姓名：</span> <span>姓名：</span>
<el-input v-model="name" clearable size="small" style="width: 200px"/> <el-input v-model="name" clearable size="small" style="width: 200px"/>
<el-button size="small" type="success" style="margin-left: 10px;" icon="el-icon-search" @click="searchName">查询</el-button> <el-button size="small" type="success" style="margin-left: 10px;" icon="el-icon-search" @click="searchName">查询</el-button>
@@ -233,7 +233,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!--增加开票记录--> <!--增加开票记录-->
<el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="750px"> <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="750px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm"> <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@@ -301,7 +301,7 @@
</div> </div>
</el-dialog> </el-dialog>
<!--客户选择--> <!--客户选择-->
<el-dialog :visible.sync="dialogCustomerFormVisible" title="选择客户" center width="600px"> <el-dialog v-el-drag-dialog :visible.sync="dialogCustomerFormVisible" title="选择客户" center width="600px">
<el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/> <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button> <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
<el-table v-loading="loading1" :data="CustomerData" border stripe size="mini" highlight-current-row height="400" show-overflow-tooltip style="height: 330px; margin-top: 5px" @row-click="handleCustomerChange"> <el-table v-loading="loading1" :data="CustomerData" border stripe size="mini" highlight-current-row height="400" show-overflow-tooltip style="height: 330px; margin-top: 5px" @row-click="handleCustomerChange">

23
src/views/MarketingCenter/PerformanceBond/index.vue
View File

@@ -41,7 +41,7 @@
@row-click="fetchTableData2"> @row-click="fetchTableData2">
<el-table-column align="center" label="合同编号" width="150"> <el-table-column align="center" label="合同编号" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag size="small" type="primary">{{ scope.row.合同编号 }}</el-tag> <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip> <el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
@@ -123,10 +123,11 @@
style="width: 100%;margin-top: 3px;" style="width: 100%;margin-top: 3px;"
height="130" height="130"
border border
stripe
size="mini"> size="mini">
<el-table-column align="center" label="履约保证金金额"> <el-table-column align="center" label="履约保证金金额">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="primary" size="small">{{ scope.row.履约保证金金额 }}</el-tag> <el-tag type="primary" size="mini">{{ scope.row.履约保证金金额 }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="保证金类型"> <el-table-column align="center" label="保证金类型">
@@ -146,8 +147,8 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="是否收回"> <el-table-column align="center" label="是否收回">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否收回) === 1" slot="reference" size="small" type="success" style="width: 66px">已收回</el-tag> <el-tag v-if="parseInt(scope.row.是否收回) === 1" slot="reference" size="mini" type="success" style="width: 66px">已收回</el-tag>
<el-tag v-else-if="parseInt(scope.row.是否收回) === 0" slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag> <el-tag v-else-if="parseInt(scope.row.是否收回) === 0" slot="reference" type="danger" size="mini" style="width: 66px">未收回</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="实际收回日期"> <el-table-column align="center" label="实际收回日期">
@@ -171,11 +172,11 @@
<div v-show="parseInt(scope.row.是否收回)=== 1 " style="text-align: center"> <div v-show="parseInt(scope.row.是否收回)=== 1 " style="text-align: center">
<h4>已于{{ scope.row.实际收回日期 }}收回</h4> <h4>已于{{ scope.row.实际收回日期 }}收回</h4>
</div> </div>
<el-tag v-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null && parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 1" slot="reference" size="small" type="warning" style="width: 66px">即将拖期</el-tag> <el-tag v-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null && parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 1" slot="reference" size="mini" type="warning" style="width: 66px">即将拖期</el-tag>
<el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 2" slot="reference" type="danger" size="small" style="width: 66px">已经拖期</el-tag> <el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 2" slot="reference" type="danger" size="mini" style="width: 66px">已经拖期</el-tag>
<el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 0" slot="reference" type="primer" size="small" style="width: 66px">无计划</el-tag> <el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 0 && parseInt(scope.row.状态) === 0" slot="reference" type="primer" size="mini" style="width: 66px">无计划</el-tag>
<el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 1" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag> <el-tag v-else-if="scope.row.计划收款日期!==''&& scope.row.计划收款日期!==null &&parseInt(scope.row.是否收回) === 1" slot="reference" type="success" size="mini" style="width: 66px">已完成</el-tag>
<el-tag v-else-if="scope.row.计划收款日期===''||scope.row.计划收款日期===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag> <el-tag v-else-if="scope.row.计划收款日期===''||scope.row.计划收款日期===null" slot="reference" size="mini" style="width: 66px">进度未完</el-tag>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
@@ -241,7 +242,7 @@
</template> </template>
</el-card> </el-card>
<el-dialog :visible.sync="dialogTimeVisible" title="实际收回日期" center style="min-height: 300px" width="23%"> <el-dialog v-el-drag-dialog :visible.sync="dialogTimeVisible" title="实际收回日期" center style="min-height: 300px" width="50%">
<el-form ref="form" :model="form" :rules="rules" label-width="140px"> <el-form ref="form" :model="form" :rules="rules" label-width="140px">
<el-form-item label="实际收回日期" prop="实际收回日期"> <el-form-item label="实际收回日期" prop="实际收回日期">
<el-date-picker <el-date-picker
@@ -259,7 +260,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :title="title1" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="40%"> <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="70%">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm"> <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">

18
src/views/MarketingCenter/SafetyMargin/index.vue
View File

@@ -42,7 +42,7 @@
@row-click="fetchTableData1"> @row-click="fetchTableData1">
<el-table-column align="center" label="合同编号" width="150"> <el-table-column align="center" label="合同编号" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag size="small" type="primary">{{ scope.row.合同编号 }}</el-tag> <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="项目名称" width="160" show-overflow-tooltip> <el-table-column align="center" label="项目名称" width="160" show-overflow-tooltip>
@@ -127,7 +127,7 @@
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column align="center" label="保证金金额" width="100"> <el-table-column align="center" label="保证金金额" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="primary" size="small">{{ scope.row.保证金金额 }}</el-tag> <el-tag type="primary" size="mini">{{ scope.row.保证金金额 }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="交付日期" width="120"> <el-table-column align="center" label="交付日期" width="120">
@@ -167,8 +167,8 @@
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column align="center" label="是否收回" width="100"> <el-table-column align="center" label="是否收回" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否收回) === 2" slot="reference" size="small" type="success" style="width: 66px">已收回</el-tag> <el-tag v-if="parseInt(scope.row.是否收回) === 2" slot="reference" size="mini" type="success" style="width: 66px">已收回</el-tag>
<el-tag v-else-if="parseInt(scope.row.是否收回) === 1" slot="reference" type="danger" size="small" style="width: 66px">未收回</el-tag> <el-tag v-else-if="parseInt(scope.row.是否收回) === 1" slot="reference" type="danger" size="mini" style="width: 66px">未收回</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="实际收回日期" width="130"> <el-table-column align="center" label="实际收回日期" width="130">
@@ -192,10 +192,10 @@
<div v-show="parseInt(scope.row.是否收回)=== 2 " style="text-align: center"> <div v-show="parseInt(scope.row.是否收回)=== 2 " style="text-align: center">
<h4>已于{{ scope.row.实际收回日期 }}收回</h4> <h4>已于{{ scope.row.实际收回日期 }}收回</h4>
</div> </div>
<el-tag v-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null && parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 1" slot="reference" size="small" type="warning" style="width: 66px">即将拖期</el-tag> <el-tag v-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null && parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 1" slot="reference" size="mini" type="warning" style="width: 66px">即将拖期</el-tag>
<el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 2" slot="reference" type="danger" size="small" style="width: 66px">已经拖期</el-tag> <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 2" slot="reference" type="danger" size="mini" style="width: 66px">已经拖期</el-tag>
<el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 0" slot="reference" type="primer" size="small" style="width: 66px">无计划</el-tag> <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 1 && parseInt(scope.row.状态) === 0" slot="reference" type="primer" size="mini" style="width: 66px">无计划</el-tag>
<el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 2" slot="reference" type="success" size="small" style="width: 66px">已完成</el-tag> <el-tag v-else-if="scope.row.预计收回日期!==''&& scope.row.预计收回日期!==null &&parseInt(scope.row.是否收回) === 2" slot="reference" type="success" size="mini" style="width: 66px">已完成</el-tag>
<el-tag v-else-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag> <el-tag v-else-if="scope.row.预计收回日期===''||scope.row.预计收回日期===null" slot="reference" size="small" style="width: 66px">进度未完</el-tag>
<div v-show="false">{{ scope.row.预计收回日期===''||scope.row.预计收回日期===null || parseInt(scope.row.是否收回) === 2 ? scope.row.是否禁用收回 = true : scope.row.是否禁用收回 = false }}</div> <div v-show="false">{{ scope.row.预计收回日期===''||scope.row.预计收回日期===null || parseInt(scope.row.是否收回) === 2 ? scope.row.是否禁用收回 = true : scope.row.是否禁用收回 = false }}</div>
<div v-show="false">{{ parseInt(scope.row.是否收回) === 2 ? scope.row.是否禁用扣款 = true : scope.row.是否禁用扣款 = false }}</div> <div v-show="false">{{ parseInt(scope.row.是否收回) === 2 ? scope.row.是否禁用扣款 = true : scope.row.是否禁用扣款 = false }}</div>
@@ -436,7 +436,7 @@
</el-dialog> </el-dialog>
<!--收回安全保证金--> <!--收回安全保证金-->
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="收回" center style="min-height: 300px" width="20%"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="收回" center style="min-height: 300px" width="40%">
<el-form ref="form4" :model="form4" :rules="rules4" label-position="left" label-width="120px" class="demo-ruleForm"> <el-form ref="form4" :model="form4" :rules="rules4" label-position="left" label-width="120px" class="demo-ruleForm">
<el-form-item label="项目名称" prop="项目名称"> <el-form-item label="项目名称" prop="项目名称">
<el-input v-model="projectName" size="small" placeholder="请输入项目名称" style="width:200px" disabled/> <el-input v-model="projectName" size="small" placeholder="请输入项目名称" style="width:200px" disabled/>

31
src/views/TechnologyCenter/CreatePackingList/index.vue
View File

@@ -91,19 +91,20 @@
size="mini" size="mini"
height="170px" height="170px"
style="margin-top:3px;margin-bottom: 0"> style="margin-top:3px;margin-bottom: 0">
<el-table-column type="expand"> <el-table-column type="expand" label="详情">
<template slot-scope="props"> <template slot-scope="props">
<el-table <el-table
:data="groupData" :data="groupData"
border border
stripe stripe
size="mini" size="mini"
style="width: 90%"> class="subTableHeader"
style="width: 50%">
<el-table-column <el-table-column
label="序号" label="序号"
type="index" type="index"
align="center" align="center"
width="100px"/> width="50px"/>
<el-table-column <el-table-column
align="center" align="center"
label="类别" label="类别"
@@ -319,7 +320,7 @@
</el-table> </el-table>
</el-card> </el-card>
<el-dialog :title="receiptTitle" :visible.sync="receiptVisible" center style="min-height: 200px" width="800px"> <el-dialog v-el-drag-dialog :title="receiptTitle" :visible.sync="receiptVisible" center style="min-height: 200px" width="800px">
<el-form ref="receiptForm" :rules="receiptRules" :model="receiptForm" label-position="left" label-width="110px" class="demo-ruleForm"> <el-form ref="receiptForm" :rules="receiptRules" :model="receiptForm" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@@ -367,7 +368,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="machineVisible" :title="machineTitle" center style="min-height: 200px" width="400px"> <el-dialog v-el-drag-dialog :visible.sync="machineVisible" :title="machineTitle" center style="min-height: 200px" width="400px">
<el-form ref="machineForm" :rules="machineRules" :model="machineForm" label-position="left" label-width="110px" class="demo-ruleForm"> <el-form ref="machineForm" :rules="machineRules" :model="machineForm" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row> <el-row>
<el-col v-if="machineTitle==='添加主机'" :span="24"> <el-col v-if="machineTitle==='添加主机'" :span="24">
@@ -400,7 +401,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="fileVisible" :title="fileTitle" center style="min-height: 200px" width="400px"> <el-dialog v-el-drag-dialog :visible.sync="fileVisible" :title="fileTitle" center style="min-height: 200px" width="400px">
<el-form ref="fileForm" :rules="filerules" :model="fileForm" label-position="left" label-width="110px" class="demo-ruleForm"> <el-form ref="fileForm" :rules="filerules" :model="fileForm" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@@ -427,7 +428,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="spareVisible" :title="spareTitle" center style="min-height: 200px" width="400px"> <el-dialog v-el-drag-dialog :visible.sync="spareVisible" :title="spareTitle" center style="min-height: 200px" width="400px">
<el-form ref="spareForm" :rules="spareRule" :model="spareForm" label-position="left" label-width="110px" class="demo-ruleForm"> <el-form ref="spareForm" :rules="spareRule" :model="spareForm" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
@@ -1064,3 +1065,19 @@ span{
.tg1 .tg-0lax{text-align:center;vertical-align:top} .tg1 .tg-0lax{text-align:center;vertical-align:top}
.tg1 .tg-a8eg{font-size:28px;text-align:center;vertical-align:top} .tg1 .tg-a8eg{font-size:28px;text-align:center;vertical-align:top}
</style> </style>
<style lang="scss">
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
}
</style>

12
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -23,7 +23,7 @@
<el-row style="margin-top: 10px"> <el-row style="margin-top: 10px">
<span>机床名称：</span> <span>机床名称：</span>
<el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/> <el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>
<span>机床数量：</span> <span style="margin-left: 10px">机床数量：</span>
<el-input v-model="machineNum" readonly size="small" placeholder="机床数量" style="width: 200px;"/> <el-input v-model="machineNum" readonly size="small" placeholder="机床数量" style="width: 200px;"/>
</el-row> </el-row>
</div> </div>
@@ -46,8 +46,8 @@
width="50"/> width="50"/>
<el-table-column align="center" label="物料状态" min-width="90"> <el-table-column align="center" label="物料状态" min-width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="small">不存在</el-tag> <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="small">存在</el-tag> <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini">存在</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="图号" min-width="120"> <el-table-column align="center" label="图号" min-width="120">
@@ -164,7 +164,7 @@
</el-table> </el-table>
</el-card> </el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px"> <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm"> <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@@ -270,7 +270,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogMaterial" title="物料选择"> <el-dialog v-el-drag-dialog :visible.sync="dialogMaterial" title="物料选择">
<el-input v-model="inputMaterial" placeholder="材质" size="small" style="width:200px"/> <el-input v-model="inputMaterial" placeholder="材质" size="small" style="width:200px"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="searchMaterial()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="searchMaterial()">查询</el-button>
<el-table <el-table
@@ -316,7 +316,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogParts" :title="title1" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" center width="400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogParts" :title="title1" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" center width="400px">
<span>零件图号：</span> <span>零件图号：</span>
<el-input v-model="PartsValueNum" size="small" placeholder="零件图号" style="width: 200px"/> <el-input v-model="PartsValueNum" size="small" placeholder="零件图号" style="width: 200px"/>
<!--<el-select v-model="PartsValueNum" filterable size="small" placeholder="零件图号">--> <!--<el-select v-model="PartsValueNum" filterable size="small" placeholder="零件图号">-->

1
src/views/TechnologyCenter/ImportParts/index.vue
View File

@@ -46,6 +46,7 @@
<!--<div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>--> <!--<div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>-->
<!--</el-upload>--> <!--</el-upload>-->
<el-dialog <el-dialog
v-el-drag-dialog
:visible.sync="dialogVisibleMachine" :visible.sync="dialogVisibleMachine"
width="30%"> width="30%">
<el-card> <el-card>

6
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -46,8 +46,8 @@
width="50"/> width="50"/>
<el-table-column align="center" label="物料状态" min-width="50"> <el-table-column align="center" label="物料状态" min-width="50">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="small" style="margin: 0px">不存在</el-tag> <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="small" style="margin: 0px">存在</el-tag> <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="图号" min-width="150"> <el-table-column align="center" label="图号" min-width="150">
@@ -65,7 +65,7 @@
{{ scope.row.材料或者规格 }} {{ scope.row.材料或者规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="规格" width="150"> <el-table-column align="center" label="规格" width="150" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规格 }} {{ scope.row.规格 }}
</template> </template>

23
src/views/WorkshopProcurement/AccountingPrice/index.vue
View File

@@ -14,7 +14,6 @@
</el-option> </el-option>
</el-select> </el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total=0;pageCurrent=1;pageSize=10;searchTable()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total=0;pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-cjn-09" style="margin-left:10px" @click="Preservation">保存</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>
@@ -64,12 +63,12 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="单价" width="100px"> <el-table-column align="center" label="单价" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.核算单价" size="mini" width="80px" align="center" @change="update(scope.row)"/> <el-input v-model="scope.row.单价" size="mini" width="80px" align="center" @change="update(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="总额" width="100px"> <el-table-column align="center" label="总额" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.核算总额" size="mini" width="80px" align="center" readonly/> {{ scope.row.金额 }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -145,20 +144,14 @@ export default {
}) })
}, },
update(row) { update(row) {
row.核算总额 = row.核算单价 * parseFloat(row.重量或面积) console.log(row)
}, Preservation(row.采购合同明细流水号, row.单价).then(response => {
Preservation() { console.log(response, 1111)
for (let i = 0; i < this.tableData.length; i++) {
console.log(this.tableData[i].请购单明细流水号, this.tableData[i].核算总额)
this.Requisition.push(this.tableData[i].请购单明细流水号)
this.UnitPrice.push(this.tableData[i].核算单价)
this.Total.push(this.tableData[i].核算总额)
}
Preservation(this.Requisition, this.Total, this.UnitPrice).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('保存成功') this.$message.success('编辑成功')
this.searchTable()
} else { } else {
this.$message.error('保存失败') this.$message.error('编辑失败')
} }
}) })
}, },

40
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -69,21 +69,6 @@
<el-card> <el-card>
<el-table :data="tableData4" border style="width: 100%;max-height: 400px;" height="300px" size="mini"> <el-table :data="tableData4" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
<el-table-column label="单件定额工时" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.单件定额工时 }}
</template>
</el-table-column>
<el-table-column label="准结定额工时" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.准结定额工时 }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
</template>
</el-table-column>
<el-table-column label="零件名称" align="center" min-width="100"> <el-table-column label="零件名称" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
@@ -104,6 +89,11 @@
{{ scope.row.零件数量 }} {{ scope.row.零件数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
</template>
</el-table-column>
<el-table-column label="金额" align="center" width="100"> <el-table-column label="金额" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.金额 }} {{ scope.row.金额 }}
@@ -128,21 +118,6 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-table :data="tableData3" border style="width: 100%;max-height: 400px;" height="300px" size="mini"> <el-table :data="tableData3" border style="width: 100%;max-height: 400px;" height="300px" size="mini">
<el-table-column label="单件定额工时" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.单件定额工时 }}
</template>
</el-table-column>
<el-table-column label="准结定额工时" align="center" width="150">
<template slot-scope="scope">
{{ scope.row.准结定额工时 }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="100"> <el-table-column label="物料名称" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料名称 }} {{ scope.row.物料名称 }}
@@ -163,6 +138,11 @@
{{ scope.row.零件数量 }} {{ scope.row.零件数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:70px"/>
</template>
</el-table-column>
<el-table-column label="金额" align="center" width="100"> <el-table-column label="金额" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.金额 }} {{ scope.row.金额 }}

125
src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
View File

@@ -25,13 +25,13 @@
@current-change="handleCurrentChange1"/> @current-change="handleCurrentChange1"/>
</div> </div>
</el-col> </el-col>
<el-col :span="22" style="margin-left: 20px"> <el-col style="margin-left: 0px">
<span>零件图号:</span> <span>零件图号:</span>
<el-input v-model="partDrawingNumber" placeholder="零件图号" size="mini" clearable style="width: 120px"/> <el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0"/>
<el-button type="success" size="mini" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入物料</el-button> <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入物料</el-button>
<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left: 10px" @click="back">打回</el-button> <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="back">打回</el-button>
<el-table v-loading="loading1" :data="tableData1" border style="width: 100%;height: 460px;margin-top: 15px;" height="330" size="mini" @selection-change="handleSelectionChange"> <el-table v-loading="loading1" :data="tableData1" border stripe highlight-current-row style="width: 100%;margin-top:3px;" height="330" size="mini" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/> <el-table-column type="selection" align="center" width="55"/>
<el-table-column label="零件图号" min-width="100" align="center"> <el-table-column label="零件图号" min-width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -48,13 +48,13 @@
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="材料" width="140" align="center"> <el-table-column label="材料" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.材料 }} {{ scope.row.材料 }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;margin-bottom: 10px;"> <div class="block">
<el-pagination <el-pagination
:current-page="pageCurrent1" :current-page="pageCurrent1"
:page-size="pageSize1" :page-size="pageSize1"
@@ -68,21 +68,21 @@
</el-card> </el-card>
<el-card> <el-card>
<div slot="header"> <div> <!--slot="header"-->
<span>采购单号:</span> <span>采购单号:</span>
<el-input v-model="purchasingOrder" placeholder="采购单号" size="small" clearable/> <el-input v-model="purchasingOrder" placeholder="采购单号" size="small" style="margin: 3px 0" clearable/>
<span>供应商:</span> <span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/> <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购单</el-button> <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购单</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存</el-button> <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存</el-button>
</div> </div>
<el-table v-loading="" :data="tableData2" border style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3"> <el-table v-loading="" :data="tableData2" border stripe h style="max-height: 460px;" height="230px" size="mini" highlight-current-row @row-click="searchTable3">
<el-table-column label="单号状态" align="center" width="100" fixed="left"> <el-table-column label="单号状态" align="center" width="100" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="small">编辑中</el-tag> <el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</el-tag>
<el-tag v-if="Number(scope.row.采购计划状态)===1" type="primary" size="small">已保存</el-tag> <el-tag v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</el-tag>
<el-tag v-if="Number(scope.row.采购计划状态)===2" type="success" size="small">已导出</el-tag> <el-tag v-if="Number(scope.row.采购计划状态)===2" type="success" size="mini">已导出</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购单号" align="center" min-width="170"> <el-table-column label="采购单号" align="center" min-width="170">
@@ -115,15 +115,27 @@
{{ scope.row.计划完成日期.split(' ')[0] }} {{ scope.row.计划完成日期.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="200" fixed="right"> <el-table-column label="操作" align="center" width="150" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="parseInt(scope.row.采购计划状态)===2" type="primary" size="mini" icon="el-icon-edit" @click="editPurchaseOrder(scope.row)"/> <el-tooltip effect="dark" content="编辑" placement="top">
<el-button :disabled="parseInt(scope.row.采购计划状态)===2" type="danger" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/> <div style="display: inline-block">
<el-button type="warning" size="mini" icon="el-icon-download" @click="exportExcel(scope.row)"/> <el-button :disabled="parseInt(scope.row.采购计划状态)===2" type="text" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button :disabled="parseInt(scope.row.采购计划状态)===2" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="导出" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-download" style="margin-left: 20px" @click="exportExcel(scope.row)"/>
</div>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block" style="margin: 10px 0;"> <div class="block">
<el-pagination <el-pagination
:current-page="pageCurrent2" :current-page="pageCurrent2"
:page-sizes="[10, 20, 30, 40]" :page-sizes="[10, 20, 30, 40]"
@@ -134,7 +146,7 @@
@size-change="handleSizeChange2" @size-change="handleSizeChange2"
@current-change="handleCurrentChange2"/> @current-change="handleCurrentChange2"/>
</div> </div>
<el-table v-loading="" :data="tableData3" border style="max-height: 300px;" height="300px" size="mini"> <el-table v-loading="" :data="tableData3" border highlight-current-row stripe style="margin: 3px 0" height="200px" size="mini">
<el-table-column label="物料编码" align="center" width="200"> <el-table-column label="物料编码" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.物料零件编码 }} {{ scope.row.物料零件编码 }}
@@ -145,27 +157,27 @@
<!--{{ scope.row.原材料名称 }}--> <!--{{ scope.row.原材料名称 }}-->
<!--</template>--> <!--</template>-->
<!--</el-table-column>--> <!--</el-table-column>-->
<el-table-column label="零件名称" align="center" width="180"> <el-table-column label="零件名称" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="材料" align="center" width="100"> <el-table-column label="材料" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.材料 }} {{ scope.row.材料 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="数量" align="center" width="100"> <el-table-column label="数量" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.批次数量 }} {{ scope.row.批次数量 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="求购重量" align="center" width="150"> <el-table-column label="求购重量" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.重量1" size="mini" style="width:120px" @change="saveWeight(scope.$index, scope.row)"/> <el-input v-model="scope.row.重量1" size="mini" style="width:120px" @change="saveWeight(scope.$index, scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="单价" align="center" width="150"> <el-table-column label="单价" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:120px" @change="saveMoney(scope.$index, scope.row)"/> <el-input v-model="scope.row.单价" size="mini" style="width:120px" @change="saveMoney(scope.$index, scope.row)"/>
</template> </template>
@@ -177,84 +189,85 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="150"> <el-table-column label="操作" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="danger" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移出</el-button> <el-tooltip effect="dark" content="移出" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)"/>
</div>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" title="供应商选择" center style="min-height: 300px">
<el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm"> <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="供应商名称"> <el-form-item label="供应商名称:">
<el-input v-model="supplierName" size="small"/> <el-input v-model="supplierName" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="企业性质"> <el-form-item label="企业性质">
<el-input v-model="enterpriseNature" size="small"/> <el-input v-model="enterpriseNature" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="12">
<el-form-item label="货期"> <el-form-item label="货期">
<el-input v-model="goodTime" size="small"/> <el-input v-model="goodTime" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="注册资本"> <el-form-item label="注册资本">
<el-input v-model="registeredCapital" size="small"/> <el-input v-model="registeredCapital" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="12">
<el-form-item label="税号"> <el-form-item label="税号">
<el-input v-model="taxNum" size="small"/> <el-input v-model="taxNum" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="电子邮箱"> <el-form-item label="电子邮箱">
<el-input v-model="EMail" size="small"/> <el-input v-model="EMail" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="地址" > <el-form-item label="地址" >
<el-input v-model="address" size="small"/> <el-input v-model="address" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-form-item label="账号"> <el-form-item label="账号">
<el-input v-model="account" size="small"/> <el-input v-model="account" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="12">
<el-form-item label="开户行"> <el-form-item label="开户行">
<el-input v-model="openingBank" size="small"/> <el-input v-model="openingBank" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="电话号码"> <el-form-item label="电话号码">
<el-input v-model="phone" size="small"/> <el-input v-model="phone" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> <el-col :span="8">
<el-row>
<el-col :span="12">
<el-form-item label="传真"> <el-form-item label="传真">
<el-input v-model="fax" size="small"/> <el-input v-model="fax" size="small"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<el-button <el-button
type="success" type="success"
size="small" size="small"
style="margin-left: 45px;margin-top: 4px"
icon="el-icon-search" icon="el-icon-search"
@click="searchSupplier">查询</el-button> @click="searchSupplier">查询</el-button>
<el-button <el-button
@@ -269,7 +282,7 @@
@click="emptySupplierDetail">清空</el-button> @click="emptySupplierDetail">清空</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData01" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="200px" border @row-click="showSupplierDetail"> <el-table :data="tableData01" size="mini" style="width: 100%;margin-top:10px" height="400px" border highlight-current-row stripe @row-click="showSupplierDetail">
<el-table-column align="center" label="供应商名称" min-width="250"> <el-table-column align="center" label="供应商名称" min-width="250">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -294,7 +307,7 @@
</el-form> </el-form>
</el-dialog> </el-dialog>
<el-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px"> <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="750px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px"> <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@@ -344,7 +357,7 @@
@click="submitEditPurchaseOrder">确定</el-button> @click="submitEditPurchaseOrder">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-card style="width: 1100px;margin: 20px auto"> <el-card style="width: 1100px;margin: 10px auto">
<div id="cjn" style="width: 1000px;margin: 0 auto"> <div id="cjn" style="width: 1000px;margin: 0 auto">
<table cellspacing="0px" align="center" border="1 solid black" width="100%"> <table cellspacing="0px" align="center" border="1 solid black" width="100%">
<tr> <tr>
@@ -866,9 +879,9 @@ export default {
height: 40px; height: 40px;
text-align: center; text-align: center;
} }
.el-card{ /*.el-card{*/
margin-bottom: 15px; /* margin-bottom: 15px;*/
} /*}*/
.el-date-editor{ .el-date-editor{
width:150px; width:150px;
} }
@@ -879,7 +892,7 @@ export default {
width:200px width:200px
} }
span{ span{
margin: 10px 0 10px 10px; /*margin: 10px 0 10px 0px;*/
} }
.el-tag{ .el-tag{
margin: 0 margin: 0

154
src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
View File

@@ -2,19 +2,19 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<span>发票号:</span> <span>发票号:</span>
<el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/> <el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0" clearable/>
<span>供应商:</span> <span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/> <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<span>传送人:</span> <span style="margin-left: 10px">传送人:</span>
<el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:100px"> <el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:200px">
<el-option <el-option
v-for="item in selectPerson1" v-for="item in selectPerson1"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>接收人:</span> <span style="margin-left: 10px">接收人:</span>
<el-select v-model="recipientValue" placeholder="接收人" size="small" filterable clearable style="width:100px"> <el-select v-model="recipientValue" placeholder="接收人" size="small" filterable clearable style="width:200px">
<el-option <el-option
v-for="item in selectPerson" v-for="item in selectPerson"
:key="item.value" :key="item.value"
@@ -32,50 +32,14 @@
size="small" size="small"
icon="el-icon-circle-plus-outline" icon="el-icon-circle-plus-outline"
style="margin-left: 10px" style="margin-left: 10px"
@click="addTable1()">增加</el-button> @click="addTable1()">新增</el-button>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="" :data="tableData1" size="mini" style="max-height: 400px" height="400px" stripe border> <el-table v-loading="" :data="tableData1" size="mini" style="margin-top: 3px" height="750px" stripe border highlight-current-row @expand-change="searchTable02">
<el-table-column align="center" label="发票号" min-width="120px"> <el-table-column type="expand" label="详情">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.发票号 }} <el-table :data="gridData" class="subTableHeader" stripe border size="mini" show-summary style="width: 40%">
</template>
</el-table-column>
<el-table-column align="center" label="开票时间" min-width="100px">
<template slot-scope="scope">
{{ scope.row.开票时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="开票金额" min-width="100px">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="供应商" min-width="200px">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="传送人" min-width="80px">
<template slot-scope="scope">
{{ scope.row.传送人姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="接收人" min-width="80px">
<template slot-scope="scope">
{{ scope.row.接收人姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" min-width="200px">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="350px">
<template slot-scope="scope">
<el-popover placement="right" width="450" trigger="click">
<el-table :data="gridData" stripe size="mini" show-summary>
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="采购单号"> <el-table-column min-width="150" align="center" label="采购单号">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -93,19 +57,65 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button> </template>
</el-popover> </el-table-column>
<el-table-column align="center" label="发票号" min-width="120px">
<template slot-scope="scope">
{{ scope.row.发票号 }}
</template>
</el-table-column>
<el-table-column align="center" label="开票时间" min-width="100px">
<template slot-scope="scope">
{{ scope.row.开票时间 }}
</template>
</el-table-column>
<el-table-column align="center" label="开票金额" min-width="100px">
<template slot-scope="scope">
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="供应商" min-width="200px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column align="center" label="传送人" min-width="80px">
<template slot-scope="scope">
{{ scope.row.传送人姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="接收人" min-width="80px">
<template slot-scope="scope">
{{ scope.row.接收人姓名 }}
</template>
</el-table-column>
<el-table-column align="center" label="备注" >
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column align="center" label="操作" fixed="right" width="150px">
<template slot-scope="scope">
<el-tooltip effect="dark" content="编辑" placement="top">
<div style="display: inline-block">
<el-button <el-button
type="primary" type="text"
size="mini" size="mini"
icon="el-icon-edit" icon="el-icon-edit-outline"
style="margin-left: 10px" style="margin-left: 10px"
@click="editTable1(scope.row)">编辑</el-button> @click="editTable1(scope.row)"/>
</div>
</el-tooltip>
<el-tooltip effect="dark" content="删除" placement="top">
<div style="display: inline-block">
<el-button <el-button
type="danger" type="text"
size="mini" size="mini"
icon="el-icon-delete" icon="el-icon-delete"
@click="deleteTable1(scope.row)">删除</el-button> style="margin-left: 20px"
@click="deleteTable1(scope.row)"/>
</div>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -122,7 +132,7 @@
</div> </div>
</el-card> </el-card>
<el-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="25%"> <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="25%">
<el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px"> <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px">
<el-form-item label="供应商名称" prop="供应商名称"> <el-form-item label="供应商名称" prop="供应商名称">
<el-input v-model="form1.供应商名称" size="small" readonly> <el-input v-model="form1.供应商名称" size="small" readonly>
@@ -130,7 +140,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="采购单号" prop="contractNum"> <el-form-item label="采购单号" prop="contractNum">
<el-select :disabled="title1==='编辑'" v-model="form1.contractNum" placeholder="采购单号" size="small" multiple filterable clearable> <el-select :disabled="title1==='编辑备料发票'" v-model="form1.contractNum" placeholder="采购单号" size="small" multiple filterable clearable>
<el-option <el-option
v-for="item in contractNums" v-for="item in contractNums"
:key="item.value" :key="item.value"
@@ -168,11 +178,11 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button size="small" @click="dialogVisible1 = false">取消</el-button> <el-button size="small" @click="dialogVisible1 = false">取消</el-button>
<el-button v-show="title1==='增加'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button> <el-button v-show="title1==='新增备料发票'" size="small" type="primary" @click="submitAdd1('form1')">确定</el-button>
<el-button v-show="title1==='编辑'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button> <el-button v-show="title1==='编辑备料发票'" size="small" type="primary" @click="submitEdit1('form1')">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialogVisible" title="供应商选择" center style="min-height: 300px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="选择供应商" center style="min-height: 300px;width: 100%">
<el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm"> <el-form ref="form1" :model="form1" label-position="left" label-width="90px" class="searchForm">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
@@ -258,7 +268,7 @@
@click="emptySupplierDetail">清空</el-button> @click="emptySupplierDetail">清空</el-button>
</el-col> </el-col>
</el-row> </el-row>
<el-table :data="tableData01" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="200px" border @row-click="showSupplierDetail"> <el-table :data="tableData01" size="mini" style="width: 97%;max-height: 300px;margin-top:15px" height="300px" border stripe highlight-current-row @row-click="showSupplierDetail">
<el-table-column align="center" label="供应商名称" min-width="250"> <el-table-column align="center" label="供应商名称" min-width="250">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -486,7 +496,7 @@ export default {
if (this.$refs['form1'] !== undefined) { if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields() this.$refs['form1'].resetFields()
} }
this.title1 = '增加' this.title1 = '新增备料发票'
this.dialogVisible1 = true this.dialogVisible1 = true
this.form1.供应商名称 = '' this.form1.供应商名称 = ''
this.form1.供应商流水号 = '' this.form1.供应商流水号 = ''
@@ -523,7 +533,7 @@ export default {
if (this.$refs['form1'] !== undefined) { if (this.$refs['form1'] !== undefined) {
this.$refs['form1'].resetFields() this.$refs['form1'].resetFields()
} }
this.title1 = '编辑' this.title1 = '编辑备料发票'
console.log(row) console.log(row)
this.dialogVisible1 = true this.dialogVisible1 = true
this.form1.contractNum = (row.采购计划流水号.split(',')).map(Number) this.form1.contractNum = (row.采购计划流水号.split(',')).map(Number)
@@ -592,7 +602,7 @@ export default {
<style scoped> <style scoped>
.el-card{ .el-card{
margin-bottom: 15px; /*margin-bottom: 15px;*/
} }
.el-date-editor{ .el-date-editor{
width:150px; width:150px;
@@ -603,11 +613,27 @@ export default {
.el-input{ .el-input{
width:200px width:200px
} }
span{ span{margin: 10px 0px;
margin: 10px 0 10px 10px;
} }
.searchForm .el-form-item{ .searchForm .el-form-item{
margin-top: 1px; margin-top: 1px;
margin-bottom: 1px; margin-bottom: 1px;
} }
</style> </style>
<style lang="scss">
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
}
</style>

29
src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue
View File

@@ -1,16 +1,16 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div slot="header"> <div>
<span>采购单号:</span> <span>采购单号:</span>
<el-select v-model="purchaseOrderValue" placeholder="采购单号" size="small" clearable filterable> <el-select v-model="purchaseOrderValue" placeholder="采购单号" style="margin-top: 3px" size="small" clearable filterable>
<el-option <el-option
v-for="item in purchaseOrder" v-for="item in purchaseOrder"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<span>供应商:</span> <span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" style="width: 200px" size="small" clearable/> <el-input v-model="supplierName0" placeholder="供应商" style="width: 200px" size="small" clearable/>
<el-button <el-button
type="success" type="success"
@@ -23,8 +23,9 @@
v-loading="loading" v-loading="loading"
:data="tableData" :data="tableData"
border border
style="width: 100%;max-height: 460px;" stripe
height="270" style="width: 100%"
height="430"
size="mini" size="mini"
highlight-current-row highlight-current-row
@row-click="searchTable1"> @row-click="searchTable1">
@@ -38,7 +39,7 @@
{{ scope.row.采购单名称 }} {{ scope.row.采购单名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" min-width="150" align="center"> <el-table-column label="供应商" min-width="150" align="center" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -77,11 +78,11 @@
</div> </div>
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="" :data="tableData1" :summary-method="getSummaries" border style="max-height: 300px;" height="400px" size="mini" show-summary> <el-table v-loading="" :data="tableData1" :summary-method="getSummaries" border stripe highlight-current-row style="margin-top: 3px" height="300px" size="mini" show-summary>
<el-table-column label="状态" align="center" width="100" fixed="left"> <el-table-column label="状态" align="center" width="100" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.是否到货)===0" type="warning" size="small">未到货</el-tag> <el-tag v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</el-tag>
<el-tag v-if="Number(scope.row.是否到货)===1" type="primary" size="small">已到货</el-tag> <el-tag v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到货</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="零件图号" align="center" min-width="150"> <el-table-column label="零件图号" align="center" min-width="150">
@@ -136,12 +137,16 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" min-width="100"> <el-table-column label="操作" align="center" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-goods" @click="OpenArrival(scope.row)">到货</el-button> <el-tooltip effect="dark" content="到货" placement="top">
<div style="display: inline-block">
<el-button type="text" size="mini" icon="el-icon-goods" @click="OpenArrival(scope.row)"/>
</div>
</el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog :visible.sync="dialogVisible" title="到货" center style="min-height: 300px" width="400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="到货" center style="min-height: 300px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="100px">
<el-row> <el-row>
<el-form-item label="重量" prop="重量"> <el-form-item label="重量" prop="重量">
@@ -313,6 +318,6 @@ export default {
<style scoped> <style scoped>
span{ span{
margin: 10px 0 10px 10px; /*margin: 10px 0;*/
} }
</style> </style>

92
src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
View File

@@ -8,13 +8,13 @@
size="small" size="small"
type="daterange" type="daterange"
align="center" align="center"
style="width: 300px" style="width: 300px;margin: 3px 0"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
format="yyyy-MM-dd" format="yyyy-MM-dd"
range-separator="～" range-separator="～"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
<span>供应商:</span> <span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/> <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<el-button <el-button
type="success" type="success"
@@ -26,7 +26,29 @@
</el-card> </el-card>
<el-card> <el-card>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" show-summary> <el-table v-loading="" :data="tableData1" border stripe highlight-current-row style="margin-top: 3px;" height="600px" size="mini" show-summary @expand-change="searchTable02">
<el-table-column type="expand" label="详情">
<template slot-scope="scope">
<el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 40%">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="采购单号">
<template slot-scope="scope">
{{ scope.row.采购单号 }}
</template>
</el-table-column>
<el-table-column min-width="150" align="center" label="采购单名称">
<template slot-scope="scope">
{{ scope.row.采购单名称 }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="计划总额" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
</template>
</el-table-column>
</el-table>
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="250"> <el-table-column label="供应商" align="center" min-width="250">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -50,9 +72,9 @@
<el-table-column label="请款付款情况" align="center"> <el-table-column label="请款付款情况" align="center">
<el-table-column label="审批情况内容" width="100" align="center"> <el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag> <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag> <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag> <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未通过审批原因" width="110" align="center"> <el-table-column label="未通过审批原因" width="110" align="center">
@@ -62,9 +84,9 @@
</el-table-column> </el-table-column>
<el-table-column label="付款情况" width="100" align="center"> <el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag> <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag> <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag> <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未付款原因" width="100" align="center"> <el-table-column label="未付款原因" width="100" align="center">
@@ -75,28 +97,11 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="250"> <el-table-column label="操作" align="center" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="right" width="500" trigger="click"> <el-tooltip effect="dark" content="取消请款" placement="top">
<el-table :data="gridData" stripe size="mini" show-summary> <div style="display: inline-block">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
<el-table-column min-width="150" align="center" label="采购单号"> </div>
<template slot-scope="scope"> </el-tooltip>
{{ scope.row.采购单号 }}
</template>
</el-table-column>
<el-table-column min-width="150" align="center" label="采购单名称">
<template slot-scope="scope">
{{ scope.row.采购单名称 }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="计划总额" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button>
</el-popover>
<el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -113,7 +118,7 @@
</div> </div>
</el-card> </el-card>
<el-dialog :visible.sync="dialogVisible2" title="采购计划请款" center style="min-height: 300px" width="1200px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="采购计划请款" center style="min-height: 300px" width="1200px">
<span>供应商：</span> <span>供应商：</span>
<el-select v-model="supplierValue" placeholder="供应商" filterable size="small"> <el-select v-model="supplierValue" placeholder="供应商" filterable size="small">
<el-option <el-option
@@ -128,7 +133,7 @@
icon="el-icon-search" icon="el-icon-search"
style="margin: 0 10px 10px 10px" style="margin: 0 10px 10px 10px"
@click="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">查询</el-button> @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable01()">查询</el-button>
<el-table v-loading="" :data="tableData01" border style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange"> <el-table v-loading="" :data="tableData01" border stripe highlight-current-row style="max-height: 300px;" height="300px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :selectable="selectable" type="selection" align="center" width="50"/> <el-table-column :selectable="selectable" type="selection" align="center" width="50"/>
<el-table-column label="采购单号" align="center" min-width="120"> <el-table-column label="采购单号" align="center" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -344,10 +349,9 @@ export default {
} }
} }
</script> </script>
<style scoped> <style scoped>
.el-card{ .el-card{
margin-bottom: 15px; /*margin-bottom: 15px;*/
} }
.el-date-editor{ .el-date-editor{
width:150px; width:150px;
@@ -359,7 +363,7 @@ export default {
width:200px width:200px
} }
span{ span{
margin: 10px 0 10px 10px; margin: 10px 0;
} }
.el-tag{ .el-tag{
margin: 0 margin: 0
@@ -369,3 +373,19 @@ export default {
} }
</style> </style>
<style lang="scss">
.subTableHeader {
th {
background: #8ff4ea !important;
color: black;
}
tr.el-table__row td {
background-color: #d8e5f6 !important;
}
tr.el-table__row.el-table__row--striped td {
background: #e9f0f9 !important;
}
}
</style>