diff --git a/public/antd_color.less b/public/antd_color.less index 791d9a1..b746b9c 100644 --- a/public/antd_color.less +++ b/public/antd_color.less @@ -1395,7 +1395,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;} .ant-tag-green-inverse {color: #fff;background: #52c41a;border-color: #52c41a;} .ant-tag-blue {color: #1890ff;background: #e6f7ff;border-color: #91d5ff;} .ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;} -.ant-tag-geekblue {color: #2f54eb;background: color(~`colorPalette("@{text-color}", 2)`);border-color: #adc6ff;} +.ant-tag-geekblue {color: #2f54eb;background: #f0f5ff;border-color: #adc6ff;} .ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;} .ant-tag-purple {color: #722ed1;background: #f9f0ff;border-color: #d3adf7;} .ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;} diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue index 1d3c12c..cf8914e 100644 --- a/src/views/checkManage/Subsection.vue +++ b/src/views/checkManage/Subsection.vue @@ -13,6 +13,7 @@ + @@ -243,7 +244,9 @@ export default { color = '#1afa29' }else if(status == 1){ color = '#d81e06' - }else{ + }else if(status == 4){ + color = '#ede900' + }else{ color = '#bfbfbf' } dom.style.background = color diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 8c617fe..ca08dc7 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -86,13 +86,13 @@

顶部图片1

- +

顶部图片2

- +
@@ -100,13 +100,13 @@

侧面图片1

- +

侧面图片2

- +
@@ -114,13 +114,13 @@

侧面图片3

- +

侧面图片4

- +
@@ -167,6 +167,7 @@ export default { data() { return { checkObj: {}, + pics:[], row: 1, column: 1, streetName: "", @@ -197,6 +198,7 @@ export default { 1: "盘点异常", 2: "核对正确", 3: "人工核对正确", + 4: "需要人工核对", }, }; }, @@ -268,7 +270,13 @@ export default { if (res.data) { this.checkObj = res.data; this.checkObj.checkPic2 = - this.checkObj.checkPic + ".jpg"; + this.checkObj.checkPic + ".jpg"; + this.pics.push(this.checkObj.topPic1); + this.pics.push(this.checkObj.topPic2); + this.pics.push(this.checkObj.sidePic1); + this.pics.push(this.checkObj.sidePic2); + this.pics.push(this.checkObj.sidePic3); + this.pics.push(this.checkObj.sidePic4); //this.shelveId = res.data.shelveId; //this.getScanAndCheck(); } @@ -384,6 +392,13 @@ export default { this.streetName = res.data.streetName; this.checkObj.checkPic2 = this.checkObj.checkPic + ".jpg"; + + this.pics.push(this.checkObj.topPic1); + this.pics.push(this.checkObj.topPic2); + this.pics.push(this.checkObj.sidePic1); + this.pics.push(this.checkObj.sidePic2); + this.pics.push(this.checkObj.sidePic3); + this.pics.push(this.checkObj.sidePic4); } else { message.info("全部盘点已完成"); } diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue index 1efeb32..4135333 100644 --- a/src/views/checkManage/index.vue +++ b/src/views/checkManage/index.vue @@ -46,6 +46,13 @@ > 盘点正确 + + + 需要人工盘点 +