1

src/components/Buying/CommondityOrderList.vue

@@ -43,7 +43,8 @@
             <el-select class="" 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-option v-for="item in LeaderList" :label="item.Name" :value="item.ID"
+                :key="item.ID"></el-option>
             </el-select>
           </span>
         </li>
@@ -52,7 +53,9 @@
             <em>订单状态</em>
             <el-select filterable v-model="msg.COrderState" class="">
               <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
-              <el-option v-for="item in OrderStatusList" :label="item.Name" :value="item.Id" :key="item.ID"></el-option>
+              <el-option v-for="item in OrderStatusList" :label="item.Name" :value="item.Id"
+                :key="item.ID"></el-option>
+
             </el-select>
           </span>
         </li>
@@ -65,7 +68,7 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>订单编号</th>
-        <th>客户名称</th>  
+        <th>客户名称</th>
         <th>订单信息</th>
         <th>物流信息</th>
         <th>同行名称/同行返佣</th>
@@ -76,13 +79,13 @@
         <th>接单领队</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
-      <tbody v-for="item in dataList" :key="item.CorderId">
+      <tbody v-for="item in dataList">
         <tr>
           <td>{{item.CorderId}}</td>
           <td>{{item.AccountName}}</td>
           <td>
             <template v-if="item.OrderDetailsList && item.OrderDetailsList.length>0"
-              v-for="subItem in item.OrderDetailsList"   >
+              v-for="subItem in item.OrderDetailsList">
               <p> 商品名称: {{subItem.CommodityName}}</p>
               <p> 价格信息: {{subItem.CommodityNum}}(数量) * {{subItem.CommodityPrice}}(单价) </p>
             </template>
@@ -104,34 +107,9 @@
           <td>{{item.ReciveLeaderName}}</td>
           <td>
             <el-button-group>
-              <el-tooltip class="item" effect="dark" content="分配领队" placement="top-start">
-                <el-popover placement="bottom" width="300" trigger="click">
-                  <table>
-                    <tr>
-                      <td style="text-align:right;width:80px;">领队/导游：</td>
-                      <td>
-                        <el-select class="w150" filterable v-model="SetLeader.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>
-                      </td>
-                    </tr>
-                    <tr>
-                      <td style="text-align:right;height:10px" colspan="2"></td>
-                    </tr>
-                    <tr>
-                      <td colspan="2" style="text-align:center;">
-                        <input type="button" @click="setShopOrderLeader(item.CorderId)" class="hollowFixedBtn"
-                          value="保存">
-                      </td>
-                    </tr>
-                  </table>
-                  <el-button type="primary" @click="clickShopOrderLeader(item)" icon="iconfont icon-beizhu"
-                    slot="reference" style="background:#AD9AF6; border-color:#AD9AF6; border-radius: 0;"></el-button>
-                </el-popover>
+              <el-tooltip class="item" effect="dark" content="分派领队" placement="top">
+                <el-button type="primary" size="mini" icon="iconfont icon-jinyong" @click="SetAccountStatus(item.CorderId,1)">
+                </el-button>
               </el-tooltip>
             </el-button-group>
           </td>
@@ -147,6 +125,29 @@
         </tr>
       </tfoot>
     </table>
+    <el-dialog
+      custom-class="w400"
+      title="分配领队"
+      :visible.sync="outerVisible"
+      center
+      :before-close="closeChangeMachie"
+    >
+      <el-form :model="addMsg" label-width="130px">
+        <el-form-item label="领队" prop="state">
+          <el-select filterable v-model="addMsg.ReciveLeaderId" prop="ParentId" >
+            <el-option v-for="item in LeaderList" :label="item.Name" :value="item.ID" :key="item.ID"></el-option>
+          </el-select>
+        </el-form-item>
+        
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <button
+          class="hollowFixedBtn"
+          @click="outerVisible = false"
+        >{{$t('pub.cancelBtn')}}</button> &nbsp;
+        <button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -159,11 +160,16 @@
           CustomerId: 0, //同行编号
           SaleId: 0, //销售编号
           COrderState: -1, //订单状态
-          ReciveLeaderId: 0, //接单领队
+          ReciveLeaderId:0,//接单领队
           pageIndex: 1,
           pageSize: 10,
           total: 0,
         },
+        addMsg: {
+          ReciveLeaderId: '',
+          OrderIdList: [],
+        },
+        outerVisible: false,
         loading: false,
         dataList: [],
         //账户修改
@@ -180,12 +186,7 @@
         //领队列表
         LeaderList: [],
         //订单状态列表
-        OrderStatusList: [],
-        //分配领队
-        SetLeader: {
-          ReciveLeaderId: 0,
-          OrderIdList: [], //订单信息
-        }
+        OrderStatusList:[],
       };
     },
     mounted() {
@@ -197,6 +198,27 @@
     },
     filters: {},
     methods: {
+      closeChangeMachie(done) {
+        done();
+      },
+      submitForm(){
+        this.apipost(
+          'ShopOrder_get_SetShopOrderAllotLeader', this.addMsg,
+          res => {
+            if (res.data.resultCode == 1) {
+              this.outerVisible = false;
+              this.getList();
+            }
+          },
+          err => {}
+        )
+      },
+      SetAccountStatus(id){
+        this.addMsg.OrderIdList = []
+        this.addMsg.ReciveLeaderId = ''
+        this.addMsg.OrderIdList.push(id)
+        this.outerVisible = true;
+      },
       handleCurrentChange(val) {
         this.msg.pageIndex = val;
         this.getList();
@@ -261,7 +283,7 @@
           }
         }, null);
       },
-      //获取领队列表
+       //获取领队列表
       getOrderStatusList() {
         this.apipost(
           'ShopOrder_get_GetShopOrderStateService', {},
@@ -273,24 +295,6 @@
           err => {}
         )
       },
-      //点击获取订单信息
-      clickShopOrderLeader(item) {
-        this.SetLeader.OrderIdList.push(item.CorderId);
-      },
-      //分配接单领队
-      setShopOrderLeader() {
-        this.apipost(
-          'ShopOrder_get_SetShopOrderAllotLeader', this.SetLeader,
-          res => {
-            if (res.data.resultCode == 1) {
-              this.getList();
-              this.SetLeader.OrderIdList = [];
-              this.SetLeader.ReciveLeaderId = 0;
-            }
-          },
-          err => {}
-        )
-      }
     }
   };