diff --git a/logistics.conf b/logistics.conf index 7d0287e..5b2ffd0 100644 --- a/logistics.conf +++ b/logistics.conf @@ -4,7 +4,7 @@ server { client_max_body_size 90m; location /api { - proxy_pass http://192.168.77.91:8099/api; + proxy_pass http://127.0.0.1:8099/api; } location /{ diff --git a/public/antd_color.less b/public/antd_color.less index b746b9c..08f0aa1 100644 --- a/public/antd_color.less +++ b/public/antd_color.less @@ -1373,9 +1373,9 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;} .ant-tag-checkable:active, .ant-tag-checkable-checked {color: #fff;} .ant-tag-checkable-checked {background-color: @primary-color;} .ant-tag-checkable:active {background-color: color(~`colorPalette("@{primary-color}", 7)`);} -.ant-tag-pink {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;} +.ant-tag-pink {color: #eb2f96;background: color(~`colorPalette("@{text-color-secondary}", 1)`);border-color: #ffadd2;} .ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} -.ant-tag-magenta {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;} +.ant-tag-magenta {color: #eb2f96;background: color(~`colorPalette("@{text-color-secondary}", 1)`);border-color: #ffadd2;} .ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;} .ant-tag-red {color: #f5222d;background: #fff1f0;border-color: #ffa39e;} .ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;} diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue index 494b380..b91995d 100644 --- a/src/views/checkManage/checkOperation.vue +++ b/src/views/checkManage/checkOperation.vue @@ -118,14 +118,7 @@ export default { index: 0, imgUrl: '', params:[ - { - label:'盘点批次号', - key: 'lotnum' - }, - { - label:'随行工单号', - key: 'orderNum' - }, + { label:'盘点任务号', key: 'checkNum' diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue index 36ebf0c..25736c8 100644 --- a/src/views/historyCheck/index.vue +++ b/src/views/historyCheck/index.vue @@ -3,9 +3,9 @@