Merge branch 'new' of http://192.168.2.236:10080/zhouna/preliminary into new

src/components/DetailBox.vue

@@ -23,7 +23,7 @@
       </div>
     </div>
     <!-- <div :class="['foot',{'noCheck':!checkF}]" @click="complete">完成</div> -->
-    <div :class="['foot',{'noCheck':!reqFinish}]" @click="complete">完成</div>
+    <div :class="['foot',{'noCheck':!checkF || !reqFinish}]" @click="complete">完成</div>
     <Toast :message="clearTxt" 
           :show="showToast"
           @comfirn="comfirnDel" 
@@ -100,7 +100,7 @@
       //有选中内容才可以点完成#1919
         // if(this.checkF){
       //必填项都填完了才可以点完成
-        if(this.reqFinish){
+        if(this.reqFinish && this.checkF){
           this.$refs.detail.saveData();
           this.$store.commit('setSearchShow', false);
         }