Merge remote-tracking branch 'origin/master'

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

@@ -2677,6 +2677,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             ResultBean<List<String>> busList = busSalesOrderFeign.selectBusinessSid(params.getUserSid(), params.getOrgPath());
             if (!busList.getData().isEmpty()) {
                 qw.in("busSid", busList.getData());
+            }else{
+                IPage<ContractPageVo> page = PagerUtil.queryToPage(query);
+                page.setRecords(new ArrayList<>());
+                return page;
             }
             if (StringUtils.isNotBlank(params.getName())) {
                 qw.and(wrapper -> wrapper.like("partyB", params.getName()).or().like("contractNo", params.getName()));

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -86,7 +86,7 @@ public interface BusSalesOrderVehicleFeign {
     @PostMapping("/appVehicleQKKPList")
     ResultBean<List<BusVehicleQKKPVo>> appVehicleQKKPList(@RequestBody BusVehicleQKKPQuery query);
 
-    @ApiOperation("欠款提车选择车辆")
+    @ApiOperation("移动端欠款提车选择车辆")
     @PostMapping("/getCanUseCars")
     ResultBean<List<QCarVo>> getCanUseCars(@RequestBody QCarQuery query);
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/QCarVo.java

@@ -18,7 +18,7 @@ import java.util.List;
 @Data
 public class QCarVo implements Vo {
     private static final long serialVersionUID = 4862519509571252488L;
-
+    //pc端使用以下
     @ApiModelProperty("车辆sid")
     private String carSid;
     @ApiModelProperty("车架号")

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -769,30 +769,39 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             //生成总经理担保书
             zjlLetterDownloadUrl = zjlLetterDownloadUrl(dto, map);
             //生成股东会对外担保决议
-            gdLetterDownloadUrl = gdLetterDownloadUrl();*/
+            gdLetterDownloadUrl = gdLetterDownloadUrl(dto, map);*/
             PdfVo pdfVo = new PdfVo();
-            pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
-            pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
-            pdfVo.setDownUrl(carContractDownloadUrl);
-            list.add(pdfVo);
-
-            pdfVo = new PdfVo();
-            pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
-            pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
-            pdfVo.setDownUrl(gdLetterDownloadUrl);
-            list.add(pdfVo);
-
-            pdfVo = new PdfVo();
-            pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
-            pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
-            pdfVo.setDownUrl(zjlLetterDownloadUrl);
-            list.add(pdfVo);
-
-            pdfVo = new PdfVo();
-            pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
-            pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
-            pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
-            list.add(pdfVo);
+            if(StringUtils.isNotBlank(carContractDownloadUrl)){
+                pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
+                pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
+                pdfVo.setDownUrl(carContractDownloadUrl);
+                list.add(pdfVo);
+            }
+
+            if(StringUtils.isNotBlank(gdLetterDownloadUrl)){
+                pdfVo = new PdfVo();
+                pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
+                pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
+                pdfVo.setDownUrl(gdLetterDownloadUrl);
+                list.add(pdfVo);
+            }
+
+            if(StringUtils.isNotBlank(zjlLetterDownloadUrl)){
+                pdfVo = new PdfVo();
+                pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
+                pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
+                pdfVo.setDownUrl(zjlLetterDownloadUrl);
+                list.add(pdfVo);
+            }
+
+            if(StringUtils.isNotBlank(guaranteeLetterDownloadUrl)){
+                pdfVo = new PdfVo();
+                pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
+                pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
+                pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
+                list.add(pdfVo);
+            }
+
 
 
         } else {
@@ -838,28 +847,36 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             }
             //新车买卖合同（欠款）
             PdfVo pdfVo = new PdfVo();
-            pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
-            pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
-            pdfVo.setDownUrl(carContractDownloadUrl);
-            list.add(pdfVo);
-            //股东会对外担保决议
-            pdfVo = new PdfVo();
-            pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
-            pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
-            pdfVo.setDownUrl(gdLetterDownloadUrl);
-            list.add(pdfVo);
-            //总经理担保书
-            pdfVo = new PdfVo();
-            pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
-            pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
-            pdfVo.setDownUrl(zjlLetterDownloadUrl);
-            list.add(pdfVo);
-            //欠款提车担保承诺书
-            pdfVo = new PdfVo();
-            pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
-            pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
-            pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
-            list.add(pdfVo);
+            if (StringUtils.isNotBlank(carContractDownloadUrl)) {
+                pdfVo.setType(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getAttachType());
+                pdfVo.setName(BuscenterFileEnum.CARCONTRACT_DOWNLOADURL.getMark());
+                pdfVo.setDownUrl(carContractDownloadUrl);
+                list.add(pdfVo);
+            }
+            if (StringUtils.isNotBlank(gdLetterDownloadUrl)) {
+                //股东会对外担保决议
+                pdfVo = new PdfVo();
+                pdfVo.setType(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getAttachType());
+                pdfVo.setName(BuscenterFileEnum.GDLETTER_DOWNLOADURL.getMark());
+                pdfVo.setDownUrl(gdLetterDownloadUrl);
+                list.add(pdfVo);
+            }
+            if(StringUtils.isNotBlank(zjlLetterDownloadUrl)){
+                //总经理担保书
+                pdfVo = new PdfVo();
+                pdfVo.setType(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getAttachType());
+                pdfVo.setName(BuscenterFileEnum.ZJLLETTER_DOWNLOADURL.getMark());
+                pdfVo.setDownUrl(zjlLetterDownloadUrl);
+                list.add(pdfVo);
+            }
+            if(StringUtils.isNotBlank(guaranteeLetterDownloadUrl)){
+                //欠款提车担保承诺书
+                pdfVo = new PdfVo();
+                pdfVo.setType(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getAttachType());
+                pdfVo.setName(BuscenterFileEnum.GUARANTEELETTER_DOWNLOADURL.getMark());
+                pdfVo.setDownUrl(guaranteeLetterDownloadUrl);
+                list.add(pdfVo);
+            }
         }
         createPdfVo.setChange(isChange);
         createPdfVo.setFileList(list);
@@ -934,10 +951,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
      *
      * @return
      */
-    public String gdLetterDownloadUrl() {
+    public String gdLetterDownloadUrl(AppArrearsCarryDto dto, Map<String, Object> map) {
         String url = "";
-        Map<String, Object> map = new HashMap<>();
-        String ftl = "gd";
+        String ftl = "gd2";
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
@@ -994,6 +1010,8 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
         //购买车辆
         map.put("num", vinList.size());
         map.put("contractNo", dto.getContractId());
+        map.put("contractName","《车辆买卖合同》");
+        map.put("customerName",name);
 
         String commitmentMoneyDate = dto.getCommitmentMoneyDate();
         List<String> stringLists = Arrays.asList(commitmentMoneyDate.split("-"));
@@ -1232,9 +1250,9 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
             } else {
                 map.put("wMoney", wMoneyAll.toString());
             }
-            if(StringUtils.isNotBlank(subscribtAllResultBean.getData())){
+            if (StringUtils.isNotBlank(subscribtAllResultBean.getData())) {
                 map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(subscribtAllResultBean.getData()).doubleValue())));
-            }else{
+            } else {
                 map.put("DyMoney", TransformMoney.transform(TransformMoney.getDecimalStr(Double.valueOf(String.valueOf(BigDecimal.ZERO)).doubleValue())));
             }
 
@@ -1252,6 +1270,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(), appOrderDetailsVo.getPurchaseSystemSid());
                 if (invoicingDetailsVoResultBean.getData() != null) {
                     map.put("orgName", invoicingDetailsVoResultBean.getData().getName());
+                    map.put("useOrgName",invoicingDetailsVoResultBean.getData().getName());
                 }
             }
             map.put("mobile", appOrderDetailsVo.getPhone());
@@ -1845,7 +1864,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                         busDeliveredDto.setContractNo(busArrearsCarryVehicleApply.getContractNo());
                         busDeliveredDto.setName(busArrearsCarryVehicleApply.getCustomerName());
                         AppOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderService.getSaleOrderDetailsByContractNo(busArrearsCarryVehicleApply.getContractNo()).getData();
-                        if(busSalesOrderDetailsVo != null){
+                        if (busSalesOrderDetailsVo != null) {
                             AppOrderPriceInfoVo priceInfoVo = busSalesOrderDetailsVo.getPriceInfo();
                             busDeliveredDto.setPrice(priceInfoVo.getSingleFinalPrice());
                             AppOrderModelInfoVo appOrderModelInfoVo = busSalesOrderDetailsVo.getModelInfo();
@@ -1858,7 +1877,7 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                             busDeliveredDto.setUseOrgName(sysOrganizationVoResultBean.getData().getName());
                         }
                         //根据合同和车辆sid查询销售订单车辆sid
-                        BusSalesOrderVehicle busSaleOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busArrearsCarryVehicleApply.getContractNo(),vehicleDetailsVo.getVinSid());
+                        BusSalesOrderVehicle busSaleOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busArrearsCarryVehicleApply.getContractNo(), vehicleDetailsVo.getVinSid());
                         busDeliveredDto.setBusVinSid(busSaleOrderVehicle.getSid());
                         busDeliveredService.saveOrUpdateDto(busDeliveredDto);
                     }
@@ -2269,13 +2288,13 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr
                 busArrearsCarryVehicleApply.setZjlLetterFile(zjlLetterImages);
             }
         }
-        if("Activity_0ynxtyz".equals(query.getTaskDefKey())){
+        if ("Activity_0ynxtyz".equals(query.getTaskDefKey())) {
             //销售经理信审截图
             if (fileList.isEmpty()) {
                 return rb.setMsg("请上传其他附件");
             }
         }
-        if(!fileList.isEmpty()){
+        if (!fileList.isEmpty()) {
             String fileLists = String.join(",", fileList).replaceAll(fileUploadComponent.getUrlPrefix(), "");
             busArrearsCarryVehicleApply.setOtherFile(fileLists);
         }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -1474,6 +1474,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     }
                 }
             }
+        }else{
+            return rb.setMsg("请选择要出库的车辆");
         }
 
         BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -398,11 +398,12 @@
     </select>
 
     <select id="selectBusinessSid" resultType="java.lang.String">
-        select bo.sid
+        select distinct bo.sid
         from bus_sales_order bo
         left join bus_sales_order_vehicle bv on bv.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment} and bo.createBySid = #{userSid} and bo.useOrgSid = #{useOrgSid} and bo.nodeState = '已办结' and bo.financePlan = '2'
+            and length(bv.linkSid)>0
         </where>
     </select>
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -401,6 +401,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 ResultBean<String> stringResultBean = finSelectedReceivablesDetailedFeign.selectByBusVinSid(qCarVo.getBusVinSid());
                 if (stringResultBean.getData() != null) {
                     adCarListVo.setSubscribedAll(stringResultBean.getData());
+                    qCarVo.setSubscribedAll(stringResultBean.getData());
                 }
                 List<GCarListVo> gcList = new ArrayList<>();
                 ResultBean<TraliveredVo> voResultBean = baseTrailerFeign.trailerList(qCarVo.getCarSid(), qCarVo.getContractNo());

anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqing.vue

@@ -108,30 +108,32 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="title">挂车信息</div>
-          <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="成交价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.price }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="平台已收款" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.subscribedAll }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
+            <div class="title">挂车信息</div>
+            <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="成交价" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="平台已收款" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.subscribedAll }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>欠款提车原因</div>
@@ -243,9 +245,15 @@ export default {
   data() {
     return {
       pickerOptions: {
-        disabledDate(time) {
-          var oneDay = 3600 * 1000 * 24 * 11
-          return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay
+        disabledDate: (time) => {
+          // 设置可选择的日期为今天之后的一个月内
+          const curDate = (new Date()).getTime()
+          // 这里算出一个月的毫秒数,
+          // 这里使用30的平均值,实际中应根据具体的每个月有多少天计算
+          const day = 10 * 24 * 3600 * 1000
+          const dateRegion = curDate + day
+          return time.getTime() < Date.now() - 8.64e7 ||
+            time.getTime() > dateRegion
         }
       },
       viewTitle: '',

anrui-buscenter/anrui-buscenter-ui/src/views/teshushenpi/qiankuanticheguanli/qiankuanticheshenqingInfo.vue

@@ -93,30 +93,32 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="title">挂车信息</div>
-          <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="成交价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.price }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="平台已收款" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.subscribedAll }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
+            <div class="title">挂车信息</div>
+            <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="成交价" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="平台已收款" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.subscribedAll }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>欠款提车原因</div>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo.vue

@@ -95,30 +95,32 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="title">挂车信息</div>
-          <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="成交价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.price }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="平台已收款" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.subscribedAll }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
+            <div class="title">挂车信息</div>
+            <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="成交价" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="平台已收款" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.subscribedAll }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>欠款提车原因</div>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue

@@ -95,30 +95,32 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="title">挂车信息</div>
-          <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="成交价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.price }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="平台已收款" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.subscribedAll }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
+            <div class="title">挂车信息</div>
+            <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="成交价" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="平台已收款" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.subscribedAll }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>欠款提车原因</div>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue

@@ -95,30 +95,32 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="title">挂车信息</div>
-          <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="成交价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.price }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="平台已收款" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.subscribedAll }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
+            <div class="title">挂车信息</div>
+            <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="成交价" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="平台已收款" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.subscribedAll }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>欠款提车原因</div>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo.vue

@@ -95,30 +95,32 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="title">挂车信息</div>
-          <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="成交价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.price }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="平台已收款" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.subscribedAll }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
+            <div class="title">挂车信息</div>
+            <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="成交价" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="平台已收款" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.subscribedAll }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>欠款提车原因</div>

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheEdit.vue

@@ -107,30 +107,32 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="title">挂车信息</div>
-          <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="成交价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.price }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="平台已收款" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.subscribedAll }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
+            <div class="title">挂车信息</div>
+            <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="成交价" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="平台已收款" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.subscribedAll }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>欠款提车原因</div>
@@ -242,9 +244,15 @@ export default {
   data() {
     return {
       pickerOptions: {
-        disabledDate(time) {
-          var oneDay = 3600 * 1000 * 24 * 11
-          return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay
+        disabledDate: (time) => {
+          // 设置可选择的日期为今天之后的一个月内
+          const curDate = (new Date()).getTime()
+          // 这里算出一个月的毫秒数,
+          // 这里使用30的平均值,实际中应根据具体的每个月有多少天计算
+          const day = 10 * 24 * 3600 * 1000
+          const dateRegion = curDate + day
+          return time.getTime() < Date.now() - 8.64e7 ||
+            time.getTime() > dateRegion
         }
       },
       viewTitle: '',

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo.vue

@@ -93,30 +93,32 @@
               </template>
             </el-table-column>
           </el-table>
-          <div class="title">挂车信息</div>
-          <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
-            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="主车车架号" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="成交价" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.price }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="平台已收款" align="center">
-              <template slot-scope="scope">
-                <span>{{ scope.row.subscribedAll }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
+          <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
+            <div class="title">挂车信息</div>
+            <el-table :key="billingKey" :data="formobj.trailersList" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="成交价" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.price }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="平台已收款" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.subscribedAll }}</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>欠款提车原因</div>