Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/singleApply.vue

@@ -228,11 +228,10 @@ export default {
     },
     handleSelectionChange(val) {
        var orderNo = []
-       console.log(val)
        val.forEach((item)=>{
          orderNo.push(item.orderNo)
        })
-       this.orderNos = orderNo.join(',')
+       this.orderNos = orderNo
      },
     importCityName(id){
         var arr = this.tradeCityList.filter(item => item.id == id)
@@ -269,13 +268,17 @@ export default {
         that.$message.error("请选择待合单的订单");
         return
       }
-        var  params = {
+      var params = []
+      that.orderNos.forEach((item)=>{
+        var data = {
           applyOrderNo:that.queryParams.mergedOrderNo,
           copyUserId:that.selectedUsers,
-          orderNos:that.orderNos,
+          orderNos:item,
           status:1
         }
-        createMerge([params]).then(res=>{
+        params.push(data)
+      })
+        createMerge(params).then(res=>{
           that.$message.success("修改成功");
           that.$router.back()
         })