Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 12 months ago
parent
commit
cb6cf7adfa
  1. 22
      yxt-as-ui/src/api/Common/dictcommons.js
  2. 88
      yxt-as-ui/src/api/purchase/procurement.js
  3. 24
      yxt-as-ui/src/router/index.js
  4. 224
      yxt-as-ui/src/views/purchase/procurement/procurement.vue
  5. 819
      yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue
  6. 319
      yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue
  7. 164
      yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue
  8. 578
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue
  9. 586
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue
  10. 370
      yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue
  11. 164
      yxt-as-ui/src/views/workFlow/caigouFlow/relation/chooseproducts.vue
  12. 5
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml
  13. 5
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml
  14. 5
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml
  15. 17
      yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java
  16. 6
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java
  17. 39
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml
  18. 37
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java
  19. 99
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java
  20. 32
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java
  21. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java
  22. 9
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml
  23. 1
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java
  24. 4
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java
  25. 159
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java
  26. 20
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java
  27. 24
      yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java

22
yxt-as-ui/src/api/Common/dictcommons.js

@ -34,7 +34,6 @@ export function selectOrgList(data) {
})
}
// 当前用户创建申请时判断该用户是否有该菜单的操作权限
export function selectHaveMessage(data) {
return request({
@ -94,7 +93,7 @@ export function getGroupList(data) {
// 查询分页列表 -- 客户列表
export function customerListPage(params) {
return request({
url: '/v1/crmcustomer/customerListPage',
url: '/yxtcrm/apiadmin/v1/crmcustomer/customerListPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
@ -124,3 +123,22 @@ export function getCounty(data) {
params: data
})
}
// 获取售后服务--基础信息--供应商信息
export function choiceSupplierInfo(data) {
return request({
url: '/pms/v1/pmssupplierinfo/choiceSupplierInfo',
method: 'post',
params: data
})
}
// 查询分页列表 -- 商品列表
export function chooseproducts(params) {
return request({
url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
}

88
yxt-as-ui/src/api/purchase/procurement.js

@ -4,69 +4,103 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/pms/pmspurchasebill/listPage',
url: '/pms/v1/pmspurchasebill/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 查询分页列表 -- 供应商
supplierListPage: function(params) {
// 初始化
fetchDetailsBySid: function(data) {
return request({
url: '/pms/v1/pmspurchasebill/fetchDetailsBySid/' + data,
method: 'get'
})
},
saveOrUpdate: function(data) {
return request({
url: '/base/basesupplierinfo/listPage',
url: '/pms/v1/pmspurchasebill/save',
method: 'post',
data: params,
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
deleteBySids: function(data) {
return request({
url: '/pms/v1/pmspurchasebill/delBySids',
method: 'DELETE',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 查询分页列表 -- 商品列表
purGoodsListPage: function(params) {
// 提交流程
submit: function(params) {
return request({
url: '/base/basegoodssku/purGoodsListPage',
url: '/pms/v1/pmspurchasebill/submit',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 初始化
fetchDetailsBySid: function(data) {
// 流程审批(同意)
complete: function(params) {
return request({
url: '/pms/pmspurchasebillsettle/fetchDetailsBySid/' + data,
method: 'get'
url: '/pms/v1/pmspurchasebill/complete',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
saveOrUpdate: function(data) {
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/pms/pmspurchasebill/save',
url: '/pms/v1/pmspurchasebill/delegate',
method: 'post',
data: data,
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
settlement: function(data) {
// 流程审批(驳回)
reject: function(params) {
return request({
url: '/pms/pmspurchasebillsettle/save',
url: '/pms/v1/pmspurchasebill/reject',
method: 'post',
data: data,
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
deleteBySids: function(data) {
// 流程审批(终止)
breakProcess: function(params) {
return request({
url: '/pms/pmspurchasebill/delBySids',
method: 'DELETE',
data: data,
url: '/pms/v1/pmspurchasebill/breakProcess',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 导出
exportExcel: function(data) {
// 流程审批(撤回)
revokeProcess: function(params) {
return request({
url: '/pms/pmspurchasebill/exportExcel',
url: '/pms/v1/pmspurchasebill/revokeProcess',
method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型
data: data,
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 审批流程(同意)获取下一环节
getNextNodesForSubmit: function(data) {
return request({
url: '/pms/v1/pmspurchasebill/getNextNodesForSubmit',
method: 'get',
params: data
})
},
// 审批流程(驳回)获取上一环节
getPreviousNodesForReject: function(data) {
return request({
url: '/pms/v1/pmspurchasebill/getPreviousNodesForReject',
method: 'get',
params: data
})
}
}

24
yxt-as-ui/src/router/index.js

@ -419,7 +419,29 @@ export const constantRoutes = [{
meta: { title: '供应商管理', noCache: true }
}
]
}
},
// 采购申请管理--编辑
{
path: '/caigouFlow/procurementEdit',
component: () =>
import('@/views/workFlow/caigouFlow/procurementEdit.vue'),
name: 'ProcurementEdit'
},
// 采购申请管理--待办
{
path: '/caigouFlow/procurementDaiBan',
component: () =>
import('@/views/workFlow/caigouFlow/procurementDaiBan.vue'),
name: 'ProcurementDaiBan'
},
// 采购申请管理--已办
{
path: '/caigouFlow/procurementYiBan',
component: () =>
import('@/views/workFlow/caigouFlow/procurementYiBan.vue'),
name: 'ProcurementYiBan'
},
// 404 page must be placed at the end !!!
// { path: '*', redirect: '/404', hidden: true }
]

224
yxt-as-ui/src/views/purchase/procurement/procurement.vue

@ -2,30 +2,57 @@
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="采购开单管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<button-bar view-title="采购申请管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="供应商">
<el-select v-model="listQuery.params.supplierSid" placeholder="请选择" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
<el-form-item label="分公司">
<el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="开单时间">
<el-form-item label="申请人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<!-- <el-form-item label="结算时间">-->
<!-- <el-date-picker v-model="listQuery.params.appealDueStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>-->
<!-- <span style="padding: 0 8px"></span>-->
<!-- <el-date-picker v-model="listQuery.params.appealDueEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item>
<el-input v-model="listQuery.params.otherQuery" placeholder="单号、备注" clearable/>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item label="采购类型">
<el-select v-model="listQuery.params.purchaseTypeValue" placeholder="请选择" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
</el-form-item>
<el-form-item label="采购原因">
<el-select v-model="listQuery.params.purchaseReasonValue" placeholder="请选择" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
</el-form-item>
<el-form-item label="付款方式">
<el-select v-model="listQuery.params.payTypeValue" placeholder="请选择" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
</el-form-item>
<el-form-item label="供应商">
<el-input v-model="listQuery.params.supplierName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="是否开票">
<el-select v-model="listQuery.params.isInvoicing" placeholder="请选择" clearable filterable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -36,7 +63,7 @@
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">采购开单列表</div>
<div class="tit">采购申请列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
@ -44,19 +71,30 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" width="180px" align="center">
<el-table-column label="操作" width="180" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="settleState" label="结算标志" align="center" />
<el-table-column prop="billNo" label="单号" align="center" />
<el-table-column prop="supplierName" label="供应商" align="center" />
<el-table-column prop="supplierPhone" label="供应商联系方式" align="center" />
<el-table-column prop="storekeeperName" label="库管员" align="center" />
<el-table-column prop="settleTime" label="结算时间" align="center" />
<el-table-column prop="createTime" label="创建时间" align="center" />
<el-table-column prop="createByName" label="制单人" align="center" />
<el-table-column label="流程状态" width="180" header-align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" width="160" />
<el-table-column prop="createOrgName" label="分公司" align="center" width="120" />
<el-table-column prop="deptName" label="申请部门" align="center" width="120" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
<el-table-column prop="purchaseTypeValue" label="采购类型" align="center" width="100" />
<el-table-column prop="purchaseReasonValue" label="采购原因" align="center" width="100" />
<el-table-column prop="payTypeValue" label="付款方式" align="center" width="100" />
<el-table-column prop="supplierName" label="供应商" align="center" min-width="150" />
<el-table-column prop="isInvoicing" label="是否开票" align="center" width="100" />
<el-table-column prop="amountCount" label="采购金额合计" align="center" width="140" />
<el-table-column prop="payableAmount" label="应付金额合计" align="center" width="140" />
</el-table>
</div>
<!--End 主页面主要部分-->
@ -72,6 +110,10 @@
<procurementAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
<!-- 详情 -->
<procurementInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
@ -80,7 +122,8 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/purchase/procurement'
import { choiceSupplierInfo } from '@/api/Common/dictcommons'
import { typeValues } from '@/api/Common/dictcommons'
import { getStorage } from '@/utils/auth'
import procurementAdd from './procurementAdd'
import procurementInfo from './procurementInfo'
@ -95,6 +138,9 @@ export default {
},
data() {
return {
url: '',
dialogHeight: '80%',
centerDialogVisible: false,
btndisabled: false,
btnList: [
{
@ -104,13 +150,6 @@ export default {
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
@ -118,13 +157,6 @@ export default {
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'doExport',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
@ -140,19 +172,38 @@ export default {
list: [],
sids: [], // SIDs
supplier_list: [],
state_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 10,
size: 5,
total: 0,
params: {
supplierSid: '',
createOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
createOrgSid: '',
otherQuery: ''
finishStartTime: '',
finishEndTime: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: '',
isInvoicing: '',
orgPath: ''
}
}
}
@ -163,16 +214,46 @@ export default {
this.getList()
},
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
choiceSupplierInfo({ createOrgSid : '' }).then((res) => {
typeValues({ type: '' }).then((res) => {
if (res.success) {
this.supplier_list = res.data
}
})
},
async handleMessage(event) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
code = event.data.params.code
}
if (code === 1) {
this.centerDialogVisible = false
} else if (code === 2) {
this.dialogHeight = event.data.params.data
this.setIframeHeight(document.getElementById('iframe'))
}
},
closeIt() {
this.url = ''
this.centerDialogVisible = false
},
setIframeHeight(iframe) {
iframe.height = this.dialogHeight
},
flowRecord(row) {
this.centerDialogVisible = true
var params = {
deployId: row.procDefId,
procInsId: row.procInstId,
token: getStorage()
}
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -188,15 +269,9 @@ export default {
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doExport':
this.doExport()
break
case 'doClose':
this.doClose()
break
@ -221,6 +296,7 @@ export default {
//
getList() {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
@ -241,14 +317,23 @@ export default {
handleReset() {
this.listQuery = {
current: 1,
size: 10,
size: 5,
total: 0,
params: {
supplierSid: '',
createOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
createOrgSid: '',
otherQuery: ''
finishStartTime: '',
finishEndTime: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: '',
isInvoicing: '',
orgPath: ''
}
}
this.init()
@ -258,12 +343,8 @@ export default {
this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid)
},
toEdit(row) {
if (this.sids.length === 1) {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.sids[0])
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑操作' })
}
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
toInfo(row) {
this.viewState = 4
@ -298,31 +379,6 @@ export default {
}).catch(() => {
})
},
doExport() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.exportExcel(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '销售单查询' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
//
resetState() {
this.viewState = 1

819
yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue

@ -5,380 +5,400 @@
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="danger" size="small" :disabled="submitdisabled" @click="settle()">结算</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="16">
<div class="span-sty">供应商</div>
<el-form-item>
<el-popover placement="right" width="600" trigger="click">
<div>
<el-table :data="supplierData" v-loading="supplierLoading" highlight-current-row @current-change="supplierCurrentChange">
<el-table-column fixed prop="vehMark" label="车辆拍照" align="center" width="130"/>
<el-table-column prop="name" label="客户" align="center" width="100"/>
<el-table-column prop="mobile" label="联系方式" align="center" min-width="300"/>
<el-table-column prop="orgName" label="客户单位" align="center" width="100"/>
</el-table>
<el-pagination :page.sync="supplierQuery.current" :page-size="supplierQuery.size" layout="total, pager" :total="supplierQuery.total"/>
</div>
<el-input slot="reference" class="addinputInfo addinputw" style="width: 30%" v-model="formobj.pmsPurchaseBill.supplierName" @input="supplierInput(formobj.pmsPurchaseBill.supplierName)" clearable placeholder="供应商名称、联系方式、缩写"/>
</el-popover>
</el-form-item>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">联系方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.pmsPurchaseBill.supplierPhone }}</span></el-form-item>
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">发票类型</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.pmsPurchaseBill.billTypeValue" clearable placeholder=""/></el-form-item>
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">是否需要发票</div>
<div class="span-sty">采购类型</div>
<el-form-item>
<el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.pmsPurchaseBill.isInvoicing">
<el-radio label="1"></el-radio>
<el-radio label="2"></el-radio>
</el-radio-group>
<el-select class="addinputInfo" v-model="formobj.purchaseTypeValue" placeholder="请选择" @change="purchaseTypeChange" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">发票号码</div>
<div class="span-sty">采购原因</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="formobj.pmsPurchaseBill.invoiceCode" clearable placeholder=""/>
<el-select class="addinputInfo" v-model="formobj.purchaseReasonValue" placeholder="请选择" @change="purchaseReasonChange" clearable filterable>
<el-option v-for="item in procurementReason_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="formobj.pmsPurchaseBill.remarks" clearable placeholder=""/>
<el-select class="addinputInfo" v-model="formobj.payTypeValue" placeholder="请选择" @change="payTypeChange" clearable filterable>
<el-option v-for="item in paymentMethod_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购员</div>
<div class="span-sty">供应商</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="formobj.purchaserName" clearable placeholder=""/>
<el-select class="addinputInfo" v-model="formobj.supplierSid" placeholder="请选择" @change="supplierChange" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">库管员</div>
<div class="span-sty">是否需要发票</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="formobj.pmsPurchaseBill.storekeeperName" clearable placeholder=""/>
<el-radio-group class="addinputInfo" style="font-size: 1px" @change="isInvoicingChange" v-model="formobj.purchaseBillInvoice.isInvoicing">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}({{ formobj.purchaseBillInvoice.taxRate }})</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额<el-input style="width: 30%" @keyup.native="formobj.prepaymentAmount = getNumber(formobj.prepaymentAmount, 2)" v-model="formobj.prepaymentAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额<el-input style="width: 30%" @keyup.native="formobj.owedAmount = getNumber(formobj.owedAmount, 2)" v-model="formobj.owedAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<div class="title">商品列表</div>
<el-table :key="commodityKey" :data="formobj.pmsPurchaseBill.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<div v-if="formobj.payTypeValue == '单笔付款'">
<div class="title">订金及付款申请</div>
<el-row>
<el-col :span="8">
<div class="span-sty">是否先付货款</div>
<el-form-item>
<el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.purchasePay.isFirstPay">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">审批通过后付订金</div>
<el-form-item>
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.deposit = getNumber(formobj.purchasePay.deposit, 2)" v-model="formobj.purchasePay.deposit" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">验货后付货款</div>
<el-form-item>
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="16" v-else>
<div class="span-sty">审批通过后付货款</div>
<el-form-item>
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">收款账户名称</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.purchasePay.accountName" placeholder="请选择" @change="accountChange" clearable filterable>
<el-option v-for="item in account_list" :key="item.bankAccount" :label="item.accountName" :value="item.accountName"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">银行账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankAccount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">其他费用名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchasePay.otherAmountName" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其他费用合计</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.otherAmount = getNumber(formobj.purchasePay.otherAmount, 2)" v-model="formobj.purchasePay.otherAmount" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">付款备注</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchasePay.payRemark" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" :accept="accept" v-model="formobj.purchasePay.filePaths" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="title titleOne">
<div>商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="selectProducts">选择商品</el-button>
</div>
<el-table :key="tableKey" :data="formobj.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column align="center" width="70" :render-header="commodityHeader">
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<i class="el-icon-delete" @click="commodityDelete(scope.$index)"></i>
<el-button type="danger" size="small" @click="commodityDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品名称" align="center" min-width="200">
<template slot-scope="scope">
<el-popover placement="right" width="600" trigger="click">
<div>
<el-table :data="commodityData" v-loading="commodityLoading" highlight-current-row @current-change="commodityCurrentChange($event, scope.row)">
<el-table-column fixed prop="goodsName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="零件号" align="center" />
<el-table-column prop="goodsShortName" label="商品简称" align="center" />
<el-table-column prop="goodsPY" label="商品拼音" align="center" />
<el-table-column prop="title" label="规格" align="center" />
</el-table>
<el-pagination :page.sync="commodityQuery.current" :page-size="commodityQuery.size" layout="total, pager" :total="commodityQuery.total" />
</div>
<el-input slot="reference" v-model="scope.row.goodsSpuName" @input="commodityInput(scope.row.goodsSpuName)" clearable placeholder="商品名称、零件号、拼音"/>
</el-popover>
</template>
</el-table-column>
<el-table-column prop="goodsCode" label="零件号" align="center" width="100" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="currentCount" label="库存数量" align="center" width="100" />
<el-table-column label="仓库" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.warehouseName" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="货位" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.warehouseRackName" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="进价" align="center" width="100">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.cost = getNumber(scope.row.cost, 2)" v-model="scope.row.cost" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" width="100">
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column label="采购数量" align="center" min-width="100">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.count = getNumber(scope.row.count, 2)" v-model="scope.row.count" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column prop="taxAmount" label="税额" align="center" width="100" />
<el-table-column label="含税价" align="center" width="100">
<el-table-column v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价" align="center" min-width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.taxPrice" @keyup.native="scope.row.taxPrice = getNumber(scope.row.taxPrice, 2)" clearable placeholder="" />
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.taxPrice = getNumber(scope.row.taxPrice, 2)" v-model="scope.row.taxPrice" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column prop="amount" label="采购金额" align="center" width="100" />
<el-table-column label="销售价" align="center" width="100">
<el-table-column v-else label="不含税单价" align="center" min-width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.salesPrice" @keyup.native="scope.row.salesPrice = getNumber(scope.row.salesPrice, 2)" clearable placeholder="" />
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.taxPrice = getNumber(scope.row.taxPrice, 2)" v-model="scope.row.taxPrice" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">合计含税金额</div>
<el-form-item><span class="addinputInfo">{{ hjhsjeTotal }} = 进价 {{ jjTotal }} + 税额 {{ seTotal }} | 数量 {{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">采购金额</div>
<el-form-item><span class="addinputInfo">{{ cgjeTotal }} = 合计含税金额{{ hjhsjeTotal }} + 误差调整<el-input style="width: 100px" v-model="formobj.errorAmount" clearable placeholder="" /></span></el-form-item>
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfjeTotal }} = 采购金额{{ cgjeTotal }} - 优惠金额<el-input style="width: 100px" v-model="formobj.discountAmount" clearable placeholder="" /></span></el-form-item>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费<el-input @keyup.native="formobj.freight = getNumber(formobj.freight, 2)" v-model="formobj.freight" style="width: 160px" clearable placeholder="" /> - 优惠<el-input @keyup.native="formobj.discountAmount = getNumber(formobj.discountAmount, 2)" v-model="formobj.discountAmount" style="width: 160px" clearable placeholder="" /> + 误差调整<el-input @keyup.native="formobj.errorAmount = getNumber(formobj.errorAmount, 2)" v-model="formobj.errorAmount" style="width: 160px" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<el-dialog :visible.sync="settleVisible" width="70%">
<el-form :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.payableAmount }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">预付款抵扣</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.prepaymentdeductAmount" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">结算方式</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.settleValue" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">结算金额</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.settleAmount" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">结算时间</div>
<el-form-item><el-date-picker class="addinputInfo addinputw" v-model="formobj.settleTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">其他结算方式</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.otherSettleKey" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其他结算金额</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.otherSettleValue" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">欠款金额</div>
<el-form-item><span class="addinputInfo">{{ debts }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="confirm"> </el-button>
<el-button type="info " size="mini" @click="settleVisible = false"> </el-button>
</div>
</el-dialog>
<!-- 选择商品 -->
<chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/purchase/procurement'
import { typeValues, getOrgSidByPath, choiceSupplierInfo } from '@/api/Common/dictcommons'
import chooseproducts from './relation/chooseproducts'
import uploadImg from '@/components/uploadFile/uploadImg'
export default {
name: 'ProcurementAdd',
components: {
chooseproducts,
uploadImg
},
data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
settleVisible: false, //
activeNames: '1',
tableKey: 1,
index: 0,
// supplier
supplierKey: 1,
supplierLoading: false,
supplierQuery: {
current: 1,
size: 2,
total: 0,
params: {
otherQuery: '',
useOrgSid: ''
}
},
supplierData: [],
// commodity
commodityKey: 1,
commodityLoading: false,
commodityQuery: {
current: 1,
size: 2,
total: 0,
params: {
otherQuery: '',
orgSid: ''
}
},
commodityData: [],
accept: '.jpg,.jpeg,.png',
procurementType_list: [],
procurementReason_list: [],
paymentMethod_list: [],
supplier_list: [],
account_list: [],
formobj: {
sid: '',
pmsPurchaseBill: {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
billTypeKey: '',
billTypeValue: '',
isInvoicing: '',
invoiceCode: '',
purchaserSid: '',
purchaserName: '',
storekeeperSid: '',
storekeeperName: '',
freight: '',
discountAmount: '',
payableAmount: '',
purchaser: '',
sortNo: '',
errorAmount: '',
pmsPurchaseBillDetailList: []
},
remarks: '',
createBySid: '',
createByName: '',
billSid: '',
createTime: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
purchaseReasonKey: '',
purchaseReasonValue: '',
payTypeKey: '',
payTypeValue: '',
errorAmount: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
purchaserSid: '',
purchaserName: '',
deliveryDate: '',
freight: '',
discountAmount: '',
payableAmount: '',
prepaymentdeductAmount: '',
settleKey: '',
settleValue: '',
settleAmount: '',
otherSettleKey: '',
otherSettleValue: '',
debts: '',
settleTime: ''
prepaymentAmount: '',
owedAmount: '',
deptSid: '',
deptName: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
useOrgSid: '',
useOrgName: '',
createOrgSid: '',
createOrgName: '',
purchasePay: {
sid: '',
billSid: '',
isFirstPay: '',
deposit: '',
goodsMoney: '',
accountName: '',
bankName: '',
bankAccount: '',
otherAmountName: '',
otherAmount: '',
payRemark: '',
filePaths: []
},
purchaseBillInvoice: {
billSid: '',
isInvoicing: '',
billTypeKey: '',
billType: '',
taxRate: ''
},
pmsPurchaseBillDetailList: []
},
rules: {}
}
},
computed: {
//
jjTotal() {
let jj = 0
if (this.formobj.pmsPurchaseBill.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBill.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '' && e.cost !== '' && e.count !== '') {
jj = jj + Math.round((parseFloat(e.cost) * parseFloat(e.count)) * 100) / 100
}
})
}
return jj
},
//
seTotal() {
let se = 0
if (this.formobj.pmsPurchaseBill.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBill.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '' && e.taxAmount !== '') {
se = se + parseFloat(e.taxAmount)
}
})
}
return se
},
//
//
slTotal() {
let sl = 0
if (this.formobj.pmsPurchaseBill.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBill.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '' && e.count !== '') {
sl = sl + parseFloat(e.count)
let sl = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
}
})
}
return sl
},
//
hjhsjeTotal() {
let hjhsje = 0
if (this.jjTotal !== null) {
hjhsje = this.jjTotal
}
return hjhsje
},
//
cgjeTotal() {
let cgje = 0
if (this.hjhsjeTotal !== null) {
cgje = cgje + Math.round((parseFloat(this.hjhsjeTotal !== '' ? this.hjhsjeTotal : '0') + parseFloat(this.formobj.pmsPurchaseBill.errorAmount !== '' ? this.formobj.pmsPurchaseBill.errorAmount : '0')) * 100) / 100
}
return cgje
},
//
yfjeTotal() {
let yfje = 0
if (this.cgjeTotal !== null) {
yfje = yfje + Math.round((parseFloat(this.cgjeTotal !== '' ? this.cgjeTotal : '0') - parseFloat(this.formobj.pmsPurchaseBill.discountAmount !== '' ? this.formobj.pmsPurchaseBill.discountAmount : '0')) * 100) / 100
cgTotal() {
let cg = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
}
})
}
return yfje
return cg
},
//
debts() {
let debt = 0
return debt
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this.formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100
return yf
}
},
methods: {
init() {
typeValues({ type: 'procurementType' }).then((res) => {
if (res.success) {
this.procurementType_list = res.data
}
})
typeValues({ type: 'procurementReason' }).then((res) => {
if (res.success) {
this.procurementReason_list = res.data
}
})
typeValues({ type: 'paymentMethod' }).then((res) => {
if (res.success) {
this.paymentMethod_list = res.data
}
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
choiceSupplierInfo({ orgSid: res.data }).then((resp) => {
if (resp.success) {
this.supplier_list = resp.data
}
})
}
})
},
showAdd() {
this.viewTitle = '【新增】采购单'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
day: nowDate.getDate()
}
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
},
showEdit(row) {
this.viewTitle = '【新增】采购单'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
req.fetchDetailsBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
}
})
},
@ -400,102 +420,111 @@ export default {
}
return val
},
supplierInput(value) {
this.supplierQuery.params.otherQuery = value
this.supplierLoading = true
req.supplierListPage(this.supplierQuery).then((response) => {
if (response.success) {
this.supplierLoading = false
this.supplierData = response.data.records
this.supplierQuery.total = response.data.total
} else {
this.serviceLoading = false
this.supplierData = []
this.supplierQuery.total = 0
}
})
purchaseTypeChange(value) {
const choose = this.procurementType_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.purchaseTypeKey = choose[0].dictKey
} else {
this.formobj.purchaseTypeKey = ''
}
},
supplierCurrentChange(value) {
this.formobj.pmsPurchaseBill.supplierName = value.supplierName
this.formobj.pmsPurchaseBill.supplierSid = value.sid
this.formobj.pmsPurchaseBill.supplierPhone = value.contactTelePhone
document.body.click()
purchaseReasonChange(value) {
const choose = this.procurementReason_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.purchaseReasonKey = choose[0].dictKey
} else {
this.formobj.purchaseReasonKey = ''
}
},
//
commodityHeader(h, { column }) {
return h(
'div',
[
h('span', column.label),
h('i', {
class: 'add-btn-icon el-icon-plus',
style: 'color: red;font-size:20px',
on: {
click: this.commodityAdd //
}
})
]
)
payTypeChange(value) {
const choose = this.paymentMethod_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.payTypeKey = choose[0].dictKey
} else {
this.formobj.payTypeKey = ''
}
},
commodityAdd() {
this.formobj.pmsPurchaseBill.pmsPurchaseBillDetailList.push({
sid: '',
billSid: '',
goodSpuSid: '',
goodsSpuName: '',
goodsSkuSid: '',
goodsSkuTitle: '',
goodsSkuCode: '',
goodsSkuOwnSpec: '',
currentCount: '',
warehouseSid: '',
warehouseName: '',
warehouseAreaSid: '',
warehouseAreaName: '',
warehouseRackSid: '',
warehouseRackName: '',
cost: '',
count: '',
taxAmount: '',
taxPrice: '',
amount: '',
salesPrice: '',
minimumSalesPrice: ''
})
supplierChange(value) {
const choose = this.supplier_list.filter((item) => item.sid === value)
if (choose !== null && choose.length > 0) {
this.formobj.supplierName = choose[0].supplierName
this.account_list = choose[0].supplierBankChoices
} else {
this.formobj.supplierName = ''
this.account_list = []
}
},
commodityInput(value) {
this.commodityQuery.params.otherQuery = value
this.commodityLoading = true
req.purGoodsListPage(this.commodityQuery).then((response) => {
if (response.success) {
this.commodityLoading = false
this.commodityData = response.data.records
this.commodityQuery.total = response.data.total
} else {
this.serviceLoading = false
this.commodityData = []
this.commodityQuery.total = 0
isInvoicingChange(val) {
if (val === '1') {
const choose = this.supplier_list.filter((item) => item.sid === this.formobj.supplierSid)
if (choose !== null && choose.length > 0) {
this.formobj.purchaseBillInvoice.billType = choose[0].billingTypeValue
this.formobj.purchaseBillInvoice.billTypeKey = choose[0].billingTypeKey
this.formobj.purchaseBillInvoice.taxRate = choose[0].taxRate
}
})
} else {
this.formobj.purchaseBillInvoice.billType = ''
this.formobj.purchaseBillInvoice.billTypeKey = ''
this.formobj.purchaseBillInvoice.taxRate = ''
}
},
commodityDelete(index) {
this.formobj.pmsPurchaseBill.pmsPurchaseBillDetailList.splice(index, 1)
accountChange(value) {
const choose = this.account_list.filter((item) => item.accountName === value)
if (choose !== null && choose.length > 0) {
this.formobj.purchasePay.bankAccount = choose[0].bankAccount
this.formobj.purchasePay.bankName = choose[0].bankName
} else {
this.formobj.purchasePay.bankAccount = ''
this.formobj.purchasePay.bankName = ''
}
},
selectProducts() {
this.viewState = 2
const aa = []
this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
},
backData(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.pmsPurchaseBillDetailList.push({
sid: '',
billSid: '',
goodSpuSid: e.goodsSpuSid,
goodsSpuName: e.goodsSpuName,
goodsSkuSid: e.goodsSkuSid,
goodsSkuTitle: '',
goodsSkuCode: e.goodsSkuCode,
goodsSkuOwnSpec: e.indexes,
unit: e.goodsUnitName,
warehouseSid: '',
warehouseName: '',
cost: '',
count: '',
taxAmount: '',
taxPrice: '',
amount: ''
})
})
}
},
resetState() {
this.viewState = 1
},
commodityCurrentChange(value, row) {
row.goodsSpuName = value.goodsName
row.goodsSkuOwnSpec = value.title
document.body.click()
commodityDelete(index) {
this.formobj.pmsPurchaseBillDetailList.splice(index, 1)
},
//
amountInput(row) {
if (row.goodsSpuName !== '') {
row.amount = Math.round((parseFloat(row.cost !== '' ? row.cost : '0') * parseFloat(row.count !== '' ? row.count : '0')) * 100) / 100
row.amount = Math.round((parseFloat(row.taxPrice !== '' ? row.taxPrice : '0') * parseFloat(row.count !== '' ? row.count : '0')) * 100) / 100
}
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
this.formobj.payableAmount = this.yfTotal
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
@ -509,17 +538,14 @@ export default {
}
})
},
settle() {
this.settleVisible = true
this.formobj.payableAmount = this.yfjeTotal
},
confirm() {
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.settlement(this.formobj).then((res) => {
this.formobj.payableAmount = this.yfTotal
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '结算成功' })
this.$message({ showClose: true, type: 'success', message: '提交成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
@ -534,51 +560,67 @@ export default {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
pmsPurchaseBill: {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
billTypeKey: '',
billTypeValue: '',
isInvoicing: '',
invoiceCode: '',
purchaserSid: '',
purchaserName: '',
storekeeperSid: '',
storekeeperName: '',
freight: '',
discountAmount: '',
payableAmount: '',
purchaser: '',
sortNo: '',
errorAmount: '',
pmsPurchaseBillDetailList: []
},
remarks: '',
createBySid: '',
createByName: '',
billSid: '',
createTime: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
purchaseReasonKey: '',
purchaseReasonValue: '',
payTypeKey: '',
payTypeValue: '',
errorAmount: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
purchaserSid: '',
purchaserName: '',
deliveryDate: '',
freight: '',
discountAmount: '',
payableAmount: '',
prepaymentdeductAmount: '',
settleKey: '',
settleValue: '',
settleAmount: '',
otherSettleKey: '',
otherSettleValue: '',
debts: '',
settleTime: ''
prepaymentAmount: '',
owedAmount: '',
deptSid: '',
deptName: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
useOrgSid: '',
useOrgName: '',
createOrgSid: '',
createOrgName: '',
purchasePay: {
sid: '',
billSid: '',
isFirstPay: '',
deposit: '',
goodsMoney: '',
accountName: '',
bankName: '',
bankAccount: '',
otherAmountName: '',
otherAmount: '',
payRemark: '',
filePaths: []
},
purchaseBillInvoice: {
billSid: '',
isInvoicing: '',
billTypeKey: '',
billType: '',
taxRate: ''
},
pmsPurchaseBillDetailList: []
}
this.submitdisabled = false
this.settleVisible = false
this.$emit('doback')
}
}
@ -596,4 +638,11 @@ export default {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

319
yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue

@ -9,13 +9,155 @@
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-table :key="tableKey" :data="formobj.pmsPurchaseBill.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseReasonValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.payTypeValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否需要发票</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}({{ formobj.purchaseBillInvoice.taxRate }})</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额{{ formobj.prepaymentAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额{{ formobj.owedAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.payTypeValue == '单笔付款'">
<div class="title">订金及付款申请</div>
<el-row>
<el-col :span="8">
<div class="span-sty">是否先付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.isFirstPay == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">审批通过后付订金</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.deposit }}</span></el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">验货后付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.goodsMoney }}</span></el-form-item>
</el-col>
<el-col :span="16" v-else>
<div class="span-sty">审批通过后付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.goodsMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">收款账户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.accountName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">银行账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankAccount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">其他费用名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.otherAmountName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其他费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.otherAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">付款备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.payRemark }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.purchasePay.filePaths" :key="index" :src="item" :preview-src-list="formobj.purchasePay.filePaths" /></el-form-item>
</el-col>
</el-row>
</div>
<div class="title ">商品列表</div>
<el-table :key="tableKey" :data="formobj.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" min-width="100" />
<el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价" align="center" min-width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" min-width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费{{ formobj.freight }} - 优惠{{ formobj.discountAmount }} + 误差调整{{ formobj.errorAmount }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/purchase/procurement'
@ -25,25 +167,188 @@ export default {
return {
viewTitle: '',
viewState: 1,
tableKey: 0,
tableKey: 1,
index: 0,
formobj: {},
formobj: {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
createTime: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
purchaseReasonKey: '',
purchaseReasonValue: '',
payTypeKey: '',
payTypeValue: '',
errorAmount: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
purchaserSid: '',
purchaserName: '',
deliveryDate: '',
freight: '',
discountAmount: '',
payableAmount: '',
prepaymentAmount: '',
owedAmount: '',
deptSid: '',
deptName: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
useOrgSid: '',
useOrgName: '',
createOrgSid: '',
createOrgName: '',
purchasePay: {
sid: '',
billSid: '',
isFirstPay: '',
deposit: '',
goodsMoney: '',
accountName: '',
bankName: '',
bankAccount: '',
otherAmountName: '',
otherAmount: '',
payRemark: '',
filePaths: []
},
purchaseBillInvoice: {
billSid: '',
isInvoicing: '',
billTypeKey: '',
billType: '',
taxRate: ''
},
pmsPurchaseBillDetailList: []
},
rules: {}
}
},
computed: {
//
slTotal() {
let sl = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
}
})
}
return sl
},
//
cgTotal() {
let cg = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
}
})
}
return cg
},
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this.formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100
return yf
}
},
methods: {
showInfo(row) {
this.viewTitle = '采购开单详情'
req.fetchDetailsBySid(row.sio).then((res) => {
this.viewTitle = '采购单详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.purchasePay.filePaths.length > 0) {
const aa = []
this.formobj.purchasePay.filePaths.forEach((e) => {
aa.push(e.url)
})
this.formobj.purchasePay.filePaths = aa
}
}
})
},
handleReturn() {
this.formobj = {}
this.formobj = {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
createTime: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
purchaseReasonKey: '',
purchaseReasonValue: '',
payTypeKey: '',
payTypeValue: '',
errorAmount: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
purchaserSid: '',
purchaserName: '',
deliveryDate: '',
freight: '',
discountAmount: '',
payableAmount: '',
prepaymentAmount: '',
owedAmount: '',
deptSid: '',
deptName: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
useOrgSid: '',
useOrgName: '',
createOrgSid: '',
createOrgName: '',
purchasePay: {
sid: '',
billSid: '',
isFirstPay: '',
deposit: '',
goodsMoney: '',
accountName: '',
bankName: '',
bankAccount: '',
otherAmountName: '',
otherAmount: '',
payRemark: '',
filePaths: []
},
purchaseBillInvoice: {
billSid: '',
isInvoicing: '',
billTypeKey: '',
billType: '',
taxRate: ''
},
pmsPurchaseBillDetailList: []
}
this.$emit('doback')
},
}
}
}
</script>

164
yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue

@ -0,0 +1,164 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择商品</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="商品名称" class="searchlist">
<el-input v-model="listQuery.params.goodsSpuName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="图号" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
</el-form-item>
<el-form-item label="供应商" class="searchlist">
<el-input v-model="listQuery.params.manufacturerName" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">商品列表</div>
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" />
<el-table-column prop="indexes" label="规格" align="center" />
<el-table-column prop="goodsUnitName" label="单位" align="center" />
<el-table-column prop="manufacturerName" label="供应商" align="center" />
</el-table>
</div>
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import { chooseproducts } from '@/api/Common/dictcommons'
export default {
name: 'SelectVehicle',
components: {
Pagination
},
data() {
return {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 5,
params: {
createOrgSid: '',
goodsSpuName: '',
goodsSkuCode: '',
manufacturerName: ''
},
total: 0
}
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
chooseproducts(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 5
this.listQuery.total = 0
this.listQuery.params.goodsSpuName = ''
this.listQuery.params.goodsSkuCode = ''
this.listQuery.params.manufacturerName = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, createOrgSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.createOrgSid = createOrgSid
this.listQuery.current = 1
this.listQuery.size = 5
this.listQuery.total = 0
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({ title: '提示', message: '请至少选择一条记录进行操作', type: 'error', duration: 2000 })
}
},
//
handleReturn() {
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

578
yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue

@ -0,0 +1,578 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="openCountersign('加签')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseReasonValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.payTypeValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否需要发票</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}({{ formobj.purchaseBillInvoice.taxRate }})</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额{{ formobj.prepaymentAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额{{ formobj.owedAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.payTypeValue == '单笔付款'">
<div class="title">订金及付款申请</div>
<el-row>
<el-col :span="8">
<div class="span-sty">是否先付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.isFirstPay == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">审批通过后付订金</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.deposit }}</span></el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">验货后付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.goodsMoney }}</span></el-form-item>
</el-col>
<el-col :span="16" v-else>
<div class="span-sty">审批通过后付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.goodsMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">收款账户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.accountName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">银行账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankAccount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">其他费用名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.otherAmountName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其他费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.otherAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">付款备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.payRemark }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.purchasePay.filePaths" :key="index" :src="item" :preview-src-list="formobj.purchasePay.filePaths" /></el-form-item>
</el-col>
</el-row>
</div>
<div class="title ">商品列表</div>
<el-table :key="tableKey" :data="formobj.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" min-width="100" />
<el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价" align="center" min-width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" min-width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费{{ formobj.freight }} - 优惠{{ formobj.discountAmount }} + 误差调整{{ formobj.errorAmount }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd" >
<el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span class="icon">*</span>加签人员:
</el-col>
<el-col :span="20">
<el-form-item>
<el-select v-model="countersign.assignee" placeholder="请选择" filterable>
<el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span>当前环节:</span>
</el-col>
<el-col :span="20">
<el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row :class="{rowClass:!currentLink}">
<el-col :span="4" class="tleftb">
<span>意见:</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="reject"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/purchase/procurement'
export default {
name: 'ProcurementDaiBan',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
createTime: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
purchaseReasonKey: '',
purchaseReasonValue: '',
payTypeKey: '',
payTypeValue: '',
errorAmount: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
purchaserSid: '',
purchaserName: '',
deliveryDate: '',
freight: '',
discountAmount: '',
payableAmount: '',
prepaymentAmount: '',
owedAmount: '',
deptSid: '',
deptName: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
useOrgSid: '',
useOrgName: '',
createOrgSid: '',
createOrgName: '',
purchasePay: {
sid: '',
billSid: '',
isFirstPay: '',
deposit: '',
goodsMoney: '',
accountName: '',
bankName: '',
bankAccount: '',
otherAmountName: '',
otherAmount: '',
payRemark: '',
filePaths: []
},
purchaseBillInvoice: {
billSid: '',
isInvoicing: '',
billTypeKey: '',
billType: '',
taxRate: ''
},
pmsPurchaseBillDetailList: []
},
rules: {},
options: [],
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
computed: {
//
slTotal() {
let sl = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
}
})
}
return sl
},
//
cgTotal() {
let cg = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
}
})
}
return cg
},
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this.formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100
return yf
}
},
methods: {
showInfo(sid) {
this.viewTitle = '采购单详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.purchasePay.filePaths.length > 0) {
const aa = []
this.formobj.purchasePay.filePaths.forEach((e) => {
aa.push(e.url)
})
this.formobj.purchasePay.filePaths = aa
}
}
})
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
}
},
/** 加签 */
handleCountersign() {
if (this.countersign.assignee === '') {
this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
return
}
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
return
}
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.rowClass{
border-top: 1px solid #E0E3EB;
}
</style>

586
yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue

@ -0,0 +1,586 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购类型</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.purchaseTypeValue" placeholder="请选择" @change="purchaseTypeChange" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.purchaseReasonValue" placeholder="请选择" @change="purchaseReasonChange" clearable filterable>
<el-option v-for="item in procurementReason_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.payTypeValue" placeholder="请选择" @change="payTypeChange" clearable filterable>
<el-option v-for="item in paymentMethod_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.supplierSid" placeholder="请选择" @change="supplierChange" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否需要发票</div>
<el-form-item>
<el-radio-group class="addinputInfo" style="font-size: 1px" @change="isInvoicingChange" v-model="formobj.purchaseBillInvoice.isInvoicing">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}({{ formobj.purchaseBillInvoice.taxRate }})</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额<el-input style="width: 30%" @keyup.native="formobj.prepaymentAmount = getNumber(formobj.prepaymentAmount, 2)" v-model="formobj.prepaymentAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额<el-input style="width: 30%" @keyup.native="formobj.owedAmount = getNumber(formobj.owedAmount, 2)" v-model="formobj.owedAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.payTypeValue == '单笔付款'">
<div class="title">订金及付款申请</div>
<el-row>
<el-col :span="8">
<div class="span-sty">是否先付货款</div>
<el-form-item>
<el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.purchasePay.isFirstPay">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">审批通过后付订金</div>
<el-form-item>
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.deposit = getNumber(formobj.purchasePay.deposit, 2)" v-model="formobj.purchasePay.deposit" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">验货后付货款</div>
<el-form-item>
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="16" v-else>
<div class="span-sty">审批通过后付货款</div>
<el-form-item>
<el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.goodsMoney = getNumber(formobj.purchasePay.goodsMoney, 2)" v-model="formobj.purchasePay.goodsMoney" clearable placeholder=""/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">收款账户名称</div>
<el-form-item>
<el-select class="addinputInfo" v-model="formobj.purchasePay.accountName" placeholder="请选择" @change="accountChange" clearable filterable>
<el-option v-for="item in account_list" :key="item.bankAccount" :label="item.accountName" :value="item.accountName"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">银行账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankAccount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">其他费用名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchasePay.otherAmountName" clearable placeholder=""/></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其他费用合计</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.purchasePay.otherAmount = getNumber(formobj.purchasePay.otherAmount, 2)" v-model="formobj.purchasePay.otherAmount" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">付款备注</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.purchasePay.payRemark" clearable placeholder=""/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<upload-img ref="uploadImg" class="addinputInfo" :accept="accept" v-model="formobj.purchasePay.filePaths" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
</div>
<div class="title titleOne">
<div>商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="selectProducts">选择商品</el-button>
</div>
<el-table :key="tableKey" :data="formobj.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="commodityDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column label="采购数量" align="center" min-width="100">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.count = getNumber(scope.row.count, 2)" v-model="scope.row.count" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价" align="center" min-width="150">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.taxPrice = getNumber(scope.row.taxPrice, 2)" v-model="scope.row.taxPrice" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column v-else label="不含税单价" align="center" min-width="150">
<template slot-scope="scope">
<el-input @input="amountInput(scope.row)" @keyup.native="scope.row.taxPrice = getNumber(scope.row.taxPrice, 2)" v-model="scope.row.taxPrice" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费<el-input @keyup.native="formobj.freight = getNumber(formobj.freight, 2)" v-model="formobj.freight" style="width: 160px" clearable placeholder="" /> - 优惠<el-input @keyup.native="formobj.discountAmount = getNumber(formobj.discountAmount, 2)" v-model="formobj.discountAmount" style="width: 160px" clearable placeholder="" /> + 误差调整<el-input @keyup.native="formobj.errorAmount = getNumber(formobj.errorAmount, 2)" v-model="formobj.errorAmount" style="width: 160px" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<!-- 选择商品 -->
<chooseproducts v-show="viewState == 2" ref="divSp" @backData="backData" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/purchase/procurement'
import { typeValues, getOrgSidByPath, choiceSupplierInfo } from '@/api/Common/dictcommons'
import chooseproducts from './relation/chooseproducts'
import uploadImg from '@/components/uploadFile/uploadImg'
export default {
name: 'ProcurementEdit',
components: {
chooseproducts,
uploadImg
},
data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
tableKey: 1,
index: 0,
accept: '.jpg,.jpeg,.png',
procurementType_list: [],
procurementReason_list: [],
paymentMethod_list: [],
supplier_list: [],
account_list: [],
formobj: {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
createTime: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
purchaseReasonKey: '',
purchaseReasonValue: '',
payTypeKey: '',
payTypeValue: '',
errorAmount: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
purchaserSid: '',
purchaserName: '',
deliveryDate: '',
freight: '',
discountAmount: '',
payableAmount: '',
prepaymentAmount: '',
owedAmount: '',
deptSid: '',
deptName: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
useOrgSid: '',
useOrgName: '',
createOrgSid: '',
createOrgName: '',
purchasePay: {
sid: '',
billSid: '',
isFirstPay: '',
deposit: '',
goodsMoney: '',
accountName: '',
bankName: '',
bankAccount: '',
otherAmountName: '',
otherAmount: '',
payRemark: '',
filePaths: []
},
purchaseBillInvoice: {
billSid: '',
isInvoicing: '',
billTypeKey: '',
billType: '',
taxRate: ''
},
pmsPurchaseBillDetailList: []
},
rules: {}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
computed: {
//
slTotal() {
let sl = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
}
})
}
return sl
},
//
cgTotal() {
let cg = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
}
})
}
return cg
},
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this.formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100
return yf
}
},
methods: {
init() {
typeValues({ type: 'procurementType' }).then((res) => {
if (res.success) {
this.procurementType_list = res.data
}
})
typeValues({ type: 'procurementReason' }).then((res) => {
if (res.success) {
this.procurementReason_list = res.data
}
})
typeValues({ type: 'paymentMethod' }).then((res) => {
if (res.success) {
this.paymentMethod_list = res.data
}
})
},
showInfo(sid) {
this.viewTitle = '【编辑】采购单'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
choiceSupplierInfo({ orgSid: this.formobj.createOrgSid }).then((resp) => {
if (resp.success) {
this.supplier_list = resp.data
}
})
}
})
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
purchaseTypeChange(value) {
const choose = this.procurementType_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.purchaseTypeKey = choose[0].dictKey
} else {
this.formobj.purchaseTypeKey = ''
}
},
purchaseReasonChange(value) {
const choose = this.procurementReason_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.purchaseReasonKey = choose[0].dictKey
} else {
this.formobj.purchaseReasonKey = ''
}
},
payTypeChange(value) {
const choose = this.paymentMethod_list.filter((item) => item.dictValue === value)
if (choose !== null && choose.length > 0) {
this.formobj.payTypeKey = choose[0].dictKey
} else {
this.formobj.payTypeKey = ''
}
},
supplierChange(value) {
const choose = this.supplier_list.filter((item) => item.sid === value)
if (choose !== null && choose.length > 0) {
this.formobj.supplierName = choose[0].supplierName
this.account_list = choose[0].supplierBankChoices
} else {
this.formobj.supplierName = ''
this.account_list = []
}
},
isInvoicingChange(val) {
if (val === '1') {
const choose = this.supplier_list.filter((item) => item.sid === this.formobj.supplierSid)
if (choose !== null && choose.length > 0) {
this.formobj.purchaseBillInvoice.billType = choose[0].billingTypeValue
this.formobj.purchaseBillInvoice.billTypeKey = choose[0].billingTypeKey
this.formobj.purchaseBillInvoice.taxRate = choose[0].taxRate
}
} else {
this.formobj.purchaseBillInvoice.billType = ''
this.formobj.purchaseBillInvoice.billTypeKey = ''
this.formobj.purchaseBillInvoice.taxRate = ''
}
},
accountChange(value) {
const choose = this.account_list.filter((item) => item.accountName === value)
if (choose !== null && choose.length > 0) {
this.formobj.purchasePay.bankAccount = choose[0].bankAccount
this.formobj.purchasePay.bankName = choose[0].bankName
} else {
this.formobj.purchasePay.bankAccount = ''
this.formobj.purchasePay.bankName = ''
}
},
selectProducts() {
this.viewState = 2
const aa = []
this.$refs['divSp'].showData(aa, this.formobj.createOrgSid)
},
backData(value) {
this.viewState = 1
if (value.length > 0) {
value.forEach((e) => {
this.formobj.pmsPurchaseBillDetailList.push({
sid: '',
billSid: '',
goodSpuSid: e.goodsSpuSid,
goodsSpuName: e.goodsSpuName,
goodsSkuSid: e.goodsSkuSid,
goodsSkuTitle: '',
goodsSkuCode: e.goodsSkuCode,
goodsSkuOwnSpec: e.indexes,
unit: e.goodsUnitName,
warehouseSid: '',
warehouseName: '',
cost: '',
count: '',
taxAmount: '',
taxPrice: '',
amount: ''
})
})
}
},
resetState() {
this.viewState = 1
},
commodityDelete(index) {
this.formobj.pmsPurchaseBillDetailList.splice(index, 1)
},
//
amountInput(row) {
if (row.goodsSpuName !== '') {
row.amount = Math.round((parseFloat(row.taxPrice !== '' ? row.taxPrice : '0') * parseFloat(row.count !== '' ? row.count : '0')) * 100) / 100
}
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
this.formobj.payableAmount = this.yfTotal
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
this.formobj.payableAmount = this.yfTotal
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '提交成功' })
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style>

370
yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue

@ -0,0 +1,370 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">采购类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseReasonValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.payTypeValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否需要发票</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-show="formobj.purchaseBillInvoice.isInvoicing == '1'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillInvoice.billType }}({{ formobj.purchaseBillInvoice.taxRate }})</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '预付款'">
<el-col :span="24">
<div class="span-sty">预付款情况</div>
<el-form-item><span class="addinputInfo">当前预付款项金额{{ formobj.prepaymentAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.payTypeValue == '月结'">
<el-col :span="24">
<div class="span-sty">月结欠款情况</div>
<el-form-item><span class="addinputInfo">累计欠款金额{{ formobj.owedAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.payTypeValue == '单笔付款'">
<div class="title">订金及付款申请</div>
<el-row>
<el-col :span="8">
<div class="span-sty">是否先付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.isFirstPay == '1' ? '是' : '否' }}</span></el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">审批通过后付订金</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.deposit }}</span></el-form-item>
</el-col>
<el-col :span="8" v-if="formobj.purchasePay.isFirstPay == '0'">
<div class="span-sty">验货后付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.goodsMoney }}</span></el-form-item>
</el-col>
<el-col :span="16" v-else>
<div class="span-sty">审批通过后付货款</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.goodsMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">收款账户名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.accountName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">开户行</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">银行账号</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.bankAccount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">其他费用名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.otherAmountName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其他费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.otherAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">付款备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchasePay.payRemark }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.purchasePay.filePaths" :key="index" :src="item" :preview-src-list="formobj.purchasePay.filePaths" /></el-form-item>
</el-col>
</el-row>
</div>
<div class="title ">商品列表</div>
<el-table :key="tableKey" :data="formobj.pmsPurchaseBillDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" min-width="100" />
<el-table-column prop="taxPrice" v-if="formobj.purchaseBillInvoice.isInvoicing == '1'" label="含税单价" align="center" min-width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" min-width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ slTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }} = 采购金额{{ cgTotal }} + 运费{{ formobj.freight }} - 优惠{{ formobj.discountAmount }} + 误差调整{{ formobj.errorAmount }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/purchase/procurement'
export default {
name: 'ProcurementYiBan',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
createTime: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
purchaseTypeKey: '',
purchaseTypeValue: '',
purchaseReasonKey: '',
purchaseReasonValue: '',
payTypeKey: '',
payTypeValue: '',
errorAmount: '',
supplierSid: '',
supplierName: '',
supplierPhone: '',
purchaserSid: '',
purchaserName: '',
deliveryDate: '',
freight: '',
discountAmount: '',
payableAmount: '',
prepaymentAmount: '',
owedAmount: '',
deptSid: '',
deptName: '',
procDefId: '',
nodeId: '',
procInstId: '',
nodeState: '',
taskId: '',
finishTime: '',
useOrgSid: '',
useOrgName: '',
createOrgSid: '',
createOrgName: '',
purchasePay: {
sid: '',
billSid: '',
isFirstPay: '',
deposit: '',
goodsMoney: '',
accountName: '',
bankName: '',
bankAccount: '',
otherAmountName: '',
otherAmount: '',
payRemark: '',
filePaths: []
},
purchaseBillInvoice: {
billSid: '',
isInvoicing: '',
billTypeKey: '',
billType: '',
taxRate: ''
},
pmsPurchaseBillDetailList: []
},
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
rules: {}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
computed: {
//
slTotal() {
let sl = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
sl = Math.round((parseFloat(sl) + parseFloat(e.count !== '' ? e.count : '0')) * 100) / 100
}
})
}
return sl
},
//
cgTotal() {
let cg = '0'
if (this.formobj.pmsPurchaseBillDetailList.length > 0) {
this.formobj.pmsPurchaseBillDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
cg = Math.round((parseFloat(cg) + parseFloat(e.amount !== '' ? e.amount : '0')) * 100) / 100
}
})
}
return cg
},
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this.formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100
return yf
}
},
methods: {
showInfo(sid) {
this.viewTitle = '采购单详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.purchasePay.filePaths.length > 0) {
const aa = []
this.formobj.purchasePay.filePaths.forEach((e) => {
aa.push(e.url)
})
this.formobj.purchasePay.filePaths = aa
}
}
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleRevoke()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
})
})
},
/** 撤回任务 */
handleRevoke() {
req.revokeProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

164
yxt-as-ui/src/views/workFlow/caigouFlow/relation/chooseproducts.vue

@ -0,0 +1,164 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>选择商品</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="120px" class="tab-header">
<el-form-item label="商品名称" class="searchlist">
<el-input v-model="listQuery.params.goodsSpuName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="图号" class="searchlist">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
</el-form-item>
<el-form-item label="供应商" class="searchlist">
<el-input v-model="listQuery.params.manufacturerName" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">商品列表</div>
<!-- <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>-->
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column prop="goodsSpuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" />
<el-table-column prop="indexes" label="规格" align="center" />
<el-table-column prop="goodsUnitName" label="单位" align="center" />
<el-table-column prop="manufacturerName" label="供应商" align="center" />
</el-table>
</div>
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<Pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import { chooseproducts } from '@/api/Common/dictcommons'
export default {
name: 'SelectVehicle',
components: {
Pagination
},
data() {
return {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
sids: [],
list: [],
number: '',
listLoading: false,
listQuery: {
current: 1,
size: 5,
params: {
createOrgSid: '',
goodsSpuName: '',
goodsSkuCode: '',
manufacturerName: ''
},
total: 0
}
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
chooseproducts(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery.current = 1
this.listQuery.size = 5
this.listQuery.total = 0
this.listQuery.params.goodsSpuName = ''
this.listQuery.params.goodsSkuCode = ''
this.listQuery.params.manufacturerName = ''
this.getList()
},
handleSelectionChange(row) {
this.sids = row
},
showData(value, createOrgSid) {
// const aa = []
// if (value.length > 0) {
// for (var i = 0; i < value.length; i++) {
// aa.push(value[i].saleVehSid)
// }
// this.listQuery.params.saleVehSids = aa
// } else {
// this.listQuery.params.saleVehSids = []
// }``
this.listQuery.params.createOrgSid = createOrgSid
this.listQuery.current = 1
this.listQuery.size = 5
this.listQuery.total = 0
this.getList()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$notify({ title: '提示', message: '请至少选择一条记录进行操作', type: 'error', duration: 2000 })
}
},
//
handleReturn() {
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

5
yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml

@ -13,7 +13,10 @@
<update id="updateFlowFiled">
UPDATE as_arrearsout_apply
SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>

5
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml

@ -20,7 +20,10 @@
<update id="updateFlowFiled">
UPDATE as_oldparthandle_apply
SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>

5
yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml

@ -31,7 +31,10 @@
<update id="updateFlowFiled">
UPDATE as_oldpartreturn_apply
SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>

17
yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsPurchasebackBillRest.java

@ -94,21 +94,4 @@ public class PmsPurchasebackBillRest {
PmsPurchasebackBillDetailsVo vo = pmsPurchasebackBillService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@PostMapping("/exportExcel")
@ApiOperation(value = "导出")
public void exportExcel(@RequestBody PmsPurchasebackBillQuery query) {
//得到所有要导出的数据
List<PmsPurchasebackBillExcelVo> exportVoList = pmsPurchasebackBillService.listExcel(query);
//定义导出的excel名字
String excelName = "出入库查询";
String fileNameURL = "";
try {
fileNameURL = URLEncoder.encode(excelName, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, exportVoList, PmsPurchasebackBillExcelVo.class, response);
}
}

6
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.java

@ -53,11 +53,5 @@ import java.util.List;
public interface PmsPurchasebackBillMapper extends BaseMapper<PmsPurchasebackBill> {
IPage<PmsPurchasebackBillVo> selectPageVo(IPage<PmsPurchasebackBill> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchasebackBill> qw);
List<PmsPurchasebackBillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsPurchasebackBill> qw);
@Select("select * from pms_purchaseback_bill")
List<PmsPurchasebackBillVo> selectListVo();
List<PmsPurchasebackBillExcelVo> listExcel(@Param(Constants.WRAPPER) QueryWrapper<PmsPurchasebackBillExcelVo> qw);
}

39
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml

@ -6,43 +6,24 @@
<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillVo">
SELECT
ppb.sid,
ppb.`nodeState`,
ppb.billNo,
ppb.createOrgName,
ppb.`deptName`,
ppb.createTime,
ppb.`finishTime`,
pb.billNo AS sourceBillNo,
pb.`payTypeValue`,
pb.`purchaseReasonValue`,
pb.`purchaseTypeValue`,
pb.supplierName,
pb.supplierPhone,
pb.purchaserName,
pb.storekeeperName,
pbs.settleTime
SUM(ppbd.backAmount) AS backAmountCount
FROM
pms_purchaseback_bill ppb
LEFT JOIN pms_purchase_bill pb
ON ppb.`sourceBillSid` = pb.`sid`
LEFT JOIN pms_purchase_bill_settle pbs
ON pbs.`billSid` = pb.`sid`
LEFT JOIN pms_purchase_bill_detail ppbd
ON ppb.`sid` = ppbd.`billSid`
<where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillVo">
SELECT * FROM pms_purchaseback_bill <where> ${ew.sqlSegment} </where>
</select>
<select id="listExcel" resultType="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillExcelVo">
SELECT
ppb.billNo,
ppb.createTime,
pb.billNo AS sourceBillNo,
pb.supplierName,
pb.supplierPhone,
pb.purchaserName,
pb.storekeeperName,
pbs.settleTime
FROM
pms_purchaseback_bill ppb
LEFT JOIN pms_purchase_bill pb
ON ppb.`sourceBillSid` = pb.`sid`
LEFT JOIN pms_purchase_bill_settle pbs
ON pbs.`billSid` = pb.`sid`
<where> ${ew.sqlSegment} </where>
</select>
</mapper>

37
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillQuery.java

@ -51,20 +51,33 @@ import java.math.BigDecimal;
@ApiModel(value = "采购退货单据 查询条件", description = "采购退货单据 查询条件")
public class PmsPurchasebackBillQuery implements Query {
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@ApiModelProperty("申请人")
private String createByName;
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("创建开始日期")
private String createStartTime;
@ApiModelProperty("创建结束日期")
private String createEndTime;
@ApiModelProperty("门店sid")
private String createOrgSid;
@ApiModelProperty("单据状态(0未作废,1已作废)")
private String documentState;
@ApiModelProperty("票据类型key")
private String billTypeKey;
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("欠款状态(0欠款,1未欠款)")
private String arrearsState;
@ApiModelProperty("其他查询条件")
private String otherQuery;
@ApiModelProperty("办结开始日期")
private String finishStartTime;
@ApiModelProperty("办结结束日期")
private String finishEndTime;
@ApiModelProperty("来源单编号")
private String sourceBillNo;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("组织全路径")
private String orgPath;
}

99
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java

@ -31,6 +31,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto;
import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService;
import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailService;
import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService;
import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService;
import com.yxt.pms.feign.flowable.flow.FlowableFeign;
import com.yxt.pms.feign.flowable.flow2.FlowFeign;
import com.yxt.pms.feign.flowable.flowtask.FlowTaskFeign;
import com.yxt.pms.feign.message.MessageFeign;
import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
@ -61,33 +70,63 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
@Autowired
private PmsPurchasebackDetailService pmsPurchasebackDetailService;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private FlowFeign flowFeign;
@Autowired
private MessageFeign messageFeign;
public PagerVo<PmsPurchasebackBillVo> listPageVo(PagerQuery<PmsPurchasebackBillQuery> pq) {
PmsPurchasebackBillQuery query = pq.getParams();
QueryWrapper<PmsPurchasebackBill> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getCreateOrgSid())){
qw.eq("ppb.createOrgSid",query.getCreateOrgSid());
String orgPath = query.getOrgPath();
String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
qw.eq("ppb.createOrgSid", createOrgSid);
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("ppb.createOrgName", query.getCreateOrgName());
}
if (StringUtils.isNotBlank(query.getDeptName())) {
qw.like("ppb.deptName", query.getDeptName());
}
if (StringUtils.isNotBlank(query.getCreateByName())) {
qw.like("ppb.createByName", query.getCreateByName());
}
if (StringUtils.isNotBlank(query.getDocumentState())){
qw.eq("ppb.documentState",query.getDocumentState());
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("ppb.billNo", query.getBillNo());
}
if (StringUtils.isNotBlank(query.getBillTypeKey())){
qw.eq("pb.billTypeKey",query.getBillTypeKey());
if (StringUtils.isNotBlank(query.getSourceBillNo())) {
qw.like("pb.billNo", query.getSourceBillNo());
}
if (StringUtils.isNotBlank(query.getSupplierSid())){
qw.eq("pb.supplierSid",query.getSupplierSid());
if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) {
qw.like("pb.purchaseTypeValue", query.getPurchaseTypeValue());
}
if (StringUtils.isNotBlank(query.getArrearsState())){
qw.eq("ppb.arrearsState",query.getArrearsState());
if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) {
qw.like("pb.purchaseReasonValue", query.getPurchaseReasonValue());
}
if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("ppb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("ppb.remarks",query.getOtherQuery()));
if (StringUtils.isNotBlank(query.getPayTypeValue())) {
qw.like("pb.payTypeValue", query.getPayTypeValue());
}
if (StringUtils.isNotBlank(query.getSupplierName())) {
qw.like("pb.supplierName", query.getSupplierName());
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String finishStartTime = query.getFinishStartTime();
String finishEndTime = query.getFinishEndTime();
qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
);
qw.groupBy("ppb.sid");
IPage<PmsPurchasebackBill> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchasebackBillVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsPurchasebackBillVo> p = PagerUtil.pageToVo(pagging, null);
@ -146,36 +185,4 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
pmsPurchasebackDetailService.delByMainSid(sid);
}
}
public List<PmsPurchasebackBillExcelVo> listExcel(PmsPurchasebackBillQuery query) {
QueryWrapper<PmsPurchasebackBillExcelVo> qw = new QueryWrapper<>();
if (query != null){
if (StringUtils.isNotBlank(query.getCreateOrgSid())){
qw.eq("ppb.createOrgSid",query.getCreateOrgSid());
}
if (StringUtils.isNotBlank(query.getDocumentState())){
qw.eq("ppb.documentState",query.getDocumentState());
}
if (StringUtils.isNotBlank(query.getBillTypeKey())){
qw.eq("pb.billTypeKey",query.getBillTypeKey());
}
if (StringUtils.isNotBlank(query.getSupplierSid())){
qw.eq("pb.supplierSid",query.getSupplierSid());
}
if (StringUtils.isNotBlank(query.getArrearsState())){
qw.eq("ppb.arrearsState",query.getArrearsState());
}
if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("ppb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("ppb.remarks",query.getOtherQuery()));
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
}
List<PmsPurchasebackBillExcelVo> list = baseMapper.listExcel(qw);
list.removeAll(Collections.singleton(null));
return list;
}
}

32
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillVo.java

@ -55,24 +55,32 @@ public class PmsPurchasebackBillVo implements Vo {
private String sid; // sid
@ApiModelProperty("流程状态")
private String nodeState;
@ApiModelProperty("单据编号")
private String billNo;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("申请部门名称")
private String deptName;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("创建时间")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime;
@ApiModelProperty("来源单编号")
private String sourceBillNo;
@ApiModelProperty("采购类型Value(厂家采购、外采、其他)")
private String purchaseTypeValue;
@ApiModelProperty("采购原因(储备/客户订单/在修车辆)")
private String purchaseReasonValue;
@ApiModelProperty("付款方式value(预付款/月结/单笔付款)")
private String payTypeValue;
@ApiModelProperty("供应商名称")
private String supplierName;
@ApiModelProperty("供应商联系电话")
private String supplierPhone;
@ApiModelProperty("采购员姓名")
private String purchaserName;
@ApiModelProperty("库管员姓名")
private String storekeeperName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("结算时间")
private Date settleTime;
@ApiModelProperty("票据类型value(不含税、增值税、普通税、已含增值税)")
private String billTypeValue;
@ApiModelProperty("退货金额")
private String backAmountCount;
@ApiModelProperty("应收金额")
private String receivableAmount;
}

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java

@ -110,7 +110,7 @@ public class PmsPurchaseBillDetailsVo implements Vo {
private String purchaserName;
@ApiModelProperty("预计到货日期")
@JsonFormat(
pattern = "yyyy-MM-dd",
pattern = "yyyy-MM-dd HH:mm:ss",
timezone = "GMT+8"
)
private Date deliveryDate;
@ -140,7 +140,7 @@ public class PmsPurchaseBillDetailsVo implements Vo {
private String nodeState; // 流程状态
@ApiModelProperty("任务id")
private String taskId; // 任务id
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty("办结时间")
private Date finishTime; // 办结时间

9
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml

@ -18,7 +18,9 @@
ppb.`supplierName`,
IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing,
SUM(ppbd.`amount`) AS amountCount,
ppb.`payableAmount`
ppb.`payableAmount`,
ppb.procDefId,
ppb.procInstId
FROM
pms_purchase_bill ppb
LEFT JOIN pms_purchase_bill_invoice ppbi
@ -38,7 +40,10 @@
<update id="updateFlowFiled">
UPDATE pms_purchase_bill
SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
<if test="nodeState == '已办结' or nodeState == '终止'">
, finishTime = NOW()
</if>
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>

1
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java

@ -26,6 +26,7 @@
package com.yxt.pms.biz.pms.pmspurchasebill;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

4
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillVo.java

@ -83,4 +83,8 @@ public class PmsPurchaseBillVo implements Vo {
private BigDecimal amountCount;
@ApiModelProperty("应付金额(=采购金额+运费-优惠金额)")
private BigDecimal payableAmount;
@ApiModelProperty("流程定义的id")
private String procDefId;
@ApiModelProperty("流程实例的sid")
private String procInstId;
}

159
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java

@ -54,95 +54,80 @@ import java.util.List;
@Service
public class PmsPurchaseBillDetailService extends MybatisBaseService<PmsPurchaseBillDetailMapper, PmsPurchaseBillDetail> {
public PagerVo<PmsPurchaseBillDetailVo> listPageVo(PagerQuery<PmsPurchaseBillDetailQuery> pq) {
PmsPurchaseBillDetailQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseBillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsPurchaseBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(PmsPurchaseBillDetailDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(PmsPurchaseBillDetailDto dto){
PmsPurchaseBillDetail entity = new PmsPurchaseBillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(PmsPurchaseBillDetailDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
PmsPurchaseBillDetail entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public PmsPurchaseBillDetailDetailsVo fetchDetailsVoBySid(String sid){
PmsPurchaseBillDetail entity = fetchBySid(sid);
PmsPurchaseBillDetailDetailsVo vo = new PmsPurchaseBillDetailDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public PagerVo<PmsPurchaseBillDetailVo> listPageVo(PagerQuery<PmsPurchaseBillDetailQuery> pq) {
PmsPurchaseBillDetailQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseBillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<PmsPurchaseBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
public void saveOrUpdateDto(PmsPurchaseBillDetailDto dto) {
this.insertByDto(dto);
}
public List<PmsPurchaseBillDetailDetailsVo> selByMainSid(String billSid) {
return baseMapper.selByMainSid(billSid);
}
public void insertByDto(PmsPurchaseBillDetailDto dto) {
PmsPurchaseBillDetail entity = new PmsPurchaseBillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public PagerVo<PmsPurchaseBillDetailReportVo> purDetailReForm(PagerQuery<PmsPurchaseBillDetailReportQuery> pq) {
PmsPurchaseBillDetailReportQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getWarehouseName())){
qw.like("pdd.warehouseName",query.getWarehouseName());
}
if (StringUtils.isNotBlank(query.getGoodsSkuCode())){
qw.like("pdd.goodsSkuCode",query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())){
qw.like("pdd.goodsSkuOwnSpec",query.getGoodsSkuOwnSpec());
}
if (StringUtils.isNotBlank(query.getGoodsSpuName())){
qw.like("pdd.goodsSpuName",query.getGoodsSpuName());
}
IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseBillDetailReportVo> pagging = baseMapper.purDetailReForm(page, qw);
PagerVo<PmsPurchaseBillDetailReportVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PmsPurchaseBillDetailDetailsVo fetchDetailsVoBySid(String sid) {
PmsPurchaseBillDetail entity = fetchBySid(sid);
PmsPurchaseBillDetailDetailsVo vo = new PmsPurchaseBillDetailDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public PagerVo<PmsPurchaseBillDetailSumVo> purSumReForm(PagerQuery<PmsPurchaseBillDetailReportQuery> pq) {
PmsPurchaseBillDetailReportQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getWarehouseName())){
qw.like("pdd.warehouseName",query.getWarehouseName());
}
if (StringUtils.isNotBlank(query.getGoodsSkuCode())){
qw.like("pdd.goodsSkuCode",query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())){
qw.like("pdd.goodsSkuOwnSpec",query.getGoodsSkuOwnSpec());
}
if (StringUtils.isNotBlank(query.getGoodsSpuName())){
qw.like("pdd.goodsSpuName",query.getGoodsSpuName());
}
qw.groupBy("pdd.goodsSkuCode");
IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseBillDetailSumVo> pagging = baseMapper.purSumReForm(page, qw);
PagerVo<PmsPurchaseBillDetailSumVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void delByMainSid(String dtoSid) {
baseMapper.delByMainSid(dtoSid);
}
public List<PmsPurchaseBillDetailDetailsVo> selByMainSid(String billSid) {
return baseMapper.selByMainSid(billSid);
}
public PagerVo<PmsPurchaseBillDetailReportVo> purDetailReForm(PagerQuery<PmsPurchaseBillDetailReportQuery> pq) {
PmsPurchaseBillDetailReportQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("pdd.warehouseName", query.getWarehouseName());
}
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec());
}
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("pdd.goodsSpuName", query.getGoodsSpuName());
}
IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseBillDetailReportVo> pagging = baseMapper.purDetailReForm(page, qw);
PagerVo<PmsPurchaseBillDetailReportVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public PagerVo<PmsPurchaseBillDetailSumVo> purSumReForm(PagerQuery<PmsPurchaseBillDetailReportQuery> pq) {
PmsPurchaseBillDetailReportQuery query = pq.getParams();
QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getWarehouseName())) {
qw.like("pdd.warehouseName", query.getWarehouseName());
}
if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode());
}
if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec());
}
if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
qw.like("pdd.goodsSpuName", query.getGoodsSpuName());
}
qw.groupBy("pdd.goodsSkuCode");
IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
IPage<PmsPurchaseBillDetailSumVo> pagging = baseMapper.purSumReForm(page, qw);
PagerVo<PmsPurchaseBillDetailSumVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

20
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java

@ -52,6 +52,7 @@ import org.springframework.stereotype.Service;
*/
@Service
public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchaseBillInvoiceMapper, PmsPurchaseBillInvoice> {
private QueryWrapper<PmsPurchaseBillInvoice> createQueryWrapper(PmsPurchaseBillInvoiceQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -69,12 +70,7 @@ public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchas
}
public void saveOrUpdateDto(PmsPurchaseBillInvoiceDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
this.insertByDto(dto);
}
public void insertByDto(PmsPurchaseBillInvoiceDto dto){
@ -82,17 +78,7 @@ public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchas
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(PmsPurchaseBillInvoiceDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
PmsPurchaseBillInvoice entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public PmsPurchaseBillInvoiceDetailsVo fetchDetailsVoBySid(String sid){
PmsPurchaseBillInvoice entity = fetchBySid(sid);
PmsPurchaseBillInvoiceDetailsVo vo = new PmsPurchaseBillInvoiceDetailsVo();

24
yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java

@ -77,12 +77,7 @@ public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapp
}
public void saveOrUpdateDto(PmsPurchasePayDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
this.insertByDto(dto);
}
public void insertByDto(PmsPurchasePayDto dto){
@ -98,23 +93,6 @@ public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapp
baseMapper.insert(entity);
}
public void updateByDto(PmsPurchasePayDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
PmsPurchasePay entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
List<PmsPurchasePayFile> filePaths = dto.getFilePaths();
String url = "";
for (PmsPurchasePayFile pmsPurchasePayFile : filePaths) {
String filePath = pmsPurchasePayFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
url = url + filePath + ",";
}
entity.setFilePath(url);
baseMapper.updateById(entity);
}
public PmsPurchasePayDetailsVo fetchDetailsVoBySid(String sid){
PmsPurchasePay entity = fetchBySid(sid);
PmsPurchasePayDetailsVo vo = new PmsPurchasePayDetailsVo();

Loading…
Cancel
Save