指令标识维护-流程中详情

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

+<template>
+  <div class="task-detail-basicInfo-com">
+    <div v-if="loading" class="detail-com">
+      <dee-as-com
+        :key="layConfig.typeName"
+        :lay-config="layConfig"
+        :basic-data="aoData"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { post } from '@/utils/http'
+export default {
+  name: 'AoProcessDetail',
+  componentName: '流程中指令信息详情',
+  components: {
+  },
+  props: {
+    basicData: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      aoData: {},
+      loading: false
+    }
+  },
+  computed: {
+    layConfig() {
+      return {
+        typeName: 'ExtProcessPlan',
+        layKey: 'instructInfo'
+      }
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    getData() {
+      const params = {
+        'searchItems': {
+          'children': [
+            {
+              'items': [
+                {
+                  'fieldName': 'id',
+                  'operator': 'EQ',
+                  'value': this.basicData.id
+                }
+              ],
+              'operator': 'AND'
+            }
+          ],
+          'items': [],
+          'operator': 'AND'
+        },
+        'openProps': [
+          {
+            'name': 'sourceExtProcessUsageLink',
+            'searchItems': {
+              'items': [
+                {
+                  'fieldName': 'targetIdType',
+                  'operator': 'EQ',
+                  'value': 'ExtProcessOperation'
+                }
+              ],
+              'operator': 'AND'
+            },
+            'openProps': [
+              {
+                'name': 'target'
+              }
+            ]
+          }
+        ],
+        'sortItem': [
+          {
+            'fieldName': 'modifyTime',
+            'sortOrder': 'desc'
+          }
+        ]
+      }
+      post(`/ExtProcessPlan/aoSearch`, params).then(res => {
+        if (res.items) {
+          this.aoData = res.items.content[0]
+          this.loading = true
+        }
+      }).finally(() => {
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+  .task-detail-basicInfo-com{
+    height: 100%;
+    .detail-com{
+      height: 100%;
+    }
+  }
+</style>

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

+<template>
+  <div class="task-detail-basicInfo-com">
+    <div v-if="loading" class="detail-com">
+      <dee-as-com
+        :key="layConfig.typeName"
+        :lay-config="layConfig"
+        :basic-data="aoData"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { post } from '@/utils/http'
+export default {
+  name: 'AoProcessDetailEdit',
+  componentName: '流程中指令信息编辑',
+  components: {
+  },
+  props: {
+    basicData: {
+      type: Object,
+      default: null
+    }
+  },
+  data() {
+    return {
+      aoData: {},
+      loading: false
+    }
+  },
+  computed: {
+    layConfig() {
+      return {
+        typeName: 'ExtProcessPlan',
+        layKey: 'instructEdit'
+      }
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    getData() {
+      const params = {
+        'searchItems': {
+          'children': [
+            {
+              'items': [
+                {
+                  'fieldName': 'id',
+                  'operator': 'EQ',
+                  'value': this.basicData.id
+                }
+              ],
+              'operator': 'AND'
+            }
+          ],
+          'items': [],
+          'operator': 'AND'
+        },
+        'openProps': [
+          {
+            'name': 'sourceExtProcessUsageLink',
+            'searchItems': {
+              'items': [
+                {
+                  'fieldName': 'targetIdType',
+                  'operator': 'EQ',
+                  'value': 'ExtProcessOperation'
+                }
+              ],
+              'operator': 'AND'
+            },
+            'openProps': [
+              {
+                'name': 'target'
+              }
+            ]
+          }
+        ],
+        'sortItem': [
+          {
+            'fieldName': 'modifyTime',
+            'sortOrder': 'desc'
+          }
+        ]
+      }
+      post(`/ExtProcessPlan/aoSearch`, params).then(res => {
+        if (res.items) {
+          this.aoData = res.items.content[0]
+          this.loading = true
+        }
+      }).finally(() => {
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+ .task-detail-basicInfo-com{
+    height: 100%;
+    .detail-com{
+      height: 100%;
+    }
+  }
+</style>

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

+export default {
+  layoutConfigData: [
+    {
+      title: '高级组件配置',
+      data: [
+        {
+          key: 'readOnly',
+          title: '只读',
+          component: {
+            name: 'el-checkbox'
+          }
+        }
+      ]
+    }
+  ],
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  computed: {
+
+  },
+  methods: {
+
+  }
+}
+

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

@@ -53,7 +53,7 @@
         >
           <template v-slot="scope">
             <el-select
-              v-if="basicData.isView"
+              v-if="!item.readOnly"
               v-model="scope.row.target.airFlag"
               placeholder="请选择"
               clearable=""
@@ -72,7 +72,7 @@
           fixed
         >
           <template v-slot="scope">
-            <el-input v-if="basicData.isView" v-model="scope.row.target.workHour" size="mini" @change="changWorkData(scope.row)" />
+            <el-input v-if="!item.readOnly" v-model="scope.row.target.workHour" size="mini" @change="changWorkData(scope.row)" />
             <span v-else>{{ scope.row.target.workHour }}</span>
           </template>
         </el-table-column>
@@ -81,10 +81,12 @@
   </div>
 </template>
 <script>
+import config from './config'
 export default {
   name: 'ProcessInformation',
   components: { },
   componentName: '工序信息',
+  mixins: [config],
   props: {
     basicData: {
       type: Object,
@@ -128,8 +130,6 @@ export default {
     id: {
       immediate: true,
       handler(newVal, oldVal) {
-        const user = localStorage.user || ''
-        this.basicData.isView = user === this.basicData.note && this.basicData.state === 'Apply'
         this.tableData = this.basicData.sourceExtProcessUsageLink
       }
     }

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

 <template>
   <div class="search-sorties">
-    <el-form :inline="true" :model="form" class="demo-form-inline search-bar">
+    <el-form :inline="true" :model="form" class="demo-form-inline search-bar" label-width="100px">
+      <el-col :span="8">
         <el-form-item label="架次:">
           <el-select v-model="form.sorties" placeholder="架次" @change="changeFrom">
             <el-option
@@ -11,6 +12,8 @@
             />
           </el-select>
         </el-form-item>
+      </el-col>
+      <el-col :span="8">
         <el-form-item label="站位:">
           <el-select v-model="form.postion" placeholder="站位" @change="changeFrom">
             <el-option
@@ -21,9 +24,12 @@
             />
           </el-select>
         </el-form-item>
+      </el-col>
+      <el-col :span="8">
         <el-form-item label="AO(号/名称):">
           <el-input v-model="form.name" placeholder="AO(号/名称)" clearable @change="changeFrom" />
         </el-form-item>
+      </el-col>
     </el-form>
   </div>
 </template>
@@ -77,6 +83,7 @@ export default {
   // 组件方法
   methods: {
     changeFrom(val) {
+      console.log(this.form)
       this.$emit('input', val)
     },
     getStation(val) {