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
2020-03-23 17:59:00 +08:00
parent cb61a19abe
commit 94e5561fdf
20 changed files with 942 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,8 @@ export function searchtable() {
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '1', type: '1',
name: '车间生产管理工艺_生产计划_查询零件', name: '车间生产管理工艺_生产计划_查询零件',
param: `机床流水号=${arguments[0]}&零件图号_check=${arguments[1]}&零件图号=${arguments[2]}&投产时间_check=${arguments[3]}&开始时间=${arguments[4]}&结束时间=${arguments[5]}&加急_check=${arguments[6]}`, param: `机床流水号_check=${arguments[0]}&机床流水号=${arguments[1]}&零件图号_check=${arguments[2]}&零件图号=${arguments[3]}&投产时间_check=${arguments[4]}&开始时间=${arguments[5]}&结束时间=${arguments[6]}&加急_check=${arguments[7]}`,
pagination: arguments[7] + '&' + arguments[8] pagination: arguments[8] + '&' + arguments[9]
} }
}) })
} }

15
src/api/ManufacturingCenter/RequestApprovalQuery.js
View File

@@ -25,7 +25,7 @@ export function searchTable1(radio, check1, supplier, check2, start, end, check3
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '1', type: '1',
name: '采购管理_情况审核查询_查询数据', name: '采购管理_情况审核查询_查询数据',
param: '查询全部=' + radio + '&供应商名称_check=' + check1 + '&供应商名称=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name, param: '查询全部=' + radio + '&供应商流水号_check=' + check1 + '&供应商流水号=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name,
Pagination: pageCurrent + '&' + pageSize Pagination: pageCurrent + '&' + pageSize
} }
}) })
@@ -44,3 +44,16 @@ export function searchTable2(num) {
} }
}) })
} }
// 查询供应商
export function searchSupplier() {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_供应商_查询数据_根据条件'
}
})
}

16
src/api/PurchasingCenter/InvoiceSettlementApprove.js
View File

@@ -12,7 +12,7 @@ export function searchTable1(...group) {
ModularID: router.currentRoute.path, ModularID: router.currentRoute.path,
type: '1', type: '1',
name: '采购管理_发票结算申请单_查询数据', name: '采购管理_发票结算申请单_查询数据',
param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}`, param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&供应商_check=${group[6]}&供应商流水号=${group[7]}`,
Pagination: group[3] + '&' + group[4] Pagination: group[3] + '&' + group[4]
} }
}) })
@@ -45,3 +45,17 @@ export function excuteApprove(...data) {
} }
}) })
} }
// 查询供应商
export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
return request({
url: '',
method: 'post',
data: {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
name: '采购管理_供应商_查询数据_根据条件',
param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
}
})
}

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

@@ -427,6 +427,11 @@
{{ scope.row.操作员 }} {{ scope.row.操作员 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="完成数量" width="120">
<template slot-scope="scope">
{{ scope.row.完成数量 }}
</template>
</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="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag> <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
@@ -434,11 +439,14 @@
<el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag> <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</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">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag> {{ scope.row.数量 }}
<el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag> </template>
<el-tag v-if="parseInt(scope.row.是否质检)!==1 && parseInt(scope.row.是否质检)!==2" type="primary" size="small">未检测</el-tag> </el-table-column>
<el-table-column align="center" label="不合格数" width="120">
<template slot-scope="scope">
{{ scope.row.不合格数量 }}
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

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

@@ -210,7 +210,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="领料人" prop="领料人" label-width="100px" size="small"> <el-form-item label="领料人" prop="领料人" label-width="100px" size="small">
<el-select v-model="form3.DirectNote" placeholder="请选择领料人" size="small" clearable style="width: 200px;"> <el-select v-model="form3.DirectNote" placeholder="请选择领料人" size="small" clearable style="width: 200px;" filterable>
<el-option <el-option
v-for="item in DirectNotes" v-for="item in DirectNotes"
:key="item.value" :key="item.value"

8
src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-input v-model="billNames" clearable filterable size="small" placeholder="供应商或合同编号" style="width: 200px;margin: 5px"/> <el-input v-model="billNames" clearable filterable size="small" placeholder="供应商或合同编号" style="width: 200px;margin: 5px"/>
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 120px"> <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 120px" clearable>
<el-option <el-option
v-for="item in person" v-for="item in person"
:key="item.value" :key="item.value"
@@ -21,14 +21,14 @@
range-separator="～" range-separator="～"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
<el-radio v-model="radio" label="1" style="margin: 0 0 0 10px">全部</el-radio> <el-radio v-model="radio" label="1" style="margin: 0 0 0 10px">全部</el-radio>
<el-radio v-model="radio" label="2" style="margin: 0 0 0 10px">通过</el-radio> <el-radio v-model="radio" label="2" style="margin: 0 0 0 10px">通过</el-radio>
<el-radio v-model="radio" label="3" style="margin: 0 0 0 10px">未过</el-radio> <el-radio v-model="radio" label="3" style="margin: 0 0 0 10px">未过</el-radio>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button> <el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
</el-card> </el-card>
<el-card style="margin-top: 5px"> <el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row> <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
<el-table-column label="采购合同编号" align="center" min-width="130"> <el-table-column label="采购合同编号" align="center" min-width="130">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购合同编号 }} {{ scope.row.采购合同编号 }}
@@ -97,7 +97,7 @@
</div> </div>
</el-card> </el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="1000px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="合同审批通知" center style="min-height: 300px;" width="370px">
<div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/> <div style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
</el-dialog> </el-dialog>
</div> </div>

236
src/views/ManufacturingCenter/ContractApprovalQuery1/index.vue Normal file
View File

@@ -0,0 +1,236 @@
<template>
<div class="app-container">
<el-card>
<el-select v-model="projectValue" filterable clearable size="small" style="margin-right:10px;width: 150px" placeholder="项目名称" @change="typeChange">
<el-option
v-for="item in project"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="machineValue" clearable filterable size="small" style="margin-right:10px;width: 150px" placeholder="机床名称">
<el-option
v-for="item in machine"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchTable()">查询</el-button>
<el-button size="small" type="primary" icon="el-icon-download" style="margin: 0 0 0 10px" plain @click="exportExcel()">导出</el-button>
</el-card>
<el-card>
<el-table v-loading="loading" :data="tableData" highlight-current-row show-summary border style="width: 1510px;" size="mini" height="700">
<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="50">
<template slot-scope="scope">
{{ scope.row.序号 }}
</template>
</el-table-column>
<el-table-column label="工序名" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.工序名 }}
</template>
</el-table-column>
<el-table-column label="投产数" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.计划数量 }}
</template>
</el-table-column>
<el-table-column label="计划准结(分)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.计划准备工时 }}
</template>
</el-table-column>
<el-table-column label="单件定额(分)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.单件计划工时 }}
</template>
</el-table-column>
<el-table-column label="计划工时(分)" align="center" prop="计划工时" width="110">
<template slot-scope="scope">
{{ scope.row.计划工时 }}
</template>
</el-table-column>
<el-table-column label="计划完成" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.计划加工日期 }}
</template>
</el-table-column>
<el-table-column label="加工件数" align="center" width="80">
<template slot-scope="scope">
{{ scope.row.加工数量 }}
</template>
</el-table-column>
<el-table-column label="准结(分)" align="center" width="110">
<template slot-scope="scope">
{{ scope.row.修补工时 }}
</template>
</el-table-column>
<el-table-column label="单件加工工时(分)" align="center" prop="加工工时" width="140">
<template slot-scope="scope">
{{ scope.row.修补单件工时 }}
</template>
</el-table-column>
<el-table-column label="加工工时(分)" align="center" prop="加工工时" width="110">
<template slot-scope="scope">
{{ scope.row.完成工时 }}
</template>
</el-table-column>
<el-table-column label="扫码工时(分)" align="center" prop="扫码工时" width="110">
<template slot-scope="scope">
{{ scope.row.扫码工时 }}
</template>
</el-table-column>
<el-table-column label="工时比值" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.工时比值 }}
</template>
</el-table-column>
<el-table-column label="加工完成" align="center" width="100">
<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">
{{ scope.row.制品名称 }}
</template>
</el-table-column>
</el-table>
<div class="block">
<el-pagination
v-if="!loading"
:current-page="pageCurrent"
:page-sizes="[50, 100, 200, 300]"
:page-size="pageSize"
:total="total"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
</div>
</template>
<script>
import { initProject, initMachine, searchatabledata } from '@/api/ManufacturingCenter/ContractDetailsInquiry'
export default {
data() {
return {
project: [],
projectValue: '', // 项目名称
machineValue: '', // 机床名称
machine: [],
loading: false,
part: [], // 分組
partValue: '',
specificationValue: '', // 规格型号
totalProcessingHours: '', // 加工总工时
totalPlannedHours: '', // 计划总工时
tableData: [], // 详情表
total: 0, // 总条数
pageSize: 50, // 每页显示条数
pageCurrent: 1 // 后台获取页
}
},
created() {
this.fetchData()
},
methods: {
fetchData() {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'project')
},
// 查询按钮
typeChange() {
this.machineValue = ''
this.machine = []
initMachine(this.projectValue).then(response => {
for (let i = 0; i < response.data.length; i++) {
this.machine.push({
label: response.data[i].机床图号,
value: response.data[i].机床流水号
})
}
})
},
// 分页查询
searchTable() {
this.tableData = []
if (this.machineValue) {
this.loading = true
searchatabledata(this.projectValue, this.machineValue, this.pageCurrent, this.pageSize).then(response => {
this.loading = false
if (response.data.result.length !== 0) {
for (let i = 0; i < response.data.result.length; i++) {
this.tableData.push({
跟单号: response.data.result[i].跟单号,
序号: response.data.result[i].工序顺序,
工序名: response.data.result[i].工艺名称,
计划数量: response.data.result[i].批次数量,
计划准备工时: response.data.result[i].准结定额工时,
单件计划工时: response.data.result[i].单件定额工时,
计划工时: response.data.result[i].计划工时,
计划加工日期: response.data.result[i].计划日期.split(' ')[0],
加工数量: response.data.result[i].完成数量,
加工准备工时: response.data.result[i].修补准结工时,
加工工时: response.data.result[i].设备工时,
扫码工时: response.data.result[i].扫码工时,
辅助工时: response.data.result[i].辅助工时,
工时比值: Number(response.data.result[i].计划工时) === 0 ? 0 : Math.round(response.data.result[i].完成工时 / Number(response.data.result[i].计划工时) * 100) / 100.00,
加工日期: response.data.result[i].操作时间,
图号及规格: response.data.result[i].零件图号_零件工艺计划,
修补工时: response.data.result[i].修补工时,
修补单件工时: response.data.result[i].修补单件工时,
完成工时: response.data.result[i].完成工时,
加工完成时间: response.data.result[i].加工完成时间,
制品名称: response.data.result[i].零件名称
})
}
}
this.total = parseInt(response.data.output[0].ItemCount)
})
} else {
this.$message.warning('请选择要查询的机床')
}
},
exportExcel() {
if (this.tableData.length === 0) {
this.$message.warning('请查询出要导出的数据')
return
}
var param = []
param[0] = ['项目流水号', this.projectValue]
param[1] = ['机床流水号', this.machineValue]
param[2] = ['PageCurrent', 1]
param[3] = ['PageSize', 999999]
param[4] = ['PageCount', '1111', 'int', '1']
param[5] = ['ItemCount', '1111', 'int', '1']
var Data = this.CreateData('2001', '报表_机床工时统计_查询', param)
this.exportExcel_NPOI(Data)
},
// 分页
handleSizeChange(val) {
this.pageCurrent = 1
this.pageSize = val
this.searchTable()
},
handleCurrentChange(val) {
this.pageCurrent = val
this.searchTable()
}
}
}
</script>
<style scoped>
</style>

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

@@ -53,11 +53,16 @@
{{ scope.row.类别 }} {{ scope.row.类别 }}
</template> </template>
</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">
{{ scope.row.计划完成时间 }} {{ scope.row.计划完成时间 }}
</template> </template>
</el-table-column> </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="入库时间"> <el-table-column align="center" label="入库时间">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.入库时间 }} {{ scope.row.入库时间 }}
@@ -122,7 +127,7 @@
</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">
采购时间 {{ scope.row.创建日期 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货数量"> <el-table-column align="center" label="到货数量">
@@ -130,11 +135,6 @@
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货时间">
<template slot-scope="scope">
到货时间
</template>
</el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination
@@ -175,16 +175,21 @@
{{ scope.row.物料规格 }} {{ scope.row.物料规格 }}
</template> </template>
</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">
{{ scope.row.零件数量 || '—' }} {{ scope.row.零件数量 || '—' }}
</template> </template>
</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">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || scope.row.离线采购数量 || '—' }}
</template> </template>
</el-table-column> </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="到货数量"> <el-table-column align="center" label="到货数量">
<template slot-scope="scope"> <template slot-scope="scope">
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
@@ -255,11 +260,6 @@
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }} {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货时间">
<template slot-scope="scope">
到货时间
</template>
</el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination
@@ -503,6 +503,9 @@ export default {
if (response.data.rows[i].计划完成时间 !== '') { if (response.data.rows[i].计划完成时间 !== '') {
response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0] response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
} }
if (response.data.rows[i].机加工实际完成时间 !== '') {
response.data.rows[i].机加工实际完成时间 = response.data.rows[i].机加工实际完成时间.split(' ', 2)[0]
}
} }
this.tableData = response.data.rows this.tableData = response.data.rows
this.total = parseInt(response.data.total) this.total = parseInt(response.data.total)

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

@@ -51,6 +51,11 @@
<el-card> <el-card>
<el-table v-loading="loading" :data="tableData" size="mini" height="740" style="width: 750px" border stripe highlight-current-row @selection-change="handleSelectionChange" @row-click="click"> <el-table v-loading="loading" :data="tableData" size="mini" height="740" style="width: 750px" border stripe highlight-current-row @selection-change="handleSelectionChange" @row-click="click">
<el-table-column type="selection" align="center" width="50"/> <el-table-column type="selection" align="center" width="50"/>
<el-table-column label="进程" prop="进程" align="center" width="95px">
<template slot-scope="scope">
{{ scope.row.进程 }}
</template>
</el-table-column>
<el-table-column label="机床号" prop="机床图号" align="center" width="95px"> <el-table-column label="机床号" prop="机床图号" align="center" width="95px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.机床图号 }} {{ scope.row.机床图号 }}
@@ -86,6 +91,16 @@
{{ scope.row.工艺完成 }} {{ scope.row.工艺完成 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="分配时间" prop="分配时间" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.工艺分配时间 ? scope.row.工艺分配时间.split( ' ')[0] : '' }}
</template>
</el-table-column>
<el-table-column label="下达时间" prop="下达时间" align="center" width="85px">
<template slot-scope="scope">
{{ scope.row.操作时间 .split( ' ')[0] }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block"> <div class="block">
<el-pagination <el-pagination

8
src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
View File

@@ -171,8 +171,10 @@ export default {
}, },
// 查询表格数据 // 查询表格数据
searchTable() { searchTable() {
if (this.machineNameValue) { if (this.machineNameValue || this.partName || this.outTime) {
this.loading = true this.loading = true
let check
this.machineNameValue ? check = 1 : check = 0
if (this.partName !== '' && this.partName !== null) { if (this.partName !== '' && this.partName !== null) {
this.partNamecheck = true this.partNamecheck = true
} else { } else {
@@ -181,13 +183,13 @@ export default {
let check7, check8 let check7, check8
this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '') this.outTime ? check7 = 1 : (check7 = 0, this.outTime = '')
this.all === false ? check8 = 0 : check8 = 1 this.all === false ? check8 = 0 : check8 = 1
searchtable(this.machineNameValue, this.partNamecheck, this.partName, check7, this.outTime[0], this.outTime[1], check8, this.pageCurrent, this.pageSize).then(response => { searchtable(check, this.machineNameValue, this.partNamecheck, this.partName, check7, this.outTime[0], this.outTime[1], check8, this.pageCurrent, this.pageSize).then(response => {
this.tableData = response.data.rows this.tableData = response.data.rows
this.total = response.data.total this.total = response.data.total
this.loading = false this.loading = false
}) })
} else { } else {
this.$message.warning('请先选择机床') this.$message.warning('请输入筛选条件')
} }
}, },
tableRowClassName({ row }) { tableRowClassName({ row }) {

41
src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
View File

@@ -1,8 +1,15 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<el-input v-model="billNames" clearable filterable size="small" placeholder="供应商或合同编号" style="width: 200px;margin: 5px"/> <!-- <el-input v-model="billNames" clearable filterable size="small" placeholder="供应商或合同编号" style="width: 200px;margin: 5px"/>-->
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 120px"> <el-select v-model="supplierValue" placeholder="供应商" filterable size="small" style="margin-left: 5px" clearable @change="totalSum=0;totalPay=0;totalDebt=0;">
<el-option
v-for="item in supplier"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-select v-model="personValue" placeholder="采购员" size="small" style="width: 120px" clearable>
<el-option <el-option
v-for="item in person" v-for="item in person"
:key="item.value" :key="item.value"
@@ -21,14 +28,14 @@
range-separator="～" range-separator="～"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"/> end-placeholder="结束日期"/>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
<el-radio v-model="radio" label="1" style="margin: 0 0 0 10px">全部</el-radio> <el-radio v-model="radio" label="1" style="margin: 0 0 0 10px">全部</el-radio>
<el-radio v-model="radio" label="2" style="margin: 0 0 0 10px">通过</el-radio> <el-radio v-model="radio" label="2" style="margin: 0 0 0 10px">通过</el-radio>
<el-radio v-model="radio" label="3" style="margin: 0 0 0 10px">未过</el-radio> <el-radio v-model="radio" label="3" style="margin: 0 0 0 10px">未过</el-radio>
<el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
<el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button> <el-button type="success" size="small" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;margin-right: 20px;float: right" plain @click="exportTable('')">导出</el-button>
</el-card> </el-card>
<el-card style="margin-top: 5px"> <el-card style="margin-top: 5px">
<el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row> <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
<el-table-column label="供应商" align="center" min-width="150"> <el-table-column label="供应商" align="center" min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
@@ -83,7 +90,7 @@
</el-card> </el-card>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="请款信息明细" center width="800px"> <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="请款信息明细" center width="800px">
<el-table :data="gridData1" border highlight-current-row size="mini" height="300px"> <el-table :data="gridData1" border highlight-current-row size="mini">
<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">
{{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }} {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
@@ -110,7 +117,7 @@
</template> </template>
<script> <script>
import { initBuyer, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/RequestApprovalQuery' import { initBuyer, searchTable1, searchTable2, searchSupplier } from '@/api/ManufacturingCenter/RequestApprovalQuery'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
export default { export default {
@@ -118,6 +125,8 @@ export default {
return { return {
radio: '1', radio: '1',
billNames: '', billNames: '',
supplier: [],
supplierValue: '',
person: [], person: [],
personValue: '', personValue: '',
dateRange: '', dateRange: '',
@@ -141,8 +150,20 @@ export default {
created() { created() {
this.fetchData() this.fetchData()
this.searchTable1() this.searchTable1()
this.searchSupplier()
}, },
methods: { methods: {
searchSupplier() {
this.supplier = []
searchSupplier().then(response => {
for (let i = 0; i < response.data.length; i++) {
this.supplier.push({
label: response.data[i].供应商名称,
value: response.data[i].供应商流水号
})
}
})
},
fetchData() { fetchData() {
this.person = [] this.person = []
initBuyer().then(response => { initBuyer().then(response => {
@@ -157,10 +178,10 @@ export default {
searchTable1() { searchTable1() {
this.loading1 = true this.loading1 = true
var check1, check2, check3 var check1, check2, check3
this.billNames ? check1 = 1 : check1 = 0 this.supplierValue ? check1 = 1 : check1 = 0
this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '') this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
this.personValue ? check3 = 1 : check3 = 0 this.personValue ? check3 = 1 : check3 = 0
searchTable1(this.radio, check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => { searchTable1(this.radio, check1, this.supplierValue, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => {
console.log(response.data) console.log(response.data)
this.loading1 = false this.loading1 = false
this.tableData1 = response.data.rows this.tableData1 = response.data.rows
@@ -169,13 +190,13 @@ export default {
}, },
exportTable() { exportTable() {
var check1, check2, check3 var check1, check2, check3
this.billNames ? check1 = 1 : check1 = 0 this.supplierValue ? check1 = 1 : check1 = 0
this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '') this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
this.personValue ? check3 = 1 : check3 = 0 this.personValue ? check3 = 1 : check3 = 0
var param = [] var param = []
param[0] = ['查询全部', this.radio] param[0] = ['查询全部', this.radio]
param[1] = ['供应商名称_check', check1] param[1] = ['供应商名称_check', check1]
param[2] = ['供应商名称', this.billNames] param[2] = ['供应商名称', this.supplierValue]
param[3] = ['时间段_check', check2] param[3] = ['时间段_check', check2]
if (check2 === 0) { if (check2 === 0) {
param[4] = ['开始时间', ''] param[4] = ['开始时间', '']

37
src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
View File

@@ -131,8 +131,17 @@
</el-col> </el-col>
</el-row> </el-row>
<el-dialog :visible.sync="dialogVisible1" :close-on-click-modal="false" class="dialog3" title="编辑" center width="500px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible1" :close-on-click-modal="false" class="dialog3" title="编辑" center width="500px">
<el-form ref="form1" :model="form1" label-position="right" label-width="160px"> <el-form ref="form1" :model="form1" label-position="right" label-width="160px">
<el-form-item label="零件图号：">
<span style="font-size: 20px">{{ partNumber }}</span>
</el-form-item>
<el-form-item label="零件名称：">
<span style="font-size: 20px">{{ partName }}</span>
</el-form-item>
<el-form-item label="工艺名称：">
<span style="font-size: 20px">{{ procedure }}</span>
</el-form-item>
<el-form-item label="完成数量：" prop="完成数量"> <el-form-item label="完成数量：" prop="完成数量">
<el-input-number :min="0" :max="剩余数量" v-model="form1.完成数量" style="width: 200px" @change="timeChange()"/> <el-input-number :min="0" :max="剩余数量" v-model="form1.完成数量" style="width: 200px" @change="timeChange()"/>
</el-form-item> </el-form-item>
@@ -171,6 +180,9 @@ export default {
loading: false, loading: false,
tableData2: [], // 工序统计表 tableData2: [], // 工序统计表
loading2: false, loading2: false,
partNumber: '',
partName: '',
procedure: '',
pageCurrent: 1, pageCurrent: 1,
pageSize: 10000, pageSize: 10000,
total: 0, total: 0,
@@ -249,6 +261,9 @@ export default {
this.form1.备注 = row.备注 this.form1.备注 = row.备注
this.加工时间 = this.form1.录入工时 this.加工时间 = this.form1.录入工时
this.form1.完成数量 = row.完成数量 this.form1.完成数量 = row.完成数量
this.procedure = row.工艺名称
this.partName = row.零件名称
this.partNumber = row.零件图号
this.timeChange() this.timeChange()
this.dialogVisible1 = true this.dialogVisible1 = true
}) })
@@ -308,5 +323,23 @@ export default {
</script> </script>
<style scoped> <style scoped>
.el-form--label-left >>> .el-form-item__label {
text-align: right;
}
>>>.el-dialog--center .el-dialog__body {
text-align: initial;
padding: 20px 30px 20px
}
>>>.el-dialog__header {
padding: 20px 20px 0px;
}
>>>.el-dialog__footer {
padding: 0px 20px 20px;
/*text-align: right;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
>>>.el-form-item {
margin-bottom: 13px;
}
</style> </style>

7
src/views/ManufacturingCenter/ShopScheduling/index.vue
View File

@@ -1,7 +1,7 @@
<template> <template>
<div> <div>
<el-row> <el-row>
<el-col style="width: 610px"> <el-col style="width: 630px">
<el-card style="height: 680px"> <el-card style="height: 680px">
<el-row style="margin-top: 5px"> <el-row style="margin-top: 5px">
<el-input v-model="Parts" placeholder="零件图号" size="small" style="width: 170px" clearable @keyup.enter.native="pageCurrent=1;getParts()"/> <el-input v-model="Parts" placeholder="零件图号" size="small" style="width: 170px" clearable @keyup.enter.native="pageCurrent=1;getParts()"/>
@@ -25,11 +25,6 @@
{{ scope.row.图号及规格 }} {{ scope.row.图号及规格 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="图号及规格" show-overflow-tooltip align="center" width="150px">
<template slot-scope="scope">
{{ scope.row.图号及规格 }}
</template>
</el-table-column>
<el-table-column label="制品名称" align="center" width="120px"> <el-table-column label="制品名称" align="center" width="120px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.零件名称 }} {{ scope.row.零件名称 }}

106
src/views/PurchasingCenter/CreatePurchaseContract/index.vue
View File

@@ -234,6 +234,7 @@ export default {
交货期组: [], 交货期组: [],
备注组: [], 备注组: [],
companyAddress: '', companyAddress: '',
count: 0,
sendAddress: '' sendAddress: ''
} }
}, },
@@ -738,6 +739,7 @@ export default {
` `
}, },
async editContract() { // 选择一个询价单，整成合同明细 async editContract() { // 选择一个询价单，整成合同明细
console.log(this.tableData1, 'tableData')
this.openDeal = false this.openDeal = false
const date = new Date() const date = new Date()
this.year = date.getFullYear() this.year = date.getFullYear()
@@ -854,55 +856,65 @@ export default {
// this.content = `自定义` // this.content = `自定义`
// }, // },
generateContract() { // 生成采购合同 generateContract() { // 生成采购合同
this.content = this.contentNew.replace(/&nbsp;/g, '') for (let i = 0; i < this.tableData1.length; i++) {
this.content = this.content.replace(/\n/g, '') if (this.tableData1[i].含税单价 === '') {
this.content = this.content.replace(/==/g, '= =') // 更新tinymce中的东西到html中，后续会用到 console.log(this.tableData1[i].含税单价, '含税单价')
this.组件零件流水号组 = [] this.count++
this.组件零件基本件流水号组 = []
this.数量组 = []
this.单价组 = []
this.交货期组 = []
this.hasTax === '含税' ? this.单价是否含税 = 1 : this.单价是否含税 = 0
const inquiryDetailNum_old = [] // 需要转移到新询价单的物料的询价单明细流水号
this.tableData1.map(v => {
if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
this.组件零件流水号组.push(v.组件零件流水号)
this.组件零件基本件流水号组.push(v.组件零件基本件流水号)
this.数量组.push(v.数量)
this.hasTax === '含税' ? this.单价组.push(v.含税单价) : this.单价组.push(v.未税单价)
this.交货期组.push(v.交货期)
this.备注组.push(v.备注)
} else { // 获取未询到价格的物料的询价单明细流水号们
inquiryDetailNum_old.push(v.询价单明细流水号)
}
})
if (this.contractNumValue) {
if (this.demoRadio) {
this.$confirm('此采购合同将递交审核，递交后该合同不可删除，确认完成编辑？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old, this.备注组).then(response => {
if (response.data[0].result === '1') {
this.$message.success('合同生成成功')
this.openDeal = true
this.reload()
} else {
this.$message.error('生成合同失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消操作'
})
})
} else {
this.$message.warning('请先选择模板进行预览')
} }
}
if (this.count === this.tableData1.length) {
this.$message.error('该合同未绑定物料信息')
} else { } else {
this.$message.warning('请先选择合同进行编辑') this.content = this.contentNew.replace(/&nbsp;/g, '')
this.content = this.content.replace(/\n/g, '')
this.content = this.content.replace(/==/g, '= =') // 更新tinymce中的东西到html中，后续会用到
this.组件零件流水号组 = []
this.组件零件基本件流水号组 = []
this.数量组 = []
this.单价组 = []
this.交货期组 = []
this.hasTax === '含税' ? this.单价是否含税 = 1 : this.单价是否含税 = 0
const inquiryDetailNum_old = [] // 需要转移到新询价单的物料的询价单明细流水号
this.tableData1.map(v => {
if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
this.组件零件流水号组.push(v.组件零件流水号)
this.组件零件基本件流水号组.push(v.组件零件基本件流水号)
this.数量组.push(v.数量)
this.hasTax === '含税' ? this.单价组.push(v.含税单价) : this.单价组.push(v.未税单价)
this.交货期组.push(v.交货期)
this.备注组.push(v.备注)
} else { // 获取未询到价格的物料的询价单明细流水号们
inquiryDetailNum_old.push(v.询价单明细流水号)
}
})
if (this.contractNumValue) {
if (this.demoRadio) {
this.$confirm('此采购合同将递交审核，递交后该合同不可删除，确认完成编辑？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
doneContract(this.contractNum, this.contractName, this.deliveryDate, this.payDate, this.payMethod, this.invoiceInfo, this.otherInfo, this.actualTotal, this.id, this.supplierValue, this.单价是否含税, this.组件零件流水号组, this.组件零件基本件流水号组, this.数量组, this.单价组, this.交货期组, this.content, this.taxRate * 100, inquiryDetailNum_old, this.备注组).then(response => {
if (response.data[0].result === '1') {
this.$message.success('合同生成成功')
this.openDeal = true
this.reload()
} else {
this.$message.error('生成合同失败')
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消操作'
})
})
} else {
this.$message.warning('请先选择模板进行预览')
}
} else {
this.$message.warning('请先选择合同进行编辑')
}
} }
} }
} }

137
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -2,46 +2,53 @@
<div class="app-container"> <div class="app-container">
<el-card> <el-card>
<div slot="header"> <div slot="header">
<el-select v-model="supplierValue" placeholder="选择供应商" filterable style="width: 220px;margin-left: 5px" size="small" clearable>
<el-option
v-for="item in supplierValues"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span>申请时间:</span> <span>申请时间:</span>
<el-date-picker v-model="date1" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始日期"/>&nbsp;~ <el-date-picker v-model="date1" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始日期"/>&nbsp;~
<el-date-picker v-model="date2" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束日期"/> <el-date-picker v-model="date2" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束日期"/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button> <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>
</div> </div>
<h4 style="margin: 0">发票结算申请单</h4> <!-- <h4 style="margin: 0">发票结算申请单</h4>-->
<el-table id="expandTable" :data="tableData1" border highlight-current-row height="330px" style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2"> <el-table id="expandTable" :data="tableData1" border highlight-current-row height="330px" style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2">
<el-table-column type="expand"> <!-- <el-table-column type="expand">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-form label-position="left" inline class="demo-table-expand"> <!-- <el-form label-position="left" inline class="demo-table-expand">-->
<el-row> <!-- <el-row>-->
<el-col :lg="10" :sm="12"> <!-- <el-col :lg="10" :sm="12">-->
<viewer> <!-- <viewer>-->
<img :src="scope.row.scanSrc" alt="发票扫描件" height="120px"> <!-- <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">-->
</viewer> <!-- </viewer>-->
</el-col> <!-- </el-col>-->
<el-col :span="6"> <!-- <el-col :span="6">-->
<el-form-item label="已付款项"> <!-- <el-form-item label="已付款项">-->
<span>{{ scope.row.已付款项 }}</span> <!-- <span>{{ scope.row.已付款项 }}</span>-->
</el-form-item><br> <!-- </el-form-item><br>-->
<el-form-item label="尚欠金额"> <!-- <el-form-item label="尚欠金额">-->
<span>{{ scope.row.尚欠金额 }}</span> <!-- <span>{{ scope.row.尚欠金额 }}</span>-->
</el-form-item><br> <!-- </el-form-item><br>-->
<el-form-item label="备注"> <!-- <el-form-item label="备注">-->
<span>{{ scope.row.备注 }}</span> <!-- <span>{{ scope.row.备注 }}</span>-->
</el-form-item><br> <!-- </el-form-item><br>-->
</el-col> <!-- </el-col>-->
<el-col :span="6"> <!-- <el-col :span="6">-->
<el-form-item label="是否费用类发票"> <!-- <el-form-item label="是否费用类发票">-->
<span>{{ scope.row.是否费用类 }}</span> <!-- <span>{{ scope.row.是否费用类 }}</span>-->
</el-form-item><br> <!-- </el-form-item><br>-->
<el-form-item label="税额"> <!-- <el-form-item label="税额">-->
<span>{{ scope.row.税额 }}</span> <!-- <span>{{ scope.row.税额 }}</span>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
</el-row> <!-- </el-row>-->
</el-form> <!-- </el-form>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="供应商" align="center" min-width="200"> <el-table-column label="供应商" align="center" min-width="200" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
@@ -102,17 +109,17 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="block" style="margin-top: 10px;"> <!-- <div class="block" style="margin-top: 10px;">-->
<el-pagination <!-- <el-pagination-->
:current-page="pageCurrent1" <!-- :current-page="pageCurrent1"-->
:page-sizes="[10, 20, 30, 40]" <!-- :page-sizes="[10, 20, 30, 40]"-->
:page-size="pageSize1" <!-- :page-size="pageSize1"-->
:total="total1" <!-- :total="total1"-->
style="display:inline-block;width:50%" <!-- style="display:inline-block;width:50%"-->
layout="total, sizes, prev, pager, next, jumper" <!-- layout="total, sizes, prev, pager, next, jumper"-->
@size-change="handleSizeChange1" <!-- @size-change="handleSizeChange1"-->
@current-change="handleCurrentChange1"/> <!-- @current-change="handleCurrentChange1"/>-->
</div> <!-- </div>-->
</el-card> </el-card>
<el-card> <el-card>
<!--<h4 style="margin: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>--> <!--<h4 style="margin: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>-->
@@ -160,7 +167,7 @@
</template> </template>
<script> <script>
import { searchTable1, searchTable2, excuteApprove } from '@/api/PurchasingCenter/InvoiceSettlementApprove' import { searchTable1, searchTable2, excuteApprove, searchSupplier } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { readFile } from '@/utils/request' import { readFile } from '@/utils/request'
import request from '@/utils/request' import request from '@/utils/request'
@@ -176,7 +183,9 @@ export default {
pageSize1: 10, pageSize1: 10,
invoiceNumber: '', invoiceNumber: '',
tableData2: [], tableData2: [],
tableData3: [] tableData3: [],
supplierValues: [],
supplierValue: ''
} }
}, },
computed: { computed: {
@@ -190,14 +199,44 @@ export default {
created() { created() {
this.fetchData() this.fetchData()
this.searchTable1() this.searchTable1()
this.searchSupplier()
}, },
methods: { methods: {
fetchData() { fetchData() {
// console.log(this.token) // console.log(this.token)
}, },
searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
this.registeredCapital ? this.supplierCheck4 = 1 : (this.supplierCheck4 = 0, this.registeredCapital = '')
this.taxNum ? this.supplierCheck5 = 1 : (this.supplierCheck5 = 0, this.taxNum = '')
this.EMail ? this.supplierCheck6 = 1 : (this.supplierCheck6 = 0, this.EMail = '')
this.address ? this.supplierCheck7 = 1 : (this.supplierCheck7 = 0, this.address = '')
this.account ? this.supplierCheck8 = 1 : (this.supplierCheck8 = 0, this.account = '')
this.openingBank ? this.supplierCheck9 = 1 : (this.supplierCheck9 = 0, this.openingBank = '')
this.phone ? this.supplierCheck10 = 1 : (this.supplierCheck10 = 0, this.phone = '')
this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
for (let i = 0; i < response.data.length; i++) {
if (response.data[i].创立日期 !== '' && response.data[i].创立日期 !== null) {
response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0]
}
}
for (let i = 0; i < response.data.length; i++) {
this.supplierValues.push({
label: response.data[i].供应商名称,
value: response.data[i].供应商流水号
})
}
})
},
searchTable1() { searchTable1() {
let check
this.date1 && this.date2 ? this.check1 = 1 : (this.check1 = 0, this.date1 = '', this.date2 = '') this.date1 && this.date2 ? this.check1 = 1 : (this.check1 = 0, this.date1 = '', this.date2 = '')
searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1, this.token).then(response => { this.supplierValue ? check = 1 : check = 0
searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1, this.token, check, this.supplierValue).then(response => {
this.tableData1 = response.data.rows this.tableData1 = response.data.rows
this.tableData1.map(v => { this.tableData1.map(v => {
this.$set(v, 'scanSrc', '') this.$set(v, 'scanSrc', '')

764
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -1,385 +1,391 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row id="PurchasingCenter/OfflineContract"> <el-card>
<el-col :span="24"> <el-row id="PurchasingCenter/OfflineContract">
<el-tabs v-model="tabName" type="border-card" @tab-click="tabClick"> <el-col :span="24">
<el-tab-pane label="三表" name="标准件"> <el-tabs v-model="tabName" type="border-card" @tab-click="tabClick">
<el-row> <el-tab-pane label="三表" name="标准件">
<el-input v-model="materialName" style="width: 150px;margin-left: 5px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()"/> <el-row>
<el-select v-model="machineValue" style="width:150px;margin-left: 5px" placeholder="机床图号" size="small" clearable filterable @change="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()"> <el-input v-model="materialName" style="width: 150px;margin-left: 5px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()"/>
<el-option <el-select v-model="machineValue" style="width:150px;margin-left: 5px" placeholder="机床图号" size="small" clearable filterable @change="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">
v-for="item in machine" <el-option
:key="item.value" v-for="item in machine"
:label="item.label" :key="item.value"
:value="item.value"/> :label="item.label"
</el-select> :value="item.value"/>
<el-date-picker </el-select>
v-model="startTime" <el-date-picker
size="small" v-model="startTime"
type="daterange" size="small"
align="center" type="daterange"
value-format="yyyy-MM-dd" align="center"
format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="～" format="yyyy-MM-dd"
style="width:250px;margin-left: 5px" range-separator="～"
start-placeholder="开始日期" style="width:250px;margin-left: 5px"
end-placeholder="结束日期"/> start-placeholder="开始日期"
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 5px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button> end-placeholder="结束日期"/>
<el-button type="primary" size="small" plain style="float: right;margin-right: 20px" @click="tiaozheng1">调整采购任务</el-button> <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 5px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
<el-select v-model="PersonValue" style="width:100px; float: right" placeholder="人员" size="small" filterable clearable> <el-button type="primary" size="small" plain style="float: right;margin-right: 20px" @click="tiaozheng1">调整采购任务</el-button>
<el-option <el-select v-model="PersonValue" style="width:100px; float: right" placeholder="人员" size="small" filterable clearable>
v-for="item in Person" <el-option
:key="item.value" v-for="item in Person"
:label="item.label" :key="item.value"
:value="item.value"/> :label="item.label"
</el-select> :value="item.value"/>
</el-row> </el-select>
<!--:row-class-name="tableRowClassName"--> </el-row>
<el-table <!--:row-class-name="tableRowClassName"-->
v-loading="loading1" <el-table
:data="tableData00" v-loading="loading1"
border :data="tableData00"
style="width: 100%;max-height: 500px;" border
height="300px" style="width: 100%;max-height: 500px;"
size="mini" height="300px"
@selection-change="handleSelectionChange1" size="mini"
@select="handleSelection"> @selection-change="handleSelectionChange1"
<el-table-column :selectable="selectable" align="center" width="43" type="selection"/> @select="handleSelection">
<el-table-column label="名称" align="center" prop="物料名称" width="100" show-overflow-tooltip> <el-table-column :selectable="selectable" align="center" width="43" type="selection"/>
<template slot-scope="scope"> <el-table-column label="名称" align="center" prop="物料名称" width="100" show-overflow-tooltip>
{{ scope.row.物料名称 }} <template slot-scope="scope">
</template> {{ scope.row.物料名称 }}
</el-table-column>
<el-table-column label="规格" align="center" prop="物料规格" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="型号" prop="物料型号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" width="120" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 === '0' ? '-' : scope.row.供货商 }}
</template>
</el-table-column>
<el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" prop="组号" align="center" width="50">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="物料类别" align="center" width="80" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料类别 }}
</template>
</el-table-column>
<el-table-column label="物料品种" prop="物料品种" align="center" width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料品种 }}
</template>
</el-table-column>
<el-table-column label="分配数量" align="center" width="80" prop="零件数量">
<template slot-scope="scope">
{{ scope.row.零件数量 }}
</template>
</el-table-column>
<el-table-column label="库存(BZ)" align="center" width="80" prop="库存">
<template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) : '-' }}
</template>
</el-table-column>
<el-table-column label="使用库存数量" align="center" width="110" prop="使用库存数">
<template slot-scope="scope">
<span v-if="Number(scope.row.零件类型) !== 1 || (Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量)) === 0">-</span>
<el-input-number v-if="Number(scope.row.零件类型) === 1 && (Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量)) !== 0" v-model="scope.row.使用库存数" :min="0" :max="Number(scope.row.零件数量) > (Number(scope.row.货位存量) - Number(scope.row.占用数量)) ? (Number(scope.row.货位存量) - Number(scope.row.占用数量) + Number(scope.row.使用库存数)) : Number(scope.row.零件数量)" :disabled="(Number(scope.row.货位存量) - Number(scope.row.占用数量)) === 0 || parseInt(scope.row.采购状态编号)===3" size="mini" style="width: 90px" @change="changeNumber(scope.row)"/>
</template>
</el-table-column>
<el-table-column label="待采数量" align="center" width="80" prop="待采购数量">
<template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用库存数) : scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
</template>
</el-table-column>
<el-table-column label="使用滞货数量" align="center" width="110" prop="使用滞货数量">
<template slot-scope="scope">
{{ Number(scope.row.零件类型) === 1 ? Number(scope.row.使用滞货数量) : '-' }}
</template>
</el-table-column>
<el-table-column label="使用滞货" align="center" width="80">
<template slot-scope="scope">
<template v-if="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0">
—
</template> </template>
<el-button v-else :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0" icon="el-icon-goods" plain type="primary" size="mini" @click="useInventory(scope.row)"/> </el-table-column>
</template> <el-table-column label="规格" align="center" prop="物料规格" width="120" show-overflow-tooltip>
</el-table-column> <template slot-scope="scope">
<el-table-column label="可用滞货数量" align="center" width="110"> {{ scope.row.物料规格 }}
<template slot-scope="scope"> </template>
{{ Number(scope.row.零件类型) === 2 ? Number(scope.row.滞货数量) : '-' }} </el-table-column>
</template> <el-table-column label="型号" prop="物料型号" align="center" width="100" show-overflow-tooltip>
</el-table-column> <template slot-scope="scope">
<el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip> {{ scope.row.物料型号 }}
<template slot-scope="scope"> </template>
{{ scope.row.备注 }} </el-table-column>
</template> <el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" width="120" show-overflow-tooltip>
</el-table-column> <template slot-scope="scope">
<el-table-column :filters="source" :filter-method="filterSource" align="center" label="来源" width="70px" prop="零件类型筛选"> {{ scope.row.供货商 === '0' ? '-' : scope.row.供货商 }}
<template slot-scope="scope"> </template>
{{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }} </el-table-column>
</template> <el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
</el-table-column> <template slot-scope="scope">
<el-table-column label="分配时间" prop="任务分配时间" align="center" min-width="120"> {{ scope.row.机床图号 }}
<template slot-scope="scope"> </template>
{{ scope.row.任务分配时间 ? (scope.row.任务分配时间.split(' ')[0] === '1900/1/4' ? '-' : scope.row.任务分配时间.split(' ')[0]) : '-' }} </el-table-column>
</template> <el-table-column label="组号" prop="组号" align="center" width="50">
</el-table-column> <template slot-scope="scope">
</el-table> {{ scope.row.组号 }}
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top"> </template>
<el-button type="warning" size="small" plain style="margin: 0px 40px 0px 20px; display: inline-block" @click="addMateriel">选入物料</el-button> </el-table-column>
</el-tooltip> <el-table-column label="物料类别" align="center" width="80" show-overflow-tooltip>
<div class="block" style="margin: 10px 0 0 0;display: inline-block"> <template slot-scope="scope">
<el-pagination {{ scope.row.物料类别 }}
:current-page="pageCurrent11" </template>
:page-sizes="[10, 20, 30, 40, 100]" </el-table-column>
:page-size="pageSize11" <el-table-column label="物料品种" prop="物料品种" align="center" width="100" show-overflow-tooltip>
:total="total11" <template slot-scope="scope">
style="display:inline-block;width:800px" {{ scope.row.物料品种 }}
layout="total, sizes, prev, pager, next, jumper" </template>
@size-change="handleSizeChange11" </el-table-column>
@current-change="handleCurrentChange11"/> <el-table-column label="分配数量" align="center" width="80" prop="零件数量">
</div> <template slot-scope="scope">
<!--:row-class-name="tableRowClassName2"--> {{ scope.row.零件数量 }}
</el-tab-pane> </template>
<el-tab-pane label="仓库" name="仓库"> </el-table-column>
<el-row> <el-table-column label="库存(BZ)" align="center" width="80" prop="库存">
<el-input v-model="materialName" style="width: 150px;margin-left: 10px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent22=1;pageSize22=20;total22=0;searchTable22()"/> <template slot-scope="scope">
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button> {{ Number(scope.row.零件类型) === 1 ? scope.row.库存 = Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量) : '-' }}
</el-row> </template>
<el-table </el-table-column>
v-loading="loading2" <el-table-column label="使用库存数量" align="center" width="110" prop="使用库存数">
:data="tableData22" <template slot-scope="scope">
border <span v-if="Number(scope.row.零件类型) !== 1 || (Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量)) === 0">-</span>
stripe <el-input-number v-if="Number(scope.row.零件类型) === 1 && (Number(scope.row.货位存量 ? scope.row.货位存量 : 0) - Number(scope.row.占用数量)) !== 0" v-model="scope.row.使用库存数" :min="0" :max="Number(scope.row.零件数量) > (Number(scope.row.货位存量) - Number(scope.row.占用数量)) ? (Number(scope.row.货位存量) - Number(scope.row.占用数量) + Number(scope.row.使用库存数)) : Number(scope.row.零件数量)" :disabled="(Number(scope.row.货位存量) - Number(scope.row.占用数量)) === 0 || parseInt(scope.row.采购状态编号)===3" size="mini" style="width: 90px" @change="changeNumber(scope.row)"/>
style="width: 594px;max-height: 500px;" </template>
height="300px" </el-table-column>
size="mini" <el-table-column label="待采数量" align="center" width="80" prop="待采购数量">
@selection-change="handleSelectionChange1" <template slot-scope="scope">
@select="handleSelection1"> {{ Number(scope.row.零件类型) === 1 ? scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用库存数) : scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
<el-table-column align="center" width="43" type="selection"/> </template>
<el-table-column label="名称" align="center" prop="物料名称" width="153" show-overflow-tooltip> </el-table-column>
<template slot-scope="scope"> <el-table-column label="使用滞货数量" align="center" width="110" prop="使用滞货数量">
{{ scope.row.物料名称 }} <template slot-scope="scope">
</template> {{ Number(scope.row.零件类型) === 1 ? Number(scope.row.使用滞货数量) : '-' }}
</el-table-column> </template>
<el-table-column label="图号或型号" prop="物料型号" align="center" width="128" show-overflow-tooltip> </el-table-column>
<template slot-scope="scope"> <el-table-column label="使用滞货" align="center" width="80">
{{ scope.row.物料型号 }} <template slot-scope="scope">
</template> <template v-if="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0">
</el-table-column> —
<el-table-column label="规格" align="center" prop="物料规格" width="119" show-overflow-tooltip> </template>
<template slot-scope="scope"> <el-button v-else :disabled="parseInt(scope.row.询价状态编号)!==1||parseInt(scope.row.是否确认)!==1||Number(scope.row.滞货数量)===0" icon="el-icon-goods" plain type="primary" size="mini" @click="useInventory(scope.row)"/>
{{ scope.row.物料规格 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column label="可用滞货数量" align="center" width="110">
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" width="132"> <template slot-scope="scope">
<template slot-scope="scope"> {{ Number(scope.row.零件类型) === 2 ? Number(scope.row.滞货数量) : '-' }}
{{ scope.row.供货商 }} </template>
</template> </el-table-column>
</el-table-column> <el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
</el-table> <template slot-scope="scope">
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top"> {{ scope.row.备注 }}
<el-button type="warning" size="small" plain style="margin: 0px 40px 0px 20px; display: inline-block" @click="addMateriel">选入物料</el-button> </template>
</el-tooltip> </el-table-column>
<div class="block" style="display: inline-block"> <el-table-column :filters="source" :filter-method="filterSource" align="center" label="来源" width="70px" prop="零件类型筛选">
<el-pagination <template slot-scope="scope">
:current-page="pageCurrent22" {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
:page-sizes="[20, 50, 100, 150]" </template>
:page-size="pageSize22" </el-table-column>
:total="total22" <el-table-column label="分配时间" prop="任务分配时间" align="center" min-width="120">
style="display:inline-block;width:50%" <template slot-scope="scope">
layout="total, sizes, prev, pager, next, jumper" {{ scope.row.任务分配时间 ? (scope.row.任务分配时间.split(' ')[0] === '1900/1/4' ? '-' : scope.row.任务分配时间.split(' ')[0]) : '-' }}
@size-change="handleSizeChange22" </template>
@current-change="handleCurrentChange22"/> </el-table-column>
</div> </el-table>
</el-tab-pane> <el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
</el-tabs> <el-button type="warning" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-col> </el-tooltip>
</el-row> <div class="block" style="margin: 10px 0 0 0;display: inline-block">
<el-pagination
:current-page="pageCurrent11"
:page-sizes="[10, 20, 30, 40, 100]"
:page-size="pageSize11"
:total="total11"
style="display:inline-block;width:800px"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange11"
@current-change="handleCurrentChange11"/>
</div>
<!--:row-class-name="tableRowClassName2"-->
</el-tab-pane>
<el-tab-pane label="仓库" name="仓库">
<el-row>
<el-input v-model="materialName" style="width: 150px;margin-left: 10px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent22=1;pageSize22=20;total22=0;searchTable22()"/>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button>
</el-row>
<el-table
v-loading="loading2"
:data="tableData22"
border
stripe
style="width: 594px;max-height: 500px;"
height="300px"
size="mini"
@selection-change="handleSelectionChange1"
@select="handleSelection1">
<el-table-column align="center" width="43" type="selection"/>
<el-table-column label="名称" align="center" prop="物料名称" width="153" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="图号或型号" prop="物料型号" align="center" width="128" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="规格" align="center" prop="物料规格" width="119" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column :filters="supplierFilters" :filter-method="filterHandler" prop="供货商" label="供货商" align="center" width="132">
<template slot-scope="scope">
{{ scope.row.供货商 }}
</template>
</el-table-column>
</el-table>
<el-tooltip :open-delay="100" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
<el-button type="warning" size="small" icon="el-icon-bottom" plain style="margin: 0px 40px 0px 0px; display: inline-block" @click="addMateriel">选入物料</el-button>
</el-tooltip>
<div class="block" style="display: inline-block">
<el-pagination
:current-page="pageCurrent22"
:page-sizes="[20, 50, 100, 150]"
:page-size="pageSize22"
:total="total22"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange22"
@current-change="handleCurrentChange22"/>
</div>
</el-tab-pane>
</el-tabs>
</el-col>
</el-row>
</el-card>
<el-card> <el-card>
<div slot="header"> <el-card>
<el-input v-model="offlineContract" placeholder="离线合同号/供应商" size="small" style="width: 170px" clearable/> <div slot="header">
<!--<el-input v-model="supplierName0" placeholder="供应商" size="small" style="width: 140px" clearable/>--> <el-input v-model="offlineContract" placeholder="离线合同号/供应商" size="small" style="width: 170px;margin-left: 5px" clearable/>
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button> <!--<el-input v-model="supplierName0" placeholder="供应商" size="small" style="width: 140px" clearable/>-->
<el-button type="warning" size="small" plain style="margin-right:10px;margin-left:100px;" @click="addOfflineContract">创建离线合同</el-button> <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
<el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top"> <el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-right:30px;margin-left:100px;" @click="addOfflineContract">离线合同</el-button>
<el-button :disabled="disable" type="success" size="small" plain style="margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button> <el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
</el-tooltip> <el-button :disabled="disabledbutton" type="success" size="small" plain style="margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button>
</el-tooltip>
<!--<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>--> <!--<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>-->
<el-tooltip :content="hasTax" placement="top" style="margin-right: 370px"> <el-tooltip :content="hasTax" placement="top" style="margin-right: 370px">
<el-switch v-model="hasTax" active-color="#13ce66" inactive-color="#ff4949" active-value="含税" inactive-value="未税" style="margin: 3px;float:right"/> <el-switch v-model="hasTax" active-color="#13ce66" inactive-color="#ff4949" active-value="含税" inactive-value="未税" style="margin: 3px;float:right"/>
</el-tooltip> </el-tooltip>
<el-input v-model="taxRate" style="float:right;width:60px;" placeholder="税率" size="mini"/> <el-input v-model="taxRate" style="float:right;width:60px;" placeholder="税率" size="mini"/>
<h4 style="float:right;width: 40px;margin: 5px">税率:</h4> <h4 style="float:right;width: 40px;margin: 5px">税率:</h4>
<!--<el-button v-if="quickChangePrice" size="mini" style="float:right; width: 100px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>--> <!--<el-button v-if="quickChangePrice" size="mini" style="float:right; width: 100px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>-->
<!--<el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>--> <!--<el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>-->
</div> </div>
<el-table v-loading="loading3" :data="tableData2" border style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3"> <el-table v-loading="loading3" :data="tableData2" border style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
<!-- <el-table-column label="详情" type="expand" fixed="left" width="50px">--> <!-- <el-table-column label="详情" type="expand" fixed="left" width="50px">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-form label-position="left" inline class="demo-table-expand">--> <!-- <el-form label-position="left" inline class="demo-table-expand">-->
<!-- <el-form-item label="离线合同备注">--> <!-- <el-form-item label="离线合同备注">-->
<!-- {{ scope.row.离线合同备注 }}--> <!-- {{ scope.row.离线合同备注 }}-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-form>--> <!-- </el-form>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="合同状态" align="center" width="80" fixed="left"> <el-table-column label="合同状态" align="center" width="80" fixed="left">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="editing(scope.row)" style="color: #E6A23C" size="small">编辑中</span> <span v-if="editing(scope.row)" style="color: #E6A23C" size="small">编辑中</span>
<span v-if="purchasing(scope.row)" style="color: #409eff" size="small">已采购</span> <span v-if="purchasing(scope.row)" style="color: #409eff" size="small">已采购</span>
<span v-if="arrival(scope.row)" style="color: #67c23a" size="small">全部到货</span> <span v-if="arrival(scope.row)" style="color: #67c23a" size="small">全部到货</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="离线合同编号" prop="离线合同编号" align="center" width="120"> <el-table-column label="离线合同编号" prop="离线合同编号" align="center" width="120">
<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="130" show-overflow-tooltip> <el-table-column label="离线合同名称" align="center" width="130" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.离线合同名称 }} {{ scope.row.离线合同名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="供应商" prop="供应商名称" align="center" width="320" show-overflow-tooltip> <el-table-column label="供应商" prop="供应商名称" align="center" width="320" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.供应商名称 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购员" prop="采购员" align="center" width="90"> <el-table-column label="采购员" prop="采购员" align="center" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购员 }} {{ scope.row.采购员 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建日期" prop="创建日期" align="center" width="100"> <el-table-column label="创建日期" prop="创建日期" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.创建日期.split(' ')[0] }} {{ scope.row.创建日期.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="规定到货时间" align="center" width="120"> <el-table-column label="规定到货时间" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.规定到货时间.split(' ')[0] }} {{ scope.row.规定到货时间.split(' ')[0] }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="120"> <el-table-column label="操作" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-edit" plain size="mini" @click="editOfflineContract(scope.row)"/> <el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-edit" plain size="mini" @click="editOfflineContract(scope.row)"/>
<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-delete" plain size="mini" @click="deleteOfflineContract(scope.row)"/> <el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-delete" plain size="mini" @click="deleteOfflineContract(scope.row)"/>
<el-tooltip :open-delay="1000" effect="dark" content="打印合同" placement="top"> <el-tooltip :open-delay="1000" effect="dark" content="打印合同" placement="top">
<el-button type="text" size="mini" icon="el-icon-printer" plain @click="exportExcel(scope.row)"/> <el-button type="text" size="mini" icon="el-icon-printer" plain @click="exportExcel(scope.row)"/>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- <div class="block" style="margin: 10px 0;">--> <!-- <div class="block" style="margin: 10px 0;">-->
<!-- <el-pagination--> <!-- <el-pagination-->
<!-- :current-page="pageCurrent2"--> <!-- :current-page="pageCurrent2"-->
<!-- :page-sizes="[10, 20, 30, 40]"--> <!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize2"--> <!-- :page-size="pageSize2"-->
<!-- :total="total2"--> <!-- :total="total2"-->
<!-- style="display:inline-block;width:50%"--> <!-- style="display:inline-block;width:50%"-->
<!-- layout="total"--> <!-- layout="total"-->
<!-- @size-change="handleSizeChange2"--> <!-- @size-change="handleSizeChange2"-->
<!-- @current-change="handleCurrentChange2"/>--> <!-- @current-change="handleCurrentChange2"/>-->
<!-- </div>--> <!-- </div>-->
<!--<h3>合同详细信息</h3>--> </el-card>
<el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border stripe style="max-height: 500px;" height="450px" size="mini" show-summary> <el-card>
<el-table-column label="物料名称" align="center" width="120" show-overflow-tooltip> <!--<h3>合同详细信息</h3>-->
<template slot-scope="scope"> <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border stripe style="max-height: 500px;" height="450px" size="mini" show-summary>
{{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }} <el-table-column label="物料名称" align="center" width="120" show-overflow-tooltip>
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
<el-table-column label="规格" align="center" width="100" show-overflow-tooltip> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }} <el-table-column label="规格" align="center" width="100" show-overflow-tooltip>
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
<el-table-column label="图号或型号" align="center" width="140" show-overflow-tooltip> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }} <el-table-column label="图号或型号" align="center" width="140" show-overflow-tooltip>
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
<el-table-column label="采购数" align="center" width="100"> </template>
<template slot-scope="scope"> </el-table-column>
<el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:60px" @change="saveContract()"/> <el-table-column label="采购数" align="center" width="100">
<b v-else>{{ scope.row.数量 }}</b> <template slot-scope="scope">
</template> <el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:60px" @change="saveContract()"/>
</el-table-column> <b v-else>{{ scope.row.数量 }}</b>
<el-table-column label="单位" align="center" min-width="50"> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.计量单位 }} <el-table-column label="单位" align="center" min-width="50">
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.计量单位 }}
<el-table-column label="参考价格" align="center" width="80"> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.参考价格 }} <el-table-column label="参考价格" align="center" width="80">
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.参考价格 }}
<el-table-column label="单价(未税)元" align="center" width="110" prop="单价"> </template>
<template slot-scope="scope"> </el-table-column>
<el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='未税'" v-model="scope.row.未税单价" :disabled="disable" size="mini" style="width:70px" @change="saveContract()"/> <el-table-column label="单价(未税)元" align="center" width="110" prop="单价">
<b v-show="hasTax!=='未税'">{{ (scope.row.单价 / (1 + taxRate)).toFixed(2) }}</b> <template slot-scope="scope">
</template> <el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='未税'" v-model="scope.row.未税单价" :disabled="disable" size="mini" style="width:70px" @change="saveContract()"/>
</el-table-column> <b v-show="hasTax!=='未税'">{{ (scope.row.单价 / (1 + taxRate)).toFixed(2) }}</b>
<el-table-column label="单价(含税)元" align="center" width="120" prop="单价"> </template>
<template slot-scope="scope"> </el-table-column>
<el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.单价" :disabled="disable" size="mini" style="width:80px" @change="saveContract()"/> <el-table-column label="单价(含税)元" align="center" width="120" prop="单价">
<b v-show="hasTax!=='含税'">{{ (scope.row.未税单价 * (1 + taxRate)).toFixed(2) }}</b> <template slot-scope="scope">
</template> <el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.单价" :disabled="disable" size="mini" style="width:80px" @change="saveContract()"/>
</el-table-column> <b v-show="hasTax!=='含税'">{{ (scope.row.未税单价 * (1 + taxRate)).toFixed(2) }}</b>
<el-table-column label="总额(未税)元" align="center" width="110" prop="合计"> </template>
<template slot-scope="scope"> </el-table-column>
{{ hasTax==='未税' ? scope.row.未税总额 = (Number(scope.row.数量) * Number(scope.row.未税单价)).toFixed(2) : scope.row.未税总额 = (scope.row.含税总额 / (1+taxRate)).toFixed(2) }} <el-table-column label="总额(未税)元" align="center" width="110" prop="合计">
</template> <template slot-scope="scope">
</el-table-column> {{ hasTax==='未税' ? scope.row.未税总额 = (Number(scope.row.数量) * Number(scope.row.未税单价)).toFixed(2) : scope.row.未税总额 = (scope.row.含税总额 / (1+taxRate)).toFixed(2) }}
<el-table-column label="总额(含税)元" align="center" width="110" prop="合计"> </template>
<template slot-scope="scope"> </el-table-column>
{{ hasTax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }} <el-table-column label="总额(含税)元" align="center" width="110" prop="合计">
</template> <template slot-scope="scope">
</el-table-column> {{ hasTax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
<el-table-column label="备注" align="center" min-width="120" prop="备注"> </template>
<template slot-scope="scope"> </el-table-column>
<el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:100px" @change="saveContract()"/> <el-table-column label="备注" align="center" min-width="120" prop="备注">
<b v-else>{{ scope.row.备注 || '—' }}</b> <template slot-scope="scope">
</template> <el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:100px" @change="saveContract()"/>
</el-table-column> <b v-else>{{ scope.row.备注 || '—' }}</b>
<el-table-column label="交货期要求" align="center" min-width="130" prop="交货期要求"> </template>
<template slot-scope="scope"> </el-table-column>
<el-input v-direction="{x: 2, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.交货要求" :disabled="disable" size="mini" style="width:90px" @change="saveContract()"/> <el-table-column label="交货期要求" align="center" min-width="130" prop="交货期要求">
<b v-else>{{ scope.row.交货期要求 || '—' }}</b> <template slot-scope="scope">
</template> <el-input v-direction="{x: 2, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.交货要求" :disabled="disable" size="mini" style="width:90px" @change="saveContract()"/>
</el-table-column> <b v-else>{{ scope.row.交货期要求 || '—' }}</b>
<el-table-column v-if="disable" label="到货数量" align="center" min-width="100"> </template>
<template slot-scope="scope"> </el-table-column>
{{ scope.row.到货数量 }} <el-table-column v-if="disable" label="到货数量" align="center" min-width="100">
</template> <template slot-scope="scope">
</el-table-column> {{ scope.row.到货数量 }}
<el-table-column label="操作" align="center" min-width="50"> </template>
<template slot-scope="scope"> </el-table-column>
<!--<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-delete" plain size="mini" @click="deleteOfflineContract(scope.row)"/>--> <el-table-column label="操作" align="center" min-width="50">
<el-button v-if="quickChangePrice" :disabled="disable" type="text" plain size="mini" icon="el-icon-right" @click="deleteMateriel(scope.row)"/> <template slot-scope="scope">
<b v-else>移除</b> <!--<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-delete" plain size="mini" @click="deleteOfflineContract(scope.row)"/>-->
</template> <el-button v-if="quickChangePrice" :disabled="disable" type="text" plain size="mini" icon="el-icon-right" @click="deleteMateriel(scope.row)"/>
</el-table-column> <b v-else>移除</b>
</el-table> </template>
</el-table-column>
</el-table>
</el-card>
</el-card> </el-card>
<div id="offlineContract" style="width: 800px;margin: 0 auto;display: none"> <div id="offlineContract" style="width: 800px;margin: 0 auto;display: none">
<table class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%"> <table class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
@@ -812,6 +818,7 @@ export default {
paramRow: '', // 参数row paramRow: '', // 参数row
disable: true, // 其他的禁用 disable: true, // 其他的禁用
tabName: '标准件', tabName: '标准件',
disabledbutton: false,
total22: 0, total22: 0,
pageCurrent22: 1, pageCurrent22: 1,
pageSize22: 20 pageSize22: 20
@@ -1060,6 +1067,7 @@ export default {
this.offlineContract ? this.check3 = 1 : this.check3 = 0 this.offlineContract ? this.check3 = 1 : this.check3 = 0
this.supplierName0 ? this.check4 = 1 : this.check4 = 0 this.supplierName0 ? this.check4 = 1 : this.check4 = 0
this.loading3 = true this.loading3 = true
this.tableData3 = []
searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0).then(response => { searchOfflineContract(this.pageCurrent2, this.pageSize2, this.check3, this.offlineContract, this.check4, this.supplierName0).then(response => {
console.log(response.data.rows, 99) console.log(response.data.rows, 99)
this.tableData2 = response.data.rows this.tableData2 = response.data.rows
@@ -1277,6 +1285,12 @@ export default {
this.$set(v, '未税单价', v.单价 / (1 + this.taxRate)) this.$set(v, '未税单价', v.单价 / (1 + this.taxRate))
}) })
this.loading4 = false this.loading4 = false
console.log(response.data.length, 1231231233)
if (response.data.length === 0) {
this.disabledbutton = true
} else {
this.disabledbutton = false
}
}) })
this.arrival(row) || this.purchasing(row) ? this.disable = true : this.disable = false // 是否为编辑模式 this.arrival(row) || this.purchasing(row) ? this.disable = true : this.disable = false // 是否为编辑模式
}, },

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

@@ -90,11 +90,16 @@
{{ scope.row.姓名 }} {{ scope.row.姓名 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="总金额(元)" align="center" min-width="60"> <el-table-column label="总金额(元)" align="center" min-width="70">
<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="60">
<template slot-scope="scope">
{{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" min-width="100" fixed="right"> <el-table-column label="操作" align="center" min-width="100" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button> <el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>

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

@@ -90,7 +90,7 @@
size="mini" size="mini"
border border
stripe stripe
style="width: 1232px" style="width: 1330px"
height="300px" height="300px"
highlight-current-row highlight-current-row
@row-click="searchTable2"> @row-click="searchTable2">
@@ -190,6 +190,11 @@
{{ scope.row.欠款金额 }} {{ scope.row.欠款金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审批时间" align="center" width="110" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '-' }}
</template>
</el-table-column>
<!-- <el-table-column label="审核时间" align="center" width="80">--> <!-- <el-table-column label="审核时间" align="center" width="80">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{ scope.row.审核时间 ? scope.row.审核时间.substr(0,9) : '—' }}--> <!-- {{ scope.row.审核时间 ? scope.row.审核时间.substr(0,9) : '—' }}-->
@@ -355,7 +360,7 @@ export default {
}, },
created() { created() {
this.fetchData() this.fetchData()
this.searchTable1() // this.searchTable1()
}, },
methods: { methods: {
// 处理完成 // 处理完成
@@ -527,7 +532,8 @@ export default {
合同金额: response.data.rows[i].合同金额, 合同金额: response.data.rows[i].合同金额,
欠款金额: response.data.rows[i].欠款金额, 欠款金额: response.data.rows[i].欠款金额,
采购员流水号: response.data.rows[i].采购员流水号, 采购员流水号: response.data.rows[i].采购员流水号,
采购合同流水号: response.data.rows[i].采购合同流水号 采购合同流水号: response.data.rows[i].采购合同流水号,
审批时间: response.data.rows[i].审批时间
}) })
} }
} }

1
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -417,7 +417,6 @@ export default {
}, },
created() { created() {
this.fetchData() this.fetchData()
this.searchTable()
}, },
methods: { methods: {
// open2: function (mess) { // open2: function (mess) {

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

@@ -74,6 +74,9 @@
<el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top"> <el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
<el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button> <el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
<el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="success" size="small" icon="el-icon-tickets" plain style="margin-top: 3px;margin-left: 10px" @click="saveMateriel">保存</el-button>
</el-tooltip>
<el-select v-model="supplierName0" placeholder="供应商" style="width: 220px;margin-left: 10px" size="small" filterable clearable @change="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"> <el-select v-model="supplierName0" placeholder="供应商" style="width: 220px;margin-left: 10px" size="small" filterable clearable @change="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">
<el-option <el-option
v-for="item in supplierName0s" v-for="item in supplierName0s"
@@ -98,9 +101,6 @@
<!--<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-tooltip>--> <!--</el-tooltip>-->
<el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable2">查询</el-button> <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable2">查询</el-button>
<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
<el-button :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="success" size="small" icon="el-icon-tickets" plain style="margin-top: 3px;margin-left: 90px" @click="saveMateriel">保存</el-button>
</el-tooltip>
</div> </div>
<el-table <el-table
v-loading="" v-loading=""