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-12-02 13:46:34 +08:00
parent 315b9f023b f8b5751a21
commit c063efad44
9 changed files with 152 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/WorkshopProcurement/NewArrivalList.js
View File

@@ -38,26 +38,26 @@ export function searchLxPurchaseOrder(pageCurrent, pageSize, check1, num, check2
}) })
} }
// 查询采购计划明细 // 查询采购计划明细
export function searchMateriel(num) { export function searchMateriel(num, check, num1) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '备料管理_采购计划明细_查询数据_未选入', name: '备料管理_采购计划明细_查询数据_未选入',
param: `供应商=${num}` param: `供应商=${num}&零件图号_check=${check}&零件图号=${num1}`
} }
}) })
} }
// 查询离线采购计划明细 // 查询离线采购计划明细
export function searchLxMateriel(num) { export function searchLxMateriel(num, check, num1) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '备料管理_离线采购计划明细_查询数据_未选入', name: '备料管理_离线采购计划明细_查询数据_未选入',
param: `供应商流水号=${num}` param: `供应商流水号=${num}&零件图号_check=${check}&零件图号=${num1}`
} }
}) })
} }

5
src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js
View File

@@ -132,15 +132,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
}) })
} }
// 查询到货单 // 查询到货单
export function searchArriveOrder(num, num1, num2, num3, num5, pageCurrent, pageSize) { export function searchArriveOrder(num, num1, num2, num3, num5) {
return request({ return request({
url: '', url: '',
method: 'post', method: 'post',
data: { data: {
type: '1', type: '1',
name: '备料管理_到货单查询', name: '备料管理_到货单查询',
param: `供应商_check=${num}&供应商=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`, param: `供应商_check=${num}&供应商=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`
Pagination: pageCurrent + '&' + pageSize
} }
}) })
} }

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

@@ -1330,6 +1330,7 @@
<el-table-column align="center" label="发货状态"> <el-table-column align="center" label="发货状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.是否发出 === 1" type="success" size="mini" style="width: 80px">已发货</el-tag> <el-tag v-if="scope.row.是否发出 === 1" type="success" size="mini" style="width: 80px">已发货</el-tag>
<el-tag v-if="scope.row.是否发出 === 0" type="success" size="mini" style="width: 80px">未发货</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="发货单编号"> <el-table-column align="center" label="发货单编号">

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

@@ -3,7 +3,7 @@
<el-card> <el-card>
<el-row> <el-row>
<span>合同号:</span> <span>合同号:</span>
<el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable> <el-select v-model="contractNumValue" placeholder="合同号" size="small" filterable clearable @change="total=0;pageCurrent=1;pageSize=10;searchTable()">
<el-option <el-option
v-for="item in contractNum" v-for="item in contractNum"
:key="item.value" :key="item.value"
@@ -13,7 +13,6 @@
<div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div> <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
</el-option> </el-option>
</el-select> </el-select>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total=0;pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
</el-row> </el-row>
</el-card> </el-card>
<el-card> <el-card>

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

@@ -141,9 +141,9 @@
style="margin-top:10px" style="margin-top:10px"
@click="calculateContractSum">计算合同总额</el-button> @click="calculateContractSum">计算合同总额</el-button>
<span>合同总额(未税):</span> <span>合同总额(未税):</span>
<el-input v-model="contractSum" size="small"/>
<span>合同总额(含税):</span>
<el-input v-model="contractSum2" size="small"/> <el-input v-model="contractSum2" size="small"/>
<span>合同总额(含税):</span>
<el-input v-model="contractSum" size="small"/>
</el-card> </el-card>
<el-card> <el-card>
<el-input :rows="20" v-model="textArea" type="textarea" style="width:calc(99% - 250px);float:right;margin-bottom: 20px" resize="none"/> <el-input :rows="20" v-model="textArea" type="textarea" style="width:calc(99% - 250px);float:right;margin-bottom: 20px" resize="none"/>
@@ -548,7 +548,7 @@ export default {
this.tableData4.push(this.groupNum2[i]) this.tableData4.push(this.groupNum2[i])
} }
this.contractSum = (this.contractSum1).toFixed(2) this.contractSum = (this.contractSum1).toFixed(2)
this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 this.contractSum2 = parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100
this.costAccount = this.contractSum this.costAccount = this.contractSum
if (parseInt(this.costAccount) === 0) { if (parseInt(this.costAccount) === 0) {
this.$message.error('成本核算不可为0') this.$message.error('成本核算不可为0')
@@ -566,7 +566,7 @@ export default {
} }
console.log(this.contractSum1, this.groupNum5, 898989) console.log(this.contractSum1, this.groupNum5, 898989)
this.contractSum = (this.contractSum1).toFixed(2) this.contractSum = (this.contractSum1).toFixed(2)
this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 this.contractSum2 = parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100
this.costAccount = this.contractSum this.costAccount = this.contractSum
if (parseInt(this.costAccount) === 0) { if (parseInt(this.costAccount) === 0) {
this.$message.error('成本核算不可为0') this.$message.error('成本核算不可为0')

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

@@ -58,64 +58,64 @@
@current-change="handleCurrentChange"/> @current-change="handleCurrentChange"/>
</div> </div>
</el-card> </el-card>
<el-card> <!--<el-card>-->
<h3>离线合同</h3> <!--<h3>离线合同</h3>-->
<el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini"> <!--<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"> <!--<el-table-column label="供应商" align="center" min-width="170">-->
<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="150"> <!--<el-table-column label="请款时间" align="center" min-width="150">-->
<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="100"> <!--<el-table-column label="请款人" align="center" min-width="100">-->
<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="100" prop="请款金额"> <!--<el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">-->
<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="320"> <!--<el-table-column label="审核" align="center" width="320">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
<el-popover placement="right" width="400" trigger="click"> <!--<el-popover placement="right" width="400" trigger="click">-->
<el-table :data="gridData" stripe size="mini" show-summary> <!--<el-table :data="gridData" stripe size="mini" show-summary>-->
<el-table-column width="50" align="center" type="index" label="序号"/> <!--<el-table-column width="50" align="center" type="index" label="序号"/>-->
<el-table-column min-width="150" align="center" label="离线合同编号"> <!--<el-table-column min-width="150" align="center" label="离线合同编号">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.离线合同编号 }} <!--{{ scope.row.离线合同编号 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
<el-table-column min-width="100" align="center" label="合同总额" prop="请款金额"> <!--<el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">-->
<template slot-scope="scope"> <!--<template slot-scope="scope">-->
{{ scope.row.请款金额 }} <!--{{ scope.row.请款金额 }}-->
</template> <!--</template>-->
</el-table-column> <!--</el-table-column>-->
</el-table> <!--</el-table>-->
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" plain @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-popover>-->
<el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApprovalOffline(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> <!--<el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApprovalOffline(scope.row)">不通过</el-button>-->
</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="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, sizes, prev, pager, next, jumper" <!--layout="total, sizes, prev, pager, next, jumper"-->
@size-change="handleSizeChange2" <!--@size-change="handleSizeChange2"-->
@current-change="handleCurrentChange2"/> <!--@current-change="handleCurrentChange2"/>-->
</div> <!--</div>-->
</el-card> <!--</el-card>-->
<el-card> <el-card>
<h3>备料合同</h3> <h3>备料合同</h3>
<el-table v-loading="" :data="tableData3" border style="width: 100%;max-height: 300px;" height="300px" size="mini"> <el-table v-loading="" :data="tableData3" border style="width: 100%;max-height: 300px;" height="300px" size="mini">

2
src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
View File

@@ -254,7 +254,7 @@
<el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="900px"> <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="900px">
<span>供应商：</span> <span>供应商：</span>
<el-input v-model="supplierName" size="small" placeholder="请选择供应商发票" style="margin: 0 5px 10px 0;" readonly/> <el-input v-model="supplierName" size="small" placeholder="请选择供应商发票" style="margin: 0 5px 10px 0;" readonly/>
<el-radio-group v-model="contractType" size="small" @change="searchTable01()"> <el-radio-group v-show="false" v-model="contractType" size="small" @change="searchTable01()">
<el-radio label="采购合同" border/> <el-radio label="采购合同" border/>
<el-radio label="离线合同" border/> <el-radio label="离线合同" border/>
</el-radio-group> </el-radio-group>

86
src/views/WorkshopProcurement/NewArrivalList/index.vue
View File

@@ -249,7 +249,15 @@
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 400px" width="1600px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible10" title="添加到货明细" center style="min-height: 400px" width="1600px">
<el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px"> <el-form ref="form10" :model="form10" :rules="rules10" label-position="right" label-width="60px">
<el-row> <el-row>
<el-col :span="5" style="margin-left: 27%"> <el-col :span="5" style="margin-left: 2%">
<span>供应商</span>
<el-input v-model="供应商名称" style="width: 250px" size="small" readonly/>
</el-col>
<el-col :span="4">
<span>到货单编号</span>
<el-input v-model="到货单编号" style="width: 150px" size="small" readonly/>
</el-col>
<el-col :span="4">
<span>计划类型</span> <span>计划类型</span>
<el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()"> <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
<el-option <el-option
@@ -259,17 +267,16 @@
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="4">
<span>供应商</span> <span>零件图号</span>
<el-input v-model="供应商名称" style="width: 250px" size="small" readonly/> <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="2">
<span>到货单编号</span> <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
<el-input v-model="到货单编号" style="width: 150px" size="small" readonly/>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<div style="width: 20%;float: left;margin-top: 5px"> <div style="width: 20%;float: left;margin-top: 20px">
<div style="background: gainsboro"> <div style="background: gainsboro">
<el-row style="height: 50px"> <el-row style="height: 50px">
<el-form-item label="材料" prop="CailiaoValue"> <el-form-item label="材料" prop="CailiaoValue">
@@ -302,8 +309,8 @@
</div> </div>
</div> </div>
<div style="width: 79%;float: left;margin-left: 10px"> <div style="width: 79%;float: left;margin-left: 10px">
<el-table v-loading="" :data="tableData20" border show-summary highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange"> <el-table :row-key="getRowKeys" :data="tableData20" border show-summary highlight-current-row stripe style="margin: 3px 0" height="550px" size="mini" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="50" align="center"/> <el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
<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.采购单号 }} {{ scope.row.采购单号 }}
@@ -336,12 +343,12 @@
</el-table-column> </el-table-column>
<el-table-column label="到货件数" align="center" width="110px"> <el-table-column label="到货件数" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px"/> <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货重量" align="center" width="110px" prop="到货重量"> <el-table-column label="到货重量" align="center" width="110px" prop="到货重量">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px"/> <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成品尺寸（长、宽、高）" align="center"> <el-table-column label="成品尺寸（长、宽、高）" align="center">
@@ -417,7 +424,7 @@
<!--</div>--> <!--</div>-->
<!--</el-dialog>--> <!--</el-dialog>-->
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联备料材料" center style="min-height: 400px" width="1400px"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="关联备料材料" center style="min-height: 550px" width="1400px">
<span>计划类型</span> <span>计划类型</span>
<el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()"> <el-select v-model="planType" placeholder="计划类型" size="small" style="width: 150px" filterable @change="searchTable20()">
<el-option <el-option
@@ -426,8 +433,11 @@
:label="item.label" :label="item.label"
:value="item.value"/> :value="item.value"/>
</el-select> </el-select>
<el-table v-loading="" :data="tableData20" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange"> <span>零件图号</span>
<el-table-column type="selection" width="50" align="center"/> <el-input v-model="零件图号" style="width: 150px" size="small" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable20()">查询</el-button>
<el-table :row-key="getRowKeys" :data="tableData20" border highlight-current-row stripe style="margin: 3px 0" height="300px" size="mini" @selection-change="handleSelectionChange">
<el-table-column :reserve-selection="true" type="selection" width="50" align="center"/>
<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.采购单号 }} {{ scope.row.采购单号 }}
@@ -460,12 +470,12 @@
</el-table-column> </el-table-column>
<el-table-column label="到货件数" align="center" width="110px"> <el-table-column label="到货件数" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px"/> <el-input-number v-model="scope.row.未到货数量" :disabled="disable === '1'" :max="scope.row.批次数量-parseInt(scope.row.到货数量)" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货重量" align="center" width="110px"> <el-table-column label="到货重量" align="center" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px"/> <el-input-number v-model="scope.row.到货重量" :disabled="disable === '1'" :step="1" :min="0" size="mini" style="width:90px" @change="saveData(scope.row)"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="成品尺寸（长、宽、高）" align="center"> <el-table-column label="成品尺寸（长、宽、高）" align="center">
@@ -535,6 +545,7 @@ export default {
ALLMoney: '', ALLMoney: '',
材料名称: '', 材料名称: '',
未绑定数量: '', 未绑定数量: '',
零件图号: '',
tableData2: [], tableData2: [],
total2: 0, total2: 0,
pageCurrent2: 1, pageCurrent2: 1,
@@ -595,12 +606,17 @@ export default {
单位: [{ required: true, message: '请填写单位' }], 单位: [{ required: true, message: '请填写单位' }],
单价: [{ required: true, message: '请填写单价' }] 单价: [{ required: true, message: '请填写单价' }]
}, },
到货单编号: '',
供应商名称: '',
本次到货数量组: [], 本次到货数量组: [],
到货重量组: [], 到货重量组: [],
工艺计划流水号组: [], 工艺计划流水号组: [],
采购计划明细流水号组: [], 采购计划明细流水号组: [],
离线采购计划明细流水号组: [], 离线采购计划明细流水号组: [],
到货金额组: [] 到货金额组: [],
getRowKeys(row) {
return row.采购计划明细流水号
}
} }
}, },
computed: { computed: {
@@ -618,6 +634,23 @@ export default {
this.searchTable4() this.searchTable4()
}, },
methods: { methods: {
saveData(row) {
var a = 0
this.tableData30.map(v => {
if (v.采购计划明细流水号 === row.采购计划明细流水号) {
v.到货重量 = row.到货重量
v.未到货数量 = row.未到货数量
a = 1
}
})
if (a === 0) {
this.tableData30.push({
采购计划明细流水号: row.采购计划明细流水号,
到货重量: row.到货重量,
未到货数量: row.未到货数量
})
}
},
fetchdata() { fetchdata() {
searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => { searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
for (let i = 0; i < response.data.length; i++) { for (let i = 0; i < response.data.length; i++) {
@@ -629,12 +662,22 @@ export default {
}) })
}, },
searchTable20() { searchTable20() {
let check
this.零件图号 ? check = 1 : check = 0
if (this.planType === 0) { if (this.planType === 0) {
searchMateriel(this.供应商).then(response => { searchMateriel(this.供应商, check, this.零件图号).then(response => {
this.tableData20 = response.data this.tableData20 = response.data
for (let i = 0; i < this.tableData20.length; i++) {
for (let j = 0; j < this.tableData30.length; j++) {
if (this.tableData20[i].采购计划明细流水号 === this.tableData30[j].采购计划明细流水号) {
this.tableData20[i].未到货数量 = this.tableData30[j].未到货数量
this.tableData20[i].到货重量 = this.tableData30[j].到货重量
}
}
}
}) })
} else { } else {
searchLxMateriel(this.供应商).then(response => { searchLxMateriel(this.供应商, check, this.零件图号).then(response => {
this.tableData20 = response.data this.tableData20 = response.data
}) })
} }
@@ -924,7 +967,9 @@ export default {
this.form10.数量 = '' this.form10.数量 = ''
this.form10.单价 = '' this.form10.单价 = ''
this.form10.金额 = '' this.form10.金额 = ''
this.tableData30 = []
this.searchTable20() this.searchTable20()
this.$refs['form10'].resetFields()
searchTable5(this.ArrivalOrderNumber).then(response => { searchTable5(this.ArrivalOrderNumber).then(response => {
this.tableData5 = response.data this.tableData5 = response.data
}) })
@@ -1046,6 +1091,7 @@ export default {
addMateriel(this.ArrivalOrderMXNumber, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组, this.到货重量组, this.到货金额组, this.userId).then(response => { addMateriel(this.ArrivalOrderMXNumber, this.工艺计划流水号组, this.采购计划明细流水号组, this.本次到货数量组, this.离线采购计划明细流水号组, this.到货重量组, this.到货金额组, this.userId).then(response => {
if (response.data[0].result === '1') { if (response.data[0].result === '1') {
this.$message.success('关联成功') this.$message.success('关联成功')
this.tableData30 = []
this.searchTable20() this.searchTable20()
searchTable6(this.ArrivalOrderMXNumber).then(response => { searchTable6(this.ArrivalOrderMXNumber).then(response => {
this.tableData6 = response.data this.tableData6 = response.data

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

@@ -132,9 +132,9 @@
<el-card style="float: left;width: 41.3%;margin-left: 5px"> <el-card style="float: left;width: 41.3%;margin-left: 5px">
<el-table :data="gridData" class="subTableHeader" show-summary stripe border size="mini" style="width: 100%"> <el-table :data="gridData" class="subTableHeader" show-summary stripe border size="mini" style="width: 100%">
<el-table-column width="50" align="center" type="index" label="序号"/> <el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="供应商"> <el-table-column label="到货单编号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.到货单编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100" align="center" label="到货日期"> <el-table-column width="100" align="center" label="到货日期">
@@ -147,11 +147,6 @@
{{ scope.row.到货金额 }} {{ scope.row.到货金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column min-width="100" align="center" label="备注">
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
<el-table-column min-width="100" align="center" label="操作"> <el-table-column min-width="100" align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip effect="dark" content="取消关联" placement="top"> <el-tooltip effect="dark" content="取消关联" placement="top">
@@ -167,12 +162,12 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="1400px"> <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="800px">
<el-form ref="form1" :model="form1" :rules="rules1" label-width="110px"> <el-form ref="form1" :model="form1" :rules="rules1" label-width="110px">
<div style="width: 25%;float: left;margin-top: 5px"> <div style="width: 45%;float: left;margin-top: 5px">
<div style="background: gainsboro"> <div style="background: gainsboro">
<el-form-item label="供应商" prop="supplierNameValue"> <el-form-item label="供应商" prop="supplierNameValue">
<el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;pageCurrent4=1;pageSize4=10;total4=0;searchTable4()"> <el-select v-model="form1.supplierNameValue" placeholder="供应商" size="small" filterable @change="Name=form1.supplierNameValue;searchTable4()">
<el-option <el-option
v-for="item in supplierNames" v-for="item in supplierNames"
:key="item.value" :key="item.value"
@@ -194,29 +189,12 @@
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
<div style="width: 74%;float: left;margin-left: 5px"> <div style="width: 54%;float: left;margin-left: 5px">
<div> <el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="280px" size="mini" highlight-current-row @selection-change="handleSelectionChange">
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="dateRange"
size="small"
type="daterange"
align="center"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
style="width:260px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
</el-tooltip>
</div>
<el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="供应商" align="center"> <el-table-column label="到货单编号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.到货单编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货日期" align="center"> <el-table-column label="到货日期" align="center">
@@ -229,23 +207,7 @@
{{ scope.row.到货金额 }} {{ scope.row.到货金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent4"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize4"
:total="total4"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange4"
@current-change="handleCurrentChange4"/>
</div>
</div> </div>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -255,29 +217,12 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="关联到货单" center style="min-height: 200px" width="45%"> <el-dialog v-el-drag-dialog :visible.sync="dialogVisible" title="关联到货单" center style="min-height: 200px" width="35%">
<div>
<span style="margin-left: 10px">时间段:</span>
<el-date-picker
v-model="dateRange"
size="small"
type="daterange"
align="center"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
range-separator="～"
style="width:260px"
start-placeholder="开始日期"
end-placeholder="结束日期"/>
<el-tooltip :open-delay="1200" effect="dark" content="查询到货单" placement="top">
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
</el-tooltip>
</div>
<el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @selection-change="handleSelectionChange"> <el-table v-loading="" :data="tableData4" border stripe style="max-height: 460px;" height="230px" size="mini" highlight-current-row @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="供应商" align="center"> <el-table-column label="到货单编号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.供应商名称 }} {{ scope.row.到货单编号 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="到货日期" align="center"> <el-table-column label="到货日期" align="center">
@@ -290,23 +235,7 @@
{{ scope.row.到货金额 }} {{ scope.row.到货金额 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
</template>
</el-table-column>
</el-table> </el-table>
<div class="block">
<el-pagination
:current-page="pageCurrent4"
:page-sizes="[10, 20, 30, 40]"
:page-size="pageSize4"
:total="total4"
style="display:inline-block;width:50%"
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange4"
@current-change="handleCurrentChange4"/>
</div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联到货单</el-button> <el-button type="primary" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">关联到货单</el-button>
</div> </div>
@@ -337,9 +266,6 @@ export default {
pageCurrent1: 1, pageCurrent1: 1,
pageSize1: 30, pageSize1: 30,
total1: 0, total1: 0,
pageCurrent4: 1,
pageSize4: 10,
total4: 0,
tableData1: [], tableData1: [],
tableData01: [], tableData01: [],
tableData4: [], tableData4: [],
@@ -436,20 +362,10 @@ export default {
console.log(this.Name) console.log(this.Name)
this.Name ? this.check = 1 : this.check = 0 this.Name ? this.check = 1 : this.check = 0
this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '') this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '')
searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => { searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1]).then(response => {
this.tableData4 = response.data.rows this.tableData4 = response.data
this.total4 = response.data.total
}) })
}, },
handleSizeChange4(val) { // 采购单列表分页
this.pageSize4 = val
this.pageCurrent4 = 1
this.searchTable4()
},
handleCurrentChange4(val) { // 采购单列表分页
this.pageCurrent4 = val
this.searchTable4()
},
searchTable02(row) { // 查看详情（发票包含的合同） searchTable02(row) { // 查看详情（发票包含的合同）
this.发票流水号 = row.发票流水号 this.发票流水号 = row.发票流水号
searchInvoiceDetail(this.发票流水号).then(response => { searchInvoiceDetail(this.发票流水号).then(response => {
@@ -461,6 +377,7 @@ export default {
this.$refs['form1'].resetFields() this.$refs['form1'].resetFields()
} }
this.title1 = '新增备料发票' this.title1 = '新增备料发票'
this.tableData4 = []
this.dialogVisible1 = true this.dialogVisible1 = true
console.log(this.supplierNames) console.log(this.supplierNames)
this.form1.supplierNameValue = '' this.form1.supplierNameValue = ''