conflict

2019-06-14 08:18:40 +08:00
parent a374ea5c8d 8b9c1033da
commit a6082d08cc
22 changed files with 855 additions and 136 deletions
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -413,9 +413,9 @@ export default {
        case '模板2':
          this.demo2()
          break
-        // case '自定义':
-        //   this.customization()
-        //   break
+          // case '自定义':
+          //   this.customization()
+          //   break
      }
    },
    demo1() { // 选择合同模板1