Merge branch 'online'

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

+<template>
+  <div>
+    <dee-as-com
+      :lay-config="layConfig"
+      @searchEvent="search"
+    />
+    <dee-as-com
+      ref="table"
+      :lay-config="{
+        typeName: 'JoExecutePlan',
+        layKey: 'SubstituteMaintenanceEquipmentTable'
+      }"
+      dis-business
+      :result-data="tableData"
+      @row-click="onRowClick"
+    />
+    <div class="foot-btn-box">
+      <el-button type="primary" @click="submitEvent">确认</el-button>
+      <el-button @click="cancelEvent">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { post } from '@/utils/http'
+export default {
+  componentName: '器材代用维护',
+  name: 'SubstituteMaintenanceEquipment',
+  components: {},
+  props: {},
+  data() {
+    return {
+      tableData: [],
+      substituteRowData: {},
+      rowData: null
+    }
+  },
+  computed: {
+    layConfig() {
+      return {
+        typeName: 'JoExecutePlan',
+        layKey: 'SubstituteMaintenanceEquipmentSearch'
+      }
+    }
+  },
+  watch: {},
+  // 生命周期 - 创建完成（可以访问当前this 实例）
+  created() {
+  },
+  // 生命周期 - 挂载之前
+  beforeMount() {
+  },
+  // 生命周期 - 挂载完成（可以访问 DOM 元素）
+  mounted() {
+  },
+  methods: {
+    search(data) {
+      this.substituteRowData = this.$utils.findByNameVnode(this, 'DeeAsPage').rowData
+      const aoInfo = data.items.length ? data.items[0].value : ''
+      const params = {
+        aoInfo,
+        airModel: this.substituteRowData.airModel,
+        sorties: this.substituteRowData.serialNo,
+        itemResCode: this.substituteRowData.itemCode
+      }
+      post(`/JoExecutePlan/getCanSubstituteAo`, params).then(res => {
+        if (res.code === 0) {
+          this.tableData = res.items
+        }
+      })
+    },
+    getQueryValue(data, key) {
+      return data.items.find(item => item.fieldName === key) ? data.items.find(item => item.fieldName === key).value : ''
+    },
+    onRowClick(data) {
+      this.rowData = data.row
+    },
+    submitEvent() {
+      if (!this.rowData) {
+        this.$utils.showMessageWarning('请点击列表中的其中一行！')
+        return false
+      }
+      const params = {
+        source: this.substituteRowData,
+        target: this.rowData
+      }
+      post(`/Substitutelink/createSubstituteLink`, params).then(res => {
+        if (res.code === 0) {
+          this.$utils.showMessageSuccess('创建成功！')
+          const obj = [{
+            'fieldName': 'sourceId',
+            'operator': 'EQ',
+            'value': this.substituteRowData.id
+          }]
+          this.$utils.findByNameVnode(this, 'DeeAsTable').getData(obj)
+          this.cancelEvent()
+        }
+      })
+    },
+    cancelEvent() {
+      this.$emit('cancel')
+    }
+  }
+}
+</script>
+
+<style lang='scss' scoped>
+.foot-btn-box{
+  display: flex;
+  justify-content: center;
+  padding: 20px
+}
+
+</style>

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

@@ -358,6 +358,7 @@ export default {
               { label: '批号', value: responseInventory.lotNo },
               { label: '系列号/序列号', value: responseInventory.serno },
               { label: '机型', value: row.airModel },
+              { label: '出库数量', value: row.allocatedAmount || '' },
               { label: '验收单号', value: responseInventory.testNo },
               { label: '库位号', value: responseInventory.workunit || '' },
               { label: '备注', value: row.remark || '' }

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

@@ -65,6 +65,7 @@
               <dee-as-com
                 ref="detailCom"
                 :key="layConfig.typeName"
+                :basic-data="{activeNodeData}"
                 :lay-config="layConfig"
                 table-height="calc(100vh - 200px)"
                 @row-click="rowClick"
@@ -74,6 +75,7 @@
               <dee-as-com
                 ref="detailCom2"
                 :key="layConfig.typeName"
+                :basic-data="{activeNodeData}"
                 :lay-config="layConfig1"
                 table-height="calc(100vh - 200px)"
                 @row-click="rowClick"
@@ -537,11 +539,11 @@ export default {
       })
     },
     handleNodeClick(data, node) {
+      data.activeTab = this.activeTab
+      data.level = node.level
+      data.searchStories = this.form.sortiesName
+      this.activeNodeData = data
       if (node.level === 2 || node.level === 3) {
-        data.activeTab = this.activeTab
-        data.level = node.level
-        data.searchStories = this.form.sortiesName
-        this.activeNodeData = data
         this.$nextTick(() => {
           if (this.activeTab === '0') {
             if (this.$refs.detailCom.$refs.asCom && this.$refs.detailCom.$refs.asCom.getData) {

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/inStorageMoveExamine/index.vue

@@ -37,7 +37,7 @@ export default {
       immediate: true,
       deep: true,
       handler(val) {
-        if (val === 'InStorageMoveAuditing') {
+        if (val === 'InStorageMoveAuditing' || val === 'OutStorageMoveConfirm') {
           this.layKey = 'batchSign_InStorageMoveAuditing'
         } else {
           this.layKey = 'batchSign_inStorageMoveExamine'

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/taskList.vue

@@ -45,6 +45,7 @@ export default {
     InstructionIdentificationBatchInfo: () => import('./instructionIdentificationBatch'), // 指令标识不编辑
     ReturnToFactoryBatch: () => import('./returnToFactoryBatch'), // 返厂处理
     InStorageMoveAuditing: () => import('./inStorageMoveExamine'), // 移库入库库房审核
+    OutStorageMoveConfirm: () => import('./inStorageMoveExamine'), // 移库出库确认
     InStorageMoveExamine: () => import('./inStorageMoveExamine'), // 移库入库库房确认
     InStorageTkdBackCraftsmenExamin: () => import('./inStorageTkdBackCraftsmenExamin'), // 退库单退库工艺审核
     InStorageTkdBackDesignerExamin: () => import('./inStorageTkdBackDesignerExamin') // 退库单退库设计审核

applications/dee-task-center/src/views/workflow/task-center/task/process.vue

@@ -123,7 +123,7 @@ export default {
                 class: 'link-style',
                 on: {
                   click: () => {
-                    getInstancePbo(params.processInstanceId).then(res => {
+                    getInstancePbo(params.id).then(res => {
                       const pbo = res.items
                       if (pbo) {
                         let modelName = pbo.dxClassname.split('.').splice(-1)[0]