diff --git a/apis/addUserApi.js b/apis/addUserApi.js index 810e657..9c880e8 100644 --- a/apis/addUserApi.js +++ b/apis/addUserApi.js @@ -23,3 +23,14 @@ export function addCustomer(data) { data }) } +/** + * 根据企业名称查询企业坐标列表 + * @param {*} data + * @returns + */ +export function getCompanyLocationList(data) { + return http.get({ + url: '/yyt-uec/get/enterprise/geographic/position/address', + data + }) +} diff --git a/apis/commonApi.js b/apis/commonApi.js index 59cee82..13a1fcb 100644 --- a/apis/commonApi.js +++ b/apis/commonApi.js @@ -76,3 +76,13 @@ export function getVerifyUrl(data = {}) { export function getGuaranteeContract(data = {}) { return http.post({ url: '/yyt-uec/create/supplier/guarantee-contract?mallSupplierId=' + data.mallSupplierId, data }) } +/** + * 转换合同成图片 + * @param {object} data 图片地址链接 fileUrl + */ +export function transformFileToImg(data) { + http.get({ + url: '/document/get/enterprise-documents/file-image-base64', + data: data + }) +} diff --git a/apis/orderApi.js b/apis/orderApi.js index 7b37c81..1dbeb15 100644 --- a/apis/orderApi.js +++ b/apis/orderApi.js @@ -47,3 +47,39 @@ export function confirmSupplierOrder(data) { data }) } + +/** + * 供应商操作纸品状态 + * @param {object} data + * @returns {Promise} + */ +export function supplierOperatePaper(data) { + return http.post({ + url: '/base-paper-trading/supplier/submit/outbound/delivery', + data + }) +} + +/** + * 供应商上传送货凭证 + * @param {object} data + * @returns {Promise} + */ +export function supplierUploadVoucher(data) { + return http.post({ + url: '/base-paper-trading/supplier/submit/upload/delivery/voucher', + data + }) +} + +/** + * 供应商确认送货 + * @param {object} data supplierOrderId + * @returns {Promise} + */ +export function supplierDelivery(data) { + return http.post({ + url: '/base-paper-trading/supplier/submit/confirm/delivery', + data + }) +} diff --git a/components/bussiness-components/packingStationItem.vue b/components/bussiness-components/packingStationItem.vue index da5eeea..bf9e782 100644 --- a/components/bussiness-components/packingStationItem.vue +++ b/components/bussiness-components/packingStationItem.vue @@ -10,7 +10,7 @@ {{ transformBusiness(info.business) }} - + 月采购量 @@ -30,7 +30,7 @@ - + 法定代表人 diff --git a/components/qn-map/qn-map.nvue b/components/qn-map/qn-map.nvue index e7262de..a2aa7d9 100644 --- a/components/qn-map/qn-map.nvue +++ b/components/qn-map/qn-map.nvue @@ -49,9 +49,11 @@ export default { watch: { // 只监听items一层变化 items(val) { + console.log('val:',val) this.markers = val.map((item) => { return this.causeMarker(item) }) + console.log('res:',this.markers) this.mapContext.addMarkers({ markers: this.markers, clear: true, diff --git a/manifest.json b/manifest.json index 76c1e80..db3feb2 100644 --- a/manifest.json +++ b/manifest.json @@ -35,18 +35,21 @@ "android" : { "permissions" : [ "", + "", "", "", "", "", "", "", + "", "", "", "", "", "", "", + "", "", "", "" @@ -77,7 +80,8 @@ "appkey_ios" : "0182ee2a9fdd5fd3ef6a8bd5a2f98325", "appkey_android" : "877848546f7f3717101a17c33e1d4df3" } - } + }, + "share" : {} } }, "uniStatistics" : { diff --git a/pages/add-user/index.vue b/pages/add-user/index.vue index 8a74842..f03f9e0 100644 --- a/pages/add-user/index.vue +++ b/pages/add-user/index.vue @@ -73,6 +73,9 @@ > + + + @@ -81,7 +84,7 @@ @@ -243,6 +246,21 @@ + + + + 可选择以下定位公司 + + + + + {{ item.enterpriseName }} + {{ `${item.provinceName}/${item.cityName}/${item.districtName}/${item.address}` }} + + + + + @@ -259,7 +277,7 @@ diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue index 4899c6b..154b0bc 100644 --- a/pages/order-detail/index.vue +++ b/pages/order-detail/index.vue @@ -30,20 +30,22 @@ {{ `${order.brandName}${order.productName} | ${order.gramWeight}g | ${order.width}*${order.length} | ${order.pieceQuantity}张` }} - 分切 - - 出库 - - - 发货 + + 分切 + + 出库 + + + 发货 + @@ -66,7 +68,7 @@ @@ -80,6 +82,10 @@ + + + 上传凭证 + @@ -129,17 +135,25 @@ 取消订单 - 查看合同 - 确认发货 + 查看合同 + 确认发货