diff --git a/app/api/property.js b/app/api/property.js index 0b864fd..5692e29 100644 --- a/app/api/property.js +++ b/app/api/property.js @@ -136,3 +136,39 @@ export function updateMaintenanceOrderStatus(data) { ); } +// 物资列表 +export function listCkstock() { + return request.get( + 'autogencode/ckcargostock/listCkstock', + {}, + { useAdminUrl: true } + ); +} + +// 提交领用申请 +export function quickOutBill(data) { + return request.post( + 'autogencode/ckbill/quickOutBill', + data, + { useAdminUrl: true } + ); +} + +// 获取领用记录列表 +export function stockPageList(params) { + return request.get( + 'autogencode/ckbill/stockPageList', + params, + { useAdminUrl: true } + ); +} + +// 取消单据 +export function cancelBill(id) { + return request.get( + `autogencode/ckbill/cancelBill/${id}`, + {}, + { useAdminUrl: true } + ); +} + diff --git a/app/config/app.js b/app/config/app.js index eadf9eb..8a9fc51 100644 --- a/app/config/app.js +++ b/app/config/app.js @@ -8,8 +8,8 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- //移动端商城API -// let domain = 'https://fzbfwy.com/mobile-api' -let domain = 'http://crmebxcx.test.jiutianda.cn' +let domain = 'https://fzbfwy.com/mobile-api' +// let domain = 'http://crmebxcx.test.jiutianda.cn' module.exports = { // 请求域名 格式: https://您的域名 @@ -18,8 +18,8 @@ module.exports = { // #ifdef MP HTTP_REQUEST_URL: domain, // #endif - HTTP_ADMIN_URL:'https://crmeb.test.jiutianda.cn', - // HTTP_ADMIN_URL:'https://fzbfwy.com/prod-api', //PC后台的API请求地址,上传图片用,影响h5上传头像 + // HTTP_ADMIN_URL:'https://crmeb.test.jiutianda.cn', + HTTP_ADMIN_URL:'https://fzbfwy.com/prod-api', //PC后台的API请求地址,上传图片用,影响h5上传头像 // #ifdef H5 //H5接口是浏览器地址 // HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host, diff --git a/app/pages/supply_chain/complaint/index.vue b/app/pages/supply_chain/complaint/index.vue index 1f4ff47..27bb18e 100644 --- a/app/pages/supply_chain/complaint/index.vue +++ b/app/pages/supply_chain/complaint/index.vue @@ -458,7 +458,7 @@ export default { .tabs { padding: 0 30rpx; display: flex; - margin-bottom: 30rpx; + margin-bottom: 15rpx; background-color: #fff; border-radius: 10rpx; box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.1); diff --git a/app/pages/supply_chain/material_receipt/index.vue b/app/pages/supply_chain/material_receipt/index.vue index 4fda10a..2441705 100644 --- a/app/pages/supply_chain/material_receipt/index.vue +++ b/app/pages/supply_chain/material_receipt/index.vue @@ -24,24 +24,20 @@ - 物资名称 - - + 物资选择 + + + + {{ item.cargoName }} ({{ item.cargoSpec }}) + × + + + + {{ selectedMaterials.length > 0 ? '已选择 ' + selectedMaterials.length + ' 项' : '请选择物资' }} + - - 领用数量 - - - 领用用途