Browse Source

Merge remote-tracking branch 'origin/master'

master
God 8 months ago
parent
commit
410c2b2884
  1. 36
      anrui-riskcenter-ui/src/views/settle/settleInfo.vue
  2. 12
      yxt-as-ui/src/api/Common/dictcommons.js
  3. 13
      yxt-as-ui/src/api/storage/sparePartsInventory.js
  4. 9
      yxt-as-ui/src/router/index.js
  5. 62
      yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue
  6. 213
      yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue
  7. 163
      yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue
  8. 215
      yxt-as-ui/src/views/purchase/purchasereturn/relation/originalorder.vue
  9. 211
      yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue
  10. 127
      yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue
  11. 195
      yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue
  12. 127
      yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue
  13. 215
      yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/relation/originalorder.vue

36
anrui-riskcenter-ui/src/views/settle/settleInfo.vue

@ -4,7 +4,7 @@
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" v-if="settleVisible" size="small" @click="settleByConfirm()">确认客户结清</el-button>
<el-button type="primary" v-if="formobj.confirmAtn" size="small" @click="settleByConfirm()">确认客户结清</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
@ -268,7 +268,6 @@ export default {
viewState: 1,
tableKey: 1,
index: 0,
settleVisible: false, //
formobj: {
bankContractNo: '',
bankName: '',
@ -347,12 +346,6 @@ export default {
req.fetchBySid({ busVinSid: '', orgPath: '', sid: row.sid, userSid: '' }).then((res) => {
if (res.success) {
this.formobj = res.data
// 0
if (row.nodeState === '已办结' && parseFloat(this.formobj.loanSettleCompanyReductionVo.amountTo) > 0) {
this.settleVisible = true
} else {
this.settleVisible = false
}
if (this.formobj.loanSettleBankCostVo.filesList.length > 0) {
const aa = []
this.formobj.loanSettleBankCostVo.filesList.forEach((e) => {
@ -388,11 +381,29 @@ export default {
this.viewState = 1
},
settleByConfirm() {
req.confirmAtn({ sid: this.formobj.sid }).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' })
}
const tip = '请再次确认客户已交清所有结清款,确认后将生成结清应收!'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.confirmAtn({ sid: this.formobj.sid }).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' })
loading.close()
}
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
handleReturn() {
this.formobj = {
@ -461,7 +472,6 @@ export default {
vehMark: '',
vinNo: ''
}
this.settleVisible = false
this.$emit('doback')
}
}

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

@ -246,6 +246,18 @@ export function listPageSales(params) {
})
}
// 查询分页列表 -- 商品列表 -- 根据部门sid从库存商品中获取
export function selInvenGoodsByUseOrgSid(params) {
return request({
url: '/wms/apiadmin/inventory/wmsinventory/selInvenGoodsByUseOrgSid',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
}
// 查询分页列表 -- 商品列表
export function getInventoryList(params) {
return request({

13
yxt-as-ui/src/api/storage/sparePartsInventory.js

@ -0,0 +1,13 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/wms/apiadmin/inventory/wmsinventory/fittingsInventory',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
}
}

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

@ -602,6 +602,15 @@ export const constantRoutes = [{
title: '结转记录查询',
noCache: true
}
},
{
path: '/sparePartsInventory/sparePartsInventory',
component: () => import('@/views/storage/sparePartsInventory/sparePartsInventory'),
name: 'SparePartsInventory',
meta: {
title: '配件库存查询',
noCache: true
}
}
]
},

62
yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue

@ -31,27 +31,6 @@
<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-input v-model="listQuery.params.sourceBillNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="采购类型">
<el-select v-model="listQuery.params.purchaseTypeValue" placeholder="请选择" 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-form-item label="采购原因">
<el-select v-model="listQuery.params.purchaseReasonValue" placeholder="请选择" 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-form-item label="付款方式">
<el-select v-model="listQuery.params.payTypeValue" placeholder="请选择" 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-form-item label="供应商">
<el-input v-model="listQuery.params.supplierName" placeholder="" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -81,16 +60,11 @@
<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="billNo" label="单据编号" align="center" width="190" />
<el-table-column prop="createOrgName" label="分公司" align="center" min-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="sourceBillNo" 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="backAmountCount" label="退货金额" align="center" width="120" />
<el-table-column prop="receivableAmount" label="应收金额" align="center" width="120" />
</el-table>
@ -120,7 +94,6 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/purchase/purchasereturn'
import { typeValues } from '@/api/Common/dictcommons'
import { getStorage } from '@/utils/auth'
import purchasereturnAdd from './purchasereturnAdd'
import purchasereturnInfo from './purchasereturnInfo'
@ -169,9 +142,6 @@ export default {
tableKey: 0,
list: [],
sids: [], // SIDs
procurementType_list: [],
procurementReason_list: [],
paymentMethod_list: [],
FormLoading: false,
listLoading: false,
//
@ -188,11 +158,6 @@ export default {
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
sourceBillNo: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: '',
orgPath: '',
menuUrl: '',
userSid: ''
@ -202,7 +167,6 @@ export default {
},
created() {
//
this.init()
this.getList()
},
mounted() {
@ -211,23 +175,6 @@ export default {
this.$refs['btnbar'].setButtonList(this.btnList)
},
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
}
})
},
async handleMessage(event) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
@ -332,11 +279,6 @@ export default {
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
sourceBillNo: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: '',
orgPath: '',
menuUrl: '',
userSid: ''

213
yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue

@ -4,7 +4,6 @@
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="selectionList()">选择原单</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
@ -32,103 +31,34 @@
<el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<div class="title">原单信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单据日期</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.createTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购人</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.purchaserName }}</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">{{ originalmessage.purchaseTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.purchaseReasonValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.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">{{ originalmessage.supplierName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否开发票</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-show="originalmessage.isInvoicing == '是'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">款项情况</div>
<el-row>
<el-col :span="6">
<div class="span-sty">采购金额</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.amountCount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">运费</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.freight }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">优惠金额</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.discountAmount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">误差调整</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.errorAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>已付金额</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.paidAmount" @keyup.native="formobj.paidAmount = getNumber(formobj.paidAmount, 2)" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">欠款</div>
<el-form-item><span class="addinputInfo">{{ qkTotal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="fullyWithdraw">整单全退</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="selectionList()">选择库存商品</el-button>
</div>
<el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :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="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="goodsID" label="商品ID" align="center" width="150" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" width="100" />
<el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == ''" label="含税单价" align="center" width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" width="150" />
<el-table-column prop="supplierName" label="供应商" align="center" width="150" />
<el-table-column prop="manufacturerName" label="厂家" align="center" width="150" />
<el-table-column prop="warehouseName" label="仓库" align="center" width="100" />
<el-table-column prop="warehouseArea" label="库区" align="center" width="100" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" width="100" />
<el-table-column label="厂家订单号" align="center" width="160">
<template slot-scope="scope">
<span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.manufactorBillNo }}</span>
</template>
</el-table-column>
<el-table-column prop="count" label="库存数量" align="center" width="100" />
<el-table-column prop="taxPrice" label="采购单价" align="center" width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
<el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
<el-table-column label="退货数量" align="center" min-width="100">
@ -159,6 +89,8 @@
</div>
<!-- 选择商品 -->
<originalorder v-show="viewState == 2" ref="divYd" @backData="backData" @doback="resetState" />
<!-- 查看采购订单 -->
<procurementInfo v-show="viewState == 3" ref="divCG" @doback="resetState" />
</div>
</template>
@ -166,11 +98,13 @@
import req from '@/api/purchase/purchasereturn'
import { getOrgSidByPath } from '@/api/Common/dictcommons'
import originalorder from './relation/originalorder'
import procurementInfo from '../procurement/procurementInfo'
export default {
name: 'PurchaseReturnAdd',
components: {
originalorder
originalorder,
procurementInfo
},
data() {
return {
@ -184,8 +118,6 @@ export default {
remarks: '',
createBySid: '',
createByName: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
backErrorAmount: '',
backFreight: '',
@ -210,22 +142,6 @@ export default {
createOrgName: '',
pmsPurchasebackDetailList: []
},
originalmessage: {
createTime: '',
purchaserName: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: '',
isInvoicing: '',
billType: '',
taxRate: '',
remarks: '',
freight: '',
amountCount: '',
discountAmount: '',
errorAmount: ''
},
rules: {}
}
},
@ -248,7 +164,7 @@ export default {
if (this.formobj.pmsPurchasebackDetailList.length > 0) {
this.formobj.pmsPurchasebackDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmotun !== '' ? e.backAmotun : '0')) * 100) / 100
th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
}
})
}
@ -258,18 +174,6 @@ export default {
let ys = '0'
ys = Math.round((parseFloat(ys) + parseFloat(this.thTotal) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) * 100) / 100
return ys
},
// = - 退(退 - + ) - -
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.formobj.payableAmount === '' ? '0' : this.formobj.payableAmount) - (parseFloat(this.thTotal) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
return yf
},
// = -
qkTotal() {
let qk = '0'
qk = Math.round((parseFloat(this.yfTotal) - parseFloat(this.formobj.paidAmount === '' ? '0' : this.formobj.paidAmount)) * 100) / 100
return qk
}
},
methods: {
@ -310,7 +214,6 @@ export default {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
}
})
},
@ -334,74 +237,64 @@ export default {
},
selectionList() {
this.viewState = 2
this.$refs['divYd'].showData(this.formobj.createOrgSid)
this.$refs['divYd'].showData(this.formobj.deptSid)
},
backData(value) {
this.viewState = 1
this.formobj.sourceBillNo = value.billNo
this.formobj.sourceBillSid = value.sid
this.formobj.payableAmount = value.payableAmount
const aa = []
if (value.pmsPurchaseBillDetailList.length > 0) {
value.pmsPurchaseBillDetailList.forEach((e) => {
if (value.length > 0) {
value.forEach((e) => {
aa.push({
sid: '',
billSid: '',
goodsID: e.goodsID,
goodsSpuSid: e.goodsSpuSid,
goodsSpuName: e.goodsSpuName,
goodsSkuSid: e.goodsSkuSid,
goodsSkuTitle: e.goodsSkuTitle,
goodsSkuCode: e.goodsSkuCode,
goodsSkuOwnSpec: e.goodsSkuOwnSpec,
unit: e.unit,
supplierName: e.supplierName,
supplierSid: e.supplierSid,
manufacturerName: e.manufacturerName,
manufacturerSid: e.manufacturerSid,
warehouseSid: e.warehouseSid,
warehouseName: e.warehouseName,
warehouseArea: e.warehouseArea,
warehouseAreaSid: e.warehouseSid,
warehouseRackCode: e.warehouseRackCode,
warehouseRackSid: e.warehouseRackSid,
manufactorBillNo: e.manufactorBillNo,
manufactorBillSid: e.manufactorBillSid,
count: e.count,
taxPrice: e.cost,
amount: e.amount,
unit: e.unit,
warehouseSid: '',
warehouseName: '',
returnedCount: e.returnedCount,
backCount: '',
taxAmount: '',
taxPrice: e.taxPrice,
backAmount: ''
})
})
}
this.formobj.pmsPurchasebackDetailList = aa
this.originalmessage.createTime = value.createTime
this.originalmessage.purchaserName = value.purchaserName
this.originalmessage.purchaseTypeValue = value.purchaseTypeValue
this.originalmessage.purchaseReasonValue = value.purchaseReasonValue
this.originalmessage.payTypeValue = value.payTypeValue
this.originalmessage.supplierName = value.supplierName
this.originalmessage.isInvoicing = value.isInvoicing
this.originalmessage.billType = value.billType
this.originalmessage.taxRate = value.taxRate
this.originalmessage.amountCount = value.amountCount
this.originalmessage.freight = value.freight
this.originalmessage.discountAmount = value.discountAmount
this.originalmessage.errorAmount = value.errorAmount
},
handleDelete(index) {
this.formobj.pmsPurchasebackDetailList.splice(index, 1)
},
resetState() {
this.viewState = 1
},
fullyWithdraw() {
if (this.formobj.pmsPurchasebackDetailList.length > 0) {
this.formobj.pmsPurchasebackDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
// 退 = - 退
e.backCount = Math.round((parseFloat(e.count) - parseFloat(e.returnedCount !== '' ? e.returnedCount : '0')) * 100) / 100
// 退
e.backAmount = Math.round((parseFloat(e.backCount) * parseFloat(e.taxPrice)) * 100) / 100
}
})
}
},
// 退
backAmountInput(row) {
if (row.goodsSpuName !== '') {
row.backAmount = Math.round((parseFloat(row.taxPrice !== '' ? row.taxPrice : '0') * parseFloat(row.backCount !== '' ? row.backCount : '0')) * 100) / 100
}
},
toInfo(row) {
this.viewState = 3
this.$refs['divCG'].showInfo({ sid: row.manufactorBillSid })
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
@ -449,8 +342,6 @@ export default {
remarks: '',
createBySid: '',
createByName: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
backErrorAmount: '',
backFreight: '',
@ -489,10 +380,6 @@ export default {
.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;

163
yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue

@ -29,101 +29,26 @@
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">原单信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单据日期</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.createTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购人</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.purchaserName }}</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">{{ originalmessage.purchaseTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.purchaseReasonValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.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">{{ originalmessage.supplierName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否开发票</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-show="originalmessage.isInvoicing == '是'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">款项情况</div>
<el-row>
<el-col :span="6">
<div class="span-sty">采购金额</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.amountCount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">运费</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.freight }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">优惠金额</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.discountAmount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">误差调整</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.errorAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>已付金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.paidAmount }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">欠款</div>
<el-form-item><span class="addinputInfo">{{ qkTotal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">商品列表
</div>
<div class="title">商品列表</div>
<el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" width="150" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" width="100" />
<el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == ''" label="含税单价" align="center" width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" width="150" />
<el-table-column prop="supplierName" label="供应商" align="center" width="150" />
<el-table-column prop="manufacturerName" label="厂家" align="center" width="150" />
<el-table-column prop="warehouseName" label="仓库" align="center" width="100" />
<el-table-column prop="warehouseArea" label="库区" align="center" width="100" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" width="100" />
<el-table-column label="厂家订单号" align="center" width="160">
<template slot-scope="scope">
<span class="bluezi" @click="toInfo(scope.row)">{{ scope.row.manufactorBillNo }}</span>
</template>
</el-table-column>
<el-table-column prop="count" label="库存数量" align="center" width="100" />
<el-table-column prop="taxPrice" label="采购单价" align="center" width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
<el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
<el-table-column prop="backCount" label="退货数量" align="center" min-width="100" />
@ -144,14 +69,20 @@
</el-form>
</div>
</div>
<!-- 查看采购订单 -->
<procurementInfo v-show="viewState == 2" ref="divCG" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/purchase/purchasereturn'
import procurementInfo from '../procurement/procurementInfo'
export default {
name: 'PurchaseReturnInfo',
components: {
procurementInfo
},
data() {
return {
viewTitle: '',
@ -189,22 +120,6 @@ export default {
createOrgName: '',
pmsPurchasebackDetailList: []
},
originalmessage: {
createTime: '',
purchaserName: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: '',
isInvoicing: '',
billType: '',
taxRate: '',
remarks: '',
amountCount: '',
freight: '',
discountAmount: '',
errorAmount: ''
},
rules: {}
}
},
@ -227,7 +142,7 @@ export default {
if (this.formobj.pmsPurchasebackDetailList.length > 0) {
this.formobj.pmsPurchasebackDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmotun !== '' ? e.backAmotun : '0')) * 100) / 100
th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100
}
})
}
@ -238,18 +153,6 @@ export default {
ys = Math.round((parseFloat(ys) + parseFloat(this.thTotal) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) * 100) / 100
return ys
},
// = - 退(退 - + ) - -
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.formobj.payableAmount === '' ? '0' : this.formobj.payableAmount) - (parseFloat(this.thTotal) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
return yf
},
// = -
qkTotal() {
let qk = '0'
qk = Math.round((parseFloat(this.yfTotal) - parseFloat(this.formobj.paidAmount === '' ? '0' : this.formobj.paidAmount)) * 100) / 100
return qk
}
},
methods: {
showInfo(row) {
@ -260,10 +163,16 @@ export default {
req.fetchDetailsBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
}
})
},
toInfo(row) {
this.viewState = 2
this.$refs['divCG'].showInfo({ sid: row.manufactorBillSid })
},
resetState() {
this.viewState = 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
@ -297,22 +206,6 @@ export default {
createOrgName: '',
pmsPurchasebackDetailList: []
}
this.originalmessage = {
createTime: '',
purchaserName: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: '',
isInvoicing: '',
billType: '',
taxRate: '',
remarks: '',
amountCount: '',
freight: '',
discountAmount: '',
errorAmount: ''
}
this.$emit('doback')
}
}

215
yxt-as-ui/src/views/purchase/purchasereturn/relation/originalorder.vue

@ -1,56 +1,46 @@
<template>
<div class="app-container">
<div>
<button-bar view-title="选择采购单" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="tab-header webtop">
<div>选择商品</div>
<div>
<el-button type="primary" size="small" @click="toConfirm">确定</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" class="tab-header" label-width="100px">
<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-input v-model="listQuery.params.createByName" placeholder="" clearable/>
<el-form-item label="商品名称">
<el-input v-model="listQuery.params.goodsSpuName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
<el-form-item label="图号">
<el-input v-model="listQuery.params.goodsSkuCode" 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.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 label="仓库">
<el-input v-model="listQuery.params.warehouseName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="采购类型">
<el-select v-model="listQuery.params.purchaseTypeValue" placeholder="请选择" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
<el-form-item label="库区">
<el-input v-model="listQuery.params.warehouseArea" placeholder="" clearable/>
</el-form-item>
<el-form-item label="采购原因">
<el-select v-model="listQuery.params.purchaseReasonValue" placeholder="请选择" clearable filterable>
<el-option v-for="item in procurementReason_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 paymentMethod_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
<el-form-item label="库位">
<el-input v-model="listQuery.params.warehouseRackCode" placeholder="" clearable/>
</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 label="厂家">
<el-input v-model="listQuery.params.manufacturerName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="厂家订单号">
<el-input v-model="listQuery.params.manufactorBillNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="入库日期">
<el-date-picker v-model="listQuery.params.inDateStart" 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.inDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center">
@ -60,25 +50,22 @@
</div>
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column width="60" fixed label="编号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed width="80" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handleConfirm(scope.row)">确认</el-button>
</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 :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50" />
<el-table-column fixed label="编号" type="index" :index="indexMethod" align="center" width="60" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="160" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="120" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="120" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="120" />
<el-table-column prop="unit" label="单位" align="center" width="120" />
<el-table-column prop="warehouseName" label="仓库" align="center" width="100" />
<el-table-column prop="warehouseArea" label="库区" align="center" width="100" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" width="100" />
<el-table-column prop="cost" label="入库单价" align="center" min-width="150" />
<el-table-column prop="count" label="库存数量" align="center" width="100" />
<el-table-column prop="manufacturerName" label="厂家" align="center" width="140" />
<el-table-column prop="supplierName" label="供应商" align="center" width="140" />
<el-table-column prop="manufactorBillNo" label="厂家订单号" align="center" width="140" />
</el-table>
</div>
<div class="pages">
@ -93,91 +80,42 @@
<script>
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/purchase/purchasereturn'
import { typeValues } from '@/api/Common/dictcommons'
import { selInvenGoodsByUseOrgSid } from '@/api/Common/dictcommons'
export default {
name: 'OriginalOrder',
components: {
Pagination,
ButtonBar
Pagination
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
sids: [],
list: [],
procurementType_list: [],
procurementReason_list: [],
paymentMethod_list: [],
state_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
listLoading: false,
listQuery: {
current: 1,
size: 5,
params: {
createOrgName: '',
createOrgSid: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
goodsSpuName: '',
goodsSkuCode: '',
warehouseName: '',
warehouseArea: '',
warehouseRackCode: '',
supplierName: '',
isInvoicing: ''
manufacturerName: '',
manufactorBillNo: '',
inDateStart: '',
inDateEnd: '',
useOrgSid: ''
},
total: 1
}
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
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
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -202,14 +140,20 @@ export default {
var pageindex = index + 1 + pagestart
return pageindex
},
handleSelectionChange(row) {
this.sids = row
},
//
getList() {
this.listLoading = true
req.choiceBillListPage(this.listQuery).then((response) => {
selInvenGoodsByUseOrgSid(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
} else {
this.listQuery.total = 0
this.list = []
}
})
},
@ -223,33 +167,34 @@ export default {
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5
this.listQuery.params.createOrgName = ''
this.listQuery.params.deptName = ''
this.listQuery.params.createByName = ''
this.listQuery.params.billNo = ''
this.listQuery.params.createStartTime = ''
this.listQuery.params.createEndTime = ''
this.listQuery.params.finishStartTime = ''
this.listQuery.params.finishEndTime = ''
this.listQuery.params.purchaseTypeValue = ''
this.listQuery.params.purchaseReasonValue = ''
this.listQuery.params.payTypeValue = ''
this.listQuery.params.goodsSpuName = ''
this.listQuery.params.goodsSkuCode = ''
this.listQuery.params.warehouseName = ''
this.listQuery.params.warehouseArea = ''
this.listQuery.params.warehouseRackCode = ''
this.listQuery.params.supplierName = ''
this.listQuery.params.isInvoicing = ''
this.listQuery.params.manufacturerName = ''
this.listQuery.params.manufactorBillNo = ''
this.listQuery.params.inDateStart = ''
this.listQuery.params.inDateEnd = ''
this.getList()
},
showData(createOrgSid) {
showData(deptSid) {
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5
this.listQuery.params.createOrgSid = createOrgSid
this.listQuery.params.useOrgSid = deptSid
this.getList()
},
handleConfirm(row) {
this.$emit('backData', row)
toConfirm() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行操作' })
}
},
//
doClose() {
handleReturn() {
this.$emit('doback')
}
}

211
yxt-as-ui/src/views/storage/sparePartsInventory/sparePartsInventory.vue

@ -0,0 +1,211 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<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-input v-model="listQuery.params.useOrgName" 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-input v-model="listQuery.params.goodsSpuName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="图号">
<el-input v-model="listQuery.params.goodsSkuCode" placeholder="" clearable/>
</el-form-item>
<el-form-item label="仓库">
<el-input v-model="listQuery.params.warehouseName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="供应商">
<el-input v-model="listQuery.params.billObjName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="厂家">
<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" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<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>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;">
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
<el-table-column prop="deptName" label="服务站" align="center" width="120" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="120" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="120" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="warehouseName" label="仓库" align="center" width="100" />
<el-table-column prop="inventoryCount" label="库存" align="center" width="120" />
<el-table-column prop="billObjName" label="供应商" align="center" min-width="150" />
<el-table-column prop="manufacturerName" label="厂家" align="center" width="120" />
</el-table>
</div>
<!--End 主页面主要部分-->
<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>
<!--End查询列表部分-->
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/storage/sparePartsInventory'
export default {
name: 'SparePartsInventory',
components: {
Pagination,
pageye,
ButtonBar
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
useOrgName: '',
deptName: '',
goodsSpuName: '',
goodsSkuCode: '',
warehouseName: '',
billObjName: '',
manufacturerName: '',
orgPath: '',
menuUrl: '',
userSid: ''
}
}
}
},
created() {
//
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doClose':
this.doClose()
break
default:
break
}
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.menuUrl = this.$route.path
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 5,
total: 0,
params: {
useOrgName: '',
deptName: '',
goodsSpuName: '',
goodsSkuCode: '',
warehouseName: '',
billObjName: '',
manufacturerName: '',
orgPath: '',
menuUrl: '',
userSid: ''
}
}
this.getList()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

127
yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnDaiBan.vue

@ -32,101 +32,23 @@
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">原单信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单据日期</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.createTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购人</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.purchaserName }}</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">{{ originalmessage.purchaseTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.purchaseReasonValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.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">{{ originalmessage.supplierName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否开发票</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-show="originalmessage.isInvoicing == '是'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">款项情况</div>
<el-row>
<el-col :span="6">
<div class="span-sty">采购金额</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.amountCount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">运费</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.freight }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">优惠金额</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.discountAmount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">误差调整</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.errorAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>已付金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.paidAmount }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">欠款</div>
<el-form-item><span class="addinputInfo">{{ qkTotal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">商品列表
</div>
<el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" width="150" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" width="100" />
<el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == ''" label="含税单价" align="center" width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" width="150" />
<el-table-column prop="supplierName" label="供应商" align="center" width="150" />
<el-table-column prop="manufacturerName" label="厂家" align="center" width="150" />
<el-table-column prop="warehouseName" label="仓库" align="center" width="100" />
<el-table-column prop="warehouseArea" label="库区" align="center" width="100" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" width="100" />
<el-table-column prop="manufactorBillNo" label="厂家订单号" align="center" width="160" />
<el-table-column prop="count" label="库存数量" align="center" width="100" />
<el-table-column prop="taxPrice" label="采购单价" align="center" width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
<el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
<el-table-column prop="backCount" label="退货数量" align="center" min-width="100" />
@ -231,22 +153,6 @@ export default {
createOrgName: '',
pmsPurchasebackDetailList: []
},
originalmessage: {
createTime: '',
purchaserName: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: '',
isInvoicing: '',
billType: '',
taxRate: '',
remarks: '',
amountCount: '',
freight: '',
discountAmount: '',
errorAmount: ''
},
rules: {},
options: [],
operation: '', //
@ -333,7 +239,7 @@ export default {
if (this.formobj.pmsPurchasebackDetailList.length > 0) {
this.formobj.pmsPurchasebackDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmotun !== '' ? e.backAmotun : '0')) * 100) / 100
th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100
}
})
}
@ -343,18 +249,6 @@ export default {
let ys = '0'
ys = Math.round((parseFloat(ys) + parseFloat(this.thTotal) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) * 100) / 100
return ys
},
// = - 退(退 - + ) - -
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.formobj.payableAmount === '' ? '0' : this.formobj.payableAmount) - (parseFloat(this.thTotal) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
return yf
},
// = -
qkTotal() {
let qk = '0'
qk = Math.round((parseFloat(this.yfTotal) - parseFloat(this.formobj.paidAmount === '' ? '0' : this.formobj.paidAmount)) * 100) / 100
return qk
}
},
methods: {
@ -366,7 +260,6 @@ export default {
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
}
})
selectStaffListss().then((res) => {

195
yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnEdit.vue

@ -4,7 +4,6 @@
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="selectionList()">选择原单</el-button>
<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>
@ -31,103 +30,30 @@
<el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<div class="title">原单信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单据日期</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.createTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购人</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.purchaserName }}</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">{{ originalmessage.purchaseTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.purchaseReasonValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.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">{{ originalmessage.supplierName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否开发票</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-show="originalmessage.isInvoicing == '是'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">款项情况</div>
<el-row>
<el-col :span="6">
<div class="span-sty">采购金额</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.amountCount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">运费</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.freight }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">优惠金额</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.discountAmount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">误差调整</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.errorAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>已付金额</div>
<el-form-item><el-input class="addinputInfo" style="width: 40%" v-model="formobj.paidAmount" @keyup.native="formobj.paidAmount = getNumber(formobj.paidAmount, 2)" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">欠款</div>
<el-form-item><span class="addinputInfo">{{ qkTotal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="fullyWithdraw">整单全退</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="selectionList()">选择库存商品</el-button>
</div>
<el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :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="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="goodsID" label="商品ID" align="center" width="150" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" width="100" />
<el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == ''" label="含税单价" align="center" width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" width="150" />
<el-table-column prop="supplierName" label="供应商" align="center" width="150" />
<el-table-column prop="manufacturerName" label="厂家" align="center" width="150" />
<el-table-column prop="warehouseName" label="仓库" align="center" width="100" />
<el-table-column prop="warehouseArea" label="库区" align="center" width="100" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" width="100" />
<el-table-column prop="manufactorBillNo" label="厂家订单号" align="center" width="160" />
<el-table-column prop="count" label="库存数量" align="center" width="100" />
<el-table-column prop="taxPrice" label="采购单价" align="center" width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
<el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
<el-table-column label="退货数量" align="center" min-width="100">
@ -208,22 +134,6 @@ export default {
createOrgName: '',
pmsPurchasebackDetailList: []
},
originalmessage: {
createTime: '',
purchaserName: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: '',
isInvoicing: '',
billType: '',
taxRate: '',
remarks: '',
freight: '',
amountCount: '',
discountAmount: '',
errorAmount: ''
},
rules: {}
}
},
@ -263,7 +173,7 @@ export default {
if (this.formobj.pmsPurchasebackDetailList.length > 0) {
this.formobj.pmsPurchasebackDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmotun !== '' ? e.backAmotun : '0')) * 100) / 100
th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100
}
})
}
@ -273,18 +183,6 @@ export default {
let ys = '0'
ys = Math.round((parseFloat(ys) + parseFloat(this.thTotal) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) * 100) / 100
return ys
},
// = - 退(退 - + ) - -
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.formobj.payableAmount === '' ? '0' : this.formobj.payableAmount) - (parseFloat(this.thTotal) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
return yf
},
// = -
qkTotal() {
let qk = '0'
qk = Math.round((parseFloat(this.yfTotal) - parseFloat(this.formobj.paidAmount === '' ? '0' : this.formobj.paidAmount)) * 100) / 100
return qk
}
},
methods: {
@ -297,7 +195,6 @@ export default {
if (res.success) {
this.formobj = res.data
this.formobj.instanceId = res.data.procInstId
this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
}
})
},
@ -321,68 +218,54 @@ export default {
},
selectionList() {
this.viewState = 2
this.$refs['divYd'].showData(this.formobj.createOrgSid)
this.$refs['divYd'].showData(this.formobj.deptSid)
},
backData(value) {
this.viewState = 1
this.formobj.sourceBillNo = value.billNo
this.formobj.sourceBillSid = value.sid
this.formobj.payableAmount = value.payableAmount
const aa = []
if (value.pmsPurchaseBillDetailList.length > 0) {
value.pmsPurchaseBillDetailList.forEach((e) => {
if (value.length > 0) {
value.forEach((e) => {
aa.push({
sid: '',
billSid: '',
goodsID: e.goodsID,
goodsSpuSid: e.goodsSpuSid,
goodsSpuName: e.goodsSpuName,
goodsSkuSid: e.goodsSkuSid,
goodsSkuTitle: e.goodsSkuTitle,
goodsSkuCode: e.goodsSkuCode,
goodsSkuOwnSpec: e.goodsSkuOwnSpec,
unit: e.unit,
supplierName: e.supplierName,
supplierSid: e.supplierSid,
manufacturerName: e.manufacturerName,
manufacturerSid: e.manufacturerSid,
warehouseSid: e.warehouseSid,
warehouseName: e.warehouseName,
warehouseArea: e.warehouseArea,
warehouseAreaSid: e.warehouseSid,
warehouseRackCode: e.warehouseRackCode,
warehouseRackSid: e.warehouseRackSid,
manufactorBillNo: e.manufactorBillNo,
manufactorBillSid: e.manufactorBillSid,
count: e.count,
taxPrice: e.cost,
amount: e.amount,
unit: e.unit,
warehouseSid: '',
warehouseName: '',
returnedCount: e.returnedCount,
backCount: '',
taxAmount: '',
taxPrice: e.taxPrice,
backAmount: ''
})
})
}
this.formobj.pmsPurchasebackDetailList = aa
this.originalmessage.createTime = value.createTime
this.originalmessage.purchaserName = value.purchaserName
this.originalmessage.purchaseTypeValue = value.purchaseTypeValue
this.originalmessage.purchaseReasonValue = value.purchaseReasonValue
this.originalmessage.payTypeValue = value.payTypeValue
this.originalmessage.supplierName = value.supplierName
this.originalmessage.isInvoicing = value.isInvoicing
this.originalmessage.billType = value.billType
this.originalmessage.taxRate = value.taxRate
this.originalmessage.amountCount = value.amountCount
this.originalmessage.freight = value.freight
this.originalmessage.discountAmount = value.discountAmount
this.originalmessage.errorAmount = value.errorAmount
},
handleDelete(index) {
this.formobj.pmsPurchasebackDetailList.splice(index, 1)
},
resetState() {
this.viewState = 1
},
fullyWithdraw() {
if (this.formobj.pmsPurchasebackDetailList.length > 0) {
this.formobj.pmsPurchasebackDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
// 退 = - 退
e.backCount = Math.round((parseFloat(e.count) - parseFloat(e.returnedCount !== '' ? e.returnedCount : '0')) * 100) / 100
// 退
e.backAmount = Math.round((parseFloat(e.backCount) * parseFloat(e.taxPrice)) * 100) / 100
}
})
}
},
// 退
backAmountInput(row) {
if (row.goodsSpuName !== '') {
@ -454,10 +337,6 @@ export default {
.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;

127
yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/purchasereturnYiBan.vue

@ -29,101 +29,23 @@
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">原单信息</div>
<el-row>
<el-col :span="8">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">单据日期</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.createTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购人</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.purchaserName }}</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">{{ originalmessage.purchaseTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购原因</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.purchaseReasonValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">付款方式</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.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">{{ originalmessage.supplierName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否开发票</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.isInvoicing }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-show="originalmessage.isInvoicing == '是'">
<div class="span-sty">发票类型(税率)</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.billType }}({{ originalmessage.taxRate }})</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">款项情况</div>
<el-row>
<el-col :span="6">
<div class="span-sty">采购金额</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.amountCount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">运费</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.freight }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">优惠金额</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.discountAmount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">误差调整</div>
<el-form-item><span class="addinputInfo">{{ originalmessage.errorAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">应付金额</div>
<el-form-item><span class="addinputInfo">{{ yfTotal }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>已付金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.paidAmount }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">欠款</div>
<el-form-item><span class="addinputInfo">{{ qkTotal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">商品列表
</div>
<el-table :key="tableKey" :data="formobj.pmsPurchasebackDetailList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="goodsID" label="商品ID" align="center" width="150" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="300" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="150" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="150" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" width="100" />
<el-table-column prop="taxPrice" v-if="originalmessage.isInvoicing == ''" label="含税单价" align="center" width="150" />
<el-table-column prop="taxPrice" v-else label="不含税单价" align="center" width="150" />
<el-table-column prop="supplierName" label="供应商" align="center" width="150" />
<el-table-column prop="manufacturerName" label="厂家" align="center" width="150" />
<el-table-column prop="warehouseName" label="仓库" align="center" width="100" />
<el-table-column prop="warehouseArea" label="库区" align="center" width="100" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" width="100" />
<el-table-column prop="manufactorBillNo" label="厂家订单号" align="center" width="160" />
<el-table-column prop="count" label="库存数量" align="center" width="100" />
<el-table-column prop="taxPrice" label="采购单价" align="center" width="150" />
<el-table-column prop="amount" label="采购金额" align="center" width="140" />
<el-table-column prop="returnedCount" label="已退数量" align="center" width="140" />
<el-table-column prop="backCount" label="退货数量" align="center" min-width="100" />
@ -189,22 +111,6 @@ export default {
createOrgName: '',
pmsPurchasebackDetailList: []
},
originalmessage: {
createTime: '',
purchaserName: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
supplierName: '',
isInvoicing: '',
billType: '',
taxRate: '',
remarks: '',
amountCount: '',
freight: '',
discountAmount: '',
errorAmount: ''
},
//
linkByParameter: {
businessSid: '',
@ -262,7 +168,7 @@ export default {
if (this.formobj.pmsPurchasebackDetailList.length > 0) {
this.formobj.pmsPurchasebackDetailList.forEach((e) => {
if (e.goodsSpuName !== '') {
th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backAmotun !== '' ? e.backAmotun : '0')) * 100) / 100
th = Math.round((parseFloat(th) + parseFloat(e.backAmount === null ? '0' : e.backCount !== '' ? e.backCount : '0')) * 100) / 100
}
})
}
@ -272,18 +178,6 @@ export default {
let ys = '0'
ys = Math.round((parseFloat(ys) + parseFloat(this.thTotal) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) * 100) / 100
return ys
},
// = - 退(退 - + ) - -
yfTotal() {
let yf = '0'
yf = Math.round((parseFloat(yf) + parseFloat(this.formobj.payableAmount === '' ? '0' : this.formobj.payableAmount) - (parseFloat(this.thTotal) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') + parseFloat(this.formobj.backErrorAmount !== '' ? this.formobj.backErrorAmount : '0')) - parseFloat(this.formobj.backFreight !== '' ? this.formobj.backFreight : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
return yf
},
// = -
qkTotal() {
let qk = '0'
qk = Math.round((parseFloat(this.yfTotal) - parseFloat(this.formobj.paidAmount === '' ? '0' : this.formobj.paidAmount)) * 100) / 100
return qk
}
},
methods: {
@ -295,7 +189,6 @@ export default {
req.fetchDetailsBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
this.originalmessage = this.formobj.pmsPurchaseChoiceBillDetailsVo
}
})
},

215
yxt-as-ui/src/views/workFlow/caigoutuihuoFlow/relation/originalorder.vue

@ -1,56 +1,46 @@
<template>
<div class="app-container">
<div>
<button-bar view-title="选择采购单" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="tab-header webtop">
<div>选择商品</div>
<div>
<el-button type="primary" size="small" @click="toConfirm">确定</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" class="tab-header" label-width="100px">
<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-input v-model="listQuery.params.createByName" placeholder="" clearable/>
<el-form-item label="商品名称">
<el-input v-model="listQuery.params.goodsSpuName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
<el-form-item label="图号">
<el-input v-model="listQuery.params.goodsSkuCode" 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.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 label="仓库">
<el-input v-model="listQuery.params.warehouseName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="采购类型">
<el-select v-model="listQuery.params.purchaseTypeValue" placeholder="请选择" clearable filterable>
<el-option v-for="item in procurementType_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
<el-form-item label="库区">
<el-input v-model="listQuery.params.warehouseArea" placeholder="" clearable/>
</el-form-item>
<el-form-item label="采购原因">
<el-select v-model="listQuery.params.purchaseReasonValue" placeholder="请选择" clearable filterable>
<el-option v-for="item in procurementReason_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 paymentMethod_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
<el-form-item label="库位">
<el-input v-model="listQuery.params.warehouseRackCode" placeholder="" clearable/>
</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 label="厂家">
<el-input v-model="listQuery.params.manufacturerName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="厂家订单号">
<el-input v-model="listQuery.params.manufactorBillNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="入库日期">
<el-date-picker v-model="listQuery.params.inDateStart" 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.inDateEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center">
@ -60,25 +50,22 @@
</div>
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column width="60" fixed label="编号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed width="80" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handleConfirm(scope.row)">确认</el-button>
</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 :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50" />
<el-table-column fixed label="编号" type="index" :index="indexMethod" align="center" width="60" />
<el-table-column prop="goodsID" label="商品ID" align="center" width="160" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" width="120" />
<el-table-column prop="goodsSkuCode" label="图号" align="center" width="120" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="120" />
<el-table-column prop="unit" label="单位" align="center" width="120" />
<el-table-column prop="warehouseName" label="仓库" align="center" width="100" />
<el-table-column prop="warehouseArea" label="库区" align="center" width="100" />
<el-table-column prop="warehouseRackCode" label="库位" align="center" width="100" />
<el-table-column prop="cost" label="入库单价" align="center" min-width="150" />
<el-table-column prop="count" label="库存数量" align="center" width="100" />
<el-table-column prop="manufacturerName" label="厂家" align="center" width="140" />
<el-table-column prop="supplierName" label="供应商" align="center" width="140" />
<el-table-column prop="manufactorBillNo" label="厂家订单号" align="center" width="140" />
</el-table>
</div>
<div class="pages">
@ -93,91 +80,42 @@
<script>
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/purchase/purchasereturn'
import { typeValues } from '@/api/Common/dictcommons'
import { selInvenGoodsByUseOrgSid } from '@/api/Common/dictcommons'
export default {
name: 'OriginalOrder',
components: {
Pagination,
ButtonBar
Pagination
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
sids: [],
list: [],
procurementType_list: [],
procurementReason_list: [],
paymentMethod_list: [],
state_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
listLoading: false,
listQuery: {
current: 1,
size: 5,
params: {
createOrgName: '',
createOrgSid: '',
deptName: '',
createByName: '',
billNo: '',
createStartTime: '',
createEndTime: '',
finishStartTime: '',
finishEndTime: '',
purchaseTypeValue: '',
purchaseReasonValue: '',
payTypeValue: '',
goodsSpuName: '',
goodsSkuCode: '',
warehouseName: '',
warehouseArea: '',
warehouseRackCode: '',
supplierName: '',
isInvoicing: ''
manufacturerName: '',
manufactorBillNo: '',
inDateStart: '',
inDateEnd: '',
useOrgSid: ''
},
total: 1
}
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
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
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
@ -202,14 +140,20 @@ export default {
var pageindex = index + 1 + pagestart
return pageindex
},
handleSelectionChange(row) {
this.sids = row
},
//
getList() {
this.listLoading = true
req.choiceBillListPage(this.listQuery).then((response) => {
selInvenGoodsByUseOrgSid(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
} else {
this.listQuery.total = 0
this.list = []
}
})
},
@ -223,33 +167,34 @@ export default {
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5
this.listQuery.params.createOrgName = ''
this.listQuery.params.deptName = ''
this.listQuery.params.createByName = ''
this.listQuery.params.billNo = ''
this.listQuery.params.createStartTime = ''
this.listQuery.params.createEndTime = ''
this.listQuery.params.finishStartTime = ''
this.listQuery.params.finishEndTime = ''
this.listQuery.params.purchaseTypeValue = ''
this.listQuery.params.purchaseReasonValue = ''
this.listQuery.params.payTypeValue = ''
this.listQuery.params.goodsSpuName = ''
this.listQuery.params.goodsSkuCode = ''
this.listQuery.params.warehouseName = ''
this.listQuery.params.warehouseArea = ''
this.listQuery.params.warehouseRackCode = ''
this.listQuery.params.supplierName = ''
this.listQuery.params.isInvoicing = ''
this.listQuery.params.manufacturerName = ''
this.listQuery.params.manufactorBillNo = ''
this.listQuery.params.inDateStart = ''
this.listQuery.params.inDateEnd = ''
this.getList()
},
showData(createOrgSid) {
showData(deptSid) {
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 5
this.listQuery.params.createOrgSid = createOrgSid
this.listQuery.params.useOrgSid = deptSid
this.getList()
},
handleConfirm(row) {
this.$emit('backData', row)
toConfirm() {
if (this.sids.length > 0) {
this.$emit('backData', this.sids)
} else {
this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行操作' })
}
},
//
doClose() {
handleReturn() {
this.$emit('doback')
}
}

Loading…
Cancel
Save