Commit bd4cca5f authored by 黄奎's avatar 黄奎

阿斯顿发送到发

parent 0da5be60
...@@ -1907,6 +1907,7 @@ ...@@ -1907,6 +1907,7 @@
<div class="combottomDiv" v-if="showChangeSales" style="height:200px;"> <div class="combottomDiv" v-if="showChangeSales" style="height:200px;">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan> <updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div> </div>
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div> </div>
</template> </template>
...@@ -2259,10 +2260,10 @@ import moment from "moment"; ...@@ -2259,10 +2260,10 @@ import moment from "moment";
let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0) let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0)
let saveMsg = {} let saveMsg = {}
saveMsg.Path = x.data.FilePath saveMsg.Path = x.data.FilePath;
saveMsg.FileName = file.file.name saveMsg.FileName = file.file.name;
saveMsg.Status = 1 saveMsg.Status = 1;
saveMsg.OrderId = this.checkedObj.orderId saveMsg.OrderId = this.checkedObj.orderId;
that.apipost('sellorder_post_SetConfirmationLetter', saveMsg, res => { that.apipost('sellorder_post_SetConfirmationLetter', saveMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message) this.$message.success(res.data.message)
...@@ -2275,8 +2276,9 @@ import moment from "moment"; ...@@ -2275,8 +2276,9 @@ import moment from "moment";
}) })
}, },
downLoadFile (obj) { downLoadFile (obj) {
let reg = /^http(s)?:\/\/(.*?)\// let dom = document.querySelector("#groupTourOrder_DownLoad");
this.downloadFileRename(obj[0].fullUrl.replace(reg, ''), obj[0].name) dom.href = obj[0].fullUrl;
dom.click();
}, },
// 订单转团 // 订单转团
transfer: function (item) { transfer: function (item) {
...@@ -3516,7 +3518,6 @@ import moment from "moment"; ...@@ -3516,7 +3518,6 @@ import moment from "moment";
this.loading = false this.loading = false
this.total = res.data.data.count this.total = res.data.data.count
this.list = res.data.data.pageData; this.list = res.data.data.pageData;
console.log("this.list",this.list)
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
......
...@@ -1710,7 +1710,7 @@ ...@@ -1710,7 +1710,7 @@
</div> </div>
</td> </td>
<td> <td>
<span v-if='item.confirmFileList.length>0' class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)"> <span v-if='item.confirmFileList.length>0' style="cursor:pointer" class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
确认函下载 确认函下载
</span> </span>
<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i> <i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i>
...@@ -1992,7 +1992,7 @@ ...@@ -1992,7 +1992,7 @@
</div> </div>
</td> </td>
<td> <td>
<span v-if='item.confirmFileList.length>0' class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)"> <span v-if='item.confirmFileList.length>0' style="cursor:pointer" class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
确认函下载 确认函下载
</span> </span>
<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i> <i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i>
...@@ -2224,6 +2224,7 @@ ...@@ -2224,6 +2224,7 @@
<button class="hollowFixedBtn" @click="OrderMoneyDialog=false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="OrderMoneyDialog=false">{{$t('pub.cancelBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
<a id='groupTourOrderByTuan_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div> </div>
</template> </template>
...@@ -2732,8 +2733,9 @@ export default { ...@@ -2732,8 +2733,9 @@ export default {
}); });
}, },
downLoadFile(obj) { downLoadFile(obj) {
let reg = /^http(s)?:\/\/(.*?)\// let dom = document.querySelector("#groupTourOrderByTuan_DownLoad");
this.downloadFileRename(obj[0].fullUrl.replace(reg,''),obj[0].name); dom.href = obj[0].fullUrl;
dom.click();
}, },
// 订单转团 // 订单转团
transfer: function (item) { transfer: function (item) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment