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

src/views/ManufacturingCenter/CreatePreparationBill/index.vue

@@ -29,7 +29,7 @@
         v-loading="loading"
         :data="tableData"
         height="760"
-        style="width: 1126px; margin: 3px 0"
+        style="width: 1408px; margin: 3px 0"
         size="mini"
         border
         stripe
@@ -81,6 +81,16 @@
             {{ scope.row.工艺要求 }}
           </template>
         </el-table-column>
+        <el-table-column label="备料任务接受时间" align="center" width="140" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.备料任务接受时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备料任务分配时间" align="center" width="140" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.备料任务分配时间 }}
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block">
         <el-pagination
@@ -217,7 +227,9 @@ export default {
               工艺要求: response.data[0].工艺要求,
               材料: this.Data[i].材料,
               重量: this.Data[i].重量,
-              批次数量: this.Data[i].批次数量
+              批次数量: this.Data[i].批次数量,
+              备料任务接受时间: this.Data[i].备料任务接受时间,
+              备料任务分配时间: this.Data[i].备料任务分配时间
             })
           })
           this.loading = false

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -669,11 +669,13 @@ export default {
         const _this = this
         if (route.name === 'PartAssignment') {
           _this.fetchData()
+          _this.DeliveryTime = ''
         }
       }
     }
   },
   created() {
+    this.DeliveryTime = ''
     this.fetchData()
   },
   methods: {