Merge branch 'master' of ssh://192.168.0.149:29418/高精2.0

src/api/ManufacturingCenter/ProjectPlanningManagement.js

@@ -43,14 +43,14 @@ export function searchtable(num1, num2, num3, num4, num5, num6, num7, num8, num9
     }
   })
 }
-export function editTable(num1, num2, num3, num4, num5, num6, num7, num8, num9, num10, num11, num12) {
+export function editTable(num1, num2, num3, num5, num6, num7, num8, num9, num10, num11, num12) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '项目计划管理_项目总计划_编辑数据',
-      param: `项目流水号=` + num1 + '&机床流水号=' + num2 + '&项目编号=' + num3 + '&数量=' + num4 + '&设计者=' + num5 + '&机床设计完成时间=' + num6 + '&采购完成时间=' + num7 + '&备料完成时间=' + num8 + '&机床生产完成时间=' + num9 + '&机床装配完成时间=' + num10 + '&完成顺序=' + num11 + '&更新=' + num12
+      param: `项目流水号=` + num1 + '&机床流水号=' + num2 + '&项目编号=' + num3 + '&设计者=' + num5 + '&机床设计完成时间=' + num6 + '&采购完成时间=' + num7 + '&备料完成时间=' + num8 + '&机床生产完成时间=' + num9 + '&机床装配完成时间=' + num10 + '&完成顺序=' + num11 + '&更新=' + num12
     }
   })
 }

src/api/PurchasingCenter/BacklogGoodsPrepare.js

@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+
+// 初始化项目
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据_按时间排序'
+    }
+  })
+}

src/icons/svg/BacklogGoodsPrepare.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1553831911600" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1975" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M510.759 0C228.679 0 0 228.677 0 510.748c0 117.224 39.911 224.892 106.318 311.091l38.377-39.956C95.222 715.203 63.249 634.79 56.233 547.225l220.465 0c16.665 107.625 105.717 190.467 215.8 198.984l0 219.895c-83.913-3.356-161.914-29.321-228.223-72.049l-34.636 42.919c80.66 53.305 177.202 84.525 281.12 84.525 282.078 0 510.748-228.672 510.748-510.752C1021.507 228.677 792.836 0 510.759 0zM492.498 691.544c-79.903-8.023-144.782-66.934-160.493-144.319l160.493 0L492.498 691.544zM492.498 492.502l-162.33 0c8.664-85.968 76.465-153.749 162.33-162.437L492.498 492.502zM492.498 274.489c-116.356 8.884-209.087 101.64-217.971 218.013L55.647 492.502C65.055 255.277 255.29 65.046 492.498 55.623L492.498 274.489zM547.221 56.52C775.889 74.679 956.69 261.363 965.857 492.502L746.951 492.502c-8.415-110.212-92.072-199.151-199.73-215.836L547.221 56.52zM547.221 332.187c77.128 15.798 136.044 80.477 144.089 160.315L547.221 492.502 547.221 332.187zM547.221 547.225l142.252 0c-14.502 71.43-70.847 127.4-142.252 141.949L547.221 547.225zM547.221 965.024 547.221 744.544c101.593-15.785 181.821-95.668 197.559-197.318l220.158 0C947.26 769.922 769.872 947.353 547.221 965.024z" p-id="1976"></path></svg>

src/icons/svg/ProjectPlanningQuery.svg

@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1045 1024" xmlns="http://www.w3.org/2000/svg" width="204.102" height="200"><defs><style/></defs><path d="M229.836 177.192h461.986v57.748H229.836v-57.748zm-1.54 116.063h461.986v57.748H228.297v-57.748zm-113.955-232.5h692.977v461.984h57.748V60.754c0-31.893-25.855-57.748-57.748-57.748H114.34c-31.893 0-57.748 25.855-57.748 57.748v808.473c0 31.893 25.855 57.748 57.748 57.748h404.237v-57.748H114.34V60.754zm115.11 463.486v57.748h140.453c0-20.068 2.94-39.447 8.386-57.748H229.451zm236.111-115.496H228.297v57.748H403.84a203.177 203.177 0 0 1 61.722-57.748zm437.246 464.777L770.39 742.678c30.444-35.382 48.852-81.417 48.852-131.754 0-111.627-90.493-202.119-202.117-202.119-111.626 0-202.118 90.492-202.118 202.119 0 111.624 90.492 202.118 202.118 202.118 40.412 0 78.05-11.867 109.63-32.299l135.218 133.614c11.276 11.276 29.558 11.276 40.834 0 11.274-11.277 11.274-29.558 0-40.835zM472.754 610.924c0-79.734 64.639-144.37 144.372-144.37 79.731 0 144.369 64.636 144.369 144.37 0 79.731-64.638 144.37-144.37 144.37s-144.37-64.639-144.37-144.37z"/></svg>

src/icons/svg/costStatistics.svg

@@ -0,0 +1 @@
+<svg class="icon" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg" width="200" height="200"><defs><style/></defs><path d="M85.333 85.547A85.525 85.525 0 0 1 170.667 0h682.666c47.147 0 85.334 38.272 85.334 85.547V1024l-160.64-106.667L642.9 1024 513.088 917.333 380.629 1024 242.005 917.333 85.333 1024V85.547zm85.334 63.765V879.36l92.672-79.659 117.29 91.691 132.459-91.69 129.813 91.69 113.792-91.69 96.64 79.658V149.333a64 64 0 0 0-63.914-64H234.58a63.85 63.85 0 0 0-63.914 63.979zM256 256c0-23.573 19.136-42.667 42.773-42.667h426.454C748.843 213.333 768 232.277 768 256c0 23.573-19.136 42.667-42.773 42.667H298.773A42.624 42.624 0 0 1 256 256zm0 192c0-23.573 19.136-42.667 42.773-42.667h426.454C748.843 405.333 768 424.277 768 448c0 23.573-19.136 42.667-42.773 42.667H298.773A42.624 42.624 0 0 1 256 448zm0 192c0-23.573 19.136-42.667 42.773-42.667h426.454C748.843 597.333 768 616.277 768 640c0 23.573-19.136 42.667-42.773 42.667H298.773A42.624 42.624 0 0 1 256 640z"/></svg>

src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue

@@ -34,7 +34,7 @@
 
     <el-card>
       <el-table v-loading="loading" :data="tableData" height="580" size="mini" style="width: 100%;" border element-loading-text="拼命加载中">
-        <el-table-column min-width="300px" label="项目编号" align="center" width="240px">
+        <el-table-column label="项目编号" align="center" width="140px">
           <template slot-scope="scope">
             <template v-if="scope.row.edit">
               <el-input v-model="scope.row.项目编号" size="mini"/>
@@ -44,37 +44,32 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="项目名称" align="center" width="250px">
+        <el-table-column label="项目名称" align="center" width="200px">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" align="center" width="250px">
+        <el-table-column label="机床图号" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center" width="250px">
+        <el-table-column label="机床名称" align="center" width="200px">
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" width="100px">
+        <el-table-column label="机床数量" align="center" width="70px">
           <template slot-scope="scope">
-            <template v-if="scope.row.edit">
+            {{ scope.row.机床数量 }}
-              <el-input v-model="scope.row.数量" size="mini"/>
-            </template>
-            <template v-else>
-              {{ scope.row.数量 }}
-            </template>
           </template>
         </el-table-column>
-        <el-table-column label="签订日期" align="center" width="250px">
+        <el-table-column label="签订日期" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.合同签订日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="交货期" align="center" width="250px">
+        <el-table-column label="交货期" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.发货节点 }}
           </template>
@@ -94,7 +89,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="发图" align="center" width="250px">
+        <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"/>
@@ -104,7 +99,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="采购" align="center" width="250px">
+        <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"/>
@@ -114,7 +109,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="备料" align="center" width="250px">
+        <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"/>
@@ -124,7 +119,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="制造" align="center" width="250px">
+        <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"/>
@@ -134,7 +129,7 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column label="装配" align="center" width="250px">
+        <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"/>
@@ -407,7 +402,7 @@ export default {
               项目名称: 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].客户名称,
@@ -431,7 +426,7 @@ export default {
     },
     // 表格1保存
     confirmEdit(row) {
-      editTable(row.项目流水号, row.机床流水号, row.项目编号, row.数量, row.机床设计者, row.机床设计完成时间, row.采购完成时间, row.备料完成时间, row.机床生产完成时间, row.机床装配完成时间, row.完成顺序, row.更新).then(response => {
+      editTable(row.项目流水号, row.机床流水号, row.项目编号, row.机床设计者, row.机床设计完成时间, row.采购完成时间, row.备料完成时间, row.机床生产完成时间, row.机床装配完成时间, row.完成顺序, row.更新).then(response => {
         if (response.data[0].result === '1') {
           row.edit = false
           this.$notify({

src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue

@@ -320,30 +320,78 @@ export default {
       if (this.projectValue !== '') {
         if (this.machineValue !== '') {
           searchtable(this.projectValue, this.machineValue).then(response => {
+            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]
+              }
+            }
             this.loading = false
             this.tableData = response.data
           }).then(() => {
             searchtable2(this.machineValue, 1).then(response => {
+              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]
+                }
+              }
               this.loading1 = false
               console.log(response.data, 2)
               this.tableData1 = response.data
             })
             searchtable2(this.machineValue, 2).then(response => {
+              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]
+                }
+              }
               this.loading1 = false
               console.log(response.data, 3)
               this.tableData2 = response.data
             })
             searchtable2(this.machineValue, 3).then(response => {
+              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]
+                }
+              }
               this.loading1 = false
               console.log(response.data, 4)
               this.tableData3 = response.data
             })
             searchtable2(this.machineValue, 4).then(response => {
+              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]
+                }
+              }
               this.loading1 = false
               console.log(response.data, 5)
               this.tableData4 = response.data
             })
             searchtable2(this.machineValue, 5).then(response => {
+              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]
+                }
+              }
               this.loading1 = false
               console.log(response.data, 6)
               this.tableData5 = response.data

src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="app-container">
+    <el-card></el-card>
+  </div>
+</template>
+
+<script>
+import {} from '@/api/PurchasingCenter/BacklogGoodsPrepare'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'BacklogGoodsPrepare',
+  data() {
+    return {
+      tableData: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id'
+    ])
+  },
+  mounted() {
+    this.initData()
+  },
+  methods: {
+    initData() {}
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+</style>