소스 검색

1.classstructureid改为assetnum,2.其他事项-综合事项参数修改

yunxing 4 년 전
부모
커밋
f5a74de174

+ 1 - 1
src/views/equipmentFacilities/EquipmentList.vue

@@ -19,7 +19,7 @@
                 <van-cell is-link v-for='item in list' @click='goToDetail(item)' :key='item.classstructureid'>
                     <!-- 使用 title 插槽来自定义标题 -->
                     <template #title>
-                        <span class='number'>{{item.classstructureid}}</span>
+                        <span class='number'>{{item.assetnum}}</span>
                         <span class='name'>{{item.sbjc}}</span>
                     </template>
                     <template #right-icon>

+ 2 - 2
src/views/equipmentFacilities/MoreEquipmentList.vue

@@ -37,7 +37,7 @@
                     >
                         <!-- 使用 title 插槽来自定义标题 -->
                         <template #title>
-                            <span class='number'>{{detail.classstructureid}}</span>
+                            <span class='number'>{{detail.assetnum}}</span>
                             <span class='name'>{{detail.sbjc}}</span>
                         </template>
                         <template #right-icon>
@@ -60,7 +60,7 @@
                         <van-cell is-link class='info' v-for='detail in item.list' @click='goToDetail(detail)' :key='detail.classstructureid'>
                             <!-- 使用 title 插槽来自定义标题 -->
                             <template #title>
-                                <span class='number'>{{detail.classstructureid}}</span>
+                                <span class='number'>{{detail.assetnum}}</span>
                                 <span class='name'>{{detail.sbjc}}</span>
                             </template>
                             <template #right-icon>

+ 8 - 6
src/views/otherMatter/ComprehensiveMatter.vue

@@ -13,7 +13,7 @@
                     <!-- 政府部门 -->
                     <div class='government-department'>
                         <!-- <div class='government-department' v-if='item.department.indexOf("其他")'> -->
-                        <van-cell :title='item.department' is-link :value='`${item.count}`' @click='goToMattersFetail(item,1)' />
+                        <van-cell :title='item.text' is-link :value='`${item.count}`' @click='goToMattersFetail(item)' />
                     </div>
                     <!-- 其他部门 -->
                     <!-- <div class='other-department' v-else>
@@ -163,7 +163,10 @@ export default {
                 }
                 if (item.otherdescription) {
                     let otherdescription = item.otherdescription.replace(/(\(无\)|\(无\))/g, '')
-                    otherdescription && (item.department = item.department + '-' + otherdescription)
+                    otherdescription && (item.text = item.department + '-' + otherdescription)
+                    otherdescription === '无' && (item.text = item.department)
+                } else {
+                    item.text = item.department
                 }
             })
             // if (['其他部门', '其他', '其它'].includes(data[0].department)) {
@@ -253,15 +256,14 @@ export default {
         },
         /**
          *  跳转 列表页面
-         *  @param { Number } 1:政府部门 2:其他部门
          */
-        goToMattersFetail(data, type) {
+        goToMattersFetail(data) {
             // console.log(data)
             let { department, otherdescription, cnt } = data
             console.log(data)
             let params = {
-                type, //部门类型
                 department, //部门名称
+                otherdescription,
                 size: cnt, //分页,按照cnt(count)字段
                 createdateStartDate: this.createdateStartDate,
                 createdateEndDate: this.createdateEndDate,
@@ -273,7 +275,7 @@ export default {
                 delete params.createdateEndDate
             }
             // 其他部门,传递 其他部门说明字段
-            type == 2 && (params.otherdescription = otherdescription)
+            otherdescription && (params.otherdescription = otherdescription)
             this.$router.push({ name: 'ComprehensiveMatterList', params })
         },
     },

+ 7 - 3
src/views/otherMatter/ComprehensiveMatterList.vue

@@ -97,14 +97,18 @@ export default {
     },
     created() {
         console.log(this.$route.params)
-        let { type, department, otherdescription, size, createdateStartDate, createdateEndDate } = this.$route.params
+        let { department, otherdescription, size, createdateStartDate, createdateEndDate } = this.$route.params
         this.size = size
-        if (type === 1) {
+        if (!otherdescription) {
             this.params = { department, createdateStartDate, createdateEndDate }
             this.title = department
         } else {
             this.params = { department, otherdescription, createdateStartDate, createdateEndDate }
-            this.title = '其他部门'
+            if (otherdescription !== '无') {
+                this.title = department + '-' + otherdescription
+            } else {
+                this.title = department
+            }
         }
         this.getList()
     },