purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加转采购退货、转销售退货、转零售退货的功能

Browse Source
This commit is contained in:
jishenghua
2025-05-02 22:12:58 +08:00
parent f3a40d0d02
commit 8425744e3c
7 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jshERP-web/src/views/bill/PurchaseInList.vue
View File

@@ -115,6 +115,7 @@
<div class="table-operator" style="margin-top: 5px">
<a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
<a-button v-if="btnEnableList.indexOf(1)>-1" icon="delete" @click="batchDel">删除</a-button>
<a-button v-if="quickBtn.purchaseBack && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转采购退货')">转采购退货</a-button>
<a-tooltip title="可将状态是部分入库的单据强制完成">
<a-button v-if="inOutManageFlag && btnEnableList.indexOf(1)>-1" icon="issues-close" @click="batchForceClose">强制结单</a-button>
</a-tooltip>
@@ -210,6 +211,7 @@
<!-- table区域-end -->
<!-- 表单区域 -->
<purchase-in-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></purchase-in-modal>
<purchase-back-modal ref="transferModalForm" @ok="modalFormOk" @close="modalFormClose"></purchase-back-modal>
<bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
<bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
</a-card>
@@ -219,6 +221,7 @@
<!-- by ji sheng hua-->
<script>
import PurchaseInModal from './modules/PurchaseInModal'
import PurchaseBackModal from './modules/PurchaseBackModal'
import BillDetail from './dialog/BillDetail'
import BillExcelIframe from '@/components/tools/BillExcelIframe'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -231,6 +234,7 @@
mixins:[JeecgListMixin,BillListMixin],
components: {
PurchaseInModal,
PurchaseBackModal,
BillDetail,
BillExcelIframe,
JEllipsis,
@@ -334,6 +338,8 @@
this.getDepotData()
this.initUser()
this.initAccount()
this.initQuickBtn()
this.getDepotByCurrentUser()
},
methods: {
}

6
jshERP-web/src/views/bill/RetailOutList.vue
View File

@@ -100,6 +100,7 @@
<div class="table-operator" style="margin-top: 5px">
<a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
<a-button v-if="btnEnableList.indexOf(1)>-1" icon="delete" @click="batchDel">删除</a-button>
<a-button v-if="quickBtn.retailBack && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转零售退货')">转零售退货</a-button>
<a-button v-if="checkFlag && btnEnableList.indexOf(2)>-1" icon="check" @click="batchSetStatus(1)">审核</a-button>
<a-button v-if="checkFlag && btnEnableList.indexOf(7)>-1" icon="stop" @click="batchSetStatus(0)">反审核</a-button>
<a-button v-if="isShowExcel && btnEnableList.indexOf(3)>-1" icon="download" @click="handleExport">导出</a-button>
@@ -179,6 +180,7 @@
<!-- table区域-end -->
<!-- 表单区域 -->
<retail-out-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></retail-out-modal>
<retail-back-modal ref="transferModalForm" @ok="modalFormOk" @close="modalFormClose"></retail-back-modal>
<bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
<bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
</a-card>
@@ -188,6 +190,7 @@
<!-- create ji sheng hua-->
<script>
import RetailOutModal from './modules/RetailOutModal'
import RetailBackModal from './modules/RetailBackModal'
import BillDetail from './dialog/BillDetail'
import BillExcelIframe from '@/components/tools/BillExcelIframe'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -200,6 +203,7 @@
mixins:[JeecgListMixin,BillListMixin],
components: {
RetailOutModal,
RetailBackModal,
BillDetail,
BillExcelIframe,
JEllipsis,
@@ -284,6 +288,8 @@
this.getDepotData()
this.initUser()
this.initAccount()
this.initQuickBtn()
this.getDepotByCurrentUser()
},
methods: {
}

2
jshERP-web/src/views/bill/SaleOrderList.vue
View File

@@ -85,7 +85,7 @@
<div class="table-operator" style="margin-top: 5px">
<a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
<a-button v-if="btnEnableList.indexOf(1)>-1" icon="delete" @click="batchDel">删除</a-button>
<a-button v-if="quickBtn.purchaseIn && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转销售出库')">转销售出库</a-button>
<a-button v-if="quickBtn.saleOut && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转销售出库')">转销售出库</a-button>
<a-tooltip title="可将状态是部分销售的单据强制完成">
<a-button v-if="btnEnableList.indexOf(1)>-1" icon="issues-close" @click="batchForceClose">强制结单</a-button>
</a-tooltip>

6
jshERP-web/src/views/bill/SaleOutList.vue
View File

@@ -116,6 +116,7 @@
<div class="table-operator" style="margin-top: 5px">
<a-button v-if="btnEnableList.indexOf(1)>-1" @click="myHandleAdd" type="primary" icon="plus">新增</a-button>
<a-button v-if="btnEnableList.indexOf(1)>-1" icon="delete" @click="batchDel">删除</a-button>
<a-button v-if="quickBtn.saleBack && btnEnableList.indexOf(1)>-1" icon="share-alt" @click="transferBill('转销售退货')">转销售退货</a-button>
<a-tooltip title="可将状态是部分出库的单据强制完成">
<a-button v-if="inOutManageFlag && btnEnableList.indexOf(1)>-1" icon="issues-close" @click="batchForceClose">强制结单</a-button>
</a-tooltip>
@@ -211,6 +212,7 @@
<!-- table区域-end -->
<!-- 表单区域 -->
<sale-out-modal ref="modalForm" @ok="modalFormOk" @close="modalFormClose"></sale-out-modal>
<sale-back-modal ref="transferModalForm" @ok="modalFormOk" @close="modalFormClose"></sale-back-modal>
<bill-detail ref="modalDetail" @ok="modalFormOk" @close="modalFormClose"></bill-detail>
<bill-excel-iframe ref="billExcelIframe" @ok="modalFormOk" @close="modalFormClose"></bill-excel-iframe>
</a-card>
@@ -219,6 +221,7 @@
</template>
<script>
import SaleOutModal from './modules/SaleOutModal'
import SaleBackModal from './modules/SaleBackModal'
import BillDetail from './dialog/BillDetail'
import BillExcelIframe from '@/components/tools/BillExcelIframe'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
@@ -231,6 +234,7 @@
mixins:[JeecgListMixin,BillListMixin],
components: {
SaleOutModal,
SaleBackModal,
BillDetail,
BillExcelIframe,
JEllipsis,
@@ -335,6 +339,8 @@
this.getDepotData()
this.initUser()
this.initAccount()
this.initQuickBtn()
this.getDepotByCurrentUser()
},
methods: {
}

6
jshERP-web/src/views/bill/modules/PurchaseBackModal.vue
View File

@@ -316,6 +316,10 @@
if (this.action === 'add') {
this.addInit(this.prefixNo)
this.fileList = []
this.$nextTick(() => {
let tp = this.transferParam
this.linkBillListOk(tp.list, tp.number, tp.organId, tp.discountMoney, tp.deposit, tp.remark, this.defaultDepotId, tp.accountId)
})
} else {
if(this.model.linkNumber) {
this.rowCanEdit = false
@@ -412,9 +416,11 @@
}
info.linkId = info.id
allTaxLastMoney += info.taxLastMoney
if(info.operNumber>0) {
listEx.push(info)
this.changeColumnShow(info)
}
}
this.materialTable.dataSource = listEx
///给优惠后金额重新赋值
allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0

4
jshERP-web/src/views/bill/modules/RetailBackModal.vue
View File

@@ -300,6 +300,8 @@
this.fileList = []
this.$nextTick(() => {
this.form.setFieldsValue({'getAmount':0, 'backAmount':0})
let tp = this.transferParam
this.linkBillListOk(tp.list, tp.number, tp.organId, tp.discountMoney, tp.deposit, tp.remark)
})
} else {
if(this.model.linkNumber) {
@@ -408,9 +410,11 @@
let info = selectBillDetailRows[j];
info.linkId = info.id
allTaxLastMoney += info.allPrice
if(info.operNumber>0) {
listEx.push(info)
this.changeColumnShow(info)
}
}
this.materialTable.dataSource = listEx
///给优惠后金额重新赋值
allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0

8
jshERP-web/src/views/bill/modules/SaleBackModal.vue
View File

@@ -189,7 +189,7 @@
import { FormTypes } from '@/utils/JEditableTableUtil'
import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
import { BillModalMixin } from '../mixins/BillModalMixin'
import { getMpListShort,changeListFmtMinus } from "@/utils/util"
import { getMpListShort, changeListFmtMinus, handleIntroJs } from '@/utils/util'
import { getAction } from '@/api/manage'
import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
import JUpload from '@/components/jeecg/JUpload'
@@ -321,6 +321,10 @@
this.addInit(this.prefixNo)
this.personList.value = ''
this.fileList = []
this.$nextTick(() => {
let tp = this.transferParam
this.linkBillListOk(tp.list, tp.number, tp.organId, tp.discountMoney, tp.deposit, tp.remark, this.defaultDepotId, tp.accountId, tp.salesMan)
})
} else {
if(this.model.linkNumber) {
this.rowCanEdit = false
@@ -422,9 +426,11 @@
}
info.linkId = info.id
allTaxLastMoney += info.taxLastMoney
if(info.operNumber>0) {
listEx.push(info)
this.changeColumnShow(info)
}
}
this.materialTable.dataSource = listEx
///给优惠后金额重新赋值
allTaxLastMoney = allTaxLastMoney?allTaxLastMoney:0