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

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

+/**
+* @Description:
+* @author gjn
+* @date 2024/05/06
+*/
+<template>
+  <div class="AddExtRetentionDetailDialog-dialog">
+    <dee-as-com
+      ref="tableCom"
+      class="list-table"
+      :lay-config="{ typeName: 'ExtProcessPlan', layKey: 'addExtRetentionLists'}"
+      @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>
+export default {
+  componentName: '添加AO保留弹框',
+  name: 'AddExtRetentionDetailDialog',
+  components: {},
+  props: {
+    basicData: {
+      type: Object,
+      default: () => {}
+    },
+    parentTableData: {
+      type: Object,
+      default: () => {}
+    }
+  },
+  data() {
+    return {
+      selection: [],
+      defaultData: {}
+    }
+  },
+  computed: {},
+  watch: {},
+  mounted() {},
+  methods: {
+    findByNameVnode(obj, targetName) {
+      if (obj && obj.$vnode && obj.$vnode.tag && obj.$vnode.tag.includes(targetName)) {
+        return obj
+      } else {
+        return this.findByNameVnode(obj.$parent, targetName)
+      }
+    },
+    selectionChange(val) {
+      this.selection = val
+    },
+    submitEvent() {
+      if (this.selection.length) {
+        const showData = this.findByNameVnode(this, 'DeeAsTable').showData
+        if (showData.length) {
+          this.selection = this.selection.filter(item => !showData.some(x => x.lifecycleTemplateId === item.lifecycleTemplateId))
+        }
+        const data = this.selection.map(item => {
+          item.operator = 'ADD'
+          item.id = null
+          return item
+        })
+        this.$emit('submitEvent', { formData: data })
+      }
+    },
+    cancelEvent() {
+      this.$emit('cancel')
+    }
+  }
+}
+</script>
+<style lang='scss'>
+.AddExtRetentionDetailDialog-dialog{
+  .list-table{
+    height: 510px!important;
+  }
+  .foot-btn-box{
+   display: flex;
+   justify-content: center;
+   align-content: center;
+   margin-top: 10px;
+ }
+ .search-box-col{
+  width: 300px !important;
+ }
+ .w60{
+  width: 30px !important;
+ }
+}
+
+</style>

applications/dee-task-center/src/views/workflow/task-center/myPlanTask/instructionIdentificationBatch/components/right/index.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="table">
       <div>
-        <div>
+        <div class="dee-table">
           <el-table
             ref="table"
             :data="tableData"
@@ -63,6 +63,13 @@
               :width="120"
               sortable
             />
+            <el-table-column
+              prop="positionNumber"
+              align="center"
+              label="站位"
+              :width="120"
+              sortable
+            />
             <el-table-column
               prop="firstCheckFlag"
               align="center"
@@ -157,7 +164,7 @@
         />
       </div>
       <div>
-        <div>
+        <div class="dee-table">
           <el-table
             :data="workProcedureData"
             height="100%"
@@ -294,6 +301,7 @@ export default {
   created() {
     this.jurisdId = this.$route.query.taskDefinitionKey
     this.getTools()
+    this.getSearchTableData()
   },
   mounted() {
     this.$bus.$on('getPlanData', (data, level) => {
@@ -589,16 +597,16 @@ export default {
         pageSize: this.tablePagination.pageSize,
         searchItems: {
           children: [
-            {
-              items: [
-                {
-                  fieldName: 'sorties',
-                  operator: 'EQ',
-                  value: data.serialNo
-                }
-              ],
-              operator: 'AND'
-            },
+            // {
+            //   items: [
+            //     {
+            //       fieldName: 'sorties',
+            //       operator: 'EQ',
+            //       value: data.serialNo
+            //     }
+            //   ],
+            //   operator: 'AND'
+            // },
             {
               'items': [
                 {
@@ -625,14 +633,14 @@ export default {
           }
         ]
       }
-      if (level === 2) {
-        params.searchItems.children[0].items.push(
-          {
-            fieldName: 'positionNumber',
-            operator: 'EQ',
-            value: data.title
-          })
-      }
+      // if (level === 2) {
+      //   params.searchItems.children[0].items.push(
+      //     {
+      //       fieldName: 'positionNumber',
+      //       operator: 'EQ',
+      //       value: data.title
+      //     })
+      // }
       post('/ExtProcessPlan/searchBatchExamineAo?taskDefinitionKey=' + this.$route.query.taskDefinitionKey, params)
         .then((res) => {
           if (res && res.items && res.items.content) {
@@ -644,7 +652,8 @@ export default {
                 number: p.pbo.serialNumber,
                 name: p.pbo.name,
                 gaceVersion: p.pbo.gaceVersion,
-                sorties: data.serialNo,
+                sorties: p.pbo.sorties,
+                positionNumber: p.pbo.positionNumber,
                 firstCheckFlag: p.pbo.firstCheckFlag,
                 firstCheckFlagSelect: false,
                 workHour: p.pbo.workHour,

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

 <template>
   <section v-loading="instructionIdentificationShow" class="single-sortie-instruction-identification">
-    <dee-fold-pane :min-percent="18" :default-percent="18" split="vertical" class="detail-pane">
+    <!-- <dee-fold-pane :min-percent="18" :default-percent="18" split="vertical" class="detail-pane">
       <template slot="paneL">
         <div class="left">
           <left
@@ -10,22 +10,22 @@
           />
         </div>
       </template>
-      <template slot="paneR">
-        <div class="right">
-          <right ref="right" />
-        </div>
-      </template>
-    </dee-fold-pane>
+      <template slot="paneR"> -->
+    <div class="right">
+      <right ref="right" />
+    </div>
+    <!-- </template>
+    </dee-fold-pane> -->
   </section>
 </template>
 
 <script>
-import left from './components/left/index'
+// import left from './components/left/index'
 import right from './components/right/index'
 
 export default {
   components: {
-    left,
+    // left,
     right
   },
   data() {
@@ -82,21 +82,21 @@ export default {
 </script>
 <style lang="scss" >
 .single-sortie-instruction-identification {
-  display: flex;
+  // display: flex;
   height: 100%;
-  .detail-pane{
-    width: 100%;
-    .left{
-      height: 100%;
-      overflow-x: hidden;
-    }
+  // .detail-pane{
+  //   width: 100%;
+  //   .left{
+  //     height: 100%;
+  //     overflow-x: hidden;
+  //   }
     .right {
       height: 100%;
       .table {
         margin-top: 0;
       }
     }
-  }
+  // }
 }
 </style>