Merge branch 'feature/提货人档案' into dev_v2

src/views/supply/displace/displace_list.vue

@@ -344,9 +344,8 @@
                 size="mini"
                 @click="submitChooseBeiGoods(scope.row)"
                 :disabled="scope.row.selected"
-              >选择
-              </el-button
-              >
+                >选择
+              </el-button>
             </template>
           </el-table-column>
           <el-table-column
@@ -390,7 +389,7 @@
             <el-pagination
               @current-change="changeBeiGoodsDialogPage"
               :current-page="beiGoodsDialog_currentPage"
-              :page-size="10"
+              :page-size="100"
               background
               layout="prev, pager, next"
               :total="beiGoodsDialog_listTotal"
@@ -514,9 +513,8 @@
                 size="mini"
                 @click="submitChooseKeGoods(scope.row)"
                 :disabled="scope.row.selected"
-              >选择
-              </el-button
-              >
+                >选择
+              </el-button>
             </template>
           </el-table-column>
           <el-table-column
@@ -553,7 +551,7 @@
             <el-pagination
               @current-change="changeKeGoodsDialogPage"
               :current-page="keGoodsDialog_currentPage"
-              :page-size="10"
+              :page-size="100"
               background
               layout="prev, pager, next"
               :total="keGoodsDialog_listTotal"
@@ -616,9 +614,8 @@
           <el-table-column align="center" width="80">
             <template slot-scope="scope">
               <el-button type="primary" size="mini" @click="submitChooseOrder(scope.row)" :disabled="scope.row.selected"
-              >选择
-              </el-button
-              >
+                >选择
+              </el-button>
             </template>
           </el-table-column>
           <el-table-column
@@ -740,7 +737,7 @@
             <el-pagination
               @current-change="changeOrderDialogPage"
               :current-page="orderDialog_currentPage"
-              :page-size="10"
+              :page-size="100"
               background
               layout="prev, pager, next"
               :total="orderDialog_listTotal"
@@ -816,8 +813,7 @@ export default {
     }
   },
 
-  created() {
-  },
+  created() {},
 
   methods: {
     // 切换置换类型
@@ -896,10 +892,8 @@ export default {
           package: '',
           signType: 'MD5',
           paySign: '',
-          success(res) {
-          },
-          fail(res) {
-          }
+          success(res) {},
+          fail(res) {}
         })
       })
     },

src/views/supply/implement/components/displace_detail.vue

@@ -30,7 +30,7 @@
         ></el-table-column>
         <el-table-column align="left" label="" min-width="80" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.isOld ? '新机' : '旧机' }}
+            {{ scope.row.isOld ? '旧机' : '新机' }}
           </template>
         </el-table-column>
         <el-table-column