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

更新

Browse Source
This commit is contained in:
liushuai
2019-10-06 08:27:27 +08:00
parent 66876d957d
commit 3c48d2583e
9 changed files with 479 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,9 +187,9 @@
<el-input v-model="scope.row.成品尺寸" size="mini" style="width:120px" @change="saveWeight(scope.$index, scope.row)"/>
</template>
</el-table-column>
<el-table-column label="单价" align="center" >
<el-table-column label="单位" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.单价" size="mini" style="width:120px" @change="saveMoney(scope.$index, scope.row)"/>
<el-input v-model="scope.row.单位" size="mini" style="width:120px" @change="saveMoney(scope.$index, scope.row)"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="备注">
@@ -564,11 +564,11 @@ export default {
this.$message.error('请输入正确的单价')
row.单价 = ''
} else {
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价)
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位)
}
},
saveRemarks(index, row) {
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单价)
saveWeight(row.采购计划明细流水号, row.成品尺寸, row.备注1, row.单位)
},
// ///////////////////////////////////////////////////////////////////////////////////////0529新加↑
useqrcode(contractNum) {

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

@@ -81,9 +81,9 @@
{{ scope.row.成品尺寸 }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" >
<el-table-column label="单位" align="center" >
<template slot-scope="scope">
{{ scope.row.单价 }}
{{ scope.row.单位 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="备注">
@@ -95,11 +95,9 @@
</el-card>
<el-card>
<div>
<span>采购单号:</span>
<el-input v-model="purchasingOrder" placeholder="采购单号" size="small" style="margin: 3px 0" clearable/>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
<el-tooltip :open-delay="1200" effect="dark" content="查询采购单" placement="top">
<el-input v-model="Name" placeholder="供应商" size="small" clearable/>
<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>
<el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">新增到货单</el-button>
@@ -125,6 +123,11 @@
{{ scope.row.金额 }}
</template>
</el-table-column>
<el-table-column label="供应商" align="center" min-width="80">
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" min-width="250" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.备注 }}
@@ -228,6 +231,17 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="供应商" prop="supplierNameValue">
<el-select v-model="form.supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable>
<el-option
v-for="item in supplierNames"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注" prop="备注">
<el-input v-model="form.备注" size="small"/>
@@ -254,7 +268,7 @@
</template>
<script>
import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5 } from '@/api/WorkshopProcurement/NewArrivalList.js'
import { searchPurchaseOrder, searchMateriel, addMateriel, searchArriveOrder, addPurchaseOrder, editPurchaseOrder, deletePurchaseOrder, searchTable5, searchSupplier } from '@/api/WorkshopProcurement/NewArrivalList.js'
import { mapGetters } from 'vuex'
export default {
@@ -263,6 +277,8 @@ export default {
purchasingOrder: '',
supplierName0: '',
arrest: [],
check: 0,
Name: '',
tableData2: [],
total2: 0,
pageCurrent2: 1,
@@ -280,8 +296,10 @@ export default {
单位: '',
数量: '',
金额: '',
备注: ''
备注: '',
supplierNameValue: ''
},
supplierNames: [],
dialogVisible: false,
title: '',
rules: { // 采购表单验证规则
@@ -289,7 +307,7 @@ export default {
单位: [{ required: true, message: '请填写单位' }],
数量: [{ required: true, message: '请填写数量' }],
金额: [{ required: true, message: '请填写金额' }],
备注: [{ required: true, message: '请填写备注' }]
supplierNameValue: [{ required: true, message: '请选择供应商' }]
},
工艺计划流水号组: [],
采购计划明细流水号组: []
@@ -332,7 +350,8 @@ export default {
},
// 查询到货单
searchTable4() {
searchArriveOrder(this.pageCurrent4, this.pageSize4).then(response => {
this.Name ? this.check = 1 : this.check = 0
searchArriveOrder(this.check, this.Name, this.pageCurrent4, this.pageSize4).then(response => {
this.tableData4 = response.data.rows
this.total4 = response.data.total
})
@@ -356,13 +375,22 @@ export default {
this.form.数量 = ''
this.form.金额 = ''
this.form.备注 = ''
this.form.supplierNameValue = ''
this.dialogVisible = true
searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
for (let i = 0; i < response.data.length; i++) {
this.supplierNames.push({
label: response.data[i].供应商名称,
value: response.data[i].供应商流水号
})
}
})
},
// 新增
submitAddPurchaseOrder() {
this.$refs['form'].validate((valid) => {
if (valid) {
addPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注).then(response => {
addPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注, this.form.supplierNameValue).then(response => {
if (response.data[0].result === '1') {
this.$message.success('新建到货单成功')
this.pageCurrent4 = 1
@@ -387,12 +415,13 @@ export default {
this.form.数量 = row.数量
this.form.金额 = row.金额
this.form.备注 = row.备注
this.form.supplierNameValue = row.供应商流水号
this.dialogVisible = true
},
submitEditPurchaseOrder() {
this.$refs['form'].validate((valid) => {
if (valid) {
editPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注, this.到货单流水号).then(response => {
editPurchaseOrder(this.form.材料, this.form.单位, this.form.数量, this.form.金额, this.form.备注, this.到货单流水号, this.form.supplierNameValue).then(response => {
if (response.data[0].result === '1') {
this.$message.success('修改到货单成功')
this.searchTable4()

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

@@ -5,23 +5,7 @@
<el-input v-model="invoiceNum" placeholder="发票号" size="small" style="margin: 3px 0;width: 130px" clearable/>
<span style="margin-left: 10px">供应商:</span>
<el-input v-model="supplierName0" placeholder="供应商" size="small" style="width:130px" clearable/>
<span style="margin-left: 10px">传送人:</span>
<el-select v-model="transmitValue" placeholder="传送人" size="small" filterable clearable style="width:130px">
<el-option
v-for="item in selectPerson1"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<span style="margin-left: 10px">接收人:</span>
<el-select v-model="recipientValue" placeholder="接收人" size="small" filterable clearable style="width:130px">
<el-option
v-for="item in selectPerson"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发货信息" placement="top">
<el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发票信息" placement="top">
<el-button
type="success"
size="small"
@@ -34,7 +18,7 @@
size="small"
icon="el-icon-circle-plus-outline"
style="margin-left: 10px"
@click="addTable1()">新增</el-button>
@click="addTable1()">新增发票</el-button>
</el-card>
<el-card>
<el-table v-loading="" :data="tableData1" size="mini" style="margin-top: 3px" height="550px" stripe border highlight-current-row @expand-change="searchTable02">
@@ -42,19 +26,19 @@
<template slot-scope="scope">
<el-table :data="gridData" class="subTableHeader" stripe border size="mini" show-summary style="width: 40%">
<el-table-column width="50" align="center" type="index" label="序号"/>
<el-table-column min-width="150" align="center" label="采购单号">
<el-table-column min-width="150" align="center" label="到货单号">
<template slot-scope="scope">
{{ scope.row.采购单号 }}
{{ 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">
{{ scope.row.采购单名称 }}
{{ scope.row.到货单名称 }}
</template>
</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">
{{ scope.row.总价 }}
{{ scope.row.金额 }}
</template>
</el-table-column>
</el-table>