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.112:10010/r/高精2.0

Browse Source
This commit is contained in:
chenjianan
2018-12-18 17:31:15 +08:00
parent 4364515a3a c19db43ec5
commit 7e6b381931
18 changed files with 1625 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/api/Inventory/PartsReplacement.js
View File

@@ -10,6 +10,17 @@ export function initProject() {
}
})
}
// 查询仓库
export function initWarehouse() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '库存管理_货位仓库_仓库_查询数据'
}
})
}
// 机床查询
export function searchmachine(check, num) {
return request({
@@ -75,14 +86,14 @@ export function searchReplacementCard(pageCurrent, pageSize, card_check, card) {
})
}
// 补投增加
export function addReplacementCard(Number) {
export function addReplacementCard(Number, house) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_补投单_补投单增加',
param: '人员编号=' + Number
param: '人员编号=' + Number + '&仓库流水号=' + house
}
})
}
@@ -99,14 +110,14 @@ export function deleteReplacementCard(Number) {
})
}
// 补投增加
export function addCardDetail(Number, project, machine, team, mun, reason) {
export function addCardDetail(Number, project, machine, team, name, mass, locate, parttype, reason) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '库存管理_仓库补投_补投单明细增加',
param: '补投单流水号=' + Number + '&项目流水号=' + project + '&机床流水号=' + machine + '&组件流水号=' + team + '&补投数量=' + mun + '&原因=' + reason
name: '库存管理_零件补投_批量增加补投单明细',
param: '补投单流水号=' + Number + '&项目流水号组=' + project + '&机床流水号组=' + machine + '&组件流水号组=' + team + '&名称组=' + name + '&数量组=' + mass + '&货位流水号组=' + locate + '&零件类型组=' + parttype + '&原因组=' + reason
}
})
}

2
src/api/ManufacturingCenter/ProcessTaskAssignment.js
View File

@@ -129,7 +129,7 @@ export function initPerson() {
data: {
type: '1',
name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
param: '考核部门编号=17'
param: '考核部门编号=9'
}
})
}

21
src/api/ManufacturingCenter/WorkshopEquipmentManagement.js
View File

@@ -56,3 +56,24 @@ export function deleteTable(number) {
}
})
}
export function setUp(time) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_新排产算法_设备能力_系数有效时间设定',
param: '系数有效时间=' + time
}
})
}
export function generate() {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间生产管理工艺_新排产算法_设备加工能力_生成设备能力表'
}
})
}

70
src/api/WorkshopProcurement/CreatingProcurementContracts.js
View File

@@ -1,16 +1,5 @@
import request from '@/utils/request'
// 初始化付款方式
export function initPayMethod() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_付款方式_查询数据'
}
})
}
// 查询合同模板
export function searchContractDemo(num1 = null) {
return request({
@@ -77,17 +66,6 @@ export function update(num, time, remarks) {
}
})
}
// 初始化付款时间节点
export function initPayTimeNode() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_付款时间节点_查询数据'
}
})
}
// 查询供应商
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({
@@ -100,54 +78,6 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
}
})
}
// 查询询价单列表 表1
export function searchInquirySheet(check1, value1, check2, value2, check3, id) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_询价单_查询数据',
param: `供应商流水号_check=${check1}&供应商流水号=${value1}&询价单编号_check=${check2}&询价单编号=${value2}&采购员流水号_check=${check3}&采购员流水号=${id}`
}
})
}
// 根据询价单流水号查询询价单详情
export function searchSheetDetail(num2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_询价单明细_查询数据',
param: '询价单流水号_check=1&询价单流水号=' + num2
}
})
}
// 移出询价单1
export function outInquirySheet(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_询价单明细_删除数据',
param: '询价单流水号=' + num1 + '&组件零件流水号=' + num2
}
})
}
// 根据询价单流水号查询询价单详情(合同内容)
export function searchSheetContract(num1) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_询价单明细_查询数据_根据询价单',
param: '询价单流水号=' + num1
}
})
}
// 生成采购合同
export function doneContract(num1, RequisitionNumber, name1, time1, time2, num2, text, freight, num3, partsNum, priceGroup, taxGroup, currency, num4, id, AdvanceCharge) {
return request({

12
src/api/WorkshopProcurement/ReceiptConnectionSheet.js
View File

@@ -14,38 +14,38 @@ export function searchInvoice(pageCurrent, pageSize, check1, num1, check2, time,
})
}
// 发票增加
export function addInvoice(num1, num2, time1, money, send, receive, remark, time2) {
export function addInvoice(num1, num2, time1, money, send, receive, remark, time2, money1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_发票_增加数据',
param: '采购合同流水号=' + num1 + '&发票号=' + num2 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark + '&操作时间=' + time2 + '&identity_receiptLiushuihao=1=int=output'
param: '采购合同流水号=' + num1 + '&发票号=' + num2 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark + '&扣除金额=' + money1 + '&操作时间=' + time2 + '&identity_receiptLiushuihao=1=int=output'
}
})
}
// 发票编辑
export function editInvoice(num1, num2, num3, time1, money, send, receive, remark) {
export function editInvoice(num1, num2, num3, time1, money, send, receive, remark, money1) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_发票_修改数据',
param: '发票流水号=' + num1 + '&采购合同流水号=' + num2 + '&发票号=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark
param: '发票流水号=' + num1 + '&采购合同流水号=' + num2 + '&发票号=' + num3 + '&开票时间=' + time1 + '&开票金额=' + money + '&传送人=' + send + '&接收人=' + receive + '&备注=' + remark + '&扣除金额=' + money1
}
})
}
// 发票删除
export function deleteInvoice(num1) {
export function deleteInvoice(num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_发票_删除数据',
param: '发票流水号=' + num1
param: '发票流水号=' + num1 + '&采购合同流水号=' + num2
}
})
}

2
src/vendor/exportExcel.js vendored
View File

@@ -20,7 +20,7 @@ export function Cleanup() {
}
const tableToExcel = (function() {
const uri = 'data:application/vnd.ms-excel;base64,'
const template = '<html><head><meta charset="UTF-8"></head><body><table border>{table}</table></body></html>'
const template = `<html xmlns:x="urn:schemas-microsoft-com:office:excel"><head><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><meta charset="UTF-8"><style type="text/css">table td {border: 2px solid #000000;width:100px;text-align: center;color: #000000;}</style></head><body><table>{table}</table></body></html>`
const base64 = function(s) { return window.btoa(unescape(encodeURIComponent(s))) }
const format = function(s, c) {
return s.replace(/{(\w+)}/g,

115
src/views/Inventory/PartsReplacement/index.vue
View File

@@ -1,6 +1,14 @@
<template>
<div class="app-container">
<el-card>
<el-radio-group
v-model="radio"
size="small"
style="margin: 10px;"
@change="BasicShow()">
<el-radio v-model="radio" :label="1" >修改记录</el-radio>
<el-radio v-model="radio" :label="2" style="margin-left: 2px" >异常记录</el-radio>
</el-radio-group>
<span style="margin-left: 20px">项目名称:</span>
<el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
<el-option
@@ -25,14 +33,6 @@
:label="item.label"
:value="item.value"/>
</el-select>
<span>仓库:</span>
<el-select v-model="purchaseStateValue" placeholder="仓库" size="small">
<el-option
v-for="item in purchaseState"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
<el-button
type="success"
size="small"
@@ -40,7 +40,7 @@
style="margin-left: 10px"
@click="pageCurrent=1;pageSize=10;total=0;getAlterRecord()">查询</el-button>
</el-card>
<el-card>
<el-card v-show="altershow">
<el-table
v-loading="loading1"
:data="tableData1"
@@ -50,32 +50,37 @@
size="mini"
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/>
<el-table-column label="项目名称" min-width="200" align="center">
<el-table-column label="项目名称" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" min-width="200" align="center">
<el-table-column label="机床图号" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" min-width="200" align="center">
<el-table-column label="组号" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="数量" min-width="200" align="center">
<el-table-column label="名称" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.供货商 }}
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="数量" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="修改原因" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.当前库存量 }}
{{ scope.row.修改原因 }}
</template>
</el-table-column>
<el-table-column label="姓名" min-width="100" align="center">
<el-table-column label="记录人" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
@@ -85,6 +90,16 @@
{{ scope.row.修改日期 }}
</template>
</el-table-column>
<el-table-column label="仓库" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column label="零件类型" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
</template>
</el-table-column>
</el-table>
<div class="block" style="margin-top: 10px;">
<el-pagination
@@ -97,6 +112,8 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card v-show="errorshow">
<el-table
v-loading="loading1"
:data="tableData2"
@@ -106,22 +123,27 @@
size="mini"
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55"/>
<el-table-column label="项目名称" min-width="200" align="center">
<el-table-column label="项目名称" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="机床图号" min-width="200" align="center">
<el-table-column label="机床图号" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.机床图号 }}
</template>
</el-table-column>
<el-table-column label="组号" min-width="200" align="center">
<el-table-column label="组号" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.组号 }}
</template>
</el-table-column>
<el-table-column label="异常数量" min-width="200" align="center">
<el-table-column label="名称" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.名称 }}
</template>
</el-table-column>
<el-table-column label="异常数量" min-width="50" align="center">
<template slot-scope="scope">
{{ scope.row.异常数量 }}
</template>
@@ -131,9 +153,19 @@
{{ scope.row.异常原因 }}
</template>
</el-table-column>
<el-table-column label="货位流水号" min-width="100" align="center">
<el-table-column label="仓库" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.货位流水号 }}
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column label="记录时间" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.记录时间 }}
</template>
</el-table-column>
<el-table-column label="零件类型" min-width="100" align="center">
<template slot-scope="scope">
{{ scope.row.类型名称 }}
</template>
</el-table-column>
</el-table>
@@ -202,9 +234,15 @@
{{ scope.row.补投时间 }}
</template>
</el-table-column>
<el-table-column label="仓库名称" align="center" min-width="250">
<template slot-scope="scope">
{{ scope.row.仓库名称 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="280" fixed="right">
<template slot-scope="scope">
<el-button :disabled="parseInt(scope.row.离线合同状态) === 1" type="danger" size="mini" icon="el-icon-delete" @click="deleteOfflineContract(scope.row)">作废</el-button>
<el-button type="warning" size="mini" icon="el-icon-download" @click="doneRequestCard()">传递</el-button>
</template>
</el-table-column>
</el-table>
@@ -218,7 +256,6 @@
layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange3"
@current-change="handleCurrentChange3"/>
<el-button style="margin-left:500px;" type="warning" size="mini" icon="el-icon-download" @click="doneRequestCard()">传递</el-button>
</div>
<el-table v-loading="" :data="tableData4" border style="max-height: 300px;" height="300px" size="mini">
<el-table-column label="离线请购单编号" align="center" min-width="150">
@@ -257,7 +294,7 @@
</template>
<script>
import { initProject, searchmachine, searchTeam, searchAlterRecord, searchErrorRecord, searchReplacementCard, addReplacementCard } from '@/api/Inventory/PartsReplacement'
import { initProject, searchmachine, searchTeam, searchAlterRecord, searchErrorRecord, searchReplacementCard, addReplacementCard, initWarehouse } from '@/api/Inventory/PartsReplacement'
import { mapGetters } from 'vuex'
export default {
data() {
@@ -290,7 +327,12 @@ export default {
GroupNumValue_check: '',
repleacecard: '',
repleacecard_check: '',
people: ''
people: '',
HouseNumber: '',
House: [],
radio: '',
altershow: true,
errorshow: false
}
},
computed: {
@@ -301,12 +343,24 @@ export default {
created() {
this.fetchData()
this.getpeopleid()
this.getHouse()
},
methods: {
// 获取人员编号
getpeopleid() {
this.people = this.id
},
getHouse() {
initWarehouse().then(response => { // 初始化仓库
console.log(response)
for (let i = 0; i < response.data.length; i++) {
this.House.push({
label: response.data[i].仓库名称,
value: response.data[i].仓库流水号
})
}
})
},
fetchData() {
this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
},
@@ -424,7 +478,7 @@ export default {
})
},
addCard() {
addReplacementCard(this.people).then(response => {
addReplacementCard(this.people, this.HouseNumber).then(response => {
if (response.data[0].result === '1') {
this.$message.success('增加成功')
this.getReplacement()
@@ -432,6 +486,15 @@ export default {
this.$message.error('删除失败')
}
})
},
BasicShow() {
if (this.radio === 1) {
this.altershow = true
this.errorshow = false
} else if (this.radio === 2) {
this.altershow = false
this.errorshow = true
}
}
}
}

2
src/views/ManufacturingCenter/InitialProduction/index.vue
View File

@@ -86,7 +86,7 @@
</el-col>
<el-col :span="1" class="line">～</el-col>
<el-col :span="11">
<el-date-picker :default-time="['12:00:00']" v-model="time_machiningFinish" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
<el-date-picker v-model="time_machiningFinish" default-time="23:59:59" size="small" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" style="margin-bottom:20px;width:200px"/>
</el-col>
</el-form-item>
</el-form>

11
src/views/ManufacturingCenter/PartAssignment/index.vue
View File

@@ -717,7 +717,8 @@ export default {
},
purchaseRequisition() {
if (this.RequisitionList !== '') {
if (this.time !== '') {
console.log(this.time)
if (this.time !== '' && this.time !== null) {
if (this.BasicPartsNumber.length !== 0 || this.StandardPartsAndOutsourcing.length !== 0) {
this.result = 0
if (this.PartType === '基本件') {
@@ -794,7 +795,7 @@ export default {
}
},
PurchasingDepartment() {
if (this.time !== '') {
if (this.time !== '' && this.time !== null) {
if (this.BasicPartsNumber.length !== 0 || this.StandardPartsAndOutsourcing.length !== 0) {
if (this.PartType === '基本件') {
purchaseRequisition2(this.projectFloatValue, this.machineFloatValue, this.groupFloatValue, this.BasicPartsNumber, this.NumberOfParts, this.time).then(response => {
@@ -813,11 +814,11 @@ export default {
this.tableData6 = response.data
})
} else {
this.$message.success('请购失败')
this.$message.error('请购失败')
}
})
} else {
PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing, this.time, this.MaterialNum, this.NumberOfParts, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
PurchasingDepartment(this.groupFloatValue, this.StandardPartsAndOutsourcing, this.time, this.MaterialNum, this.NumberOfParts, this.projectFloatValue, this.machineFloatValue).then(response => {
if (response.data[0].result !== '0') {
this.$message.success('请购成功')
if (this.PartType === '外购件') {
@@ -830,7 +831,7 @@ export default {
})
}
} else {
this.$message.success('请购失败')
this.$message.error('请购失败')
}
})
}

32
src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
View File

@@ -77,6 +77,17 @@
@current-change="handleCurrentChange"/>
</div>
</el-card>
<el-card>
<span>有效时间：</span>
<el-date-picker
v-model="time"
type="date"
size="small"
value-format="yyyy-MM-dd"
placeholder="选择日期"/>
<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
</el-card>
<el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px" class="demo-ruleForm">
@@ -163,13 +174,14 @@
</template>
<script>
import { getData, initProcessing, addTable, editTable, deleteTable } from '@/api/ManufacturingCenter/WorkshopEquipmentManagement'
import { getData, initProcessing, addTable, editTable, deleteTable, setUp, generate } from '@/api/ManufacturingCenter/WorkshopEquipmentManagement'
export default {
data() {
return {
equipmentName: '', // 设备名称
List: [],
check: 0,
time: '',
pageCurrent: 1,
pageSize: 10,
total: null,
@@ -348,6 +360,24 @@ export default {
})
})
},
setUp() {
if (this.time !== '') {
setUp(this.time).then(response => {
if (response.data[0].result === '1') {
this.$message.success('设定成功')
} else { this.$message.error('设定失败') }
})
} else {
this.$message.warning('请选择有效时间')
}
},
generate() {
generate().then(response => {
if (response.data[0].result === '1') {
this.$message.success('生成成功')
} else { this.$message.error('生成失败') }
})
},
handleSizeChange(val) {
this.pageSize = val
this.pageCurrent = 1

32
src/views/MarketingCenter/PerformanceBond/index.vue
View File

@@ -198,21 +198,23 @@
</el-table>
</el-tab-pane>
<el-tab-pane :disabled="performanceGuaranteeDisabled" label="履约保函" name="second">
<el-button type="danger" icon="el-icon-delete" size="small" style="float: right" @click="delPerformanceGuarantee">删除</el-button>
<div v-show="performanceGuaranteeShow" style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
<el-upload
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove"
:file-list="fileList"
:before-upload="beforeUpload"
:on-success="onSuccess"
:action="'http://localhost:8411/submit/upload3.ashx?ProjectId='+ projectId"
list-type="picture-card">
<i class="el-icon-plus"/>
</el-upload>
<el-dialog :visible.sync="dialogVisible">
<img :src="dialogImageUrl" width="100%" alt="">
</el-dialog>
<div v-show="performanceGuaranteeShow">
<el-button type="danger" icon="el-icon-delete" size="small" style="float: right;display: inline-block" @click="delPerformanceGuarantee">删除</el-button>
<div style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
<el-upload
:on-preview="handlePictureCardPreview"
:on-remove="handleRemove"
:file-list="fileList"
:before-upload="beforeUpload"
:on-success="onSuccess"
:action="'http://localhost:8411/submit/upload3.ashx?ProjectId='+ projectId"
list-type="picture-card">
<i class="el-icon-plus"/>
</el-upload>
<el-dialog :visible.sync="dialogVisible">
<img :src="dialogImageUrl" width="100%" alt="">
</el-dialog>
</div>
</div>
</el-tab-pane>
</el-tabs>

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

@@ -67,13 +67,6 @@
<el-input v-model="name" size="small" readonly/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="运费">
<el-input v-model="freight" size="small"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="税率">
<el-input v-model="taxRate" size="small"/>

13
src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
View File

@@ -49,9 +49,14 @@
{{ scope.row.到票总金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="扣款总金额" min-width="100px">
<template slot-scope="scope">
{{ scope.row.扣款总金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="到票情况" min-width="200px">
<template slot-scope="scope">
<el-progress :text-inside="true" :stroke-width="18" :percentage="100*(scope.row.到票总金额/scope.row.合同总金额).toFixed(2)" status="success"/>
<el-progress :text-inside="true" :stroke-width="18" :percentage="100*(scope.row.到票总金额/scope.row.剩余总金额).toFixed(2)" status="success"/>
</template>
</el-table-column>
</el-table>
@@ -82,6 +87,11 @@
{{ scope.row.开票金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="扣除金额" min-width="100px">
<template slot-scope="scope">
{{ scope.row.扣除金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="传送人" min-width="80px">
<template slot-scope="scope">
{{ scope.row.传送人姓名 }}
@@ -171,6 +181,7 @@ export default {
this.contractNum ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0
searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => {
console.log(response.data.rows)
this.tableData1 = response.data.rows
this.total1 = response.data.total
})

1262
src/views/WorkshopProcurement/OutsourcingProcessPlanning/index.vue Normal file
View File

File diff suppressed because it is too large Load Diff

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

@@ -74,7 +74,7 @@
<el-progress
:text-inside="true"
:stroke-width="18"
:percentage="100*((scope.row.总金额 - scope.row.欠款金额)/scope.row.总金额).toFixed(4)"
:percentage="(parseInt(10000*(scope.row.总金额 - scope.row.欠款金额)/scope.row.总金额)) / 100"
status="success"/>
</template>
</el-table-column>

14
src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
View File

@@ -34,17 +34,17 @@
height="300px"
highlight-current-row
@row-click="searchTable2">
<el-table-column label="采购合同号" align="center" width="250">
<el-table-column label="采购合同号" align="center">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column label="采购合同名称" align="center" width="100">
<el-table-column label="采购合同名称" align="center">
<template slot-scope="scope">
{{ scope.row.采购合同名称 }}
</template>
</el-table-column>
<el-table-column label="规定到货时间" align="center" width="100">
<el-table-column label="规定到货时间" align="center">
<template slot-scope="scope">
{{ scope.row.规定到货时间 }}
</template>
@@ -54,22 +54,22 @@
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="采购员" align="center" width="70">
<el-table-column label="采购员" align="center">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="总金额" align="center" width="80">
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" align="center" width="200">
<el-table-column label="预付款" align="center">
<template slot-scope="scope">
{{ scope.row.预付款 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
</template>

271
src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
View File

@@ -43,17 +43,17 @@
height="300px"
highlight-current-row
@row-click="searchTable2">
<el-table-column label="采购合同号" align="center" width="250">
<el-table-column label="采购合同号" align="center">
<template slot-scope="scope">
{{ scope.row.采购合同编号 }}
</template>
</el-table-column>
<el-table-column label="采购合同名称" align="center" width="100">
<el-table-column label="采购合同名称" align="center">
<template slot-scope="scope">
{{ scope.row.采购合同名称 }}
</template>
</el-table-column>
<el-table-column label="规定到货时间" align="center" width="100">
<el-table-column label="规定到货时间" align="center">
<template slot-scope="scope">
{{ scope.row.规定到货时间 }}
</template>
@@ -63,33 +63,34 @@
{{ scope.row.供应商名称 }}
</template>
</el-table-column>
<el-table-column label="采购员" align="center" width="70">
<el-table-column label="采购员" align="center">
<template slot-scope="scope">
{{ scope.row.姓名 }}
</template>
</el-table-column>
<el-table-column label="总金额" align="center" width="80">
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" align="center" width="200">
<el-table-column label="预付款" align="center">
<template slot-scope="scope">
{{ scope.row.预付款 }}
</template>
</el-table-column>
<el-table-column label="审批情况" align="center" width="100">
<el-table-column label="审批情况" align="center">
<template slot-scope="scope">
{{ scope.row.审批情况内容 }}
</template>
</el-table-column>
<el-table-column label="未通过原因" align="center" width="100">
<el-table-column label="未通过原因" align="center">
<template slot-scope="scope">
{{ scope.row.未通过原因 }}
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="100">
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="warning" size="mini" @click="exportTable('100')">导出</el-button>
<el-button type="danger" size="mini" @click="Disable(scope.row)">禁用</el-button>
</template>
</el-table-column>
@@ -110,131 +111,133 @@
<el-card>
<div style="width:900px;margin-left: 350px">
<el-card>
<table id="1" cellspacing="0px" align="center" border width="100%" style="">
<tr style="height: 40px">
<td colspan="1" align="center" style="font-weight: bold">GAOJING</td>
<td colspan="3" align="center" style="font-weight: bold">产品销售合同</td>
</tr>
<tr style="height: 40px">
<td colspan="1" align="center">需方</td>
<td colspan="1" align="center">江苏高精机电装备有限公司</td>
<td colspan="1" align="center">合同编号</td>
<td colspan="1" align="center">{{ contract }}</td>
</tr>
<tr style="height: 40px">
<td colspan="1" align="center">供方</td>
<td colspan="1" align="center">{{ supplier }}</td>
<td colspan="1" align="center">签订地点</td>
<td colspan="1" align="center">江苏盐城</td>
</tr>
</table>
<div style="margin-top: 20px;line-height: 25px">根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。</div>
<div style="line-height: 25px">一、 产品名称、规格型号、材质、数量、单价和交货期：</div>
<table id="50" cellspacing="0px" align="center" border width="100%" style="">
<tbody id="51">
<tr id="tableHead1" style="height: 40px">
<td colspan="2" align="center">零件名称</td>
<td colspan="1" align="center">零件图号</td>
<td colspan="1" align="center">材料</td>
<td colspan="1" align="center">交货期</td>
<td colspan="1" align="center">备注</td>
<td colspan="1" align="center">数量</td>
<td colspan="1" align="center">单价</td>
<td colspan="1" align="center">总价</td>
</tr>
</tbody>
</table>
<hr>
<table id="2" cellspacing="0px" align="center" border width="100%" style="">
<tbody id="4">
<tr id="tableHead" style="height: 40px">
<td colspan="2" align="center">物料名称</td>
<td colspan="1" align="center">物料规格</td>
<td colspan="1" align="center">物料型号</td>
<td colspan="1" align="center">交货期</td>
<td colspan="1" align="center">备注</td>
<td colspan="1" align="center">数量</td>
<td colspan="1" align="center">单价</td>
<td colspan="1" align="center">总价</td>
</tr>
</tbody>
<tfoot>
<div id="100">
<table id="1" cellspacing="0px" align="center" border width="100%" style="">
<tr style="height: 40px">
<td colspan="8">总价: (人民币){{ RMB }}(未税) </td>
<td colspan="1" align="center">{{ TotalAmount }}</td>
<td colspan="3" align="center" style="font-weight: bold">GAOJING</td>
<td colspan="5" align="center" style="font-weight: bold">产品销售合同</td>
</tr>
<tr style="height: 40px">
<td colspan="8">总价: (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
<td colspan="1" align="center">{{ TotalAmount1 }}</td>
<td colspan="2" align="center">需方</td>
<td colspan="2" align="center">江苏高精机电装备有限公司</td>
<td colspan="2" align="center">合同编号</td>
<td colspan="2" align="center">{{ contract }}</td>
</tr>
</tfoot>
</table>
<div style="line-height: 25px">以上价格为含税增值税价格，供方开具真实有效的16%增值税发票</div>
<div id="23" style="line-height: 25px"/>
<table id="66" cellspacing="0px" align="center" border width="100%" style="margin-top: 30px">
<tbody id="67">
<tr style="height: 35px">
<td colspan="4" align="center">供 方</td>
<td colspan="4" align="center">需 方</td>
<tr style="height: 40px">
<td colspan="2" align="center">供方</td>
<td colspan="2" align="center">{{ supplier }}</td>
<td colspan="2" align="center">签订地点</td>
<td colspan="2" align="center">江苏盐城</td>
</tr>
<tr style="height: 35px">
<th style="width: 15%">单位名称（章）</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">单位名称（章）</th>
<td style="width: 35%" colspan="3" align="center">江苏高精</td>
</tr>
<tr style="height: 35px">
<th style="width: 15%">法定代表人</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">法定代表人</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">委托代理人</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">委托代理人</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">电话</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">电话</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">传真</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">传真</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">开户银行</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">开户银行</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">账号</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">账号</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">税号</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">税号</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">邮政编码</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">邮政编码</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
</tbody>
</table>
<div style="line-height: 25px;margin-top: 10px">签订时间：____年__月__日</div>
<div style="line-height: 25px">有效期限：____年__月__日至____年__月__日</div>
</table>
<div style="margin-top: 20px;line-height: 25px">根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。</div>
<div style="line-height: 25px">一、 产品名称、规格型号、材质、数量、单价和交货期：</div>
<table id="50" cellspacing="0px" align="center" border width="100%" style="">
<tbody id="51">
<tr id="tableHead1" style="height: 40px">
<td colspan="1" align="center">零件名称</td>
<td colspan="1" align="center">零件图号</td>
<td colspan="1" align="center">材料</td>
<td colspan="1" align="center">交货期</td>
<td colspan="1" align="center">备注</td>
<td colspan="1" align="center">数量</td>
<td colspan="1" align="center">单价</td>
<td colspan="1" align="center">总价</td>
</tr>
</tbody>
</table>
<hr>
<table id="2" cellspacing="0px" align="center" border width="100%" style="">
<tbody id="4">
<tr id="tableHead" style="height: 40px">
<td colspan="1" align="center">物料名称</td>
<td colspan="1" align="center">物料规格</td>
<td colspan="1" align="center">物料型号</td>
<td colspan="1" align="center">交货期</td>
<td colspan="1" align="center">备注</td>
<td colspan="1" align="center">数量</td>
<td colspan="1" align="center">单价</td>
<td colspan="1" align="center">总价</td>
</tr>
</tbody>
<tfoot>
<tr style="height: 40px">
<td colspan="7">总价: (人民币){{ RMB }}(未税) </td>
<td colspan="1" align="center">{{ TotalAmount }}</td>
</tr>
<tr style="height: 40px">
<td colspan="7">总价: (人民币){{ RMB1 }}(含{{ taxRate }}增值税) </td>
<td colspan="1" align="center">{{ TotalAmount1 }}</td>
</tr>
</tfoot>
</table>
<div style="line-height: 25px">以上价格为含税增值税价格，供方开具真实有效的16%增值税发票</div>
<div id="23"/>
<table id="66" cellspacing="0px" align="center" border width="100%" style="margin-top: 30px">
<tbody id="67">
<tr style="height: 35px">
<td colspan="4" align="center">供 方</td>
<td colspan="4" align="center">需 方</td>
</tr>
<tr style="height: 35px">
<th style="width: 15%">单位名称（章）</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">单位名称（章）</th>
<td style="width: 35%" colspan="3" align="center">江苏高精</td>
</tr>
<tr style="height: 35px">
<th style="width: 15%">法定代表人</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">法定代表人</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">委托代理人</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">委托代理人</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">电话</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">电话</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">传真</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">传真</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">开户银行</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">开户银行</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">账号</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">账号</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">税号</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">税号</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
<tr style="height: 35px">
<th style="width: 15%">邮政编码</th>
<td style="width: 35%" colspan="3" align="center"/>
<th style="width: 15%">邮政编码</th>
<td style="width: 35%" colspan="3" align="center"/>
</tr>
</tbody>
</table>
<div style="line-height: 25px;margin-top: 10px">签订时间：____年__月__日</div>
<div style="line-height: 25px">有效期限：____年__月__日至____年__月__日</div>
</div>
</el-card>
</div>
</el-card>
@@ -279,6 +282,7 @@
<script>
import { initContract, initBuyer, searchTable1, searchTable2, searchTable3, Disable } from '@/api/WorkshopProcurement/ProcurementContractEnquiry'
import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
export default {
data() {
@@ -418,6 +422,11 @@ export default {
})
})
},
exportTable(tableid) {
getExplorer()
method5(tableid)
Cleanup()
},
handleSizeChange1(val) {
this.pageCurrent1 = 1
this.pageSize1 = val
@@ -452,7 +461,7 @@ export default {
for (let i = 0; i < this.returns.length; i++) {
tr[i] = document.createElement('tr')
tr[i].setAttribute('class', 'tableData')
tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
'<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
document.getElementById('tableHead').after(tr[i])
}
@@ -480,7 +489,7 @@ export default {
for (let i = 0; i < this.returns1.length; i++) {
tr[i] = document.createElement('tr')
tr[i].setAttribute('class', 'tableData1')
tr[i].innerHTML = '<td colspan="2" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
tr[i].innerHTML = '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' +
'<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>' + '<td colspan="1" align="center"></td>'
document.getElementById('tableHead1').after(tr[i])
}

17
src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
View File

@@ -88,6 +88,11 @@
{{ scope.row.总金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="扣除金额" min-width="100px">
<template slot-scope="scope">
{{ scope.row.扣除金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="传送人" min-width="80px">
<template slot-scope="scope">
{{ scope.row.传送人姓名 }}
@@ -154,6 +159,9 @@
<el-form-item label="开票金额" prop="money">
<el-input v-model="form1.money" size="small" placeholder="开票金额"/>
</el-form-item>
<el-form-item label="扣除金额" prop="money">
<el-input v-model="form1.money1" size="small" placeholder="扣除金额"/>
</el-form-item>
<el-form-item label="传送人" prop="sendPerson">
<el-select v-model="form1.sendPersonValue" placeholder="传送人" size="small" disabled filterable clearable style="width:100px">
<el-option
@@ -218,6 +226,7 @@ export default {
invoiceNumValue: '',
invoiceTime: '',
money: '',
money1: '',
sendPersonValue: '',
receivePersonValue: '',
remark: ''
@@ -301,6 +310,7 @@ export default {
this.form1.invoiceNum = ''
this.form1.invoiceTime = ''
this.form1.money = ''
this.form1.money1 = ''
this.form1.sendPersonValue = parseInt(this.id)
this.form1.receivePersonValue = ''
this.form1.remark = ''
@@ -313,7 +323,7 @@ export default {
const month = myDate.getMonth() + 1
const date = myDate.getDate()
const nowDate = year + '-' + month + '-' + date
addInvoice(this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark, nowDate).then(response => {
addInvoice(this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark, nowDate, this.form1.money1).then(response => {
console.log(response.data)
if (response.data.result[0].result === '1') {
this.$message.success('增加成功')
@@ -338,6 +348,7 @@ export default {
this.form1.invoiceNumValue = row.发票流水号
this.form1.invoiceTime = row.开票时间
this.form1.money = row.开票金额
this.form1.money1 = row.扣除金额
this.form1.sendPersonValue = parseInt(row.传送人)
this.form1.receivePersonValue = parseInt(row.接收人)
this.form1.remark = row.备注
@@ -355,7 +366,7 @@ export default {
submitEdit1(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
editInvoice(this.form1.invoiceNumValue, this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark).then(response => {
editInvoice(this.form1.invoiceNumValue, this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark, this.form1.money1).then(response => {
console.log(this.form1.invoiceNumValue, this.form1.contractNum, this.form1.invoiceNum, this.form1.invoiceTime, this.form1.money, this.form1.sendPersonValue, this.form1.receivePersonValue, this.form1.remark)
console.log(response.data)
if (response.data[0].result === '1') {
@@ -377,7 +388,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteInvoice(row.发票流水号).then(response => {
deleteInvoice(row.发票流水号, row.采购合同流水号).then(response => {
console.log(response.data)
if (response.data[0].result === '1') {
this.$message.success('删除成功')