Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/api/ManufacturingCenter/ProjectPlanningManagementQuery.js

@@ -0,0 +1,157 @@
+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: '客户关系管理系统_初始化查询_客户名称'
+    }
+  })
+}
+// 查询表1
+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
+    }
+  })
+}
+// 编辑表1
+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
+    }
+  })
+}
+// 查询表2
+export function searchTable2(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '项目计划管理_项目计划查询_查询项目详细_查询数据',
+      param: `机床流水号=` + num1
+    }
+  })
+}
+// 编辑表2
+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
+    }
+  })
+}
+// 删除表2
+export function Delete(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '项目计划管理_项目详细计划_删除数据',
+      param: `组件计划流水号=` + num1
+    }
+  })
+}
+// 新增表2
+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
+    }
+  })
+}

src/api/PurchasingCenter/PurchaseSituationSearch.js

@@ -38,9 +38,9 @@ export function searchTable1(...params) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '采购管理_采购部采购_查询物料_分配后_加供应商_新',
+      name: '采购管理_采购部采购_查询物料_分配后_加供应商_新_LLJ',
-      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}`,
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}&时间_check=${params[13]}&开始时间=${params[14]}&结束时间=${params[15]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&PageCount=1=int=output&ItemCount=1=int=output`
-      Pagination: params[4] + '&' + params[5]
+      // Pagination: params[4] + '&' + params[5]
     }
   })
 }
@@ -53,9 +53,9 @@ export function searchTable2(...params) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新',
+      name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商_新_LLJ',
-      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}`,
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}&时间_check=${params[12]}&开始时间=${params[13]}&结束时间=${params[14]}&PageCurrent=${params[4]}=int&PageSize=${params[5]}=int&PageCount=1=int=output&ItemCount=1=int=output`
-      Pagination: params[4] + '&' + params[5]
+      // Pagination: params[4] + '&' + params[5]
     }
   })
 }

src/views/Assembly/MakeAssemblyPlan/index.vue

@@ -14,7 +14,7 @@
           </el-option>
         </el-select>
         <el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 300px" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="margin-left: 300px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -106,8 +106,8 @@
             <!--</el-tooltip>-->
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
+                <el-button v-if="!scope.row.edit" type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
                 <el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
                 <el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button>
               </div>
             </el-tooltip>

src/views/Assembly/MakeColdWorkPlan/index.vue

@@ -14,7 +14,7 @@
           </el-option>
         </el-select>
         <el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 300px" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="margin-left: 300px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -100,7 +100,7 @@
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="!scope.row.edit" type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
                 <el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button>
               </div>
             </el-tooltip>

src/views/Assembly/MakeElectricalAssembly/index.vue

@@ -14,7 +14,7 @@
           </el-option>
         </el-select>
         <el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 300px" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="margin-left: 300px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -100,7 +100,7 @@
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="!scope.row.edit" type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
                 <el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button>
               </div>
             </el-tooltip>

src/views/Assembly/MakePaintPlan/index.vue

@@ -14,7 +14,7 @@
           </el-option>
         </el-select>
         <el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 300px" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="margin-left: 300px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -100,7 +100,7 @@
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button v-if="scope.row.edit" type="text" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="!scope.row.edit" type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
                 <el-button v-if="scope.row.edit" type="text" plain size="small" @click="cancel(scope.row)">取消</el-button>
               </div>
             </el-tooltip>

src/views/Inventory/CreatePickingList/index.vue

@@ -3,7 +3,7 @@
     <el-card style="width: 100%">
       <div slot="header">
         <el-row>
-          <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable style="width: 120px" @change="machineChange">
+          <el-select v-show="PartType !== '离线采购件'" v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable style="width: 120px;margin-left: 5px" @change="machineChange">
             <el-option
               v-for="item in machineNumber"
               :key="item.value"
@@ -13,7 +13,7 @@
               <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
             </el-option>
           </el-select>
-          <el-select v-model="groupNumberValue" placeholder="组号" size="small" style="width: 120px" clearable>
+          <el-select v-show="PartType !== '离线采购件'" v-model="groupNumberValue" placeholder="组号" size="small" style="width: 120px" clearable>
             <el-option
               v-for="item in groupNumber"
               :key="item.value"
@@ -22,11 +22,13 @@
           </el-select>
           <el-input v-model="Name" placeholder="物料名称、规格、型号" clearable style="width: 200px" size="small"/>
           <el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent0=1;pageSize0=300;pageCurrent1=1;pageSize1=300;pageCurrent2=1;pageSize2=300;pageCurrent4=1;pageSize4=20;searchTable()">查询</el-button>
+          <el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchTable()">查询</el-button>
           <el-switch
             v-model="PickingValue"
             active-color="#13ce66"
             inactive-color="#ff4949"
-            style="margin-left: 5px"/>
+            style="margin-left: 5px"
+            @change="searchTable()"/>
           <span>已领用</span>
         </el-row>
       </div>
@@ -578,7 +580,13 @@ export default {
     },
     // 查三表
     searchTable() {
-      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
+      console.log(this.PartType, this.machineNumberValue)
+      if (this.PartType === '离线采购件') {
+        this.machineNumberValue = ''
+        this.groupNumberValue = ''
+        this.searchTable4()
+      }
+      if ((this.machineNumberValue !== '' && this.machineNumberValue !== null) || this.PartType === '离线采购件') {
         this.multipleSelection = []
         this.multipleSelection1 = []
         if (this.PartType === '标准件') {
@@ -587,8 +595,6 @@ export default {
           this.searchTable1()
         } else if (this.PartType === '基本件') {
           this.searchTable2()
-        } else if (this.PartType === '离线采购件') {
-          this.searchTable4()
         }
       } else {
         this.$message.warning('请选择机床后再查询')
@@ -627,16 +633,17 @@ export default {
       if (this.PickingValue === false) {
         this.loading1 = true
         searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent1, this.pageSize1, 2).then(response => {
-          this.tableData0 = response.data.rows
+          console.log(response, 2)
-          this.total0 = response.data.total
+          this.tableData1 = response.data.rows
+          this.total1 = response.data.total
           this.loading1 = false
         }).catch(() => {
           this.loading1 = false
         })
       } else {
         searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent1, this.pageSize1, 2).then(response => {
-          this.tableData0 = response.data.rows
+          this.tableData1 = response.data.rows
-          this.total0 = response.data.total
+          this.total1 = response.data.total
         })
       }
     },
@@ -650,16 +657,16 @@ export default {
       if (this.PickingValue === false) {
         this.loading2 = true
         searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 0, this.pageCurrent2, this.pageSize2, 3).then(response => {
-          this.tableData0 = response.data.rows
+          this.tableData2 = response.data.rows
-          this.total0 = response.data.total
+          this.total2 = response.data.total
           this.loading2 = false
         }).catch(() => {
           this.loading2 = false
         })
       } else {
         searchTable(check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.Name, 1, 1, this.pageCurrent2, this.pageSize2, 3).then(response => {
-          this.tableData0 = response.data.rows
+          this.tableData2 = response.data.rows
-          this.total0 = response.data.total
+          this.total2 = response.data.total
         })
       }
     },

src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue

@@ -454,57 +454,57 @@ export default {
           this.loading = false
         } else {
           for (let i = 0; i < response.data.rows.length; i++) {
-            if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null) {
+            // if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null) {
-              response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
+            //   response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].发货节点 !== '' && response.data.rows[i].发货节点 !== null) {
+            // if (response.data.rows[i].发货节点 !== '' && response.data.rows[i].发货节点 !== null) {
-              response.data.rows[i].发货节点 = response.data.rows[i].发货节点.split(' ')[0]
+            //   response.data.rows[i].发货节点 = response.data.rows[i].发货节点.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].设备预验收节点 !== '' && response.data.rows[i].设备预验收节点 !== null) {
+            // if (response.data.rows[i].设备预验收节点 !== '' && response.data.rows[i].设备预验收节点 !== null) {
-              response.data.rows[i].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0]
+            //   response.data.rows[i].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].安装调试节点 !== '' && response.data.rows[i].安装调试节点 !== null) {
+            // if (response.data.rows[i].安装调试节点 !== '' && response.data.rows[i].安装调试节点 !== null) {
-              response.data.rows[i].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0]
+            //   response.data.rows[i].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].机床设计完成时间 !== '' && response.data.rows[i].机床设计完成时间 !== null) {
+            // if (response.data.rows[i].机床设计完成时间 !== '' && response.data.rows[i].机床设计完成时间 !== null) {
-              response.data.rows[i].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0]
+            //   response.data.rows[i].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].采购完成时间 !== '' && response.data.rows[i].采购完成时间 !== null) {
+            // if (response.data.rows[i].采购完成时间 !== '' && response.data.rows[i].采购完成时间 !== null) {
-              response.data.rows[i].采购完成时间 = response.data.rows[i].采购完成时间.split(' ')[0]
+            //   response.data.rows[i].采购完成时间 = response.data.rows[i].采购完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].备料完成时间 !== '' && response.data.rows[i].备料完成时间 !== null) {
+            // if (response.data.rows[i].备料完成时间 !== '' && response.data.rows[i].备料完成时间 !== null) {
-              response.data.rows[i].备料完成时间 = response.data.rows[i].备料完成时间.split(' ')[0]
+            //   response.data.rows[i].备料完成时间 = response.data.rows[i].备料完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].机床生产完成时间 !== '' && response.data.rows[i].机床生产完成时间 !== null) {
+            // if (response.data.rows[i].机床生产完成时间 !== '' && response.data.rows[i].机床生产完成时间 !== null) {
-              response.data.rows[i].机床生产完成时间 = response.data.rows[i].机床生产完成时间.split(' ')[0]
+            //   response.data.rows[i].机床生产完成时间 = response.data.rows[i].机床生产完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].机床装配完成时间 !== '' && response.data.rows[i].机床装配完成时间 !== null) {
+            // if (response.data.rows[i].机床装配完成时间 !== '' && response.data.rows[i].机床装配完成时间 !== null) {
-              response.data.rows[i].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0]
+            //   response.data.rows[i].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].机床设计实际完成时间 !== '' && response.data.rows[i].机床设计实际完成时间 !== null) {
+            // if (response.data.rows[i].机床设计实际完成时间 !== '' && response.data.rows[i].机床设计实际完成时间 !== null) {
-              response.data.rows[i].机床设计实际完成时间 = response.data.rows[i].机床设计实际完成时间.split(' ')[0]
+            //   response.data.rows[i].机床设计实际完成时间 = response.data.rows[i].机床设计实际完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].采购实际完成时间 !== '' && response.data.rows[i].采购实际完成时间 !== null) {
+            // if (response.data.rows[i].采购实际完成时间 !== '' && response.data.rows[i].采购实际完成时间 !== null) {
-              response.data.rows[i].采购实际完成时间 = response.data.rows[i].采购实际完成时间.split(' ')[0]
+            //   response.data.rows[i].采购实际完成时间 = response.data.rows[i].采购实际完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].备料实际完成时间 !== '' && response.data.rows[i].备料实际完成时间 !== null) {
+            // if (response.data.rows[i].备料实际完成时间 !== '' && response.data.rows[i].备料实际完成时间 !== null) {
-              response.data.rows[i].备料实际完成时间 = response.data.rows[i].备料实际完成时间.split(' ')[0]
+            //   response.data.rows[i].备料实际完成时间 = response.data.rows[i].备料实际完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].机床生产实际完成时间 !== '' && response.data.rows[i].机床生产实际完成时间 !== null) {
+            // if (response.data.rows[i].机床生产实际完成时间 !== '' && response.data.rows[i].机床生产实际完成时间 !== null) {
-              response.data.rows[i].机床生产实际完成时间 = response.data.rows[i].机床生产实际完成时间.split(' ')[0]
+            //   response.data.rows[i].机床生产实际完成时间 = response.data.rows[i].机床生产实际完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].机床装配实际完成时间 !== '' && response.data.rows[i].机床装配实际完成时间 !== null) {
+            // if (response.data.rows[i].机床装配实际完成时间 !== '' && response.data.rows[i].机床装配实际完成时间 !== null) {
-              response.data.rows[i].机床装配实际完成时间 = response.data.rows[i].机床装配实际完成时间.split(' ')[0]
+            //   response.data.rows[i].机床装配实际完成时间 = response.data.rows[i].机床装配实际完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].审图计划开始时间 !== '' && response.data.rows[i].审图计划开始时间 !== null) {
+            // if (response.data.rows[i].审图计划开始时间 !== '' && response.data.rows[i].审图计划开始时间 !== null) {
-              response.data.rows[i].审图计划开始时间 = response.data.rows[i].审图计划开始时间.split(' ')[0]
+            //   response.data.rows[i].审图计划开始时间 = response.data.rows[i].审图计划开始时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].审图计划完成时间 !== '' && response.data.rows[i].审图计划完成时间 !== null) {
+            // if (response.data.rows[i].审图计划完成时间 !== '' && response.data.rows[i].审图计划完成时间 !== null) {
-              response.data.rows[i].审图计划完成时间 = response.data.rows[i].审图计划完成时间.split(' ')[0]
+            //   response.data.rows[i].审图计划完成时间 = response.data.rows[i].审图计划完成时间.split(' ')[0]
-            }
+            // }
-            if (response.data.rows[i].审图实际完成时间 !== '' && response.data.rows[i].审图实际完成时间 !== null) {
+            // if (response.data.rows[i].审图实际完成时间 !== '' && response.data.rows[i].审图实际完成时间 !== null) {
-              response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0]
+            //   response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0]
-            }
+            // }
             this.tableData.push({
               edit: false,
               项目编号: response.data.rows[i].项目编号,

src/views/ManufacturingCenter/ProjectPlanningManagementNew/index.vue

@@ -21,6 +21,7 @@
         <h3 style="display: inline-block;margin: 0 0 0 20px">客户名称:</h3>
         <el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
         <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
+        <el-button size="small" style="margin: 0px 0px 3px 300px" type="warning" icon="el-icon-edit-outline" plain @click="editPro()">编辑</el-button>
       </el-row>
       <el-row v-if="false">
         <h3 style="display: inline-block;margin: 0">签订日期:</h3>
@@ -35,7 +36,7 @@
     <el-card style="overflow: auto">
       <el-col style="width: 1400px;">
         <!--<h2 style="display: inline-block;margin: 0 0 10px 0">总计划:</h2>-->
-        <el-table v-loading="loading" :data="tableData" height="300" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中">
+        <el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
           <el-table-column label="项目编号" align="center" width="140px" fixed="left">
             <template slot-scope="scope">
               <template v-if="scope.row.edit">
@@ -86,131 +87,6 @@
               {{ 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="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 v-if="false" 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>
@@ -232,16 +108,108 @@
         </div>
       </el-col>
       <el-col style="width: 200px;">
-        sadasd
+        <el-form label-position="left" label-width="90px" class="demo-ruleForm1">
+          <el-row>
+            <el-col style="width: 20px">
+              <!--<el-radio v-model="radio" label="1">{{ empty }}</el-radio>-->
+            </el-col>
+            <el-col style="width: 180px;margin-left: 20px">
+              <el-form-item label="设计者" prop="设计者" >
+                <el-input v-model="设计者" placeholder="设计者" clearable size="small" style="width: 150px"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 20px">
+              <!--<el-radio v-model="radio" label="2">{{ empty }}</el-radio>-->
+            </el-col>
+            <el-col style="width: 180px;margin-left: 20px">
+              <el-form-item label="审图开始" prop="审图开始">
+                <el-date-picker v-model="审图开始" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图开始" class="time"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 20px">
+              <!--<el-radio v-model="radio" label="3">{{ empty }}</el-radio>-->
+            </el-col>
+            <el-col style="width: 180px;margin-left: 20px">
+              <el-form-item label="审图结束" prop="审图结束">
+                <el-date-picker v-model="审图结束" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="审图结束" class="time"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 20px">
+              <el-radio v-model="radio" label="1">{{ empty }}</el-radio>
+            </el-col>
+            <el-col style="width: 180px">
+              <el-form-item label="发图完成" prop="发图完成">
+                <el-date-picker v-model="发图完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="发图完成" class="time"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 20px">
+              <el-radio v-model="radio" label="2">{{ empty }}</el-radio>
+            </el-col>
+            <el-col style="width: 180px">
+              <el-form-item label="采购完成" prop="采购完成">
+                <el-date-picker v-model="采购完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="采购完成" class="time"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 20px">
+              <el-radio v-model="radio" label="3">{{ empty }}</el-radio>
+            </el-col>
+            <el-col style="width: 180px">
+              <el-form-item label="备料完成" prop="备料完成">
+                <el-date-picker v-model="备料完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="备料完成" class="time"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 20px">
+              <el-radio v-model="radio" label="4">{{ empty }}</el-radio>
+            </el-col>
+            <el-col style="width: 180px">
+              <el-form-item label="制造完成" prop="制造完成">
+                <el-date-picker v-model="制造完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="制造完成" class="time"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 20px">
+              <el-radio v-model="radio" label="5">{{ empty }}</el-radio>
+            </el-col>
+            <el-col style="width: 180px">
+              <el-form-item label="装配完成" prop="装配完成">
+                <el-date-picker v-model="装配完成" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="装配完成" class="time"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 20px">
+              <!--<el-radio v-model="radio" label="9">{{ empty }}</el-radio>-->
+            </el-col>
+            <el-col style="width: 180px;margin-left: 20px">
+              <el-form-item label="更新时间" prop="更新时间">
+                <el-input v-model="更新时间" placeholder="更新时间" clearable size="small" style="width: 150px"/>
+                <!--<el-date-picker v-model="更新时间" size="small" value-format="yyyy-MM-dd" type="date" style="width: 150px" placeholder="更新时间" class="time"/>-->
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
       </el-col>
     </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="radio==='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="radio==='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="radio==='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="radio==='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>
+      <h2 v-if="radio==='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">
@@ -354,10 +322,24 @@
 </template>
 
 <script>
-import { getProject, getCustomerName, getToolNum, searchtable, editTable, searchTable2, editTable2, Delete, addTable, searchgroup, searchgroupName } from '@/api/ManufacturingCenter/ProjectPlanningManagement'
+import { getProject, getCustomerName, searchgroupName, getToolNum, searchtable, editTable, searchTable2, searchgroup, addTable, editTable2, Delete } from '@/api/ManufacturingCenter/ProjectPlanningManagement'
 export default {
   data() {
     return {
+      empty: '',
+      radio: '',
+      项目流水号: '',
+      机床流水号: '',
+      项目编号: '',
+      设计者: '',
+      审图开始: '',
+      审图结束: '',
+      发图完成: '',
+      采购完成: '',
+      备料完成: '',
+      制造完成: '',
+      装配完成: '',
+      更新时间: '',
       machineNum: '',
       jichuang: '',
       title: '',
@@ -382,6 +364,15 @@ export default {
       pageCurrent: 1 // 后台获取页
     }
   },
+  watch: {
+    radio(val) {
+      if (this.项目流水号) {
+        this.openDialog()
+      } else {
+        this.radio = ''
+      }
+    }
+  },
   created() {
     this.fetchData()
     this.getCustomerName()
@@ -415,7 +406,6 @@ export default {
     groupChange(row, index) {
       if (row.组件流水号 !== '') {
         searchgroupName(row.组件流水号).then(response => {
-          console.log(response.data)
           this.tableData2[index].任务名称 = response.data[0].组件名称
         })
       }
@@ -437,6 +427,19 @@ export default {
       this.loading = true
       this.tableData = []
       this.tableData2 = []
+      this.radio = ''
+      this.项目流水号 = ''
+      this.机床流水号 = ''
+      this.项目编号 = ''
+      this.设计者 = ''
+      this.审图开始 = ''
+      this.审图结束 = ''
+      this.发图完成 = ''
+      this.采购完成 = ''
+      this.备料完成 = ''
+      this.制造完成 = ''
+      this.装配完成 = ''
+      this.更新时间 = ''
       this.jichuang = ''
       this.code = ''
       if (this.projectValue !== '' && this.projectValue !== null) { this.projectValuecheck = 1 } else { this.projectValuecheck = 0 }
@@ -445,7 +448,6 @@ export default {
       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 => {
-        console.log(response.data)
         if (response.data.total === 0) {
           this.loading = false
         } else {
@@ -488,40 +490,64 @@ export default {
         this.loading = false
       })
     },
-    // 表格1保存
+    rowClick(row) {
-    confirmEdit(row) {
+      searchtable(1, row.项目流水号, 1, row.机床流水号, 0, 0, 0, '', '', 0, '', '', 1, 100).then(response => {
-      editTable(row.项目流水号, row.机床流水号, row.项目编号, row.机床设计者, row.审图计划开始时间, row.审图计划完成时间, row.审图实际完成时间, row.机床设计完成时间, row.采购完成时间, row.备料完成时间, row.机床生产完成时间, row.机床装配完成时间, row.完成顺序, row.更新).then(response => {
+        if (response.data.total !== 0) {
-        if (response.data[0].result === '1') {
+          this.machineNum = row.机床图号
-          row.edit = false
+          this.项目流水号 = row.项目流水号
-          this.$notify({
+          this.机床流水号 = row.机床流水号
-            title: '成功',
+          this.项目编号 = row.项目编号
-            message: '信息修改成功',
+          this.设计者 = response.data.rows[0].机床设计者
-            type: 'success'
+          this.审图开始 = response.data.rows[0].审图计划开始时间
-          })
+          this.审图结束 = response.data.rows[0].审图计划完成时间
-          this.searchTable()
+          this.发图完成 = response.data.rows[0].机床设计完成时间
-        } else {
+          this.采购完成 = response.data.rows[0].采购完成时间
-          this.$message.error('信息修改失败')
+          this.备料完成 = response.data.rows[0].备料完成时间
+          this.制造完成 = response.data.rows[0].机床生产完成时间
+          this.装配完成 = response.data.rows[0].机床装配完成时间
+          this.更新时间 = response.data.rows[0].更新
         }
       })
     },
+    // 表格1保存
+    editPro() {
+      if (this.项目流水号) {
+        this.审图开始 ? this.审图开始 : this.审图开始 = null
+        this.审图结束 ? this.审图结束 : this.审图结束 = null
+        this.发图完成 ? this.发图完成 : this.发图完成 = null
+        this.采购完成 ? this.采购完成 : this.采购完成 = null
+        this.备料完成 ? this.备料完成 : this.备料完成 = null
+        this.制造完成 ? this.制造完成 : this.制造完成 = null
+        this.装配完成 ? this.装配完成 : this.装配完成 = null
+        editTable(this.项目流水号, this.机床流水号, this.项目编号, this.设计者, this.审图开始, this.审图结束, '', this.发图完成, this.采购完成, this.备料完成, this.制造完成, this.装配完成, '', this.更新时间).then(response => {
+          if (response.data[0].result === '1') {
+            console.log(response.data)
+            this.$message.success('保存成功')
+          } else {
+            this.$message.error('信息修改失败')
+          }
+        })
+      } else {
+        this.$message.error('请先选择项目')
+      }
+    },
     // 查询表格2数据
-    openDialog(row) {
+    openDialog() {
-      this.machineNum = row.机床图号
       this.loading2 = true
       this.tableData2 = []
-      if (this.code === 1) {
+      if (this.radio === '1') {
         this.title = '发图'
-      } else if (this.code === 2) {
+      } else if (this.radio === '2') {
         this.title = '采购'
-      } else if (this.code === 3) {
+      } else if (this.radio === '3') {
         this.title = '备料'
-      } else if (this.code === 4) {
+      } else if (this.radio === '4') {
         this.title = '制造'
-      } else if (this.code === 5) {
+      } else if (this.radio === '5') {
         this.title = '装配'
       }
       this.groupNum = []
-      searchgroup(row.机床流水号).then(response => {
+      searchgroup(this.机床流水号).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.groupNum.push({
             label: response.data[i].组号,
@@ -529,8 +555,7 @@ export default {
           })
         }
       })
-      searchTable2(row.机床流水号, this.code).then(response => {
+      searchTable2(this.机床流水号, this.radio).then(response => {
-        this.jichuang = row.机床流水号
         if (response.data.length === 0) {
           this.loading2 = false
         } else {
@@ -571,21 +596,28 @@ export default {
         this.loading2 = false
       })
     },
+    // 表格2增加
+    addTable() {
+      if (this.radio === '') {
+        this.$message.error('请先选择一个类别')
+      } else {
+        addTable(this.机床流水号, this.radio).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message({
+              type: 'success',
+              message: '添加成功!'
+            })
+            this.searchTable2()
+          } else {
+            this.$message.error('添加失败')
+          }
+        })
+      }
+    },
     searchTable2() {
       this.loading2 = true
       this.tableData2 = []
-      if (this.code === 1) {
+      searchTable2(this.机床流水号, this.radio).then(response => {
-        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 {
@@ -669,24 +701,6 @@ export default {
         })
       })
     },
-    // 表格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
@@ -702,12 +716,6 @@ export default {
 </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;
   }
@@ -716,22 +724,17 @@ export default {
   }
 </style>
 <style>
+  .el-radio {
+    margin-top: 12px !important;
+  }
+  .demo-ruleForm1 .el-form-item {
+     margin-bottom: 0px
+  }
   .bold-font .el-table{
     font: bold 20px 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;

src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue

@@ -0,0 +1,496 @@
+<template>
+  <div class="app-container bold-font">
+    <el-card>
+      <el-row>
+        <el-select v-model="projectValue" filterable clearable size="small" style="margin-top:10px;width: 200px" placeholder="项目名称" @change="typeChange()">
+          <el-option
+            v-for="item in project"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-select v-model="toolNumValue" clearable filterable size="small" style="margin-bottom:10px;width: 200px" placeholder="机床名称">
+          <el-option
+            v-for="item in toolNum"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <el-input v-model="CustomerNameValue" placeholder="客户名称" size="small" clearable style="width:200px"/>
+        <h3 style="display: inline-block;margin: 0 0 0 10px">签订日期:</h3>
+        <el-date-picker
+          v-model="Sign"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;margin: 3px 0"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <h3 style="display: inline-block;margin: 0 0 0 10px">交货期:</h3>
+        <el-date-picker
+          v-model="delivery"
+          size="small"
+          type="daterange"
+          align="center"
+          style="width: 240px;margin: 3px 0"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <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 style="overflow: auto">
+      <el-col style="width: 1400px;">
+        <el-table v-loading="loading" :data="tableData" height="330" highlight-current-row style="margin-top: 5px;width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
+          <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" min-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="125px">
+            <template slot-scope="scope">
+              {{ scope.row.合同签订日期 !== '1900-01-01' ? scope.row.合同签订日期 : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="交货期" align="center" width="125px">
+            <template slot-scope="scope">
+              {{ scope.row.发货节点 !== '1900-01-01' ? scope.row.发货节点 : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="设备预验节点" align="center" width="125px">
+            <template slot-scope="scope">
+              {{ scope.row.设备预验收节点 !== '1900/1/1' ? scope.row.设备预验收节点 : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="安装调试节点" align="center" width="125px">
+            <template slot-scope="scope">
+              {{ scope.row.安装调试节点 !== '1900/1/1' ? scope.row.安装调试节点 : '' }}
+            </template>
+          </el-table-column>
+          <el-table-column v-if="false" 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-col>
+      <el-col style="width: 240px;">
+        <div style="width: 80px;font-size: 18px;float: left;text-align: center;">进程</div>
+        <div style="width: 80px;font-size: 18px;float: left;text-align: center;">计划时间</div>
+        <div style="width: 80px;font-size: 18px;float: left;text-align: center;">实际时间</div>
+        <el-form label-position="right" label-width="85px" class="demo-ruleForm1">
+          <el-row>
+            <el-col style="width: 270px">
+              <el-form-item label="审图开始">
+                <el-col style="width: 80px;">
+                  {{ 审图开始 }}
+                </el-col>
+                <el-col style="width: 80px;">
+                  -
+                </el-col>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 270px">
+              <el-form-item label="审图结束">
+                <el-col style="width: 80px;">
+                  {{ 审图结束 }}
+                </el-col>
+                <el-col style="width: 80px;">
+                  {{ 审图实际完成时间 }}
+                </el-col>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 270px">
+              <el-form-item label="发图完成">
+                <el-col style="width: 80px;">
+                  {{ 发图完成 }}
+                </el-col>
+                <el-col style="width: 80px;">
+                  {{ 机床设计实际完成时间 }}
+                </el-col>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 270px">
+              <el-form-item label="采购完成">
+                <el-col style="width: 80px;">
+                  {{ 采购完成 }}
+                </el-col>
+                <el-col style="width: 80px;">
+                  {{ 采购实际完成时间 }}
+                </el-col>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 270px">
+              <el-form-item label="备料完成">
+                <el-col style="width: 80px;">
+                  {{ 备料完成 }}
+                </el-col>
+                <el-col style="width: 80px;">
+                  {{ 备料实际完成时间 }}
+                </el-col>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 270px">
+              <el-form-item label="制造完成">
+                <el-col style="width: 80px;">
+                  {{ 制造完成 }}
+                </el-col>
+                <el-col style="width: 80px;">
+                  {{ 机床生产实际完成时间 }}
+                </el-col>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col style="width: 270px">
+              <el-form-item label="装配完成">
+                <el-col style="width: 80px;">
+                  {{ 装配完成 }}
+                </el-col>
+                <el-col style="width: 80px;">
+                  {{ 机床装配实际完成时间 }}
+                </el-col>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </el-col>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="loading2" :data="tableData2" :row-class-name="tableRowClassName" style="margin-top: 10px;width: 100%;" border element-loading-text="拼命加载中">
+        <el-table-column width="100px" label="计划名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.计划类型名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column width="150px" label="组号" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column width="300px" label="任务名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.任务名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column width="120px" label="负责人" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.负责人 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="任务开始时间" align="center" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.任务开始时间 ? scope.row.任务开始时间.split(' ')[0] : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="计划完成" align="center" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.计划完成时间 ? scope.row.计划完成时间.split(' ')[0] : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column width="140px" label="计划工期(天)" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.货期 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="实际完成时间" align="center" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.实际完成时间 ? scope.row.实际完成时间.split(' ')[0] : '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column width="140px" label="实际工期(天)" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.实际完成时间 ? scope.row.实际工期 : '-' }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getProject, getCustomerName, searchgroupName, getToolNum, searchtable, searchTable2 } from '@/api/ManufacturingCenter/ProjectPlanningManagementQuery'
+export default {
+  data() {
+    return {
+      Sign: '',
+      delivery: '',
+      项目流水号: '',
+      机床流水号: '',
+      项目编号: '',
+      设计者: '',
+      审图开始: '',
+      审图结束: '',
+      发图完成: '',
+      采购完成: '',
+      备料完成: '',
+      制造完成: '',
+      装配完成: '',
+      更新时间: '',
+      // /////////////
+      审图实际完成时间: '',
+      机床设计实际完成时间: '',
+      采购实际完成时间: '',
+      备料实际完成时间: '',
+      机床生产实际完成时间: '',
+      机床装配实际完成时间: '',
+      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 => {
+          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.radio = ''
+      this.项目流水号 = ''
+      this.机床流水号 = ''
+      this.项目编号 = ''
+      this.设计者 = ''
+      this.审图开始 = ''
+      this.审图结束 = ''
+      this.发图完成 = ''
+      this.采购完成 = ''
+      this.备料完成 = ''
+      this.制造完成 = ''
+      this.装配完成 = ''
+      this.更新时间 = ''
+      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 }
+      this.Sign ? this.time_Signcheck = 1 : (this.time_Signcheck = 0, this.Sign = '')
+      this.delivery ? this.time_deliverycheck = 1 : (this.time_deliverycheck = 0, this.delivery = '')
+      searchtable(this.projectValuecheck, this.projectValue, this.toolNumValuecheck, this.toolNumValue, this.CustomerNameValuecheck, this.CustomerNameValue, this.time_Signcheck, this.Sign[0], this.Sign[1], this.time_deliverycheck, this.delivery[0], this.delivery[1], this.pageCurrent, this.pageSize).then(response => {
+        if (response.data.total === 0) {
+          this.loading = false
+        } else {
+          this.tableData = response.data.rows
+          this.total = response.data.total
+        }
+      }).then(() => {
+        this.loading = false
+      })
+    },
+    rowClick(row) {
+      this.设计者 = row.机床设计者 ? row.机床设计者.split(' ')[0] : '-'
+      this.审图开始 = row.审图计划开始时间 ? row.审图计划开始时间.split(' ')[0] : '-'
+      this.审图结束 = row.审图计划完成时间 ? row.审图计划完成时间.split(' ')[0] : '-'
+      this.发图完成 = row.机床设计完成时间 ? row.机床设计完成时间.split(' ')[0] : '-'
+      this.采购完成 = row.采购完成时间 ? row.采购完成时间.split(' ')[0] : '-'
+      this.备料完成 = row.备料完成时间 ? row.备料完成时间.split(' ')[0] : '-'
+      this.制造完成 = row.机床生产完成时间 ? row.机床生产完成时间.split(' ')[0] : '-'
+      this.装配完成 = row.机床装配完成时间 ? row.机床装配完成时间.split(' ')[0] : '-'
+      this.更新时间 = row.更新 ? row.更新.split(' ')[0] : '-'
+      // ////////////////////////////
+      this.审图实际完成时间 = row.审图实际完成时间 ? row.审图实际完成时间.split(' ')[0] : '-'
+      this.机床设计实际完成时间 = row.机床设计实际完成时间 ? row.机床设计实际完成时间.split(' ')[0] : '-'
+      this.采购实际完成时间 = row.采购实际完成时间 ? row.采购实际完成时间.split(' ')[0] : '-'
+      this.备料实际完成时间 = row.备料实际完成时间 ? row.备料实际完成时间.split(' ')[0] : '-'
+      this.机床生产实际完成时间 = row.机床生产实际完成时间 ? row.机床生产实际完成时间.split(' ')[0] : '-'
+      this.机床装配实际完成时间 = row.机床装配实际完成时间 ? row.机床装配实际完成时间.split(' ')[0] : '-'
+      this.openDialog(row)
+    },
+    // 查询表格2数据
+    openDialog(row) {
+      this.loading2 = true
+      this.tableData2 = []
+      searchTable2(row.机床流水号).then(response => {
+        if (response.data.length !== 0) {
+          this.tableData2 = response.data
+        }
+      }).then(() => {
+        this.loading2 = false
+      })
+    },
+    // 考核状态变色
+    tableRowClassName({ row, rowIndex }) {
+      if (row.计划类型名称 === '设计') {
+        return 'PPMQHairDrawing'
+      } else if (row.计划类型名称 === '采购') {
+        return 'PPMQPurchase'
+      } else if (row.计划类型名称 === '备料') {
+        return 'PPMQSpareParts'
+      } else if (row.计划类型名称 === '制造') {
+        return 'PPMQManufacture'
+      } else if (row.计划类型名称 === '装配') {
+        return 'PPMQassembling'
+      }
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    }
+  }
+}
+</script>
+<style scoped>
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .el-pagination{
+    background-color: white;
+  }
+</style>
+<style>
+  .PPMQHairDrawing{
+    background: rgb(189,215,238) !important;
+  }
+  .PPMQPurchase{
+    background: rgb(248,203,173) !important;
+  }
+  .PPMQSpareParts{
+    background: rgb(201,201,201) !important;
+  }
+  .PPMQManufacture{
+    background: rgb(255,230,153) !important;
+  }
+  .PPMQassembling{
+    background: rgb(169,208,142) !important;
+  }
+  .demo-ruleForm1 .el-form-item {
+    margin-bottom: 0px
+  }
+  .bold-font .el-table{
+    font: bold 20px arial!important;
+    margin: 0 0 10px 0;
+    /*color: white;*/
+  }
+  .bold-font{
+    /*color: ghostwhite;*/
+    font: bold 22px arial!important;
+    padding: 5px;
+  }
+</style>

src/views/layout/components/TagsView.vue

@@ -67,6 +67,9 @@ export default {
         case 'ProjectPlanningManagementNew': // 项目计划管理
           document.getElementById('app-main').style.width = '1710px'
           break
+        case 'ProjectPlanningManagementQuery': // 项目计划管理
+          document.getElementById('app-main').style.width = '1710px'
+          break
         default:
           document.getElementById('app-main').style.width = '1380px'
       }