From 82730e6baa1f3088905890d24c24891d3920f399 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Mon, 18 Mar 2019 08:29:23 +0800
Subject: [PATCH 01/13] bugfix

---
 .../MarketingCenter/ContractInformationManagement/index.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index cc878508..fbb4666a 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -467,7 +467,7 @@
     </el-dialog>
 
     <!--客户选择-->
-    <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="600px">
+    <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="60%">
       <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 10;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
       <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange">

From e0c4dd2d79a6012d26c1198279e972ba02d7c4dc Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Tue, 26 Mar 2019 14:10:47 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportChangeParts/specificationData1.vue       | 14 +++++++++++++-
 src/views/TechnologyCenter/QueryParts/index.vue    |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index ead697a4..35c0177a 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -276,7 +276,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogParts" :title="title1" center width="400px">
+    <el-dialog :visible.sync="dialogParts" :title="title1" :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false" center width="400px">
       <span>零件图号：</span>
       <el-input v-model="PartsValueNum" size="small" placeholder="零件图号" style="width: 200px"/>
       <!--<el-select v-model="PartsValueNum" filterable size="small" placeholder="零件图号">-->
@@ -288,6 +288,7 @@
       <!--</el-select>-->
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submit">提交</el-button>
+        <el-button type="primary" @click="submitCancel">取消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -465,6 +466,17 @@ export default {
         }
       })
     },
+    submitCancel() {
+      this.dialogParts = false
+      update(this.projectName, this.machineValue, this.Number, 0).then(response => {
+        if (response.data[0].result === '1') {
+          this.fetchData()
+          this.$message.success('取消成功')
+        } else {
+          this.$message.error('取消失败')
+        }
+      })
+    },
     getGroups() {
       this.$emit('machineChange', this.machineValue)
     },
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 5c56c35e..3214c68c 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -309,6 +309,7 @@ export default {
             return item
           })
         })
+        console.log(this.tableData)
       } else {
         const type = this.groupName.indexOf('WG') > -1 ? 2 : 1
         this.loadingWB = true

From f85ecfdbaeb127fefe756767bc3e1b15b36ba9ac Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Tue, 26 Mar 2019 16:59:06 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Inventory/StockInquiry.js             |  37 ++++
 src/icons/svg/StockInquiry.svg                |   1 +
 src/views/Inventory/StockInquiry/index.vue    | 165 ++++++++++++++++++
 .../ContractInformationManagement/index.vue   |  88 +++++-----
 4 files changed, 248 insertions(+), 43 deletions(-)
 create mode 100644 src/api/Inventory/StockInquiry.js
 create mode 100644 src/icons/svg/StockInquiry.svg
 create mode 100644 src/views/Inventory/StockInquiry/index.vue

diff --git a/src/api/Inventory/StockInquiry.js b/src/api/Inventory/StockInquiry.js
new file mode 100644
index 00000000..2104299f
--- /dev/null
+++ b/src/api/Inventory/StockInquiry.js
@@ -0,0 +1,37 @@
+import request from '@/utils/request'
+
+// 初始化项目
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据_按时间排序'
+    }
+  })
+}
+// 机床查询
+export function searchmachine(check, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据',
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + num
+    }
+  })
+}
+// 分组查询
+export function searchTeam(machineNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + machineNumber
+    }
+  })
+}
diff --git a/src/icons/svg/StockInquiry.svg b/src/icons/svg/StockInquiry.svg
new file mode 100644
index 00000000..343a5d73
--- /dev/null
+++ b/src/icons/svg/StockInquiry.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553579626916" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2009" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M65.344 944.64l893.312 0 0 72.064-893.312 0 0-72.064Z" p-id="2010"></path><path d="M838.016 40 185.984 40c-70.656 0-128 57.344-128 128l0 531.968c0 70.656 57.344 128 128 128l652.032 0c70.656 0 128-57.344 128-128L966.016 168C966.016 97.344 908.672 40 838.016 40zM832 486.656l-60.032 0 0 193.344L254.976 680 256 486.656 192 486.656 192 416l325.312-275.968L832 428.032 832 486.656z" p-id="2011"></path><path d="M512 266.304 316.032 436.288 316.032 620.352 446.72 620.352 446.72 494.976 577.344 494.976 577.344 620.352 707.968 620.352 707.968 436.288Z" p-id="2012"></path></svg>
\ No newline at end of file
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
new file mode 100644
index 00000000..56693e1c
--- /dev/null
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -0,0 +1,165 @@
+<template>
+  <div>
+    <el-card>
+      <span>项目名称:</span>
+      <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine">
+        <el-option
+          v-for="item in Project"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>机床图号:</span>
+      <el-select v-model="MachineValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="searchGroupList">
+        <el-option
+          v-for="item in Machine"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>组号:</span>
+      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px;margin-right:10px">
+        <el-option
+          v-for="item in GroupNum"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>零件图号:</span>
+      <el-input v-model="Partpaint" clearable size="small" style="width:200px;margin-right:10px" />
+      <span>库位:</span>
+      <el-select v-model="StoreHouseValue" filterable clearable size="small" placeholder="组号" style="width: 200px;margin-right:10px">
+        <el-option
+          v-for="item in StoreHouse"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="">查询</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table
+        v-loading="listLoadingx1"
+        :data="HouseDataBasic"
+        border
+        size="mini"
+        style="width: 100%;"
+        height="200">
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
+        <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" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.货位名称 }}
+          </template>
+        </el-table-column>
+        <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" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <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" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <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" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.货位存量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件类型" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.类型名称 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import { initProject, searchmachine, searchTeam } from '@/api/Inventory/StockInquiry'
+  export default {
+    data() {
+      return {
+        ProjectValue: '',
+        Project: [],
+        ProjectValue_check: 1,
+        MachineValue: '',
+        Machine: [],
+        MachineValue_check: 1,
+        GroupNumValue: '',
+        GroupNumValue_check: 1,
+        GroupNum: [],
+        Partpaint: '',
+        StoreHouseValue: '',
+        StoreHouse: [],
+        HouseDataBasic: [],
+      }
+    },
+    created(){
+      this.fetchData()
+    },
+    methods: {
+      fetchData() {
+        this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
+      },
+      searchMachine() { // 查询机床
+        this.Machine = []
+        this.GroupNum = []
+        this.MachineValue = ''
+        this.GroupNumValue = ''
+        if (this.ProjectValue !== '') {
+          searchmachine(1, this.ProjectValue).then(response => {
+            for (let i = 0; i < response.data.length; i++) {
+              this.Machine.push({
+                label: response.data[i].机床图号,
+                value: response.data[i].机床流水号
+              })
+            }
+          })
+        }
+      },
+      searchGroupList() { // 查询组号
+        this.GroupNum = []
+        this.GroupNumValue = ''
+        searchTeam(this.MachineValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.GroupNum.push({
+              label: response.data[i].组号,
+              value: response.data[i].组件流水号
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index fbb4666a..cc01a875 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -1,36 +1,40 @@
 <template>
   <div class="app-container">
     <el-card>
-      <span>项目名称：</span>
-      <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right: 10px" size="small">
-        <el-option
-          v-for="item in entryName"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span style="margin-left: 10px">机床型号：</span>
-      <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
-      <span style="margin-left: 10px">销售经理：</span>
-      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
-      <span style="margin-left: 10px">时间区间：</span>
-      <el-date-picker
-        v-model="startTime"
-        style="width: 200px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择开始日期"/>
-      <span>-</span>
-      <el-date-picker
-        v-model="endTime"
-        style="width: 200px;"
-        value-format="yyyy-MM-dd"
-        size="small"
-        type="date"
-        placeholder="请选择结束日期"/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
+      <div>
+        <span>项目名称：</span>
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small">
+          <el-option
+            v-for="item in entryName"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span style="margin-left: 10px">机床型号：</span>
+        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
+        <span style="margin-left: 10px">销售经理：</span>
+        <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
+      </div>
+      <div style="margin-top: 20px">
+        <span style="margin-top: 20px">开始日期：</span>
+        <el-date-picker
+          v-model="startTime"
+          style="width: 200px;"
+          value-format="yyyy-MM-dd"
+          size="small"
+          type="date"
+          placeholder="请选择开始日期"/>
+        <span style="margin-left: 10px">结束日期：</span>
+        <el-date-picker
+          v-model="endTime"
+          style="width: 200px;"
+          value-format="yyyy-MM-dd"
+          size="small"
+          type="date"
+          placeholder="请选择结束日期"/>
+        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
+        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">增加</el-button>
+      </div>
     </el-card>
     <el-card>
       <el-table
@@ -46,18 +50,18 @@
         @expand-change="selectMachine">
         <el-table-column type="expand">
           <template slot-scope="scope">
-            <el-table :data="tableData2" border style="width: 600px; text-align: center" size="mini">
-              <el-table-column label="设备型号" align="center">
+            <el-table :data="tableData2" border style="width: 490px; text-align: center" size="mini">
+              <el-table-column label="设备型号" align="center" width="130">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
                 </template>
               </el-table-column>
-              <el-table-column label="设备名称" align="center">
+              <el-table-column label="设备名称" align="center" width="160">
                 <template slot-scope="scope">
                   {{ scope.row.机床名称 }}
                 </template>
               </el-table-column>
-              <el-table-column label="操作" fixed="right" width="200px" align="center">
+              <el-table-column label="操作" width="200" align="center">
                 <template slot-scope="scope">
                   <el-button
                     size="mini"
@@ -100,7 +104,7 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="付款方式" width="150">
+        <el-table-column align="center" label="付款方式" width="80">
           <template slot-scope="scope">
             {{ scope.row.付款方式 }}
           </template>
@@ -360,7 +364,7 @@
     </el-dialog>
 
     <!--新增机床对话框-->
-    <el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="25%">
+    <el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
         <el-form-item label="设备型号" prop="设备型号">
           <el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
@@ -376,8 +380,8 @@
     </el-dialog>
 
     <!--营销经理选择-->
-    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%">
-      <span>责权省份</span>
+    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
+      <span>责权省份：</span>
       <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
         <el-option
           v-for="item in Province"
@@ -467,7 +471,7 @@
     </el-dialog>
 
     <!--客户选择-->
-    <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="60%">
+    <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="800px">
       <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 10;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
       <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange">
@@ -507,7 +511,7 @@
     </el-dialog>
 
     <!--改变节点时间对话框-->
-    <el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="23%">
+    <el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="400px">
       <el-form ref="form2" :model="form2" :rules="rules2" :disabled="disabledTime" label-width="140px">
         <el-form-item label="进度完成日期" prop="进度完成日期">
           <el-date-picker
@@ -1228,9 +1232,7 @@ export default {
 </script>
 
 <style scoped>
-.el-card {
-  margin-top: 15px;
-}
+
 .el-date-editor{
   width:200px;
 }

From e567e52a2aaeaa62f30fdbef0abd8a332f052650 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 26 Mar 2019 16:59:56 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machiningHoursStatistics.js               |  6 ++---
 .../machiningHoursStatistics/index.vue        | 27 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/api/ManufacturingCenter/machiningHoursStatistics.js b/src/api/ManufacturingCenter/machiningHoursStatistics.js
index 749c2705..444da7f9 100644
--- a/src/api/ManufacturingCenter/machiningHoursStatistics.js
+++ b/src/api/ManufacturingCenter/machiningHoursStatistics.js
@@ -7,8 +7,8 @@ export function searchtable(num1, num2, num3, num4, num5, pageCurrent, pageSize)
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_工时统计_查询数据',
-      param: '操作者_check=' + num1 + '&操作者=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
+      name: '车间生产管理工艺_工时统计_查询数据2',
+      param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
@@ -20,7 +20,7 @@ export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_工时统计按人员查询_查询数据',
+      name: '车间生产管理工艺_工时统计按人员查询_查询数据2',
       param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4,
       Pagination: pageCurrent + '&' + pageSize
     }
diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index ea29520e..15622569 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -34,12 +34,12 @@
             width="50"/>
           <el-table-column label="操作者" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.操作者 }}
+              {{ scope.row.姓名 }}
             </template>
           </el-table-column>
-          <el-table-column label="总工时" align="center">
+          <el-table-column label="实际工时" align="center">
             <template slot-scope="scope">
-              {{ scope.row.工人总工时 }}
+              {{ scope.row.实际加工时间段 }}
             </template>
           </el-table-column>
         </el-table>
@@ -76,14 +76,19 @@
               {{ scope.row.工艺名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="工序工时" align="center" width="150px">
+          <el-table-column label="理论工时" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.工序工时 }}
+              {{ scope.row.理论加工时间段 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="实际工时" align="center" width="150px">
+            <template slot-scope="scope">
+              {{ scope.row.实际加工时间段 }}
             </template>
           </el-table-column>
           <el-table-column label="完成日期" align="center">
             <template slot-scope="scope">
-              {{ scope.row.完成日期 }}
+              {{ scope.row.加工完成时间 }}
             </template>
           </el-table-column>
         </el-table>
@@ -160,14 +165,11 @@ export default {
       this.loading2 = true
       this.tableData2 = []
       this.pageCurrent2 = 1
-      this.gongzuozhebianhao = row.工作者编号
-      searchtable2(row.工作者编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
+      this.gongzuozhebianhao = row.人员编号
+      searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => {
         if (response.data.total === 0) {
           this.loading2 = false
         } else {
-          for (let i = 0; i < response.data.rows.length; i++) {
-            response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0]
-          }
           this.total2 = response.data.total
           this.tableData2 = response.data.rows
         }
@@ -182,9 +184,6 @@ export default {
         if (response.data.total === 0) {
           this.loading2 = false
         } else {
-          for (let i = 0; i < response.data.rows.length; i++) {
-            response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0]
-          }
           this.total2 = response.data.total
           this.tableData2 = response.data.rows
         }

From 8266a64bbe68f7972c28d609feedbf9feeefa817 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 26 Mar 2019 17:07:13 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machiningHoursStatistics/index.vue             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index 15622569..177c52bf 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -25,14 +25,14 @@
       </el-row>
     </el-card>
     <el-card>
-      <el-col :span="7">
+      <el-col :span="6">
         <el-table v-loading="loading" :data="tableData" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
           <el-table-column
             label=" "
             type="index"
             align="center"
             width="50"/>
-          <el-table-column label="操作者" align="center" width="150px">
+          <el-table-column label="操作者" align="center" width="130px">
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
             </template>
@@ -54,7 +54,7 @@
             @current-change="handleCurrentChange"/>
         </div>
       </el-col>
-      <el-col :span="16" style="margin-left: 30px;">
+      <el-col :span="17" style="margin-left: 30px;">
         <el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column
             label=" "
@@ -71,22 +71,22 @@
               {{ scope.row.零件名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="工艺名称" align="center" width="150px">
+          <el-table-column label="工艺名称" align="center" width="130px">
             <template slot-scope="scope">
               {{ scope.row.工艺名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="理论工时" align="center" width="150px">
+          <el-table-column label="理论工时" align="center" width="100px">
             <template slot-scope="scope">
               {{ scope.row.理论加工时间段 }}
             </template>
           </el-table-column>
-          <el-table-column label="实际工时" align="center" width="150px">
+          <el-table-column label="实际工时" align="center" width="100px">
             <template slot-scope="scope">
               {{ scope.row.实际加工时间段 }}
             </template>
           </el-table-column>
-          <el-table-column label="完成日期" align="center">
+          <el-table-column label="完成时间" align="center">
             <template slot-scope="scope">
               {{ scope.row.加工完成时间 }}
             </template>

From f94d46abc229ceab5f98382a440fa03757b8b7e8 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Tue, 26 Mar 2019 18:10:48 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/element-ui.scss                            | 11 +++++++++++
 src/views/MarketingCenter/CRM/index.vue               | 10 +++++++---
 .../ContractCapitalManagement/index.vue               |  9 +++++++--
 .../ContractInformationManagement/index.vue           |  7 ++++++-
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index ef7bb5da..46dca356 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -27,3 +27,14 @@
     }
   }
 }
+ .el-table td, .el-table th.is-leaf{
+   border-bottom: 1px solid DarkGray;
+   border-left: 1px solid DarkGray;
+   border-top: 1px solid DarkGray;
+   border-right: 1px solid DarkGray;
+ }
+ .el-textarea__inner,
+ .el-radio__inner,
+ .el-input__inner{
+   border: 1px solid rgb(49, 56, 72)!important;
+ }
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index c0506572..b6ddc1b5 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -24,7 +24,7 @@
       <el-button type="success" icon="el-icon-search" class="move" size="small" @click="selectCustomerOfName">查询</el-button>
     </el-card>
     <el-row>
-      <el-col :span="4">
+      <el-col :span="6">
         <el-card>
           <el-table
             v-loading="loading1"
@@ -48,7 +48,7 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col :span="20">
+      <el-col :span="18">
         <el-card>
           <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
           <span style="float: right">销售经理</span>
@@ -586,5 +586,9 @@ export default {
   .move{
     margin-left: 10px;
   }
-
+  .el-table td, .el-table th.is-leaf,
+  .el-radio__inner,
+  .el-input__inner{
+    border: 1px solid black!important;
+  }
 </style>
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index b3758cbc..c2ee328e 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -380,8 +380,8 @@
       </div>
     </el-dialog>
     <!--营销经理选择-->
-    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%">
-      <span>责权省份</span>
+    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
+      <span>责权省份：</span>
       <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
         <el-option
           v-for="item in Province"
@@ -1633,4 +1633,9 @@ export default {
     margin-top: 10px;
     margin-right: 40px;
   }
+  .el-table td, .el-table th.is-leaf,
+  .el-radio__inner,
+  .el-input__inner{
+    border: 1px solid black!important;
+  }
 </style>
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index cc01a875..5cc03949 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -50,7 +50,7 @@
         @expand-change="selectMachine">
         <el-table-column type="expand">
           <template slot-scope="scope">
-            <el-table :data="tableData2" border style="width: 490px; text-align: center" size="mini">
+            <el-table :data="tableData2" border style="width: 491px; text-align: center" size="mini">
               <el-table-column label="设备型号" align="center" width="130">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
@@ -1282,4 +1282,9 @@ a{
   display: inline-block;
   color: #999;
 }
+.el-table td, .el-table th.is-leaf,
+.el-radio__inner,
+.el-input__inner{
+  border: 1px solid black!important;
+}
 </style>

From a035447b36cd01e67a9558df68db07a8d4792e0e Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 27 Mar 2019 08:48:57 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/element-ui.scss                 |  12 +-
 src/views/Inventory/StockInquiry/index.vue | 165 ---------------------
 2 files changed, 6 insertions(+), 171 deletions(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 46dca356..184ab3ad 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -27,12 +27,12 @@
     }
   }
 }
- .el-table td, .el-table th.is-leaf{
-   border-bottom: 1px solid DarkGray;
-   border-left: 1px solid DarkGray;
-   border-top: 1px solid DarkGray;
-   border-right: 1px solid DarkGray;
- }
+ //.el-table td, .el-table th.is-leaf{
+ //  border-bottom: 1px solid DarkGray;
+ //  border-left: 1px solid DarkGray;
+ //  border-top: 1px solid DarkGray;
+ //  border-right: 1px solid DarkGray;
+ //}
  .el-textarea__inner,
  .el-radio__inner,
  .el-input__inner{
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
index 56693e1c..e69de29b 100644
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -1,165 +0,0 @@
-<template>
-  <div>
-    <el-card>
-      <span>项目名称:</span>
-      <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine">
-        <el-option
-          v-for="item in Project"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>机床图号:</span>
-      <el-select v-model="MachineValue" filterable clearable size="small" placeholder="机床图号" style="width: 200px;margin-right:10px" @change="searchGroupList">
-        <el-option
-          v-for="item in Machine"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>组号:</span>
-      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 200px;margin-right:10px">
-        <el-option
-          v-for="item in GroupNum"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <span>零件图号:</span>
-      <el-input v-model="Partpaint" clearable size="small" style="width:200px;margin-right:10px" />
-      <span>库位:</span>
-      <el-select v-model="StoreHouseValue" filterable clearable size="small" placeholder="组号" style="width: 200px;margin-right:10px">
-        <el-option
-          v-for="item in StoreHouse"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"/>
-      </el-select>
-      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="">查询</el-button>
-    </el-card>
-
-    <el-card>
-      <el-table
-        v-loading="listLoadingx1"
-        :data="HouseDataBasic"
-        border
-        size="mini"
-        style="width: 100%;"
-        height="200">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          width="50"/>
-        <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" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.货位名称 }}
-          </template>
-        </el-table-column>
-        <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" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.零件图号 }}
-          </template>
-        </el-table-column>
-        <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" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <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" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.货位存量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件类型" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.类型名称 }}
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
-</template>
-
-<script>
-  import { initProject, searchmachine, searchTeam } from '@/api/Inventory/StockInquiry'
-  export default {
-    data() {
-      return {
-        ProjectValue: '',
-        Project: [],
-        ProjectValue_check: 1,
-        MachineValue: '',
-        Machine: [],
-        MachineValue_check: 1,
-        GroupNumValue: '',
-        GroupNumValue_check: 1,
-        GroupNum: [],
-        Partpaint: '',
-        StoreHouseValue: '',
-        StoreHouse: [],
-        HouseDataBasic: [],
-      }
-    },
-    created(){
-      this.fetchData()
-    },
-    methods: {
-      fetchData() {
-        this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
-      },
-      searchMachine() { // 查询机床
-        this.Machine = []
-        this.GroupNum = []
-        this.MachineValue = ''
-        this.GroupNumValue = ''
-        if (this.ProjectValue !== '') {
-          searchmachine(1, this.ProjectValue).then(response => {
-            for (let i = 0; i < response.data.length; i++) {
-              this.Machine.push({
-                label: response.data[i].机床图号,
-                value: response.data[i].机床流水号
-              })
-            }
-          })
-        }
-      },
-      searchGroupList() { // 查询组号
-        this.GroupNum = []
-        this.GroupNumValue = ''
-        searchTeam(this.MachineValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.GroupNum.push({
-              label: response.data[i].组号,
-              value: response.data[i].组件流水号
-            })
-          }
-        })
-      },
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>

From 7f7fdc7b920a98c0f49ce0072a4ae62119823ef1 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 27 Mar 2019 09:12:49 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machiningHoursStatistics/index.vue          | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index 177c52bf..ead8c4b8 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -27,16 +27,16 @@
     <el-card>
       <el-col :span="6">
         <el-table v-loading="loading" :data="tableData" highlight-current-row height="580" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable2">
-          <el-table-column
-            label=" "
-            type="index"
-            align="center"
-            width="50"/>
-          <el-table-column label="操作者" align="center" width="130px">
+          <el-table-column label="操作者" align="center" width="110px">
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
             </template>
           </el-table-column>
+          <el-table-column label="理论工时" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.理论加工时间段 }}
+            </template>
+          </el-table-column>
           <el-table-column label="实际工时" align="center">
             <template slot-scope="scope">
               {{ scope.row.实际加工时间段 }}
@@ -56,11 +56,6 @@
       </el-col>
       <el-col :span="17" style="margin-left: 30px;">
         <el-table v-loading="loading2" :data="tableData2" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
-          <el-table-column
-            label=" "
-            type="index"
-            align="center"
-            width="50"/>
           <el-table-column label="零件图号" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}

From 1938b741b25deb3655a9728f4f21d8596eaa455a Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 27 Mar 2019 09:40:33 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../machiningHoursStatistics/index.vue                 | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index ead8c4b8..93e072fb 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -61,16 +61,21 @@
               {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column label="零件名称" align="center" width="150px">
+          <el-table-column label="零件名称" align="center" width="130px">
             <template slot-scope="scope">
               {{ scope.row.零件名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="工艺名称" align="center" width="130px">
+          <el-table-column label="工艺名称" align="center" width="120px">
             <template slot-scope="scope">
               {{ scope.row.工艺名称 }}
             </template>
           </el-table-column>
+          <el-table-column label="完成数量" align="center" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.完成数量 }}
+            </template>
+          </el-table-column>
           <el-table-column label="理论工时" align="center" width="100px">
             <template slot-scope="scope">
               {{ scope.row.理论加工时间段 }}
@@ -165,6 +170,7 @@ export default {
         if (response.data.total === 0) {
           this.loading2 = false
         } else {
+          console.log(response.data)
           this.total2 = response.data.total
           this.tableData2 = response.data.rows
         }

From 4007800ad1e8ce080d2c11ad721e13f3928b3447 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Wed, 27 Mar 2019 10:46:52 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E6=8A=80=E6=9C=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/TechnologyCenter/ImportParts.js                   | 8 ++++----
 src/views/TechnologyCenter/CreatePackingList/index.vue    | 2 +-
 .../ImportChangeParts/specificationData1.vue              | 4 ++--
 src/views/TechnologyCenter/QueryParts/index.vue           | 7 ++++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js
index 65480ad3..6fbc0f6b 100644
--- a/src/api/TechnologyCenter/ImportParts.js
+++ b/src/api/TechnologyCenter/ImportParts.js
@@ -286,19 +286,19 @@ export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num
     data: {
       type: '2',
       name: 'PDM_零件明细表_基本件_大量导入',
-      param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num
+      param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num
     }
   })
 }
 // 传递零件
-export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, oldId, oldNum) {
+export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, num8, num9, id, oldId, oldNum) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: 'PDM_零件明细表_整改件_大量导入',
-      param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum
+      param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&分类码=' + num8 + '&整改类型=' + num9 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum
     }
   })
 }
@@ -309,7 +309,7 @@ export function transferWG(groupNum, materialNum, totalNum, remarks, mark, desig
     data: {
       type: '2',
       name: 'PDM_零件明细表_标准件和外购件_大量导入',
-      param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}`
+      param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}`
     }
   })
 }
diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue
index 7d3e5aa3..10d6df98 100644
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -435,7 +435,7 @@
           <td class="tg-qj3h" colspan="6"><p style="margin-top:50px">装&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;箱&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;单</p></td>
         </tr>
         <tr>
-          <td class="tg-qj3h" colspan="6">GJR1322-ZD</td>
+          <td class="tg-qj3h" colspan="6">{{ receiptName }}</td>
         </tr>
         <tr>
           <td class="tg-qj3h" colspan="6">
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index 35c0177a..ee7d47f6 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -567,8 +567,8 @@ export default {
           for (let i = 0; i < this.tableDataAll.length; i++) {
             const data = this.tableDataAll[i]
             const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量)
-            console.log(data.前id, data.前图号或者型号)
-            const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.前id, data.前图号或者型号)
+            console.log(data.分类码)
+            const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.分类码, data.整改类型, data.id, data.前id, data.前图号或者型号)
             await sleep(10)
             if (resp.data[0].result === '0') {
               this.err++
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 3214c68c..ad82edb2 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -88,9 +88,14 @@
           align="center">
           <template slot-scope="scope">{{ scope.row.零件类型名称 }}</template>
         </el-table-column>
+        <el-table-column align="center" label="分类码" width="150">
+          <template slot-scope="scope">
+            {{ scope.row.分类码 }}
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="旧零件图号" width="150">
           <template slot-scope="scope">
-            {{ scope.row.旧零件图号 }}
+            {{ scope.row.前零件图号 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="整改类型" width="150">

From afc1565a0993b05b856fc3719554ae34fd55cdf7 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 27 Mar 2019 16:15:49 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=BA=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Inventory/StockInquiry.js          |  28 +--
 src/views/Inventory/StockInquiry/index.vue | 239 +++++++++++++++++++++
 2 files changed, 254 insertions(+), 13 deletions(-)

diff --git a/src/api/Inventory/StockInquiry.js b/src/api/Inventory/StockInquiry.js
index 2104299f..70438de1 100644
--- a/src/api/Inventory/StockInquiry.js
+++ b/src/api/Inventory/StockInquiry.js
@@ -1,18 +1,7 @@
 import request from '@/utils/request'
 
-// 初始化项目
-export function initProject() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: 'PDM_项目名称_查询数据_按时间排序'
-    }
-  })
-}
 // 机床查询
-export function searchmachine(check, num) {
+export function getMachines(check, num) {
   return request({
     url: '',
     method: 'post',
@@ -24,7 +13,7 @@ export function searchmachine(check, num) {
   })
 }
 // 分组查询
-export function searchTeam(machineNumber) {
+export function getGroups(machineNumber) {
   return request({
     url: '',
     method: 'post',
@@ -35,3 +24,16 @@ export function searchTeam(machineNumber) {
     }
   })
 }
+// 主表查询
+export function getTable(num1, num2, num3, num4, num5, num6, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_库存管理_基本件库存查询',
+      param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
index e69de29b..20d9c1a8 100644
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -0,0 +1,239 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <span>机床号:</span>
+      <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
+        <el-option
+          v-for="item in Machines"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          <div style="float: left">{{ item.label }}</div>
+          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
+        </el-option>
+      </el-select>
+      <span>组号:</span>
+      <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
+        <el-option
+          v-for="item in Groups"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span>零件图号:</span>
+      <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 180px;"/>
+      <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="listLoading1" :data="tableData1" class="table" border height="650">
+        <el-table-column
+          label="序号"
+          align="center"
+          width="50"
+          type="index"/>
+        <el-table-column align="center" label="零件名称" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="零件图号" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="入库数量" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.入库数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="机床图号" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="组号" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="仓库名称" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.仓库名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="货位名称" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.货位名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="入库时间">
+          <template slot-scope="scope">
+            {{ scope.row.入库时间 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          v-if="!listLoading1"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import { getMachines, getGroups, getTable } from '@/api/Inventory/StockInquiry'
+
+export default {
+  data() {
+    return {
+      startTime: '',
+      endTime: '',
+      startTime_check: 0,
+      endTime_check: 0,
+      liushuihao: '',
+      // value2: null,
+      radioList: '0',
+      length: 0,
+      listLoading1: false,
+      tableData1: [],
+      project: '',
+      projects: [],
+      Machine: '',
+      Machines: [],
+      Group: '',
+      Groups: [],
+      part: '',
+      parts: [{
+        value: 0,
+        label: '全部零件'
+      }, {
+        value: 1,
+        label: '自家生产'
+      }, {
+        value: 2,
+        label: '外协生产'
+      }],
+      Speed: '',
+      Speeds: [{
+        value: 5,
+        label: '全部'
+      }, {
+        value: 1,
+        label: '拖期'
+      }, {
+        value: 2,
+        label: '即将拖期'
+      }, {
+        value: 3,
+        label: '如期'
+      }, {
+        value: 4,
+        label: '工序外协'
+      }],
+      number: '',
+      checkbox_project: false,
+      checkbox_Machine: false,
+      checkbox_Group: false,
+      checkbox_part: false,
+      checkbox_number: false,
+      零件图号: [],
+      零件名称: [],
+      投产数量: [],
+      result: [],
+      process: [[]],
+      planDate: [[]],
+      worker: [[]],
+      colorCode: [[]],
+      realDate: [[]],
+      // waixie: [[]],
+      total: 0, // 总条数
+      pageSize: 10,
+      pageCurrent: 1
+    }
+  },
+  created() {
+    this.getMachine()
+    this.getTableData()
+  },
+  methods: {
+    getMachine() {
+      this.Machine = ''
+      this.Machines = []
+      this.Group = ''
+      this.Groups = []
+      getMachines().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Machines.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号,
+            value2: response.data[i].项目名称
+          })
+        }
+      })
+    },
+    getGroup() {
+      this.Group = ''
+      this.Groups = []
+      getGroups(this.Machine).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Groups.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    // 按条件查询
+    getTableData() {
+      this.listLoading1 = true
+      if (this.Machine === '') {
+        this.checkbox_Machine = 0
+      } else {
+        this.checkbox_Machine = 1
+      }
+      if (this.Group === '') {
+        this.checkbox_Group = 0
+      } else {
+        this.checkbox_Group = 1
+      }
+      if (this.number === '') {
+        this.checkbox_number = 0
+      } else {
+        this.checkbox_number = 1
+      }
+      this.tableData1 = []
+      getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, this.pageCurrent, this.pageSize).then(response => {
+        if (response.data.total === 0) {
+          this.listLoading1 = false
+        } else {
+          // for (let i = 0; i < response.data.rows.length; i++) {
+          //   response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ')[0]
+          // }
+          this.tableData1 = response.data.rows
+          this.total = response.data.total
+          this.listLoading1 = false
+        }
+      })
+    },
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.getTableData()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.getTableData()
+    }
+  }
+}
+</script>
+<style scoped>
+</style>

From 199b7186d913a419a1689ed0669d38c44cdd8c52 Mon Sep 17 00:00:00 2001
From: caoxinyu <caoxinyu@meswork.com>
Date: Wed, 27 Mar 2019 18:33:32 +0800
Subject: [PATCH 12/13] 11

---
 .../ContractCapitalManagement/index.vue       | 20 +++++++++----------
 .../ContractInformationManagement/index.vue   |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index c2ee328e..e52faa5e 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -71,17 +71,17 @@
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="合同总金额（元）" width="150">
+        <el-table-column align="center" label="合同总金额（万元）" width="150">
           <template slot-scope="scope">
             {{ scope.row.合同总金额 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已到账金额（元）" width="150">
+        <el-table-column align="center" label="已到账金额（万元）" width="150">
           <template slot-scope="scope">
             {{ scope.row.已支付 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="未到账金额（元）" width="150">
+        <el-table-column align="center" label="未到账金额（万元）" width="150">
           <template slot-scope="scope">
             <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
           </template>
@@ -203,17 +203,17 @@
           label="付款批次"
           type="index"
           width="150"/>
-        <el-table-column align="center" label="应收金额（元）" width="180px">
+        <el-table-column align="center" label="应收金额（万元）" width="180px">
           <template slot-scope="scope">
             {{ scope.row.应收金额 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已收金额（元）" width="180px">
+        <el-table-column align="center" label="已收金额（万元）" width="180px">
           <template slot-scope="scope">
             {{ scope.row.已收金额 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="未收金额（元）" width="180px">
+        <el-table-column align="center" label="未收金额（万元）" width="180px">
           <template slot-scope="scope">
             <el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>
           </template>
@@ -309,7 +309,7 @@
           <el-input v-model="form2.ContractNumberValue" :disabled="true" size="small" placeholder="请输入合同编号" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="合同总金额" prop="TotalContractAmount" label-width="100px">
-          <el-input v-model="form2.TotalContractAmount" size="small" placeholder="请输入合同总金额（元）" style="width: 200px"/>
+          <el-input v-model="form2.TotalContractAmount" size="small" placeholder="请输入合同总金额（万元）" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -333,7 +333,7 @@
           <el-input v-model="form2.ContractNumberValue" :disabled="true" size="small" placeholder="请输入合同编号" style="width: 200px"/>
         </el-form-item>
         <el-form-item label="合同总金额" prop="TotalContractAmount" label-width="100px">
-          <el-input v-model="form2.TotalContractAmount" size="small" placeholder="请输入合同总金额（元）" style="width: 200px"/>
+          <el-input v-model="form2.TotalContractAmount" size="small" placeholder="请输入合同总金额（万元）" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -348,10 +348,10 @@
           <el-input v-model="form.EntryName" :disabled="true" size="small" placeholder="请输入项目名称"/>
         </el-form-item>
         <el-form-item label="合同总金额" prop="TotalContractAmount" label-width="100px">
-          <el-input v-model="form.TotalContractAmount" :disabled="true" size="small" placeholder="请输入合同总金额（元）"/>
+          <el-input v-model="form.TotalContractAmount" :disabled="true" size="small" placeholder="请输入合同总金额（万元）"/>
         </el-form-item>
         <el-form-item label="未付款金额" prop="AlreadyPaid1" label-width="100px">
-          <el-input v-model="form.AlreadyPaid1 " :disabled="true" size="small" placeholder="请输入未付款金额（元）"/>
+          <el-input v-model="form.AlreadyPaid1 " :disabled="true" size="small" placeholder="请输入未付款金额（万元）"/>
         </el-form-item>
         <el-form-item label="本次付款" prop="ThisPayment" label-width="100px">
           <el-input-number v-model="form.ThisPayment" :min="0" :max="maxMoney" :precision="2" :step="1" controls-position="right" size="small" style="width: 232px" placeholder="请输入本次付款金额" @change="changeMoney"/>
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index 5cc03949..fe387b51 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -213,7 +213,7 @@
           <el-step :description="time4" title="预备验收" icon="el-icon-view"/>
           <el-step :description="time5" title="设备发货" icon="el-icon-sold-out"/>
           <el-step :description="time6" title="安装调试" icon="el-icon-time"/>
-          <el-step :description="time7" title="项目验收" icon="el-icon-circle-check-outline"/>
+          <el-step :description="time7" title="项目终验收" icon="el-icon-circle-check-outline"/>
           <el-step :description="time8" title="质保阶段" icon="el-icon-service"/>
         </el-steps>
       </div>

From 6989a2cc126bb3f017fbd109c3a0878e78b7545d Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Thu, 28 Mar 2019 18:08:55 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectPlanningManagement.js              |  74 ++-
 .../ProjectPlanningManagement/index.vue       | 525 +++++++++++++++---
 2 files changed, 503 insertions(+), 96 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagement.js b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
index 52ab573a..eabc005f 100644
--- a/src/api/ManufacturingCenter/ProjectPlanningManagement.js
+++ b/src/api/ManufacturingCenter/ProjectPlanningManagement.js
@@ -10,23 +10,24 @@ export function getProject() {
     }
   })
 }
+export function getToolNum(check, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_查询数据',
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + num
+    }
+  })
+}
 export function getCustomerName() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
-    }
-  })
-}
-export function getToolNum() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
+      name: '客户关系管理系统_初始化查询_客户名称'
     }
   })
 }
@@ -37,18 +38,63 @@ export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9
     data: {
       type: '1',
       name: '项目计划管理_项目总计划_查询数据',
-      param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&@机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12,
+      param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-export function searchtable2() {
+export function editTable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '项目计划管理_项目总计划_编辑数据',
+      param: `项目流水号=` + num1 + '&机床流水号=' + num2 + '&项目编号=' + num3 + '&数量=' + num4 + '&设计者=' + num5 + '&机床设计完成时间=' + num6 + '&采购完成时间=' + num7 + '&备料完成时间=' + num8 + '&机床生产完成时间=' + num9 + '&机床装配完成时间=' + num10 + '&完成顺序=' + num11 + '&更新=' + num12
+    }
+  })
+}
+export function searchTable2(num1, num2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_传递后_项目名称_查询数据_加工进度修改'
+      name: '项目计划管理_项目详细计划_查询数据',
+      param: `机床流水号=` + num1 + '&计划类型=' + num2
+    }
+  })
+}
+export function editTable2(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '项目计划管理_项目详细计划_编辑数据',
+      param: `组件计划流水号=` + num1 + '&组号=' + num2 + '&任务名称=' + num3 + '&负责人=' + num4 + '&接收任务时间=' + num5 + '&任务开始时间=' + num6 + '&计划完成时间=' + num7 + '&货期=' + num8 + '&实际完成时间=' + num9 + '&备注=' + num10
+    }
+  })
+}
+export function Delete(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '项目计划管理_项目详细计划_删除数据',
+      param: `组件计划流水号=` + num1
+    }
+  })
+}
+export function addTable(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '项目计划管理_项目详细计划_增加数据',
+      param: `机床流水号=` + num1 + '&计划类型=' + num2
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
index 2518359c..9f688f5f 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
@@ -19,123 +19,156 @@
             :value="item.value"/>
         </el-select>
         <span>客户名称:</span>
-        <el-select v-model="CustomerNameValue" clearable filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="客户名称">
-          <el-option
-            v-for="item in CustomerName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
+        <el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
       </el-row>
       <el-row>
         <span>签订日期:</span>
-        <el-date-picker v-model="time_SignStart" size="small" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/>~
-        <el-date-picker v-model="time_SignFinish" size="small" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/>
+        <el-date-picker v-model="time_SignStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/>~
+        <el-date-picker v-model="time_SignFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="签订日期" class="time"/>
         <span>交货期:</span>
-        <el-date-picker v-model="time_deliveryStart" size="small" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>~
-        <el-date-picker v-model="time_deliveryFinish" size="small" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>
+        <el-date-picker v-model="time_deliveryStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>~
+        <el-date-picker v-model="time_deliveryFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
       </el-row>
     </el-card>
 
     <el-card>
-      <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中">
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center"/>
+      <el-table v-loading="loading" :data="tableData" height="580" size="mini" style="width: 100%;" border element-loading-text="拼命加载中">
         <el-table-column min-width="300px" label="项目编号" align="center" width="240px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
-              <el-input v-model="scope.row.项目编号" class="edit-input" size="small"/>
+              <el-input v-model="scope.row.项目编号" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.项目编号 }}
             </template>
-            <span v-else>{{ scope.row.项目编号 }}</span>
           </template>
         </el-table-column>
-        <!--<el-table-column label="项目编号" align="center" width="220px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.项目编号 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <el-table-column label="项目名称" align="center" width="240px">
+        <el-table-column label="项目名称" align="center" width="250px">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" align="center" width="100px">
+        <el-table-column label="机床图号" align="center" width="250px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center" width="100px">
+        <el-table-column label="机床名称" align="center" width="250px">
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
         <el-table-column label="数量" align="center" width="100px">
           <template slot-scope="scope">
-            {{ scope.row.数量 }}
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.数量" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.数量 }}
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="签订日期" align="center">
+        <el-table-column label="签订日期" align="center" width="250px">
           <template slot-scope="scope">
             {{ scope.row.合同签订日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="交货期" align="center">
+        <el-table-column label="交货期" align="center" width="250px">
           <template slot-scope="scope">
             {{ scope.row.发货节点 }}
           </template>
         </el-table-column>
-        <el-table-column label="客户名称" align="center">
+        <el-table-column label="客户名称" align="center" width="250px">
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="设计者" align="center">
+        <el-table-column label="设计者" align="center" width="100px">
           <template slot-scope="scope">
-            {{ scope.row.机床设计者 }}
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.机床设计者" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.机床设计者 }}
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="发图" align="center">
+        <el-table-column label="发图" align="center" width="250px">
           <template slot-scope="scope">
-            {{ scope.row.机床设计完成时间 }}
+            <template v-if="scope.row.edit">
+              <el-date-picker v-model="scope.row.机床设计完成时间" value-format="yyyy-MM-dd" size="mini" type="date"/>
+            </template>
+            <template v-else>
+              <el-button type="text" @click="code = 1;openDialog(scope.row)">{{ scope.row.机床设计完成时间 }}</el-button>
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="采购" align="center">
+        <el-table-column label="采购" align="center" width="250px">
           <template slot-scope="scope">
-            {{ scope.row.采购完成时间 }}
+            <template v-if="scope.row.edit">
+              <el-date-picker v-model="scope.row.采购完成时间" value-format="yyyy-MM-dd" size="mini" type="date"/>
+            </template>
+            <template v-else>
+              <el-button type="text" @click="code = 2;openDialog(scope.row)">{{ scope.row.采购完成时间 }}</el-button>
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="备料" align="center">
+        <el-table-column label="备料" align="center" width="250px">
           <template slot-scope="scope">
-            {{ scope.row.备料完成时间 }}
+            <template v-if="scope.row.edit">
+              <el-date-picker v-model="scope.row.备料完成时间" value-format="yyyy-MM-dd" size="mini" type="date"/>
+            </template>
+            <template v-else>
+              <el-button type="text" @click="code = 3;openDialog(scope.row)">{{ scope.row.备料完成时间 }}</el-button>
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="制造" align="center">
+        <el-table-column label="制造" align="center" width="250px">
           <template slot-scope="scope">
-            {{ scope.row.机床生产完成时间 }}
+            <template v-if="scope.row.edit">
+              <el-date-picker v-model="scope.row.机床生产完成时间" value-format="yyyy-MM-dd" size="mini" type="date"/>
+            </template>
+            <template v-else>
+              <el-button type="text" @click="code = 4;openDialog(scope.row)">{{ scope.row.机床生产完成时间 }}</el-button>
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="装配" align="center">
+        <el-table-column label="装配" align="center" width="250px">
           <template slot-scope="scope">
-            {{ scope.row.机床装配完成时间 }}
+            <template v-if="scope.row.edit">
+              <el-date-picker v-model="scope.row.机床装配完成时间" value-format="yyyy-MM-dd" size="mini" type="date"/>
+            </template>
+            <template v-else>
+              <el-button type="text" @click="code = 5;openDialog(scope.row)">{{ scope.row.机床装配完成时间 }}</el-button>
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="顺序" align="center">
+        <el-table-column label="顺序" align="center" width="100px">
           <template slot-scope="scope">
-            {{ scope.row.完成顺序 }}
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.完成顺序" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.完成顺序 }}
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="更新" align="center">
+        <el-table-column label="更新" align="center" width="200px">
           <template slot-scope="scope">
-            {{ scope.row.更新 }}
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.更新" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.更新 }}
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="300px" align="center" fixed="right">
+        <el-table-column label="操作" width="200px" align="center" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" size="small" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">保存</el-button>
-            <el-button v-else type="primary" size="small" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+            <el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit(scope.row)">确定</el-button>
+            <el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+            <el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -151,15 +184,123 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-
+    <el-card>
+      <span>{{ title }}</span>
+      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 10px" @click="addTable()">增加</el-button>
+      <el-table v-loading="loading2" :data="tableData2" size="mini" style="margin-top: 10px;width: 100%;" border element-loading-text="拼命加载中">
+        <el-table-column min-width="300px" label="组号" align="center" width="240px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.组号" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.组号 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="300px" label="任务名称" align="center" width="240px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.任务名称" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.任务名称 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="300px" label="负责人" align="center" width="240px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.负责人" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.负责人 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="接收任务时间" align="center" width="250px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-date-picker v-model="scope.row.接收任务时间" value-format="yyyy-MM-dd" size="mini" type="date"/>
+            </template>
+            <template v-else>
+              {{ scope.row.接收任务时间 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="任务开始时间" align="center" width="250px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-date-picker v-model="scope.row.任务开始时间" value-format="yyyy-MM-dd" size="mini" type="date"/>
+            </template>
+            <template v-else>
+              {{ scope.row.任务开始时间 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="计划完成时间" align="center" width="250px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-date-picker v-model="scope.row.计划完成时间" value-format="yyyy-MM-dd" size="mini" type="date"/>
+            </template>
+            <template v-else>
+              {{ scope.row.计划完成时间 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="300px" label="货期" align="center" width="240px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.货期" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.货期 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际完成时间" align="center" width="250px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-date-picker v-model="scope.row.实际完成时间" value-format="yyyy-MM-dd" size="mini" type="date"/>
+            </template>
+            <template v-else>
+              {{ scope.row.实际完成时间 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="300px" label="备注" align="center" width="240px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.备注" size="mini"/>
+            </template>
+            <template v-else>
+              {{ scope.row.备注 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="200px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.edit" type="success" size="small" @click="confirmEdit2(scope.row)">确定</el-button>
+            <el-button v-else type="primary" size="small" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
+            <el-button v-if="scope.row.edit" type="primary" size="small" @click="scope.row.edit=!scope.row.edit">取消</el-button>
+            <el-button v-else type="danger" size="small" @click="Delete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
   </div>
 </template>
 
 <script>
-import { getProject, getCustomerName, getToolNum, searchtable } from '@/api/ManufacturingCenter/ProjectPlanningManagement'
+import { getProject, getCustomerName, getToolNum, searchtable, editTable, searchTable2, editTable2, Delete, addTable } from '@/api/ManufacturingCenter/ProjectPlanningManagement'
 export default {
   data() {
     return {
+      jichuang: '',
+      title: '',
+      tableData2: [],
+      loading2: false,
+      code: '',
       time_SignStart: '', // 签订开始
       time_SignFinish: '', // 签订结束
       time_deliveryStart: '', // 交货开始
@@ -183,22 +324,6 @@ export default {
     this.searchTable()
   },
   methods: {
-    cancelEdit(row) {
-      row.title = row.originalTitle
-      row.edit = false
-      this.$message({
-        message: 'The title has been restored to the original value',
-        type: 'warning'
-      })
-    },
-    confirmEdit(row) {
-      row.edit = false
-      row.originalTitle = row.title
-      this.$message({
-        message: 'The title has been edited',
-        type: 'success'
-      })
-    },
     fetchData() {
       this.projectValue = ''
       this.project = []
@@ -211,6 +336,21 @@ export default {
         }
       })
     },
+    typeChange() {
+      if (this.projectValue === '' || this.projectValue === null) {
+        this.toolNumValue = ''
+        this.toolNum = []
+      } else {
+        getToolNum(1, this.projectValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.toolNum.push({
+              label: response.data[i].机床图号,
+              value: response.data[i].机床流水号
+            })
+          }
+        })
+      }
+    },
     getCustomerName() {
       this.CustomerNameValue = ''
       this.CustomerName = []
@@ -223,38 +363,257 @@ export default {
         }
       })
     },
-    typeChange() {
-      this.toolNumValue = ''
-      this.toolNum = []
-      getToolNum().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.toolNum.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
-    },
     // 查询表格数据
     searchTable() {
       this.loading = true
       this.tableData = []
+      this.tableData2 = []
+      this.jichuang = ''
+      this.code = ''
       if (this.projectValue !== '' && this.projectValue !== null) { this.projectValuecheck = 1 } else { this.projectValuecheck = 0 }
       if (this.CustomerNameValue !== '' && this.CustomerNameValue !== null) { this.CustomerNameValuecheck = 1 } else { this.CustomerNameValuecheck = 0 }
       if (this.toolNumValue !== '' && this.toolNumValue !== null) { this.toolNumValuecheck = 1 } else { this.toolNumValuecheck = 0 }
       if (this.time_SignStart !== '' && this.time_SignStart !== null && this.time_SignFinish !== '' && this.time_SignFinish) { this.time_Signcheck = 1 } else { this.time_Signcheck = 0 }
       if (this.time_deliveryStart !== '' && this.time_deliveryStart !== null && this.time_deliveryFinish !== '' && this.time_deliveryFinish) { this.time_deliverycheck = 1 } else { this.time_deliverycheck = 0 }
-      searchtable(this.projectValuecheck, this.projectValue, this.CustomerNameValuecheck, this.CustomerNameValue, this.toolNumValuecheck, this.toolNumValue, this.time_Signcheck, this.time_deliveryStart, this.time_deliveryFinish, this.time_deliverycheck, this.time_deliveryStart, this.time_deliveryFinish, this.pageCurrent, this.pageSize).then(response => {
+      searchtable(this.projectValuecheck, this.projectValue, this.toolNumValuecheck, this.toolNumValue, this.CustomerNameValuecheck, this.CustomerNameValue, this.time_Signcheck, this.time_SignStart, this.time_SignFinish, this.time_deliverycheck, this.time_deliveryStart, this.time_deliveryFinish, this.pageCurrent, this.pageSize).then(response => {
         if (response.data.total === 0) {
           this.loading = false
         } else {
-          this.tableData = response.data.rows
+          for (let i = 0; i < response.data.rows.length; i++) {
+            if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null) {
+              response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
+            }
+            if (response.data.rows[i].发货节点 !== '' && response.data.rows[i].发货节点 !== null) {
+              response.data.rows[i].发货节点 = response.data.rows[i].发货节点.split(' ')[0]
+            }
+            if (response.data.rows[i].机床设计完成时间 !== '' && response.data.rows[i].机床设计完成时间 !== null) {
+              response.data.rows[i].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0]
+            }
+            if (response.data.rows[i].采购完成时间 !== '' && response.data.rows[i].采购完成时间 !== null) {
+              response.data.rows[i].采购完成时间 = response.data.rows[i].采购完成时间.split(' ')[0]
+            }
+            if (response.data.rows[i].备料完成时间 !== '' && response.data.rows[i].备料完成时间 !== null) {
+              response.data.rows[i].备料完成时间 = response.data.rows[i].备料完成时间.split(' ')[0]
+            }
+            if (response.data.rows[i].机床生产完成时间 !== '' && response.data.rows[i].机床生产完成时间 !== null) {
+              response.data.rows[i].机床生产完成时间 = response.data.rows[i].机床生产完成时间.split(' ')[0]
+            }
+            if (response.data.rows[i].机床装配完成时间 !== '' && response.data.rows[i].机床装配完成时间 !== null) {
+              response.data.rows[i].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0]
+            }
+            this.tableData.push({
+              edit: false,
+              项目编号: response.data.rows[i].项目编号,
+              项目名称: response.data.rows[i].项目名称,
+              机床图号: response.data.rows[i].机床图号,
+              机床名称: response.data.rows[i].机床名称,
+              数量: response.data.rows[i].数量,
+              合同签订日期: response.data.rows[i].合同签订日期,
+              发货节点: response.data.rows[i].发货节点,
+              客户名称: response.data.rows[i].客户名称,
+              机床设计者: response.data.rows[i].机床设计者,
+              机床设计完成时间: response.data.rows[i].机床设计完成时间,
+              采购完成时间: response.data.rows[i].采购完成时间,
+              备料完成时间: response.data.rows[i].备料完成时间,
+              机床生产完成时间: response.data.rows[i].机床生产完成时间,
+              机床装配完成时间: response.data.rows[i].机床装配完成时间,
+              完成顺序: response.data.rows[i].完成顺序,
+              更新: response.data.rows[i].更新,
+              项目流水号: response.data.rows[i].项目流水号,
+              机床流水号: response.data.rows[i].机床流水号
+            })
+          }
           this.total = response.data.total
         }
       }).then(() => {
         this.loading = false
       })
     },
+    // 表格1保存
+    confirmEdit(row) {
+      editTable(row.项目流水号, row.机床流水号, row.项目编号, row.数量, row.机床设计者, row.机床设计完成时间, row.采购完成时间, row.备料完成时间, row.机床生产完成时间, row.机床装配完成时间, row.完成顺序, row.更新).then(response => {
+        if (response.data[0].result === '1') {
+          row.edit = false
+          this.$notify({
+            title: '成功',
+            message: '信息修改成功',
+            type: 'success'
+          })
+          this.searchTable()
+        } else {
+          this.$message.error('信息修改失败')
+        }
+      })
+    },
+    // 查询表格2数据
+    openDialog(row) {
+      this.loading2 = true
+      this.tableData2 = []
+      if (this.code === 1) {
+        this.title = '发图'
+      } else if (this.code === 2) {
+        this.title = '采购'
+      } else if (this.code === 3) {
+        this.title = '备料'
+      } else if (this.code === 4) {
+        this.title = '制造'
+      } else if (this.code === 5) {
+        this.title = '装配'
+      }
+      searchTable2(row.机床流水号, this.code).then(response => {
+        this.jichuang = row.机床流水号
+        if (response.data.length === 0) {
+          this.loading2 = false
+        } else {
+          for (let i = 0; i < response.data.length; i++) {
+            if (response.data[i].接收任务时间 !== '' && response.data[i].接收任务时间 !== null) {
+              response.data[i].接收任务时间 = response.data[i].接收任务时间.split(' ')[0]
+            }
+            if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
+              response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
+            }
+            if (response.data[i].接收任务时间 !== '' && response.data[i].接收任务时间 !== null) {
+              response.data[i].接收任务时间 = response.data[i].接收任务时间.split(' ')[0]
+            }
+            if (response.data[i].计划完成时间 !== '' && response.data[i].计划完成时间 !== null) {
+              response.data[i].计划完成时间 = response.data[i].计划完成时间.split(' ')[0]
+            }
+            if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
+              response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
+            }
+            this.tableData2.push({
+              edit: false,
+              组件计划流水号: response.data[i].组件计划流水号,
+              机床流水号: response.data[i].机床流水号,
+              组号: response.data[i].组号,
+              任务名称: response.data[i].任务名称,
+              负责人: response.data[i].负责人,
+              接收任务时间: response.data[i].接收任务时间,
+              任务开始时间: response.data[i].任务开始时间,
+              计划完成时间: response.data[i].计划完成时间,
+              实际完成时间: response.data[i].实际完成时间,
+              备注: response.data[i].备注
+            })
+          }
+        }
+      }).then(() => {
+        this.loading2 = false
+      })
+    },
+    searchTable2() {
+      this.loading2 = true
+      this.tableData2 = []
+      if (this.code === 1) {
+        this.title = '发图'
+      } else if (this.code === 2) {
+        this.title = '采购'
+      } else if (this.code === 3) {
+        this.title = '备料'
+      } else if (this.code === 4) {
+        this.title = '制造'
+      } else if (this.code === 5) {
+        this.title = '装配'
+      }
+      searchTable2(this.jichuang, this.code).then(response => {
+        if (response.data.length === 0) {
+          this.loading2 = false
+        } else {
+          for (let i = 0; i < response.data.length; i++) {
+            if (response.data[i].接收任务时间 !== '' && response.data[i].接收任务时间 !== null) {
+              response.data[i].接收任务时间 = response.data[i].接收任务时间.split(' ')[0]
+            }
+            if (response.data[i].任务开始时间 !== '' && response.data[i].任务开始时间 !== null) {
+              response.data[i].任务开始时间 = response.data[i].任务开始时间.split(' ')[0]
+            }
+            if (response.data[i].接收任务时间 !== '' && response.data[i].接收任务时间 !== null) {
+              response.data[i].接收任务时间 = response.data[i].接收任务时间.split(' ')[0]
+            }
+            if (response.data[i].计划完成时间 !== '' && response.data[i].计划完成时间 !== null) {
+              response.data[i].计划完成时间 = response.data[i].计划完成时间.split(' ')[0]
+            }
+            if (response.data[i].实际完成时间 !== '' && response.data[i].实际完成时间 !== null) {
+              response.data[i].实际完成时间 = response.data[i].实际完成时间.split(' ')[0]
+            }
+            this.tableData2.push({
+              edit: false,
+              组件计划流水号: response.data[i].组件计划流水号,
+              机床流水号: response.data[i].机床流水号,
+              组号: response.data[i].组号,
+              任务名称: response.data[i].任务名称,
+              负责人: response.data[i].负责人,
+              接收任务时间: response.data[i].接收任务时间,
+              任务开始时间: response.data[i].任务开始时间,
+              计划完成时间: response.data[i].计划完成时间,
+              实际完成时间: response.data[i].实际完成时间,
+              备注: response.data[i].备注
+            })
+          }
+        }
+      }).then(() => {
+        this.loading2 = false
+      })
+    },
+    // 表格2保存
+    confirmEdit2(row) {
+      editTable2(row.组件计划流水号, row.组号, row.任务名称, row.负责人, row.接收任务时间, row.任务开始时间, row.计划完成时间, row.货期, row.实际完成时间, row.备注).then(response => {
+        if (response.data[0].result === '1') {
+          row.edit = false
+          this.$notify({
+            title: '成功',
+            message: '信息修改成功',
+            type: 'success'
+          })
+          this.searchTable2()
+        } else {
+          this.$message.error('信息修改失败')
+        }
+      })
+    },
+    // 表格2删除
+    Delete(row) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        Delete(row.组件计划流水号).then(response => {
+          if (response.data[0].result === '1') {
+            row.edit = false
+            this.$notify({
+              title: '成功',
+              message: '信息修改成功',
+              type: 'success'
+            })
+            this.searchTable2()
+          } else {
+            this.$message.error('信息修改失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 表格2增加
+    addTable() {
+      if (this.jichuang === '') {
+        this.$message.error('请先选择一个类别')
+      } else {
+        addTable(this.jichuang, this.code).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message({
+              type: 'success',
+              message: '添加成功!'
+            })
+            this.searchTable2()
+          } else {
+            this.$message.error('添加失败')
+          }
+        })
+      }
+    },
     // 分页
     handleSizeChange(val) {
       this.pageCurrent = 1
@@ -270,5 +629,7 @@ export default {
 </script>
 
 <style scoped>
-
+  .el-card {
+    margin-bottom: 15px;
+  }
 </style>