完善交回车辆入库

1 year ago · 8cb88d6bac
6 changed files with 158 additions and 138 deletions
--- a/anrui-riskcenter-ui/src/views/returntostorage/returntostorage.vue
+++ b/anrui-riskcenter-ui/src/views/returntostorage/returntostorage.vue
@ -50,7 +50,9 @@
                <el-input v-model="listQuery.params.loanName" placeholder="" clearable/>
              </el-form-item>
              <el-form-item label="是否带挂车">
-                <el-input v-model="listQuery.params.tralier" placeholder="" clearable/>
+                <el-select v-model="listQuery.params.tralier" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in tralier_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
              </el-form-item>
            </el-form>
            <div class="btn" style="text-align: center;">
@ -171,7 +173,7 @@
      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
    </el-dialog>
    <!-- 选择车辆 -->
-    <el-dialog title="可处置车辆列表" :visible.sync="carVisible" width="80%">
+    <el-dialog title="可入库车辆列表" :visible.sync="carVisible" width="80%">
      <div>
        <el-form ref="multipleTable" :inline="true" :model="carList" class="vinNoForm" label-width="100px">
          <el-form-item label="车架号">
@ -261,6 +263,16 @@ export default {
      tableKey: 0,
      list: [],
      sids: [], // 用于导出的时候保存已选择的SIDs
+      tralier_list: [
+        {
+          dictKey: '0',
+          dictValue: '是'
+        },
+        {
+          dictKey: '1',
+          dictValue: '否'
+        }
+      ],
      FormLoading: false,
      listLoading: false,
      // 翻页
@ -420,8 +432,6 @@ export default {
          createByName: '',
          createEndTime: '',
          createStartTime: '',
-          createDateEnd: '',
-          createDateStart: '',
          deptName: '',
          menuUrl: '',
          orgPath: '',
--- a/anrui-riskcenter-ui/src/views/returntostorage/returntostorageAdd.vue
+++ b/anrui-riskcenter-ui/src/views/returntostorage/returntostorageAdd.vue
@ -94,35 +94,37 @@
              <el-form-item><el-input class="addinputInfo" style="width: 30%" v-model="formobj.parkFees" clearable placeholder="" /></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><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.vinNo" clearable placeholder="" /></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">车牌号</div>
-              <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.vehMark" clearable placeholder="" /></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">入库价(元)</div>
-              <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.inboundMoney" clearable placeholder="" /></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">挂车类型</div>
-              <el-form-item>
-                <el-select class="addinputInfo" v-model="formobj.loanReturnInboundTrailer.trailerTypeKey" @change="trailerChange" placeholder="请选择" filterable>
-                  <el-option v-for="item in trailer_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <div class="span-sty">备注</div>
-              <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.remarks" clearable placeholder="" /></el-form-item>
-            </el-col>
-          </el-row>
+          <div v-if="formobj.tralier === '是'">
+            <div class="title">挂车信息</div>
+            <el-row>
+              <el-col :span="8">
+                <div class="span-sty">车架号</div>
+                <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.vinNo" clearable placeholder="" /></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">车牌号</div>
+                <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.vehMark" clearable placeholder="" /></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">入库价(元)</div>
+                <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.inboundMoney" clearable placeholder="" /></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <div class="span-sty">挂车类型</div>
+                <el-form-item>
+                  <el-select class="addinputInfo" v-model="formobj.loanReturnInboundTrailer.trailerTypeKey" @change="trailerChange" placeholder="请选择" filterable>
+                    <el-option v-for="item in trailer_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <div class="span-sty">备注</div>
+                <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.remarks" clearable placeholder="" /></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
          <div class="title">已还与欠款情况</div>
          <el-row>
            <el-col :span="8">
@ -266,7 +268,7 @@ export default {
        if (resp.success) {
          this.formobj = resp.data
          // 主车入库价 = 逾期金额 + 未到期应收(金额)
-          this.formobj.inboundMoney = parseFloat(this.formobj.currentBeMoney === '' ? 0 : this.formobj.currentBeMoney) + parseFloat(this.formobj.unexpiredMoney === '' ? 0 : this.unexpiredMoney.currentBeMoney)
+          this.formobj.inboundMoney = parseFloat(this.formobj.currentBeMoney === '' ? 0 : this.formobj.currentBeMoney) + parseFloat(this.formobj.unexpiredMoney === '' ? 0 : this.formobj.unexpiredMoney)
        }
      })
    },
--- a/anrui-riskcenter-ui/src/views/returntostorage/returntostorageInfo.vue
+++ b/anrui-riskcenter-ui/src/views/returntostorage/returntostorageInfo.vue
@ -85,31 +85,33 @@
              <el-form-item><span class="addinputInfo">{{ formobj.parkFees }}</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">{{ formobj.loanReturnInboundTrailer.vinNo }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">车牌号</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.vehMark }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">入库价(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.inboundMoney }}</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.loanReturnInboundTrailer.trailerType }}</span></el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <div class="span-sty">备注</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.remarks }}</span></el-form-item>
-            </el-col>
-          </el-row>
+          <div v-if="formobj.tralier === '是'">
+            <div class="title">挂车信息</div>
+            <el-row>
+              <el-col :span="8">
+                <div class="span-sty">车架号</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.vinNo }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">车牌号</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.vehMark }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">入库价(元)</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.inboundMoney }}</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.loanReturnInboundTrailer.trailerType }}</span></el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <div class="span-sty">备注</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.remarks }}</span></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
          <div class="title">已还与欠款情况</div>
          <el-row>
            <el-col :span="8">
--- a/anrui-riskcenter-ui/src/views/workFlow/jiaohuirukuFlow/returntostorageDaiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jiaohuirukuFlow/returntostorageDaiBan.vue
@ -88,31 +88,33 @@
              <el-form-item><span class="addinputInfo">{{ formobj.parkFees }}</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">{{ formobj.loanReturnInboundTrailer.vinNo }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">车牌号</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.vehMark }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">入库价(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.inboundMoney }}</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.loanReturnInboundTrailer.trailerType }}</span></el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <div class="span-sty">备注</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.remarks }}</span></el-form-item>
-            </el-col>
-          </el-row>
+          <div v-if="formobj.tralier === '是'">
+            <div class="title">挂车信息</div>
+            <el-row>
+              <el-col :span="8">
+                <div class="span-sty">车架号</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.vinNo }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">车牌号</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.vehMark }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">入库价(元)</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.inboundMoney }}</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.loanReturnInboundTrailer.trailerType }}</span></el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <div class="span-sty">备注</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.remarks }}</span></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
          <div class="title">已还与欠款情况</div>
          <el-row>
            <el-col :span="8">
--- a/anrui-riskcenter-ui/src/views/workFlow/jiaohuirukuFlow/returntostorageEdit.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jiaohuirukuFlow/returntostorageEdit.vue
@ -93,35 +93,37 @@
              <el-form-item><el-input class="addinputInfo" style="width: 30%" v-model="formobj.parkFees" clearable placeholder="" /></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><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.vinNo" clearable placeholder="" /></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">车牌号</div>
-              <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.vehMark" clearable placeholder="" /></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">入库价(元)</div>
-              <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.inboundMoney" clearable placeholder="" /></el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <div class="span-sty">挂车类型</div>
-              <el-form-item>
-                <el-select class="addinputInfo" v-model="formobj.loanReturnInboundTrailer.trailerTypeKey" @change="trailerChange" placeholder="请选择" filterable>
-                  <el-option v-for="item in trailer_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <div class="span-sty">备注</div>
-              <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.remarks" clearable placeholder="" /></el-form-item>
-            </el-col>
-          </el-row>
+          <div v-if="formobj.tralier === '是'">
+            <div class="title">挂车信息</div>
+            <el-row>
+              <el-col :span="8">
+                <div class="span-sty">车架号</div>
+                <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.vinNo" clearable placeholder="" /></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">车牌号</div>
+                <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.vehMark" clearable placeholder="" /></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">入库价(元)</div>
+                <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.inboundMoney" clearable placeholder="" /></el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="8">
+                <div class="span-sty">挂车类型</div>
+                <el-form-item>
+                  <el-select class="addinputInfo" v-model="formobj.loanReturnInboundTrailer.trailerTypeKey" @change="trailerChange" placeholder="请选择" filterable>
+                    <el-option v-for="item in trailer_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <div class="span-sty">备注</div>
+                <el-form-item><el-input class="addinputInfo" style="width: 50%" v-model="formobj.loanReturnInboundTrailer.remarks" clearable placeholder="" /></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
          <div class="title">已还与欠款情况</div>
          <el-row>
            <el-col :span="8">
--- a/anrui-riskcenter-ui/src/views/workFlow/jiaohuirukuFlow/returntostorageYiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/jiaohuirukuFlow/returntostorageYiBan.vue
@ -85,31 +85,33 @@
              <el-form-item><span class="addinputInfo">{{ formobj.parkFees }}</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">{{ formobj.loanReturnInboundTrailer.vinNo }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">车牌号</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.vehMark }}</span></el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <div class="span-sty">入库价(元)</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.inboundMoney }}</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.loanReturnInboundTrailer.trailerType }}</span></el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <div class="span-sty">备注</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.remarks }}</span></el-form-item>
-            </el-col>
-          </el-row>
+          <div v-if="formobj.tralier === '是'">
+            <div class="title">挂车信息</div>
+            <el-row>
+              <el-col :span="8">
+                <div class="span-sty">车架号</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.vinNo }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">车牌号</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.vehMark }}</span></el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <div class="span-sty">入库价(元)</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.inboundMoney }}</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.loanReturnInboundTrailer.trailerType }}</span></el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <div class="span-sty">备注</div>
+                <el-form-item><span class="addinputInfo">{{ formobj.loanReturnInboundTrailer.remarks }}</span></el-form-item>
+              </el-col>
+            </el-row>
+          </div>
          <div class="title">已还与欠款情况</div>
          <el-row>
            <el-col :span="8">