架次修改

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

@@ -305,23 +305,33 @@ export default {
           resize: true
         },
         {
-          name: 'start_date',
+          name: 'scheduledStart',
           label: '计划开工时间',
           align: 'center',
           width: 120,
           resize: true,
           template: function(obj) {
-            return that.formatDate(obj.start_date)
+            return that.formatDate(obj.scheduledStart)
           }
         },
+        // {
+        //   name: 'start_date',
+        //   label: '计划开工时间',
+        //   align: 'center',
+        //   width: 120,
+        //   resize: true,
+        //   template: function(obj) {
+        //     return that.formatDate(obj.start_date)
+        //   }
+        // },
         {
-          name: 'end_date',
+          name: 'scheduledEnd',
           label: '计划完工时间',
           align: 'center',
           width: 120,
           resize: true,
           template: function(obj) {
-            return that.formatDate(obj.end_date)
+            return that.formatDate(obj.scheduledEnd)
           }
         },
         {
@@ -367,10 +377,10 @@ export default {
     },
     // 获取甘特图数据
     getAllData(val) {
-      const sortiesId = val.sorties.split(':')[0]
-      const sortiesTypeId = val.sorties.split(':').slice(-1)[0]
+      const sortiesId = val.sorties
+      // const sortiesTypeId = val.sorties.split(':').slice(-1)[0]
       const params = {
-        'searchItems': { 'items': [{ 'fieldName': 'aircraftSortiesId', 'operator': 'EQ', 'value': sortiesId }, { 'fieldName': 'soritesTypeId', 'operator': 'EQ', 'value': sortiesTypeId }] },
+        'searchItems': { 'items': [{ 'fieldName': 'aircraftSortiesId', 'operator': 'EQ', 'value': sortiesId }] },
         'openProps': [
           {
             'name': 'extProcessExecutorRoutes'
@@ -449,7 +459,7 @@ export default {
       }
     },
     addAO(m, p, params) {
-      if (p.target) {
+      if (p.target && p.target.wrProduction) {
         params.data.push(this.toAO(m, p.target))
       }
     },
@@ -463,6 +473,8 @@ export default {
         type: 'project',
         id: p.id,
         start_date: p.extPositionPlans[0].scheduledStart,
+        scheduledStart: p.extPositionPlans[0].scheduledStart,
+        scheduledEnd: p.extPositionPlans[0].scheduledEnd,
         text: p.serialNumber,
         right_text: p.name,
         isLeaf: true,
@@ -489,6 +501,8 @@ export default {
       return {
         id: p.id,
         start_date: p.wrProduction[0].scheduledStart,
+        scheduledStart: p.wrProduction[0].scheduledStart,
+        scheduledEnd: p.wrProduction[0].scheduledEnd,
         status: p.wrProduction[0].planState,
         text: p.serialNumber,
         parent: m.id,

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

@@ -220,16 +220,22 @@ export default {
         this.sortiesData = []
         this.sorties = null
       }
-      const params = { 'searchItems': { 'items': [{ 'fieldName': 'id', 'operator': 'NEQ', 'value': 0 }] }, 'sortItem': [{ 'fieldName': 'modifyTime', 'sortOrder': 'asc' }] }
-      params.openProps = [{ name: 'target' }, { name: 'source' }]
-      this.$api.searchApi('SoritesLink', params)
+      const params = { 'searchItems': { 'items': [{ 'fieldName': 'aircraftTypeId', 'operator': 'EQ', 'value': this.form.model }] }, 'sortItem': [{ 'fieldName': 'modifyTime', 'sortOrder': 'asc' }] }
+      params.openProps = [{ name: 'aircraftType' }]
+      this.$api.searchApi('AircraftSorties', params)
         .then((res) => {
           this.sortiesData = []
           if (res) {
+            // this.sortiesData = res.items.content.map(row => {
+            //   return {
+            //     value: `${row.sourceId}:${row.targetId}`,
+            //     label: this.getSoritesLabel(row)
+            //   }
+            // })
             this.sortiesData = res.items.content.map(row => {
               return {
-                value: `${row.sourceId}:${row.targetId}`,
-                label: this.getSoritesLabel(row)
+                value: row.id,
+                label: row.defName
               }
             })
             this.$nextTick(() => {
@@ -289,8 +295,8 @@ export default {
      * 获取项目计划
      */
     getProjectPlan() {
-      const sortiesId = this.form.sorties.split(':')[0]
-      const sortiesTypeId = this.form.sorties.split(':').slice(-1)[0]
+      const sortiesId = this.form.sorties
+      // const sortiesTypeId = this.form.sorties.split(':').slice(-1)[0]
       const param = {
         pageFrom: 1,
         pageSize: 50,
@@ -298,11 +304,11 @@ export default {
           children: [
             {
               items: [
-                {
-                  fieldName: 'soritesTypeId',
-                  operator: 'EQ',
-                  value: sortiesTypeId
-                },
+                // {
+                //   fieldName: 'soritesTypeId',
+                //   operator: 'EQ',
+                //   value: sortiesTypeId
+                // },
                 {
                   fieldName: 'aircraftSortiesId',
                   operator: 'EQ',
@@ -372,10 +378,10 @@ export default {
      * 获取站位
      */
     getStation() {
-      const sortiesId = this.form.sorties.split(':')[0]
-      const sortiesTypeId = this.form.sorties.split(':').slice(-1)[0]
+      const sortiesId = this.form.sorties
+      // const sortiesTypeId = this.form.sorties.split(':').slice(-1)[0]
       const params = {
-        'searchItems': { 'items': [{ 'fieldName': 'aircraftSortiesId', 'operator': 'EQ', 'value': sortiesId }, { 'fieldName': 'soritesTypeId', 'operator': 'EQ', 'value': sortiesTypeId }] },
+        'searchItems': { 'items': [{ 'fieldName': 'aircraftSortiesId', 'operator': 'EQ', 'value': sortiesId }] },
         'openProps': [{ name: 'extPositionPlans' }],
         'sortItem': [{ 'fieldName': 'serialNumber', 'sortOrder': 'asc' }]
       }

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

@@ -385,6 +385,8 @@ export default {
         if (res.items) {
           this.refrehGantt(res.items)
         }
+      }).catch((err) => {
+        console.log(err)
       }).finally(() => {
         this.loading = false
       })

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

@@ -135,15 +135,22 @@ export default {
   methods: {
     getSortiesList() {
       this.sortiesData = []
-      const params = { 'searchItems': { 'items': [{ 'fieldName': 'id', 'operator': 'NEQ', 'value': 0 }] }, 'sortItem': [{ 'fieldName': 'modifyTime', 'sortOrder': 'asc' }] }
-      params.openProps = [{ name: 'target' }, { name: 'source' }]
-      this.$api.searchApi('SoritesLink', params).then(res => {
+      const params = { 'searchItems': { 'items': [{ 'fieldName': 'aircraftTypeId', 'operator': 'EQ', 'value': this.form.model }] }, 'sortItem': [{ 'fieldName': 'modifyTime', 'sortOrder': 'asc' }] }
+      params.openProps = [{ name: 'aircraftType' }]
+      this.$api.searchApi('AircraftSorties', params).then(res => {
         if (res.items && res.items.content) {
+          // this.sortiesData = res.items.content.map(row => {
+          //   return {
+          //     value: `${row.sourceId}:${row.targetId}`,
+          //     label: this.getSoritesLabel(row),
+          //     defName: row.source.defName
+          //   }
+          // })
           this.sortiesData = res.items.content.map(row => {
             return {
-              value: `${row.sourceId}:${row.targetId}`,
-              label: this.getSoritesLabel(row),
-              defName: row.source.defName
+              value: row.id,
+              label: row.defName,
+              defName: row.defName
             }
           })
           this.$set(this.form, 'sorties', this.sortiesData[0].value)

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

@@ -100,10 +100,9 @@ export default {
 
   methods: {
     getStation() {
-      const sortiesId = this.sortiesId.split(':')[0]
-      const sortiesTypeId = this.sortiesId.split(':').slice(-1)[0]
+      const sortiesId = this.sortiesId
       const params = {
-        'searchItems': { 'items': [{ 'fieldName': 'aircraftSortiesId', 'operator': 'EQ', 'value': sortiesId }, { 'fieldName': 'soritesTypeId', 'operator': 'EQ', 'value': sortiesTypeId }] },
+        'searchItems': { 'items': [{ 'fieldName': 'aircraftSortiesId', 'operator': 'EQ', 'value': sortiesId }] },
         'openProps': [{ name: 'aircraftSorties' }],
         'sortItem': [{ 'fieldName': 'serialNumber', 'sortOrder': 'asc' }]
       }

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

@@ -99,7 +99,7 @@
           </dd>
         </el-popover>
         <dd @click="$parent.isShow = false">
-          <i class="icon iconfont el-icon-collection" />
+          <i class="icon el-icon-collection" />
           <p>视图切换</p>
         </dd>
         <dd @click="$refs.TimeToSee.open()">
@@ -401,7 +401,7 @@ export default {
 }
 </script>
 <style lang="scss">
-// @import "../../../../../../icons/app/iconfont.css";
+@import "../../../../icons/app/iconfont.css";
 @keyframes glow {
   0% {
     box-shadow: 2px 3px 16px 0px rgba(208, 208, 208, 0.5);