Merge remote-tracking branch 'origin/master'

src/router/modules/analysis.ts

@@ -57,23 +57,5 @@ export default {
         },
       ],
     },
-    {
-      path: "sales",
-      component: () => import("@/views/sales/index.vue"),
-      name: "Sales",
-      meta: {
-        title: "销售反馈",
-        icon: "Guide",
-      },
-    },
-    {
-      path: "unqualified",
-      component: () => import("@/views/unqualified/index.vue"),
-      name: "Unqualified",
-      meta: {
-        title: "不合格处置",
-        icon: "Guide",
-      },
-    },
   ],
 };

src/router/modules/statistic.ts

@@ -46,5 +46,14 @@ export default {
         icon: "Guide",
       },
     },
+    {
+      path: "unqualified",
+      component: () => import("@/views/unqualified/index.vue"),
+      name: "Unqualified",
+      meta: {
+        title: "不合格处置",
+        icon: "Guide",
+      },
+    },
   ],
 };

src/views/sales/DetailCom.vue

@@ -23,7 +23,7 @@
         <tr>
           <td>{{ saleModel.materialModel }}</td>
           <td>{{ saleModel.type }}</td>
-          <td>{{ saleModel.workOrderCode }}</td>
+          <td>{{ saleModel.checkCode }}</td>
           <td>{{ saleModel.num }}</td>
         </tr>
       <tr>

src/views/unqualified/handle5.vue

@@ -141,8 +141,8 @@ const confirmClick = () => {
 
       let p = {
         id: saleModel.value.id,
-        remark4: JSON.stringify(remark2Copy),
-        remark5: JSON.stringify(remark3),
+        remark5: JSON.stringify(remark2Copy),
+        remark6: JSON.stringify(remark3),
         state: remark.state,
         currentUserName: remark.nextRemarkUser,
         step: 5, //步骤 1 投书或建议处置意见 2 整改及纠正措施验证 3 处置情况的反馈意见