装配计划执行样式修改

applications/dee-mes/src/views/taskReception/components/taskReceiveCard/index.vue

@@ -88,7 +88,7 @@
           popper-class="fuzzy-search-popper"
         >
           <div class="body">
-            <el-input v-model="aoName" size="mini" placeholder="AO号/名称" />
+            <el-input v-model="aoName" size="mini" clearable placeholder="AO号/名称" />
             <footer>
               <el-button size="mini" type="text" class="last-anchor" name="" @click="getTaskAcceptance()">查询</el-button>
             </footer>

applications/dee-mes/src/views/taskReception/components/taskReceiveTable/table.vue

@@ -12,14 +12,14 @@
       <el-table-column
         prop="serialNumber"
         label="AO号"
-        min-width="220"
+        min-width="240"
         align="center"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <el-button type="text" @click="routerAssemblyExecution(scope.row)">{{
+          <span class="link-style" type="text" @click="routerAssemblyExecution(scope.row)">{{
             scope.row.serialNumber
-          }}</el-button>
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -182,7 +182,7 @@ export default {
                 {
                   'fieldName': 'prodTask.extProcessSkillUser.dxUserInfoId',
                   'operator': 'EQ',
-                  'value': 1626781927440
+                  'value': localStorage.getItem('userId') || ''
                 },
                 {
                   'fieldName': 'extProcessPlan.sorties',
@@ -237,7 +237,7 @@ export default {
         ],
         'toValidateKeys': ''
       }
-      that.processLoading = true
+      that.loading = true
       post('/JoExecutePlan/getTaskAcceptanceToDo', param)
         .then((res) => {
           if (res && res.items && res.items.content) {
@@ -289,21 +289,33 @@ export default {
         })
         .catch((err) => console.error(err))
         .finally(() => {
-          that.processLoading = false
+          that.loading = false
         })
     },
     routerAssemblyExecution(item) {
-      if (!item.isOK) return
+      // if (!item.isOK) return
       this.$router.push({
-        name: 'assemblyPerform',
+        path: '/dee-mes/taskExecution',
         query: {
           id: item.id,
-          materNo: item.materNo,
-          airModelId: item.airModelId,
-          sortiesId: item.sortiesId,
-          isOK: item.isOK
+          title: this.$route.query.title + '执行',
+          showMenu: false,
+          showTag: 'false',
+          isOK: item.isOK,
+          backFlag: true
         }
       })
+      this.$store.dispatch('app/closeSideBar', false)
+      // this.$router.push({
+      //   name: 'assemblyPerform',
+      //   query: {
+      //     id: item.id,
+      //     materNo: item.materNo,
+      //     airModelId: item.airModelId,
+      //     sortiesId: item.sortiesId,
+      //     isOK: item.isOK
+      //   }
+      // })
     }
   }
 }