diff --git a/src/api/ma/device.js b/src/api/ma/device.js index 4ab12e80..1353aebd 100644 --- a/src/api/ma/device.js +++ b/src/api/ma/device.js @@ -88,3 +88,10 @@ export function synchReport(data) { data: data, }) } +export function editAssetsCode(data) { + return request({ + url: '/material/ma_machine/editAssetsCode', + method: 'post', + data: data, + }) +} \ No newline at end of file diff --git a/src/api/ma/typeConfigKeeper.js b/src/api/ma/typeConfigKeeper.js index fbc318db..c12dbada 100644 --- a/src/api/ma/typeConfigKeeper.js +++ b/src/api/ma/typeConfigKeeper.js @@ -27,7 +27,7 @@ export function bindKeeper(data) { }) } -// 库管员管理--绑定 +// 库管员管理--解绑 export function noBindKeeper(data) { return request({ url: '/material/ma_type_keeper/unbind', diff --git a/src/views/business/businessHandling/index.vue b/src/views/business/businessHandling/index.vue index b0405bc3..1421c52b 100644 --- a/src/views/business/businessHandling/index.vue +++ b/src/views/business/businessHandling/index.vue @@ -137,8 +137,20 @@ :value="item.typeId" :data-key="item.typeId" > + + + + @@ -1163,6 +1175,7 @@ export default { // downloadFileData({ fileName: file.name,fileUrl:file.url }) } }, + // 高亮文本 highlightText(text, keyword) { if (!keyword) return text @@ -1405,4 +1418,7 @@ export default { color: #fff; font-size: 20px; } +.type-tooltip { + max-width: none !important; +} diff --git a/src/views/home/equipment-supply/components/card-model.vue b/src/views/home/equipment-supply/components/card-model.vue index 25434093..4564dcbd 100644 --- a/src/views/home/equipment-supply/components/card-model.vue +++ b/src/views/home/equipment-supply/components/card-model.vue @@ -4,13 +4,15 @@ {{ cardTitle }} -
{{ cardNum }}
-
+
+
{{ cardNum }}
+
+
@@ -83,7 +85,7 @@ export default { position: relative; font-size: 14px; letter-spacing: 1px; - + width:100%; .icon-box { font-size: 18px; position: absolute; @@ -91,12 +93,20 @@ export default { } } + .f-count-wrapper { + width: 100%; + display: flex; + justify-content: center; /* 水平居中 */ + align-items: flex-end; /* 垂直靠下 */ + } .f-count { margin: 4px 0; font-size: 18px; font-weight: bold; letter-spacing: 2px; } + + } .card-model:hover { diff --git a/src/views/home/equipment-supply/index.vue b/src/views/home/equipment-supply/index.vue index daf6b8a6..ec5cec32 100644 --- a/src/views/home/equipment-supply/index.vue +++ b/src/views/home/equipment-supply/index.vue @@ -222,6 +222,14 @@ export default { cardNum: 0, ratio: 0 }, + { + title: '修试待入库量', + theme: '#b8741a', + icon: 'repair_store', + isReduce: true, + cardNum: 0, + ratio: 0 + }, { title: '新购待入库量', theme: '#bfbf00', @@ -230,14 +238,6 @@ export default { cardNum: 0, ratio: 0 }, - { - title: '修试待入库量', - theme: '#b8741a', - icon: 'repair_store', - isReduce: true, - cardNum: 0, - ratio: 0 - } ], cardList_3: [ { @@ -299,26 +299,26 @@ export default { const { data: res } = await getCardListApi(queryParams) const { demandNum, - demandIncrease, + // demandIncrease, suppliedQuantityNum, - suppliedQuantityIncrease, + // suppliedQuantityIncrease, suppliedToBeQuantityNum, - suppliedToBeQuantityIncrease, + // suppliedToBeQuantityIncrease, projectNum, suppliedQuantityAllNum, suppliedQuantityPrice } = res this.cardList_1[0].cardNum = demandNum - this.cardList_1[0].ratio = Math.abs(demandIncrease) - demandIncrease > 0 ? (this.cardList_1[0].isReduce = true) : (this.cardList_1[0].isReduce = false) + // this.cardList_1[0].ratio = Math.abs(demandIncrease) + // demandIncrease > 0 ? (this.cardList_1[0].isReduce = true) : (this.cardList_1[0].isReduce = false) this.cardList_1[1].cardNum = suppliedQuantityNum - this.cardList_1[1].ratio = Math.abs(suppliedQuantityIncrease) - suppliedQuantityIncrease > 0 ? (this.cardList_1[1].isReduce = true) : (this.cardList_1[1].isReduce = false) + // this.cardList_1[1].ratio = Math.abs(suppliedQuantityIncrease) + // suppliedQuantityIncrease > 0 ? (this.cardList_1[1].isReduce = true) : (this.cardList_1[1].isReduce = false) this.cardList_1[2].cardNum = suppliedToBeQuantityNum - this.cardList_1[2].ratio = Math.abs(suppliedToBeQuantityIncrease) - suppliedToBeQuantityIncrease > 0 - ? (this.cardList_1[2].isReduce = true) - : (this.cardList_1[2].isReduce = false) + // this.cardList_1[2].ratio = Math.abs(suppliedToBeQuantityIncrease) + // suppliedToBeQuantityIncrease > 0 + // ? (this.cardList_1[2].isReduce = true) + // : (this.cardList_1[2].isReduce = false) this.cardList_3[0].cardNum = projectNum this.cardList_3[1].cardNum = suppliedQuantityAllNum || 0 this.cardList_3[2].cardNum = suppliedQuantityPrice || 0 @@ -327,32 +327,32 @@ export default { const { data: result } = await getCardList_2Api(queryParams) const { inStockNum, - inStockIncrease, + // inStockIncrease, inUseNum, - inUseIncrease, + // inUseIncrease, inRepairNum, - inRepairIncrease, + // inRepairIncrease, newPurchaseNum, - newPurchaseIncrease, + // newPurchaseIncrease, newRepairNum, - newRepairIncrease + // newRepairIncrease } = result this.cardList_2[0].cardNum = inStockNum - this.cardList_2[0].ratio = Math.abs(inStockIncrease) - inStockIncrease > 0 ? (this.cardList_2[0].isReduce = true) : (this.cardList_2[0].isReduce = false) + // this.cardList_2[0].ratio = Math.abs(inStockIncrease) + // inStockIncrease > 0 ? (this.cardList_2[0].isReduce = true) : (this.cardList_2[0].isReduce = false) this.cardList_2[1].cardNum = inUseNum - this.cardList_2[1].ratio = Math.abs(inUseIncrease) - inUseIncrease > 0 ? (this.cardList_2[1].isReduce = true) : (this.cardList_2[1].isReduce = false) + // this.cardList_2[1].ratio = Math.abs(inUseIncrease) + // inUseIncrease > 0 ? (this.cardList_2[1].isReduce = true) : (this.cardList_2[1].isReduce = false) this.cardList_2[2].cardNum = inRepairNum - this.cardList_2[2].ratio = Math.abs(inRepairIncrease) - inRepairIncrease > 0 ? (this.cardList_2[2].isReduce = true) : (this.cardList_2[2].isReduce = false) + // this.cardList_2[2].ratio = Math.abs(inRepairIncrease) + // inRepairIncrease > 0 ? (this.cardList_2[2].isReduce = true) : (this.cardList_2[2].isReduce = false) this.cardList_2[3].cardNum = newPurchaseNum - this.cardList_2[3].ratio = Math.abs(newPurchaseIncrease) - newPurchaseIncrease > 0 ? (this.cardList_2[3].isReduce = true) : (this.cardList_2[3].isReduce = false) + // this.cardList_2[3].ratio = Math.abs(newPurchaseIncrease) + // newPurchaseIncrease > 0 ? (this.cardList_2[3].isReduce = true) : (this.cardList_2[3].isReduce = false) this.cardList_2[4].cardNum = newRepairNum - this.cardList_2[4].ratio = Math.abs(newRepairIncrease) - newRepairIncrease > 0 ? (this.cardList_2[4].isReduce = true) : (this.cardList_2[4].isReduce = false) + // this.cardList_2[4].ratio = Math.abs(newRepairIncrease) + // newRepairIncrease > 0 ? (this.cardList_2[4].isReduce = true) : (this.cardList_2[4].isReduce = false) this.pie_2Data = [ { value: inStockNum, name: '在库量', itemStyle: { color: '#26a8ff' } }, @@ -383,7 +383,7 @@ export default { const { data: pie1 } = await getPie_1DataApi(queryParams) const { demandNum, suppliedQuantityNum, suppliedToBeQuantityNum } = pie1 this.pie_1Data = [ - { value: demandNum, name: '计划需求量', itemStyle: { color: '#65dfe0' } }, + // { value: demandNum, name: '计划需求量', itemStyle: { color: '#65dfe0' } }, { value: suppliedQuantityNum, name: '已供应量', itemStyle: { color: '#ff8e9d' } }, { value: suppliedToBeQuantityNum, name: '待供应量', itemStyle: { color: '#6ccaf6' } } ] diff --git a/src/views/inventoryLogs/index.vue b/src/views/inventoryLogs/index.vue index 6e6151c7..0ed56d0a 100644 --- a/src/views/inventoryLogs/index.vue +++ b/src/views/inventoryLogs/index.vue @@ -46,6 +46,7 @@ +