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

applications/architecture-dee/src/layout/components/Navbar.vue

@@ -6,7 +6,8 @@
       </span>
       <div v-if="activeModel" class="login-module">
         <span class="dex" style="cursor: pointer;" @click="goHome">DEX</span>
-        <span class="moudle-name">{{ activeModel | formatMoudleName }}</span>
+        <span v-if="$route.query.backFlag" class="moudle-name"><i class="el-icon-back" @click="goback()" />{{ $route.query.title }}</span>
+        <span v-else class="moudle-name">{{ activeModel | formatMoudleName }}</span>
         <!-- <span>>></span>
         <span>{{ routeName }}</span> -->
       </div>
@@ -202,6 +203,9 @@ export default {
     //   }
     //   this.moduleName = localStorage.getItem('moduleName')
     // },
+    goback() {
+      this.$router.go(-1)
+    },
     goHome() {
       this.$router.push(`/`)
     },

applications/architecture-dee/src/store/modules/menu.js

@@ -97,7 +97,9 @@ const mutations = {
 const actions = {
   activeModel({ commit, state }, model) {
     // if (!state.activeModel || model.appId !== state.activeModel.id || (model.appId === 'todoTask' && state.activeModel.id !== 'todoTask')) {
-    if (model.appId === 'todoTask' || model.appId === 'myMessage' || model.appId === 'myTaskReceive' || model.appId === 'myCheckTaskReceive' || model.appId === 'myAirTaskReceive') { // 待办任务页特殊处理
+    if (model.appId === 'todoTask' || model.appId === 'myMessage' ||
+     model.appId === 'myTaskReceive' || model.appId === 'myCheckTaskReceive' ||
+     model.appId === 'myAirTaskReceive') { // 待办任务页特殊处理
       commit('SET_ACTIVE_MODEL', {
         id: model.appId,
         path: { ...model.pageInfo }

applications/dee-mes/src/views/taskExecution/components/ConfirmMaterial/footer.vue

@@ -16,7 +16,7 @@
         :cell-class-name="cellClassName"
       >
         <el-table-column type="index" :width="80" label="序号" align="center" />
-        <el-table-column :width="120" label="扫码录入" align="center">
+        <el-table-column v-if="flag" :width="120" label="扫码录入" align="center">
           <template slot-scope="scope">
             <el-popover
               v-model="scope.row.popoverVisible"
@@ -44,6 +44,7 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="flag"
           prop="extMaterial.isRecord"
           label="是否记实"
           align="center"
@@ -67,7 +68,7 @@
           sortable
           show-overflow-tooltip
         />
-        <el-table-column :width="80" label="操作" align="center">
+        <el-table-column v-if="flag" :width="80" label="操作" align="center">
           <template slot-scope="scope">
             <el-button
               :disabled="scope.row.scanCodeRecordsState==='未确认'"
@@ -215,7 +216,8 @@ export default {
         stripe: true,
         border: true
       },
-      scanId: null
+      scanId: null,
+      flag: false
     }
   },
   created() {
@@ -232,6 +234,11 @@ export default {
     },
     // 初始化数据
     init() {
+      if (this.$route.query.title === '装配任务执行') {
+        this.flag = true
+      } else {
+        this.flag = false
+      }
       // 设置数据
       this.loading = true
       this.tableData = []

applications/dee-mes/src/views/taskExecution/components/ConfirmMaterial/header.vue

@@ -2,7 +2,7 @@
   <section class="confirm-material-header">
     <p class="confirm-material-header-title-table">
       <span>物料配套发放：</span>
-      <span>提示：当零件类型为外购成品时,实称重量/去除重量才可双击编辑!</span>
+      <span v-show="flag">提示：当零件类型为外购成品时,实称重量/去除重量才可双击编辑!</span>
     </p>
     <scan v-show="false" :id="onlyUuid" @getQrCode="getScanBar">扫码录入</scan>
     <div>
@@ -16,7 +16,7 @@
         @cell-dblclick="deeTableEdit"
       >
         <el-table-column type="index" :width="80" label="序号" align="center" />
-        <el-table-column :width="120" label="扫码录入" align="center">
+        <el-table-column v-if="flag" :width="120" label="扫码录入" align="center">
           <template slot-scope="scope">
             <el-popover
               v-model="scope.row.popoverVisible"
@@ -95,6 +95,7 @@
           </template>
         </el-table-column>
         <el-table-column
+          v-if="flag"
           prop="extMaterial.isRecord"
           label="是否记实"
           align="center"
@@ -324,7 +325,8 @@ export default {
         scanId: [{ required: true, message: '请扫码录入' }],
         count: [{ required: true, message: '请输入数量' }]
       },
-      stateList: []
+      stateList: [],
+      flag: false
     }
   },
   created() {},
@@ -337,6 +339,11 @@ export default {
   methods: {
     // 初始化数据
     init() {
+      if (this.$route.query.title === '装配任务执行') {
+        this.flag = true
+      } else {
+        this.flag = false
+      }
       // 设置数据
       this.loading = true
       this.tableData = []
@@ -390,7 +397,7 @@ export default {
     },
     deeTableEdit(row, column, cell, event) {
       var that = this
-      if (row.extMaterial.resType2.typeName !== '外购成品' || !row.jobResponseOutStorageVOS) return
+      if (row.extMaterial.resType2.typeName !== '外购成品' || !row.jobResponseOutStorageVOS || !this.flag) return
       if (column.property === 'actualWeight') {
         this.setRowValue = row.actualWeight
         row.actualWeightSelect = true

applications/dee-mes/src/views/taskExecution/components/TechnicalRequirements/components/Table2.vue

 <template>
   <section>
-    <!-- 表格 -->
-    <!-- <dee-table
-      :loading="loading"
-      :index-row="indexRow"
-      :columns="tableColums"
-      :data="tableData"
-      :options="tableOptions"
-    /> -->
     <el-table
       v-loading="loading"
       :data="tableData"
@@ -28,12 +20,15 @@
       >
         <template
           slot-scope="scope"
-        ><el-button
-          class="seepdf"
-          size="mini"
-          type="text"
-          @click="seePDF(scope.row)"
-        >{{ scope.row.docNumber }}</el-button>
+        >
+          <el-button
+            v-if="flag"
+            class="seepdf"
+            size="mini"
+            type="text"
+            @click="seePDF(scope.row)"
+          >{{ scope.row.docNumber }}</el-button>
+          <span v-else>{{ scope.row.docNumber }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="name" label="名称" header-align="center" />
@@ -104,7 +99,8 @@ export default {
       tableOptions: {
         stripe: true,
         border: true
-      }
+      },
+      flag: false
     }
   },
   created() {
@@ -120,6 +116,11 @@ export default {
     },
     // 初始化数据
     init() {
+      if (this.$route.query.title === '装配任务执行') {
+        this.flag = true
+      } else {
+        this.flag = false
+      }
       this.tableData = this.$parent.$parent.$parent.tableFile || []
       this.loading = false
     },

applications/dee-mes/src/views/taskExecution/index.vue

@@ -423,7 +423,7 @@
           class="gooey-menu-item"
           content="工作说明"
           :disabled="isOK"
-          @click="!isOK && $refs.TechnicalRequirements.open()"
+          @click="!isOK && $refs.TechnicalRequirements.open(headerData)"
         >
           <el-badge :value="12" class="item" hidden>
             <svg class="icon" aria-hidden="true">
@@ -853,6 +853,10 @@ export default {
               curRow = that.workingProcedure.find(
                 (p) => p.statusCode === 'UnderTest'
               )
+            } else if (this.$route.query.title === '检验任务执行') {
+              curRow = that.workingProcedure.find(
+                (p) => p.statusCode === 'Yes'
+              )
             } else {
               curRow = that.workingProcedure.find(
                 (p) => p.statusCode === 'Not'

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

@@ -114,6 +114,7 @@
 <script>
 // import Dialog from './dialog'
 // import TimeToSee from '@/views/mes/programExecutionManagement/assemblyPerform/components/TimeToSee/index'
+import { mapGetters } from 'vuex'
 import { post } from '@/utils/http'
 export default {
   name: 'TaskReceiveCard',
@@ -185,7 +186,11 @@ export default {
       searchElement: []
     }
   },
-  computed: {},
+  computed: {
+    ...mapGetters([
+      'activeModel'
+    ])
+  },
   watch: {
     $route: {
       handler(to, from) {
@@ -221,19 +226,13 @@ export default {
           title: this.$route.query.title + '执行',
           showMenu: false,
           showTag: 'false',
-          isOK: item.isOK
+          isOK: item.isOK,
+          backFlag: true
           // materNo: item.materNo,
           // airModelId: item.airModelId,
           // sortiesId: item.sortiesId,
         }
       })
-      this.$store.dispatch('menu/activeModel', {
-        appId: 'myTaskReceive',
-        pageInfo: {
-          title: this.$route.query.title,
-          path: '/dee-mes/taskExecution'
-        }
-      })
       this.$store.dispatch('app/closeSideBar', false)
     },
     getTaskAcceptance() {