yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(front):前端审核代码提交;

Browse Source
master
jiyufei 4 months ago
parent 71267a0a40
commit 1c72632dda
7 changed files with 682 additions and 635 deletions
Show Stats Download Patch File Download Diff File

2
jnpf-java-boot/jnpf-admin/src/main/resources/mapper/RecycleDeliveryOrderMapper.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.mapper.RecycleCleanOrderMapper">
<mapper namespace="jnpf.mapper.RecycleDeliveryOrderMapper">
<update id="auditBatch">
UPDATE NX_RECYCLE_DELIVERY_ORDER

2
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/RecycleDeliveryOrderMapper.java
Unescape View File

@ -15,5 +15,5 @@ import org.apache.ibatis.annotations.Param;
*/
public interface RecycleDeliveryOrderMapper extends BaseMapper<RecycleDeliveryOrderEntity> {
int auditBatch(@Param("bacth") DeliveryAuditBatch batch);
int auditBatch(@Param("batch") DeliveryAuditBatch batch);
}

1
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
Unescape View File

@ -607,6 +607,7 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
// 添加商户流水
EnterpriseAccountBillEntity billEntity = new EnterpriseAccountBillEntity();
billEntity.setEnterpriseId(companyId);
billEntity.setCompanyId(companyId);
billEntity.setBillNumber(getIdNumber("BL"));
billEntity.setAccountBalance(fund);

4
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/RecycleCleanOrderController.java
Unescape View File

@ -215,8 +215,8 @@ public class RecycleCleanOrderController {
@PostMapping("/auditBatch")
public ActionResult AuditBatch(@RequestBody CleanAuditBatch batch) {
int up = recycleCleanOrderService.auditBatch(batch);
if (up > 0) return ActionResult.success("审核操作成功");
else return ActionResult.fail("审核操作失败");
if (up > 0) return ActionResult.success("审核成功");
else return ActionResult.fail("审核失败");
}
}

51
jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/DialogComponent.vue
Unescape View File

@ -0,0 +1,51 @@
<template>
<el-dialog title="批量审核" :visible.sync="showDialog" width="30%" @close="handleDialogClose">
<el-form ref="form" :model="form" label-width="120px">
<el-form-item label="*审核意见">
<el-input v-model="form.adjustComm" placeholder="请输入审核意见"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="showDialog = false">取 消</el-button>
<el-button type="primary" @click="handleSubmit">确 定</el-button>
</span>
</el-dialog>
</template>
<script>
export default {
props: {
showDialog: {
type: Boolean,
default: false,
},
selectedRows: {
type: Array,
default: () => []
},
onSubmit: {
type: Function,
default: () => { },
},
},
data() {
return {
form: {
adjustComm: '',
},
};
},
methods: {
handleDialogClose() {
this.form.adjustComm = ''; // 清空输入框内容
this.$emit('update:showDialog', false); // 通知父组件更新 showDialog
},
handleSubmit() {
this.onSubmit({
adjustComm: this.form.adjustComm,
});
this.handleDialogClose(); // 关闭弹窗
},
},
};
</script>

61
jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/index.vue
Unescape View File

@ -27,6 +27,9 @@
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="showDialog = true">批量审核
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
@ -40,8 +43,9 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod">
<el-table-column prop="orderNo" label="清运单号" align="left">
:span-method="arraySpanMethod" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="40"></el-table-column>
<el-table-column prop="orderNo" label="清运单号" align="left" width="150">
</el-table-column>
<el-table-column prop="deviceCode" label="设备编码" align="left">
</el-table-column>
@ -53,7 +57,7 @@
</el-table-column>
<el-table-column prop="productSubCode" label="回收品子类" align="left">
</el-table-column>
<el-table-column prop="deviceOrderNo" label="机柜清运单号" align="left">
<el-table-column prop="deviceOrderNo" label="机柜清运单号" align="left" width="100">
</el-table-column>
<el-table-column prop="price" label="单价" align="left">
<template slot-scope="scope" v-if="scope.row.price">
@ -82,7 +86,7 @@
</el-table-column>
<el-table-column prop="cleanUserId" label="清运员" align="left">
</el-table-column>
<el-table-column prop="phone" label="清运员手机号" align="left">
<el-table-column prop="phone" label="清运员手机号" align="left" width="100">
</el-table-column>
<el-table-column label="入库状态" prop="entryStatus" algin="left">
<template slot-scope="scope">
@ -109,8 +113,8 @@
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">详情
</el-button>
<el-button type="text" v-show="scope.row.adjustStatus === '未审核'" @click="auditHandle(scope.row)"
v-has="'btn_edit'">审核
<el-button type="text" v-show="scope.row.adjustStatus === '未审核'"
@click="auditHandle(scope.row)" v-has="'btn_edit'">审核
</el-button>
</template>
</el-table-column>
@ -122,15 +126,13 @@
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<Audit v-if="auditHandleVisible" ref="Audit" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<DialogComponent :showDialog.sync="showDialog" @update:showDialog="showDialog = $event"
:onSubmit="handleSubmit" />
</div>
</template>
@ -152,17 +154,21 @@ import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
import DialogComponent from './DialogComponent.vue';
export default {
components: {
JNPFForm,
Detail,
Audit,
DialogComponent,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
selectedRows: [],
selectedIds:[],
showDialog: false,
keyword: '',
expandsTree: true,
refreshTree: true,
@ -172,7 +178,6 @@ export default {
mergeList: [],
exportList: [],
columnList,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
@ -230,6 +235,10 @@ export default {
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
handleSelectionChange(val) {
this.selectedRows = val;
this.selectedIds = this.selectedRows.map(row => row.id);
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
@ -509,6 +518,34 @@ export default {
this.flowVisible = false
if (isrRefresh) this.reset()
},
handleSubmit(rows) {
if (this.selectedIds.length == 0) {
this.$message.error('请选择要审核的单据！');
return;
}
if (rows.adjustComm == null || rows.adjustComm == '') {
this.$message.error('请填写您的审核意见！');
return;
}
let _query = {
adjustStatus: 1,
ids:this.selectedIds,
adjustComm:rows.adjustComm,
entryStatus:1
};
request({
url: `/api/scm/RecycleCleanOrder/auditBatch`,
method: 'post',
data: _query
}).then(res => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
})
this.initData()
})
},
}
}
</script>

196
jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue
Unescape View File

@ -1,10 +1,3 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
@ -18,8 +11,7 @@
<el-col :span="6">
<el-form-item label="审核状态 ">
<JnpfSelect v-model="query.adjustStatus" placeholder="请选择" clearable
:options="adjustStatusOptions"
:props="adjustStatusProps" >
:options="adjustStatusOptions" :props="adjustStatusProps">
</JnpfSelect>
</el-form-item>
</el-col>
@ -32,23 +24,21 @@
<el-col :span="6">
<el-form-item label="机柜编码">
<JnpfSelect v-model="query.deviceCode" placeholder="请选择" clearable
:options="deviceCodeOptions"
:props="deviceCodeProps" multiple >
:options="deviceCodeOptions" :props="deviceCodeProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="桶编号">
<JnpfSelect v-model="query.doorNum" placeholder="请选择" clearable
:options="doorNumOptions"
:props="doorNumProps" multiple >
:options="doorNumOptions" :props="doorNumProps" multiple>
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="桶编码">
<JnpfCascader v-model="query.bucketCode" placeholder="请选择" :options ="bucketCodeOptions" :props="bucketCodeProps"
clearable/>
<JnpfCascader v-model="query.bucketCode" placeholder="请选择" :options="bucketCodeOptions"
:props="bucketCodeProps" clearable />
</el-form-item>
</el-col>
<el-col :span="6">
@ -69,8 +59,7 @@
<el-col :span="6">
<el-form-item label="清运状态">
<JnpfSelect v-model="query.cleanStatus" placeholder="请选择" clearable
:options="cleanStatusOptions"
:props="cleanStatusProps" >
:options="cleanStatusOptions" :props="cleanStatusProps">
</JnpfSelect>
</el-form-item>
</el-col>
@ -99,6 +88,9 @@
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" @click="addOrUpdateHandle()">新增
</el-button>
<el-button type="success" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="showDialog = true">批量审核
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
@ -112,137 +104,70 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange'
:span-method="arraySpanMethod"
>
<el-table-column
prop="companyId"
label="公司id" align="left"
>
:span-method="arraySpanMethod" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="40"></el-table-column>
<el-table-column prop="companyId" label="公司id" align="left">
</el-table-column>
<el-table-column
prop="orderNo"
label="投递单号" align="left"
>
<el-table-column prop="orderNo" label="投递单号" align="left" width="150">
</el-table-column>
<el-table-column
prop="phone"
label="投递人手机" align="left"
>
<el-table-column prop="phone" label="投递人手机" align="left" width="100">
</el-table-column>
<el-table-column
prop="deviceCode"
label="投递机柜" align="left"
>
<el-table-column prop="deviceCode" label="投递机柜" align="left">
</el-table-column>
<el-table-column label="桶编号" prop="doorNum" algin="left"
>
<el-table-column label="桶编号" prop="doorNum" algin="left">
<template slot-scope="scope">
{{ scope.row.doorNum }}
</template>
</el-table-column>
<el-table-column
prop="originalWeight"
label="桶内原重" align="left"
>
<el-table-column prop="originalWeight" label="桶内原重" align="left">
</el-table-column>
<el-table-column
prop="reportWeight"
label="上报重量" align="left"
>
<el-table-column prop="reportWeight" label="上报重量" align="left">
</el-table-column>
<el-table-column
prop="price"
label="单价" align="left"
>
<el-table-column prop="price" label="单价" align="left">
</el-table-column>
<el-table-column
prop="totalPrice"
label="总价" align="left"
>
<el-table-column prop="totalPrice" label="总价" align="left">
</el-table-column>
<el-table-column
prop="adjustStatus"
label="审核状态 " align="left"
>
<el-table-column prop="adjustStatus" label="审核状态 " align="left">
</el-table-column>
<el-table-column
prop="adjustWeight"
label="审核重量" align="left"
>
<el-table-column prop="adjustWeight" label="审核重量" align="left">
</el-table-column>
<el-table-column
prop="adjustPrice"
label="审核总价" align="left"
>
<el-table-column prop="adjustPrice" label="审核总价" align="left">
</el-table-column>
<el-table-column
prop="adjustComm"
label="审核说明" align="left"
>
<el-table-column prop="adjustComm" label="审核说明" align="left">
</el-table-column>
<el-table-column
prop="bucketCode"
label="桶编号" align="left"
>
<el-table-column prop="bucketCode" label="桶编号" align="left">
</el-table-column>
<el-table-column
prop="bagNo"
label="垃圾袋编号" align="left"
>
<el-table-column prop="bagNo" label="垃圾袋编号" align="left">
</el-table-column>
<el-table-column
prop="productCode"
label="回收品大类" align="left"
>
<el-table-column prop="productCode" label="回收品大类" align="left">
</el-table-column>
<el-table-column
prop="productSubCode"
label="回收品子类" align="left"
>
<el-table-column prop="productSubCode" label="回收品子类" align="left">
</el-table-column>
<el-table-column label="登录方式" prop="loginType" algin="left"
>
<el-table-column label="登录方式" prop="loginType" algin="left">
<template slot-scope="scope">
{{ scope.row.loginType }}
</template>
</el-table-column>
<el-table-column label="清运状态" prop="cleanStatus" algin="left"
>
<el-table-column label="清运状态" prop="cleanStatus" algin="left">
<template slot-scope="scope">
{{ scope.row.cleanStatus }}
</template>
</el-table-column>
<el-table-column
prop="cleanNo"
label="清运单号" align="left"
>
<el-table-column prop="cleanNo" label="清运单号" align="left">
</el-table-column>
<el-table-column
prop="cleanerPhone"
label="清运员手机号" align="left"
>
<el-table-column prop="cleanerPhone" label="清运员手机号" align="left" width="100">
</el-table-column>
<el-table-column
prop="lastModifyUserId"
label="修改用户" align="left"
>
<el-table-column prop="lastModifyUserId" label="修改用户" align="left">
</el-table-column>
<el-table-column
prop="lastModifyTime"
label="修改时间" align="left"
>
<el-table-column prop="lastModifyTime" label="修改时间" align="left">
</el-table-column>
<el-table-column label="操作"
fixed="right" width="180" >
<el-table-column label="操作" fixed="right" width="180">
<template slot-scope="scope">
<el-button type="text"
@click="addOrUpdateHandle(scope.row)" >编辑
<el-button type="text" @click="addOrUpdateHandle(scope.row)">编辑
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text"
@click="goDetail(scope.row.id)">详情
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
<el-button type="text" v-show="scope.row.adjustStatus === '待审核'"
@click="auditHandle(scope.row)">审核
@ -250,21 +175,20 @@
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<delivery-Order-Audit v-if="auditVisible" ref="deliveryOrderAudit" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail" @close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
<DialogComponent :showDialog.sync="showDialog" @update:showDialog="showDialog = $event"
:onSubmit="handleSubmit" />
</div>
</template>
@ -286,17 +210,21 @@
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
import DialogComponent from '@/views/recyclecleanorder/DialogComponent.vue';
export default {
components: {
JNPFForm,
Detail,
deliveryOrderAudit,
DialogComponent,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
selectedRows: [],
selectedIds:[],
showDialog: false,
keyword: '',
expandsTree: true,
refreshTree: true,
@ -306,7 +234,6 @@
mergeList: [],
exportList: [],
columnList,
showAll: false,
superQueryVisible: false,
superQueryJson,
@ -385,6 +312,10 @@
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
handleSelectionChange(val) {
this.selectedRows = val;
this.selectedIds = this.selectedRows.map(row => row.id);
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
@ -681,6 +612,33 @@
this.flowVisible = false
if (isrRefresh) this.reset()
},
handleSubmit(rows) {
if (this.selectedIds.length == 0) {
this.$message.error('请选择要审核的单据！');
return;
}
if (rows.adjustComm == null || rows.adjustComm == '') {
this.$message.error('请填写您的审核意见！');
return;
}
let _query = {
adjustStatus: 1,
ids:this.selectedIds,
adjustComm:rows.adjustComm,
};
request({
url: `/api/scm/RecycleDeliveryOrder/auditBatch`,
method: 'post',
data: _query
}).then(res => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
})
this.initData()
})
},
}
}
</script>

Write Preview
Loading…
Cancel
Save