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

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

@@ -7,19 +7,18 @@
 <template>
   <div class="Chemical-test-process">
     <dee-as-com
-      v-if="JobResponseInExpermentData"
+      v-if="basicData"
       refs="outerCasing"
       model-name="InStorageRequestItem"
       :lay-config="{
         typeName: 'InStorageRequestItem',
-        layKey: 'test'
+        layKey: '1c4983a2-6f51-49e4-95ee-2f5506b8e217'
       }"
-      :basic-data="JobResponseInExpermentData"
+      :basic-data="basicData"
     />
   </div>
 </template>
 <script>
-import { post } from '@/utils/http'
 
 export default {
   componentName: '理化检验流程',
@@ -34,69 +33,14 @@ export default {
   data() {
     return {
       // data: { 'reportNo': bindForm.reportNo, 'experimentAmount':bindForm.experimentAmount}, 'dxType': 'JobResponseInStorage', 'operator': 'ADD' }
-      JobResponseInExpermentData: null
     }
   },
   computed: {},
   created() {
     // 初始化数据
-    console.log('理化检验流程', this.basicData)
-    this.getFrom(this.basicData.id)
   },
   methods: {
-    getFrom(id) {
-      const param = {
-        'pageFrom': 1,
-        'pageSize': 10,
-        'searchItems': {
-          'children': [
-            {
-              'items': [
-                {
-                  'fieldName': 'jobOrderId',
-                  'operator': 'EQ',
-                  'value': id
-                },
-                {
-                  'fieldName': 'subTypeName',
-                  'operator': 'EQ',
-                  'value': 'JobResponseInExperment'
-                }
-              ],
-              'operator': 'AND'
-            }
-          ],
-          'items': [],
-          'operator': 'AND'
-        },
-        'openProps': [
-          {
-            'name': 'objFileLinks',
-            'openProps': [
-              { 'name': 'target' }
-            ]
-          },
-          {
-            'name': 'jobOrder',
-            'openProps': [
-              { 'name': 'purchaseUnit' }
-            ]
-          }
-        ],
-        'sortItem': [
-          {
-            'fieldName': 'modifyTime',
-            'sortOrder': 'desc'
-          }
-        ]
-      }
-      post('JobResponseInStorage/search', param).then(res => {
-        // this.data = res.items.content[0]
-        this.JobResponseInExpermentData = res.items.content[0]
-      }).catch((err) => {
-        console.log(err)
-      })
-    }
+
   }
 }
 </script>

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

+<!--
+ * @Author: gjn
+ * @Date: 2023-08-04 10:29:39
+ * @Description:批量签审_理化实验入库响应
+-->
+<template>
+  <div class="jobResponseInExperiment">
+    <dee-as-com
+      ref="applyTable"
+      class="list-table"
+      :basic-data=" { selectData,selectionRows }"
+      :lay-config="{ typeName: 'JobResponseInStorage', layKey: 'batchSign_jobResponseInExperiment'}"
+      @selectionChange="selectionChange"
+    />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'JobResponseInExperiment',
+  components: {},
+  props: {
+    selectData: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      selectionRows: []
+    }
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  // 组件方法
+  methods: {
+    selectionChange(val) {
+      this.selectionRows = val
+    }
+  }
+}
+</script>
+
+<style  lang='scss'>
+.jobResponseInExperiment{
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  padding:0 4px;
+
+}
+</style>

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

@@ -10,7 +10,8 @@
 export default {
   components: {
     WarehouseApply: () => import('./warehouseApply'),
-    OutStorageExpireApply: () => import('./outStorageExpireApply')
+    OutStorageExpireApply: () => import('./outStorageExpireApply'),
+    JobResponseInExperiment: () => import('./jobResponseInExperiment')
   },
   props: {
     selectData: {

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

 <!--
  * @Author: gjn
  * @Date: 2023-08-01 10:28:07
- * @Description:验收入库申请
+ * @Description:批量签审_验收入库申请
 -->
 <template>
   <div class="warehouseApply">