Merge branch 'sit' into dev

src/views/sellOut/returnOrder/detail.vue

@@ -35,7 +35,15 @@
                 </template>
               </show-data-table>
             </el-collapse-item>
-            <el-collapse-item title="退货验收记录" name="0">
+            <el-collapse-item
+              title="退货验收记录"
+              name="0"
+              v-if="
+                newTime !== '' &&
+                sitem &&
+                !(sitem.order_type === '1' || sitem.order_type === '5')
+              "
+            >
               <!----047--->
               <return-record
                 :sitem="sitem"
@@ -48,7 +56,11 @@
             <el-collapse-item
               title="退货验收审核"
               name="1"
-              v-if="status == '2' || status == '3' || status == '4'"
+              v-if="status == '2' || status == '3' || status == '4'&&
+                newTime !== '' &&
+                sitem &&
+                !(sitem.order_type === '1' || sitem.order_type === '5')"
+              
             >
               <!----042--->
               <return-check
@@ -61,7 +73,10 @@
             <el-collapse-item
               title="业务审核"
               name="2"
-              v-if="status == '3' || status == '4'"
+              v-if="status == '3' || status == '4'&&
+                newTime !== '' &&
+                sitem &&
+                !(sitem.order_type === '1' || sitem.order_type === '5')"
             >
               <!----043--->
               <audit-form
@@ -154,7 +169,7 @@ export default {
   },
   mounted() {
     this.queryId = this.$route.query.id;
-    
+
     this.initData();
   },
   methods: {
@@ -200,7 +215,7 @@ export default {
         });
     },
     async initData() {
-      this.newTime=""
+      this.newTime = "";
       let model = {
         thNo: this.queryId,
       };

src/views/sellOut/zixunOrder/components/editForm.vue

@@ -1040,6 +1040,11 @@ export default {
             this.loading = false;
             return;
           }
+          if (new Date(endtime).getTime() <= new Date().getTime()) {
+            this.$message.warning("竞价截止时间应该大于当前时间！");
+            this.loading = false;
+            return;
+          }
           model.khNo = model.khNo.toString();
           // model.platform_code = model.platform_code.toString();
           model.projectNo = model.projectNo.toString();