刘璐珈

src/views/Assembly/AssemblyExecution/index.vue

@@ -27,17 +27,17 @@
     <el-card>
       <h3 style="text-align: center">总装调试</h3>
       <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
-        <el-table-column label="项目名称" align="center">
+        <el-table-column label="项目名称" align="center" width="90px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床编号" align="center">
+        <el-table-column label="机床编号" align="center" width="90PX" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center" width="120px">
+        <el-table-column label="机床名称" align="center" width="100px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
@@ -47,27 +47,71 @@
             {{ scope.row.机床数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="装配开始时间" align="center">
+        <el-table-column label="装配开始时间" align="center" width="170px">
           <template slot-scope="scope">
-            {{ scope.row.机床装配实际开始时间 }}
+            <template v-if="scope.row.edit&&!(scope.row.装配状态===null || scope.row.装配状态===0)">
+              <el-date-picker
+                v-model="scope.row.机床装配开始时间"
+                type="datetime"
+                size="mini"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                style="width: 165px"
+                placeholder="选择日期时间"/>
+            </template>
+            <template v-else >
+              {{ scope.row.机床装配开始时间 }}
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="装配结束时间" align="center">
+        <el-table-column label="装配结束时间" align="center" width="170px">
           <template slot-scope="scope">
-            {{ scope.row.机床装配实际完成时间 }}
+            <template v-if="scope.row.edit && scope.row.装配状态===2">
+              <el-date-picker
+                v-model="scope.row.机床装配实际完成时间"
+                type="datetime"
+                size="mini"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                style="width: 165px"
+                placeholder="选择日期时间"/>
+            </template>
+            <template v-else >
+              {{ scope.row.机床装配实际完成时间 }}
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="调试开始时间" align="center">
+        <el-table-column label="调试开始时间" align="center" width="170px">
           <template slot-scope="scope">
-            {{ scope.row.调试开始时间 }}
+            <template v-if="scope.row.edit && !(scope.row.调试状态===null || scope.row.调试状态===0)">
+              <el-date-picker
+                v-model="scope.row.调试开始时间"
+                type="datetime"
+                size="mini"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                style="width: 165px"
+                placeholder="选择日期时间"/>
+            </template>
+            <template v-else >
+              {{ scope.row.调试开始时间 }}
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="调试结束时间" align="center">
+        <el-table-column label="调试结束时间" align="center" width="170px">
           <template slot-scope="scope">
-            {{ scope.row.调试结束时间 }}
+            <template v-if="scope.row.edit && scope.row.调试状态===2">
+              <el-date-picker
+                v-model="scope.row.调试结束时间"
+                type="datetime"
+                size="mini"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                style="width: 165px"
+                placeholder="选择日期时间"/>
+            </template>
+            <template v-else >
+              {{ scope.row.调试结束时间 }}
+            </template>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="430px" fixed="right">
+        <el-table-column label="操作" align="center" width="340px" fixed="right">
           <template slot-scope="scope">
             <el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="text" size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
             <el-button v-if="scope.row.装配状态===1" type="text" size="small" @click="handleend_1(scope.row)">结束装配</el-button>
@@ -79,6 +123,13 @@
             <el-button v-if="scope.row.调试状态===2" type="text" size="small" >调试完成</el-button>
             <el-button v-if="scope.row.调试状态===1" size="small" type="text" @click="handleCancelStart_2(scope.row)">取消开始调试</el-button>
             <el-button v-if="scope.row.调试状态===2" size="small" type="text" @click="handleCancelEnd_2(scope.row)">取消结束调试</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top" style="margin-left: 10px">
+              <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" plain size="small" @click="cancel(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -86,50 +137,50 @@
     <el-card>
       <h3 style="text-align: center">部装</h3>
       <el-table :data="tableData2" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
-        <el-table-column label="组号" align="center">
+        <el-table-column label="组号" align="center" width="60px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="任务名称" align="center">
+        <el-table-column label="任务名称" align="center" width="130px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划工时" align="center">
+        <el-table-column label="计划工时" align="center" width="90px">
           <template slot-scope="scope">
             {{ scope.row.计划工时 }}
           </template>
         </el-table-column>
-        <el-table-column label="实际工时" align="center">
+        <el-table-column label="实际工时" align="center" width="140px">
           <template slot-scope="scope">
-            <el-input v-if="scope.row.isEditing" v-model="scope.row.实际工时" size="mini"/>
+            <el-input v-if="scope.row.isEditing" v-model="scope.row.实际工时" size="mini" @input="filterNuber(scope.row.实际工时, scope.$index, '实际工时')"/>
             <span v-if="!scope.row.isEditing">{{ scope.row.实际工时 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="修补工时" align="center">
+        <el-table-column label="修补工时" align="center" width="140px">
           <template slot-scope="scope">
-            <el-input v-if="scope.row.isEditing" v-model="scope.row.修补工时" size="mini"/>
+            <el-input v-if="scope.row.isEditing" v-model="scope.row.修补工时" size="mini" @input="filterNuber(scope.row.修补工时, scope.$index, '修补工时')"/>
             <span v-if="!scope.row.isEditing">{{ scope.row.修补工时 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center">
+        <el-table-column label="开始时间" align="center" width="160px">
           <template slot-scope="scope">
             {{ scope.row.开始时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="结束时间" align="center">
+        <el-table-column label="结束时间" align="center" width="160px">
           <template slot-scope="scope">
             {{ scope.row.结束时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center">
+        <el-table-column label="备注" align="center" width="200px">
           <template slot-scope="scope">
             <el-input v-if="scope.row.isEditing" v-model="scope.row.备注" size="mini"/>
             <span v-if="!scope.row.isEditing">{{ scope.row.备注 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="300px" fixed="right">
+        <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1200" effect="dark" content="编辑部装工时" placement="top">
               <el-button v-if="!scope.row.isEditing" type="text" icon="el-icon-edit-outline" size="small" @click="editTable2(scope.row)"/>
@@ -149,7 +200,7 @@
 </template>
 
 <script>
-import { initProject, searchgroup, searchTable1, searchTable2, MachineToolStateUpdate, DebugStatusUpdate, ComponentStateUpdate, submitTable2 } from '@/api/Assembly/AssemblyExecution'
+import { initProject, searchgroup, searchTable1, searchTable2, MachineToolStateUpdate, DebugStatusUpdate, ComponentStateUpdate, submitTable2, editData } from '@/api/Assembly/AssemblyExecution'
 // import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -169,15 +220,51 @@ export default {
     this.initProject()
   },
   methods: {
+    // 保留两位小数的正实数
+    filterNuber(val, index, date) {
+      console.log(index, 6666)
+      let value = '' + val
+      value = value
+        .replace(/[^\d.]/g, '') // 清除“数字”和“.”以外的字符
+        .replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
+        .replace('.', '$#$')
+        .replace(/\./g, '')
+        .replace('$#$', '.')
+        .replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
+      if (value.indexOf('.') < 0 && value !== '') {
+        value = parseFloat(value)
+      }
+      console.log(value)
+      this.tableData2[index][date] = value
+    },
+    confirmEdit(row) {
+      console.log(row)
+      editData(row.机床流水号, row.机床装配开始时间, row.机床装配实际完成时间, row.调试开始时间, row.调试结束时间).then(response => {
+        if (response.data[0].result === '1') {
+          row.edit = false
+          this.$message.success('编辑成功')
+          this.searchTable1()
+        } else {
+          this.$message.error('编辑失败')
+          this.searchTable1()
+        }
+      })
+    },
+    cancel(row) {
+      console.log(row)
+      row.edit = !row.edit
+      this.searchTable1()
+    },
     submitTable2(row) {
       row.备注 ? row.备注 : ''
-      row.实际工时 ? row.实际工时 : ''
-      row.修补工时 ? row.修补工时 : ''
-      console.log(row.备注, row.计划流水号, row.实际工时, row.修补工时)
+      row.实际工时 ? Number(row.实际工时).toFixed(2) : ''
+      row.修补工时 ? Number(row.修补工时).toFixed(2) : ''
+      console.log(row)
       submitTable2(row.备注, row.计划流水号, row.实际工时, row.修补工时).then(res => {
         if (res.data[0].result === '1') {
           this.$message.success('编辑成功')
           row.isEditing = !row.isEditing
+          this.searchTable2()
         } else {
           this.$message.error('编辑失败')
         }
@@ -265,17 +352,50 @@ export default {
         }
       })
     },
-    searchTable1() {
+    searchTable1: function() {
       this.tableData1 = []
-      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) {
+        this.check2 = 1
+      } else {
+        this.check2 = 0
+      }
       if (this.check2 === 0) {
         this.tableData1 = []
         this.tableData2 = []
       } else {
         searchTable1(this.machineNumberValue, this.check2).then(response => {
-          this.tableData1 = response.data
-        }).then(() => {
-          this.searchTable2()
+          // this.tableData1 = response.data
+          console.log(response.data)
+          for (let i = 0; i < response.data.length; i++) {
+            this.tableData1.push({
+              项目流水号: response.data[i].项目流水号,
+              机床流水号: response.data[i].机床流水号,
+              机床图号: response.data[i].机床图号,
+              机床名称: response.data[i].机床名称,
+              项目名称: response.data[i].项目名称,
+              项目计划完成时间: response.data[i].项目计划完成时间,
+
+              是否启用: response.data[i].是否启用,
+              客户流水号: response.data[i].客户流水号,
+              操作日期: response.data[i].操作日期,
+              是否下发装配计划: response.data[i].是否下发装配计划,
+              是否定额: response.data[i].是否定额,
+              调试状态: response.data[i].调试状态,
+              装配状态: response.data[i].装配状态,
+              机床数量: response.data[i].机床数量,
+              机床装配开始时间: response.data[i].机床装配开始时间,
+              机床装配实际完成时间: response.data[i].机床装配实际完成时间,
+              调试开始时间: response.data[i].调试开始时间,
+              调试结束时间: response.data[i].调试结束时间,
+              电气开始装配时间: response.data[i].电气开始装配时间,
+              电气结束装配时间: response.data[i].电气结束装配时间,
+              电气开始调试时间: response.data[i].电气开始调试时间,
+              电气结束调试时间: response.data[i].电气结束调试时间,
+              电气装配状态: response.data[i].电气装配状态,
+              电气调试状态: response.data[i].电气调试状态,
+              edit: false
+            })
+          }
         })
       }
     },
@@ -287,6 +407,9 @@ export default {
           console.log(response.data, 111)
           this.tableData2 = response.data
           this.tableData2.map(v => {
+            v.计划工时 = Number(v.计划工时).toFixed(2)
+            v.实际工时 = Number(v.实际工时).toFixed(2)
+            v.修补工时 = Number(v.修补工时).toFixed(2)
             this.$set(v, 'isEditing', false)
             this.$set(v, '原实际工时', '')
             this.$set(v, '原修补工时', '')
@@ -336,7 +459,7 @@ export default {
       ComponentStateUpdate(row.计划流水号, 1).then(response => {
         this.searchTable1()
         row.buttonStatus = 2
-        // this.searchTable2()
+        this.searchTable2()
       })
     },
     // 部装结束装配
@@ -344,7 +467,7 @@ export default {
       ComponentStateUpdate(row.计划流水号, 2).then(response => {
         this.searchTable1()
         row.buttonStatus = 3
-        // this.searchTable2()
+        this.searchTable2()
       })
     }
   }