Merge branch 'hhl' of SH-Arbitrate/Arbitrate-Frontend into dev

src/views/awardManagement/components/MailawardDialog.vue

@@ -59,7 +59,7 @@
             />
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <!-- <el-col :span="24">
           <el-form-item
             label="申请人快递单号："
             prop="apptrackingNum"
@@ -80,7 +80,7 @@
               placeholder="请输入快递单号"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>

src/views/caseFiling/components/archiveDetailsDialog.vue

@@ -13,9 +13,9 @@
           <el-tab-pane label="案件日志" name="second">
             <caselogInfo :caselogDataArr="caseLog"></caselogInfo>
           </el-tab-pane>
-          <el-tab-pane label="快递信息" name="third">
+          <!-- <el-tab-pane label="快递信息" name="third" v-if="false">
             <expressDeliveryInfo :deliveryDataArr="detailform"></expressDeliveryInfo>
-          </el-tab-pane>
+          </el-tab-pane> -->
           <!-- <el-tab-pane label="案件视频" name="fourth"> -->
             <!-- <div @click="getVideo">chakanshipin</div> -->
             <!-- <el-empty description="暂无视频" v-if="!videoFlag"></el-empty>