Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 year ago
parent
commit
467606eb4c
  1. 22
      yxt-as-ui/src/api/statement/purchasereport.js
  2. 12
      yxt-as-ui/src/router/index.js
  3. 2
      yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue
  4. 30
      yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
  5. 2
      yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue
  6. 193
      yxt-as-ui/src/views/statement/purchasereport/detailedpurchasereport.vue
  7. 191
      yxt-as-ui/src/views/statement/purchasereport/purchasesummaryreport.vue

22
yxt-as-ui/src/api/statement/purchasereport.js

@ -0,0 +1,22 @@
import request from '@/utils/request'
export default {
// 查询分页列表 -- 采购明细报表
purDetailReForm: function(params) {
return request({
url: '/apiadmin/pms/pmspurchasebill/purDetailReForm',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 查询分页列表 -- 采购汇总报表
purSumReForm: function(params) {
return request({
url: '/apiadmin/pms/pmspurchasebill/purSumReForm',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
}
}

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

@ -96,6 +96,18 @@ export const constantRoutes = [
component: () => import('@/views/statement/warehousereport/receiptandreceiptrecord.vue'),
name: 'ReceiptAndReceiptRecord',
meta: { title: '收发存明细报表', noCache: true }
},
{
path: '/purchasereport/detailedpurchasereport',
component: () => import('@/views/statement/purchasereport/detailedpurchasereport.vue'),
name: 'DetailedPurchaseReport',
meta: { title: '采购明细报表', noCache: true }
},
{
path: '/purchasereport/purchasesummaryreport',
component: () => import('@/views/statement/purchasereport/purchasesummaryreport.vue'),
name: 'PurchaseSummaryReport',
meta: { title: '采购汇总报表', noCache: true }
}
]
},

2
yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue

@ -80,7 +80,7 @@
</el-col>
<el-col :span="12">
<div class="span-sty">成本</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
</el-form>

30
yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue

@ -53,29 +53,29 @@
<el-row>
<el-col :span="8">
<div class="span-sty">排序</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">工时单价</div>
<el-form-item><el-input class="addinputInfo addinputw" @input="computeXSJ" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">工时数</div>
<el-form-item><el-input class="addinputInfo addinputw" @input="computeXSJ" v-model="formobj.hours" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" @input="computeXSJ" @keyup.native="formobj.hours = getNumber(formobj.hours, 2)" v-model="formobj.hours" 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" @input="computeGSS" v-model="formobj.price" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.price = getNumber(formobj.price, 2)" @input="computeGSS" v-model="formobj.price" 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.examineHourPrice" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.examineHourPrice = getNumber(formobj.examineHourPrice, 2)" v-model="formobj.examineHourPrice" 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.cost" clearable placeholder="" /></el-form-item>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
@ -188,6 +188,24 @@ export default {
}
})
},
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
},
serviceTypeChange(value) {
const choose = this.serviceType_list.filter((item) => item.serviceType === value)
if (choose !== null && choose.length > 0) {

2
yxt-as-ui/src/views/operation/preregistration/preregistrationAdd.vue

@ -92,7 +92,7 @@
<el-popover placement="right" width="600" trigger="click">
<div>
<el-table :data="serviceData" v-loading="serviceLoading" highlight-current-row @current-change="serviceCurrentChange($event, scope.row)">
<el-table-column fixed prop="serviceItem" label="项目名称" align="center" width="130" />
<el-table-column fixed prop="sitemName" label="项目名称" align="center" width="130" />
<el-table-column prop="sitemCode" label="项目编码" align="center" width="100" />
<el-table-column prop="hourPrice" label="工时单价" align="center" min-width="300" />
<el-table-column prop="hours" label="工时数" align="center" width="100" />

193
yxt-as-ui/src/views/statement/purchasereport/detailedpurchasereport.vue

@ -0,0 +1,193 @@
<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.goodsSpuName" 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.goodsSkuOwnSpec" 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 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 prop="goodsSpuName" label="商品名称" align="center" width="130" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" width="100" />
<el-table-column prop="cost" label="进价" align="center" width="100" />
<el-table-column prop="costCount" label="进价合计" align="center" width="100" />
<el-table-column prop="taxAmount" label="税额" align="center" width="100" />
<el-table-column prop="taxAmountCount" label="税额合计" align="center" width="100" />
<el-table-column prop="taxPrice" label="含税价" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" width="100" />
<el-table-column prop="retreatCount" label="退货数量" align="center" width="100" />
<el-table-column prop="amount" label="采购金额" align="center" width="100" />
</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/statement/purchasereport'
export default {
name: 'DetailedPurchaseReport',
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: {
warehouseName: '',
goodsSkuCode: '',
goodsSkuOwnSpec: '',
goodsSpuName: ''
}
}
}
},
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
}
},
// sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
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.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.purDetailReForm(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: 10,
total: 0,
params: {
warehouseName: '',
goodsSkuCode: '',
goodsSkuOwnSpec: '',
goodsSpuName: ''
}
}
this.getList()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

191
yxt-as-ui/src/views/statement/purchasereport/purchasesummaryreport.vue

@ -0,0 +1,191 @@
<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.goodsSpuName" 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.goodsSkuOwnSpec" 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 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 prop="goodsSpuName" label="商品名称" align="center" width="130" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" width="100" />
<el-table-column prop="unit" label="单位" align="center" width="100" />
<el-table-column prop="goodsSkuOwnSpec" label="规格" align="center" width="100" />
<el-table-column prop="count" label="采购数量" align="center" min-width="300" />
<el-table-column prop="amount" label="采购金额" align="center" width="100" />
<el-table-column prop="retreatCount" label="退货数量" align="center" width="100" />
<el-table-column prop="backAmount" label="退货金额" align="center" width="100" />
</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/statement/purchasereport'
export default {
name: 'PurchaseSummaryReport',
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: 10,
total: 0,
params: {
warehouseName: '',
goodsSkuCode: '',
goodsSkuOwnSpec: '',
goodsSpuName: ''
}
}
}
},
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
}
},
// sid
handleSelectionChange(row) {
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
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.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.purSumReForm(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: {
warehouseName: '',
goodsSkuCode: '',
goodsSkuOwnSpec: '',
goodsSpuName: ''
}
}
this.getList()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>
Loading…
Cancel
Save