Selaa lähdekoodia

1.资产跳转详情传参优化
2.资产非代办列表进入详情页禁止业务操作的相关按钮

GouGengquan 1 vuosi sitten
vanhempi
commit
dee4bb3e06

+ 6 - 1
src/views/assets/allList.vue

@@ -226,10 +226,15 @@ export default {
             })
         },
         orderDetail(row) {
+            const newRow = {
+                assetsId: row.assetsId,
+                statementNo: row.statementNo,
+                reportNo: row.reportNo,
+            }
             this.$router.push({
                 path: "/assets/orderDetail",
                 query: {
-                    row: JSON.stringify(row),
+                    row: JSON.stringify(newRow),
                     back: '/assets/allList',
                     couldEdit: false,
                     couldBack: false,

+ 6 - 1
src/views/assets/departmentDoneList.vue

@@ -170,10 +170,15 @@ export default {
             })
         },
         orderDetail(row) {
+            const newRow = {
+                assetsId: row.assetsId,
+                statementNo: row.statementNo,
+                reportNo: row.reportNo,
+            }
             this.$router.push({
                 path: "/assets/orderDetail",
                 query: {
-                    row: JSON.stringify(row),
+                    row: JSON.stringify(newRow),
                     back: '/assets/archivedList',
                     couldEdit: false,
                     couldBack: false,

+ 13 - 3
src/views/assets/departmentTodoList.vue

@@ -109,7 +109,7 @@
                 <el-table-column label="操作" align="center" width="100" fixed="right">
                     <template slot-scope="{row}">
                         <el-button type="text" @click="orderViewDetail(row)">查看</el-button>
-                        <el-button v-if="row.handlerId === $store.getters.userInfo.id" type="danger" size="mini"
+                        <el-button v-if="row.handlerId === $store.getters.userInfo.id" type="text"
                             @click="orderDetail(row)">任务处理</el-button>
                     </template>
                 </el-table-column>
@@ -258,10 +258,15 @@ export default {
                     || row.currentNodeCode === 'REPORT_OUT') {
                     activeTabName = 'production';
                 }
+                const newRow = {
+                    assetsId: row.assetsId,
+                    statementNo: row.statementNo,
+                    reportNo: row.reportNo,
+                }
                 this.$router.push({
                     path: "/assets/orderDetail",
                     query: {
-                        row: JSON.stringify(row),
+                        row: JSON.stringify(newRow),
                         back: '/assets/department/todoList',
                         couldEdit: true,
                         couldBack: true,
@@ -272,10 +277,15 @@ export default {
             }
         },
         orderViewDetail(row) {
+            const newRow = {
+                assetsId: row.assetsId,
+                statementNo: row.statementNo,
+                reportNo: row.reportNo,
+            }
             this.$router.push({
                 path: "/assets/orderDetail",
                 query: {
-                    row: JSON.stringify(row),
+                    row: JSON.stringify(newRow),
                     back: '/assets/department/todoList',
                     couldEdit: false,
                     couldBack: false,

+ 6 - 1
src/views/assets/doneList.vue

@@ -156,10 +156,15 @@ export default {
             })
         },
         orderDetail(row) {
+            const newRow = {
+                assetsId: row.assetsId,
+                statementNo: row.statementNo,
+                reportNo: row.reportNo,
+            }
             this.$router.push({
                 path: "/assets/orderDetail",
                 query: {
-                    row: JSON.stringify(row),
+                    row: JSON.stringify(newRow),
                     back: '/assets/archivedList',
                     couldEdit: false,
                     couldBack: false,

+ 6 - 1
src/views/assets/myOrderList.vue

@@ -690,10 +690,15 @@ export default {
             })
         },
         orderDetail(row) {
+            const newRow = {
+                assetsId: row.assetsId,
+                statementNo: row.statementNo,
+                reportNo: row.reportNo,
+            }
             this.$router.push({
                 path: "/assets/orderDetail",
                 query: {
-                    row: JSON.stringify(row),
+                    row: JSON.stringify(newRow),
                     back: '/assets/myOrderList',
                     couldEdit: false,
                     couldBack: false,

+ 9 - 9
src/views/assets/orderDetail.vue

@@ -484,7 +484,7 @@
                   </el-button>
                   <el-button v-if="currentNode.nodeCode === 'SPOT_RECONNAISSANCE_DETERMINE_PRICE'" type="text"
                     size="small" @click="assetsTargetDelete(scope.row.id)">删除</el-button>
-                  <el-button v-if="currentNode.nodeCode === 'REVIEW_STATEMENT' || currentNode.nodeCode === 'CHECK_REPORT'"
+                  <el-button v-if="(currentNode.nodeCode === 'REVIEW_STATEMENT' || currentNode.nodeCode === 'CHECK_REPORT') && !disabledStatus"
                     type="text" size="small" @click="openCheckValueDialog(scope.row.id);">审核定价</el-button>
                 </template>
               </el-table-column>
@@ -751,44 +751,44 @@
                     查看
                   </el-button>
                   <el-button
-                    v-if="currentNode.nodeCode === 'REVIEW_STATEMENT' || (currentNode.nodeCode === 'GENERATE_STATEMENT' && scope.row.productionType === 'STATEMENT') || (currentNode.nodeCode === 'WRITE_REPORT' && scope.row.productionType !== 'STATEMENT')"
+                    v-if="(currentNode.nodeCode === 'REVIEW_STATEMENT' || (currentNode.nodeCode === 'GENERATE_STATEMENT' && scope.row.productionType === 'STATEMENT') || (currentNode.nodeCode === 'WRITE_REPORT' && scope.row.productionType !== 'STATEMENT'))  && !disabledStatus"
                     type="text" size="small"
                     @click="openWriteProductionDialog(false, 'edit'), getAssetsProductionDetail(scope.row.id)">
                     编辑
                   </el-button>
                   <el-button
-                    v-if="currentNode.nodeCode === 'REVIEW_STATEMENT' && scope.row.productionType === 'STATEMENT'"
+                    v-if="currentNode.nodeCode === 'REVIEW_STATEMENT' && scope.row.productionType === 'STATEMENT' && !disabledStatus"
                     type="text" size="small"
                     @click="productionPerformanceForm.productionId = scope.row.id, openProductionCheckDialog()">
                     审核意见书
                   </el-button>
                   <el-button
-                    v-if="currentNode.nodeCode === 'REEXAMINE_STATEMENT' && scope.row.productionType === 'STATEMENT'"
+                    v-if="currentNode.nodeCode === 'REEXAMINE_STATEMENT' && scope.row.productionType === 'STATEMENT' && !disabledStatus"
                     type="text" size="small"
                     @click="productionPerformanceForm.productionId = scope.row.id, openProductionCheckDialog()">
                     复审意见书
                   </el-button>
-                  <el-button v-if="currentNode.nodeCode === 'CHECK_REPORT' && scope.row.productionType !== 'STATEMENT'"
+                  <el-button v-if="currentNode.nodeCode === 'CHECK_REPORT' && scope.row.productionType !== 'STATEMENT' && !disabledStatus"
                     type="text" size="small"
                     @click="productionPerformanceForm.productionId = scope.row.id, openProductionCheckDialog()">
                     审核报告
                   </el-button>
-                  <el-button v-if="currentNode.nodeCode === 'RECHECK_REPORT' && scope.row.productionType !== 'STATEMENT'"
+                  <el-button v-if="currentNode.nodeCode === 'RECHECK_REPORT' && scope.row.productionType !== 'STATEMENT' && !disabledStatus"
                     type="text" size="small"
                     @click="productionPerformanceForm.productionId = scope.row.id, openProductionCheckDialog()">
                     复审报告
                   </el-button>
                   <el-button
-                    v-if="currentNode.nodeCode === 'FOURTH_CHECK_REPORT' && scope.row.productionType !== 'STATEMENT'"
+                    v-if="currentNode.nodeCode === 'FOURTH_CHECK_REPORT' && scope.row.productionType !== 'STATEMENT' && !disabledStatus"
                     type="text" size="small"
                     @click="productionPerformanceForm.productionId = scope.row.id, openProductionCheckDialog()">
                     四审报告
                   </el-button>
                   <el-button
-                    v-if="(currentNode.nodeCode === 'STATEMENT_IN' || currentNode.nodeCode === 'REPORT_IN') && scope.row.repertoryState === null"
+                    v-if="(currentNode.nodeCode === 'STATEMENT_IN' || currentNode.nodeCode === 'REPORT_IN') && scope.row.repertoryState === null && !disabledStatus"
                     type="text" size="small" @click="openWareHouseDialog(scope.row);">产品入库</el-button>
                   <el-button
-                    v-if="(currentNode.nodeCode === 'STATEMENT_OUT' || currentNode.nodeCode === 'REPORT_OUT') && scope.row.repertoryState === false"
+                    v-if="(currentNode.nodeCode === 'STATEMENT_OUT' || currentNode.nodeCode === 'REPORT_OUT') && scope.row.repertoryState === false && !disabledStatus"
                     type="text" size="small" @click="openWareHouseDialog(scope.row);">产品出库</el-button>
                 </template>
               </el-table-column>

+ 7 - 2
src/views/assets/terminateList.vue

@@ -218,10 +218,15 @@ export default {
             })
         },
         orderDetail(row) {
+            const newRow = {
+                assetsId: row.assetsId,
+                statementNo: row.statementNo,
+                reportNo: row.reportNo,
+            }
             this.$router.push({
                 path: "/assets/orderDetail",
                 query: {
-                    row: JSON.stringify(row),
+                    row: JSON.stringify(newRow),
                     back: '/assets/allList',
                     couldEdit: false,
                     couldBack: false,
@@ -229,7 +234,7 @@ export default {
                 }
             })
         },
-        toAddAssetsOrder(row){
+        toAddAssetsOrder(row) {
             this.$router.push({
                 path: "/assets/addOrder",
                 query: {