Merge branch 'dy' of git.picaiba.com:mt-fe-group/xc-pad into dy

src/utils/request.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-20 11:02:29
- * @LastEditTime: 2024-01-29 16:48:54
+ * @LastEditTime: 2024-01-30 14:45:55
  * @LastEditors: DY
  * @Description:
  */

src/views/Quality.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-01-09 13:48:42
- * @LastEditTime: 2024-01-30 08:55:04
+ * @LastEditTime: 2024-01-30 14:39:35
  * @LastEditors: DY
  * @Description:
 -->
@@ -120,8 +120,11 @@ export default {
             item.value = item.id
             return item
           })
+          this.listQuery.productionLineId = this.lineArray[0].value
+          this.getSection(this.listQuery.productionLineId)
         } else {
           this.lineArray = []
+          this.listQuery.productionLineId = ''
         }
       })
     },
@@ -229,7 +232,7 @@ export default {
 }
 .quality {
   background-image: url('./../assets/quality-bg.png');
-  height: 100vh;
+  min-height: 100vh;
   width: 100vw;
   padding: 20px 20px;
   box-sizing: border-box;

src/views/Scrap.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-01-09 13:49:03
- * @LastEditTime: 2024-01-30 08:56:57
+ * @LastEditTime: 2024-01-30 10:28:52
  * @LastEditors: DY
  * @Description:
 -->
@@ -79,7 +79,7 @@
         <el-col :span="12">
           <div class="whiteForm">
             <el-form-item label="时间" prop="logTime">
-              <el-date-picker type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" v-model="ruleForm.logTime" style="width: 100%;"></el-date-picker>
+              <el-date-picker type="datetime" placeholder="选择日期" value-format="timestamp" v-model="ruleForm.logTime" style="width: 100%;"></el-date-picker>
             </el-form-item>
           </div>
         </el-col>
@@ -163,7 +163,8 @@ export default {
         lineId: undefined,
         sectionId: undefined,
         remark: undefined,
-        logTime: new Date()
+        source: 1,
+        logTime: new Date().getTime()
       },
       show: false,
       simpleShow: false,
@@ -251,7 +252,8 @@ export default {
       lineId: undefined,
       sectionId: undefined,
       remark: undefined,
-      logTime: new Date()
+      source: 1,
+      logTime: new Date().getTime()
     }
   },
   methods: {
@@ -369,6 +371,8 @@ export default {
         console.log('res', res.data.data)
         if (res && res.data.data.datas.length > 0) {
           this.lineArray = res.data.data.datas
+          this.ruleForm.lineId = this.lineArray[0].id
+          this.getSection(this.ruleForm.lineId)
         } else {
           this.lineArray = []
         }
@@ -392,7 +396,7 @@ export default {
                 type: 'success'
               })
               this.$router.push({
-                path: 'home'
+                path: 'list'
               })
             }
           })

src/views/ScrapList.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-29 10:01:55
- * @LastEditTime: 2024-01-29 17:31:48
+ * @LastEditTime: 2024-01-30 14:42:15
  * @LastEditors: DY
  * @Description: 报废列表
 -->
@@ -53,11 +53,11 @@ const tableProps = [
     label: '报废时间'
   },
   {
-    prop: 'createTime',
+    prop: 'lineName',
     label: '产线名称'
   },
   {
-    prop: 'createTime',
+    prop: 'sectionName',
     label: '工段名称'
   },
   {