Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

klp-crm/src/main/java/com/klp/crm/domain/CrmCustomer.java

@@ -23,7 +23,7 @@ public class CrmCustomer extends BaseEntity {
      * 客户ID（主键）
      */
     @TableId(value = "customer_id")
-    private String customerId;
+    private Long customerId;
     /**
      * 客户统一编码
      */

klp-crm/src/main/java/com/klp/crm/domain/bo/CrmCustomerBo.java

@@ -20,7 +20,7 @@ public class CrmCustomerBo extends BaseEntity {
     /**
      * 客户ID（主键）
      */
-    private String customerId;
+    private Long customerId;
 
     /**
      * 客户统一编码

klp-crm/src/main/java/com/klp/crm/domain/vo/CrmCustomerVo.java

@@ -24,7 +24,7 @@ public class CrmCustomerVo {
      */
     @ExcelProperty(value = "客户ID", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "主=键")
-    private String customerId;
+    private Long customerId;
 
     /**
      * 客户统一编码

klp-ui/src/views/crm/preOrder/index.vue

@@ -94,18 +94,21 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
+            v-if="scope.row.orderType === 0"
             size="mini"
             type="text"
             icon="el-icon-check"
             @click.stop="handleApprove(scope.row)"
           >审批</el-button>
           <el-button
+            v-if="scope.row.orderType === 0"
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click.stop="handleUpdate(scope.row)"
           >修改</el-button>
           <el-button
+            v-if="scope.row.orderType === 0"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -269,7 +272,7 @@ export default {
           this.getList();
         }).finally(() => {
           this.loading = false;
-        }); 
+        });
       });
     },
     // 表单重置