zhuliu 1 年之前
父節點
當前提交
92ab5849e2

+ 9 - 4
src/utils/model/noPermission/index.vue

@@ -37,17 +37,22 @@ export default {
     top: 0;
     bottom: 0;
     margin: auto;
-    width: 220px;
-    height: 30px;
+    width: 180px;
+    height: 25px;
     z-index: 9999;
-    padding: 20px;
+    padding: 15px;
     border: none;
     box-shadow: 0.01333rem 0.01333rem 0.26667rem rgba(0,0,0,0.3);
     border-radius: 0.04rem;
     background: #fff;
     overflow: hidden;
+    font-size: 0.8rem;
+    i{
+        color: var(--bg);
+        font-size: 1rem;
+    }
     .myNoPermission_content{
-        line-height: 30px;
+        line-height: 25px;
     }
 }
 </style>

+ 5 - 0
src/views/product/components/commodity/commodity.vue

@@ -79,6 +79,11 @@ export default {
   components: {
     commodityTable,
   },
+  props:{
+    productId:{
+      default:0
+    }
+  },
   data() {
     return {
       //检索字段

+ 6 - 1
src/views/product/components/commodity/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 商品化专利 -->
   <div>
-    <commodity></commodity>
+    <commodity :productId="productId"></commodity>
   </div>
 </template>
 
@@ -16,6 +16,11 @@ export default {
 
     }
   },
+  computed:{
+    productId(){
+      return this.$route.query.productId
+    }
+  },
   mounted() {
 
   },

+ 1 - 1
src/views/product/components/index.vue

@@ -259,7 +259,7 @@ export default {
       let router = this.$router.resolve({
         path: '/commodity',
         query: {
-          
+          productId:row.id
         }
       })
       window.open(router.href,'_blank')

+ 1 - 1
src/views/project/index.vue

@@ -52,7 +52,7 @@
             </div>
           </el-main>
           <el-footer class="pagination" v-if="[2].indexOf(isOperate) == -1 && this.queryShowType != '2'">
-            <el-pagination backgroundx layout="total, prev, pager, next, jumper" :current-page.sync="queryParams.current"
+            <el-pagination backgroundx layout="total,sizes, prev, pager, next, jumper" :current-page.sync="queryParams.current"
               :page-size.sync="queryParams.size" @current-change="handleCurrentChange" :total="total">
             </el-pagination>
           </el-footer>

+ 1 - 1
src/views/report/components/index.vue

@@ -135,7 +135,7 @@ export default {
       //总数
       total: 0,
       //分页数量
-      pageSize: [10, "全部"],
+      pageSize: [10, 20],
       //排序字段
       sort: [
         {