Merge remote-tracking branch 'origin/happywork_front1.1.1' into happywork_front1.1.1

src/views/ordermanager/modules/HwOrderModal.vue

@@ -53,7 +53,7 @@
               </div>
             <!--</template>-->
           </detail-list-item>
-          <detail-list-item term="转包合同">
+          <detail-list-item term="转包合同" v-if="model.hwRequirement.subcontractType != null">
             {{model.hwRequirement.subcontractType == 0?'线上合同':'线下合同'}}
             <!--<template v-if="model.hwRequirement.subcontractType == 0">-->
               <div class="text" style="margin-top: 10px;">