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

Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

Browse Source
This commit is contained in:
zhangdingyu
2019-09-24 20:46:17 +08:00
parent 9804b623bd 6cd2c4e1c3
commit c11add4b18
21 changed files with 340 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 108 KiB

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 MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
const service = axios.create({
baseURL: `http://192.168.0.104:8005/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
})

6
src/views/Assembly/AssemblyQualityInspection/index.vue
View File

@@ -34,11 +34,13 @@
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
<el-tooltip effect="dark" content="导出查询数据" placement="top" open-delay="1000">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
<el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="500px">
<el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="600px">
<el-table-column align="center" label="检验情况" width="80px">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>

4
src/views/Assembly/DeliveryConfirmation/index.vue
View File

@@ -336,12 +336,12 @@
</el-form-item>
</el-row>
<el-row style="margin-top: 15px">
<el-form-item label="备注" prop="备注" style="display: inline-block" label-width="80px">
<el-form-item label="备注" prop="备注" style="display: inline-block;width: 70%" label-width="80px">
<el-input
v-model="invoiceFrom.备注"
:disabled="disabled"
size="mini"
style="width: 788px;margin-right: 10px"
style="width: 90%;margin-right: 10px"
clearable
placeholder="请输入内容"/>
</el-form-item>

10
src/views/Assembly/QualityInspectionInformationInquiry/index.vue
View File

@@ -66,11 +66,13 @@
:value="item.value"/>
</el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
<el-tooltip effect="dark" content="导出查询数据" placement="top" open-delay="1000">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
</el-tooltip>
</el-row>
</el-card>
<el-card>
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column align="center" label="禁用情况" width="80px">
<template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否禁用)===0||scope.row.是否禁用===''" type="success" size="small" @click="approvalPass(scope.row)">未禁用</el-tag>
@@ -257,7 +259,7 @@
</el-card>
<el-card>
<h4 style="margin-left: 45%;">正在加工零件列表</h4>
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
@@ -327,7 +329,7 @@
</el-card>
<el-card>
<h4 style="margin-left: 45%;">待加工零件列表</h4>
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
<el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
<el-table-column label="机床图号" align="center" width="110px">
<template slot-scope="scope">
{{ scope.row.机床图号 }}

48
src/views/BasicData/PartsNumberMaintenance/index.vue
View File

@@ -34,14 +34,17 @@
</el-card>
<el-card>
<div>
<span style="font-size: 20px;margin-bottom: 20px">基本件三表数量</span>
<el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
<span style="font-size: 20px">基本件三表数量</span>
<el-tooltip effect="dark" content="删除基本件三表数量" placement="top" open-delay="1000">
<el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
</el-tooltip>
</div>
<el-table
v-loading="loading"
:data="tableData"
highlight-current-row
border
stripe
size="mini"
style="width: 100%;max-height: 520px"
height="320">
@@ -121,16 +124,23 @@
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" width="200">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-edit"
@click="type=1;handleEdit(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
<el-tooltip effect="dark" content="编辑零件数量" placement="top" open-delay="1000">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-edit"
@click="type=1;handleEdit(scope.row)">编辑</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="删除该行" placement="top" open-delay="1000">
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
@@ -147,8 +157,10 @@
</el-card>
<el-card>
<div>
<span style="font-size: 20px;margin-bottom: 20px">外购件和标准件三表数量</span>
<el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
<span style="font-size: 20px">外购件和标准件三表数量</span>
<el-tooltip effect="dark" content="删除外购件和标准件数量" placement="top" open-delay="1000">
<el-button style="float: right;margin-bottom: 20px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
</el-tooltip>
</div>
<el-table
v-loading="loadingWB"
@@ -241,7 +253,7 @@
</el-card>
<el-card>
<div>
<div style="font-size: 20px;margin-bottom: 20px">未投产数量</div>
<div style="font-size: 20px">未投产数量</div>
<el-table
:data="tableData1"
border
@@ -305,7 +317,7 @@
</div>
</el-card>
<el-card>
<div style="font-size: 20px;margin-bottom: 20px">未平衡数量</div>
<div style="font-size: 20px">未平衡数量</div>
<el-table
:data="tableData2"
border
@@ -363,7 +375,7 @@
</div>
</el-card>
<el-card>
<div style="font-size: 20px;margin-bottom: 20px">未分配采购零件数量</div>
<div style="font-size: 20px">未分配采购零件数量</div>
<el-tabs type="border-card" @tab-click="searchTable1();searchTable2()">
<el-tab-pane label="标准件和外购件">
<el-table :data="tableData3" size="mini" style="max-height: 320px" height="320px" border>
@@ -617,7 +629,7 @@
</el-tab-pane>
</el-tabs>
</el-card>
<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="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
<el-form-item label="数量" prop="数量">
<el-input

43
src/views/BasicData/ShiftManagement/index.vue
View File

@@ -10,76 +10,81 @@
:value="item.value"/>
</el-select>
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="searchTable()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addShifttable()">增加</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="ShiftType()">班次类型工作时间</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addShifttable()">新增</el-button>
<el-button type="warning" icon="el-icon-circle-plus-outline" plain size="small" @click="ShiftType()">班次类型工作时间</el-button>
</el-card>
<el-card>
<el-table
:data="tableData"
border
stripe
size="mini"
style="width: 100%;height: 550px;">
<el-table-column label="开始工作时间">
height="550"
center
style="width: 100%">
<el-table-column label="开始工作时间" align="center">
<template slot-scope="scope">
{{ scope.row.开始工作时间 }}
</template>
</el-table-column>
<el-table-column disabled label="结束工作时间" >
<el-table-column disabled label="结束工作时间" align="center">
<template slot-scope="scope">
{{ scope.row.结束工作时间 }}
</template>
</el-table-column>
<el-table-column label="班次类型">
<el-table-column label="班次类型" align="center">
<template slot-scope="scope">
{{ scope.row.班次类型 }}
</template>
</el-table-column>
<el-table-column label="班次代码">
<el-table-column label="班次代码" align="center">
<template slot-scope="scope">
{{ scope.row.班次代码 }}
</template>
</el-table-column>
<el-table-column label="是否夜班">
<el-table-column label="是否夜班" align="center">
<template slot-scope="scope">
{{ scope.row.是否夜班 }}
</template>
</el-table-column>
<el-table-column label="是否工作">
<el-table-column label="是否工作" align="center">
<template slot-scope="scope">
{{ scope.row.是否工作 }}
</template>
</el-table-column>
<el-table-column label="是否工作">
<el-table-column label="是否工作" align="center">
<template slot-scope="scope">
{{ scope.row.是否工作 }}
</template>
</el-table-column>
<el-table-column label="日工作能力">
<el-table-column label="日工作能力" align="center">
<template slot-scope="scope">
{{ scope.row.日工作能力 }}
</template>
</el-table-column>
<el-table-column label="是否可以安排高难度件">
<el-table-column label="是否可以安排高难度件" align="center">
<template slot-scope="scope">
{{ scope.row.是否可以安排高难度件 }}
</template>
</el-table-column>
<el-table-column label="备注">
<el-table-column label="备注" align="center">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column label="操作" width="200">
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-edit"
@click="aeditShifttable(scope.row)">修改</el-button>
@click="aeditShifttable(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@@ -96,7 +101,7 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-dialog :visible.sync ="dialogFormVisible1" title="增加" center style="min-height: 270px" width="900px">
<el-dialog v-el-drag-dialog :visible.sync ="dialogFormVisible1" title="新增班次人员" center style="min-height: 270px" width="900px">
<el-form ref="form1" :model="form1" :rules="rules" label-position="right" label-width="160px" class="demo-ruleForm">
<el-row>
<el-col :span="10">
@@ -183,7 +188,7 @@
<el-button type="primary" @click="submitAdd1()">确 定</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="编辑" center style="min-height: 270px" width="900px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="编辑" center style="min-height: 270px" width="900px">
<el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="10">
@@ -467,8 +472,6 @@ export default {
<style scoped>
.el-card{
margin-bottom:15px;
margin-left: 15px;
margin-right: 15px;
margin: 0px;
}
</style>

11
src/views/BasicData/SystemRrolemaintenance/index.vue
View File

@@ -6,7 +6,7 @@
<el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="pageCurrent=1;pageSize = 10;searchData()">查询</el-button>
<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
</el-card>
<el-card style="margin-top: 15px">
<el-card style="margin-top: 0px">
<el-table
v-loading="loading"
:data="tableData"
@@ -32,11 +32,13 @@
<el-button
size="mini"
type="primary"
plain
icon="el-icon-edit"
@click="handleEdit(scope.row)">编辑</el-button>
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@@ -54,7 +56,7 @@
</div>
</el-card>
<el-dialog :visible.sync="dialogFormVisible1" title="新增角色" center style="min-height: 200px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="新增角色" center style="min-height: 200px" width="400px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px">
<el-form-item label="角色名称" prop="角色功能" style="display: inline-block">
<el-input
@@ -212,7 +214,8 @@ export default {
}
}
</script>
<style scoped>
.el-card{
margin: 0px;
}
</style>

31
src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
View File

@@ -18,42 +18,49 @@
</el-card>
<el-card>
<el-table :data="tableData" highlight-current-row>
<el-table-column label="员工姓名">
<el-table :data="tableData" highlight-current-row stripe size="mini" height="550" border style="width: 100%">
<el-table-column
label="序号"
align="center"
type="index"
width="50"/>
<el-table-column label="员工姓名" align="center">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column disabled label="所属部门" >
<el-table-column disabled label="所属部门" align="center">
<template slot-scope="scope">
{{ scope.row.部门名称 }}
</template>
</el-table-column>
<el-table-column label="岗位名称">
<el-table-column label="岗位名称" align="center">
<template slot-scope="scope">
{{ scope.row.岗位名称 }}
</template>
</el-table-column>
<el-table-column label="角色名称">
<el-table-column label="角色名称" align="center">
<template slot-scope="scope">
{{ scope.row.角色功能 }}
</template>
</el-table-column>
<el-table-column label="考勤编号">
<el-table-column label="考勤编号" align="center">
<template slot-scope="scope">
{{ scope.row.考勤编号 }}
</template>
</el-table-column>
<el-table-column label="操作">
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
plain
icon="el-icon-edit"
@click="submitEdit(scope.$index, scope.row)">修改</el-button>
<el-button
size="mini"
type="danger"
plain
icon="el-icon-delete"
@click="handleDelete(scope.row)">删除</el-button>
</template>
@@ -72,7 +79,7 @@
</el-card>
</table>
<el-dialog :visible.sync="dialogFormVisible" title="人员信息" center width="750px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="人员信息" center width="750px">
<div style="height: 500px">
<div style="float: left;margin-top: 10px;margin-left: 20px;overflow-y: scroll;height: 400px">
<el-tree
@@ -111,7 +118,7 @@
<el-button type="primary" style="margin-top: 20px" @click="getName">确认</el-button>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible1" title="增加" center style="min-height: 270px" width="800px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="增加" center style="min-height: 270px" width="800px">
<el-form ref="form1" :model="form1" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -148,7 +155,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="dialogFormVisible2" title="编辑" center style="min-height: 270px" width="800px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="编辑" center style="min-height: 270px" width="800px">
<el-form ref="form2" :model="form2" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
@@ -393,8 +400,6 @@ export default {
<style scoped>
.el-card{
margin-bottom:15px;
margin-left: 15px;
margin-right: 15px;
margin: 0px;
}
</style>

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

@@ -5,9 +5,6 @@
<span>零件图号:</span>
<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=30; pageCurrent=1;searchTable()">查询</el-button>
<el-tooltip effect="dark" content="已导出和未导出备料单" placement="top" open-delay="1200">
<el-checkbox v-model="all" size="small">查询全部</el-checkbox>
</el-tooltip>
<el-tooltip effect="dark" content="打印备料单" placement="top" open-delay="1200">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left:0px" @click="exportTable('BL')">导出备料单</el-button>
</el-tooltip>

120
src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
View File

@@ -82,22 +82,10 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<!--<el-row>-->
<!--<el-col :xs="24" :sm="24" :lg="8">-->
<!--<el-card>-->
<!--<div id="myChart1" style="width: 1000px; height: 570px; margin: auto"/>-->
<!--</el-card>-->
<!--</el-col>-->
<!--<el-col :xs="24" :sm="24" :lg="8">-->
<!--<el-card>-->
<!--<div id="myChart2" style="width: 1000px; height: 570px; margin: auto"/>-->
<!--</el-card>-->
<!--</el-col>-->
<!--</el-row>-->
<el-card style="width: 49.8%; float: left;margin-right: 5px">
<div id="myChart1" style="width: 1000px; height: 570px; margin: auto"/>
</el-card>
<el-card style="width: 49.8%">
<el-card style="width: 49.7%;margin-left: 5px">
<div id="myChart2" style="width: 1000px; height: 570px; margin: auto"/>
</el-card>
<el-card>
@@ -135,6 +123,38 @@
<el-card>
<div id="myChart" style="width: 1000px; height: 570px; margin: auto"/>
</el-card>
<el-card>
<span>工位号:</span>
<el-select v-model="MachineValue2" filterable size="small" style="width:160px;margin-bottom:10px" placeholder="工位号">
<el-option
v-for="item in Machine"
: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 style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="date3"
style="width:160px;margin:10px;"
size="small"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"/>
<span>~</span>
<el-date-picker
v-model="date4"
style="width:160px;margin:10px;"
size="small"
type="date"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData2()">查询</el-button>
</el-card>
<el-card>
<div id="myChart3" style="width: 100%; height: 520px; margin: auto"/>
</el-card>
@@ -149,6 +169,7 @@ export default {
tableDataA: [],
MachineValue: '',
MachineValue1: '',
MachineValue2: '',
Machine: [],
yAxisValue: [],
colors: [],
@@ -156,6 +177,8 @@ export default {
Time: '',
date1: '',
date2: '',
date3: '',
date4: '',
time1: '',
time2: '',
time3: '',
@@ -211,50 +234,33 @@ export default {
})
},
searchData1() {
getData2(this.MachineValue1, this.date1, this.date2).then(response => {
this.table = response.data
}).then(() => {
this.drawLine()
if (!this.date1 || !this.date2) {
this.$message.warning('请选择开始时间或结束时间')
} else {
if (!this.MachineValue1) {
this.$message.warning('请选择工位')
} else {
const endYear = parseInt(this.date2.split('-')[0])
const startYear = parseInt(this.date1.split('-')[0])
const endMonth = parseInt(this.date2.split('-')[1])
const startMonth = parseInt(this.date1.split('-')[1])
const endDate = parseInt(this.date2.split('-')[2])
const startDate = parseInt(this.date1.split('-')[2])
let diff
if ((endMonth - startMonth) === 0) {
diff = endDate - startDate
}
if ((endMonth - startMonth) === 1) {
diff = endDate - startDate + 10
}
if ((endMonth - startMonth) > 1 || (endYear - startYear) !== 0) {
diff = 999
}
if (diff > 6) {
this.$message.warning('选择时间区间不得超过6天！')
} else {
searchState().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.colors.push(response.data[i].颜色)
this.state.push(response.data[i].状态)
}
})
getData3(this.MachineValue1, this.date1, this.date2).then(response => {
this.table1 = response.data
}).then(() => {
this.drawLine3()
})
}
if (this.date1 === null || this.date2 === null) {
this.$message.warning('请选择开始时间或结束时间')
} else {
getData2(this.MachineValue1, this.date1, this.date2).then(response => {
this.table = response.data
}).then(() => {
this.drawLine()
})
}
},
searchData2() {
if (this.date3 === null || this.date4 === null) {
this.$message.warning('请选择开始时间或结束时间')
} else {
searchState().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.colors.push(response.data[i].颜色)
this.state.push(response.data[i].状态)
}
}
})
})
getData3(this.MachineValue2, this.date3, this.date4).then(response => {
this.table1 = response.data
console.log(this.table1)
}).then(() => {
this.drawLine3()
})
}
},
// 绘制图形
drawLine() {
@@ -497,7 +503,7 @@ export default {
var categoryIndex = api.value(0) // 这里使用 api.value(0) 取出当前 dataItem 中第一个维度的数值。
var start = api.coord([api.value(1), categoryIndex]) // 这里使用 api.coord(...) 将数值在当前坐标系中转换成为屏幕上的点的像素值。
var end = api.coord([api.value(2), categoryIndex])
var height = 24 // 柱体宽度
var height = 10 // 柱体宽度
return {
type: 'rect', // 表示这个图形元素是矩形。还可以是 'circle', 'sector', 'polygon' 等等。

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

@@ -2671,7 +2671,7 @@ export default {
left join (select 组件流水号,count(*) as 已传递条数
from 车间生产管理工艺_零件工序_投产信息_查询视图 where 是否传递 = 2 group by 组件流水号) as b
on 综合查询_零件分配模块信息视图.组件流水号 = b.组件流水号
where 机床流水号 = ${this.machineValue1} order by 组号`
where 机床流水号 = ${this.machineValue1} and 组号 <> '00组' order by 组号`
}
}).then(res => {
this.tableDataDiv4 = res.data
@@ -4470,7 +4470,7 @@ export default {
width: 1858px;
height: 400px;
/*border: 1px solid red;*/
background: url('../../../assets/img/img12.png') repeat;
background: url('../../../assets/img/img13.png') repeat;
background-repeat:no-repeat;
background-size:100% 100%;-moz-background-size:100% 100%;
}

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

@@ -172,9 +172,9 @@
</el-row>
<el-divider content-position="right">跳转链接</el-divider>
<el-row style="margin-left: 20px">
<router-link to="/StatusQuery/index" style="color:dodgerblue">零件状态查询</router-link>
<el-button size="medium" type="text" @click="toStatusQuery">零件状态查询</el-button>
<el-divider direction="vertical"/>
<router-link to="/StatusQuery/index" style="color:dodgerblue">加工进度查询</router-link>
<el-button size="medium" type="text" @click="toProcessingStatus">加工进度查询</el-button>
</el-row>
</div>
</div>
@@ -307,6 +307,12 @@ export default {
})
}
},
toStatusQuery() {
this.$router.push('/ManufacturingCenter/StatusQuery')
},
toProcessingStatus() {
this.$router.push('/ManufacturingCenter/ProcessingStatus')
},
createFilterPick(queryString) {
return (restaurant) => {
return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)

49
src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
View File

@@ -32,7 +32,7 @@
<el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
</div>
<h3 style="margin-top: 0">请款表</h3>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini">
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
<el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -114,7 +114,7 @@
</el-table>
<el-button slot="reference" type="primary" size="mini" plain icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button>
</el-popover>
<el-button :disabled="Number(id)!==Number(scope.row.请款人)||!Number(scope.row.审核情况流水号)!==3" type="danger" plain size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
<el-button :disabled="Number(id)!==Number(scope.row.请款人) || !((Number(scope.row.审核情况流水号) !== 1) || (Number(scope.row.审批情况流水号)===2) || (Number(scope.row.付款情况流水号)===2))" type="danger" plain size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
</template>
</el-table-column>
</el-table>
@@ -139,7 +139,7 @@
<el-card>
<h3 style="margin-top: 0">离线合同明细</h3>
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" stripe show-summary>
<el-table-column label="离线合同编号" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.离线合同编号 }}
@@ -235,9 +235,14 @@
{{ scope.row.已付金额 }}
</template>
</el-table-column>
<el-table-column label="申请中金额" align="center" min-width="100" prop="申请中金额">
<template slot-scope="scope">
{{ scope.row.申请中金额 }}
</template>
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="120" prop="请款金额">
<template slot-scope="scope">
<el-input-number :precision="2" v-model="scope.row.请款金额" size="mini" controls-position="right" style="width: 100%;"/>
<el-input-number :precision="2" :max="scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额) === 0" v-model="scope.row.请款金额" size="mini" controls-position="right" style="width: 100%;"/>
</template>
</el-table-column>
</el-table>
@@ -307,6 +312,7 @@ export default {
name: '', // 离线合同
data() {
return {
selectContents: '',
totalSum: 0,
totalPay: 0,
totalDebt: 0,
@@ -462,7 +468,7 @@ export default {
})
this.tableData01.map(v => {
this.$set(v, '请款金额', 0)
v.请款金额 = v.合同总额 - v.已付金额
v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额
return v
})
})
@@ -476,6 +482,7 @@ export default {
})
},
handleSelectionChange(val) {
this.selectContents = val
this.SUM = 0
this.contractGroup = []
this.sumGroup = []
@@ -491,13 +498,31 @@ export default {
},
submitRequestFund() { // 确认请款
if (this.supplierValue && this.contractGroup.length !== 0) {
submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person
if (response.data[0].result === '1') {
this.$message.success('请款成功')
this.searchTable1()
this.dialogVisible2 = false
} else { this.$message.error('请款失败') }
})
this.SUM = 0
this.contractGroup = []
this.sumGroup = []
for (let i = 0; i < this.tableData01.length; i++) {
for (let j = 0; j < this.selectContents.length; j++) {
if (this.selectContents[j].离线合同流水号 === this.tableData01[i].离线合同流水号) {
this.SUM += parseFloat(this.tableData01[i].请款金额)
this.contractGroup.push(this.tableData01[i].离线合同流水号)
this.sumGroup.push(this.tableData01[i].请款金额)
}
}
}
if (this.SUM === 0) {
this.$message.error('请款金额不能为0')
} else {
submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person
if (response.data[0].result === '1') {
this.$message.success('请款成功')
this.searchTable1()
this.dialogVisible2 = false
} else {
this.$message.error('请款失败')
}
})
}
} else {
this.$message.error('请选择需要请款的合同')
}

47
src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
View File

@@ -85,7 +85,7 @@
</div>
</div>
<h3>请款表</h3>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini">
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
<el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -167,7 +167,7 @@
</el-table>
<el-button slot="reference" type="primary" plain size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button>
</el-popover>
<el-button :disabled="Number(id)!==Number(scope.row.请款人)||Number(scope.row.审核情况流水号)!==3" type="danger" plain size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
<el-button :disabled="Number(id)!==Number(scope.row.请款人) || !((Number(scope.row.审核情况流水号) !== 1) || (Number(scope.row.审批情况流水号)===2) || (Number(scope.row.付款情况流水号)===2))" type="danger" plain size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
</template>
</el-table-column>
</el-table>
@@ -226,9 +226,14 @@
{{ scope.row.已付金额 }}
</template>
</el-table-column>
<el-table-column label="申请中金额" align="center" min-width="100" prop="申请中金额">
<template slot-scope="scope">
{{ scope.row.申请中金额 }}
</template>
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="120" prop="请款金额">
<template slot-scope="scope">
<el-input-number v-model="scope.row.请款金额" :precision="2" size="mini" controls-position="right" style="width: 100%;"/>
<el-input-number :max="scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额) === 0" v-model="scope.row.请款金额" :precision="2" size="mini" controls-position="right" style="width: 100%;"/>
</template>
</el-table-column>
</el-table>
@@ -248,6 +253,7 @@ import { getNowTime, timeToStamp } from '@/utils/tool'
export default {
data() {
return {
selectContents: [],
getDate: null,
tableData0: [],
pickerOptions: {
@@ -394,7 +400,7 @@ export default {
this.tableData01 = response.data
this.tableData01.map(v => {
this.$set(v, '请款金额', 0)
v.请款金额 = v.合同总额 - v.已付金额
v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额
return v
})
})
@@ -406,6 +412,7 @@ export default {
return parseInt(row.已请款) !== 1 // 已经请款
},
handleSelectionChange(val) {
this.selectContents = val
this.SUM = 0
this.contractGroup = []
this.sumGroup = []
@@ -417,13 +424,31 @@ export default {
},
submitRequestFund() { // 确认请款
if (this.supplierValue && this.contractGroup.length !== 0) {
submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 采购合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person
if (response.data[0].result === '1') {
this.$message.success('请款成功')
this.searchTable1()
this.dialogVisible2 = false
} else { this.$message.error('请款失败') }
})
this.SUM = 0
this.contractGroup = []
this.sumGroup = []
for (let i = 0; i < this.tableData01.length; i++) {
for (let j = 0; j < this.selectContents.length; j++) {
if (this.selectContents[j].采购合同流水号 === this.tableData01[i].采购合同流水号) {
this.SUM += parseFloat(this.tableData01[i].请款金额)
this.contractGroup.push(this.tableData01[i].采购合同流水号)
this.sumGroup.push(this.tableData01[i].请款金额)
}
}
}
if (this.SUM === 0) {
this.$message.error('请款金额不能为0')
} else {
submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 采购合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person
if (response.data[0].result === '1') {
this.$message.success('请款成功')
this.searchTable1()
this.dialogVisible2 = false
} else {
this.$message.error('请款失败')
}
})
}
} else {
this.$message.error('请选择需要请款的合同')
}

3
src/views/PurchasingCenter/PurchaseContractReview/index.vue
View File

@@ -29,8 +29,9 @@
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button
type="info"
type="warning"
size="small"
plain
icon="el-icon-search"
style="margin-left:10px"
@click="setting()">通知</el-button>

12
src/views/PurchasingCenter/PurchaseContractSearch/index.vue
View File

@@ -60,11 +60,13 @@
icon="el-icon-search"
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
<el-button
type="warning"
size="small"
icon="el-icon-download"
@click="download()">导出</el-button>
<el-tooltip effect="dark" content="打印采购合同" placement="top" open-delay="1000">
<el-button
type="warning"
size="small"
icon="el-icon-download"
@click="download()">导出</el-button>
</el-tooltip>
</el-row>
</div>
<el-table

14
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -44,6 +44,7 @@
</div>
</el-card>
<el-card>
<h3>自制件</h3>
<el-table
v-loading="loading"
:data="tableData"
@@ -157,6 +158,7 @@
</div>
</el-card>
<el-card>
<h3>外购件</h3>
<el-table
v-loading="loadingWB"
:data="tableDataWB"
@@ -445,16 +447,16 @@ export default {
</script>
<style scoped>
/*span{*/
/*margin: 20px;*/
/*}*/
span{
margin: 0px;
}
.wrapper{
width: 225px;
height: 50px;
overflow: hidden;
border: 1px solid #b8c7d9;
float: left;
margin: 10px;
margin: 0px;
}
.content{
position: relative;
@@ -493,4 +495,8 @@ a{
display: inline-block;
color: #999;
}
.el-card {
padding: 0px !important;
margin: 0px !important;
}
</style>

22
src/views/WorkshopProcurement/FundApproval2/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<h3>采购合同</h3>
<el-table v-loading="" :data="tableData" border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="170">
<template slot-scope="scope">
@@ -39,10 +39,10 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable01(scope.row)">查看详情</el-button>
</el-popover>
<el-button type="primary" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApproval(scope.row)">不通过</el-button>
</template>
</el-table-column>
</el-table>
@@ -59,6 +59,7 @@
</div>
</el-card>
<el-card>
<h3>离线合同</h3>
<el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="170">
<template slot-scope="scope">
@@ -96,10 +97,10 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable02(scope.row)">查看详情</el-button>
</el-popover>
<el-button type="primary" size="mini" icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" @click="noApprovalOffline(scope.row)">不通过</el-button>
<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApprovalOffline(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApprovalOffline(scope.row)">不通过</el-button>
</template>
</el-table-column>
</el-table>
@@ -116,6 +117,7 @@
</div>
</el-card>
<el-card>
<h3>备料合同</h3>
<el-table v-loading="" :data="tableData3" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
<el-table-column label="供应商" align="center" min-width="170">
<template slot-scope="scope">
@@ -158,10 +160,10 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable03(scope.row)">查看详情</el-button>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @click="searchTable03(scope.row)">查看详情</el-button>
</el-popover>
<el-button type="primary" size="mini" icon="el-icon-check" @click="yesMaterials(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" @click="noMaterials(scope.row)">不通过</el-button>
<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesMaterials(scope.row)">通过</el-button>
<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noMaterials(scope.row)">不通过</el-button>
</template>
</el-table-column>
</el-table>

47
src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue
View File

@@ -32,7 +32,7 @@
</el-card>
<el-card>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini">
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
<el-table-column label="供应商" align="center" min-width="250">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -100,9 +100,9 @@
</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-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @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>
<el-button :disabled="Number(id)!==Number(scope.row.请款人) || (Number(scope.row.审批情况流水号)===1 && Number(scope.row.付款情况流水号)!==2)" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" plain @click="cancelRequestFund(scope.row)">取消请款</el-button>
</template>
</el-table-column>
</el-table>
@@ -167,9 +167,14 @@
{{ scope.row.已付金额 }}
</template>
</el-table-column>
<el-table-column label="申请中金额" align="center" min-width="100" prop="申请中金额">
<template slot-scope="scope">
{{ scope.row.申请中金额 }}
</template>
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
<template slot-scope="scope">
<el-input-number :max="scope.row.合同总额 - scope.row.已付金额" :disabled="(scope.row.合同总额 - scope.row.已付金额) === 0" v-model="scope.row.请款金额" controls-position="right" size="mini" style="width: 100%;"/>
<el-input-number :max="scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.合同总额 - scope.row.已付金额 - scope.row.申请中金额) === 0" v-model="scope.row.请款金额" controls-position="right" size="mini" style="width: 100%;"/>
</template>
</el-table-column>
</el-table>
@@ -187,6 +192,7 @@ export default {
name: '', // 离线合同
data() {
return {
selectContents: [],
totalSum: 0,
totalPay: 0,
totalDebt: 0,
@@ -337,7 +343,7 @@ export default {
})
this.tableData01.map(v => {
this.$set(v, '请款金额', 0)
v.请款金额 = v.合同总额 - v.已付金额
v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额
return v
})
})
@@ -346,6 +352,7 @@ export default {
}
},
handleSelectionChange(val) {
this.selectContents = val
this.SUM = 0
this.contractGroup = []
this.sumGroup = []
@@ -361,13 +368,29 @@ export default {
},
submitRequestFund() { // 确认请款
if (this.supplierValue && this.contractGroup.length !== 0) {
submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person
if (response.data[0].result === '1') {
this.$message.success('请款成功')
this.searchTable1()
this.dialogVisible2 = false
} else { this.$message.error('请款失败') }
})
this.SUM = 0
this.contractGroup = []
this.sumGroup = []
for (let i = 0; i < this.tableData01.length; i++) {
for (let j = 0; j < this.selectContents.length; j++) {
if (this.selectContents[j].离线合同流水号 === this.tableData01[i].离线合同流水号) {
this.SUM += parseFloat(this.tableData01[i].请款金额)
this.contractGroup.push(this.tableData01[i].离线合同流水号)
this.sumGroup.push(this.tableData01[i].请款金额)
}
}
}
if (this.SUM === 0) {
this.$message.error('请款金额不能为0')
} else {
submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => { // 离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person
if (response.data[0].result === '1') {
this.$message.success('请款成功')
this.searchTable1()
this.dialogVisible2 = false
} else { this.$message.error('请款失败') }
})
}
} else {
this.$message.error('请选择需要请款的合同')
}

49
src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
View File

@@ -32,7 +32,7 @@
</el-card>
<el-card>
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini">
<el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini" stripe>
<el-table-column label="供应商" align="center" min-width="250">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -100,9 +100,9 @@
</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-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @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>
<el-button :disabled="Number(id)!==Number(scope.row.请款人) || (Number(scope.row.审批情况流水号)===1 && Number(scope.row.付款情况流水号)!==2)" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" plain @click="cancelRequestFund(scope.row)">取消请款</el-button>
</template>
</el-table-column>
</el-table>
@@ -167,9 +167,14 @@
{{ scope.row.已付金额 }}
</template>
</el-table-column>
<el-table-column label="申请中金额" align="center" min-width="100" prop="申请中金额">
<template slot-scope="scope">
{{ scope.row.申请中金额 }}
</template>
</el-table-column>
<el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
<template slot-scope="scope">
<el-input-number :max="scope.row.含税总金额 - scope.row.已付金额" :disabled="(scope.row.含税总金额 - scope.row.已付金额) === 0" v-model="scope.row.请款金额" controls-position="right" size="mini" style="width: 100%;"/>
<el-input-number :max="scope.row.含税总金额 - scope.row.已付金额 - scope.row.申请中金额" :disabled="(scope.row.含税总金额 - scope.row.已付金额 - scope.row.申请中金额) === 0" v-model="scope.row.请款金额" controls-position="right" size="mini" style="width: 100%;"/>
</template>
</el-table-column>
</el-table>
@@ -187,6 +192,7 @@ import { timeToStamp } from '@/utils/tool'
export default {
data() {
return {
selectContents: [],
getDate: null,
tableData0: [],
pickerOptions: {
@@ -319,7 +325,7 @@ export default {
this.tableData01 = response.data
this.tableData01.map(v => {
this.$set(v, '请款金额', 0)
v.请款金额 = v.含税总金额 - v.已付金额
v.请款金额 = v.含税总金额 - v.已付金额 - v.申请中金额
return v
})
})
@@ -331,6 +337,7 @@ export default {
return parseInt(row.已请款) !== 1 // 已经请款
},
handleSelectionChange(val) {
this.selectContents = val
this.SUM = 0
this.contractGroup = []
this.sumGroup = []
@@ -342,13 +349,31 @@ export default {
},
submitRequestFund() { // 确认请款
if (this.supplierValue && this.contractGroup.length !== 0) {
submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('请款成功')
this.searchTable1()
this.dialogVisible2 = false
} else { this.$message.error('请款失败') }
})
this.SUM = 0
this.contractGroup = []
this.sumGroup = []
for (let i = 0; i < this.tableData01.length; i++) {
for (let j = 0; j < this.selectContents.length; j++) {
if (this.selectContents[j].采购合同流水号 === this.tableData01[i].采购合同流水号) {
this.SUM += parseFloat(this.tableData01[i].请款金额)
this.contractGroup.push(this.tableData01[i].采购合同流水号)
this.sumGroup.push(this.tableData01[i].请款金额)
}
}
}
if (this.SUM === 0) {
this.$message.error('请款金额不能为0')
} else {
submitRequestFund(this.contractGroup, this.sumGroup, this.supplierValue, this.SUM, this.id).then(response => {
if (response.data[0].result === '1') {
this.$message.success('请款成功')
this.searchTable1()
this.dialogVisible2 = false
} else {
this.$message.error('请款失败')
}
})
}
} else {
this.$message.error('请选择需要请款的合同')
}