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-06-13 17:15:04 +08:00
parent fa5f12d664
commit 810b198282
26 changed files with 1476 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/views/PurchasingCenter/CreateInquirySheet/index.vue
View File

@@ -101,6 +101,11 @@
{{ 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 :filters="supplierFilters" :filter-method="filterHandler" label="供货商" align="center" min-width="100" prop="供货商" sortable="custom" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
@@ -786,6 +791,11 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="计量单位" min-width="150">
<template slot-scope="scope">
{{ scope.row.计量单位 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin: 10px 0;">
<el-pagination
@@ -2038,6 +2048,20 @@ export default {
})
},
handleSelectionChange1(val) { // 标准件和外购件多选
this.groupPartNumValue = ''
this.checkeddd = 0
this.materialOldValue = ''
this.materialOld111 = ''
if (val.length === 1) {
this.materialOldValue = val[0].物料流水号
this.materialOld111 = val[0].物料名称 + ' ' + val[0].物料规格 + ' ' + val[0].物料型号
this.groupPartNumValue = val[0].组件零件流水号
if (parseInt(val[0].询价状态编号) === 1 || parseInt(val[0].是否确认) === 1) {
this.checkeddd = 1
} else {
this.checkeddd = 0
}
}
this.groupPartNum = []
this.allNum = []
this.标准件和外购件流水号 = []

93
src/views/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue
View File

@@ -16,38 +16,6 @@
</div>
<!-- <h4 style="margin: 0">发票结算申请单</h4>-->
<el-table id="expandTable" :data="tableData1" border highlight-current-row height="250px" style="width: 100%;height: 330px;overflow:auto" size="mini">
<!-- <el-table-column type="expand">-->
<!-- <template slot-scope="scope">-->
<!-- <el-form label-position="left" inline class="demo-table-expand">-->
<!-- <el-row>-->
<!-- <el-col :lg="10" :sm="12">-->
<!-- <viewer>-->
<!-- <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">-->
<!-- </viewer>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="已付款项">-->
<!-- <span>{{ scope.row.已付款项 }}</span>-->
<!-- </el-form-item><br>-->
<!-- <el-form-item label="尚欠金额">-->
<!-- <span>{{ scope.row.尚欠金额 }}</span>-->
<!-- </el-form-item><br>-->
<!-- <el-form-item label="备注">-->
<!-- <span>{{ scope.row.备注 }}</span>-->
<!-- </el-form-item><br>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="是否费用类发票">-->
<!-- <span>{{ scope.row.是否费用类 }}</span>-->
<!-- </el-form-item><br>-->
<!-- <el-form-item label="税额">-->
<!-- <span>{{ scope.row.税额 }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- </el-form>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="供应商" align="center" width="180" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供应商名称 }}
@@ -63,7 +31,7 @@
{{ scope.row.发票金额 }}
</template>
</el-table-column>
<el-table-column label="申请人" align="center" min-width="80">
<el-table-column label="申请人" align="center" min-width="90">
<template slot-scope="scope">
{{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
</template>
@@ -118,24 +86,18 @@
{{ scope.row.审批2未过原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100" fixed="right">
<template slot-scope="scope">
<el-button type="text" @click="cancel(scope.row)">撤回</el-button>
</template>
</el-table-column>
</el-table>
<!-- <div class="block" style="margin-top: 10px;">-->
<!-- <el-pagination-->
<!-- :current-page="pageCurrent1"-->
<!-- :page-sizes="[10, 20, 30, 40]"-->
<!-- :page-size="pageSize1"-->
<!-- :total="total1"-->
<!-- style="display:inline-block;width:50%"-->
<!-- layout="total, sizes, prev, pager, next, jumper"-->
<!-- @size-change="handleSizeChange1"-->
<!-- @current-change="handleCurrentChange1"/>-->
<!-- </div>-->
</el-card>
</div>
</template>
<script>
import { searchTable1, searchSupplier } from '@/api/PurchasingCenter/InvoiceSettlementApproveSearch'
import { cancel, searchTable1, searchSupplier } from '@/api/PurchasingCenter/InvoiceSettlementApproveSearch'
import { mapGetters } from 'vuex'
import { readFile } from '@/utils/request'
import request from '@/utils/request'
@@ -170,8 +132,47 @@ export default {
this.searchSupplier()
},
methods: {
cancel(row) {
console.log(row, 'row')
if (Number(this.token) === 18) {
cancel(row.发票结算申请单流水号, this.token).then(response => {
if (response.data[0].result === '1') {
this.$message.success('撤回成功')
this.searchTable1()
} else {
this.$message.error('撤回失败')
}
})
} else if (Number(this.token) === 4) {
if (row.审批3流水号 === '3') {
cancel(row.发票结算申请单流水号, this.token).then(response => {
if (response.data[0].result === '1') {
this.$message.success('撤回成功')
this.searchTable1()
} else {
this.$message.error('撤回失败')
}
})
} else {
this.$message.error('已进行财务审批，无法撤回！')
}
} else if (Number(this.token) === 2) {
if (row.审批4流水号 === '3') {
cancel(row.发票结算申请单流水号, this.token).then(response => {
if (response.data[0].result === '1') {
this.$message.success('撤回成功')
this.searchTable1()
} else {
this.$message.error('撤回失败')
}
})
} else {
this.$message.error('总经理已审批，无法撤回！')
}
}
},
fetchData() {
// console.log(this.token)
console.log(this.token, 'token')
},
searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')

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

@@ -110,7 +110,7 @@
<el-table
v-loading="loading"
:data="tableData"
style="width: 1200px;margin-top: 3px"
style="width: 1300px;margin-top: 3px"
height="600"
size="mini"
highlight-current-row
@@ -131,6 +131,11 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="计量单位" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.计量单位 }}
</template>
</el-table-column>
<el-table-column align="center" label="供货商" width="132px" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.供货商 }}

10
src/views/PurchasingCenter/MaterialManagement/index.vue
View File

@@ -100,6 +100,11 @@
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column align="center" label="计量单位" prop="计量单位">
<template slot-scope="scope">
{{ scope.row.计量单位 }}
</template>
</el-table-column>
<el-table-column align="center" label="供货商" prop="供货商">
<template slot-scope="scope">
{{ scope.row.供货商 }}
@@ -283,7 +288,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel('form')">取消</el-button>
<el-button v-show="title==='增加'" type="primary" @click="submitAdd('form')">确定</el-button>
<el-button v-show="title==='增加'" :disabled="Material_loading" type="primary" @click="submitAdd('form')">确定</el-button>
<el-button v-show="title==='编辑'" type="primary" @click="submitEdit('form')">确定</el-button>
</div>
</el-dialog>
@@ -475,6 +480,7 @@ import { mapGetters } from 'vuex'
export default {
data() {
return {
Material_loading: false,
打回原因: '',
物料流水号: '',
tableData5: [],
@@ -771,6 +777,7 @@ export default {
})
},
handleAdd() {
this.Material_loading = false
this.supplierValue1 = ''
this.MaterialCategory1 = []
this.MaterialVariety1 = []
@@ -778,6 +785,7 @@ export default {
this.addForm('form', [this.dialogFormVisible1 = true, this.title = '增加'])
},
submitAdd() { // 提交增加
this.Material_loading = true
this.addTable(addData, [this.form.物料品种流水号, this.form.物料名称, this.form.物料全名, this.form.物料规格, this.form.物料型号, this.form.计量单位流水号, this.form.物料来源流水号, this.form.GonghuoshangValue], 'form', function() {
this.dialogFormVisible1 = false
this.searchMaterial()

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

@@ -352,9 +352,9 @@
{{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
</template>
</el-table-column>
<el-table-column label="采购数" align="center" width="80">
<el-table-column label="采购数" align="center" width="100">
<template slot-scope="scope">
<el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:100px" @change="saveContract()"/>
<el-input v-direction="{x: 0, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.数量" :disabled="disable" size="mini" style="width:80px" @change="saveContract()"/>
<b v-else>{{ scope.row.数量 }}</b>
</template>
</el-table-column>

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

@@ -58,8 +58,8 @@
<!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
<span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
<span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
<span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
</template>
</el-table-column>
<el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip fixed="left">