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

2019-03-29 15:31:27 +08:00
parent d76ad3ae86 193bcc5fa5
commit 25d84bd2c4
8 changed files with 125 additions and 22 deletions
--- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
+++ b/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">
-              <el-input v-model="scope.row.数量" size="mini"/>
-            </template>
-            <template v-else>
-              {{ scope.row.数量 }}
-            </template>
+            {{ 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="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({
--- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
+++ b/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
--- a/src/views/PurchasingCenter/BacklogGoodsPrepare/index.vue
+++ b/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>