Browse Source

修复显示,增加排序

master
cgx 5 months ago
parent
commit
aa2ee954a7
9 changed files with 8 additions and 18 deletions
  1. +1
    -9
      admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue
  2. +1
    -4
      admin-hanhai-vue/src/views/suggest/TbSuggestList.vue
  3. +0
    -5
      admin-hanhai-vue/src/views/suggest/modules/TbSuggestForm.vue
  4. +1
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/controller/TbProductController.java
  5. +1
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/controller/TbProductOrderController.java
  6. +1
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/controller/TbCustomsController.java
  7. +1
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/controller/TbSuggestController.java
  8. +1
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java
  9. +1
    -0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java

+ 1
- 9
admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue View File

@ -186,7 +186,7 @@
dataIndex: 'deposit'
},
{
title:'暂定数量',
title:'暂定数量',
align:"center",
dataIndex: 'num'
},
@ -195,14 +195,6 @@
align:"center",
dataIndex: 'productType_dictText'
},
{
title:'交货时间',
align:"center",
dataIndex: 'transactionTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
},
{
title:'提货时间',
align:"center",


+ 1
- 4
admin-hanhai-vue/src/views/suggest/TbSuggestList.vue View File

@ -165,10 +165,7 @@
{
title:'提交时间',
align:"center",
dataIndex: 'submitTime',
customRender:function (text) {
return !text?"":(text.length>10?text.substr(0,10):text)
}
dataIndex: 'createTime',
},
{
title: '操作',


+ 0
- 5
admin-hanhai-vue/src/views/suggest/modules/TbSuggestForm.vue View File

@ -23,11 +23,6 @@
<j-image-upload isMultiple v-model="model.proofImg" ></j-image-upload>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="submitTime">
<j-date placeholder="请选择提交时间" v-model="model.submitTime" style="width: 100%" />
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
</j-form-container>


+ 1
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/controller/TbProductController.java View File

@ -52,6 +52,7 @@ public class TbProductController extends JeecgController<TbProduct, ITbProductSe
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TbProduct> queryWrapper = QueryGenerator.initQueryWrapper(tbProduct, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<TbProduct> page = new Page<TbProduct>(pageNo, pageSize);
IPage<TbProduct> pageList = tbProductService.page(page, queryWrapper);
return Result.OK(pageList);


+ 1
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/controller/TbProductOrderController.java View File

@ -53,6 +53,7 @@ public class TbProductOrderController extends JeecgController<TbProductOrder, IT
HttpServletRequest req) {
QueryWrapper<TbProductOrder> queryWrapper = QueryGenerator.initQueryWrapper(tbProductOrder, req.getParameterMap());
Page<TbProductOrder> page = new Page<TbProductOrder>(pageNo, pageSize);
queryWrapper.orderByDesc("create_time");
IPage<TbProductOrder> pageList = tbProductOrderService.page(page, queryWrapper);
return Result.OK(pageList);
}


+ 1
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbCustoms/controller/TbCustomsController.java View File

@ -52,6 +52,7 @@ public class TbCustomsController extends JeecgController<TbCustoms, ITbCustomsSe
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TbCustoms> queryWrapper = QueryGenerator.initQueryWrapper(tbCustoms, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<TbCustoms> page = new Page<TbCustoms>(pageNo, pageSize);
IPage<TbCustoms> pageList = tbCustomsService.page(page, queryWrapper);
return Result.OK(pageList);


+ 1
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/tbSuggest/controller/TbSuggestController.java View File

@ -52,6 +52,7 @@ public class TbSuggestController extends JeecgController<TbSuggest, ITbSuggestSe
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<TbSuggest> queryWrapper = QueryGenerator.initQueryWrapper(tbSuggest, req.getParameterMap());
queryWrapper.orderByDesc("create_time");
Page<TbSuggest> page = new Page<TbSuggest>(pageNo, pageSize);
IPage<TbSuggest> pageList = tbSuggestService.page(page, queryWrapper);
return Result.OK(pageList);


+ 1
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/userRole/controller/TbUserRoleController.java View File

@ -53,6 +53,7 @@ public class TbUserRoleController extends JeecgController<TbUserRole, ITbUserRol
HttpServletRequest req) {
QueryWrapper<TbUserRole> queryWrapper = QueryGenerator.initQueryWrapper(tbUserRole, req.getParameterMap());
Page<TbUserRole> page = new Page<TbUserRole>(pageNo, pageSize);
queryWrapper.orderByDesc("create_time");
IPage<TbUserRole> pageList = tbUserRoleService.page(page, queryWrapper);
return Result.OK(pageList);
}


+ 1
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java View File

@ -127,6 +127,7 @@ public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct>
JSONObject jsonObject = new JSONObject();
tbProductOrder.setCompanyName(one1.getCompanyName());
tbProductOrder.setBankName(one1.getBankNama());
tbProductOrder.setProductType(product.getProductType());
tbProductOrder.setBankAccount(one1.getBankAccount());
jsonObject.put("bankAccount", one1.getBankAccount());
jsonObject.put("companyName", one1.getCompanyName());


Loading…
Cancel
Save