Merge remote-tracking branch 'origin/main'

product
chuang 2 years ago
commit 8278d379b7

@ -577,6 +577,24 @@ public class PoundlistController {
}
/**
*
*
* @param id
* @return
*/
@PostMapping("/handleReturn/{id}")
@Transactional
public ActionResult handleReturn(@PathVariable("id") String id){
PoundlistEntity entity= poundlistService.getInfo(id);
if(entity!=null){
entity.setIsExamine("0");
poundlistService.updateById(entity);
return ActionResult.success("驳回成功");
}
return ActionResult.fail("数据不存在");
}

@ -128,7 +128,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
//排序
if(StringUtil.isEmpty(tradeuploadPagination.getSidx())){
tradeuploadPagination.setSidx("CREATOR_TIME");
tradeuploadPagination.setSort("DESC");
tradeuploadPagination.setSort("ASC");
}else{
try {
String sidx = tradeuploadPagination.getSidx();

@ -52,10 +52,12 @@ creator_time = DATE_SUB(NOW(),interval 15 day)
<if test="tradeuploadPagination.salesName != null and tradeuploadPagination.salesName != ''">
AND f.contract_name LIKE CONCAT('%',#{tradeuploadPagination.salesName},'%')
</if>
<if test="tradeuploadPagination.customerName != null and tradeuploadPagination.customerName != ''">
AND d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.customerName},'%')
</if>
<if test="tradeuploadPagination.businessName != null and tradeuploadPagination.businessName != ''">
AND h.F_RealName LIKE CONCAT('%',#{tradeuploadPagination.businessName},'%')
</if>
<if test="tradeuploadPagination.sidx != null and tradeuploadPagination.sidx != ''">
ORDER BY ${tradeuploadPagination.sidx} ${tradeuploadPagination.sort}
</if>

@ -18,7 +18,7 @@
<popupSelect v-model="dataForm.supplierId" placeholder="请选择" clearable field="supplierId"
interfaceId="389674191453990661" :columnOptions="supplierIdcolumnOptions"
propsValue="id" relationField="supplier_name" popupType="dialog" popupTitle="选择数据"
popupWidth="800px" hasPage :pageSize="20" :disabled="true">
popupWidth="800px" hasPage :pageSize="20" disabled>
</popupSelect>
</el-form-item>
@ -1211,3 +1211,9 @@
},
}
</script>
<style lang="scss" scoped>
.el-input.is-disabled {
color: #606266;
}
</style>

@ -233,8 +233,10 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button>
<!-- <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button>-->
<el-button type="text" @click="handleReturn(scope.row)" v-has="'btn_remove'">
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row)" v-has="'btn_remove'">
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)" v-has="'btn_detail'">
@ -572,6 +574,32 @@
this.listLoading = false
})
},
handleReturn(row){
/* if(row.purchaseStatus != '99' || row.salesStatus != '99'){
this.$message({
type: 'error',
message: '该磅单已生成采购或销售无法删除',
duration: 2500,
})
return
}*/
this.$confirm('是否确认驳回?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/poundlist/Poundlist/handleReturn/${row.id}`,
method: 'post'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {});
},
handleDel(row) {
if(row.purchaseStatus != '99' || row.salesStatus != '99'){
this.$message({

@ -103,6 +103,16 @@
{{ scope.row.currency | dynamicText(currencyOptions) }}
</template>
</el-table-column>
<el-table-column label="是否付款" sortable width="100" prop="isPayment" align="center" >
<template slot-scope="scope">
{{ scope.row.isPayment | dynamicText(isPaymentOptions) }}
</template>
</el-table-column>
<el-table-column label="是否转销售" sortable width="110" prop="isTransfer" align="center" >
<template slot-scope="scope">
{{ scope.row.isTransfer | dynamicText(isTransferOptions) }}
</template>
</el-table-column>
<el-table-column prop="payPrice" label="已付款金额" sortable width="150" align="center" />
<el-table-column prop="invoiceNum" label="发票数量" sortable width="150" align="center" />
<el-table-column prop="invoiceAmount" label="发票金额" sortable width="150" align="center" />
@ -258,6 +268,10 @@
prop: 'notAmount',
label: '不含税金额'
},
{
prop: 'isPayment',
label: '是否付款'
},
{
prop: 'payPrice',
label: '已付款金额'
@ -285,6 +299,20 @@
"fullName": "英镑",
"id": "2"
}],
isPaymentOptions: [{
"fullName": "否",
"id": "0"
}, {
"fullName": "是",
"id": "1"
}],
isTransferOptions: [{
"fullName": "否",
"id": "0"
}, {
"fullName": "是",
"id": "1"
}],
currencyProps: {
"label": "fullName",
"value": "id"

@ -0,0 +1,156 @@
<template>
<el-dialog title="选择库区" :close-on-click-modal="false" :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center"
lock-scroll append-to-body width="1000px">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="8">
<el-form-item label="库区编码">
<el-input v-model="areacode" placeholder="请输入库区编码查询" clearable @keyup.enter.native="init()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="库区名称">
<el-input v-model="areaname" placeholder="请输入库区名称查询" clearable @keyup.enter.native="init()" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="init()">{{$t('common.search')}}
</el-button>
<el-button icon="el-icon-refresh-right" @click="refresh()">{{$t('common.reset')}}
</el-button>
</el-form-item>
</el-col>
</el-form>
<div class="JNPF-common-search-box-right">
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false" @click="init()" />
</el-tooltip>
</div>
</el-row>
<JNPF-table v-loading="listLoading" :data="list" @row-click="rowClick" @row-dblclick="rowdbClick" :border="false" :hasNO="false">
<el-table-column width="35">
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="checkedRow.id">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="areacode" label="库区编码" />
<el-table-column prop="areaname" label="库区名称" />
<el-table-column prop="maximum" label="最高库存" />
<el-table-column prop="safety" label="安全库存" />
<el-table-column prop="minimum" label="最低库存" />
<el-table-column prop="warehouseId" label="仓库名称" />
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="refresh" />
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">{{$t('common.cancelButton')}}</el-button>
<el-button type="primary" @click="select()">{{$t('common.confirmButton')}}</el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
import {
getDictionaryDataSelector
} from '@/api/systemData/dictionary'
import {
getDataInterfaceRes
} from '@/api/systemData/dataInterface'
import {
GoodsList
} from '@/api/extend/order'
export default {
data() {
return {
visible: false,
listLoading: true,
areacode: '',
areaname: '',
list: [],
total: 0,
checkedRow: {},
listQuery: {
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "creatorTime",
areacode: '',
areaname: '',
},
total: 0,
checked: '',
}
},
computed: {
menuId() {
return this.$route.meta.modelId || ''
}
},
methods: {
rowdbClick(row){
this.checked = row.id
this.checkedRow = row
this.select();
},
rowClick(row) {
this.checked = row.id
this.checkedRow = row
},
init() {
this.visible = true
this.listLoading = true
this.listQuery.areacode = this.areacode
this.listQuery.areaname = this.areaname
this.listQuery.menuId = this.menuId
let listQuery = this.listQuery
request({
url: `/api/example/Reservoirarea/getList`,
method: 'post',
data: listQuery
}).then(res => {
this.list = res.data.list
this.total = res.data.pagination.total
this.listLoading = false
})
/* GoodsList(query).then(res => {
this.list = res.data.list
this.total = res.data.pagination.total
this.listLoading = false
}) */
},
refresh() {
this.areacode = ''
this.areaname = ''
this.init()
},
select() {
if (this.checked == '') return
this.$emit('refreshDataList', this.checkedRow)
this.visible = false
},
handleSelectionChange(val) {
this.checked = val
}
}
}
</script>
<style lang="scss" scoped>
>>>.el-dialog__body {
height: 70vh;
padding: 0 0 10px !important;
display: flex;
flex-direction: column;
overflow: hidden;
.JNPF-common-search-box {
margin-bottom: 0;
.JNPF-common-search-box-right {
padding: 10px 10px 0 0;
}
}
}
</style>

@ -76,7 +76,7 @@
<screenfull isContainer/>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" custom-column border>
<el-table-column prop="poundDate" label="磅单日期" width="200" align="center" sortable
/>
@ -157,9 +157,9 @@
<el-button type="text"
@click="addOrUpdateHandle2(scope.row.id)" v-has="'btn_addOrUpdateHandle2'">审核
</el-button>
<!-- <el-button type="text"
<el-button type="text"
@click="addOrUpdateHandle(scope.row.id)">编辑
</el-button> -->
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)" v-has="'btn_remove'">
</el-button>
<el-button type="text"

Loading…
Cancel
Save