Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/dee-mes/src/privateComponents/components/JobResponseInTestProcess/component/materialCheckNo.vue

@@ -14,10 +14,13 @@
           trigger="click"
         >
           <upload-files ref="chemical" v-model="form.chemicalObjFileLinks" :view-or-edit="'view'" />
-          <el-button slot="reference">查看附件</el-button>
+          <el-button slot="reference" size="medium" type="primary">查看附件</el-button>
         </el-popover>
       </div>
-      <dee-tools :tools="tools" mode="normal" style="flex-direction: row-reverse;margin-bottom: 12px;" />
+      <div class="right-button">
+        <el-button type="primary" size="medium" @click="savePDF">下载</el-button>
+      </div>
+      <!-- <dee-tools :tools="tools" mode="normal" style="flex-direction: row-reverse;margin-bottom: 12px;" /> -->
     </div>
     <el-form ref="form" :model="form" class="checkNo-container" :rules="formRules">
       <el-col :span="6">
@@ -979,8 +982,14 @@ export default {
 .material-checkNo {
   .head{
     display: flex;
-    justify-content: flex-end;
+    justify-content: flex-start;
     align-items: center;
+    .right-button {
+      margin-left:10px;
+    }
+  }
+  .link-to-page-dialog-box{
+    max-height: 100%;
   }
   // .el-select {
   //   width: 220px

applications/dee-mes/src/views/assemblyPlanManagement/stationPlanMaintenance/stationPlanList.vue

@@ -205,7 +205,12 @@ export default {
         .searchApi('AircraftSorties', params)
         .then((res) => {
           this.sortiesData = []
-          if (res) {
+          if (res.items && res.items.content) {
+            res.items.content.map((item, index) => {
+              if (item.defCode === 'NA') {
+                res.items.content.unshift(res.items.content.splice(index, 1)[0])
+              }
+            })
             this.sortiesData = res.items.content.map((row) => {
               return {
                 value: row.id,