最新版本541200007

doum

3 天以前 bc09bc87234065abe7130b84c92f81f143f5f3e7

最新版本541200007

 admin/src/components/business/OperaCategoryJkLineWindow.vue

@@ -25,6 +25,7 @@
    return {
      // 表单数据
      form: {
        id:null,
        name: '',
        type: 4,
        sortnum: null,

 admin/src/components/business/OperaJkCustomerImportWindow.vue

@@ -10,6 +10,7 @@
  >
    <p class="tip-warn"><i class="el-icon-warning"></i>导入说明：<br>
      1.请先下载文件模板，并按照模板要去填写表格内容;<br>
      2.建议每次导入数据量不大于3000，可采取分批导入;<br>
    </p>
    <el-form class="demo-form-inline" >
      <el-form-item label="客户信息" required>

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketch.java

@@ -61,6 +61,9 @@
    @ApiModelProperty(value = "当前线路数", example = "1")
    //@ExcelColumn(name="主线路编码（关联category)")
    private Integer lineNum;
    @ApiModelProperty(value = "最新优化线路数", example = "1")
    //@ExcelColumn(name="主线路编码（关联category)")
    private Integer planLineNum;

    @ApiModelProperty(value = "送货量", example = "1")
    @ExcelColumn(name="送货量（条）",index = 4,width = 10)

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java

@@ -366,6 +366,7 @@
            }else{
                tModel = new JkSketch();
                tModel.setLineNum(getLineNumByOrders(orders.getCategoryId(),newOrderList));
                tModel.setPlanLineNum(tModel.getLineNum());
                tModel.setCreator(orders.getCreator());
                tModel.setCreateDate(orders.getCreateDate());
                tModel.setCategoryId(orders.getCategoryId());