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

applications/dee-mes/src/privateComponents/components/AddEquipmentPut/components/dialog.vue

@@ -208,7 +208,8 @@ export default {
             searchItems: {
               items: [{ 'fieldName': 'aircraftType.defName', operator: 'EQ', value: val }],
               operator: 'AND'
-            }
+            },
+            sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
           }
           this.$api.searchApi('AircraftSorties', params)
             .then((res) => {

applications/dee-mes/src/privateComponents/components/BatchSignEditInstorageItems/index.vue

@@ -1771,7 +1771,8 @@ export default {
               'value': this.form.airModel
             }
           ]
-        }
+        },
+        sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
       }
       this.$api.searchApi('AircraftSorties', params).then(res => {
         const SORTIES = this.formFileds[0].data.find(

applications/dee-mes/src/privateComponents/components/InStorageRecallItemCom/component/storageDetailsCreateCom.vue

@@ -1773,7 +1773,8 @@ export default {
               'value': this.form.airModel
             }
           ]
-        }
+        },
+        sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
       }
       this.$api.searchApi('AircraftSorties', params).then(res => {
         const SORTIES = this.formFileds[0].data.find(

applications/dee-mes/src/privateComponents/components/PurchasingWarehousingNewOrEdit/component/storageDetailsCreateCom.vue

@@ -1772,7 +1772,8 @@ export default {
               'value': this.form.airModel
             }
           ]
-        }
+        },
+        sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
       }
       this.$api.searchApi('AircraftSorties', params).then(res => {
         const SORTIES = this.formFileds[0].data.find(

applications/dee-mes/src/privateComponents/components/SearchSorties/index.vue

@@ -116,7 +116,7 @@ export default {
     },
     getSortiesList() {
       this.sortiesData = []
-      const params = { 'searchItems': { 'items': [] }, 'sortItem': [{ 'fieldName': 'modifyTime', 'sortOrder': 'asc' }] }
+      const params = { 'searchItems': { 'items': [] }, 'sortItem': [{ 'fieldName': 'defCode', 'sortOrder': 'asc' }] }
       this.$api.searchApi('AircraftSorties', params).then(res => {
         if (res.items && res.items.content) {
           this.sortiesData = res.items.content.map(row => {

applications/dee-mes/src/privateComponents/components/SortiesNameSelect/index.vue

@@ -105,7 +105,8 @@ export default {
           searchItems: {
             items: [{ 'fieldName': 'aircraftType.defName', operator: 'EQ', value: val }],
             operator: 'AND'
-          }
+          },
+          sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
         }
         this.$api.searchApi('AircraftSorties', params).then(res => {
           this.options = res.items.content.map(row => {

applications/dee-mes/src/privateComponents/components/SortiesSelect/index.vue

@@ -97,7 +97,8 @@ export default {
           searchItems: {
             items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: val }],
             operator: 'AND'
-          }
+          },
+          sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
         }
         this.$api.searchApi('AircraftSorties', params).then(res => {
           this.options = res.items.content.map(row => {

applications/dee-mes/src/privateComponents/components/StationSelect/index.vue

@@ -102,7 +102,8 @@ export default {
               }
             ]
           }
-        ]
+        ],
+        sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
       }
       this.options = []
       this.loading = true

applications/dee-mes/src/privateComponents/components/StorageDetailsCreate/index.vue

@@ -655,7 +655,8 @@ export default {
               'value': this.form.airModel
             }
           ]
-        }
+        },
+        sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
       }
       this.$api.searchApi('AircraftSorties', params).then(res => {
         const SORTIES = this.formFileds[0].data.find(

applications/dee-mes/src/privateComponents/components/getSortiesSelect/index.vue

@@ -102,7 +102,8 @@ export default {
         searchItems: {
           items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: val.split('+')[0] }],
           operator: 'AND'
-        }
+        },
+        sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
       }
       this.$api.searchApi('AircraftSorties', params).then(res => {
         this.options = res.items.content.map(row => {

applications/dee-mes/src/views/assemblyPlanManagement/assemblyPlanMaintenance/search.vue

@@ -235,7 +235,7 @@ export default {
         this.sortiesData = []
         this.sorties = null
       }
-      const params = { 'searchItems': { 'items': [{ 'fieldName': 'aircraftTypeId', 'operator': 'EQ', 'value': this.form.model }] }, 'sortItem': [{ 'fieldName': 'modifyTime', 'sortOrder': 'asc' }] }
+      const params = { 'searchItems': { 'items': [{ 'fieldName': 'aircraftTypeId', 'operator': 'EQ', 'value': this.form.model }] }, sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }] }
       params.openProps = [{ name: 'aircraftType' }]
       this.$api.searchApi('AircraftSorties', params)
         .then((res) => {

applications/dee-mes/src/views/assemblyPlanManagement/inspectionDispatch/index.vue

@@ -341,12 +341,7 @@ export default {
           'operator': 'AND'
         },
         'openProps': [],
-        'sortItem': [
-          {
-            'fieldName': 'modifyTime',
-            'sortOrder': 'desc'
-          }
-        ],
+        sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }],
         'toValidateKeys': ''
       }
       this.$api.searchApi('AircraftSorties', params).then(res => {

applications/dee-mes/src/views/assemblyPlanManagement/instructionsDispatch/index.vue

@@ -424,12 +424,7 @@ export default {
           'operator': 'AND'
         },
         'openProps': [],
-        'sortItem': [
-          {
-            'fieldName': 'modifyTime',
-            'sortOrder': 'desc'
-          }
-        ],
+        sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }],
         'toValidateKeys': ''
       }
       this.$api.searchApi('AircraftSorties', params).then(res => {

applications/dee-mes/src/views/assemblyPlanManagement/instructionsIssued/index1.vue

@@ -323,8 +323,8 @@ export default {
         ],
         'sortItem': [
           {
-            'fieldName': 'modifyTime',
-            'sortOrder': 'desc'
+            'fieldName': 'defCode',
+            'sortOrder': 'asc'
           }
         ],
         'toValidateKeys': ''

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

@@ -135,7 +135,7 @@ export default {
   methods: {
     getSortiesList() {
       this.sortiesData = []
-      const params = { 'searchItems': { 'items': [{ 'fieldName': 'aircraftTypeId', 'operator': 'EQ', 'value': this.form.model }] }, 'sortItem': [{ 'fieldName': 'modifyTime', 'sortOrder': 'asc' }] }
+      const params = { 'searchItems': { 'items': [{ 'fieldName': 'aircraftTypeId', 'operator': 'EQ', 'value': this.form.model }] }, sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }] }
       params.openProps = [{ name: 'aircraftType' }]
       this.$api.searchApi('AircraftSorties', params).then(res => {
         if (res.items && res.items.content) {

applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue

@@ -53,6 +53,9 @@
                   <div v-show="!item.isOK" class="upgrade">
                     升版中
                   </div>
+                  <div v-show="item.isGaceUpgrade" class="upgrade">
+                    GACE升版中
+                  </div>
                 </div>
                 <div>
                   <div>
@@ -379,6 +382,7 @@ export default {
                 isQualified: p.isQualified,
                 isExit: p.isExit,
                 isOK: p.planVer === p.extProcessPlan.gaceVersion,
+                isGaceUpgrade: p.extProcessPlan.upgrade,
                 // // 例外放行
                 isException: p.isException,
                 // 转序

applications/dee-mes/src/views/taskReception/components/taskReceiveTable/index.vue

@@ -142,7 +142,8 @@ export default {
         searchItems: {
           items: [{ 'fieldName': 'aircraftTypeId', operator: 'EQ', value: this.model }],
           operator: 'AND'
-        }
+        },
+        sortItem: [{ fieldName: 'defCode', sortOrder: 'asc' }]
       }
       this.$api.searchApi('AircraftSorties', param).then((res) => {
         this.sortiesData = []

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/instructionIdentificationBatch/components/right/index.vue

@@ -551,15 +551,15 @@ export default {
        */
     handleExport() {
       const params = {
-        pageFrom: this.tablePagination.currentPage,
-        pageSize: this.tablePagination.pageSize,
+        // pageFrom: this.tablePagination.currentPage,
+        // pageSize: this.tablePagination.pageSize,
         searchItems: {
           items: [
-            {
-              fieldName: 'sorties',
-              operator: 'EQ',
-              value: this.nodeData.serialNo
-            }
+            // {
+            //   fieldName: 'sorties',
+            //   operator: 'EQ',
+            //   value: this.nodeData.serialNo
+            // }
           ],
           operator: 'AND'
         },
@@ -579,7 +579,7 @@ export default {
             value: this.nodeData.title
           })
       }
-      const downloadTitle = '单架次指令标识-' + this.nodeData.title + '.xlsx'
+      const downloadTitle = '单架次指令标识' + '.xlsx'
       downloadFile(`ExtProcessPlan/download/excel?taskDefinitionKey=${this.$route.query.taskDefinitionKey}`, 'post', params).then(res => {
         this.$utils.downLoadFile(res, downloadTitle)
       })