'打回零件'

2018-12-24 15:29:38 +08:00
parent 53262caac4
commit 50d5e90356
4 changed files with 150 additions and 65 deletions
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -100,11 +100,6 @@
                {{ scope.row.零件数量 }}
              </template>
            </el-table-column>
-            <el-table-column label="库存量" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.库存量 }}
-              </template>
-            </el-table-column>
            <el-table-column label="备注" align="center">
              <template slot-scope="scope">
                {{ scope.row.零件备注 }}
@@ -135,11 +130,6 @@
                {{ scope.row.零件数量 }}
              </template>
            </el-table-column>
-            <el-table-column label="库存量" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.库存量 }}
-              </template>
-            </el-table-column>
            <el-table-column label="备注" align="center">
              <template slot-scope="scope">
                {{ scope.row.备注 }}
@@ -170,11 +160,6 @@
                {{ scope.row.零件数量 }}
              </template>
            </el-table-column>
-            <el-table-column label="库存量" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.库存量 }}
-              </template>
-            </el-table-column>
            <el-table-column label="备注" align="center">
              <template slot-scope="scope">
                {{ scope.row.备注 }}
@@ -393,13 +378,13 @@
    </el-dialog>
    <el-dialog
      :visible.sync="dialogFormVisible1"
-      :row-style="tableRowClassName"
      title="基本件打回信息"
      center
      width="70%"
      style="min-height: 400px">
      <el-table
        :data="tableData9"
+        :row-class-name="tableRowClassName"
        size="mini"
        style="width: 97%;max-height: 300px"
        height="400"
@@ -432,7 +417,7 @@
        </el-table-column>
        <el-table-column align="center" label="机床编号">
          <template slot-scope="scope">
-            {{ scope.row.机床编号 }}
+            {{ scope.row.机床图号 }}
          </template>
        </el-table-column>
        <el-table-column align="center" label="组号">
@@ -461,13 +446,13 @@
    </el-dialog>
    <el-dialog
      :visible.sync="dialogFormVisible2"
-      :row-style="tableRowClassName"
      title="外购件和标准件打回信息"
      center
      width="70%"
      style="min-height: 400px">
      <el-table
        :data="tableData10"
+        :row-class-name="tableRowClassName"
        size="mini"
        style="width: 97%;max-height: 300px"
        height="400"
@@ -500,7 +485,7 @@
        </el-table-column>
        <el-table-column align="center" label="机床编号">
          <template slot-scope="scope">
-            {{ scope.row.机床编号 }}
+            {{ scope.row.机床图号 }}
          </template>
        </el-table-column>
        <el-table-column align="center" label="组号">
@@ -615,7 +600,7 @@ export default {
          if (response.data[i].退回时间 !== '') {
            response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
          }
-          if (response.data[i].是否确认 === '0') {
+          if (response.data[i].是否确认 === 0) {
            this.value += 1
          }
        }
@@ -626,7 +611,7 @@ export default {
          if (response.data[i].退回时间 !== '') {
            response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
          }
-          if (response.data[i].是否确认 === '0') {
+          if (response.data[i].是否确认 === 0) {
            this.value1 += 1
          }
        }
@@ -649,7 +634,7 @@ export default {
              if (response.data[i].退回时间 !== '') {
                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
              }
-              if (response.data[i].是否确认 === '0') {
+              if (response.data[i].是否确认 === 0) {
                this.value += 1
              }
            }
@@ -670,7 +655,7 @@ export default {
              if (response.data[i].退回时间 !== '') {
                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
              }
-              if (response.data[i].是否确认 === '0') {
+              if (response.data[i].是否确认 === 0) {
                this.value1 += 1
              }
            }
@@ -682,52 +667,75 @@ export default {
      })
    },
    Delete(row) {
-      Delete(row.基本件流水号).then(response => {
-        this.value = 0
-        if (response.data[0].result === '1') {
-          this.$message.success('删除成功')
-          PartCallbackInformation().then(response => {
-            for (let i = 0; i < response.data.length; i++) {
-              if (response.data[i].退回时间 !== '') {
-                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        Delete(row.基本件流水号).then(response => {
+          this.value = 0
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            PartCallbackInformation().then(response => {
+              for (let i = 0; i < response.data.length; i++) {
+                if (response.data[i].退回时间 !== '') {
+                  response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+                }
+                if (response.data[i].是否确认 === 0) {
+                  this.value += 1
+                }
              }
-              if (response.data[i].是否确认 === '0') {
-                this.value += 1
-              }
-            }
-            this.tableData9 = response.data
-          })
-        } else {
-          this.$message.error('删除失败')
-        }
+              this.tableData9 = response.data
+            })
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
      })
    },
    Delete1(row) {
-      Delete1(row.标准件和外购件流水号).then(response => {
-        this.value1 = 0
-        if (response.data[0].result === '1') {
-          this.$message.success('删除成功')
-          PartCallbackInformation1().then(response => {
-            for (let i = 0; i < response.data.length; i++) {
-              if (response.data[i].退回时间 !== '') {
-                response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        Delete1(row.标准件和外购件流水号).then(response => {
+          this.value1 = 0
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            PartCallbackInformation1().then(response => {
+              for (let i = 0; i < response.data.length; i++) {
+                if (response.data[i].退回时间 !== '') {
+                  response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
+                }
+                if (response.data[i].是否确认 === 0) {
+                  this.value1 += 1
+                }
              }
-              if (response.data[i].是否确认 === '0') {
-                this.value1 += 1
-              }
-            }
-            this.tableData10 = response.data
-          })
-        } else {
-          this.$message.error('删除失败')
-        }
+              this.tableData10 = response.data
+            })
+          } else {
+            this.$message.error('删除失败')
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
      })
    },
    tableRowClassName({ row }) {
-      if (row.是否确认 === '0') {
-        return 'background: #ffff66'
+      console.log(row.是否确认)
+      if (row.是否确认 === 0) {
+        return 'NotThrough'
      } else {
-        return ''
+        return 'adopt'
      }
    },
    projectChange() {
@@ -1197,3 +1205,11 @@ export default {
    margin-right: 40px;
  }
 </style>
+<style>
+  .el-table .NotThrough{
+    background: palevioletred;
+  }
+  .el-table .adopt{
+    background: limegreen;
+  }
+</style>