页面修改

src/components/Buying/CommondityOrderList.vue

@@ -12,7 +12,7 @@
         <li>
           <span>
             <em>旅客名称</em>
-            <el-input v-model="msg.AccountName" @keyup.enter.native="getList"></el-input>
+            <el-input v-model="msg.AccountName" @keyup.enter.native="getList" class="w150"></el-input>
           </span>
         </li>
         <li style="display:none;">
@@ -37,10 +37,21 @@
             </el-select>
           </span>
         </li>
+        <li>
+          <span>
+            <em>接单领队</em>
+            <el-select class="w150" v-model="msg.ReciveLeaderId" filterable :placeholder="$t('pub.pleaseSel')">
+              <el-option :label="$t('pub.unlimitedSel')" :value="SelectDefaultValue">
+              </el-option>
+              <el-option v-for="item in LeaderList" :label="item.Name" :value="item.ID"
+                :key="item.ID"></el-option>
+            </el-select>
+          </span>
+        </li>
         <li>
           <span>
             <em>订单状态</em>
-            <el-select filterable v-model="msg.COrderState">
+            <el-select filterable v-model="msg.COrderState" class="w150">
               <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
               <el-option label="正常" :value="0"></el-option>
               <el-option label="禁用" :value="1"></el-option>
@@ -73,13 +84,14 @@
           <td>{{item.CorderId}}</td>
           <td>{{item.AccountName}}</td>
           <td>
-            <template v-if="item.OrderDetailsList && item.OrderDetailsList.length>0"  v-for="subItem in item.OrderDetailsList">
-            <p> 商品名称: {{subItem.CommodityName}}</p>
-            <p> 价格信息: {{subItem.CommodityNum}}(数量) * {{subItem.CommodityPrice}}(单价) </p>
+            <template v-if="item.OrderDetailsList && item.OrderDetailsList.length>0"
+              v-for="subItem in item.OrderDetailsList">
+              <p> 商品名称: {{subItem.CommodityName}}</p>
+              <p> 价格信息: {{subItem.CommodityNum}}(数量) * {{subItem.CommodityPrice}}(单价) </p>
             </template>
-             <p> {{item.DeductionPrice}}(抵扣)</p>
-             <p> {{item.PreferPrice}} (应收)</p>
-             <p> {{item.RealityPrice}} (实收)</p>
+            <p> {{item.DeductionPrice}}(抵扣)</p>
+            <p> {{item.PreferPrice}} (应收)</p>
+            <p> {{item.RealityPrice}} (实收)</p>
             <p> 订单状态: {{item.COrderStateStr}} 下单时间:{{item.CreateTimeStr}}</p>
           </td>
           <td>
@@ -95,29 +107,17 @@
           <td>{{item.ReciveLeaderName}}</td>
           <td>
             <el-button-group>
-              <!-- <template v-if="item.AccountStatus==0">
-              <el-tooltip class="item" effect="dark" content="禁用" placement="top">
+              <el-tooltip class="item" effect="dark" content="分派领队" placement="top">
                 <el-button type="primary" size="mini" icon="iconfont icon-jinyong" @click="SetAccountStatus(item.Id,1)">
                 </el-button>
               </el-tooltip>
-              <el-tooltip class="item" effect="dark" content="删除" placement="top">
-                <el-button type="danger" size="mini" icon="iconfont icon-img_delete_small" @click="SetAccountStatus(item.Id,2)">
-                </el-button>
-              </el-tooltip>
-            </template>
-            <template v-else>
-              <el-tooltip class="item" effect="dark" content="启用" placement="top">
-                <el-button type="primary" size="mini" icon="iconfont icon-qidong" @click="SetAccountStatus(item.Id,0)">
-                </el-button>
-              </el-tooltip>
-            </template> -->
             </el-button-group>
           </td>
         </tr>
       </tbody>
       <tfoot>
         <tr>
-          <td colspan="9">
+          <td colspan="11">
             <el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
               :page-size="msg.pageSize" :total="msg.total">
             </el-pagination>
@@ -133,10 +133,11 @@
       return {
         //查询参数
         msg: {
-          AccountName:"",//旅客名称
+          AccountName: "", //旅客名称
           CustomerId: 0, //同行编号
           SaleId: 0, //销售编号
-          COrderState:-1,//订单状态
+          COrderState: -1, //订单状态
+          ReciveLeaderId:0,//接单领队
           pageIndex: 1,
           pageSize: 10,
           total: 0,
@@ -154,10 +155,13 @@
         EmployeeList: [],
         //客户列表
         CustomerList: [],
+        //领队列表
+        LeaderList: [],
       };
     },
     mounted() {
       this.getEmployeeList();
+      this.getLeaderList();
       //this.getCustomerList();
       this.getList();
     },
@@ -202,6 +206,18 @@
           err => {}
         )
       },
+      //获取领队列表
+      getLeaderList() {
+        this.apipost(
+          'leader_post_GetList', {},
+          res => {
+            if (res.data.resultCode == 1) {
+              this.LeaderList = res.data.data;
+            }
+          },
+          err => {}
+        )
+      },
       //获取数据
       getList() {
         this.loading = true;