diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
index f38f199301..f0a42e8f3f 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java
@@ -197,4 +197,11 @@ public class AppBusSalesOrderVo implements Vo {
     private String distributorNameTwo;
     @ApiModelProperty("单车中介服务费2")
     private String distributorPriceTwo;
+
+    @ApiModelProperty("App合同下载路径")
+    private String contractPath;
+    @ApiModelProperty("PC合同下载路径")
+    private String contractFilePath;
+    @ApiModelProperty("是否显示生成合同按钮")
+    private boolean showContractBtn2;
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index cf37683f16..57cc8f4bea 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -164,6 +164,7 @@ import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherp
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicyFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
+import com.yxt.common.base.config.component.DocPdfComponent;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.Base64;
@@ -311,6 +312,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
     @Autowired
     private BaseDiscountpackageFeign baseDiscountpackageFeign;
+    @Autowired
+    private DocPdfComponent docPdfComponent;
 
     /**
      * 构造查询条件
@@ -395,7 +398,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //包含采购系统的车架号
                 List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
                 List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
-                if(!vinList.isEmpty()){
+                if (!vinList.isEmpty()) {
                     for (int i = 0; i < vinLists.size(); i++) {
                         VinListsVo vinListsVo = vinLists.get(i);
                         BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
@@ -405,8 +408,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             List<String> stringList = listResultBean.getData();
                             initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
                         }
-                        if(initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0){
-                            vinList.set(i,vinList.get(i)+"促销("+initBigDecimalTwo.toString()+"元)");
+                        if (initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0) {
+                            vinList.set(i, vinList.get(i) + "促销(" + initBigDecimalTwo.toString() + "元)");
                         }
                     }
                 }
@@ -1310,7 +1313,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
             }
         }
-        if(!initBigDecimalOneList.isEmpty()){
+        if (!initBigDecimalOneList.isEmpty()) {
             String initOne = Collections.min(initBigDecimalOneList);
             initBigDecimalOne = new BigDecimal(initOne);
         }
@@ -2269,9 +2272,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleOrderVo.getCarSid(), busSalesOrder.getUseOrgSid());
                     if (listResultBean.getSuccess()) {
                         List<String> stringList = listResultBean.getData();
-                        if(stringList.isEmpty()){
+                        if (stringList.isEmpty()) {
                             appNowCarVo.setPromotion(false);
-                        }else{
+                        } else {
                             appNowCarVo.setPromotion(true);
                         }
                     }
@@ -2599,9 +2602,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleOrderVo.getCarSid(), busSalesOrder.getUseOrgSid());
                     if (listResultBean.getSuccess()) {
                         List<String> stringList = listResultBean.getData();
-                        if(stringList.isEmpty()){
+                        if (stringList.isEmpty()) {
                             appNowCarVo.setPromotion(false);
-                        }else{
+                        } else {
                             appNowCarVo.setPromotion(true);
                         }
                     }
@@ -3382,7 +3385,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 //包含采购系统的车架号
                 List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
                 List<String> orderVinList = busSalesOrderVehicleService.selectList(sid);
-                if(!vinList.isEmpty()){
+                if (!vinList.isEmpty()) {
                     for (int i = 0; i < vinLists.size(); i++) {
                         VinListsVo vinListsVo = vinLists.get(i);
                         BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
@@ -3392,8 +3395,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             List<String> stringList = listResultBean.getData();
                             initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
                         }
-                        if(initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0){
-                            vinList.set(i,vinList.get(i)+"，促销("+initBigDecimalTwo.toString()+"元)");
+                        if (initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0) {
+                            vinList.set(i, vinList.get(i) + "，促销(" + initBigDecimalTwo.toString() + "元)");
                         }
                     }
                 }
@@ -4030,9 +4033,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 }
                 list.add(getValueSpanSize(loanDownPayValue.toString(), 1, 0, false));
                 StringBuilder downPayAmountsRatioValue = new StringBuilder();
-                if(StringUtils.isNotBlank(solutionsDetailsVo.getDownPayAmountsRatio())){
+                if (StringUtils.isNotBlank(solutionsDetailsVo.getDownPayAmountsRatio())) {
                     downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例：").append(solutionsDetailsVo.getDownPayAmountsRatio());
-                }else{
+                } else {
                     downPayAmountsRatioValue = downPayAmountsRatioValue.append("实际首付比例：").append("-");
                 }
                 list.add(getValueSpanSize(downPayAmountsRatioValue.toString(), 1, 0, false));
@@ -5856,10 +5859,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             qw.like("ls.factoryDiscount", pagerQuery.getFactoryDiscount());
         }
         String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
+        String urlPrefix = docPdfComponent.getPrefixTemplateUrl();
+        String temp = "/template/";
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrdersByOrgPath(page, qw, pq.getParams().getName(), typeState, pagerQuery.getVinNo(), pagerQuery.getOrderingNo());
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
             record.setShowStopBtn(false);
             record.setShowContractBtn(false);
+            record.setShowContractBtn2(false);
+            //判断该合同是否有下载附件
+            if (StringUtils.isNotBlank(record.getContractId())) {
+                String contractId = record.getContractId();
+                CommonContract contract = commonContractFeign.selectByNo(contractId).getData();
+                if (null != contract) {
+                    if (StringUtils.isNotBlank(contract.getContractUrlAll())) {
+                        record.setShowContractBtn2(true);
+                        record.setContractPath(urlPrefix + contract.getContractUrlAll());
+                        record.setContractFilePath(temp + contract.getContractUrlAll());
+                    }
+                }
+            }
+
             if (StringUtils.isNotBlank(record.getCustomerImage())) {
                 record.setCustomerImage(fileUploadComponent.getUrlPrefix() + record.getCustomerImage());
             }
@@ -6152,7 +6171,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<BusSalesOrderVehicle> busSalesOrderVehicles = busSalesOrderVehicleService.selectByOrderSid(sid);
         if (!busSalesOrderVehicles.isEmpty()) {
             for (BusSalesOrderVehicle busSalesOrderVehicle : busSalesOrderVehicles) {
-                if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())){
+                if (StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
                     vinNo = vinNo + busSalesOrderVehicle.getLinkNo() + ",";
                 }
             }
@@ -6759,7 +6778,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     public ResultBean saveContractOne(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        BusSalesOrder busSalesOrder= fetchBySid(sid);
+        BusSalesOrder busSalesOrder = fetchBySid(sid);
         //查询是否有合同，如果没有则生成合同
         OrderContractQuery orderContractQuery = new OrderContractQuery();
         orderContractQuery.setSid(sid);
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicereceive.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicereceive.vue
index 2a61184fc5..7df6e7572d 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicereceive.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicereceive.vue
@@ -62,11 +62,6 @@
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
             <el-table-column fixed label="序号" width="60" type="index" :index="indexMethod" align="center"/>
-            <el-table-column fixed label="操作" width="180" align="center">
-              <template slot-scope="scope">
-                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
-              </template>
-            </el-table-column>
             <el-table-column label="创建日期" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.createTime }}</span>
@@ -259,6 +254,7 @@ export default {
           this.payType_list = res.data
         }
       })
+      this.getList()
     },
     // 序号
     indexMethod(index) {
@@ -315,9 +311,6 @@ export default {
       }
       this.getList()
     },
-    toInfo(row) {
-      this.viewState = 3
-    },
     handleLook(row) {
       this.dialogVisible = true
       this.image_list = row.receiveFilesList
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue
index 4f4cb96e9e..440967bc43 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue
@@ -75,7 +75,7 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span class="icon">*</span>接收附件</div>
+              <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">接收附件</div>
               <el-form-item><upload ref="uploadImg" class="addinputInfo" v-model="formobj.receiveFilesList" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/></el-form-item>
             </el-col>
           </el-row>
@@ -140,10 +140,6 @@ export default {
       })
     },
     handleSave() {
-      if (this.formobj.receiveFilesList.length === 0) {
-        this.$message({ showClose: true, type: 'error', message: '请上传接收附件' })
-        return
-      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue
index 162934b683..e9f1778a20 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue
@@ -61,7 +61,6 @@
             <el-table-column fixed label="操作" width="180" align="center">
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="toEdit(scope.row)">确认</el-button>
-                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
             <el-table-column label="创建日期" align="center" width="120">
@@ -346,10 +345,6 @@ export default {
       this.viewState = 3
       this.$refs['divAdd'].showEdit(row)
     },
-    toInfo(row) {
-      this.viewState = 4
-      this.$refs['divInfo'].showInfo(row)
-    },
     resetState() {
       this.viewState = 1
     },
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue
index 7509fe02be..5420c6c139 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue
@@ -61,9 +61,9 @@
               <el-form-item label="车型:">
                 <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable/>
               </el-form-item>
-<!--              <el-form-item label="采购订单编号:">-->
-<!--                <el-input v-model="listQuery.params.orderingNo" placeholder="" clearable/>-->
-<!--              </el-form-item>-->
+              <el-form-item label="车架号:">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="快捷检索:">
                 <el-input v-model="listQuery.params.modelName" placeholder="" clearable/>
               </el-form-item>
@@ -162,7 +162,7 @@ export default {
           vehicleType: '',
           vehicleVersion: '',
           userSid: '',
-          orderingNo: '',
+          vinNo: '',
           orgSid: '',
           vehSids: []
         },
@@ -267,7 +267,7 @@ export default {
       this.listQuery.params.vehicleType = ''
       this.listQuery.params.vehicleVersion = ''
       this.listQuery.params.userSid = ''
-      this.listQuery.params.orderingNo = ''
+      this.listQuery.params.vinNo = ''
       this.getList()
     },
     handleSelectionChange(row) {
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue
index 7b3027469a..09da110879 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue
@@ -61,9 +61,10 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column width="50" type="selection" align="center"/>
             <el-table-column fixed label="序号" width="60" type="index" :index="indexMethod" align="center"/>
-            <el-table-column fixed label="操作" width="100" align="center">
+            <el-table-column fixed label="操作" width="180" align="center">
               <template slot-scope="scope">
-                <el-button type="primary" v-show="scope.row.printOrderBtn" size="mini" @click="handlePrint(scope.row)">下载打印</el-button>
+                <el-button type="primary" v-show="scope.row.printOrderBtn" size="mini" @click="handlePrint(scope.row)">下载订单</el-button>
+                <el-button type="primary" v-show="scope.row.showContractBtn2" size="mini" @click="handleDown(scope.row)">下载合同</el-button>
               </template>
             </el-table-column>
             <el-table-column label="分公司" align="center" width="120">
@@ -412,6 +413,28 @@ export default {
         }
       })
     },
+    handleDown(row) {
+      var xhr = new XMLHttpRequest()
+      xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + row.contractFilePath + '&outFileName=' + '合同', true)
+      xhr.setRequestHeader('token', getStorage())
+      xhr.responseType = 'blob'
+      xhr.onload = function(e) {
+        // 如果请求执行成功
+        var blob = this.response
+        var filename = '合同.pdf'
+        var a = document.createElement('a')
+        // blob.type="application/octet-stream";
+        // 创键临时url对象
+        var url = URL.createObjectURL(blob)
+        a.href = url
+        a.download = filename
+        a.click()
+        // 释放之前创建的URL对象
+        window.URL.revokeObjectURL(url)
+      }
+      // 发送请求
+      xhr.send()
+    },
     handleLook(row) {
       this.viewState = 2
       let aa = null
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue
index d3dc36f03d..ef86d89fee 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue
@@ -61,9 +61,9 @@
               <el-form-item label="车型:">
                 <el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable/>
               </el-form-item>
-<!--              <el-form-item label="采购订单编号:">-->
-<!--                <el-input v-model="listQuery.params.orderingNo" placeholder="" clearable/>-->
-<!--              </el-form-item>-->
+              <el-form-item label="车架号:">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="厂家入库日期">
                 <el-date-picker v-model="listQuery.params.priceStartDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
@@ -177,7 +177,7 @@ export default {
           vehicleType: '',
           vehicleVersion: '',
           userSid: '',
-          orderingNo: '',
+          vinNo: '',
           orgSid: '',
           priceStartDate: '',
           priceEndDate: '',
@@ -288,7 +288,7 @@ export default {
       this.listQuery.params.vehicleType = ''
       this.listQuery.params.vehicleVersion = ''
       this.listQuery.params.userSid = ''
-      this.listQuery.params.orderingNo = ''
+      this.listQuery.params.vinNo = ''
       this.listQuery.params.priceStartDate = ''
       this.listQuery.params.priceEndDate = ''
       this.listQuery.params.orgPriceStartDate = ''
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
index 211f175b0c..f4b964104f 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
@@ -365,7 +365,6 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
     }
 
     public PagerVo<FinUncollectedReceivablesDetailedVo> detailedListPageVo(PagerQuery<FinUncollectedReceivablesDetailedQuery> pq) {
-        //   Map<String, Boolean> dict = new HashMap<>();
         //==============================分页开始====================================
         FinUncollectedReceivablesDetailedQuery params = pq.getParams();
         //车架号查询
@@ -514,11 +513,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                     }
                 }
             }
-            //  dict.put(record.getContractNo() + record.getVinNo(), dict.getOrDefault(record.getContractNo() + record.getVinNo(), true) ? record.getDownload() : false);
         }
-//        for (FinUncollectedReceivablesDetailedVo record : records) {
-//            record.setDownload(dict.get(record.getContractNo() + record.getVinNo()));
-//        }
         PagerVo<FinUncollectedReceivablesDetailedVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
index 4a1cbaffa9..385890876e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java
@@ -84,7 +84,9 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             if(appOrderPriceInfoVo != null){
                 solutionsDetailsVo.setFinalPrice(appOrderPriceInfoVo.getTransactionPrice());
                 solutionsDetailsVo.setGcPrice(appOrderPriceInfoVo.getGcPrice());
-                solutionsDetailsVo.setSzPrice(appOrderPriceInfoVo.getSzPrice());
+                if(StringUtils.isNotBlank(appOrderPriceInfoVo.getSzPrice())){
+                    solutionsDetailsVo.setSzPrice(appOrderPriceInfoVo.getSzPrice());
+                }
             }
         }
         if (loanSolutions == null) {
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
index b6253c997a..3e358b2a0e 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
@@ -978,7 +978,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         if ("已办结".equals(scmApplyInbound.getNodeState())) {
             return rb.setMsg("该数据已审批通过，不允许终止");
         }
-        if (StringUtils.isNotBlank(scmApplyInbound.getTaskId())) {
+      /*  if (StringUtils.isNotBlank(scmApplyInbound.getTaskId())) {
             com.yxt.anrui.flowable.api.flowtask.FlowTaskVo flowTaskVo = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
             flowTaskVo.setTaskId(scmApplyInbound.getTaskId());
             flowTaskVo.setInstanceId(scmApplyInbound.getProcInsId());
@@ -997,7 +997,11 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             scmApplyInbound.setTaskDefKey("Event_end");
             scmApplyInbound.setCancalRemarks(cancalRemarks);
             baseMapper.updateById(scmApplyInbound);
-        }
+        }*/
+        scmApplyInbound.setNodeState("终止");
+        scmApplyInbound.setTaskDefKey("Event_end");
+        scmApplyInbound.setCancalRemarks(cancalRemarks);
+        baseMapper.updateById(scmApplyInbound);
         return rb.success();
     }
 
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
index e34cd3f368..a23c1723b9 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue
@@ -50,7 +50,7 @@
             <el-table-column fixed width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column fixed label="操作" align="center" width="220">
               <template slot-scope="scope">
-                <el-button type="primary" size="small" :disabled="scope.row.offlineDate !==''" @click="handleUpdate(scope.row)">编辑</el-button>
+                <el-button type="primary" size="small" :disabled="scope.row.offlineDate !=='' || scope.row.orderStatus == '已作废'" @click="handleUpdate(scope.row)">编辑</el-button>
                 <el-button type="danger" size="small" :disabled="scope.row.offlineDate !=='' || scope.row.orderStatus == '已作废'" @click="handleCancellation(scope.row)">作废</el-button>
                 <el-button type="primary" size="small" @click="handleLooK(scope.row)">查看</el-button>
               </template>
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java
index ec5af23ab3..8eda443202 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java
@@ -116,4 +116,8 @@ public class BusOrderSalesVo implements Vo {
     private String saler;
     @ApiModelProperty("车架号的展示")
     private String vinNo;
+    @ApiModelProperty("App合同下载路径")
+    private String contractPath;
+    @ApiModelProperty("是否显示生成合同按钮")
+    private boolean showContractBtn2;
 }