From 8b5f3569ee83cd39e033a1313477074979f58d6a Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Mon, 11 Mar 2019 17:35:09 +0800
Subject: [PATCH 1/3] BUG

---
 src/utils/request.js                    |  4 ++--
 src/views/MarketingCenter/CRM/index.vue | 28 ++++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 81241138..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实例
@@ -19,7 +19,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间git
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 1cb22d7b..a414d10f 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -53,7 +53,7 @@
           <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
           <span style="float: right">销售经理</span>
           <el-table v-loading="loading3" :data="tableData3" height="192" style="width: 100%;margin-top: 10px" border>
-            <el-table-column label="责权省份" align="center" width="80">
+            <el-table-column label="责权省份" align="center" min-width="80">
               <template slot-scope="scope">
                 {{ scope.row.省份 }}
               </template>
@@ -98,67 +98,67 @@
           <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click = "addCustomer();flag1 = 1">新增客户</el-button>
           <span style="float: right">客户信息</span>
           <el-table v-loading="loading2" :data="tableData2" height="400" style="width: 100%;margin-top: 10px" border>
-            <el-table-column label="省份" align="center" width="80px">
+            <el-table-column label="省份" align="center" min-width="80px">
               <template slot-scope="scope">
                 {{ scope.row.省份 }}
               </template>
             </el-table-column>
-            <el-table-column label="客户名称" align="center" width="280">
+            <el-table-column label="客户名称" align="center" min-width="400">
               <template slot-scope="scope">
                 {{ scope.row.客户名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="联系人" align="center" width="100spx">
+            <el-table-column label="联系人" align="center" min-width="120">
               <template slot-scope="scope">
                 {{ scope.row.联系人 }}
               </template>
             </el-table-column>
-            <el-table-column label="联系电话" align="center" width="192px">
+            <el-table-column label="联系电话" align="center" min-width="300">
               <template slot-scope="scope">
                 {{ scope.row.电话 }}
               </template>
             </el-table-column>
-            <el-table-column label="开票电话" align="center" width="140px">
+            <el-table-column label="开票电话" align="center" min-width="200">
               <template slot-scope="scope">
                 {{ scope.row.传真 }}
               </template>
             </el-table-column>
-            <el-table-column label="联系地址" align="center" width="200px">
+            <el-table-column label="联系地址" align="center" min-width="350">
               <template slot-scope="scope">
                 {{ scope.row.地址 }}
               </template>
             </el-table-column>
-            <el-table-column label="电子邮箱" align="center" width="200px">
+            <el-table-column label="电子邮箱" align="center" min-width="250">
               <template slot-scope="scope">
                 {{ scope.row.电子邮箱 }}
               </template>
             </el-table-column>
-            <el-table-column label="税号" align="center" width="100px">
+            <el-table-column label="税号" align="center" min-width="120">
               <template slot-scope="scope">
                 {{ scope.row.税号 }}
               </template>
             </el-table-column>
-            <el-table-column label="开户行" align="center" width="200px">
+            <el-table-column label="开户行" align="center" min-width="200">
               <template slot-scope="scope">
                 {{ scope.row.开户行 }}
               </template>
             </el-table-column>
-            <el-table-column label="银行账号" align="center" width="200px">
+            <el-table-column label="银行账号" align="center" min-width="260">
               <template slot-scope="scope">
                 {{ scope.row.银行账号 }}
               </template>
             </el-table-column>
-            <el-table-column label="信誉等级" align="center" width="100px">
+            <el-table-column label="信誉等级" align="center" min-width="80">
               <template slot-scope="scope">
                 {{ scope.row.价值评估 }}
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center">
+            <el-table-column label="备注" align="center" min-width="350">
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="200px" fixed="right">
+            <el-table-column label="操作" align="center" min-width="200px" fixed="right">
               <template slot-scope="scope">
                 <el-button
                   size="mini"

From fa7067b93f8369d83bbeb64ad6e0c22aeb5118a9 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Tue, 12 Mar 2019 10:04:40 +0800
Subject: [PATCH 2/3] bugfix

---
 src/views/MarketingCenter/CRM/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index a414d10f..c0506572 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -37,7 +37,7 @@
             border>
             <el-table-column align="center" label="序号" width="80">
               <template slot-scope="scope">
-                <el-radio :label="scope.row.省份流水号" v-model="radio" @change.native="getCurrentRow(scope.row.省份流水号, scope.row.省份)"/>
+                <el-radio :label="scope.row.省份流水号" v-model="radio" @change="pageCurrent = 1;pageSize = 10;getCurrentRow(scope.row.省份流水号, scope.row.省份)"/>
               </template>
             </el-table-column>
             <el-table-column align="center" label="地区">
@@ -348,7 +348,7 @@ export default {
       radio: null, // 地区选择框
       tableData2: [], // 客户表
       pageCurrent: 1,
-      pageSize: 10,
+      pageSize: 40,
       total: null,
       AdressID: null, // 地区流水号
       MarketingManagerValue: '', // 营销经理

From 5759ace0e4681507e8a7589d54fbbc178ab99e9c Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Tue, 12 Mar 2019 15:45:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=8A=A0=E6=97=B6=E9=97=B4=E6=AE=B5?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessingStatusEdit.js                   |  4 +--
 .../ProcessingStatusEdit/index.vue            | 32 ++++++++++++++++++-
 2 files changed, 33 insertions(+), 3 deletions(-)

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/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 @@
         </el-select>
         <span>零件号:</span>
         <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
+        <span class="demonstration">计划下达时间:</span>
+        <el-date-picker
+          v-model="startTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择日期"/>
+        <span class="demonstration">-</span>
+        <el-date-picker
+          v-model="endTime"
+          value-format="yyyy-MM-dd"
+          size="small"
+          style="width: 160px"
+          type="date"
+          placeholder="选择日期"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;pageSize=10;total = 0;getTableData();">查询</el-button>
       </el-row>
     </el-card>
@@ -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 {