销售订单

src/store/modules/order.js

@@ -155,7 +155,7 @@ const order = {
     getSaleShipmentPoint({commit, state}) {
       return new Promise((resolve, reject) => {
         if (state.saleShipmentPoint && state.saleShipmentPoint.length) return resolve(state.saleShipmentPoint)
-        listPaymentClause().then(res => {
+        listPoint().then(res => {
           commit('SET_SALE_SHIPMENT_POINT', res.rows)
           resolve(res.rows)
         }).catch(() => reject())

src/views/mes/order/sales/index.vue

@@ -29,7 +29,7 @@
       </el-form-item>
       <el-form-item label="跟单人" prop="merchandiser">
         <el-select v-model="queryParams.merchandiser" clearable filterable remote :remote-method="getUserList" placeholder="请选择跟单人">
-          <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId"/>
+          <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName" :value="item.nickName"/>
         </el-select>
       </el-form-item>
       <el-form-item label="订单状态" prop="state">
@@ -99,8 +99,7 @@
       <el-table-column label="客户编号" prop="clientNo"/>
       <el-table-column label="交货期" prop="deliveryDate" width="180"/>
       <el-table-column label="总金额" prop="amount" :formatter="r => this.formatMoney(r.amount)"/>
-      <el-table-column label="跟单人" prop="merchandiser"
-                       :formatter="r => (this.userList.find(item => item.userId == r.merchandiser) || {}).nickName"/>
+      <el-table-column label="跟单人" prop="merchandiser"/>
       <el-table-column label="备注" prop="remark"/>
       <el-table-column label="订单状态" prop="state">
         <template slot-scope="{row}">