From b369087c656b4b88ea10c85bb139bf747ea13644 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 17 Nov 2018 10:21:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=87=87=E8=B4=AD=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=EF=BC=9Areload=E5=88=B7=E6=96=B0=E9=A1=B5=EF=BC=9Brea?=
 =?UTF-8?q?donly=E5=90=88=E5=90=8C=E6=80=BB=E9=A2=9D=EF=BC=9B=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E8=A7=84=E5=AE=9A=E5=88=B0=E8=B4=A7=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 22 +++++++++++++++++--
 .../PurchasingCenter/CreateContract/index.vue | 10 ++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 721d3a32..cb46977e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,11 +1,29 @@
 <template>
   <div id="app">
-    <router-view/>
+    <router-view v-if="isRouterAlive"/>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'App'
+  name: 'App',
+  provide() {
+    return {
+      reload: this.reload
+    }
+  },
+  data() {
+    return {
+      isRouterAlive: true
+    }
+  },
+  methods: {
+    reload() {
+      this.isRouterAlive = false
+      this.$nextTick(function() {
+        this.isRouterAlive = true
+      })
+    }
+  }
 }
 </script>
diff --git a/src/views/PurchasingCenter/CreateContract/index.vue b/src/views/PurchasingCenter/CreateContract/index.vue
index 8edbfa7b..5c85a1a3 100644
--- a/src/views/PurchasingCenter/CreateContract/index.vue
+++ b/src/views/PurchasingCenter/CreateContract/index.vue
@@ -186,7 +186,7 @@
         style="margin-top:10px"
         @click="calculateContractSum">计算合同总额</el-button>
       <span>合同总额:</span>
-      <el-input v-model="contractSum" size="small"/>
+      <el-input v-model="contractSum" size="small" readonly/>
     </el-card>
 
     <el-card>
@@ -237,10 +237,10 @@ export default {
       searchView: '',
       fileList: [],
       minDate: null,
-      endDateOpt: { // 为了让规定到货时间早于物料计划到货时间
+      endDateOpt: { // 禁用大于规定到货日期和小于当前日期
         disabledDate: (time) => {
           if (this.minDate) {
-            return time.getTime() > this.minDate
+            return time.getTime() > this.minDate || time.getTime() < new Date()
           }
         }
       },
@@ -262,8 +262,8 @@ export default {
       payTime5Value: '', // 付款时间
       payTime6Value: '', // 付款时间
       freight: '', // 运费
-      taxRate: '', // 税率
-      currencyValue: '', // 币种
+      taxRate: '0.17', // 税率
+      currencyValue: 1, // 币种
       currency: [
         {
           label: '人民币',