Merge branch 'online'

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

+<template>
+  <div class="addAoInGeberalExperRecord">
+    <dee-as-com
+      ref="tablelists"
+      :basic-data="basicData"
+      class="list-table"
+      :lay-config="{
+        typeName: 'ExtProcessPlan',
+        layKey: 'addAoInGeberalExperRecord',
+      }"
+      @selectionChange="selectionChange"
+    />
+    <div slot="footer" 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 {
+  name: 'AddAoInGeberalExperRecordDialog',
+  components: {},
+  props: {
+    basicData: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  data() {
+    return {
+      selection: []
+    }
+  },
+
+  computed: {},
+  mounted() { },
+  methods: {
+    selectionChange(val) {
+      this.selection = val
+    },
+    submitEvent() {
+      if (!this.selection || !this.selection.length) return this.$utils.showMessageWarning('请选择数据！')
+      const params = this.selection.map((item) => {
+        return {
+          sourceId: this.basicData.id,
+          sourceIdType: this.basicData.subTypeName,
+          targetId: item.id,
+          targetIdType: item.subTypeName,
+          operator: 'ADD'
+        }
+      })
+      post('/ExperimentPlanLink/recursions', params).then(res => {
+        this.cancelEvent()
+        this.$utils.showMessageSuccess('保存成功')
+        this.$bus.$emit('refreshExperimentPlanLink')
+      })
+    },
+    cancelEvent() {
+      this.$emit('cancel')
+    }
+  }
+}
+</script>
+<style lang="scss">
+.addAoInGeberalExperRecord{
+   height: calc(100% - 100px);
+  .foot-btn-box{
+      display: flex;
+      justify-content: center;
+      padding: 20px
+   }
+}
+</style>

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

@@ -143,7 +143,7 @@ export default {
         {
           title: 'AO名称',
           show: true,
-          key: 'materName',
+          key: 'name',
           sortable: true,
           minWidth: 100
         },

applications/dee-mes/src/privateComponents/components/SortiesSearchInAoAdd/config.js

+export default {
+  props: {},
+  layoutConfigData: [
+    {
+      title: '高级组件配置',
+      data: [
+        {
+          key: 'inheritAttr',
+          title: '继承属性',
+          component: {
+            defaultValue: 'sorties',
+            name: 'el-input'
+          }
+        }
+      ]
+    }
+  ],
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  computed: {
+
+  },
+  methods: {
+
+  }
+}
+

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

+/**
+* @Description:  通用试验申请添加指令
+*/
+<template>
+  <div class="inherit-select">
+    <el-select v-model="selVal" placeholder="请选择" size="mini" :disabled="disabledVal" @change="changeVal">
+      <el-option
+        v-for="item in options"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value"
+      />
+    </el-select>
+  </div>
+</template>
+<script>
+import config from './config'
+import _get from 'lodash.get'
+export default {
+  componentName: '继承外部数据下拉框',
+  name: 'InheritSelect', // name写在组件的最前方,自定义组件为必填
+  components: {},
+  mixins: [config],
+  props: {
+    itemObj: {
+      type: Object,
+      default: null
+    },
+    form: {
+      type: Object,
+      default: () => {}
+    },
+    middleForm: {
+      type: Object,
+      default: () => {}
+    },
+    value: {
+      type: [Number, String, Object],
+      default: () => ''
+    },
+    basicData: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      options: [],
+      selVal: '',
+      disabledVal: false,
+      inheritValue: ''
+    }
+  },
+  computed: {},
+  watch: {
+    basicData: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        if (val) {
+          if (!this.itemObj.inheritAttr) {
+            return
+          }
+          const _val = _get(val, this.itemObj.inheritAttr)
+          if (_val !== this.inheritValue) {
+            this.inheritValue = _val
+            if (this.inheritValue && this.inheritValue.length) {
+              const data = this.inheritValue.split(',')
+              this.options = data.map(item => {
+                return {
+                  value: item,
+                  label: item
+                }
+              })
+            } else {
+              this.options = []
+            }
+          }
+        }
+      }
+    },
+    value: {
+      immediate: true,
+      deep: true,
+      handler(v) {
+        if (v) {
+          this.selVal = this.value
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化数据
+  },
+  methods: {
+    changeVal() {
+      this.$emit('input', this.selVal)
+    }
+  }
+}
+</script>
+<style lang='scss'>
+</style>

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

@@ -111,7 +111,7 @@ export default {
         if (res && res.items && res.items.content && res.items.content[0].extPosition) {
           this.options = res.items.content[0].extPosition.map(v => ({
             key: v.id,
-            label: v.name,
+            label: `${v.serialNumber}-${v.name}`,
             value: v.serialNumber
           }))
         }

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

@@ -195,6 +195,8 @@ export default {
         { title: '机型', key: 'extProcessPlan.planeType', align: 'left' },
         { title: '架次', key: 'extProcessPlan.sorties', align: 'left' },
         { title: '站位', key: 'extProcessPlan.positionNumber', align: 'left' },
+        { title: '大专业', key: 'extProcessPlan.major', align: 'left' },
+        { title: '小专业', key: 'extProcessPlan.subMajor', align: 'left' },
         { title: '工时定额', key: 'extProcessPlan.opHour', align: 'left' },
         { title: '工时', key: 'extProcessPlan.workHour', align: 'left' },
         { title: '计划员', key: 'planner.name', align: 'left' },

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

@@ -259,6 +259,8 @@ export default {
         { title: '架次', key: 'extProcessPlan.sorties', align: 'left' },
         { title: '站位', key: 'extProcessPlan.positionNumber', align: 'left' },
         { title: '工作包名称', key: 'extProcessPlan.extWorkPackageLinks[0].source.name', align: 'left' },
+        { title: '大专业', key: 'extProcessPlan.major', align: 'left' },
+        { title: '小专业', key: 'extProcessPlan.subMajor', align: 'left' },
         { title: '工时定额', key: 'extProcessPlan.opHour', align: 'left' },
         { title: '工时', key: 'extProcessPlan.workHour', align: 'left' },
         { title: '计划员', key: 'planner.name', align: 'left' },

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

+<!--
+ * @Author: gjn
+ * @Date: 2024-4-12 10:49:39
+ * @Description:试验记录审核/通用试验记录审核
+-->
+<template>
+  <div class="experimentRecordExamine">
+    <dee-as-com
+      ref="applyTable"
+      class="list-table"
+      :basic-data=" { selectData,selectionRows }"
+      :lay-config="{ typeName: 'ExperimentRecord', layKey: layKey}"
+      @selectionChange="selectionChange"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExperimentRecordExamine',
+  components: {},
+  props: {
+    selectData: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      selectionRows: [],
+      layKey: 'batchSign_experimentRecordExamine'
+    }
+  },
+  computed: {},
+  watch: {
+    'selectData.router': {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        if (val === 'ExperimentRecordExamine') {
+          this.layKey = 'batchSign_experimentRecordExamine'
+        } else {
+          this.layKey = 'batchSign_GeneraleExperimentRecordExamine'
+        }
+      }
+    }
+  },
+  created() {},
+  mounted() {
+
+  },
+  // 组件方法
+  methods: {
+    selectionChange(val) {
+      this.selectionRows = val
+    }
+  }
+}
+</script>
+
+<style  lang='scss'>
+.experimentRecordExamine{
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  padding:0 4px;
+
+}
+</style>

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

@@ -48,7 +48,9 @@ export default {
     OutStorageMoveConfirm: () => import('./inStorageMoveExamine'), // 移库出库确认
     InStorageMoveExamine: () => import('./inStorageMoveExamine'), // 移库入库库房确认
     InStorageTkdBackCraftsmenExamin: () => import('./inStorageTkdBackCraftsmenExamin'), // 退库单退库工艺审核
-    InStorageTkdBackDesignerExamin: () => import('./inStorageTkdBackDesignerExamin') // 退库单退库设计审核
+    InStorageTkdBackDesignerExamin: () => import('./inStorageTkdBackDesignerExamin'), // 退库单退库设计审核
+    ExperimentRecordExamine: () => import('./experimentRecordExamine'), // 试验记录审核
+    GeneralExperimentRecordExamine: () => import('./experimentRecordExamine') // 通用试验记录审核
   },
   props: {
     selectData: {