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:
lixin
2019-01-22 09:46:55 +08:00
parent 7461a46113 a01226b906
commit d797d18b66
5 changed files with 873 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/api/WorkshopProcurement/OfflineContract1.js
View File

@@ -1,72 +1,88 @@
import request from '@/utils/request'
// 查询库存数
export function searchInventoryNum(pageCurrent, pageSize, check1, name, check2, state1) {
export function searchInventoryNum(pageCurrent, pageSize, check1, name, check2, state1, state2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_离线合同_物料余量_查询数据',
param: `物料名称_check=${check1}&物料名称=${name}&库存状态_check=${check2}&库存状态=${state1}`,
name: '采购管理_离线合同_物料余量_查询数据',
param: `物料名称_check=${check1}&物料名称=${name}&库存状态_check=${check2}&库存状态=${state1}&采购状态=${state2}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 查询离线合同
export function searchOfflineContract(pageCurrent, pageSize, check1, num) {
export function searchOfflineContract(pageCurrent, pageSize, check1, num, check2, name) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_离线合同_查询数据',
param: `请购单编号_check=${check1}&请购单编号=${num}`,
param: `离线合同编号_check=${check1}&离线合同编号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
export function addData(num, num2, time) {
// 查询离线合同 (不分页)
export function searchOfflineContract2() {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_离线合同_查询数据',
param: `离线合同编号_check=0&离线合同编号=0&供应商名称_check=0&供应商名称=0`
}
})
}
// 查询供应商
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({
url: '',
method: 'post',
data: {
type: '1',
name: '采购管理_供应商_查询数据_根据条件',
param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
}
})
}
// 增加离线合同
export function addOfflineContract(contractNum, contractName, supplier, person, date, remark) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间采购管理_离线合同_增加数据',
param: '请购单编号=' + num + '&请购人=' + num2 + '&请购时间=' + time
param: `离线合同编号=${contractNum}&离线合同名称=${contractName}&供应商流水号=${supplier}&人员编号=${person}&规定到货时间=${date}&离线合同备注=${remark}`
}
})
}
export function editData(RequisitionList, num, time) {
// 编辑离线合同
export function editOfflineContract(contractNumValue, contractNum, contractName, supplier, person, date, remark) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间采购管理_离线合同_编辑数据',
param: '请购单流水号=' + RequisitionList + '&请购单编号=' + num + '&请购时间=' + time
param: `离线合同流水号=${contractNumValue}&离线合同编号=${contractNum}&离线合同名称=${contractName}&供应商流水号=${supplier}&人员编号=${person}&规定到货时间=${date}&离线合同备注=${remark}`
}
})
}
export function deleteData(RequisitionList) {
// 作废离线合同
export function deleteOfflineContract(num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间采购管理_离线合同_删除数据',
param: '请购单流水号=' + RequisitionList
}
})
}
export function updateStatus(num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间采购管理_离线合同_导出更改状态',
param: '请购单流水号=' + num
param: '离线合同流水号=' + num
}
})
}
@@ -78,7 +94,7 @@ export function searchMateriel(num) {
data: {
type: '1',
name: '车间采购管理_离线合同明细_查询数据',
param: `请购单流水号=${num}`
param: `离线合同流水号=${num}`
}
})
}
@@ -90,7 +106,7 @@ export function addMateriel(num1, num2) {
data: {
type: '2',
name: '车间采购管理_离线合同明细_增加数据',
param: `请购单流水号=${num1}&物料流水号组=${num2}`
param: `离线合同流水号=${num1}&物料流水号组=${num2}`
}
})
}
@@ -102,18 +118,19 @@ export function deleteMateriel(num) {
data: {
type: '2',
name: '车间采购管理_离线合同明细_删除数据',
param: `请购单明细流水号=${num}`
param: `离线合同明细流水号=${num}`
}
})
}
export function update(num, num1, num2) {
// 生成离线合同
export function doneOfflineContact(contractNum, total, partGroup, numGroup, priceGroup) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间采购管理_离线合同明细_编辑数据',
param: `请购单明细流水号=${num}&数量=${num1}&用途=${num2}`
name: '车间采购管理_离线合同_生成合同',
param: `离线合同流水号=${contractNum}&合同总额=${total}&离线合同明细流水号组=${partGroup}&数量组=${numGroup}&单价组=${priceGroup}`
}
})
}

63
src/api/WorkshopProcurement/OfflineContractRequestFund1.js Normal file
View File

@@ -0,0 +1,63 @@
import request from '@/utils/request'
// 查询请款表
export function searchRequestFund(pageCurrent, pageSize, check1, start, end) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_离线合同_请款_查询数据',
param: `时间段_check=${check1}&开始时间=${start}&结束时间=${end}`,
Pagination: pageCurrent + '&' + pageSize
}
})
}
// 查询离线合同待请款信息
export function searchOfflineContract(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_离线合同_待请款_查询数据',
param: `供应商流水号=${num}`
}
})
}
// 查询离线合同待请款信息
export function submitRequestFund(contractGroup, sumGroup, supplier, money, person) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间采购管理_离线合同_请款_增加数据',
param: `离线合同流水号组=${contractGroup}&合同总额组=${sumGroup}&供应商流水号=${supplier}&请款金额=${money}&请款人=${person}`
}
})
}
// 查询离线合同待请款信息
export function searchRequsetFundDetail(num) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间采购管理_离线合同_请款明细_查询数据',
param: `离线合同请款流水号=${num}`
}
})
}
// 取消请款
export function cancelRequestFund(num) {
return request({
url: '',
method: 'post',
data: {
type: '2',
name: '车间采购管理_离线合同_请款_删除数据',
param: `离线合同请款流水号=${num}`
}
})
}

1
src/icons/svg/OfflineContractRequestFund1.svg Normal file
View File

@@ -0,0 +1 @@
<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style/></defs><path d="M327 564.9c-16.6 0-30 13.4-30 30s13.4 30 30 30h155V697c0 16.6 13.4 30 30 30s30-13.4 30-30v-72.1h155c16.6 0 30-13.4 30-30s-13.4-30-30-30H542v-48.7h155c16.6 0 30-13.4 30-30s-13.4-30-30-30H552.5l108-108c11.7-11.7 11.7-30.7 0-42.4s-30.7-11.7-42.4 0L512 411.9 405.9 305.8c-11.7-11.7-30.7-11.7-42.4 0s-11.7 30.7 0 42.4l108 108H327c-16.6 0-30 13.4-30 30s13.4 30 30 30h155v48.7H327zM102.3 717.6c-21 0-38.3 17.2-38.3 38.3v165.8c0 21 17.2 38.3 38.3 38.3 21 0 38.3-17.2 38.3-38.3V755.9c-.1-21.1-17.3-38.3-38.3-38.3z"/><path d="M581.6 733.4C557.1 794.9 512 844 458.2 857.9H315.7v-38.3h74.7c24.7 0 44.6-20 44.6-44.6 0-24.7-20-44.6-44.6-44.6h-52.5C315.1 711 288.6 700 260.2 700c-28.4 0-54.9 10.9-77.7 30.4h-10v216.7h285.8c93.3-7.9 167.1-106.4 167.1-227 0-5.2-.5-10.1-.8-15.2-18.9 0-36.1 11.1-43 28.5z"/><path d="M959.8 497.7C952.3 258.1 752.9 64.6 513.2 64 265.2 63.4 64 264.2 64 512v1.1c0 13 10.8 23.4 23.8 23.4h12.5c13.3 0 23.7-10.9 23.7-24.2v-.2c0-223.1 189.3-402.9 415.8-387 191.9 13.4 347 169.4 359.4 361.4 11.4 176.5-96 330-249.8 388.4-11.6 4.4-19.2 15.5-19.2 27.9 0 20.9 20.9 35.6 40.5 28.2C844 865.3 965.9 695.3 959.8 497.7z"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

1008
src/views/WorkshopProcurement/OfflineContract1/index.vue
View File

File diff suppressed because it is too large Load Diff

34
src/views/WorkshopProcurement/OfflineContractRequestFund1/index.vue
View File

@@ -35,45 +35,39 @@
{{ scope.row.请款时间 }}
</template>
</el-table-column>
<el-table-column label="请款人" align="center" min-width="100">
<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="100" prop="请款金额">
<el-table-column label="请款金额" align="center" min-width="90" prop="请款金额">
<template slot-scope="scope">
{{ scope.row.请款金额 }}
</template>
</el-table-column>
<el-table-column label="请款付款情况" align="center">
<el-table-column label="审核情况内容" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.审核情况内容 }}
</template>
</el-table-column>
<el-table-column label="未通过审核原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批情况内容" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.审批情况内容 }}
<el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
<el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
</template>
</el-table-column>
<el-table-column label="未通过审批原因" width="110" align="center">
<template slot-scope="scope">
{{ scope.row.未通过审批原因 }}
{{ scope.row.未通过审批原因 === '通过' ? '—' : scope.row.未通过审批原因 }}
</template>
</el-table-column>
<el-table-column label="付款情况" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.付款情况内容 }}
<el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
<el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
</template>
</el-table-column>
<el-table-column label="未付款原因" width="100" align="center">
<template slot-scope="scope">
{{ scope.row.未付款原因 }}
{{ scope.row.未付款原因 === '通过' ? '—' : scope.row.未付款原因 }}
</template>
</el-table-column>
</el-table-column>
@@ -93,9 +87,9 @@
</template>
</el-table-column>
</el-table>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-left: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
<el-button slot="reference" type="success" size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button>
</el-popover>
<el-button :disabled="parseInt(scope.row.审核情况流水号)===1" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
<el-button :disabled="Number(scope.row.审批情况流水号)!==3" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">取消请款</el-button>
</template>
</el-table-column>
</el-table>
@@ -166,8 +160,7 @@
</div>
</template>
<script>
import { searchRequestFund, searchOfflineContract, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/PurchasingCenter/OfflineContractRequestFund'
<script>import { searchRequestFund, searchOfflineContract, submitRequestFund, searchRequsetFundDetail, cancelRequestFund } from '@/api/WorkshopProcurement/OfflineContractRequestFund1'
import { mapGetters } from 'vuex'
export default {
@@ -233,6 +226,7 @@ export default {
},
created() {
this.fetchData()
this.searchTable1()
},
methods: {
fetchData() {