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
2018-12-22 16:26:10 +08:00
parent 64d549cd89
commit 6f6d4d6b57
11 changed files with 88 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/ManufacturingCenter/ProcessPlanning.js
View File

@@ -209,7 +209,7 @@ export function gongyiCopy(num1, num2) {
method: 'post',
data: {
type: '1',
name: '车间采购管理工艺_零件工序_工艺拷贝_工艺流水号',
name: '车间生产管理工艺_零件工序_工艺拷贝_工艺流水号',
param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int'
}
})
@@ -233,8 +233,8 @@ export function hardEdit(num, hard) {
method: 'post',
data: {
type: '2',
name: '车间采购管理工艺_零件工序_修改数据_工艺难度等级',
param: '外购件工序流水号=' + num + '=int&工艺难度等级=' + hard
name: '车间生产管理工艺_零件工序_修改数据_工艺难度等级',
param: '工序流水号=' + num + '=int&工艺难度等级=' + hard
}
})
}
@@ -329,8 +329,8 @@ export function selectRequest(num0, num1, num2, num3, request0) {
method: 'post',
data: {
type: '2',
name: '车间采购管理工艺_零件工序_修改数据_根据外购件工序流水号和工艺流水号',
param: '外购件工序流水号=' + num0 + '&工艺流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
}
})
}

16
src/api/TechnologyCenter/ImportParts.js
View File

@@ -108,7 +108,7 @@ export function specificationQueryWB(projectCheck, project, machineCheck, machin
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_外购件和标准件_规范数据查询_gj2',
name: 'PDM_零件明细表_外购件和标准件_规范数据查询_gj',
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`
}
})
@@ -141,7 +141,7 @@ export function unSpecificationQueryWB(projectCheck, project, machineCheck, mach
method: 'post',
data: {
type: '1',
name: 'PDM_零件明细表_外购件和标准件_不规范数据查询gj2',
name: 'PDM_零件明细表_外购件和标准件_不规范数据查询gj',
param: `项目名字_check=${projectCheck}&项目名字=${project}&机床名字_check=${machineCheck}&机床名字=${machine}&组号_check=${groupCheck}&组号=${group}`
}
})
@@ -278,6 +278,18 @@ export function searchGroupNum1(project, name) {
}
})
}
// 一键删除
export function allDelete(project, machine, group) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: 'PDM_零件明细表_一键删除',
param: `项目=${project}&机床=${machine}&组号=${group}`
}
})
}
// 传递零件
export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id) {
return request({

11
src/api/WorkshopProcurement/ProcurementContractEnquiry.js
View File

@@ -60,17 +60,6 @@ export function searchTable3(num) {
}
})
}
export function submitApproval(num, num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '采购管理_合同审批_修改数据',
param: '采购合同流水号=' + num + '&审批情况流水号=' + num1 + '&未通过原因=' + num2
}
})
}
export function Disable(num) {
return request({
url: '',

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

@@ -201,7 +201,6 @@
<el-input v-model="PurchaseOrder" size="small" style="width: 200px" placeholder="请购单号" clearable/>
<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1()">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 15px" @click="handleAdd()">创建</el-button>
<el-button type="warning" size="small" icon="el-icon-download">导出Excel</el-button>
</el-row>
</el-card>
<el-card>

16
src/views/MarketingCenter/BidBond/index.vue
View File

@@ -408,7 +408,7 @@
<script>
import elInput from 'element-ui/packages/input'
import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, ComplianceGold, addBidBond, editBidBond, delBidBond, winningBid, executionProgressID, intProject, submitPerformanceBond } from '@/api/MarketingCenter/BidBond'
import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, addBidBond, editBidBond, delBidBond, winningBid, executionProgressID, intProject, submitPerformanceBond } from '@/api/MarketingCenter/BidBond'
export default {
components: {
elInput
@@ -640,20 +640,6 @@ export default {
},
ComplianceGold(row) {
this.addForm('PerformanceBondform')
// this.$confirm('此操作会将此投标保证金转为履约保证金, 是否继续?', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// ComplianceGold(row.招标保证金流水号).then(response => {
// if (response.data[0].result === '1') {
// this.fetchTableData1()
// this.$message.success('操作成功')
// } else {
// this.$message.error('操作失败')
// }
// })
// })
this.code = row.招标保证金流水号
this.dialogPerformanceBondVisible = true
this.PerformanceBondform.保证金金额 = row.应收回金额

26
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -1,7 +1,7 @@
<template>
<div>
<el-card>
<div style="width: 700px;margin: 0 auto">
<div style="width: 900px;margin: 0 auto">
<span>机床名称：</span>
<el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" @change="getGroups">
<el-option
@@ -19,6 +19,7 @@
:value="item.value"/>
</el-select>
<el-button :disabled="disabled" type="primary" icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
<el-button type="danger" icon="el-icon-delete" size="small" @click="allDelete">一键删除</el-button>
</div>
</el-card>
<el-card>
@@ -27,6 +28,12 @@
:data="tableData"
:row-class-name="tableRowClassName"
border>
<el-table-column align="center" label="物料状态" min-width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.物料流水号===null" type="warning" size="small">不存在</el-tag>
<el-tag v-if="scope.row.物料流水号!==null" type="primary" size="small">存在</el-tag>
</template>
</el-table-column>
<el-table-column align="center" label="图号" min-width="200">
<template slot-scope="scope">
{{ scope.row.图号或者型号 }}
@@ -260,7 +267,7 @@
<script>
import { sleep } from '../../../utils/tool'
import { unSpecificationQuery, unSpecificationQueryWB, specificationQueryWB, specificationQuery, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX, transferWG } from '../../../api/TechnologyCenter/ImportParts'
import { unSpecificationQuery, unSpecificationQueryWB, specificationQueryWB, specificationQuery, deleteBasicParts, deleteBWParts, getMaterial, getMaterialWB, searchMaterialWB, updateRow, updateRowWB, transferMX, transferWG, allDelete } from '../../../api/TechnologyCenter/ImportParts'
export default {
name: 'SpecificationData',
props: {
@@ -382,6 +389,7 @@ export default {
} else {
this.type = 2
this.unSpecification = await unSpecificationQueryWB(projectCheck, this.projectName, machineCheck, this.machineValue, groupCheck, this.groupValue)
console.log(this.unSpecification)
this.unSpecification.data.forEach(item => {
this.tableDataAll.push(item)
})
@@ -397,6 +405,20 @@ export default {
console.log(`查询零件发生错误：${e}`)
}
},
allDelete() {
if (this.projectName !== '' && this.machineValue !== '' && this.groupValue !== '') {
allDelete(this.projectName, this.machineValue, this.groupValue).then(response => {
if (response.data[0].result === '1') {
this.tableData = []
this.$message.success('删除成功')
} else {
this.$message.error('删除失败')
}
})
} else {
this.$message.warning('请选择好项目机床分组')
}
},
getGroups() {
this.$emit('machineChange', this.machineValue)
},

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

@@ -181,12 +181,6 @@
icon="el-icon-search"
style="margin-left:10px"
@click="searchRequestTable">查询</el-button>
<el-button
type="warning"
size="small"
icon="el-icon-download"
style="margin-left:10px"
>导出Excel</el-button>
</el-card>
<el-card>

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

@@ -109,8 +109,8 @@
<td colspan="1" align="center">江苏盐城</td>
</tr>
</table>
<div style="margin-top: 20px;line-height: 25px">根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。</div>
<div style="line-height: 25px">一、 产品名称、规格型号、材质、数量、单价和交货期：</div>
<div style="margin-top: 20px;line-height: 30px">根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。</div>
<div style="line-height: 30px">一、 产品名称、规格型号、材质、数量、单价和交货期：</div>
<table id="50" cellspacing="0px" align="center" border width="100%" style="">
<tbody id="51">
<tr id="tableHead1" style="height: 40px">
@@ -150,8 +150,8 @@
</tr>
</tfoot>
</table>
<div style="line-height: 25px">以上价格为含税增值税价格，供方开具真实有效的16%增值税发票</div>
<div id="23" style="line-height: 25px"/>
<div style="line-height: 30px">以上价格为含税增值税价格，供方开具真实有效的16%增值税发票</div>
<div id="23" style="line-height: 30px"/>
<table id="66" cellspacing="0px" align="center" border width="100%" style="margin-top: 30px">
<tbody id="67">
<tr style="height: 35px">

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

@@ -90,7 +90,7 @@
</el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="warning" size="mini" @click="exportTable('100')">导出</el-button>
<el-button type="warning" size="mini" @click="exportTable()">打印</el-button>
<el-button type="danger" size="mini" @click="Disable(scope.row)">禁用</el-button>
</template>
</el-table-column>
@@ -111,27 +111,28 @@
<el-card>
<div style="width:900px;margin-left: 350px">
<el-card>
<div id="100">
<div id="export">
<table id="1" cellspacing="0px" align="center" border width="100%" style="">
<tr style="height: 40px">
<td colspan="3" align="center" style="font-weight: bold">GAOJING</td>
<td colspan="2" align="center" style="font-weight: bold">GAOJING</td>
<td colspan="5" align="center" style="font-weight: bold">产品销售合同</td>
<td colspan="1" rowspan="3" style="width: 119px"><img id="img" alt=""></td>
</tr>
<tr style="height: 40px">
<td colspan="2" align="center">需方</td>
<td colspan="2" align="center">江苏高精机电装备有限公司</td>
<td colspan="2" align="center">合同编号</td>
<td colspan="1" align="center">需方</td>
<td colspan="3" align="center">江苏高精机电装备有限公司</td>
<td colspan="1" align="center">合同编号</td>
<td colspan="2" align="center">{{ contract }}</td>
</tr>
<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="1" align="center">供方</td>
<td colspan="3" align="center">{{ supplier }}</td>
<td colspan="1" align="center">签订地点</td>
<td colspan="2" align="center">江苏盐城</td>
</tr>
</table>
<div style="margin-top: 20px;line-height: 25px">根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。</div>
<div style="line-height: 25px">一、 产品名称、规格型号、材质、数量、单价和交货期：</div>
<div style="margin-top: 20px;line-height: 30px">根据《中华人民共和国合同法》的有关规定，经供需双方友好协商，在平等自愿的基础上定立本合同，以便供需双方共同遵守。</div>
<div style="line-height: 30px">一、 产品名称、规格型号、材质、数量、单价和交货期：</div>
<table id="50" cellspacing="0px" align="center" border width="100%" style="">
<tbody id="51">
<tr id="tableHead1" style="height: 40px">
@@ -171,8 +172,8 @@
</tr>
</tfoot>
</table>
<div style="line-height: 25px">以上价格为含税增值税价格，供方开具真实有效的16%增值税发票</div>
<div id="23"/>
<div style="line-height: 30px">以上价格为含税增值税价格，供方开具真实有效的16%增值税发票</div>
<div id="23" style="line-height: 30px"/>
<table id="66" cellspacing="0px" align="center" border width="100%" style="margin-top: 30px">
<tbody id="67">
<tr style="height: 35px">
@@ -282,7 +283,8 @@
<script>
import { initContract, initBuyer, searchTable1, searchTable2, searchTable3, Disable } from '@/api/WorkshopProcurement/ProcurementContractEnquiry'
import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
import $ from 'jquery'
import QRCode from 'qrcode'
export default {
data() {
@@ -422,10 +424,15 @@ export default {
})
})
},
exportTable(tableid) {
getExplorer()
method5(tableid)
Cleanup()
exportTable() {
const htmlNode = $('#export').html()
const body = $('body')
body.children().hide()
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
printNode.remove()
},
handleSizeChange1(val) {
this.pageCurrent1 = 1
@@ -437,7 +444,6 @@ export default {
this.searchTable1()
},
searchTable2(row) {
console.log(row)
this.textarea = row.合同文本
this.supplier = row.供应商名称
this.contract = row.采购合同编号
@@ -448,6 +454,18 @@ export default {
this.RMB1 = row.含税总金额_文本
document.getElementById('23').innerText = this.textarea
this.contractValue = parseInt(row.采购合同流水号)
const opts = {
errorCorrectionLevel: 'H',
type: 'image/jpeg',
rendererOpts: {
quality: 0.3
}
}
QRCode.toDataURL(row.采购合同流水号, opts, function(err, url) {
if (err) throw err
const img = document.getElementById('img')
img.src = url
})
searchTable2(this.contractValue).then(response => {
this.returns = response.data
const children = document.getElementsByClassName('tableData')

51
src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
View File

@@ -16,50 +16,7 @@
style="margin-left:10px"
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</el-card>
<el-card>
<div style="margin-bottom: 20px;margin-left: 10px;font-size: 20px;">采购部采购</div>
<el-table v-loading="" :data="tableData1" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table-column label="项目名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料名称 }}
</template>
</el-table-column>
<el-table-column label="物料规格" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料规格 }}
</template>
</el-table-column>
<el-table-column label="物料型号" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.物料型号 }}
</template>
</el-table-column>
<el-table-column label="数量" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.数量 }}
</template>
</el-table-column>
<el-table-column label="单价" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.单价 }}
</template>
</el-table-column>
<el-table-column label="小计(元)" align="center" min-width="100" prop="金额">
<template slot-scope="scope">
{{ scope.row.金额 }}
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<div style="margin-bottom: 20px;margin-left: 10px;font-size: 20px;">车间采购</div>
<el-table v-loading="" :data="tableData2" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table-column label="项目名称" align="center" min-width="100">
<template slot-scope="scope">
@@ -97,6 +54,8 @@
</template>
</el-table-column>
</el-table>
</el-card>
<el-card>
<el-table v-loading="" :data="tableData" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table-column label="项目名称" align="center" min-width="100">
<template slot-scope="scope">
@@ -139,7 +98,7 @@
</template>
<script>
import { initProject, searchProjectTotal, searchProjectTotal1, searchProjectTotal2 } from '@/api/WorkshopProcurement/ProjectTotalSearch'
import { initProject, searchProjectTotal1, searchProjectTotal2 } from '@/api/WorkshopProcurement/ProjectTotalSearch'
import { mapGetters } from 'vuex'
export default {
@@ -149,7 +108,6 @@ export default {
projectValue: '',
project: [],
tableData: [],
tableData1: [],
tableData2: []
}
},
@@ -177,9 +135,6 @@ export default {
},
searchTable1() {
if (this.projectValue) {
searchProjectTotal(this.projectValue).then(response => {
this.tableData1 = response.data
})
searchProjectTotal1(this.projectValue).then(response => {
this.tableData = response.data
})

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

@@ -44,11 +44,6 @@
icon="el-icon-circle-plus-outline"
style="margin-left: 10px"
@click="addTable1()">增加</el-button>
<el-button
type="warning"
size="small"
icon="el-icon-download"
style="margin-left: 10px">导出</el-button>
</el-card>
<el-card>
@@ -324,7 +319,6 @@ export default {
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, this.form1.money1).then(response => {
console.log(response.data)
if (response.data.result[0].result === '1') {
this.$message.success('增加成功')
this.dialogVisible1 = false