Merge remote-tracking branch 'origin/master'

anrui-riskcenter-ui/src/views/caseexecution/caseexecution.vue

@@ -87,9 +87,11 @@
             <el-table-column prop="loanContract" label="贷款合同编号" align="center" width="160" />
             <el-table-column prop="customName" label="客户名称" align="center" width="100" />
             <el-table-column prop="lenderName" label="贷款人" align="center" min-width="100" />
+            <el-table-column prop="amountInArear" label="当前欠款金额" align="center" width="130" />
             <el-table-column prop="executeRegisDate" label="预执行立案日期" align="center" width="130" />
             <el-table-column prop="executeDeadline" label="执行时限" align="center" width="130" />
-            <el-table-column prop="executeRegisMoney" label="执行立案金额" align="center" width="120" />
+            <el-table-column prop="executeRegisMoney" label="预执行立案金额" align="center" width="120" />
+            <el-table-column prop="badDebtAmount" label="预计申请坏账金额" align="center" width="180" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->

anrui-riskcenter-ui/src/views/caseexecution/caseexecutionAdd.vue

@@ -102,6 +102,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.partProceRemarks }}</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">判决信息</div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">判决日期</div>
@@ -117,14 +118,10 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="16">
+            <el-col :span="24">
               <div class="span-sty">判决备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.judgRemarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">判决生效后回款金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="judgPayMoneyInput" v-model="formobj.judgPayMoney" clearable placeholder="" /></el-form-item>
-            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -132,16 +129,12 @@
               <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in image_list" :key="index" :src="item" :preview-src-list="image_list" /></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">车辆信息</div>
-          <el-table :key="tableKey" :data="formobj.loanCaseExecuteVehList" :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>
+          <div class="title">预执行立案信息</div>
           <el-row>
+            <el-col :span="8">
+              <div class="span-sty">当前欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.amountInArear }}</span></el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">预执行立案日期</div>
               <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.executeRegisDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
@@ -154,10 +147,30 @@
                 </el-select>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="8">
-              <div class="span-sty">执行立案金额</div>
+              <div class="span-sty">预执行立案金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeRegisMoney }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中执行欠款金额</div>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="totalMoney" @keyup.native="formobj.executeAmountInArear = getNumber(formobj.executeAmountInArear, 2)" v-model="formobj.executeAmountInArear" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中执行费用金额</div>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="totalMoney" @keyup.native="formobj.executeExpenseAmount = getNumber(formobj.executeExpenseAmount, 2)" v-model="formobj.executeExpenseAmount" clearable placeholder="" /></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.badDebtAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" placeholder="" clearable /></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -167,6 +180,15 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <div class="title">车辆信息</div>
+          <el-table :key="tableKey" :data="formobj.loanCaseExecuteVehList" :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-form>
       </div>
     </div>
@@ -238,6 +260,11 @@ export default {
         taskId: '',
         useOrgName: '',
         useOrgSid: '',
+        amountInArear: '',
+        executeAmountInArear: '',
+        executeExpenseAmount: '',
+        badDebtAmount: '',
+        remarks: '',
         zxclFiles: []
       },
       rules: {}
@@ -251,6 +278,24 @@ export default {
         }
       })
     },
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     showAdd(sid) {
       this.viewTitle = '【新增】执行立案申请'
       this.$nextTick(() => {
@@ -290,8 +335,11 @@ export default {
         }
       })
     },
-    judgPayMoneyInput() {
-      this.formobj.executeRegisMoney = parseFloat(this.formobj.judgMoney !== '' ? this.formobj.judgMoney : 0) - parseFloat(this.formobj.judgPayMoney !== '' ? this.formobj.judgPayMoney : 0)
+    totalMoney() {
+      // 预执行立案金额 = 其中执行欠款金额 + 其中执行费用金融
+      this.formobj.executeRegisMoney = Math.round((parseFloat(this.formobj.executeAmountInArear !== '' ? this.formobj.executeAmountInArear : 0) + parseFloat(this.formobj.executeExpenseAmount !== '' ? this.formobj.executeExpenseAmount : 0)) * 100) / 100
+      // 预计申请坏账金额 = 当前欠款金额 - 其中执行欠款金额
+      this.formobj.badDebtAmount = Math.round((parseFloat(this.formobj.amountInArear !== '' ? this.formobj.amountInArear : 0) + parseFloat(this.formobj.executeAmountInArear !== '' ? this.formobj.executeAmountInArear : 0)) * 100) / 100
     },
     executeDeadlineChange(value) {
       const choose = this.executeDeadline_list.filter((item) => item.dictKey === value)
@@ -390,6 +438,11 @@ export default {
         useOrgName: '',
         useOrgSid: '',
         userSid: '',
+        amountInArear: '',
+        executeAmountInArear: '',
+        executeExpenseAmount: '',
+        badDebtAmount: '',
+        remarks: '',
         zxclFiles: []
       }
       this.image_list = []
@@ -413,6 +466,10 @@ export default {
   justify-content: flex-start;
   align-items: center;
 }
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 140px !important;
+  width: calc(100% - 135px);
+}
 /deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
   line-height: 15px !important;
   display: flex;

anrui-riskcenter-ui/src/views/caseexecution/caseexecutionInfo.vue

@@ -100,6 +100,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.partProceRemarks }}</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">判决信息</div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">判决日期</div>
@@ -115,14 +116,10 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="16">
+            <el-col :span="24">
               <div class="span-sty">判决备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.judgRemarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">判决生效后回款金额</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.judgPayMoney }}</span></el-form-item>
-            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -130,16 +127,12 @@
               <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.loanCaseExecuteVehList" :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>
+          <div class="title">预执行立案信息</div>
           <el-row>
+            <el-col :span="8">
+              <div class="span-sty">当前欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.amountInArear }}</span></el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">预执行立案日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeRegisDate }}</span></el-form-item>
@@ -148,10 +141,30 @@
               <div class="span-sty">执行时限</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeDeadline }}</span></el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="8">
-              <div class="span-sty">执行立案金额</div>
+              <div class="span-sty">预执行立案金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeRegisMoney }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中执行欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeAmountInArear }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中执行费用金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeExpenseAmount }}</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.badDebtAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <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">
@@ -159,6 +172,15 @@
               <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.zxclFiles" :key="index" :src="item" :preview-src-list="formobj.zxclFiles" /></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">车辆信息</div>
+          <el-table :key="tableKey" :data="formobj.loanCaseExecuteVehList" :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-form>
       </div>
     </div>
@@ -224,6 +246,11 @@ export default {
         taskId: '',
         useOrgName: '',
         useOrgSid: '',
+        amountInArear: '',
+        executeAmountInArear: '',
+        executeExpenseAmount: '',
+        badDebtAmount: '',
+        remarks: '',
         zxclFiles: []
       },
       rules: {}
@@ -309,6 +336,11 @@ export default {
         taskId: '',
         useOrgName: '',
         useOrgSid: '',
+        amountInArear: '',
+        executeAmountInArear: '',
+        executeExpenseAmount: '',
+        badDebtAmount: '',
+        remarks: '',
         zxclFiles: []
       }
       this.$emit('doback')

anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionDaiBan.vue

@@ -103,6 +103,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.partProceRemarks }}</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">判决信息</div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">判决日期</div>
@@ -118,14 +119,10 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="16">
+            <el-col :span="24">
               <div class="span-sty">判决备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.judgRemarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">判决生效后回款金额</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.judgPayMoney }}</span></el-form-item>
-            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -133,16 +130,12 @@
               <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.loanCaseExecuteVehList" :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>
+          <div class="title">预执行立案信息</div>
           <el-row>
+            <el-col :span="8">
+              <div class="span-sty">当前欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.amountInArear }}</span></el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">预执行立案日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeRegisDate }}</span></el-form-item>
@@ -151,10 +144,30 @@
               <div class="span-sty">执行时限</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeDeadline }}</span></el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="8">
-              <div class="span-sty">执行立案金额</div>
+              <div class="span-sty">预执行立案金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeRegisMoney }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中执行欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeAmountInArear }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中执行费用金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeExpenseAmount }}</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.badDebtAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <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">
@@ -162,6 +175,15 @@
               <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.zxclFiles" :key="index" :src="item" :preview-src-list="formobj.zxclFiles" /></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">车辆信息</div>
+          <el-table :key="tableKey" :data="formobj.loanCaseExecuteVehList" :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-form>
       </div>
     </div>
@@ -266,6 +288,11 @@ export default {
         taskId: '',
         useOrgName: '',
         useOrgSid: '',
+        amountInArear: '',
+        executeAmountInArear: '',
+        executeExpenseAmount: '',
+        badDebtAmount: '',
+        remarks: '',
         zxclFiles: []
       },
       rules: {},

anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionEdit.vue

@@ -101,6 +101,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.partProceRemarks }}</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">判决信息</div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">判决日期</div>
@@ -116,14 +117,10 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="16">
+            <el-col :span="24">
               <div class="span-sty">判决备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.judgRemarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">判决生效后回款金额</div>
-              <el-form-item><el-input class="addinputInfo addinputw" @input="judgPayMoneyInput" v-model="formobj.judgPayMoney" clearable placeholder="" /></el-form-item>
-            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -131,16 +128,12 @@
               <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in image_list" :key="index" :src="item" :preview-src-list="image_list" /></el-form-item>
             </el-col>
           </el-row>
-          <div class="title">车辆信息</div>
-          <el-table :key="tableKey" :data="formobj.loanCaseExecuteVehList" :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>
+          <div class="title">预执行立案信息</div>
           <el-row>
+            <el-col :span="8">
+              <div class="span-sty">当前欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.amountInArear }}</span></el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">预执行立案日期</div>
               <el-form-item><el-date-picker class="addinputInfo" v-model="formobj.executeRegisDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
@@ -153,10 +146,30 @@
                 </el-select>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="8">
-              <div class="span-sty">执行立案金额</div>
+              <div class="span-sty">预执行立案金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeRegisMoney }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中执行欠款金额</div>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="totalMoney" @keyup.native="formobj.executeAmountInArear = getNumber(formobj.executeAmountInArear, 2)" v-model="formobj.executeAmountInArear" clearable placeholder="" /></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中执行费用金额</div>
+              <el-form-item><el-input class="addinputInfo addinputw" @input="totalMoney" @keyup.native="formobj.executeExpenseAmount = getNumber(formobj.executeExpenseAmount, 2)" v-model="formobj.executeExpenseAmount" clearable placeholder="" /></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.badDebtAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" placeholder="" clearable /></el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -166,6 +179,15 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <div class="title">车辆信息</div>
+          <el-table :key="tableKey" :data="formobj.loanCaseExecuteVehList" :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-form>
       </div>
     </div>
@@ -237,6 +259,11 @@ export default {
         taskId: '',
         useOrgName: '',
         useOrgSid: '',
+        amountInArear: '',
+        executeAmountInArear: '',
+        executeExpenseAmount: '',
+        badDebtAmount: '',
+        remarks: '',
         zxclFiles: []
       },
       rules: {}
@@ -267,6 +294,24 @@ export default {
         }
       })
     },
+    getNumber(val, limit) {
+      val = val.replace(/[^0-9.]/g, '') // 保留数字
+      val = val.replace(/^00/, '0.') // 开头不能有两个0
+      val = val.replace(/^\./g, '0.') // 开头为小数点转换为0.
+      val = val.replace(/\.{2,}/g, '.') // 两个以上的小数点转换成一个
+      val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); // 只保留一个小数点
+      /^0\d+/.test(val) ? val = val.slice(1) : '' // 两位以上数字开头不能为0
+      const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
+      const reg = new RegExp(str)
+      if (limit === 0) {
+        // 不需要小数点
+        val = val.replace(reg, '$1')
+      } else {
+        // 通过正则保留小数点后指定的位数
+        val = val.replace(reg, '$1.$2')
+      }
+      return val
+    },
     showInfo(sid) {
       this.viewTitle = '【编辑】执行立案申请'
       this.$nextTick(() => {
@@ -287,8 +332,11 @@ export default {
         }
       })
     },
-    judgPayMoneyInput() {
-      this.formobj.executeRegisMoney = parseFloat(this.formobj.judgMoney !== '' ? this.formobj.judgMoney : 0) - parseFloat(this.formobj.judgPayMoney !== '' ? this.formobj.judgPayMoney : 0)
+    totalMoney() {
+      // 预执行立案金额 = 其中执行欠款金额 + 其中执行费用金融
+      this.formobj.executeRegisMoney = Math.round((parseFloat(this.formobj.executeAmountInArear !== '' ? this.formobj.executeAmountInArear : 0) + parseFloat(this.formobj.executeExpenseAmount !== '' ? this.formobj.executeExpenseAmount : 0)) * 100) / 100
+      // 预计申请坏账金额 = 当前欠款金额 - 其中执行欠款金额
+      this.formobj.badDebtAmount = Math.round((parseFloat(this.formobj.amountInArear !== '' ? this.formobj.amountInArear : 0) + parseFloat(this.formobj.executeAmountInArear !== '' ? this.formobj.executeAmountInArear : 0)) * 100) / 100
     },
     executeDeadlineChange(value) {
       const choose = this.executeDeadline_list.filter((item) => item.dictKey === value)
@@ -368,6 +416,10 @@ export default {
 .addinputInfo {
   margin-left: 140px !important;
 }
+.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+  margin-left: 140px !important;
+  width: calc(100% - 135px);
+}
 .tlineheightb {
   display: flex;
   flex-direction: row;

anrui-riskcenter-ui/src/views/workFlow/zhixingFlow/caseexecutionYiBan.vue

@@ -100,6 +100,7 @@
               <el-form-item><span class="addinputInfo">{{ formobj.partProceRemarks }}</span></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">判决信息</div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty">判决日期</div>
@@ -115,14 +116,10 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="16">
+            <el-col :span="24">
               <div class="span-sty">判决备注</div>
               <el-form-item><span class="addinputInfo">{{ formobj.judgRemarks }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
-              <div class="span-sty">判决生效后回款金额</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.judgPayMoney }}</span></el-form-item>
-            </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -130,16 +127,12 @@
               <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.loanCaseExecuteVehList" :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>
+          <div class="title">预执行立案信息</div>
           <el-row>
+            <el-col :span="8">
+              <div class="span-sty">当前欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.amountInArear }}</span></el-form-item>
+            </el-col>
             <el-col :span="8">
               <div class="span-sty">预执行立案日期</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeRegisDate }}</span></el-form-item>
@@ -148,10 +141,30 @@
               <div class="span-sty">执行时限</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeDeadline }}</span></el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="8">
-              <div class="span-sty">执行立案金额</div>
+              <div class="span-sty">预执行立案金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.executeRegisMoney }}</span></el-form-item>
             </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中执行欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeAmountInArear }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中执行费用金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.executeExpenseAmount }}</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.badDebtAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <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">
@@ -159,6 +172,15 @@
               <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.zxclFiles" :key="index" :src="item" :preview-src-list="formobj.zxclFiles" /></el-form-item>
             </el-col>
           </el-row>
+          <div class="title">车辆信息</div>
+          <el-table :key="tableKey" :data="formobj.loanCaseExecuteVehList" :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-form>
       </div>
     </div>
@@ -224,6 +246,11 @@ export default {
         taskId: '',
         useOrgName: '',
         useOrgSid: '',
+        amountInArear: '',
+        executeAmountInArear: '',
+        executeExpenseAmount: '',
+        badDebtAmount: '',
+        remarks: '',
         zxclFiles: []
       },
       // 环节所需参数

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java

@@ -1259,6 +1259,11 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
         appMap.put("type", "3");
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData();
+        if (sysOrganization != null) {
+            bv.setOrgSidPath(sysOrganization.getOrgSidPath());
+        }
+        bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
         //特殊处理
         //获取调入方组织信息
         SysOrganizationVo drOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData();
@@ -1297,7 +1302,6 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
                 bv.setNextNodeUserSids(substring);
             }
         }
-        bv.setModelId(wmsInventoryAllocateBill.getProcDefId());
         if (bv.getTaskId().equals(wmsInventoryAllocateBill.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {