Merge branch 'dev' into 'purchaseDev'

收货地址档案修改

See merge request new-business/drp-web!157

src/api/purchase/basic.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取物料分工列表
 export function getDivisionList(data) {
   return request({
-    url: `/material/division/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    url: `/material/division/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}&isAsc=desc&orderByColumn=updateTime`,
     method: 'post',
     data: data
   })

src/api/purchase/deliveryAddress.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 获取收货地址档案列表
 export function getAddressList(data) {
   return request({
-    url: `/pu/delivery/address/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}`,
+    url: `/pu/delivery/address/list?pageSize=${data.pageSize}&pageNum=${data.pageNum}&isAsc=desc&orderByColumn=updateTime`,
     method: 'post',
     data: data
   })

src/views/purchase/deliveryAddress/index.vue

@@ -176,7 +176,7 @@
         >
           <el-table-column show-overflow-tooltip type="selection" width="55" />
           <el-table-column show-overflow-tooltip label="仓库属性" align="center" prop="warehouseProperty"/>
-          <el-table-column show-overflow-tooltip label="仓库档案名称" align="center" width="200" prop="warehouseCode"/>
+          <el-table-column show-overflow-tooltip label="仓库档案名称" align="center" width="200" prop="warehouseName"/>
           <el-table-column show-overflow-tooltip label="收货仓库编码" align="center" prop="code" />
           <el-table-column show-overflow-tooltip label="收货仓库名称" align="center" width="150" prop="name"/>
           <el-table-column show-overflow-tooltip label="详细地址" align="center" width="150" prop="address"/>