bug

src/api/quality.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-20 11:05:00
- * @LastEditTime: 2024-04-22 09:03:11
+ * @LastEditTime: 2024-04-29 14:13:18
  * @LastEditors: DY
  * @Description: 质量和报废
  */
@@ -71,11 +71,11 @@ export function createInspection (data) {
 }
 
 // 撤销质量检查信息
-export function deleteByCancel (query) {
+export function deleteByCancel (data) {
   return request({
     url: '/base/quality-inspection-record/deleteByCancel',
-    method: 'delete',
-    params: query
+    method: 'post',
+    data: data
   })
 }
 

src/utils/request.js

@@ -1,7 +1,7 @@
 /*
  * @Author: Do not edit
  * @Date: 2023-11-20 11:02:29
- * @LastEditTime: 2024-04-22 09:39:49
+ * @LastEditTime: 2024-04-29 16:56:15
  * @LastEditors: DY
  * @Description:
  */

src/views/Quality.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-01-09 13:48:42
- * @LastEditTime: 2024-04-22 09:33:28
+ * @LastEditTime: 2024-04-29 16:35:33
  * @LastEditors: DY
  * @Description:
 -->
@@ -55,8 +55,9 @@
         </van-row>
       </van-col>
     </van-row>
-    <el-scrollbar class="scollbar" ref="scrollbar" style="height: 100%" >
-      <el-backtop target=".scollbar .el-scrollbar__wrap" :visibility-height="10" :bottom="20">
+    <div style="height: 7px"></div>
+    <el-scrollbar class="scollbar" ref="scrollbar" style="height: 75%;" >
+      <el-backtop target=".scollbar .el-scrollbar__wrap" :visibility-height="10" :bottom="50">
         <i class="el-icon-caret-top" />
       </el-backtop>
       <div class="content" v-for="(item, index) in typeList" :key="index">
@@ -133,14 +134,15 @@ export default {
       })
     },
     addRecord (value) {
-      const now = new Date() // 创建一个表示当前时间的Date对象
-      const formattedTime = `${now.getFullYear()}-${(now.getMonth() + 1).toString().padStart(2, '0')}-${now.getDate().toString().padStart(2, '0')} ${now.getHours().toString().padStart(2, '0')}:${now.getMinutes().toString().padStart(2, '0')}:${now.getSeconds().toString().padStart(2, '0')}`
+      const now = new Date().getTime() // 创建一个表示当前时间的Date对象
+      // const formattedTime = `${now.getFullYear()}-${(now.getMonth() + 1).toString().padStart(2, '0')}-${now.getDate().toString().padStart(2, '0')} ${now.getHours().toString().padStart(2, '0')}:${now.getMinutes().toString().padStart(2, '0')}:${now.getSeconds().toString().padStart(2, '0')}`
       // console.log(formattedTime)
       if (!this.isCancel) {
         createInspection({
           ...this.listQuery,
           inspectionDetId: value.detId,
-          checkTime: formattedTime
+          checkTime: now,
+          source: 1
         }).then(res => {
           if (res.data.code === 0) {
             // this.typeList.forEach(element => {
@@ -159,7 +161,7 @@ export default {
           deleteByCancel({
             ...this.listQuery,
             inspectionDetId: value.detId,
-            checkTime: formattedTime
+            checkTime: now
           }).then(res => {
             if (res.data.code === 0) {
               // this.typeList.forEach(element => {
@@ -186,11 +188,13 @@ export default {
     getQuality () {
       // qualityManage().then(res => {
       qualityManage(this.listQuery).then(res => {
-        if (JSON.stringify(res.data.data) !== '{}') {
+        if (res.data.code === 0 && JSON.stringify(res.data.data) !== '{}') {
           this.typeList = Object.values(res.data.data)
           this.count = this.typeList[0][0].sunCount
           if (this.typeList[0][0]?.resetMethod === 1) {
-            this.resetMethod = true
+            this.showReset = true
+          } else {
+            this.showReset = false
           }
         } else {
           this.typeList = []
@@ -336,7 +340,7 @@ export default {
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   color: #000000;
-  margin-top: 7px;
+  margin-bottom: 7px;
   padding: 0 20px 20px 20px;
   box-sizing: border-box;
   /* overflow: scroll;

src/views/ScrapList.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Do not edit
  * @Date: 2023-12-29 10:01:55
- * @LastEditTime: 2024-03-28 09:07:41
+ * @LastEditTime: 2024-04-28 16:41:33
  * @LastEditors: DY
  * @Description: 报废列表
 -->
@@ -27,7 +27,7 @@
     max-height="600"
     style="width: 100%">
       <el-table-column
-      type="index" label="序号" width="60" />
+      type="index" :index="indexMethod" label="序号" width="60" />
       <el-table-column v-for="(item, index) in tableProps" :key="index" :prop="item.prop" :label="item.label" />
     </el-table>
     <el-pagination
@@ -96,6 +96,9 @@ export default {
     this.getList()
   },
   methods: {
+    indexMethod (index) {
+      return (this.listQuery.pageNo - 1) * 10 + index + 1
+    },
     handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
       this.listQuery.pageSize = val