Merge remote-tracking branch 'origin/V0.0.7' into V0.0.7

src/views/core/accessPlan/index.vue

@@ -434,14 +434,14 @@
         <el-form-item
           v-show="form.orgType"
           label="调阅机构"
-          prop="planExecOrgIdList"
-        >
+          prop="planExecOrgIdList">
         <org-tree-select
             v-model="form.planExecOrgIdList"
             :queryData="form.orgType"
             ref="orgTreeSelect"
             checkShow="true"  
-            :enabledCheckOrgTypes="parseInt(form.orgType)"                
+            :enabledCheckOrgTypes="parseInt(form.orgType)"
+            :disabled="form.isComplete"                
           >
           </org-tree-select>
         </el-form-item>

src/views/core/outIn/outInLog/index.vue

@@ -178,8 +178,8 @@
               align="center"
               width="420"
             >
-              <template slot-scope="scope">
-                <span
+              <template v-if="scope.row.arrivalTime || scope.row.departureTime" slot-scope="scope">
+                <span v-if="scope.row.arrivalTime"
                 >{{
                     dayjs(scope.row.arrivalTime).format(
                       "YYYY年MM月DD日HH时mm分"