Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/qualityManagement/reviewFormMess/index.vue

@@ -164,7 +164,7 @@ export default {
       getErpReviewList({
         current: this.page.currentPage,
         size: this.page.pageSize,
-        ...this.query,
+        rsCode:this.query && this.query.sheetNo,
       }).then(res => {
         this.data = res.data.data.records;
         this.page.total = res.data.data.total;

src/views/qualityManagement/reviewFormMess/options.js

@@ -275,7 +275,7 @@ export const erpOption = {
         {
             label: '审理单号',
             // prop: 'rsCode',
-            prop: 'rsCode',
+            prop: 'sheetNo',
             // bind: 'dsPart.partCode',
             search: true,
             sortable: true,
@@ -385,7 +385,7 @@ export const erpOption = {
         },
          {
             label: '零件号',
-            prop: 'partCode',
+            prop: 'prtno',
             // prop: 'partCode',
             // bind: 'dsPart.plate',
             search: false,
@@ -407,7 +407,7 @@ export const erpOption = {
         },
          {
             label: '备注',
-            prop: 'remark',
+            prop: 'memo',
             // bind: 'dsPart.plate',
             search: false,
             sortable: true,
@@ -417,7 +417,7 @@ export const erpOption = {
         },
          {
             label: '处理意见',
-            prop: 'memo',
+            prop: 'dispose',
             // bind: 'dsPart.plate',
             search: false,
             sortable: true,