Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmcollectionrebatedistribution/ScmCollectionRebateDistributionService.java

@@ -28,19 +28,14 @@ package com.yxt.anrui.scm.biz.scmcollectionrebatedistribution;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.scm.api.scmcollectionrebatedistribution.*;
 import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDetailsVo;
 import com.yxt.anrui.scm.api.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehDto;
-import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDetailsVo;
-import com.yxt.anrui.scm.api.scmcollectionrebateveh.ScmCollectionRebateVehDto;
-import com.yxt.anrui.scm.api.scmcollectionrebatewithapply.ScmCollectionRebateWithApplyVo;
 import com.yxt.anrui.scm.api.scmfile.ScmFile;
 import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
 import com.yxt.anrui.scm.biz.scmcollectionrebatedistributionveh.ScmCollectionRebateDistributionVehService;
-import com.yxt.anrui.scm.biz.scmcollectionrebateveh.ScmCollectionRebateVehService;
 import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import org.apache.commons.lang3.StringUtils;

yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@@ -47,7 +47,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <div class="span-sty">索赔厂家及厂家</div>
+              <div class="span-sty">索赔厂家及类型</div>
               <el-form-item>
                 <div class="addinputInfo" style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center">
                   <el-select :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.claimManufacturer" placeholder="请选择" @change="changeClaimManufacturer" clearable filterable>
@@ -1105,7 +1105,7 @@ export default {
         this.formobj.claimManufacturerSid = ''
       }
     },
-    changeShClaimType() {
+    changeShClaimType(value) {
       const choose = this.shClaimType_list.filter((item) => item.dictKey === value)
       if (choose.length > 0 && choose !== null) {
         this.formobj.shClaimTypeValue = choose[0].dictValue