Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/AppModelConfigDetailsVo.java

@@ -75,6 +75,8 @@ public class AppModelConfigDetailsVo implements Vo {
     @ApiModelProperty("蓄电池value")
     private String storagBatteryValue;
 
+    @ApiModelProperty("货箱")
+    private String packingCase;
 
     @ApiModelProperty(value = "配置包")
     private String configuringBao;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -356,6 +356,7 @@
                bmc.independentSources,
                bmc.fuelTank,
                bmc.multimedia,
+               bmc.packingCase,
                bmc.otherConfig
         FROM base_vehmodel_config bvc
                      LEFT JOIN base_model_config bmc ON bmc.sid = bvc.configurationItemsSid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1138,6 +1138,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         list2.add(getConfigValueSpanSize("上车踏板", configVo.getBoardPedalValue()));
         list2.add(getConfigValueSpanSize("方向盘", configVo.getSteerWheelValue()));
         list2.add(getConfigValueSpanSize("蓄电池", configVo.getStoragBatteryValue()));
+        list2.add(getConfigValueSpanSize("货箱", configVo.getPackingCase()));
 
 
         configDetailVo.setConfigInfo(list2);

anrui-riskcenter-ui/src/views/repaymentschedule/repaymentscheduleAdd.vue

@@ -132,6 +132,7 @@ export default {
         otherMidRepay: '',
         otherLastRepay: '',
         isOtherPolicy: '',
+        userSid: '',
         solutionsDetailsssVo: []
       },
       rules: {}
@@ -153,6 +154,7 @@ export default {
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
+          this.formobj.userSid = window.sessionStorage.getItem('userSid')
           req.loanCreateSchedulePdf(this.formobj).then((res) => {
             if (res.success) {
               this.$message({ showClose: true, type: 'success', message: '生成成功' })
@@ -196,6 +198,7 @@ export default {
         otherMidRepay: '',
         otherLastRepay: '',
         isOtherPolicy: '',
+        userSid: '',
         solutionsDetailsssVo: []
       }
       this.submitdisabled = false

anrui-riskcenter-ui/src/views/warrantinformation/warrantinformationByHandOver.vue

@@ -31,9 +31,10 @@
           <el-col :span="24">
             <div class="span-sty">移交资料</div>
             <el-form-item>
-              <el-select class="addinputInfo" v-model="formobj.transferInformationKey" placeholder="请选择" @change="transferInformationChange" clearable filterable>
+<!--              <el-select class="addinputInfo" v-model="formobj.transferInformationKey" placeholder="请选择" @change="transferInformationChange" clearable filterable>-->
-                <el-option v-for="item in transferInformation_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+<!--                <el-option v-for="item in transferInformation_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>-->
-              </el-select>
+<!--              </el-select>-->
+              <el-input class="addinputInfo" style="width: 30%" v-model="formobj.transferInformation" clearable placeholder=""/>
             </el-form-item>
           </el-col>
         </el-row>