diff --git a/package.json b/package.json index c97b16c1..4b7dd3c5 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@xkeshi/vue-barcode": "^1.0.0", "axios": "0.18.0", "echarts": "^4.2.0-rc.2", - "element-ui": "2.8.2", + "element-ui": "2.10.0", "file-saver": "^1.3.8", "html2canvas": "^1.0.0-alpha.12", "jquery": "^3.3.1", diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index f760d53a..2fabd94b 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -32,7 +32,7 @@ 物料状态: - + 物料名称: @@ -215,7 +215,7 @@ 物料状态: - + 零件图号: diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 41b249fc..f96a10be 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -12,7 +12,7 @@ 物料状态: - + { + searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent0, this.pageSize0, 1, check3, this.Name, check4, this.spec, check5, this.model).then(response => { this.tableData0 = response.data.rows this.total0 = response.data.total }) @@ -514,10 +514,10 @@ export default { let check1, check2, check3, check4, check5 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 - this.name ? check3 = 1 : check3 = 0 + this.Name ? check3 = 1 : check3 = 0 this.spec ? check4 = 1 : check4 = 0 this.model ? check5 = 1 : check5 = 0 - searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.name, check4, this.spec, check5, this.model).then(response => { + searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1, 2, check3, this.Name, check4, this.spec, check5, this.model).then(response => { this.tableData1 = response.data.rows this.total1 = response.data.total }) @@ -526,10 +526,10 @@ export default { let check1, check2, check3, check4, check5 this.machineNumberValue ? check1 = 1 : check1 = 0 this.groupNumberValue ? check2 = 1 : check2 = 0 - this.name ? check3 = 1 : check3 = 0 + this.Name ? check3 = 1 : check3 = 0 this.spec ? check4 = 1 : check4 = 0 this.model ? check5 = 1 : check5 = 0 - searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.name, check4, this.spec, check5, this.model).then(response => { + searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2, check3, this.Name, check4, this.spec, check5, this.model).then(response => { this.tableData2 = response.data.rows this.total2 = response.data.total }) diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index 4f1d21dc..fb6d3efc 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -26,7 +26,7 @@ type="success" size="small" icon="el-icon-search" - style="margin-left: 10px" + style="margin-left: 10px;margin-bottom:10px" @click="pageCurrent0=1;pageSize0=20;total0=0;searchTable0()">查询 采购员: @@ -49,7 +49,7 @@ :value="item.value"/> 物料状态: - + 查询 采购员: @@ -263,7 +263,7 @@ :value="item.value"/> 物料状态: - + 查询 采购员: @@ -477,7 +477,7 @@ :value="item.value"/> 物料状态: - + - + 重新加载 关闭当前 关闭其他 @@ -25,8 +25,8 @@ export default { data() { return { visible: false, - top: 0, - left: 0, + tagTop: 0, + tagLeft: 0, selectedTag: {} } }, @@ -111,9 +111,9 @@ export default { const status = Cookies.get('sidebarStatus') this.visible = true this.selectedTag = tag - this.left = e.clientX - if (status === '0') this.left = parseInt(e.clientX) - 200 - this.top = e.clientY + this.tagLeft = e.clientX + if (status === '0') this.tagLeft = parseInt(e.clientX) - 200 + this.tagTop = e.clientY }, closeMenu() { this.visible = false