Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 1 year ago
parent
commit
556433ea40
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java
  3. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java
  4. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  5. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java
  6. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java
  7. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java
  8. 7
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java
  9. 16
      anrui-riskcenter-ui/src/api/courseofthecase/relation/execute.js
  10. 2
      anrui-riskcenter-ui/src/views/courseofthecase/relation/examineagain/examineagain.vue
  11. 2
      anrui-riskcenter-ui/src/views/courseofthecase/relation/examineagain/examineagainInfo.vue
  12. 276
      anrui-riskcenter-ui/src/views/courseofthecase/relation/execute/execute.vue
  13. 285
      anrui-riskcenter-ui/src/views/courseofthecase/relation/execute/executeInfo.vue
  14. 338
      anrui-riskcenter-ui/src/views/courseofthecase/relation/shangsuInfo/shangsuInfo.vue
  15. 2
      anrui-riskcenter-ui/src/views/courseofthecase/relation/trialofsecondinstance/trialofsecondinstance.vue
  16. 2
      anrui-riskcenter-ui/src/views/courseofthecase/relation/trialofsecondinstance/trialofsecondinstanceInfo.vue
  17. 10
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
  18. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java
  19. 12
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  20. 13
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue
  21. 9
      anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue
  22. 9
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue
  23. 14
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue
  24. 9
      anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue
  25. 65
      doc/databases/统计报表更新.sql

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclecertificate/BaseVehicleCertificateFeign.java

@ -66,6 +66,10 @@ public interface BaseVehicleCertificateFeign {
@PostMapping("/update/{sid}") @PostMapping("/update/{sid}")
public ResultBean update(@RequestBody BaseVehicleCertificateDto dto, @PathVariable("sid") String sid); public ResultBean update(@RequestBody BaseVehicleCertificateDto dto, @PathVariable("sid") String sid);
@ApiOperation("单独维护车架号")
@PostMapping("/updateVinNo")
public ResultBean updateVinNo(@RequestParam("vinNo") String vinNo, @RequestParam("sid") String sid);
/** /**
* 根据前台传来的sid的集合进行批量删除 * 根据前台传来的sid的集合进行批量删除
* *

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java

@ -112,5 +112,8 @@ public interface BusVehicleApplyFeign {
@ResponseBody @ResponseBody
public ResultBean assignTask(@RequestBody AppBusVehicleApplyDelegateQuery query); public ResultBean assignTask(@RequestBody AppBusVehicleApplyDelegateQuery query);
@ApiOperation("根据排产编号查询")
@PostMapping("/getBillNo")
@ResponseBody
ResultBean<BusVehicleApply> getBillNo(@RequestParam("pcApplicationCode") String pcApplicationCode);
} }

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java

@ -121,4 +121,9 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign {
public ResultBean assignTask(AppBusVehicleApplyDelegateQuery query) { public ResultBean assignTask(AppBusVehicleApplyDelegateQuery query) {
return null; return null;
} }
@Override
public ResultBean<BusVehicleApply> getBillNo(String pcApplicationCode) {
return null;
}
} }

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -1108,7 +1108,7 @@
or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入' or bv.vehicleStateValue = '调入'
) )
and bv.isDelete = 0 and bv.isDelete = 0 and length(bv.vinNo)>8
order by isFictitious, bv.locationName, bv.vinNo desc order by isFictitious, bv.locationName, bv.vinNo desc
</select> </select>
@ -1128,7 +1128,7 @@
or bv.vehicleStateValue = '在途' or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入' or bv.vehicleStateValue = '调入'
) )
and bv.isDelete = 0 and bv.isDelete = 0 and length(bv.vinNo)>8
<if test="list != null and list.size() != 0"> <if test="list != null and list.size() != 0">
and bv.sid in and bv.sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")"> <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
@ -1416,6 +1416,7 @@
<if test="names != null and names != ''"> <if test="names != null and names != ''">
and bv.vinNo LIKE concat('%', #{names}, '%') and bv.vinNo LIKE concat('%', #{names}, '%')
</if> </if>
AND LENGTH(bv.vinNo)>8
</where> </where>
</select> </select>

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java

@ -107,4 +107,7 @@ public interface BaseVehicleCertificateMapper extends BaseMapper<BaseVehicleCert
void updateTransferState(@Param("sid") String sid,@Param("tranKey") String tranKey,@Param("tranValue") String tranValue); void updateTransferState(@Param("sid") String sid,@Param("tranKey") String tranKey,@Param("tranValue") String tranValue);
BaseVehicleCertificate selectByVinSid(String vinSid); BaseVehicleCertificate selectByVinSid(String vinSid);
@Update("update base_vehicle_certificate set remarks = #{remarks},vinNo = #{vinNo} where sid = #{sid}")
void updateVinNo(@Param("vinNo") String vinNo,@Param("remarks") String remarks,@Param("sid") String sid);
} }

5
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateRest.java

@ -177,6 +177,11 @@ public class BaseVehicleCertificateRest implements BaseVehicleCertificateFeign {
return rb.success().setMsg("修改成功"); return rb.success().setMsg("修改成功");
} }
@Override
public ResultBean updateVinNo(String vinNo, String sid) {
return baseVehicleCertificateService.updateVinNo(vinNo,sid);
}
/** /**
* 根据前台传来的sid的集合进行批量删除 * 根据前台传来的sid的集合进行批量删除
* *

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateService.java

@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo; import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrandExportVo;
import com.yxt.anrui.base.api.basevehiclecertificate.*; import com.yxt.anrui.base.api.basevehiclecertificate.*;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.common.enums.CertificState; import com.yxt.anrui.base.common.enums.CertificState;
@ -67,6 +68,8 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
private BusTransferRecordsFeign busTransferRecordsFeign; private BusTransferRecordsFeign busTransferRecordsFeign;
@Autowired @Autowired
private BaseVehicleAppendixService baseVehicleAppendixService; private BaseVehicleAppendixService baseVehicleAppendixService;
@Autowired
private BaseVehicleService baseVehicleService;
/** /**
* 台账信息条件分页查询 * 台账信息条件分页查询
* *
@ -342,4 +345,21 @@ public class BaseVehicleCertificateService extends MybatisBaseService<BaseVehicl
} }
return rb.success(); return rb.success();
} }
public ResultBean updateVinNo(String vinNo, String sid) {
ResultBean rb = ResultBean.fireFail();
if (vinNo.length() != 17){
return rb.setMsg("字符串长度不是17位");
}
BaseVehicleCertificate baseVehicleCertificate = fetchBySid(sid);
String remarks = baseVehicleCertificate.getRemarks();
if (StringUtils.isBlank(remarks)) {
remarks = "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
}else {
remarks = remarks + "," + "由原车架号" + baseVehicleCertificate.getVinNo() + "改成新车架号" + vinNo;
}
baseMapper.updateVinNo(vinNo,remarks,sid);
baseVehicleService.updateVinNoByVehSid(vinNo, baseVehicleCertificate.getVehicleSid());
return rb.success();
}
} }

7
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyRest.java

@ -133,6 +133,13 @@ public class BusVehicleApplyRest implements BusVehicleApplyFeign {
return busVehicleApplyService.assignTask(query); return busVehicleApplyService.assignTask(query);
} }
@Override
public ResultBean<BusVehicleApply> getBillNo(String pcApplicationCode) {
ResultBean rb = ResultBean.fireFail();
BusVehicleApply busVehicleApply = busVehicleApplyService.selectByCode(pcApplicationCode);
return rb.success().setData(busVehicleApply);
}
/* @Override /* @Override
public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) { public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) {
return busVehicleApplyService.shareBusVehicleApply(shareQuery); return busVehicleApplyService.shareBusVehicleApply(shareQuery);

16
anrui-riskcenter-ui/src/api/courseofthecase/relation/execute.js

@ -53,5 +53,21 @@ export default {
data: data, data: data,
headers: { 'Content-Type': 'application/json' } headers: { 'Content-Type': 'application/json' }
}) })
},
// 执行 -- 历史执行记录列表
getExecuteList: function(data) {
return request({
url: '/riskcenter/v1/LoanCaseProgress/getExecuteList',
method: 'get',
params: data
})
},
// 执行 -- 历史执行记录列表 -- 查看详情
getHistoryExecuteDetail: function(data) {
return request({
url: '/riskcenter/v1/LoanCaseProgress/getHistoryExecuteDetail',
method: 'get',
params: data
})
} }
} }

2
anrui-riskcenter-ui/src/views/courseofthecase/relation/examineagain/examineagain.vue

@ -207,7 +207,7 @@
<script> <script>
import req from '@/api/courseofthecase/relation/examineagain' import req from '@/api/courseofthecase/relation/examineagain'
import uploadImg from '@/components/uploadFile/uploadImg' import uploadImg from '@/components/uploadFile/uploadImg'
import caseappealInfo from '../../../caseappeal/caseappealInfo' import caseappealInfo from '../shangsuInfo/shangsuInfo'
export default { export default {
name: 'ZaiShen', name: 'ZaiShen',

2
anrui-riskcenter-ui/src/views/courseofthecase/relation/examineagain/examineagainInfo.vue

@ -188,7 +188,7 @@
<script> <script>
import req from '@/api/courseofthecase/relation/examineagain' import req from '@/api/courseofthecase/relation/examineagain'
import caseappealInfo from '../../../caseappeal/caseappealInfo' import caseappealInfo from '../shangsuInfo/shangsuInfo'
export default { export default {
name: 'ZaiShenInfo', name: 'ZaiShenInfo',

276
anrui-riskcenter-ui/src/views/courseofthecase/relation/execute/execute.vue

@ -4,8 +4,11 @@
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<div class="title titleOne"> <div class="title titleOne">
<div>准备执行材料</div> <div>准备执行材料</div>
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<el-button type="primary" size="mini" class="btntopblueline" @click="lookHistory">历史执行记录</el-button>
<el-button type="primary" size="mini" class="btntopblueline" @click="ZBZXSave">保存</el-button> <el-button type="primary" size="mini" class="btntopblueline" @click="ZBZXSave">保存</el-button>
</div> </div>
</div>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">转执行日期</div> <div class="span-sty">转执行日期</div>
@ -199,6 +202,155 @@
<el-dialog :visible.sync="dialogVisible"> <el-dialog :visible.sync="dialogVisible">
<el-image style="width: 150px; height: 150px" v-for="(item, index) in list" :key="index" :src="item" :preview-src-list="list"/> <el-image style="width: 150px; height: 150px" v-for="(item, index) in list" :key="index" :src="item" :preview-src-list="list"/>
</el-dialog> </el-dialog>
<!-- 历史执行记录 -->
<el-dialog :visible.sync="historyVisible" width="70%">
<div v-show="tableVisible">
<el-form ref="form_obj" :rules="rules" class="formaddcopy02">
<div class="title">历史执行记录</div>
<el-table :key="historyKey" :data="historyList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="prepareTime" label="转执行日期" align="center" width="150" />
<el-table-column prop="executeTime" label="执行立案日期" align="center" width="230" />
<el-table-column label="执行案件号" align="center" width="200">
<template slot-scope="scope">
<span class="bluezi" @click="lookDetail(scope.row.recordSid)">{{ scope.row.executeCaseNo }}</span>
</template>
</el-table-column>
<el-table-column prop="executeMoney" label="执行立案金额" align="center" width="200" />
<el-table-column prop="executeAmountAll" label="执行回款总金额" align="center" width="200" />
<el-table-column prop="endTime" label="终止日期" align="center" width="150" />
<el-table-column prop="endReason" label="终止原因" align="center" min-width="300" />
</el-table>
</el-form>
</div>
<div v-show="!tableVisible">
<div style="text-align: right">
<el-button type="info" size="small" @click="handleClose()">关闭</el-button>
</div>
<el-form ref="form_obj" :model="history" :rules="rules" class="formaddcopy02">
<div class="title">
<div>准备执行材料</div>
</div>
<el-row>
<el-col :span="8">
<div class="span-sty">转执行日期</div>
<el-form-item><span class="addinputInfo">{{ history.readyInfo.prepareTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">材料递交日期</div>
<el-form-item><span class="addinputInfo">{{ history.readyInfo.transferTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">负责人</div>
<el-form-item><span class="addinputInfo">{{ history.readyInfo.header }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">材料</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in history.readyInfo.file" :key="index" :src="item" :preview-src-list="history.readyInfo.file" /></el-form-item>
</el-col>
</el-row>
<div class="title">已执行立案</div>
<el-row>
<el-col :span="8">
<div class="span-sty">执行立案日期</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">执行案件号</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeCaseNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">执行时限()</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeDays }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">执行立案金额</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">执行回款总金额</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeAmountAll }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">执行未回款金额</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeNotAmount }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">执行法官
</div>
<el-table :key="tableKey" :data="history.yiZhiXingInfo.executeMeasure" :index="index" border style="width: 100%">
<el-table-column prop="measure" label="执行措施" align="center" width="150" />
<el-table-column prop="measureTime" label="执行日期" align="center" width="230" />
<el-table-column prop="measureMoney" label="执行回款金额" align="center" min-width="300" />
<el-table-column prop="measureShows" label="执行说明" align="center" min-width="300" />
<el-table-column prop="operatorTime" label="操作时间" align="center" width="200" />
<el-table-column prop="operator" label="操作人" align="center" width="150" />
<el-table-column label="附件" align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" style="padding-left: 5px" v-show="scope.row.file.length > 0" @click="handleLook(scope.row.file)">查看</el-button>
</template>
</el-table-column>
</el-table>
<div class="title">列入失信人名单</div>
<el-row>
<el-col :span="24">
<div class="span-sty">列入日期</div>
<el-form-item><span class="addinputInfo">{{ history.promiseInfo.promiseTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">材料</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in history.promiseInfo.file" :key="index" :src="item" :preview-src-list="history.promiseInfo.file" /></el-form-item>
</el-col>
</el-row>
<div class="title">查封冻结资产</div>
<el-row>
<el-col :span="16">
<div class="span-sty">查封内容</div>
<el-form-item><span class="addinputInfo">{{ history.closeInfo.closePart }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">查封日期</div>
<el-form-item><span class="addinputInfo">{{ history.closeInfo.closeTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">材料</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in history.closeInfo.file" :key="index" :src="item" :preview-src-list="history.closeInfo.file" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">财产处置</div>
<el-form-item><span class="addinputInfo">{{ history.closeInfo.closeDisposal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">终止本次执行</div>
<el-row>
<el-col :span="8">
<div class="span-sty">终止日期</div>
<el-form-item><span class="addinputInfo">{{ history.endCaseInfo.endTime }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">终止原因</div>
<el-form-item><span class="addinputInfo">{{ history.endCaseInfo.endReason }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">材料</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in history.endCaseInfo.file" :key="index" :src="item" :preview-src-list="history.endCaseInfo.file" /></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -260,6 +412,46 @@ export default {
file: [] file: []
} }
}, },
historyVisible: false,
tableVisible: true,
historyList: [],
historyKey: 1,
history: {
sid: '',
recordSid: '',
readyInfo: {
prepareTime: '',
transferTime: '',
header: '',
headerSid: '',
file: []
},
yiZhiXingInfo: {
executeTime: '',
executeCaseNo: '',
executeDays: '',
executeMoney: '',
executeAmountAll: '',
executeNotAmount: '',
executeJudge: '',
executeMeasure: []
},
closeInfo: {
closePart: '',
closeTime: '',
closeDisposal: '',
file: []
},
endCaseInfo: {
endTime: '',
endReason: '',
file: []
},
promiseInfo: {
promiseTime: '',
file: []
}
},
rules: {} rules: {}
} }
}, },
@ -279,6 +471,90 @@ export default {
} }
}) })
}, },
lookHistory() {
this.historyVisible = true
req.getExecuteList({ sid: this.formobj.sid }).then((resp) => {
if (resp.success) {
this.tableVisible = true
this.historyList = resp.data
}
})
},
lookDetail(sid) {
req.getHistoryExecuteDetail({ recordSid: sid }).then((resp) => {
if (resp.success) {
this.tableVisible = false
this.history = resp.data
if (this.history.readyInfo.file.length > 0) {
const aa = []
this.history.readyInfo.file.forEach((e) => {
aa.push(e.url)
})
this.history.readyInfo.file = aa
}
if (this.history.closeInfo.file.length > 0) {
const aa = []
this.history.closeInfo.file.forEach((e) => {
aa.push(e.url)
})
this.history.closeInfo.file = aa
}
if (this.history.promiseInfo.file.length > 0) {
const aa = []
this.history.promiseInfo.file.forEach((e) => {
aa.push(e.url)
})
this.history.promiseInfo.file = aa
}
if (this.history.endCaseInfo.file.length > 0) {
const aa = []
this.history.endCaseInfo.file.forEach((e) => {
aa.push(e.url)
})
this.history.endCaseInfo.file = aa
}
}
})
},
handleClose() {
this.tableVisible = true
this.history = {
sid: '',
recordSid: '',
readyInfo: {
prepareTime: '',
transferTime: '',
header: '',
headerSid: '',
file: []
},
yiZhiXingInfo: {
executeTime: '',
executeCaseNo: '',
executeDays: '',
executeMoney: '',
executeAmountAll: '',
executeNotAmount: '',
executeJudge: '',
executeMeasure: []
},
closeInfo: {
closePart: '',
closeTime: '',
closeDisposal: '',
file: []
},
endCaseInfo: {
endTime: '',
endReason: '',
file: []
},
promiseInfo: {
promiseTime: '',
file: []
}
}
},
ZBZXSave() { ZBZXSave() {
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {

285
anrui-riskcenter-ui/src/views/courseofthecase/relation/execute/executeInfo.vue

@ -2,7 +2,10 @@
<div class="app-container"> <div class="app-container">
<div class=""> <div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<div class="title">准备执行材料</div> <div class="title titleOne">
<div>准备执行材料</div>
<el-button type="primary" size="mini" class="btntopblueline" @click="lookHistory">历史执行记录</el-button>
</div>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">转执行日期</div> <div class="span-sty">转执行日期</div>
@ -126,6 +129,155 @@
<el-dialog :visible.sync="dialogVisible"> <el-dialog :visible.sync="dialogVisible">
<el-image style="width: 150px; height: 150px" v-for="(item, index) in list" :key="index" :src="item" :preview-src-list="list"/> <el-image style="width: 150px; height: 150px" v-for="(item, index) in list" :key="index" :src="item" :preview-src-list="list"/>
</el-dialog> </el-dialog>
<!-- 历史执行记录 -->
<el-dialog :visible.sync="historyVisible" width="70%">
<div v-show="tableVisible">
<el-form ref="form_obj" :rules="rules" class="formaddcopy02">
<div class="title">历史执行记录</div>
<el-table :key="historyKey" :data="historyList" :index="index" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
<el-table-column prop="prepareTime" label="转执行日期" align="center" width="150" />
<el-table-column prop="executeTime" label="执行立案日期" align="center" width="230" />
<el-table-column label="执行案件号" align="center" width="200">
<template slot-scope="scope">
<span class="bluezi" @click="lookDetail(scope.row.recordSid)">{{ scope.row.executeCaseNo }}</span>
</template>
</el-table-column>
<el-table-column prop="executeMoney" label="执行立案金额" align="center" width="200" />
<el-table-column prop="executeAmountAll" label="执行回款总金额" align="center" width="200" />
<el-table-column prop="endTime" label="终止日期" align="center" width="150" />
<el-table-column prop="endReason" label="终止原因" align="center" min-width="300" />
</el-table>
</el-form>
</div>
<div v-show="!tableVisible">
<div style="text-align: right">
<el-button type="info" size="small" @click="handleClose()">关闭</el-button>
</div>
<el-form ref="form_obj" :model="history" :rules="rules" class="formaddcopy02">
<div class="title">
<div>准备执行材料</div>
</div>
<el-row>
<el-col :span="8">
<div class="span-sty">转执行日期</div>
<el-form-item><span class="addinputInfo">{{ history.readyInfo.prepareTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">材料递交日期</div>
<el-form-item><span class="addinputInfo">{{ history.readyInfo.transferTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">负责人</div>
<el-form-item><span class="addinputInfo">{{ history.readyInfo.header }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">材料</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in history.readyInfo.file" :key="index" :src="item" :preview-src-list="history.readyInfo.file" /></el-form-item>
</el-col>
</el-row>
<div class="title">已执行立案</div>
<el-row>
<el-col :span="8">
<div class="span-sty">执行立案日期</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">执行案件号</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeCaseNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">执行时限()</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeDays }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">执行立案金额</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">执行回款总金额</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeAmountAll }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">执行未回款金额</div>
<el-form-item><span class="addinputInfo">{{ history.yiZhiXingInfo.executeNotAmount }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">执行法官
</div>
<el-table :key="tableKey" :data="history.yiZhiXingInfo.executeMeasure" :index="index" border style="width: 100%">
<el-table-column prop="measure" label="执行措施" align="center" width="150" />
<el-table-column prop="measureTime" label="执行日期" align="center" width="230" />
<el-table-column prop="measureMoney" label="执行回款金额" align="center" min-width="300" />
<el-table-column prop="measureShows" label="执行说明" align="center" min-width="300" />
<el-table-column prop="operatorTime" label="操作时间" align="center" width="200" />
<el-table-column prop="operator" label="操作人" align="center" width="150" />
<el-table-column label="附件" align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" style="padding-left: 5px" v-show="scope.row.file.length > 0" @click="handleLook(scope.row.file)">查看</el-button>
</template>
</el-table-column>
</el-table>
<div class="title">列入失信人名单</div>
<el-row>
<el-col :span="24">
<div class="span-sty">列入日期</div>
<el-form-item><span class="addinputInfo">{{ history.promiseInfo.promiseTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">材料</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in history.promiseInfo.file" :key="index" :src="item" :preview-src-list="history.promiseInfo.file" /></el-form-item>
</el-col>
</el-row>
<div class="title">查封冻结资产</div>
<el-row>
<el-col :span="16">
<div class="span-sty">查封内容</div>
<el-form-item><span class="addinputInfo">{{ history.closeInfo.closePart }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">查封日期</div>
<el-form-item><span class="addinputInfo">{{ history.closeInfo.closeTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">材料</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in history.closeInfo.file" :key="index" :src="item" :preview-src-list="history.closeInfo.file" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">财产处置</div>
<el-form-item><span class="addinputInfo">{{ history.closeInfo.closeDisposal }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">终止本次执行</div>
<el-row>
<el-col :span="8">
<div class="span-sty">终止日期</div>
<el-form-item><span class="addinputInfo">{{ history.endCaseInfo.endTime }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">终止原因</div>
<el-form-item><span class="addinputInfo">{{ history.endCaseInfo.endReason }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">材料</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in history.endCaseInfo.file" :key="index" :src="item" :preview-src-list="history.endCaseInfo.file" /></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</el-dialog>
</div> </div>
</template> </template>
@ -181,6 +333,46 @@ export default {
file: [] file: []
} }
}, },
historyVisible: false,
tableVisible: true,
historyList: [],
historyKey: 1,
history: {
sid: '',
recordSid: '',
readyInfo: {
prepareTime: '',
transferTime: '',
header: '',
headerSid: '',
file: []
},
yiZhiXingInfo: {
executeTime: '',
executeCaseNo: '',
executeDays: '',
executeMoney: '',
executeAmountAll: '',
executeNotAmount: '',
executeJudge: '',
executeMeasure: []
},
closeInfo: {
closePart: '',
closeTime: '',
closeDisposal: '',
file: []
},
endCaseInfo: {
endTime: '',
endReason: '',
file: []
},
promiseInfo: {
promiseTime: '',
file: []
}
},
rules: {} rules: {}
} }
}, },
@ -220,6 +412,90 @@ export default {
} }
}) })
}, },
lookHistory() {
this.historyVisible = true
req.getExecuteList({ sid: this.formobj.sid }).then((resp) => {
if (resp.success) {
this.tableVisible = true
this.historyList = resp.data
}
})
},
lookDetail(sid) {
req.getHistoryExecuteDetail({ recordSid: sid }).then((resp) => {
if (resp.success) {
this.tableVisible = false
this.history = resp.data
if (this.formobj.readyInfo.file.length > 0) {
const aa = []
this.formobj.readyInfo.file.forEach((e) => {
aa.push(e.url)
})
this.formobj.readyInfo.file = aa
}
if (this.formobj.closeInfo.file.length > 0) {
const aa = []
this.formobj.closeInfo.file.forEach((e) => {
aa.push(e.url)
})
this.formobj.closeInfo.file = aa
}
if (this.formobj.promiseInfo.file.length > 0) {
const aa = []
this.formobj.promiseInfo.file.forEach((e) => {
aa.push(e.url)
})
this.formobj.promiseInfo.file = aa
}
if (this.formobj.endCaseInfo.file.length > 0) {
const aa = []
this.formobj.endCaseInfo.file.forEach((e) => {
aa.push(e.url)
})
this.formobj.endCaseInfo.file = aa
}
}
})
},
handleClose() {
this.tableVisible = true
this.history = {
sid: '',
recordSid: '',
readyInfo: {
prepareTime: '',
transferTime: '',
header: '',
headerSid: '',
file: []
},
yiZhiXingInfo: {
executeTime: '',
executeCaseNo: '',
executeDays: '',
executeMoney: '',
executeAmountAll: '',
executeNotAmount: '',
executeJudge: '',
executeMeasure: []
},
closeInfo: {
closePart: '',
closeTime: '',
closeDisposal: '',
file: []
},
endCaseInfo: {
endTime: '',
endReason: '',
file: []
},
promiseInfo: {
promiseTime: '',
file: []
}
}
},
// -- // --
handleLook(row) { handleLook(row) {
this.dialogVisible = true this.dialogVisible = true
@ -245,4 +521,11 @@ export default {
.addinputInfo { .addinputInfo {
margin-left: 140px !important; margin-left: 140px !important;
} }
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
</style> </style>

338
anrui-riskcenter-ui/src/views/courseofthecase/relation/shangsuInfo/shangsuInfo.vue

@ -0,0 +1,338 @@
<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-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</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.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">案件创建日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.caseCreateDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">公司负责人</div>
<el-form-item><span class="addinputInfo">{{ formobj.compHead }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">法务部门负责人</div>
<el-form-item><span class="addinputInfo">{{ formobj.legalDeptHead }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">案件编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.caseNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">案件类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.caseType }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">贷款合同编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.loanContract }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">贷款人</div>
<el-form-item><span class="addinputInfo">{{ formobj.lenderName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">贷款人证件号码</div>
<el-form-item><span class="addinputInfo">{{ formobj.lenderIdNo }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">贷款人户籍/注册地址</div>
<el-form-item><span class="addinputInfo">{{ formobj.lenderAddress }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">客户</div>
<el-form-item><span class="addinputInfo">{{ formobj.customName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">资方合同编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.bankContract }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">欠款合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.arrearsTotal }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">是否全额诉讼</div>
<el-form-item><span class="addinputInfo">{{ formobj.isFullLitigation }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">起诉金额合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.sueMoneyTotal }}</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">{{ formobj.partProceRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">判决日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.judgDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">判决结果</div>
<el-form-item><span class="addinputInfo">{{ formobj.judgResult }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">判决金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.judgMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">领取判决书日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.receivejudgDate }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">判决备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.judgRemarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">判决资料</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.pjclFiles" :key="index" :src="item" :preview-src-list="formobj.pjclFiles" /></el-form-item>
</el-col>
</el-row>
<div class="title">车辆信息</div>
<el-table :key="tableKey" :data="formobj.loanCaseAppealVehList" :index="index" border style="width: 100%">
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="carNum" label="车牌号" align="center" />
<el-table-column prop="affiliatedCompany" label="挂靠公司" align="center" />
<el-table-column prop="carState" label="车辆状态" align="center" />
<el-table-column prop="remarks" label="备注" align="center" />
</el-table>
<el-row>
<el-col :span="8">
<div class="span-sty">案件阶段</div>
<el-form-item><span class="addinputInfo">{{ formobj.caseStage }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">预上/应诉日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.expectDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">上诉到期日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.appealDueDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24" class="tlineheightb">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">/应诉材料</div>
<el-form-item>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.ysclFiles" :key="index" :src="item" :preview-src-list="formobj.ysclFiles" /></el-form-item>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/caseappeal/caseappeal'
export default {
name: 'ShangSuInfo',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 0,
index: 0,
formobj: {
appealDueDate: '',
arrearsTotal: '',
bankContract: '',
bankName: '',
billNo: '',
busSid: '',
caseCreateDate: '',
caseNo: '',
caseStage: '',
caseType: '',
compHead: '',
createByName: '',
createBySid: '',
createTime: '',
customName: '',
deptName: '',
deptSid: '',
expectCourt: '',
expectDate: '',
isFullLitigation: '',
judgDate: '',
judgMoney: '',
judgRemarks: '',
judgResult: '',
legalDeptHead: '',
lenderAddress: '',
lenderIdNo: '',
lenderName: '',
loanCaseAppealVehList: [],
loanContract: '',
nodeSid: '',
nodeState: '',
orgPath: '',
partProceRemarks: '',
pjclFiles: [],
priCourtRefer: '',
procDefId: '',
procInstSid: '',
receivejudgDate: '',
remarks: '',
sid: '',
sueMoneyTotal: '',
taskId: '',
useOrgName: '',
useOrgSid: '',
ysclFiles: []
},
rules: {}
}
},
methods: {
showInfo(row) {
this.viewTitle = '案件上/应诉申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.pjclFiles.length > 0) {
const aa = []
this.formobj.pjclFiles.forEach((e) => {
aa.push(e.url)
})
this.formobj.pjclFiles = aa
}
if (this.formobj.ysclFiles.length > 0) {
const aa = []
this.formobj.ysclFiles.forEach((e) => {
aa.push(e.url)
})
this.formobj.ysclFiles = aa
}
}
})
},
handleReturn() {
this.formobj = {
appealDueDate: '',
arrearsTotal: '',
bankContract: '',
bankName: '',
billNo: '',
busSid: '',
caseCreateDate: '',
caseNo: '',
caseStage: '',
caseType: '',
compHead: '',
createByName: '',
createBySid: '',
createTime: '',
customName: '',
deptName: '',
deptSid: '',
expectCourt: '',
expectDate: '',
isFullLitigation: '',
judgDate: '',
judgMoney: '',
judgRemarks: '',
judgResult: '',
legalDeptHead: '',
lenderAddress: '',
lenderIdNo: '',
lenderName: '',
loanCaseAppealVehList: [],
loanContract: '',
nodeSid: '',
nodeState: '',
orgPath: '',
partProceRemarks: '',
pjclFiles: [],
priCourtRefer: '',
procDefId: '',
procInstSid: '',
receivejudgDate: '',
remarks: '',
sid: '',
sueMoneyTotal: '',
taskId: '',
useOrgName: '',
useOrgSid: '',
ysclFiles: []
}
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 150px !important;
}
.addinputInfo {
margin-left: 140px !important;
}
.tlineheightb {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
line-height: 15px !important;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
</style>

2
anrui-riskcenter-ui/src/views/courseofthecase/relation/trialofsecondinstance/trialofsecondinstance.vue

@ -207,7 +207,7 @@
<script> <script>
import req from '@/api/courseofthecase/relation/trialofsecondinstance' import req from '@/api/courseofthecase/relation/trialofsecondinstance'
import uploadImg from '@/components/uploadFile/uploadImg' import uploadImg from '@/components/uploadFile/uploadImg'
import caseappealInfo from '../../../caseappeal/caseappealInfo' import caseappealInfo from '../shangsuInfo/shangsuInfo'
export default { export default {
name: 'ErShen', name: 'ErShen',

2
anrui-riskcenter-ui/src/views/courseofthecase/relation/trialofsecondinstance/trialofsecondinstanceInfo.vue

@ -188,7 +188,7 @@
<script> <script>
import req from '@/api/courseofthecase/relation/trialofsecondinstance' import req from '@/api/courseofthecase/relation/trialofsecondinstance'
import caseappealInfo from '../../../caseappeal/caseappealInfo' import caseappealInfo from '../shangsuInfo/shangsuInfo'
export default { export default {
name: 'ErShenInfo', name: 'ErShenInfo',

10
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java

@ -553,7 +553,9 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
} }
//合并pdf文件 //合并pdf文件
if (filesList.size() > 0) { if (filesList.size() > 0) {
String typeName = appOrderDetailsVo.getPayType() + printConfirmDto.getContractNo() + ".pdf"; String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = appOrderDetailsVo.getPayType() + printConfirmDto.getContractNo() + "_" + dateStr + seconds + ".pdf";
try { try {
File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName); File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
} catch (Exception e) { } catch (Exception e) {
@ -1246,11 +1248,11 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
} else { } else {
map.put("pj", "□"); map.put("pj", "□");
} }
//融资金额
map.put("downPayMoney", solutionsDetailsVo.getLoanAmountTotal());
List<String> urls = new ArrayList<>(); List<String> urls = new ArrayList<>();
if (conSetUpKey.equals("001")) { if (conSetUpKey.equals("001")) {
for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) { for (SalesOrderVehicle salesOrderVehicle : salesOrderVehicles) {
//融资金额
map.put("downPayMoney", solutionsDetailsVo.getLoanAmountTotal());
//保证金款项 //保证金款项
map.put("bondAmounts", solutionsDetailsVo.getBondAmounts()); map.put("bondAmounts", solutionsDetailsVo.getBondAmounts());
//车辆落户保证金 //车辆落户保证金
@ -1298,6 +1300,8 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
urls.add(pdfName); urls.add(pdfName);
} }
} else if (conSetUpKey.equals("002")) { } else if (conSetUpKey.equals("002")) {
//融资金额
map.put("downPayMoney", new BigDecimal(solutionsDetailsVo.getLoanAmountTotal()).multiply(new BigDecimal(salesOrderVehicles.size())));
//保证金款项 //保证金款项
map.put("bondAmounts", new BigDecimal(solutionsDetailsVo.getBondAmounts()).multiply(new BigDecimal(salesOrderVehicles.size()))); map.put("bondAmounts", new BigDecimal(solutionsDetailsVo.getBondAmounts()).multiply(new BigDecimal(salesOrderVehicles.size())));
//车辆落户保证金 //车辆落户保证金

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java

@ -109,6 +109,9 @@ public class ScmApplyInboundVo implements Vo {
@ApiModelProperty("内部编码") @ApiModelProperty("内部编码")
private String insideCode; private String insideCode;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("厂家发车日期") @ApiModelProperty("厂家发车日期")
private String departureDate; private String departureDate;

12
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerAllVo;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerFeign;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankFeign;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo; import com.yxt.anrui.base.api.basemanufacturerbank.BaseManufacturerBankVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign; import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle; import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto; import com.yxt.anrui.base.api.basevehicle.BaseVehicleDto;
@ -20,6 +21,7 @@ import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign; import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign;
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign; import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailFeign;
import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo; import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
@ -30,6 +32,7 @@ import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.OperVehicleState; import com.yxt.anrui.base.common.enums.OperVehicleState;
import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo; import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial; import com.yxt.anrui.fin.api.kingdee.bdmaterial.BdMaterial;
import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock; import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@ -132,8 +135,6 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
@Autowired @Autowired
private BasePurchaseSystemFeign basePurchaseSystemFeign; private BasePurchaseSystemFeign basePurchaseSystemFeign;
@Autowired @Autowired
private ScmApplyInboundQueryService scmApplyInboundQueryService;
@Autowired
private BaseVehmodelConfigFeign baseVehmodelConfigFeign; private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) { public PagerVo<ScmApplyInbound> listPage(PagerQuery<ScmApplyInboundQuery> pq) {
@ -262,12 +263,10 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
vinNo = vinNo.trim(); vinNo = vinNo.trim();
vinNo = vinNo.replace(" ", ""); vinNo = vinNo.replace(" ", "");
if (vinNo.length() != 17) { if (vinNo.length() != 17) {
if (vinNo.length() != 8) {
return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确"); return new ResultBean().fail().setMsg(scmApplyInboundVehicleDto.getVinNo() + "车架号输入不正确");
} }
} }
} }
}
List<String> vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList()); List<String> vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList());
// 采购订单下线日期一旦维护,二次确认,则不能修改 TODO // 采购订单下线日期一旦维护,二次确认,则不能修改 TODO
// 验证填写的车架号是否重复 // 验证填写的车架号是否重复
@ -363,6 +362,9 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
} }
vo.setVehicleList(list); vo.setVehicleList(list);
vo.setScmFiles(scmFileVos); vo.setScmFiles(scmFileVos);
BusVehicleApply busVehicleApply = busVehicleApplyFeign.getBillNo(scmApplyInbound.getPcApplicationCode()).getData();
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemFeign.fetchDetailsByDeptSid(busVehicleApply.getOrgDeptSid()).getData();
vo.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName());
return vo; return vo;
} }
@ -1027,7 +1029,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护,不可确认"); return new ResultBean().fail().setMsg("车型与配置贷款或全款销售指导价未维护,不可确认");
} }
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList(); List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
if (StringUtils.isBlank(dto.getOrgPriceDate())){ if (StringUtils.isBlank(dto.getOrgPriceDate())) {
return new ResultBean().fail().setMsg("公司入库日期不能为空"); return new ResultBean().fail().setMsg("公司入库日期不能为空");
} }
/*int vinCount = 0; /*int vinCount = 0;

13
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangAdd.vue

@ -32,11 +32,15 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>采购订单编号</span></div> <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
<el-form-item><el-input v-model="formobj.purchaseOrderNo" placeholder="" clearable class="addinputw addinputwOne" style="width: 75% !important;"/></el-form-item> <el-form-item><el-input v-model="formobj.purchaseOrderNo" placeholder="" clearable class="addinputw addinputwOne" style="width: 75% !important;"/></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>采购系统</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseSystemName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>内部编码</span></div> <div class="span-sty spanOneWidth"><span>内部编码</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item>
</el-col> </el-col>
@ -290,6 +294,7 @@ export default {
policyTwoo: '', // 2 policyTwoo: '', // 2
priceDate: '', priceDate: '',
purchaseOrderNo: '', purchaseOrderNo: '',
purchaseSystemName: '',
remarks: '', remarks: '',
secondaryFreight: '', secondaryFreight: '',
userSid: '', userSid: '',
@ -726,8 +731,8 @@ export default {
} }
}, },
changeVinNo(val) { changeVinNo(val) {
if (val.length < 17 && val.length !== 8) { if (val.length < 17) {
const message = '车架号的长度应为8位或17位' const message = '车架号的长度应为17位'
this.$message({ showClose: true, type: 'error', message: message }) this.$message({ showClose: true, type: 'error', message: message })
} }
}, },

9
anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangInfo.vue

@ -30,11 +30,15 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>采购订单编号</span></div> <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth">采购系统</div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>内部编码</span></div> <div class="span-sty spanOneWidth"><span>内部编码</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item>
</el-col> </el-col>
@ -287,6 +291,7 @@ export default {
policyTwoo: '', policyTwoo: '',
priceDate: '', priceDate: '',
purchaseOrderNo: '', purchaseOrderNo: '',
purchaseSystemName: '',
remarks: '', remarks: '',
secondaryFreight: '', secondaryFreight: '',
userSid: '', userSid: '',

9
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangDaiBanInfo.vue

@ -32,11 +32,15 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>采购订单编号</span></div> <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth">采购系统</div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>内部编码</span></div> <div class="span-sty spanOneWidth"><span>内部编码</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item>
</el-col> </el-col>
@ -322,6 +326,7 @@ export default {
policyTwoo: '', policyTwoo: '',
priceDate: '', priceDate: '',
purchaseOrderNo: '', purchaseOrderNo: '',
purchaseSystemName: '',
remarks: '', remarks: '',
secondaryFreight: '', secondaryFreight: '',
userSid: '', userSid: '',

14
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangEdit.vue

@ -31,11 +31,15 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>采购订单编号</span></div> <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
<el-form-item><el-input v-model="formobj.purchaseOrderNo" placeholder="" clearable class="addinputw addinputwOne"/></el-form-item> <el-form-item><el-input v-model="formobj.purchaseOrderNo" placeholder="" clearable class="addinputw addinputwOne"/></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>采购系统</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseSystemName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>内部编码</span></div> <div class="span-sty spanOneWidth"><span>内部编码</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item>
</el-col> </el-col>
@ -233,7 +237,6 @@
<script> <script>
import req from '@/api/ruzhang/scmapplyinbound' import req from '@/api/ruzhang/scmapplyinbound'
import upload_picture from '@/components/uploadFile/upload_picture' import upload_picture from '@/components/uploadFile/upload_picture'
import { getOrgSidByPath, fetchBySid } from '@/api/cheliang/dictcommons'
export default { export default {
name: 'ruzhangEdit', name: 'ruzhangEdit',
components: { components: {
@ -289,6 +292,7 @@ export default {
policyTwoo: '', policyTwoo: '',
priceDate: '', priceDate: '',
purchaseOrderNo: '', purchaseOrderNo: '',
purchaseSystemName: '',
remarks: '', remarks: '',
secondaryFreight: '', secondaryFreight: '',
userSid: '', userSid: '',
@ -724,8 +728,8 @@ export default {
} }
}, },
changeVinNo(val) { changeVinNo(val) {
if (val.length < 17 && val.length !== 8) { if (val.length < 17) {
const message = '车架号的长度应为8位或17位' const message = '车架号的长度应为17位'
this.$message({ showClose: true, type: 'error', message: message }) this.$message({ showClose: true, type: 'error', message: message })
} }
}, },

9
anrui-scm/anrui-scm-ui/src/views/workFlow/ruzhangguanliFlow/ruzhangguanli/ruzhangYiBanInfo.vue

@ -30,11 +30,15 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth"><span>采购订单编号</span></div> <div class="span-sty spanOneWidth"><span>采购订单编号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.purchaseOrderNo }}</span></el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="8">
<div class="span-sty spanOneWidth">采购系统</div>
<el-form-item><span class="addinputwOne addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>内部编码</span></div> <div class="span-sty spanOneWidth"><span>内部编码</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item> <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.insideCode }}</span></el-form-item>
</el-col> </el-col>
@ -287,6 +291,7 @@ export default {
policyTwoo: '', policyTwoo: '',
priceDate: '', priceDate: '',
purchaseOrderNo: '', purchaseOrderNo: '',
purchaseSystemName: '',
remarks: '', remarks: '',
secondaryFreight: '', secondaryFreight: '',
userSid: '', userSid: '',

65
doc/databases/统计报表更新.sql

@ -64,9 +64,13 @@ BEGIN
-- 更新库存-排产-未定(排产订单中未入库,且未被销售订单锁定) -- 更新库存-排产-未定(排产订单中未入库,且未被销售订单锁定)
UPDATE daily_report r UPDATE daily_report r
INNER JOIN ( INNER JOIN (
select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid,v.carBrand select sum(v.scount) as scount, v.useOrgSid, v.modelSid, v.modelConfigSid, v.carBrand
from ( from (
select ifnull(si.num, 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid,bbm.carBrand select ifnull(si.num, 0) as scount,
si.useOrgSid,
si.modelSid,
si.configSid modelConfigSid,
bbm.carBrand
from anrui_base.bus_vehicle_apply bo from anrui_base.bus_vehicle_apply bo
left join anrui_scm.scm_apply_inbound si on bo.sid = si.vehicleOrderSid left join anrui_scm.scm_apply_inbound si on bo.sid = si.vehicleOrderSid
left join anrui_base.bus_vehicle_order bbo on bbo.purchaseRequisitionSid = bo.sid left join anrui_base.bus_vehicle_order bbo on bbo.purchaseRequisitionSid = bo.sid
@ -75,12 +79,13 @@ BEGIN
and bo.isDelete <> 1 and bo.isDelete <> 1
and bo.applyTypeKey = '001' and bo.applyTypeKey = '001'
and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo) and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
group by si.applicationCode,bo.createOrgSid,si.modelSid,si.configSid group by si.applicationCode, bo.createOrgSid, si.modelSid, si.configSid
union all union all
select ifnull(sum(bo.platformNo), 0) as scount, select ifnull(sum(bo.platformNo), 0) as scount,
bo.useOrgSid, bo.useOrgSid,
bd.vehicleSid, bd.vehicleSid,
bd.configSid modelConfigSid,bbm.carBrand bd.configSid modelConfigSid,
bbm.carBrand
from anrui_base.bus_vehicle_order bo from anrui_base.bus_vehicle_order bo
left join anrui_base.bus_vehicle_apply_detail bd left join anrui_base.bus_vehicle_apply_detail bd
on bd.sid = bo.purchaseApplyMediumModelSid on bd.sid = bo.purchaseApplyMediumModelSid
@ -89,16 +94,20 @@ BEGIN
and LENGTH(offlineDate) = 0 and LENGTH(offlineDate) = 0
and bo.orderStatus != '已作废' and bo.orderStatus != '已作废'
and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo) and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
group by bo.createOrgSid,bd.vehicleSid,bd.configSid group by bo.createOrgSid, bd.vehicleSid, bd.configSid
union all union all
select ifnull(si.num, 0) as scount, si.useOrgSid, si.modelSid, si.configSid modelConfigSid,bbm.carBrand select ifnull(si.num, 0) as scount,
si.useOrgSid,
si.modelSid,
si.configSid modelConfigSid,
bbm.carBrand
from anrui_base.bus_vehicle_apply bo from anrui_base.bus_vehicle_apply bo
left join anrui_scm.scm_apply_inbound si on bo.sid = si.vehicleOrderSid left join anrui_scm.scm_apply_inbound si on bo.sid = si.vehicleOrderSid
left join anrui_base.base_vehicle_model bbm on bbm.sid = si.modelSid left join anrui_base.base_vehicle_model bbm on bbm.sid = si.modelSid
where (si.nodeState != '已办结' and si.nodeState != '终止') where (si.nodeState != '已办结' and si.nodeState != '终止')
and bo.isDelete <> 1 and bo.isDelete <> 1
and bo.applyTypeKey = '004' and bo.applyTypeKey = '004'
group by si.applicationCode,bo.createOrgSid,si.modelSid,si.configSid group by si.applicationCode, bo.createOrgSid, si.modelSid, si.configSid
) as v ) as v
GROUP BY v.`useOrgSid`, GROUP BY v.`useOrgSid`,
v.`modelSid`, v.`modelSid`,
@ -132,7 +141,7 @@ BEGIN
) ab ON ab.linkSid = bo.sid ) ab ON ab.linkSid = bo.sid
WHERE (si.nodeState != '已办结' AND si.nodeState != '终止') WHERE (si.nodeState != '已办结' AND si.nodeState != '终止')
AND bo.isDelete <> 1 AND bo.isDelete <> 1
group by si.applicationCode,bo.createOrgSid,si.modelSid,si.configSid group by si.applicationCode, bo.createOrgSid, si.modelSid, si.configSid
) as v ) as v
GROUP BY v.`useOrgSid`, GROUP BY v.`useOrgSid`,
v.`modelSid`, v.`modelSid`,
@ -258,8 +267,8 @@ BEGIN
SET saleOrder_subtotal_month=saleOrder_loan_month + saleOrder_full_month SET saleOrder_subtotal_month=saleOrder_loan_month + saleOrder_full_month
WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-- 销售订单-待交车累计(销售订单已办结且库存状态为库存和在途的) -- 销售订单-待交车累计(销售订单已办结且库存状态为库存和在途的)
UPDATE daily_report r /* UPDATE daily_report r
INNER JOIN (select count(bv.id) as scount, bv.useOrgSid, bv.modelSid, bv.modelConfigSid, bo.contractNo INNER JOIN (select count(bv.id) as scount, bv.useOrgSid, bv.modelSid, bv.modelConfigSid, bo.contractNo
from anrui_base.base_vehicle bv from anrui_base.base_vehicle bv
left join anrui_buscenter.bus_sales_order_vehicle bov on bov.linkSid = bv.sid left join anrui_buscenter.bus_sales_order_vehicle bov on bov.linkSid = bv.sid
@ -271,6 +280,42 @@ BEGIN
AND r.vehModelSid = s.modelSid AND r.vehModelSid = s.modelSid
AND r.vehMConfigSid = s.modelConfigSid AND r.vehMConfigSid = s.modelConfigSid
SET r.`saleOrder_waitVeh_total` = s.scount SET r.`saleOrder_waitVeh_total` = s.scount
WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();*/
UPDATE daily_report r
INNER JOIN (select (b.scount - b.ssscount) as scount, b.useOrgSid, b.modelConfigSid, b.modelSid
from (SELECT a.scount,
a.useOrgSid,
a.modelConfigSid,
a.modelSid,
(SELECT count(bov.id) AS scount
FROM anrui_base.base_vehicle bv
LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bov ON bov.linkSid = bv.sid
LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
WHERE bo.nodeState = '已办结'
AND bv.vehicleState = '0002'
and bo.useOrgSid = a.useOrgSid
and bm.modelSid = a.modelSid
and bm.modelConfigSid = a.modelConfigSid) as ssscount
FROM (
SELECT count(bov.id) AS scount,
bo.useOrgSid,
bm.modelSid,
bm.modelConfigSid,
bo.contractNo
FROM anrui_buscenter.bus_sales_order_vehicle bov
LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
WHERE bo.nodeState = '已办结'
GROUP BY bo.useOrgSid,
bm.modelSid,
bm.modelConfigSid
) a) b
) AS s ON r.useOrgSid = s.useOrgSid
AND r.vehModelSid = s.modelSid
AND r.vehMConfigSid = s.modelConfigSid
SET r.`saleOrder_waitVeh_total` = s.scount
WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE(); WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();
-- 本日销售全款(销售日期为本日、全款、主车(包含value为空的)) -- 本日销售全款(销售日期为本日、全款、主车(包含value为空的))

Loading…
Cancel
Save