diff --git a/src/api/ManufacturingCenter/ProjectPlanningManagementNew.js b/src/api/ManufacturingCenter/ProjectPlanningManagementNew.js
new file mode 100644
index 00000000..2c2fa2d0
--- /dev/null
+++ b/src/api/ManufacturingCenter/ProjectPlanningManagementNew.js
@@ -0,0 +1,148 @@
+import request from '@/utils/request'
+import state from '@/store'
+import router from '@/router'
+
+export function getProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: 'PDM_项目名称_查询数据_总计划'
+    }
+  })
+}
+export function getToolNum(check, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: 'PDM_机床名称_查询数据',
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + num
+    }
+  })
+}
+// 组件查询
+export function searchgroup(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num
+    }
+  })
+}
+// 组件名称查询
+export function searchgroupName(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: 'PDM_组件名称_查询数据_查询名称',
+      param: '组件流水号=' + num
+    }
+  })
+}
+export function getCustomerName() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '客户关系管理系统_初始化查询_客户名称'
+    }
+  })
+}
+export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '项目计划管理_项目总计划_查询数据',
+      param: `项目流水号_check=` + num1 + '&项目流水号=' + num2 + '&机床流水号_check=' + num3 + '&机床流水号=' + num4 + '&客户名称_check=' + num5 + '&客户名称=' + num6 + '&签订日期_check=' + num7 + '&签订日期开始时间=' + num8 + '&签订日期结束时间=' + num9 + '&交货期_check=' + num10 + '&交货期开始时间=' + num11 + '&交货期结束时间=' + num12,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function editTable(num1, num2, num3, num5, num13, num14, num15, num6, num7, num8, num9, num10, num11, num12) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '项目计划管理_项目总计划_编辑数据',
+      param: `项目流水号=` + num1 + '&机床流水号=' + num2 + '&项目编号=' + num3 + '&设计者=' + num5 + '&审图计划开始时间=' + num13 + '&审图计划完成时间=' + num14 + '&审图实际完成时间=' + num15 + '&机床设计完成时间=' + num6 + '&采购完成时间=' + num7 + '&备料完成时间=' + num8 + '&机床生产完成时间=' + num9 + '&机床装配完成时间=' + num10 + '&完成顺序=' + num11 + '&更新=' + num12
+    }
+  })
+}
+export function searchTable2(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '项目计划管理_项目详细计划_查询数据',
+      param: `机床流水号=` + num1 + '&计划类型=' + num2
+    }
+  })
+}
+export function editTable2(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '项目计划管理_项目详细计划_编辑数据',
+      param: `组件计划流水号=` + num1 + '&组件流水号=' + num2 + '&任务名称=' + num3 + '&负责人=' + num4 + '&接收任务时间=' + num5 + '&任务开始时间=' + num6 + '&计划完成时间=' + num7 + '&货期=' + num8 + '&实际完成时间=' + num9 + '&备注=' + num10
+    }
+  })
+}
+export function Delete(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '项目计划管理_项目详细计划_删除数据',
+      param: `组件计划流水号=` + num1
+    }
+  })
+}
+export function addTable(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '项目计划管理_项目详细计划_增加数据',
+      param: `机床流水号=` + num1 + '&计划类型=' + num2
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
new file mode 100644
index 00000000..a9fad44e
--- /dev/null
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue
@@ -0,0 +1,795 @@
+<template>
+  <div class="app-container bold-font">
+    <el-card>
+      <el-row>
+        <h3 style="display: inline-block;margin: 0">项目名称:</h3>
+        <el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="项目名称" @change="typeChange()">
+          <el-option
+            v-for="item in project"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <h3 style="display: inline-block;margin: 0 0 0 20px">机床名称:</h3>
+        <el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床名称">
+          <el-option
+            v-for="item in toolNum"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3>
+        <el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
+      </el-row>
+      <el-row>
+        <h3 style="display: inline-block;margin: 0">签订日期:</h3>
+        <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"/>
+        <h3 style="display: inline-block;margin: 0 0 0 20px">交货期:</h3>
+        <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="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
+      </el-row>
+    </el-card>
+
+    <el-card>
+      <h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>
+      <el-table v-loading="loading" :data="tableData" height="750" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table-column label="项目编号" align="center" width="140px" fixed="left">
+          <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="120px" fixed="left">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center" width="140px" fixed="left">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床名称" align="center" width="280px" fixed="left">
+          <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="120px">
+          <template slot-scope="scope">
+            {{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="交货期" align="center" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="设备预验节点" align="center" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="安装调试节点" align="center" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="设计者" align="center" width="90px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.机床设计者" size="mini" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.机床设计者 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="审图（计划开始）" align="center" width="170px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.审图计划开始时间 !== '1900/1/1' ? scope.row.审图计划开始时间 : '' }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="审图（计划完成）" align="center" width="170px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.审图计划完成时间 !== '1900/1/1' ? scope.row.审图计划完成时间 : '' }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="审图（实际完成）" align="center" width="170px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.审图实际完成时间 !== '1900/1/1' ? scope.row.审图实际完成时间 : '' }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="发图（计划）" align="center" width="150px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              <el-button class="bold-font" type="text" @click="code = 1;openDialog(scope.row)">{{ scope.row.机床设计完成时间 !== '1900-01-01 00:00:00' ? scope.row.机床设计完成时间 : '-' }}</el-button>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="发图（实际）" align="center" width="150px">
+          <template slot-scope="scope">
+            <div class="bold-font">{{ scope.row.机床设计实际完成时间 !== '1900-01-01' ? scope.row.机床设计实际完成时间 : '-' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="采购（计划）" align="center" width="150px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              <el-button class="bold-font" type="text" @click="code = 2;openDialog(scope.row)">{{ scope.row.采购完成时间 !== '1900-01-01' ? scope.row.采购完成时间 : '-' }}</el-button>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="采购（实际）" align="center" width="150px">
+          <template slot-scope="scope">
+            <div class="bold-font">{{ scope.row.采购实际完成时间 !== '1900-01-01' ? scope.row.采购实际完成时间 : '-' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="备料（计划）" align="center" width="150px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              <el-button class="bold-font" type="text" @click="code = 3;openDialog(scope.row)">{{ scope.row.备料完成时间 !== '1900-01-01' ? scope.row.备料完成时间 : '-' }}</el-button>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="备料（实际）" align="center" width="150px">
+          <template slot-scope="scope">
+            <div class="bold-font">{{ scope.row.备料实际完成时间 !== '1900-01-01' ? scope.row.备料实际完成时间 : '-' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="制造（计划）" align="center" width="150px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              <el-button class="bold-font" type="text" @click="code = 4;openDialog(scope.row)">{{ scope.row.机床生产完成时间 !== '1900-01-01' ? scope.row.机床生产完成时间 : '-' }}</el-button>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="制造（实际）" align="center" width="150px">
+          <template slot-scope="scope">
+            <div class="bold-font">{{ scope.row.机床生产实际完成时间 !== '1900-01-01' ? scope.row.机床生产实际完成时间 : '-' }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column label="装配（计划）" align="center" width="150px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              <el-button class="bold-font" type="text" @click="code = 5;openDialog(scope.row)">{{ scope.row.机床装配完成时间 !== '1900-01-01' ? scope.row.机床装配完成时间 : '-' }}</el-button>
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="装配（实际）" align="center" width="150px">
+          <template slot-scope="scope">
+            <div class="bold-font">{{ scope.row.机床装配实际完成时间 !== '1900-01-01' ? scope.row.机床装配实际完成时间 : '-' }}</div>
+          </template>
+        </el-table-column>
+        <!--<el-table-column label="顺序" align="center" width="100px">-->
+        <!--<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="90px">
+          <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="150px" align="center">
+          <template slot-scope="scope">
+            <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>
+      <div class="block" style="margin-top: 15px;">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+
+    <el-card>
+      <h2 v-if="code===1" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 发图</h2>
+      <h2 v-if="code===2" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 采购</h2>
+      <h2 v-if="code===3" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 备料</h2>
+      <h2 v-if="code===4" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 制造</h2>
+      <h2 v-if="code===5" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 装配</h2>
+      <el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 7px 0 0 0" plain @click="addTable()">增加</el-button>
+      <el-table v-loading="loading2" :data="tableData2" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
+        <el-table-column min-width="100px" label="组号" align="center">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-select v-model="scope.row.组件流水号" filterable clearable size="small" style="width: 100px" @change="groupChange(scope.row, scope.$index)">
+                <el-option
+                  v-for="item in groupNum"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"/>
+              </el-select>
+            </template>
+            <template v-else>
+              {{ scope.row.组号 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="200px" label="任务名称" align="center">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.任务名称" size="mini" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.任务名称 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="100px" label="负责人" align="center">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.负责人" size="mini" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.负责人 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="接收任务时间" align="center" width="150px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.接收任务时间 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="任务开始时间" align="center" width="150px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.任务开始时间 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="计划完成时间" align="center" width="150px">
+          <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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.计划完成时间 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column min-width="100px" label="货期" align="center">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit">
+              <el-input v-model="scope.row.货期" size="mini" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.货期 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="实际完成时间" align="center" width="150px">
+          <template slot-scope="scope">
+            <template v-if="scope.row.edit && !scope.row.组件流水号">
+              <el-date-picker v-model="scope.row.实际完成时间" value-format="yyyy-MM-dd" size="mini" type="date" style="width: 100%"/>
+            </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" style="width: 100%"/>
+            </template>
+            <template v-else>
+              {{ scope.row.备注 }}
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="180px" 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, editTable, searchTable2, editTable2, Delete, addTable, searchgroup, searchgroupName } from '@/api/ManufacturingCenter/ProjectPlanningManagement'
+export default {
+  data() {
+    return {
+      machineNum: '',
+      jichuang: '',
+      title: '',
+      tableData2: [],
+      loading2: false,
+      code: '',
+      time_SignStart: '', // 签订开始
+      time_SignFinish: '', // 签订结束
+      time_deliveryStart: '', // 交货开始
+      time_deliveryFinish: '', // 交货结束
+      projectValue: '',
+      project: [], // 项目名称
+      CustomerNameValue: '',
+      CustomerName: [], // 客户名称
+      toolNumValue: '',
+      toolNum: [], // 机床
+      groupNum: [],
+      loading: false,
+      tableData: [], // 表格数据
+      total: null, // 总条数
+      pageSize: 10, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
+    }
+  },
+  created() {
+    this.fetchData()
+    this.getCustomerName()
+    this.searchTable()
+  },
+  methods: {
+    fetchData() {
+      this.projectValue = ''
+      this.project = []
+      getProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.project.push({
+            label: response.data[i].项目名称,
+            value: response.data[i].项目流水号
+          })
+        }
+      })
+    },
+    typeChange() {
+      this.toolNumValue = ''
+      this.toolNum = []
+      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].机床流水号
+          })
+        }
+      })
+    },
+    groupChange(row, index) {
+      if (row.组件流水号 !== '') {
+        searchgroupName(row.组件流水号).then(response => {
+          console.log(response.data)
+          this.tableData2[index].任务名称 = response.data[0].组件名称
+        })
+      }
+    },
+    getCustomerName() {
+      this.CustomerNameValue = ''
+      this.CustomerName = []
+      getCustomerName().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.CustomerName.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.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 {
+          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]
+            }
+            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]
+            }
+            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].采购实际完成时间,
+              备料实际完成时间: 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.机床装配完成时间, 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.machineNum = 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 = '装配'
+      }
+      this.groupNum = []
+      searchgroup(row.机床流水号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNum.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+      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].货期,
+              实际完成时间: 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].货期,
+              实际完成时间: 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
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card {
+    border-color: rgb(0, 12, 57);
+    color: white;
+    margin-bottom: 5px;
+    background-color: rgb(0, 12, 57);
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .el-pagination{
+    background-color: white;
+  }
+</style>
+<style>
+  .bold-font .el-table{
+    font: bold 18px arial!important;
+    margin: 0 0 10px 0;
+    color: white;
+  }
+  .bold-font .el-table td{
+    background-color: rgb(0, 12, 57)!important;
+  }
+  .bold-font .el-table th{
+    color: white;
+    background-color: rgb(0, 12, 57)!important;
+  }
+  .bold-font .el-table div{
+    color: white;
+    background-color: rgb(0, 12, 57)!important;
+  }
+  .bold-font{
+    color: ghostwhite;
+    font: bold 22px arial!important;
+    padding: 5px;
+  }
+</style>