diff --git a/pages/material/component/carditem.vue b/pages/material/component/carditem.vue index 49c7655..70fc5bc 100644 --- a/pages/material/component/carditem.vue +++ b/pages/material/component/carditem.vue @@ -34,19 +34,34 @@ {{ v.materialName }} - 物料编码: {{ v.materialNo }} + + 物料编码: + + {{ v.materialNo }} - 规格型号: {{ v.specificationModel }} + + 规格型号: + + {{ v.specificationModel }} - 品牌型号：{{ v.brandType }} + + 品牌型号: + + {{ v.brandType }} - 生产厂家：{{ v.manufacturer }} + + 生产厂家: + + {{ v.manufacturer }} - 供 应 商 ：{{ v.gysName }} + + 供应商: + + {{ v.gysName }} @@ -131,7 +146,7 @@ } // const caigouobj = ref({}) const addcar = (v : any, i : number) => { - console.log("看看值",v) + console.log("看看值", v) cardvalue.value = v; priceshow.value = true // console.log("为啥点击不上啊",i) @@ -240,7 +255,7 @@ .crdcroll { width: 90vw; - height: calc(100vh - 5vw); + height: calc(100vh - 2vw); .box { width: 90vw; @@ -392,7 +407,8 @@ font-size: 32rpx; border-radius: 12rpx; } - .no-price{ + + .no-price { position: absolute; top: 80rpx; right: 32rpx; @@ -406,6 +422,7 @@ font-size: 23rpx; color: #FF6161; } + .white-tag { color: #666666; /* 字体灰 */ @@ -479,15 +496,29 @@ &:nth-child(5) { margin-top: 0.25vw; max-width: 25vw; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; + // white-space: nowrap; + // text-overflow: ellipsis; + // overflow: hidden; + display: flex; + // align-items: center; + font-weight: 400; + font-size: 1.3vw; + color: #777777; + margin-top: 0.25vw; - text { - font-weight: 400; - font-size: 1.3vw; - color: #777777; - margin-top: 0.25vw; + + + .left-text { + width: 140rpx; + } + .right-text{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: 320rpx; + } + .letter { + letter-spacing: 9.2rpx; } } diff --git a/pages/material/component/crkitem.vue b/pages/material/component/crkitem.vue index 3e67e0c..48e2327 100644 --- a/pages/material/component/crkitem.vue +++ b/pages/material/component/crkitem.vue @@ -60,10 +60,10 @@ 已添加 --> - + - + 出入库 @@ -221,7 +221,7 @@ } .crdcroll { width: 86vw; - height: calc(100vh - 6vw); + height: calc(100vh - 3vw); margin-top: 0.3vw; .box { @@ -257,7 +257,7 @@ // background-color: blue; position: absolute; top: -3vw; - right: -16vw; + right: -11vw; z-index: 55; >view { @@ -309,7 +309,7 @@ justify-content: center; flex-direction: column; align-items: center; - right: 2.6vw; + left: 32vw; top: -1.5vw; text{ font-weight: bold; @@ -399,7 +399,7 @@ } .msitem { - min-width: 20vw; + width: 25vw; height: 14vw; margin-right: 4.2vw; position: relative; diff --git a/pages/material/component/information.vue b/pages/material/component/information.vue index 76f653a..a6fd952 100644 --- a/pages/material/component/information.vue +++ b/pages/material/component/information.vue @@ -53,7 +53,7 @@ 采购单号：{{ item.ddNo }} - {{ item.crkNum }} +{{ item.gzsl }} -{{ item.xzsl }} {{ item.materialUnits }} + {{ item.crkNum }} +{{ item.gzsl }}挂 -{{ item.xzsl }}销 采 购 人 ： {{ item.cgBy }} diff --git a/pages/material/material.vue b/pages/material/material.vue index 3b59006..a461a85 100644 --- a/pages/material/material.vue +++ b/pages/material/material.vue @@ -33,11 +33,16 @@ + + + + + diff --git a/pages/procure/api/api.js b/pages/procure/api/api.js new file mode 100644 index 0000000..3f51d1b --- /dev/null +++ b/pages/procure/api/api.js @@ -0,0 +1,42 @@ +// 引入 request 文件 +import request from '@/request/index.js' + +// 查询采购单列表 +export const queryCgdList = (params) => { + return request({ + url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryCgdList?nuId=${uni.getStorageSync('nuId')}&pageNo=${params.pageNo}&pageSize=10`, + method: 'get', + // data: params, + }) +} +// // 盘点接口 +// export const savePddInfo = (params) => { +// return request({ +// url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/savePddInfo`, +// method: 'post', +// data: params, +// }) +// } + +// // 查询物料的进度 +// export const getPdjd = () => { +// return request({ +// url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/getPdjd?nuId=${uni.getStorageSync('nuId')}`, +// method: 'get', +// }) +// } +// // 查询物料信息列表 +// export const queryCrkInfoList = (param) => { +// return request({ +// url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/queryCrkInfoList?nuId=${uni.getStorageSync('nuId')}&column=createTime&order=desc&pageNo=${param.pageNo}&pageSize=15&wlId=${param.wlId}&cgdId=${param.cgdId}`, +// method: 'get', +// }) +// } +// // 改价接口 +// export const editXsjg = (params) => { +// return request({ +// url: `${uni.getStorageSync('serverUrl')}/api/pad/invoicing/editXsjg`, +// method: 'post', +// data: params, +// }) +// } \ No newline at end of file diff --git a/pages/procure/procure.vue b/pages/procure/procure.vue index e240d10..9a2d9b7 100644 --- a/pages/procure/procure.vue +++ b/pages/procure/procure.vue @@ -1,6 +1,7 @@ + + .center { + display: flex; + justify-content: center; + align-items: center; + } + \ No newline at end of file diff --git a/request/index.js b/request/index.js index 7acca46..6a1ba8d 100644 --- a/request/index.js +++ b/request/index.js @@ -1,6 +1,6 @@ // 全局请求封装 export const base_url = 'https://www.focusnu.com/opeapi' -// export const base_url = 'http://192.168.2.27:8081/opeapi/' +// export const base_url = 'http://192.168.2.16:8081/opeapi/' // const base_url = 'http://192.168.2.55:8081/opeapi' export const media_url = 'https://www.focusnu.com/media/' // 请求超出时间