Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 year ago
parent
commit
0f99cf552c
  1. 7
      anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue
  2. 7
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue
  3. 7
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue
  4. 7
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue
  5. 7
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue
  6. 7
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue
  7. 7
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue
  8. 7
      anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue
  9. 12
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue
  10. 7
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue
  11. 7
      anrui-riskcenter-ui/src/components/publicPage/salesOrder.vue
  12. 7
      anrui-riskcenter-ui/src/views/workFlow/publicPage/salesOrder.vue
  13. 63
      yxt-as-ui/src/api/purchase/purchasereturn.js
  14. 6
      yxt-as-ui/src/router/index.js
  15. 337
      yxt-as-ui/src/views/purchase/purchasereturn/purchasereturn.vue
  16. 332
      yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnAdd.vue
  17. 81
      yxt-as-ui/src/views/purchase/purchasereturn/purchasereturnInfo.vue

7
anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/dingdanInfo.vue

@ -11,6 +11,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -347,6 +353,7 @@ export default {
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
companyInvoicingName: '',
concatNo: '',
createDate: '',
customerName: '',

7
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/dingdanInfo.vue

@ -11,6 +11,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -339,6 +345,7 @@ export default {
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
companyInvoicingName: '',
concatNo: '',
createDate: '',
customerName: '',

7
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue

@ -15,6 +15,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -386,6 +392,7 @@ export default {
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
companyInvoicingName: '',
concatNo: '',
createDate: '',
customerName: '',

7
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue

@ -15,6 +15,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -409,6 +415,7 @@ export default {
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
companyInvoicingName: '',
concatNo: '',
createDate: '',
customerName: '',

7
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByJinRong.vue

@ -15,6 +15,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -386,6 +392,7 @@ export default {
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
companyInvoicingName: '',
concatNo: '',
createDate: '',
customerName: '',

7
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue

@ -11,6 +11,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -339,6 +345,7 @@ export default {
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
concatNo: '',
companyInvoicingName: '',
createDate: '',
customerName: '',
customerSid: '',

7
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue

@ -11,6 +11,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -339,6 +345,7 @@ export default {
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
companyInvoicingName: '',
concatNo: '',
createDate: '',
customerName: '',

7
anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/salesOrder.vue

@ -11,6 +11,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -339,6 +345,7 @@ export default {
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
companyInvoicingName: '',
concatNo: '',
createDate: '',
customerName: '',

12
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue

@ -179,7 +179,7 @@ export default {
visibleDisabled: false,
printSid: '',
print: '',
printSource: '',
printSource: false,
btndisabled: false,
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
@ -357,13 +357,13 @@ export default {
},
handleDownLoad(row) {
this.printSid = row.sid
this.printSource = row.source
this.printSource = row.loan
this.print = ''
this.dialogVisible = true
},
handleConfirm() {
this.visibleDisabled = true
if (this.printSource === '01') {
if (!this.printSource) {
createPdf({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
if (resp.success && resp.data.pdfPath !== '') {
var xhr = new XMLHttpRequest()
@ -388,7 +388,7 @@ export default {
xhr.send()
this.dialogVisible = false
this.printSid = ''
this.printSource = ''
this.printSource = false
this.visibleDisabled = false
this.getList()
} else {
@ -397,7 +397,7 @@ export default {
}).catch(() => {
this.visibleDisabled = false
})
} else if (this.printSource === '02') {
} else if (this.printSource) {
createPdfRsk({ skdSid: this.printSid, printerType: this.print }).then((resp) => {
if (resp.success && resp.data.pdfPath !== '') {
var xhr = new XMLHttpRequest()
@ -422,7 +422,7 @@ export default {
xhr.send()
this.dialogVisible = false
this.printSid = ''
this.printSource = ''
this.printSource = false
this.visibleDisabled = false
this.getList()
} else {

7
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/salesOrder.vue

@ -11,6 +11,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -339,6 +345,7 @@ export default {
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
companyInvoicingName: '',
concatNo: '',
createDate: '',
customerName: '',

7
anrui-riskcenter-ui/src/components/publicPage/salesOrder.vue

@ -11,6 +11,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -339,6 +345,7 @@ export default {
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
companyInvoicingName: '',
concatNo: '',
createDate: '',
customerName: '',

7
anrui-riskcenter-ui/src/views/workFlow/publicPage/salesOrder.vue

@ -11,6 +11,12 @@
<div class="titwu">销售订单</div>
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24">
<div class="span-sty">开票单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.companyInvoicingName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">订单编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -339,6 +345,7 @@ export default {
busSalesOrderVehicleList: [],
busSalesOrderotherMessageDetailsVo: [],
busSalesVehicleOrderList: [],
companyInvoicingName: '',
concatNo: '',
createDate: '',
customerName: '',

63
yxt-as-ui/src/api/purchase/purchasereturn.js

@ -0,0 +1,63 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/pms/pmspurchasebackbill/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 查询分页列表 -- 供应商
supplierListPage: function(params) {
return request({
url: '/base/basesupplierinfo/listPage',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 初始化
fetchDetailsBySid: function(data) {
return request({
url: '/pms/pmspurchasebackbill/fetchDetailsBySid/' + data,
method: 'get'
})
},
saveOrUpdate: function(data) {
return request({
url: '/pms/pmspurchasebillsettle/save',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
settlement: function(data) {
return request({
url: '/pms/pmspurchasebillsettle/save',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
deleteBySids: function(data) {
return request({
url: '/pms/pmspurchasebackbill/delBySids',
method: 'DELETE',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 导出
exportExcel: function(data) {
return request({
url: '/pms/pmspurchasebackbill/exportExcel',
method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型
data: data,
headers: { 'Content-Type': 'application/json' }
})
}
}

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

@ -132,6 +132,12 @@ export const constantRoutes = [
component: () => import('@/views/purchase/procurement/procurement.vue'),
name: 'Procurement',
meta: { title: '采购开单', noCache: true }
},
{
path: '/purchasereturn/purchasereturn',
component: () => import('@/views/purchase/purchasereturn/purchasereturn.vue'),
name: 'PurchaseReturn',
meta: { title: '采购退货', noCache: true }
}
]
},

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

@ -0,0 +1,337 @@
<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-select v-model="listQuery.params.supplierSid" placeholder="请选择" clearable filterable>
<el-option v-for="item in supplier_list" :key="item.sid" :label="item.supplierName" :value="item.sid"></el-option>
</el-select>
</el-form-item>
<el-form-item label="开单时间">
<el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<!-- <el-form-item label="结算时间">-->
<!-- <el-date-picker v-model="listQuery.params.appealDueStartDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>-->
<!-- <span style="padding: 0 8px"></span>-->
<!-- <el-date-picker v-model="listQuery.params.appealDueEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>-->
<!-- </el-form-item>-->
<el-form-item>
<el-input v-model="listQuery.params.otherQuery" placeholder="单号、备注" clearable/>
</el-form-item>
</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%;" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50" />
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
<el-table-column label="操作" width="180px" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单号" align="center" />
<el-table-column prop="supplierName" label="供应商" align="center" />
<el-table-column prop="supplierPhone" label="供应商联系方式" align="center" />
<el-table-column prop="purchaserName" label="采购员" align="center" />
<el-table-column prop="storekeeperName" label="库管员" align="center" />
<el-table-column prop="settleTime" label="结算时间" align="center" />
<el-table-column prop="createTime" label="创建时间" align="center" />
</el-table>
</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>
<!--新增及修改 -->
<purchasereturnAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
<!-- 详情 -->
<purchasereturnInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/purchase/purchasereturn'
import { choiceSupplierInfo } from '@/api/Common/dictcommons'
import purchasereturnAdd from './purchasereturnAdd'
import purchasereturnInfo from './purchasereturnInfo'
export default {
name: 'PurchaseReturn',
components: {
Pagination,
pageye,
ButtonBar,
purchasereturnAdd,
purchasereturnInfo
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
icon: 'edit',
btnKey: 'toEdit',
btnLabel: '编辑'
},
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'doExport',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
supplier_list: [],
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 10,
total: 0,
params: {
supplierSid: '',
createStartTime: '',
createEndTime: '',
createOrgSid: '',
otherQuery: ''
}
}
}
},
created() {
//
this.init()
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
choiceSupplierInfo({ createOrgSid : '' }).then((res) => {
if (res.success) {
this.supplier_list = res.data
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'toEdit':
this.toEdit()
break
case 'doDel':
this.doDel()
break
case 'doExport':
this.doExport()
break
case 'doClose':
this.doClose()
break
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
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: 10,
total: 0,
params: {
supplierSid: '',
createStartTime: '',
createEndTime: '',
createOrgSid: '',
otherQuery: ''
}
}
this.init()
},
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid)
},
toEdit(row) {
if (this.sids.length === 1) {
this.viewState = 3
this.$refs['divAdd'].showEdit(this.sids[0])
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑操作' })
}
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
},
doDel() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
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.deleteBySids(this.sids).then(resp => {
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
}
this.getList()
loading.close()
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
doExport() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.exportExcel(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '销售单查询' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
//
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

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

@ -0,0 +1,332 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="danger" size="small" @click="settle()">结算</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">制单人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<el-button type="primary" size="mini" class="btntopblueline" @click="selectYD">选取原单</el-button>
</div>
<el-table :key="tableReturnKey" v-show="formobj.pmsPurchasebackDetailList.length > 0" :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="goodsSpuName" label="商品名称" align="center" width="130" />
<el-table-column prop="goodsSkuCode" label="零件号" align="center" width="130" />
<el-table-column prop="unit" label="计量单位" align="center" width="100" />
<el-table-column prop="warehouse" label="仓库" align="center" width="130" />
<el-table-column prop="currentCount" label="库存数量" align="center" width="130" />
<el-table-column prop="cost" 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="amount" label="采购金额" align="center" width="100" />
<el-table-column prop="returnedCount" label="已退数量" align="center" width="100" />
<el-table-column label="退货数量" align="center" width="100">
<template slot-scope="scope">
<el-input @input="backCountInput(scope.row)" v-model="scope.row.backCount" clearable placeholder=""/>
</template>
</el-table-column>
<el-table-column prop="backAmount" label="退货金额" align="center" width="100" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">数量</div>
<el-form-item><span class="addinputInfo">{{ numTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">合计含税金额</div>
<el-form-item><span class="addinputInfo">{{ hsjeTotal }} = 进价{{ jjTotal }} + 税额</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">退货金额</div>
<el-form-item><span class="addinputInfo">{{ thjeTotal }} = 合计含税金额{{ hsjeTotal }} + 退误差调整</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">应收金额</div>
<el-form-item><span class="addinputInfo">{{ ysjeTotal }} = 退货金额{{ thjeTotal }} - 退优惠<el-input style="width: 100px" v-model="formobj.backDiscountAmount" clearable placeholder="" /> - 抵扣欠款<el-input style="width: 100px" v-model="formobj.backDiscountAmount" clearable placeholder="" /></span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<!-- 选取原单 -->
<el-dialog :visible="YDVisible" width="70%">
<el-form ref="multipleTable" :inline="true" :model="YDQuery" label-width="100px">
<el-form-item>
<el-input v-model="YDQuery.params.queryName" clearable style="width: 150px;" placeholder="制单人、单据编号"/>
</el-form-item>
<el-form-item label="开单时间">
<el-date-picker v-model="YDQuery.params.startDate" 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="YDQuery.params.endDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="YDselect">查询</el-button>
</el-form-item>
</el-form>
<el-table :key="YDKey" v-loading="YDLoading" :data="listByYD" border fit highlight-current-row style="width: 100%;">
<el-table-column fixed :index="YDindexMethod" align="center" label="序号" type="index" width="80"/>
<el-table-column fixed label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="chooseYD(scope.row)">选择</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" />
<el-table-column prop="customerName" label="客户名称" align="center" />
<el-table-column prop="vehMark" label="车辆拍照" align="center" />
<el-table-column prop="mobile" label="联系方式" align="center" />
<el-table-column prop="salesName" label="服务顾问" align="center" />
<el-table-column prop="state" label="单据状态" align="center" />
<el-table-column prop="settleTime" label="结算时间" align="center" />
</el-table>
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="YDQuery.length > 0" :limit.sync="YDQuery.size" :page.sync="YDQuery.current" :total="YDQuery.total" class="pagination" @pagination="getYDList"/>
</div>
</el-dialog>
<!-- 退货结算 -->
<el-dialog :visible.sync="settleVisible" width="70%">
<el-form :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">应收金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.mobile}}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">转入预付款</div>
<el-form-item><span class="addinputInfo">{{ formobj.mobile }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">结算方式</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.mobile" 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.mobile" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">结算时间</div>
<el-form-item><el-date-picker class="addinputInfo addinputw" v-model="formobj.mobile" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">其他结算方式</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.mobile" 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.mobile" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">欠款金额</div>
<!-- <el-form-item><span class="addinputInfo">{{ debts }}</span></el-form-item>-->
</el-col>
</el-row>
</el-form>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="confirm"> </el-button>
<el-button type="info " size="mini" @click="settleVisible = false"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import req from '@/api/purchase/purchasereturn'
export default {
name: 'PurchaseReturnAdd',
components: {
Pagination
},
data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
settleVisible: false,
tableReturnKey: 0,
index: 0,
formobj: {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
backErrorAmount: '',
backDiscountAmount: '',
deductDebts: '',
deductBillNo: '',
toPrepayment: '',
useOrgSid: '',
createOrgSid: '',
pmsPurchasebackDetailList: []
},
YDVisible: false,
YDKey: 2,
YDLoading: false,
listByYD: [],
YDQuery: {
current: 1,
size: 5,
total: 0,
params: {
queryName: '',
startDate: '',
endDate: '',
useOrgSid: ''
}
},
rules: {}
}
},
computed: {
//
numTotal() {
let num = 0
if (this.formobj.pmsPurchasebackDetailList.length > 0) {
this.formobj.pmsPurchasebackDetailList.forEach((e) => {
num = Math.round((parseFloat(num) + parseFloat(e.backCount !== '' ? e.backCount : '0')) * 100) / 100
})
}
return num
},
//
jjTotal() {
let jj = 0
if (this.formobj.pmsPurchasebackDetailList.length > 0) {
this.formobj.pmsPurchasebackDetailList.forEach((e) => {
jj = Math.round((parseFloat(jj) + parseFloat(e.backAmount !== '' ? e.backAmount : '0')) * 100) / 100
})
}
return jj
},
//
hsjeTotal() {
let hsje = 0
if (this.jjTotal !== null) {
hsje = Math.round((parseFloat(hsje) + parseFloat(this.jjTotal !== '' ? this.jjTotal : '0')) * 100) / 100
}
return hsje
},
// 退
thjeTotal() {
let thje = 0
if (this.hsjeTotal !== null) {
thje = Math.round((parseFloat(thje) + parseFloat(this.hsjeTotal !== '' ? this.hsjeTotal : '0')) * 100) / 100
}
return thje
},
//
ysjeTotal() {
let ysje = 0
if (this.thjeTotal !== null) {
ysje = Math.round((parseFloat(ysje) - parseFloat(this.formobj.backDiscountAmount !== '' ? this.formobj.backDiscountAmount : '0') - parseFloat(this.formobj.deductDebts !== '' ? this.formobj.deductDebts : '0')) * 100) / 100
}
return ysje
}
},
methods: {
showAdd() {},
showEdit() {},
selectYD() {
this.YDVisible = true
this.getYDList()
},
YDindexMethod(index) {
var pagestart = (this.YDQuery.current - 1) * this.YDQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
getYDList() {
this.YDLoading = true
req.listPageReturn(this.YDQuery).then(response => {
this.YDLoading = false
if (response.success) {
this.listByYD = response.data.records
this.YDQuery.total = response.data.total
} else {
this.listByYD = []
this.YDQuery.total = 0
}
})
},
YDselect() {
this.YDselect.current = 1
this.getYDList()
},
chooseYD(row) {
this.YDVisible = false
// this.formobj
},
// 退
backCountInput(row) {
row.backAmount = Math((parseFloat(row.cost !== '' ? row.cost : '0') * parseFloat(row.backCount !== '' ? row.backCount : '0')) * 100) / 100
},
settle() {
this.settleVisible = true
this.formobj.settleVo.payableAmount = this.yfjeTotal
},
confirm() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '结算成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn() {
this.formobj = {}
this.$emit('doback')
},
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

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

@ -0,0 +1,81 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-table :key="tableReturnKey" :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="goodsSpuName" label="商品名称" align="center" width="130" />
<el-table-column prop="goodsSkuCode" label="零件号" align="center" width="130" />
<el-table-column prop="unit" label="计量单位" align="center" width="100" />
<el-table-column prop="warehouse" label="仓库" align="center" width="130" />
<el-table-column prop="currentCount" label="库存数量" align="center" width="130" />
<el-table-column prop="cost" 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="amount" label="采购金额" align="center" width="100" />
<el-table-column prop="returnedCount" label="已退数量" align="center" width="100" />
</el-table>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/purchase/purchasereturn'
export default {
name: 'PurchaseReturnInfo',
data() {
return {
viewTitle: '',
viewState: 1,
tableReturnKey: 0,
index: 0,
formobj: {
sid: '',
remarks: '',
createBySid: '',
createByName: '',
sourceBillSid: '',
sourceBillNo: '',
billNo: '',
backErrorAmount: '',
backDiscountAmount: '',
deductDebts: '',
deductBillNo: '',
toPrepayment: '',
useOrgSid: '',
createOrgSid: '',
pmsPurchasebackDetailList: []
},
rules: {}
}
},
methods: {
showInfo(row) {
this.viewTitle = '采购退货单详情'
req.fetchDetailsBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
handleReturn() {
this.formobj = {}
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>
Loading…
Cancel
Save