From 8d15e4f9a334a3a887fb85032f02cb51be7e043a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 10 Feb 2020 10:03:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8F=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/index.js | 4 ++--
src/api/Outsourcing/OutsourcingPaymentPlanManagement.js | 2 +-
.../Outsourcing/OutsourcingPaymentPlanManagement/index.vue | 1 +
src/views/WorkshopProcurement/OfflineProcurement/index.vue | 5 -----
.../WorkshopProcurement/OutsourcingMaterialsSearch/index.vue | 5 -----
5 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/config/index.js b/config/index.js
index 6427159f..7609b831 100644
--- a/config/index.js
+++ b/config/index.js
@@ -7,8 +7,8 @@ const os = require('os')
const networkInterfaces = os.networkInterfaces()
-// const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
-const ip = '127.0.0.1'
+const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
+// const ip = '127.0.0.1'
module.exports = {
dev: {
// Paths
diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
index 69d7ff29..35ba5a4e 100644
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -3,11 +3,11 @@ import state from '@/store'
// 查询表格数据
export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) {
- console.log(state.state.user.id, 22222)
return request({
url: '',
method: 'post',
data: {
+ UserID: state.state.user.id,
type: '1',
name: '车间生产管理工艺_外协付款_查询',
param: '外协厂家_check=' + check1 + '&外协厂家=' + ManufacturerAbbreviation + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 76cddbc7..7c5c8d2a 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -218,6 +218,7 @@ export default {
var check2 = 0
this.ManufacturerName ? check = 1 : check = 0
searchtable(check, this.ManufacturerName, check2, '', '', this.pageCurrent, this.pageSize).then(response => {
+ console.log(response.data)
this.loading = false
if (response.data.rows.length !== 0) {
this.tableData = response.data.rows
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index 3504765a..708412eb 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -81,13 +81,8 @@
:label="item.label"
:value="item.value"/>
-<<<<<<< HEAD
- 查询
- 创建采购计划单
-=======
查询
创建采购计划单
->>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index 63e707fc..a34a21bd 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -20,10 +20,6 @@
:label="item.label"
:value="item.value"/>
-<<<<<<< HEAD
- 查询
- 导出
-=======
备料时间段:
查询
导出
->>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4