Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -30,7 +30,6 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
-import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -395,6 +394,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
             qw.lambda().apply("FIND_IN_SET ('" + orgPath + "',useOrg)");
         }
         qw.eq("salesPolicyKey", "0002");
+        qw.eq("nodeState","已办结");
         List<AppBaseDiscountpackageVo> voList = baseMapper.getAppPackage(qw);
         if (voList.isEmpty()) {
             voList = new ArrayList<>();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -74,6 +74,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -750,25 +751,33 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         return url;
     }*/
     private String genCarSaleContract(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
-        File file = null;
+//        File file = null;
+
+        String ftl = "";
         if ("现车".equals(appOrderDetailsVo.getOrderType())) {
             //获取模板
-            file = new File(getClass().getClassLoader().getResource("ftl/existingvehicles.ftl").getFile());
+//            file = new File(getClass().getClassLoader().getResource("ftl/existingvehicles.ftl").getFile());
+            ftl = "existingvehicles";
         } else {
             //获取模板
-            file = new File(getClass().getClassLoader().getResource("ftl/orderacar.ftl").getFile());
+            ftl = "orderacar";
+//            file = new File(getClass().getClassLoader().getResource("ftl/orderacar.ftl").getFile());
         }
-        String dir = getClassLoader().getResource("ftl").getPath();
+        InputStream inputStream  = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl+".ftl");
+//        String dir = getClassLoader().getResource("ftl").getPath();
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        WordConvertUtils.creatWord(map, file, targetPath, typeName, dir);
+        File file = new File(targetPath + ftl+seconds+".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
-        //生成出门证文件名
-        String pdfName = dateStr + seconds + ".pdf";
+        //生成文件名
+        String pdfName = "合同_"+dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
@@ -805,31 +814,38 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     }*/
     private String genCarSaleContractBlank(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
         String url = "";
-        File file = null;
+//        File file = null;
         map.put("totalPrice", "");
         map.put("priceRemarks", "");
         map.put("depositTotal", "");
+        String ftl = "";
         // 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
         if ("1".equals(dto.getDiscountKey())) {
             // 现车
             if ("现车".equals(appOrderDetailsVo.getOrderType())) {
                 //获取模板
-                file = new File(getClass().getClassLoader().getResource("ftl/existingvehicles_black.ftl").getFile());
+                ftl = "existingvehicles_black";
+//                file = new File(getClass().getClassLoader().getResource("ftl/existingvehicles_black.ftl").getFile());
             } else {
                 // 订车获取模板
-                file = new File(getClass().getClassLoader().getResource("ftl/orderacar_black.ftl").getFile());
+                ftl = "orderacar_black";
+//                file = new File(getClass().getClassLoader().getResource("ftl/orderacar_black.ftl").getFile());
             }
-            String dir = getClassLoader().getResource("ftl").getPath();
+//            String dir = getClassLoader().getResource("ftl").getPath();
+            InputStream inputStream  = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl+".ftl");
             //生成word文件名
             String targetPath = docPdfComponent.getUploadTemplateUrl();
             String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
             long seconds = System.currentTimeMillis();
             String typeName = dateStr + seconds + ".doc";
-            WordConvertUtils.creatWord(map, file, targetPath, typeName, dir);
+            File file = new File(targetPath + ftl+seconds+".ftl");
+            File dir = new File(targetPath);
+            WordConvertUtils.inputStreamToFile(inputStream, file);
+            WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
             //新生成的word路径
             String wordPath = targetPath + typeName;
             //生成合同文件名
-            String pdfName = dateStr + seconds + ".pdf";
+            String pdfName = "空白合同_"+dateStr + seconds + ".pdf";
             WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
             url = pdfName;
         }
@@ -1231,7 +1247,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
-            if(!voResultBean.getSuccess()){
+            if (!voResultBean.getSuccess()) {
                 return rb.setMsg(voResultBean.getMsg());
             }
             baseMapper.updateBySidAndState(businessSid, "2");

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bushandover/BusHandoverVo.java

@@ -46,4 +46,6 @@ public class BusHandoverVo implements Vo {
     //下载路径
     private List<DownloadVo> fileResps = new ArrayList<>();
 
+    private String recipient;
+
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverMapper.xml

@@ -39,7 +39,8 @@
                bhi.modelName,
                bh.sid,
                (select count(*) from bus_handover_items bhi2 where bhi2.handoverSid = bh.sid) as number,
-               bh.handoverStateKey
+               bh.handoverStateKey,
+               bh.recipient
         from bus_handover bh
                  left join bus_handover_items bhi on bh.sid = bhi.handoverSid
         <where>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandover/BusHandoverService.java

@@ -48,8 +48,6 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
-import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader;
-
 /**
  * Project: anrui-buscenter(业务中心) <br/>
  * File: BusHandoverService.java <br/>
@@ -185,7 +183,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                 buscenterFile.setFileType(str.substring(str.lastIndexOf(".") + 1));
                 buscenterFileService.insert(buscenterFile);
             }
-           /* Future<String> future2 = pool.submit(() -> {
+            Future<String> future2 = pool.submit(() -> {
                 return entrustConfirmImages(busHandover.getSid());
             });
             if (StringUtils.isNotBlank(future2.get())) {
@@ -206,26 +204,28 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                 buscenterFile.setFileType(str.substring(str.lastIndexOf(".") + 1));
                 buscenterFileService.insert(buscenterFile);
             }
-            Future<String> future3 = pool.submit(() -> {
-                return entrustImages(busHandover.getSid());
-            });
-            if (StringUtils.isNotBlank(future3.get())) {
-                busHandoverListVo = new BusHandoverListVo();
-                busHandoverListVo.setName(MessageFormat.format("《{0}》", BuscenterFileEnum.ENTRUST_IMAGES.getMark()));
-                busHandoverListVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future3.get());
-                list.add(busHandoverListVo);
-                String str = future1.get();
-                buscenterFile = new BuscenterFile();
-                buscenterFile.setLinkSid(busHandover.getSid());
-                buscenterFile.setFilePath(future3.get());
-                buscenterFile.setAttachType(BuscenterFileEnum.ENTRUST.getAttachType());
-                File file = new File(fileUploadComponent.getUploadPath() + str.replace("/", File.separator));
-                if (file != null) {
-                    buscenterFile.setFileSize(fileUploadComponent.getPrintSize(file.length()));
+            if (!busHandover.getCustomerName().equals(busHandover.getRecipient())) {
+                Future<String> future3 = pool.submit(() -> {
+                    return entrustImages(busHandover.getSid());
+                });
+                if (StringUtils.isNotBlank(future3.get())) {
+                    busHandoverListVo = new BusHandoverListVo();
+                    busHandoverListVo.setName(MessageFormat.format("《{0}》", BuscenterFileEnum.ENTRUST_IMAGES.getMark()));
+                    busHandoverListVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future3.get());
+                    list.add(busHandoverListVo);
+                    String str = future1.get();
+                    buscenterFile = new BuscenterFile();
+                    buscenterFile.setLinkSid(busHandover.getSid());
+                    buscenterFile.setFilePath(future3.get());
+                    buscenterFile.setAttachType(BuscenterFileEnum.ENTRUST.getAttachType());
+                    File file = new File(fileUploadComponent.getUploadPath() + str.replace("/", File.separator));
+                    if (file != null) {
+                        buscenterFile.setFileSize(fileUploadComponent.getPrintSize(file.length()));
+                    }
+                    buscenterFile.setFileName(BuscenterFileEnum.ENTRUST_IMAGES.getMark());
+                    buscenterFile.setFileType(str.substring(str.lastIndexOf(".") + 1));
+                    buscenterFileService.insert(buscenterFile);
                 }
-                buscenterFile.setFileName(BuscenterFileEnum.ENTRUST_IMAGES.getMark());
-                buscenterFile.setFileType(str.substring(str.lastIndexOf(".") + 1));
-                buscenterFileService.insert(buscenterFile);
             }
             Future<String> future4 = pool.submit(() -> {
                 return outDoor(busHandover.getSid());
@@ -247,7 +247,7 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                 buscenterFile.setFileName(BuscenterFileEnum.EXIT_TICKET_IMAGES.getMark());
                 buscenterFile.setFileType(str.substring(str.lastIndexOf(".") + 1));
                 buscenterFileService.insert(buscenterFile);
-            }*/
+            }
         } catch (Exception e) {
             e.printStackTrace();
             return rb.setMsg("生成文件失败");
@@ -295,19 +295,19 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
 //        File file = new File(getClass().getClassLoader().getResource("ftl/receiveCar.ftl").getFile());
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/receiveCar.ftl");
 //        String dir = getClassLoader().getResource("ftl").getPath();
-        String dir = this.getClass().getResource("ftl").getPath();
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        File file = new File(targetPath +"receiveCar.ftl");
+        File file = new File(targetPath + "receiveCar"+seconds+".ftl");
+        File dir = new File(targetPath);
         WordConvertUtils.inputStreamToFile(inputStream, file);
-        WordConvertUtils.creatWord(map, file, targetPath, typeName, dir);
+        WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
         //生成出门证文件名
-        String pdfName = dateStr + seconds + ".pdf";
+        String pdfName = "接收车辆确认书_"+dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
@@ -336,18 +336,22 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         List<BusItemVo> list = busHandoverItemsService.getList(sid);
         List<String> stringList = list.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
         map.put("vinNo", String.join(",", stringList));
-        File file = new File(getClass().getClassLoader().getResource("ftl/entrust.ftl").getFile());
-        String dir = getClassLoader().getResource("ftl").getPath();
+//        File file = new File(getClass().getClassLoader().getResource("ftl/entrust.ftl").getFile());
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/entrust.ftl");
+//        String dir = getClassLoader().getResource("ftl").getPath();
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        WordConvertUtils.creatWord(map, file, targetPath, typeName, dir);
+        File file = new File(targetPath + "entrust"+seconds+".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
-        //生成出门证文件名
-        String pdfName = dateStr + seconds + ".pdf";
+        //生成文件名
+        String pdfName = "委托提车授权书_"+dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
@@ -366,18 +370,22 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         map.put("customerName", busHandover.getCustomerName());
         List<BusItemVo> list = busHandoverItemsService.getList(sid);
         map.put("list", list);
-        File file = new File(getClass().getClassLoader().getResource("ftl/entrustConfirm.ftl").getFile());
-        String dir = getClassLoader().getResource("ftl").getPath();
+//        File file = new File(getClass().getClassLoader().getResource("ftl/entrustConfirm.ftl").getFile());
+//        String dir = getClassLoader().getResource("ftl").getPath();
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/entrustConfirm.ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        WordConvertUtils.creatWord(map, file, targetPath, typeName, dir);
+        File file = new File(targetPath + "entrustConfirm"+seconds+".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
-        //生成出门证文件名
-        String pdfName = dateStr + seconds + ".pdf";
+        //生成文件名
+        String pdfName = "交车资料确认单_"+dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
@@ -407,18 +415,22 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
         AppOrderDetailsVo appOrderDetailsVo = orderDetailsVoResultBean.getData();
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
         map.put("modelName", appOrderModelInfoVo.getModelName());
-        File file = new File(getClass().getClassLoader().getResource("ftl/outdoor.ftl").getFile());
-        String dir = getClassLoader().getResource("ftl").getPath();
+//        File file = new File(getClass().getClassLoader().getResource("ftl/outdoor.ftl").getFile());
+//        String dir = getClassLoader().getResource("ftl").getPath();
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/outdoor.ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        WordConvertUtils.creatWord(map, file, targetPath, typeName, dir);
+        File file = new File(targetPath + "outdoor"+seconds+".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
         //生成出门证文件名
-        String pdfName = dateStr + seconds + ".pdf";
+        String pdfName = "出门证_"+dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
@@ -458,11 +470,14 @@ public class BusHandoverService extends MybatisBaseService<BusHandoverMapper, Bu
                 vo.setName(buscenterFile.getFileName());
                 vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
                 stringList.add(vo);
-                vo = new DownloadVo();
-                buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.ENTRUST.getAttachType());
-                vo.setName(buscenterFile.getFileName());
-                vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
-                stringList.add(vo);
+                if(!record.getCustomerName().equals(record.getRecipient())){
+                    vo = new DownloadVo();
+                    buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.ENTRUST.getAttachType());
+                    vo.setName(buscenterFile.getFileName());
+                    vo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + buscenterFile.getFilePath());
+                    stringList.add(vo);
+                }
+
                 vo = new DownloadVo();
                 buscenterFile = buscenterFileService.selectByLinkSidOne(record.getSid(), BuscenterFileEnum.EXIT_TICKET.getAttachType());
                 vo.setName(buscenterFile.getFileName());

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -93,13 +93,12 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.File;
+import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
-import static cn.hutool.core.util.ClassLoaderUtil.getClassLoader;
-
 /**
  * Project: scm(scm) <br/>
  * File: ScmVehicleGressionService.java <br/>
@@ -1373,14 +1372,18 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
         //申请人
         dataMap.put("apply", scmVehicleGression.getApplicantName());
         //获取模板
-        File file = new File(getClass().getClassLoader().getResource("ftl/outdoor.ftl").getFile());
-        String dir = getClassLoader().getResource("ftl").getPath();
+//        File file = new File(getClass().getClassLoader().getResource("ftl/outdoor.ftl").getFile());
+//        String dir = getClassLoader().getResource("ftl").getPath();
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/outdoor.ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
         String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
         long seconds = System.currentTimeMillis();
         String typeName = dateStr + seconds + ".doc";
-        WordConvertUtils.creatWord(dataMap, file, targetPath, typeName, dir);
+        File file = new File(targetPath + "outdoor"+seconds+".ftl");
+        File dir = new File(targetPath);
+        WordConvertUtils.inputStreamToFile(inputStream, file);
+        WordConvertUtils.creatWord1(dataMap, file, targetPath, typeName, dir);
         //新生成的word路径
         String wordPath = targetPath + typeName;
         //生成出门证文件名

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@@ -103,11 +103,9 @@
             <el-col :span="3" class="tleftb">
               <span>常用配置</span>
             </el-col>
-            <el-col :span="21" class="trightb tlineheightb">
+            <el-col :span="13" class="trightb tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="3" class="tleftb">
               <span>内部编码</span>
             </el-col>
@@ -116,6 +114,16 @@
                 <span>{{ formobj.insideCode }}</span>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>车辆型号</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.vehMark" clearable placeholder="" class="addinputw"/>
+              </el-form-item>
+            </el-col>
             <el-col :span="3" class="tleftb">
               <span>销售指导价</span>
             </el-col>
@@ -420,7 +428,8 @@ export default {
         vehicleTypeKey: '',
         isSaleOrgApproval: '',
         approvalName: '',
-        approvalSid: ''
+        approvalSid: '',
+        vehMark: ''
       },
       rules: {
         purchaseSystemName: [{ required: true, message: '采购系统不能为空', trigger: 'change' }], // 采购系统名称
@@ -632,6 +641,7 @@ export default {
           this.formobj.isSaleOrgApproval = vdata.isSaleOrgApproval
           this.formobj.approvalName = vdata.approvalName
           this.formobj.approvalSid = vdata.approvalSid
+          this.formobj.vehMark = vdata.vehMark
           this.formobj.baseOutsourcingApplicationVehicleDtos = vdata.baseOutsourcingApplicationVehicleVos // 部门sid
         }
       }).catch(e => {
@@ -853,6 +863,7 @@ export default {
       this.formobj.isSaleOrgApproval = ''
       this.formobj.approvalName = ''
       this.formobj.approvalSid = ''
+      this.formobj.vehMark = ''
       this.submitdisabled = false
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue

@@ -58,11 +58,9 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">常用配置</el-col>
-          <el-col :span="21" class="trightb tlineheightb">
+          <el-col :span="13" class="trightb tlineheightb">
             <el-form-item><span>{{ formobj.configName }}</span></el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
@@ -71,6 +69,16 @@
               <span>{{ formobj.insideCode }}</span>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3" class="tleftb">
+            <span>车辆型号</span>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item>
+              <span>{{ formobj.vehMark }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="3" class="tleftb">销售指导价</el-col>
           <el-col :span="5">
             <el-form-item><span>{{ formobj.guidedPrice }}</span></el-form-item>

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue

@@ -60,11 +60,9 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">常用配置</el-col>
-          <el-col :span="21" class="trightb tlineheightb">
+          <el-col :span="13" class="trightb tlineheightb">
             <el-form-item><span>{{ formobj.configName }}</span></el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
@@ -73,6 +71,16 @@
               <span>{{ formobj.insideCode }}</span>
             </el-form-item>
           </el-col>
+          <el-col :span="3" class="tleftb">
+            <span>车辆型号</span>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="5">
+            <el-form-item>
+              <span>{{ formobj.vehMark }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="3" class="tleftb">销售指导价</el-col>
           <el-col :span="5">
             <el-form-item><span>{{ formobj.guidedPrice }}</span></el-form-item>

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue

@@ -102,11 +102,9 @@
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>常用配置</span>
             </el-col>
-            <el-col :span="21" class="trightb tlineheightb">
+            <el-col :span="13" class="trightb tlineheightb">
               <el-form-item>{{ formobj.configName }}</el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="3" class="tleftb">
               <span>内部编码</span>
             </el-col>
@@ -115,6 +113,16 @@
                 <span>{{ formobj.insideCode }}</span>
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="3" class="tleftb">
+              <span>车辆型号</span>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item>
+                <el-input v-model="formobj.vehMark" clearable placeholder="" class="addinputw"/>
+              </el-form-item>
+            </el-col>
             <el-col :span="3" class="tleftb">
               <span><span class="icon">*</span>销售指导价</span>
             </el-col>
@@ -423,7 +431,8 @@ export default {
         vehicleTypeKey: '',
         isSaleOrgApproval: '',
         approvalName: '',
-        approvalSid: ''
+        approvalSid: '',
+        vehMark: ''
       },
       stopList: { // 终止列表
         businessSid: '',
@@ -669,6 +678,7 @@ export default {
       this.formobj.isSaleOrgApproval = ''
       this.formobj.approvalName = ''
       this.formobj.approvalSid = ''
+      this.formobj.vehMark = ''
       window.parent.postMessage({
         cmd: 'returnHeight',
         params: {
@@ -738,6 +748,7 @@ export default {
           this.formobj.isSaleOrgApproval = vdata.isSaleOrgApproval
           this.formobj.approvalName = vdata.approvalName
           this.formobj.approvalSid = vdata.approvalSid
+          this.formobj.vehMark = vdata.vehMark
           this.formobj.baseOutsourcingApplicationVehicleDtos = vdata.baseOutsourcingApplicationVehicleVos // 部门sid
         } else {
           // 根据resp.code进行异常情况处理

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue

@@ -53,11 +53,9 @@
         </el-row>
         <el-row>
           <el-col :span="3" class="tleftb">常用配置</el-col>
-          <el-col :span="21" class="trightb tlineheightb">
+          <el-col :span="13" class="trightb tlineheightb">
             <el-form-item><span>{{ formobj.configName }}</span></el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="3" class="tleftb">
             <span>内部编码</span>
           </el-col>
@@ -66,6 +64,16 @@
               <span>{{ formobj.insideCode }}</span>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="3" class="tleftb">
+            <span>车辆型号</span>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item>
+              <span>{{ formobj.vehMark }}</span>
+            </el-form-item>
+          </el-col>
           <el-col :span="3" class="tleftb">销售指导价</el-col>
           <el-col :span="5">
             <el-form-item><span>{{ formobj.guidedPrice }}</span></el-form-item>

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@@ -45,12 +45,19 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24" class="tlineheightb">
+          <el-col :span="16" class="tlineheightb">
             <el-form-item>
               <span slot="label"><span class="icon">*</span>常用配置：</span>
               <span>{{ temp.configName }}</span>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span slot="label">内部编码：</span>
+              <span>{{ temp.insideCode }}</span>
+            </el-form-item>
+          </el-col>
+
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -61,14 +68,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <span slot="label">内部编码：</span>
-              <span>{{ temp.insideCode }}</span>
+              <span slot="label">发动机号：</span>
+              <el-input v-model="temp.engineNo" maxlength="125" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item>
-              <span slot="label">发动机号：</span>
-              <el-input v-model="temp.engineNo" maxlength="125" placeholder="" class="addinputw" clearable/>
+            <el-form-item prop="vehMark">
+              <span slot="label">车辆型号：</span>
+              <el-input v-model="temp.vehMark" maxlength="17" placeholder="" class="addinputw" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -369,7 +376,8 @@ export default {
         carBrandName: '',
         supplierName: '',
         supplierSid: '',
-        freight: ''
+        freight: '',
+        vehMark: ''
       }, // 添加和修改
       dialogFormVisible: false, // 添加修改对话框状态
       dialogStatus: '', // 对话框状态
@@ -389,7 +397,7 @@ export default {
         costPrice: [{ required: true, message: '厂家结算价（含运费）不能为空', trigger: 'blur' }],
         freight: [{ required: true, message: '运费不能为空', trigger: 'blur' }],
         settlementStatusValue: [{ required: true, message: '买断状态不能为空', trigger: 'change' }],
-        isProblemVeh: [{ required: true, message: '是否为问题车辆不能为空', trigger: 'change' }]
+        isProblemVeh: [{ required: true, message: '是否为问题车辆不能为空', trigger: 'change' }],
       }
     }
   },
@@ -657,7 +665,8 @@ export default {
         isProblemVeh: '',
         supplierName: '',
         supplierSid: '',
-        freight: ''
+        freight: '',
+        vehMark: ''
       }
       this.$emit('doback')
     },

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue

@@ -33,12 +33,18 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24" class="tlineheightb">
+          <el-col :span="16" class="tlineheightb">
             <el-form-item>
               <span slot="label">常用配置：</span>
               <span>{{ temp.configName }}</span>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <span slot="label">内部编码：</span>
+              <span>{{ temp.insideCode }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -49,14 +55,14 @@
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <span slot="label">内部编码：</span>
-              <span>{{ temp.insideCode }}</span>
+              <span slot="label">发动机号：</span>
+              <span>{{ temp.engineNo }}</span>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <span slot="label">发动机号：</span>
-              <span>{{ temp.engineNo }}</span>
+              <span slot="label">车辆型号：</span>
+              <span>{{ temp.vehMark }}</span>
             </el-form-item>
           </el-col>
         </el-row>

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue

@@ -115,6 +115,11 @@
                 <span>{{ scope.row.insideCode }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="车辆型号" align="center" width="200">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.vehicleNo" clearable placeholder=""></el-input>
+              </template>
+            </el-table-column>
             <el-table-column label="排产数量" header-align="center" width="130">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.quantity" @keyup.native="scope.row.quantity = oninput(scope.row.quantity,2)" placeholder="" class="addinputw" clearable/>
@@ -379,7 +384,8 @@ export default {
             vehicleSid: e.modelSid,
             guidePrice: '',
             actualPay: '',
-            actualSid: ''
+            actualSid: '',
+            vehicleNo: ''
           })
           if (e.insideCode) {
             this.isRead = true

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue

@@ -85,6 +85,11 @@
                 <span>{{ scope.row.insideCode }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="车辆型号" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleNo }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="排产数量" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.quantity }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue

@@ -87,6 +87,11 @@
                 <span>{{ scope.row.insideCode }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="车辆型号" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleNo }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="排产数量" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.quantity }}</span>

anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue

@@ -114,6 +114,11 @@
                 <span>{{ scope.row.insideCode }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="车辆型号" align="center" width="200">
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.vehicleNo" clearable placeholder=""></el-input>
+              </template>
+            </el-table-column>
             <el-table-column label="排产数量" header-align="center" width="130">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.quantity" @keyup.native="scope.row.quantity = oninput(scope.row.quantity,2)" placeholder="" class="addinputw" clearable/>
@@ -351,7 +356,8 @@ export default {
             vehicleSid: e.modelSid,
             guidePrice: '',
             actualPay: '',
-            actualSid: ''
+            actualSid: '',
+            vehicleNo: ''
           })
           if (e.insideCode) {
             this.isRead = true

anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue

@@ -85,6 +85,11 @@
                 <span>{{ scope.row.insideCode }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="车辆型号" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vehicleNo }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="排产数量" align="center" width="130">
               <template slot-scope="scope">
                 <span>{{ scope.row.quantity }}</span>