Merge remote-tracking branch 'origin/rubberPaint-dev' into dev

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

 <template>
-  <div class="addAoInGeberalExperRecord-dialog">
-    <dee-as-com :basicData="basicData" ref="tablelists" class="list-table" table-height="50vh" :lay-config="{
-      typeName: 'ExtProcessPlan',
-      layKey: 'addAoInGeberalExperRecord',
-    }" @selectionChange="selectionChange" />
+  <div class="addAoInGeberalExperRecord">
+    <dee-as-com
+      ref="tablelists"
+      :basic-data="basicData"
+      class="list-table"
+      table-height="50vh"
+      :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>
@@ -20,7 +27,7 @@ export default {
     basicData: {
       type: Object,
       default: () => { }
-    },
+    }
   },
   data() {
     return {
@@ -35,21 +42,21 @@ export default {
       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')
-        })
+      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')
@@ -58,4 +65,11 @@ export default {
 }
 </script>
 <style lang="scss">
+.addAoInGeberalExperRecord{
+  .foot-btn-box{
+      display: flex;
+      justify-content: center;
+      padding: 20px
+   }
+}
 </style>

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

@@ -72,7 +72,7 @@
         <el-table-column label="其他库房详情" min-width="110">
           <template slot-scope="scope">
             <span class="link" @click="openDetails(scope,'otherStorageZoneItems')">
-              查看
+              {{ scope.row.otherCenterAmount||'查看' }}
             </span>
           </template>
         </el-table-column>

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

@@ -61,6 +61,7 @@ export default {
           }
           const _val = _get(this.form, this.itemObj.linkageAttr)
           if (_val !== this.linkageValue) {
+            this.selVal = ''
             this.linkageValue = _val
             this.getData(_val)
           }

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

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