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

feat(front):测试问题修复;

Browse Source
master
jiyufei 3 months ago
parent db96c09931
commit dbc1a13e67
6 changed files with 340 additions and 880 deletions
Show Stats Download Patch File Download Diff File

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

@ -560,6 +560,7 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
UserInfo userInfo = userProvider.get();
form.setLastModifyUserId(userInfo.getUserId());
form.setLastModifyTime(LocalDateTime.now());
RecycleDeliveryOrderEntity entity = this.getById(form.getId());
UpdateWrapper<RecycleDeliveryOrderEntity> wrapper = new UpdateWrapper<>();
wrapper.lambda()
.set(RecycleDeliveryOrderEntity::getAdjustStatus, form.getAdjustStatus())
@ -569,9 +570,17 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
.set(RecycleDeliveryOrderEntity::getLastModifyUserId, form.getLastModifyUserId())
.set(RecycleDeliveryOrderEntity::getLastModifyTime, form.getLastModifyTime())
.eq(RecycleDeliveryOrderEntity::getId, form.getId());
//如果重量不一致则改为调整通过
if (!entity.getReportWeight().equals(form.getAdjustWeight()) && "1".equals(form.getAdjustStatus())) {
wrapper.lambda().set(RecycleDeliveryOrderEntity::getAdjustStatus, "2");
}
//如果是拒绝的话 将审核重量以及单价全部改为0
if ("4".equals(form.getAdjustStatus())) {
wrapper.lambda().set(RecycleDeliveryOrderEntity::getAdjustWeight, 0)
.set(RecycleDeliveryOrderEntity::getAdjustPrice, 0);
}
boolean update = this.update(wrapper);
if (update) {
RecycleDeliveryOrderEntity entity = this.getById(form.getId());
BigDecimal price = entity.getAdjustPrice();
String orderNo = entity.getOrderNo();
String companyId = entity.getCompanyId();

129
jnpf-java-boot/jnpf-web/src/views/recyclecleanorder/cleanAudit.vue
Unescape View File

@ -4,29 +4,12 @@
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" />审核
<div class="options">
<!-- <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<template v-if="dataForm.id">
<el-dropdown-item @click.native="prev" :disabled='prevDis'>
{{ '上一条' }}
</el-dropdown-item>
<el-dropdown-item @click.native="next" :disabled='nextDis'>
{{ '下一条' }}
</el-dropdown-item>
</template>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading" :disabled='btnLoading'>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'>
通过</el-button>
<el-button type="success" @click="dataFormEdit()" :loading="btnLoading"
<!-- <el-button type="success" @click="dataFormEdit()" :loading="btnLoading"
:disabled='continueBtnLoading'>
纠正</el-button>
纠正</el-button> -->
<el-button @click="goBack"> 取 消</el-button>
</div>
</div>
@ -35,54 +18,7 @@
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<!-- <el-col :span="8">
<jnpf-form-tip-item label="设备编码" prop="deviceCode">
<JnpfPopupSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)"
:rowIndex="null" :formData="dataForm" :templateJson="interfaceRes.deviceCode"
placeholder="请选择" propsValue="device_code" popupWidth="800px" popupTitle="选择数据"
popupType="dialog" relationField='device_name' field='deviceCode'
interfaceId="564713894723988869" :pageSize="20"
:columnOptions="deviceCodecolumnOptions" clearable :style='{ "width": "100%" }'>
</JnpfPopupSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="桶编码" prop="bucketCode">
<JnpfInput v-model="dataForm.bucketCode" @change="changeData('bucketCode', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="门号" prop="doorNum">
<JnpfInput v-model="dataForm.doorNum" @change="changeData('doorNum', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="回收品大类" prop="productCode">
<JnpfRadio v-model="dataForm.productCode" @change="changeData('productCode', -1)"
optionType="default" direction="horizontal" size="small"
:options="productCodeOptions" :props="productCodeProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="回收品子类" prop="productSubCode">
<JnpfRadio v-model="dataForm.productSubCode" @change="changeData('productSubCode', -1)"
optionType="default" direction="horizontal" size="small"
:options="productSubCodeOptions" :props="productSubCodeProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="机柜清运单号" prop="deviceOrderNo">
<JnpfInput v-model="dataForm.deviceOrderNo" @change="changeData('deviceOrderNo', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col> -->
<el-col :span="8">
<jnpf-form-tip-item label="单价" prop="price">
<JnpfInputNumber v-model="dataForm.price" @change="changeData('price', -1)"
@ -107,7 +43,7 @@
<el-col :span="8">
<jnpf-form-tip-item label="审核后重量" prop="adjustWeight">
<JnpfInputNumber v-model="dataForm.adjustWeight"
@change="changeData('adjustWeight', -1)" placeholder="数字文本" :precision="2" :step="1"
@change="changeData('adjustWeight', -1)" placeholder="数字文本" :precision="2" :step="1" :min="0"
@input="updateAdjustPrice">
</JnpfInputNumber>
</jnpf-form-tip-item>
@ -119,44 +55,6 @@
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="8">
<jnpf-form-tip-item label="清运员" prop="cleanUserId">
<JnpfUserSelect v-model="dataForm.cleanUserId" @change="changeData('cleanUserId', -1)"
placeholder="请选择" selectType="all" :ableIds="ableAll.cleanUserIdableIds" clearable
:style='{ "width": "100%" }'>
</JnpfUserSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="清运员手机号" prop="phone">
<JnpfInput v-model="dataForm.phone" @change="changeData('phone', -1)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="入库状态" prop="entryStatus">
<JnpfRadio v-model="dataForm.entryStatus" @change="changeData('entryStatus', -1)"
optionType="default" direction="horizontal" size="small"
:options="entryStatusOptions" :props="entryStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="垃圾袋号" prop="bagNo">
<JnpfInput v-model="dataForm.bagNo" @change="changeData('bagNo', -1)" placeholder="请输入"
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col> -->
<!-- <el-col :span="8">
<jnpf-form-tip-item label="审核状态" prop="adjustStatus">
<JnpfRadio v-model="dataForm.adjustStatus" @change="changeData('adjustStatus', -1)"
optionType="default" direction="horizontal" size="small"
:options="adjustStatusOptions" :props="adjustStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col> -->
<el-col :span="8">
<jnpf-form-tip-item label="审核说明" prop="adjustComm">
<JnpfInput v-model="dataForm.adjustComm" @change="changeData('adjustComm', -1)"
@ -164,21 +62,6 @@
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="8">
<jnpf-form-tip-item label="租户id" prop="tenantId">
<JnpfOrganizeSelect v-model="dataForm.tenantId" @change="changeData('tenantId', -1)"
placeholder="请选择" selectType="all" :ableIds="ableAll.tenantIdableIds" clearable
:style='{ "width": "100%" }'>
</JnpfOrganizeSelect>
</jnpf-form-tip-item>
</el-col> -->
<!-- <el-col :span="24">
<jnpf-form-tip-item label="抓拍图片" prop="photo">
<JnpfUploadImg v-model="dataForm.photo" @change="changeData('photo', -1)" :fileSize="10"
sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col> -->
<!-- 表单结束 -->
</template>
</el-form>
@ -504,6 +387,10 @@ export default {
_data.adjustStatus = "1";
_data.entryStatus = "1";
_data.lastModifyTime = null;
if ((_data.adjustWeight != _data.weight) && (_data.adjustComm == undefined || _data.adjustComm == null || _data.adjustComm == '')) {
this.$message.error('审核后重量与清运重量不一致，请填写审核说明');
return;
}
if (_data.adjustWeight == 0) {
this.$message.error('审核后重量不能为 0');
return;

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

@ -171,8 +171,9 @@ export default {
},
data() {
return {
selectedWeights: [],
selectedRows: [],
selectedIds:[],
selectedIds: [],
showDialog: false,
keyword: '',
expandsTree: true,
@ -239,13 +240,14 @@ export default {
this.query.deviceCode = this.$route.query.deviceCode
console.log(this.query)
this.getColumnList(),
this.initSearchDataAndListData()
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
handleSelectionChange(val) {
this.selectedRows = val;
this.selectedIds = this.selectedRows.map(row => row.id);
this.selectedWeights = this.selectedRows.map(row => row.weight);
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return
@ -527,6 +529,14 @@ export default {
if (isrRefresh) this.reset()
},
handleSubmit(rows) {
if (this.selectedWeights.some(str => {
const num = parseFloat(str);
return !isNaN(num) && (num === 0 || num < 0);
})) {
console.log(1111111);
this.$message.error('清运重量存在异议！请检查所选数据');
return;
}
if (this.selectedIds.length == 0) {
this.$message.error('请选择要审核的单据！');
return;
@ -537,9 +547,9 @@ export default {
}
let _query = {
adjustStatus: 1,
ids:this.selectedIds,
adjustComm:rows.adjustComm,
entryStatus:1
ids: this.selectedIds,
adjustComm: rows.adjustComm,
entryStatus: 1
};
request({
url: `/api/scm/RecycleCleanOrder/auditBatch`,

462
jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/deliveryOrder.vue
Unescape View File

@ -4,30 +4,12 @@
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" />审核
<div class="options">
<!-- <el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
更 多<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<template v-if="dataForm.id">
<el-dropdown-item @click.native="prev" :disabled='prevDis'>
{{ '上一条' }}
</el-dropdown-item>
<el-dropdown-item @click.native="next" :disabled='nextDis'>
{{ '下一条' }}
</el-dropdown-item>
</template>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
:loading="continueBtnLoading" :disabled='btnLoading'>
{{ !dataForm.id ? '确定并新增' : '确定并继续' }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown> -->
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'>
通过</el-button>
<el-button type="success" @click="dataFormEdit()" :loading="btnLoading"
:disabled='continueBtnLoading'>
纠正</el-button>
拒绝</el-button>
<el-button @click="goBack"> 取 消</el-button>
</div>
</div>
@ -36,231 +18,110 @@
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<!-- <el-col :span="24"> -->
<!-- <el-collapse :accordion="false" v-model="activeripxar" class="mb-20">
<el-collapse-item title="投递情况" name="1">
<el-col :span="8">
<jnpf-form-tip-item label="投递单号" prop="orderNo">
<JnpfInput v-model="dataForm.orderNo" @change="changeData('orderNo', -1)"
placeholder="系统自动生成" readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="投递机柜" prop="deviceCode">
<JnpfSelect v-model="dataForm.deviceCode"
@change="changeData('deviceCode', -1)" placeholder="请选择" clearable
:style='{ "width": "100%" }' :options="deviceCodeOptions"
:props="deviceCodeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="投递人手机" prop="phone">
<JnpfInput v-model="dataForm.phone" @change="changeData('phone', -1)"
placeholder="投递员手机" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="桶编号" prop="doorNum">
<JnpfSelect v-model="dataForm.doorNum" @change="changeData('doorNum', -1)"
placeholder="请选择" clearable :style='{ "width": "100%" }'
:options="doorNumOptions" :props="doorNumProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收品大类" prop="productCode">
<JnpfSelect v-model="dataForm.productCode"
@change="changeData('productCode', -1)" placeholder="请选择" clearable
:style='{ "width": "100%" }' :options="productCodeOptions"
:props="productCodeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收品子类" prop="productSubCode">
<JnpfCascader v-model="dataForm.productSubCode"
@change="changeData('productSubCode', -1)" placeholder="请选择"
show-all-levels clearable :style='{ "width": "100%" }' separator="/"
:options="productSubCodeOptions" :props="productSubCodeProps">
</JnpfCascader>
</jnpf-form-tip-item>
</el-col> -->
<el-col :span="8">
<jnpf-form-tip-item label="上报重量" prop="reportWeight">
<JnpfInput v-model="dataForm.reportWeight"
@change="changeData('reportWeight', -1)" placeholder="请输入"
addonAfter="KG" :style='{ "width": "100%" }' :disabled="true">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="单价" prop="price">
<JnpfInput v-model="dataForm.price" @change="changeData('price', -1)"
placeholder="请输入" addonAfter="元" clearable :style='{ "width": "100%" }' :disabled="true">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="总价" prop="totalPrice">
<JnpfInput v-model="dataForm.totalPrice"
@change="changeData('totalPrice', -1)" placeholder="审核后本单总价"
addonAfter="元" clearable :style='{ "width": "100%" }' :disabled="true">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="8">
<jnpf-form-tip-item label="桶内原重" prop="originalWeight">
<JnpfInput v-model="dataForm.originalWeight"
@change="changeData('originalWeight', -1)" placeholder="投递前桶内重量"
addonAfter="KG" :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col> -->
<el-col :span="8">
<jnpf-form-tip-item label="审核重量" prop="adjustWeight">
<JnpfInputNumber v-model="dataForm.adjustWeight"
@change="changeData('adjustWeight', -1)"placeholder="数字文本" :precision="2" :step="1" @input="updateAdjustPrice"
>
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="审核总价" prop="adjustPrice">
<JnpfInput v-model="dataForm.adjustPrice"
@change="changeData('adjustPrice', -1)" placeholder="审核后本单总价"
addonAfter="元" clearable :style='{ "width": "100%" }' :disabled="true">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="8">
<jnpf-form-tip-item label="审核状态 " prop="adjustStatus">
<JnpfRadio v-model="dataForm.adjustStatus"
@change="changeData('adjustStatus', -1)" optionType="button"
direction="horizontal" size="small" :options="adjustStatusOptions"
:props="adjustStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col> -->
<!-- <el-col :span="8">
<jnpf-form-tip-item label="审核设置" prop="adjustSet">
<JnpfRadio v-model="dataForm.adjustSet" @change="changeData('adjustSet', -1)"
disabled optionType="button" direction="horizontal" size="small"
:options="adjustSetOptions" :props="adjustSetProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col> -->
<el-col :span="24">
<jnpf-form-tip-item label="审核说明" prop="adjustComm">
<JnpfTextarea v-model="dataForm.adjustComm"
@change="changeData('adjustComm', -1)" placeholder="请输入"
:style='{ "width": "100%" }' true type="textarea"
:autosize='{ "minRows": 1, "maxRows": 4 }'>
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
<!-- <el-col :span="24">
<jnpf-form-tip-item label="投递照片" prop="photo">
<JnpfUploadImg v-model="dataForm.photo" @change="changeData('photo', -1)"
disabled :fileSize="2" sizeUnit="MB" :limit="4" pathType="defaultPath"
:isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="桶编号" prop="bucketCode">
<JnpfCascader v-model="dataForm.bucketCode"
@change="changeData('bucketCode', -1)" placeholder="请选择" show-all-levels
clearable :style='{ "width": "100%" }' separator="/"
:options="bucketCodeOptions" :props="bucketCodeProps">
</JnpfCascader>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="垃圾袋编号" prop="bagNo">
<JnpfInput v-model="dataForm.bagNo" @change="changeData('bagNo', -1)"
placeholder="请输入" clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="机柜单号" prop="deviceOrderNo">
<JnpfInput v-model="dataForm.deviceOrderNo"
@change="changeData('deviceOrderNo', -1)" placeholder="请输入" clearable
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="登录方式" prop="loginType">
<JnpfRadio v-model="dataForm.loginType" @change="changeData('loginType', -1)"
optionType="button" direction="horizontal" size="small"
:options="loginTypeOptions" :props="loginTypeProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col> -->
<!-- </el-collapse-item> -->
<el-collapse-item title="清运情况" name="2">
<el-col :span="8">
<jnpf-form-tip-item label="清运单号" prop="cleanNo">
<JnpfInput v-model="dataForm.cleanNo" @change="changeData('cleanNo', -1)"
placeholder="请输入" readonly clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="清运员手机号" prop="cleanerPhone">
<JnpfInput v-model="dataForm.cleanerPhone"
@change="changeData('cleanerPhone', -1)" placeholder="请输入" readonly
clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="清运状态" prop="cleanStatus">
<JnpfRadio v-model="dataForm.cleanStatus"
@change="changeData('cleanStatus', -1)" optionType="button"
direction="horizontal" size="small" :options="cleanStatusOptions"
:props="cleanStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="公司id" prop="companyId">
<JnpfOpenData v-model="dataForm.companyId"
@change="changeData('companyId', -1)" placeholder="系统自动生成" readonly
:style='{ "width": "100%" }' type="currOrganize" showLevel="all">
</JnpfOpenData>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<JnpfInput v-model="dataForm.lastModifyTime"
@change="changeData('lastModifyTime', -1)" placeholder="系统自动生成" readonly
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="修改用户" prop="lastModifyUserId">
<JnpfInput v-model="dataForm.lastModifyUserId"
@change="changeData('lastModifyUserId', -1)" placeholder="系统自动生成"
readonly :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="组织JSONID" prop="organizeJsonId">
<JnpfOpenData v-model="dataForm.organizeJsonId"
@change="changeData('organizeJsonId', -1)" placeholder="系统自动生成" readonly
:style='{ "width": "100%" }' type="currOrganize" showLevel="all">
</JnpfOpenData>
</jnpf-form-tip-item>
</el-col>
</el-collapse-item>
<!-- </el-collapse>
<el-col :span="8">
<jnpf-form-tip-item label="上报重量" prop="reportWeight">
<JnpfInput v-model="dataForm.reportWeight" @change="changeData('reportWeight', -1)"
placeholder="请输入" addonAfter="KG" :style='{ "width": "100%" }' :disabled="true">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="单价" prop="price">
<JnpfInput v-model="dataForm.price" @change="changeData('price', -1)" placeholder="请输入"
addonAfter="元" clearable :style='{ "width": "100%" }' :disabled="true">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="总价" prop="totalPrice">
<JnpfInput v-model="dataForm.totalPrice" @change="changeData('totalPrice', -1)"
placeholder="审核后本单总价" addonAfter="元" clearable :style='{ "width": "100%" }'
:disabled="true">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="审核重量" prop="adjustWeight">
<JnpfInputNumber v-model="dataForm.adjustWeight"
@change="changeData('adjustWeight', -1)" placeholder="数字文本" :precision="2" :step="1" :min="0"
@input="updateAdjustPrice">
</JnpfInputNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="审核总价" prop="adjustPrice">
<JnpfInput v-model="dataForm.adjustPrice" @change="changeData('adjustPrice', -1)"
placeholder="审核后本单总价" addonAfter="元" clearable :style='{ "width": "100%" }'
:disabled="true">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="审核说明" prop="adjustComm">
<JnpfTextarea v-model="dataForm.adjustComm" @change="changeData('adjustComm', -1)"
placeholder="请输入" :style='{ "width": "100%" }' true type="textarea"
:autosize='{ "minRows": 1, "maxRows": 4 }'>
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
<el-collapse-item title="清运情况" name="2">
<el-col :span="8">
<jnpf-form-tip-item label="清运单号" prop="cleanNo">
<JnpfInput v-model="dataForm.cleanNo" @change="changeData('cleanNo', -1)"
placeholder="请输入" readonly clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="清运员手机号" prop="cleanerPhone">
<JnpfInput v-model="dataForm.cleanerPhone" @change="changeData('cleanerPhone', -1)"
placeholder="请输入" readonly clearable :style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="清运状态" prop="cleanStatus">
<JnpfRadio v-model="dataForm.cleanStatus" @change="changeData('cleanStatus', -1)"
optionType="button" direction="horizontal" size="small"
:options="cleanStatusOptions" :props="cleanStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="公司id" prop="companyId">
<JnpfOpenData v-model="dataForm.companyId" @change="changeData('companyId', -1)"
placeholder="系统自动生成" readonly :style='{ "width": "100%" }' type="currOrganize"
showLevel="all">
</JnpfOpenData>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<JnpfInput v-model="dataForm.lastModifyTime"
@change="changeData('lastModifyTime', -1)" placeholder="系统自动生成" readonly
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="修改用户" prop="lastModifyUserId">
<JnpfInput v-model="dataForm.lastModifyUserId"
@change="changeData('lastModifyUserId', -1)" placeholder="系统自动生成" readonly
:style='{ "width": "100%" }'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="组织JSONID" prop="organizeJsonId">
<JnpfOpenData v-model="dataForm.organizeJsonId"
@change="changeData('organizeJsonId', -1)" placeholder="系统自动生成" readonly
:style='{ "width": "100%" }' type="currOrganize" showLevel="all">
</JnpfOpenData>
</jnpf-form-tip-item>
</el-col>
</el-collapse-item>
<!-- </el-collapse>
</el-col> -->
<!-- 表单结束 -->
</template>
@ -348,7 +209,7 @@ export default {
activeripxar: ["1", "2"],
dataRule:
{
},
deviceCodeOptions: [],
deviceCodeProps: { "label": "device_name", "value": "device_code" },
@ -449,6 +310,7 @@ export default {
url: '/api/scm/RecycleDeliveryOrder/' + id,
method: 'get'
}).then(res => {
this.reportW = res.data.reportWeight
this.dataInfo(res.data)
});
},
@ -681,6 +543,10 @@ export default {
let _data = this.dataList()
_data.adjustStatus = "1";
_data.lastModifyTime = null;
if ((_data.adjustWeight != _data.reportWeight) && (_data.adjustComm == undefined || _data.adjustComm == null || _data.adjustComm == '')) {
this.$message.error('审核后重量与上报重量不一致，请填写审核说明');
return;
}
if (_data.adjustWeight == 0) {
this.$message.error('审核后重量不能为 0');
return;
@ -690,74 +556,70 @@ export default {
} else {
this.btnLoading = true
}
request({
url: '/api/scm/RecycleDeliveryOrder/audit',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
request({
url: '/api/scm/RecycleDeliveryOrder/audit',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
},
requestEdit() {
let _data = this.dataList()
_data.adjustStatus = "2";
_data.adjustStatus = "3";
_data.lastModifyTime = null;
if (_data.adjustWeight == 0) {
this.$message.error('审核后重量不能为 0');
return;
}
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
this.btnLoading = true
}
request({
url: '/api/scm/RecycleDeliveryOrder/audit',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
request({
url: '/api/scm/RecycleDeliveryOrder/audit',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
},
openSelectDialog(key) {
this.currTableConf = this.addTableConf[key]

372
jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/form.vue
Unescape View File

@ -2,10 +2,7 @@
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<div class="JNPF-common-page-header">
<el-page-header
@back="goBack"
:content="!dataForm.id ? '新建' : '编辑'"
/>
<el-page-header @back="goBack" :content="!dataForm.id ? '新建' : '编辑'" />
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
@ -20,131 +17,67 @@
{{ "下一条" }}
</el-dropdown-item>
</template>
<el-dropdown-item
type="primary"
@click.native="dataFormSubmit(2)"
:loading="continueBtnLoading"
:disabled="btnLoading"
>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)" :loading="continueBtnLoading"
:disabled="btnLoading">
{{
!dataForm.id ? "确定并新增" : "确定并继续"
}}</el-dropdown-item
>
}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button
type="primary"
@click="dataFormSubmit()"
:loading="btnLoading"
:disabled="continueBtnLoading"
>
保 存</el-button
>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading" :disabled="continueBtnLoading">
保 存</el-button>
<el-button @click="goBack"> 取 消</el-button>
</div>
</div>
<el-row
:gutter="15"
class=" main"
:style="{ margin: '0 auto', width: '100%' }"
>
<el-form
ref="formRef"
:model="dataForm"
:rules="dataRule"
size="small"
label-width="150px"
label-position="right"
>
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="150px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="24">
<el-collapse
:accordion="false"
v-model="activeripxar"
class="mb-20"
>
<el-collapse :accordion="false" v-model="activeripxar" class="mb-20">
<el-collapse-item title="投递情况" name="1">
<el-col :span="8">
<jnpf-form-tip-item label="投递单号" prop="orderNo">
<JnpfInput
v-model="dataForm.orderNo"
@change="changeData('orderNo', -1)"
placeholder="系统自动生成"
readonly
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.orderNo" @change="changeData('orderNo', -1)" placeholder="系统自动生成"
readonly :style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="投递机柜" prop="deviceCode">
<JnpfSelect
v-model="dataForm.deviceCode"
@change="changeData('deviceCode', -1)"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
:options="deviceCodeOptions"
:props="deviceCodeProps"
>
<JnpfSelect v-model="dataForm.deviceCode" @change="changeData('deviceCode', -1)" placeholder="请选择"
clearable :style="{ width: '100%' }" :options="deviceCodeOptions" :props="deviceCodeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="投递人手机" prop="phone">
<JnpfInput
v-model="dataForm.phone"
@change="changeData('phone', -1)"
placeholder="投递员手机"
clearable
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.phone" @change="changeData('phone', -1)" placeholder="投递员手机"
clearable :style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="门号" prop="doorNum">
<JnpfSelect
v-model="dataForm.doorNum"
@change="changeData('doorNum', -1)"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
:options="doorNumOptions"
:props="doorNumProps"
>
<JnpfSelect v-model="dataForm.doorNum" @change="changeData('doorNum', -1)" placeholder="请选择"
clearable :style="{ width: '100%' }" :options="doorNumOptions" :props="doorNumProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="回收品大类" prop="productCode">
<JnpfSelect
v-model="dataForm.productCode"
@change="changeData('productCode', -1)"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
:options="productCodeOptions"
:props="productCodeProps"
>
<JnpfSelect v-model="dataForm.productCode" @change="changeData('productCode', -1)"
placeholder="请选择" clearable :style="{ width: '100%' }" :options="productCodeOptions"
:props="productCodeProps">
</JnpfSelect>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="回收品子类"
prop="productSubCode"
>
<JnpfSelect
v-model="dataForm.productSubCode"
@change="changeData('productSubCode', -1)"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
:options="productSubCodeOptions"
:props="productSubCodeProps"
>
<jnpf-form-tip-item label="回收品子类" prop="productSubCode">
<JnpfSelect v-model="dataForm.productSubCode" @change="changeData('productSubCode', -1)"
placeholder="请选择" clearable :style="{ width: '100%' }" :options="productSubCodeOptions"
:props="productSubCodeProps">
</JnpfSelect>
<!-- <JnpfCascader
v-model="dataForm.productSubCode"
@ -162,149 +95,86 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="上报重量" prop="reportWeight">
<JnpfInput
v-model="dataForm.reportWeight"
@change="changeData('reportWeight', -1)"
placeholder="请输入"
addonAfter="KG"
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.reportWeight" :disabled="!changeId"
@change="changeData('reportWeight', -1)" placeholder="请输入" addonAfter="KG"
:style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="单价" prop="price">
<JnpfInput
v-model="dataForm.price"
@change="changeData('price', -1)"
placeholder="请输入"
addonAfter="元"
clearable
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.price" :disabled="!changeId" @change="changeData('price', -1)"
placeholder="请输入" addonAfter="元" clearable :style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="总价" prop="totalPrice">
<JnpfInput
v-model="dataForm.totalPrice"
@change="changeData('totalPrice', -1)"
placeholder="审核后本单总价"
addonAfter="元"
clearable
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.totalPrice" :disabled="!changeId"
@change="changeData('totalPrice', -1)" placeholder="审核后本单总价" addonAfter="元" clearable
:style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="桶内原重" prop="originalWeight">
<JnpfInput
v-model="dataForm.originalWeight"
@change="changeData('originalWeight', -1)"
placeholder="投递前桶内重量"
addonAfter="KG"
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.originalWeight" :disabled="!changeId"
@change="changeData('originalWeight', -1)" placeholder="投递前桶内重量" addonAfter="KG"
:style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="审核重量" prop="adjustWeight">
<JnpfInput
v-model="dataForm.adjustWeight"
@change="changeData('adjustWeight', -1)"
placeholder="请输入"
addonAfter="KG"
clearable
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.adjustWeight" :disabled="!changeId"
@change="changeData('adjustWeight', -1)" placeholder="请输入" addonAfter="KG" clearable
:style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="审核总价" prop="adjustPrice">
<JnpfInput
v-model="dataForm.adjustPrice"
@change="changeData('adjustPrice', -1)"
placeholder="审核后本单总价"
addonAfter="元"
clearable
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.adjustPrice" :disabled="!changeId"
@change="changeData('adjustPrice', -1)" placeholder="审核后本单总价" addonAfter="元" clearable
:style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="审核状态 " prop="adjustStatus">
<JnpfRadio
v-model="dataForm.adjustStatus"
@change="changeData('adjustStatus', -1)"
optionType="button"
direction="horizontal"
size="small"
:options="adjustStatusOptions"
:props="adjustStatusProps"
>
<JnpfRadio v-model="dataForm.adjustStatus" @change="changeData('adjustStatus', -1)"
optionType="button" direction="horizontal" size="small" :options="adjustStatusOptions"
:props="adjustStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="审核设置" prop="adjustSet">
<JnpfRadio
v-model="dataForm.adjustSet"
@change="changeData('adjustSet', -1)"
disabled
optionType="button"
direction="horizontal"
size="small"
:options="adjustSetOptions"
:props="adjustSetProps"
>
<JnpfRadio v-model="dataForm.adjustSet" @change="changeData('adjustSet', -1)" disabled
optionType="button" direction="horizontal" size="small" :options="adjustSetOptions"
:props="adjustSetProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="审核说明" prop="adjustComm">
<JnpfTextarea
v-model="dataForm.adjustComm"
@change="changeData('adjustComm', -1)"
placeholder="请输入"
:style="{ width: '100%' }"
true
type="textarea"
:autosize="{ minRows: 1, maxRows: 4 }"
>
<JnpfTextarea v-model="dataForm.adjustComm" @change="changeData('adjustComm', -1)"
placeholder="请输入" :style="{ width: '100%' }" true type="textarea"
:autosize="{ minRows: 1, maxRows: 4 }">
</JnpfTextarea>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="投递照片" prop="photo">
<JnpfUploadImg
v-model="dataForm.photo"
@change="changeData('photo', -1)"
disabled
:fileSize="2"
sizeUnit="MB"
:limit="4"
pathType="defaultPath"
:isAccount="0"
>
<JnpfUploadImg v-model="dataForm.photo" @change="changeData('photo', -1)" disabled :fileSize="2"
sizeUnit="MB" :limit="4" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="桶编号" prop="bucketCode">
<JnpfSelect
v-model="dataForm.bucketCode"
@change="changeData('bucketCode', -1)"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
:options="bucketCodeOptions"
:props="bucketCodeProps"
>
<JnpfSelect v-model="dataForm.bucketCode" @change="changeData('bucketCode', -1)" placeholder="请选择"
clearable :style="{ width: '100%' }" :options="bucketCodeOptions" :props="bucketCodeProps">
</JnpfSelect>
<!-- <JnpfCascader
v-model="dataForm.bucketCode"
@ -322,39 +192,22 @@
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="垃圾袋编号" prop="bagNo">
<JnpfInput
v-model="dataForm.bagNo"
@change="changeData('bagNo', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.bagNo" @change="changeData('bagNo', -1)" placeholder="请输入" clearable
:style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="机柜单号" prop="deviceOrderNo">
<JnpfInput
v-model="dataForm.deviceOrderNo"
@change="changeData('deviceOrderNo', -1)"
placeholder="请输入"
clearable
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.deviceOrderNo" @change="changeData('deviceOrderNo', -1)"
placeholder="请输入" clearable :style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="登录方式" prop="loginType">
<JnpfRadio
v-model="dataForm.loginType"
@change="changeData('loginType', -1)"
optionType="button"
direction="horizontal"
size="small"
:options="loginTypeOptions"
:props="loginTypeProps"
>
<JnpfRadio v-model="dataForm.loginType" @change="changeData('loginType', -1)" optionType="button"
direction="horizontal" size="small" :options="loginTypeOptions" :props="loginTypeProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
@ -362,44 +215,23 @@
<el-collapse-item title="清运情况" name="2">
<el-col :span="8">
<jnpf-form-tip-item label="清运单号" prop="cleanNo">
<JnpfInput
v-model="dataForm.cleanNo"
@change="changeData('cleanNo', -1)"
placeholder="请输入"
readonly
clearable
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.cleanNo" @change="changeData('cleanNo', -1)" placeholder="请输入"
readonly clearable :style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="清运员手机号"
prop="cleanerPhone"
>
<JnpfInput
v-model="dataForm.cleanerPhone"
@change="changeData('cleanerPhone', -1)"
placeholder="请输入"
readonly
clearable
:style="{ width: '100%' }"
>
<jnpf-form-tip-item label="清运员手机号" prop="cleanerPhone">
<JnpfInput v-model="dataForm.cleanerPhone" @change="changeData('cleanerPhone', -1)"
placeholder="请输入" readonly clearable :style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="清运状态" prop="cleanStatus">
<JnpfRadio
v-model="dataForm.cleanStatus"
@change="changeData('cleanStatus', -1)"
optionType="button"
direction="horizontal"
size="small"
:options="cleanStatusOptions"
:props="cleanStatusProps"
>
<JnpfRadio v-model="dataForm.cleanStatus" @change="changeData('cleanStatus', -1)"
optionType="button" direction="horizontal" size="small" :options="cleanStatusOptions"
:props="cleanStatusProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
@ -419,28 +251,15 @@
</el-col> -->
<el-col :span="8">
<jnpf-form-tip-item label="修改时间" prop="lastModifyTime">
<JnpfInput
v-model="dataForm.lastModifyTime"
@change="changeData('lastModifyTime', -1)"
placeholder="系统自动生成"
readonly
:style="{ width: '100%' }"
>
<JnpfInput v-model="dataForm.lastModifyTime" @change="changeData('lastModifyTime', -1)"
placeholder="系统自动生成" readonly :style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item
label="修改用户"
prop="lastModifyUserId"
>
<JnpfInput
v-model="dataForm.lastModifyUserId"
@change="changeData('lastModifyUserId', -1)"
placeholder="系统自动生成"
readonly
:style="{ width: '100%' }"
>
<jnpf-form-tip-item label="修改用户" prop="lastModifyUserId">
<JnpfInput v-model="dataForm.lastModifyUserId" @change="changeData('lastModifyUserId', -1)"
placeholder="系统自动生成" readonly :style="{ width: '100%' }">
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
@ -467,14 +286,8 @@
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog
v-if="selectDialogVisible"
:config="currTableConf"
:formData="dataForm"
ref="selectDialog"
@select="addForSelect"
@close="selectDialogVisible = false"
/>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm" ref="selectDialog"
@select="addForSelect" @close="selectDialogVisible = false" />
</el-row>
</div>
</transition>
@ -606,7 +419,7 @@ export default {
},
{
pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
message: "请输入正确的重量",
message: "请输入正确的金额",
trigger: "blur"
}
],
@ -779,6 +592,9 @@ export default {
};
},
computed: {
changeId() {
return !this.dataForm.id;
},
...mapGetters(["userInfo"])
},
watch: {},
@ -787,7 +603,7 @@ export default {
this.initDefaultData();
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm));
},
mounted() {},
mounted() { },
methods: {
prev() {
this.index--;
@ -886,10 +702,10 @@ export default {
if (relationFieldAll.length > 1 && index > -1) {
val =
this.dataForm[relationFieldAll[0] + "List"] &&
this.dataForm[relationFieldAll[0] + "List"].length
this.dataForm[relationFieldAll[0] + "List"].length
? this.dataForm[relationFieldAll[0] + "List"][index][
relationFieldAll[1]
]
relationFieldAll[1]
]
: "";
} else {
val = this.dataForm[relationFieldAll];
@ -919,10 +735,10 @@ export default {
if (relationFieldAll.length > 1 && index > -1) {
val =
this.dataForm[relationFieldAll[0] + "List"] &&
this.dataForm[relationFieldAll[0] + "List"].length
this.dataForm[relationFieldAll[0] + "List"].length
? this.dataForm[relationFieldAll[0] + "List"][index][
relationFieldAll[1]
]
relationFieldAll[1]
]
: "";
} else {
val = this.dataForm[relationFieldAll];
@ -958,10 +774,10 @@ export default {
if (relationFieldAll.length > 1 && index > -1) {
val =
this.dataForm[relationFieldAll[0] + "List"] &&
this.dataForm[relationFieldAll[0] + "List"].length
this.dataForm[relationFieldAll[0] + "List"].length
? this.dataForm[relationFieldAll[0] + "List"][index][
relationFieldAll[1]
]
relationFieldAll[1]
]
: "";
} else {
val = this.dataForm[relationFieldAll];
@ -1007,10 +823,10 @@ export default {
if (relationFieldAll.length > 1 && index > -1) {
val =
this.dataForm[relationFieldAll[0] + "List"] &&
this.dataForm[relationFieldAll[0] + "List"].length
this.dataForm[relationFieldAll[0] + "List"].length
? this.dataForm[relationFieldAll[0] + "List"][index][
relationFieldAll[1]
]
relationFieldAll[1]
]
: "";
} else {
val = this.dataForm[relationFieldAll];
@ -1069,7 +885,7 @@ export default {
this.$store.commit("generator/UPDATE_RELATION_DATA", {});
},
//初始化默认数据
initDefaultData() {},
initDefaultData() { },
// 表单提交
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0;

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

@ -11,13 +11,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="审核状态 ">
<JnpfSelect
v-model="query.adjustStatus"
placeholder="请选择"
clearable
:options="adjustStatusOptions"
:props="adjustStatusProps"
>
<JnpfSelect v-model="query.adjustStatus" placeholder="请选择" clearable :options="adjustStatusOptions"
:props="adjustStatusProps">
</JnpfSelect>
</el-form-item>
</el-col>
@ -30,39 +25,22 @@
<template v-if="showAll">
<el-col :span="6">
<el-form-item label="机柜编码">
<JnpfSelect
v-model="query.deviceCode"
placeholder="请选择"
clearable
:options="deviceCodeOptions"
:props="deviceCodeProps"
@change="getbucketCodeOptions"
>
<JnpfSelect v-model="query.deviceCode" placeholder="请选择" clearable :options="deviceCodeOptions"
:props="deviceCodeProps" @change="getbucketCodeOptions">
</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
>
<JnpfSelect v-model="query.doorNum" placeholder="请选择" clearable :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">
@ -73,68 +51,37 @@
</el-col>
<el-col :span="6">
<el-form-item label="所属商户">
<JnpfOrganizeSelect
v-model="query.companyId"
placeholder="请选择"
:lastLevel="false"
/>
<JnpfOrganizeSelect v-model="query.companyId" placeholder="请选择" :lastLevel="false" />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="清运员手机">
<el-input
v-model="query.cleanerPhone"
placeholder="请输入"
clearable
>
<el-input v-model="query.cleanerPhone" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="清运状态">
<JnpfSelect
v-model="query.cleanStatus"
placeholder="请选择"
clearable
:options="cleanStatusOptions"
:props="cleanStatusProps"
>
<JnpfSelect v-model="query.cleanStatus" placeholder="请选择" clearable :options="cleanStatusOptions"
:props="cleanStatusProps">
</JnpfSelect>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="清运单号">
<el-input
v-model="query.cleanNo"
placeholder="请输入"
clearable
>
<el-input v-model="query.cleanNo" placeholder="请输入" clearable>
</el-input>
</el-form-item>
</el-col>
</template>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()"
>查询</el-button
>
<el-button icon="el-icon-refresh-right" @click="reset()"
>重置</el-button
>
<el-button
type="text"
icon="el-icon-arrow-down"
@click="showAll = true"
v-if="!showAll"
>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
<el-button type="text" icon="el-icon-arrow-down" @click="showAll = true" v-if="!showAll">
展开
</el-button>
<el-button
type="text"
icon="el-icon-arrow-up"
@click="showAll = false"
v-else
>
<el-button type="text" icon="el-icon-arrow-up" @click="showAll = false" v-else>
收起
</el-button>
</el-form-item>
@ -144,64 +91,29 @@
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button
type="primary"
icon="icon-ym icon-ym-btn-add"
@click="addOrUpdateHandle()"
>新增
<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 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">
<el-link
icon="icon-ym icon-ym-filter JNPF-common-head-icon"
:underline="false"
@click="openSuperQuery()"
/>
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<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="initData()"
/>
<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="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table
v-loading="listLoading"
:data="list"
@sort-change="sortChange"
:span-method="arraySpanMethod"
@selection-change="handleSelectionChange"
>
<JNPF-table v-loading="listLoading" :data="list" @sort-change="sortChange" :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"
width="150"
>
<el-table-column prop="orderNo" label="投递单号" align="left" width="150">
</el-table-column>
<el-table-column
prop="phone"
label="投递人手机"
align="left"
width="100"
>
<el-table-column prop="phone" label="投递人手机" align="left" width="100">
</el-table-column>
<el-table-column prop="deviceCode" label="投递机柜" align="left">
</el-table-column>
@ -232,11 +144,7 @@
</el-table-column>
<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">
<template slot-scope="scope">
@ -250,77 +158,37 @@
</el-table-column>
<el-table-column prop="cleanNo" label="清运单号" align="left">
</el-table-column>
<el-table-column
prop="cleanerPhone"
label="清运员手机号"
align="left"
width="100"
>
<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>
<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 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)"
>审核
<el-button type="text" v-show="scope.row.adjustStatus === '待审核'" @click="auditHandle(scope.row)">审核
</el-button>
</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" />
<Audit v-if="auditVisible" 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"
/>
<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>
@ -357,6 +225,8 @@ export default {
return {
selectedRows: [],
selectedIds: [],
selectedPrices: [],
selectedWeights: [],
showDialog: false,
keyword: "",
expandsTree: true,
@ -465,13 +335,15 @@ export default {
this.getColumnList(), this.initSearchDataAndListData();
this.getadjustStatusOptions();
this.getdeviceCodeOptions();
this.queryData = JSON.parse(JSON.stringify(this.query));
},
methods: {
handleSelectionChange(val) {
this.selectedRows = val;
this.selectedIds = this.selectedRows.map(row => row.id);
this.selectedPrices = this.selectedRows.map(row => row.totalPrice);
this.selectedWeights = this.selectedRows.map(row => row.reportWeight);
},
toDetail(defaultValue, modelId) {
if (!defaultValue) return;
@ -669,7 +541,7 @@ export default {
this.initData();
},
//初始化查询的默认数据
async initSearchData() {},
async initSearchData() { },
initData() {
this.listLoading = true;
let _query = {
@ -713,7 +585,7 @@ export default {
});
});
})
.catch(() => {});
.catch(() => { });
},
handelUpload() {
this.uploadBoxVisible = true;
@ -792,6 +664,10 @@ export default {
if (isrRefresh) this.reset();
},
handleSubmit(rows) {
if (this.selectedWeights.some(num => num < 0) || this.selectedPrices.some(num => num < 0) ) {
this.$message.error("请检查所选择的数据，上报重量或者总价存在异议！");
return;
}
if (this.selectedIds.length == 0) {
this.$message.error("请选择要审核的单据！");
return;

Write Preview
Loading…
Cancel
Save