diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
index 967b1234..26adb5f7 100644
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -34,14 +34,14 @@ export function getGroups(stepNumber) {
})
}
-export function getTable(stepNumber, a, b, c, d, e, f, g, pageCurrent, pageSize) {
+export function getTable(stepNumber, a, b, c, d, e, f, g, h, i, j, k, pageCurrent, pageSize) {
return request({
url: '',
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_加工进度修改专用',
- param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0',
+ param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=0&开始时间_check=' + h + '&开始时间=' + i + '&结束时间_check=' + j + '&结束时间=' + k,
Pagination: pageCurrent + '&' + pageSize
}
})
diff --git a/src/utils/request.js b/src/utils/request.js
index f4f36407..657a98da 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,7 +3,7 @@ import axios from 'axios'
// import store from '../store'
// import { getToken } from '@/utils/auth'
-export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket`
+export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例
diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
index 6df8260a..c303aba3 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue
@@ -24,6 +24,22 @@
零件号:
+ 计划下达时间:
+
+ -
+
查询
@@ -366,6 +382,10 @@ export default {
person: '',
title: '',
Num: '',
+ startTime: '',
+ endTime: '',
+ startTime_check: 0,
+ endTime_check: 0,
form: {
人员: '',
考勤编号: '',
@@ -525,6 +545,16 @@ export default {
} else {
this.checkbox_number = true
}
+ if(this.startTime === '' || this.startTime === null) {
+ this.startTime_check = 0
+ } else {
+ this.startTime_check = 1
+ }
+ if(this.endTime === '' || this.endTime === null) {
+ this.endTime_check = 0
+ } else {
+ this.endTime_check = 1
+ }
this.tableData1 = []
this.零件图号 = []
this.零件名称 = []
@@ -538,7 +568,7 @@ export default {
this.colorCode = [[]]
this.realDate = [[]]
this.length = 0
- getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
+ getTable(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => {
if (response.data.rows.length === 0) {
this.listLoading1 = false
} else {
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 1cb22d7b..c0506572 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -37,7 +37,7 @@
border>
-
+
@@ -53,7 +53,7 @@
添加销售经理
销售经理
-
+
{{ scope.row.省份 }}
@@ -98,67 +98,67 @@
新增客户
客户信息
-
+
{{ scope.row.省份 }}
-
+
{{ scope.row.客户名称 }}
-
+
{{ scope.row.联系人 }}
-
+
{{ scope.row.电话 }}
-
+
{{ scope.row.传真 }}
-
+
{{ scope.row.地址 }}
-
+
{{ scope.row.电子邮箱 }}
-
+
{{ scope.row.税号 }}
-
+
{{ scope.row.开户行 }}
-
+
{{ scope.row.银行账号 }}
-
+
{{ scope.row.价值评估 }}
-
+
{{ scope.row.备注 }}
-
+