|
|
@@ -708,7 +708,7 @@
|
|
|
<span class="btn text-center"
|
|
|
:class="isShowSecondOrderInfo ?'btn-outline-secondary': 'btn-outline-info'"
|
|
|
:style="{'min-height':toggleBtnHeight+'px'} "
|
|
|
- @click="togglSecondeOrder"
|
|
|
+ @click="toggleSeCondeOrder"
|
|
|
v-text="isShowSecondOrderInfo ? '隐藏运单列' : '展开运单列'"></span>
|
|
|
</td>
|
|
|
<td class="child-layer-3-hide" v-show="isShowSecondOrderInfo">
|
|
|
@@ -749,11 +749,12 @@
|
|
|
</div>
|
|
|
|
|
|
<div v-if="orderIssue.second_order !== null">
|
|
|
- <div class="text-center m-0" :id="'secondOrderNumbers'+orderIssue.id"
|
|
|
+ <div class="text-center m-0"
|
|
|
+ :id="'secondOrderNumbers'+orderIssue.id"
|
|
|
:class="orderIssue.seconderCount > 1 ? 'collapse':''">
|
|
|
<p class="m-0 p-0 text-muted "
|
|
|
- v-for="package in orderIssue.second_order.packages"
|
|
|
- v-text="package.logistic_number"></p>
|
|
|
+ v-for="item in orderIssue.second_order.packages"
|
|
|
+ v-text="item.logistic_number"></p>
|
|
|
</div>
|
|
|
<button type="button"
|
|
|
class="btn btn-sm btn-outline-primary align-middle mt-1"
|
|
|
@@ -761,8 +762,7 @@
|
|
|
v-if="orderIssue.second_order.packages.length > 1"
|
|
|
:id="'secondOrderNumbersBtn'+orderIssue.id"
|
|
|
:data-target="'#secondOrderNumbers'+orderIssue.id"
|
|
|
- @click="toggleseCondOrderNumbers(orderIssue.id,orderIssue.second_order.packages.length)">
|
|
|
- 分箱@{{ orderIssue.second_order.packages.length }}件,点击展开
|
|
|
+ @click="toggleSeCondOrderNumbers(orderIssue.id,orderIssue.second_order.packages.length)">分箱@{{ orderIssue.second_order.packages.length }}件,点击展开
|
|
|
</button>
|
|
|
</div>
|
|
|
<div v-else-if="orderIssue.second_order === null">
|
|
|
@@ -1424,7 +1424,7 @@
|
|
|
{name: 'archive_at_end', type: 'dateTime', tip: '归档结束日期'},
|
|
|
@endcannot
|
|
|
{
|
|
|
- name: 'is_handle', type: 'checkbox', tip: '是否已处理', data: [{name: 'ture', value: '已解决'}]
|
|
|
+ name: 'is_handle', type: 'checkbox', tip: '是否已处理', data: [{name: 'ture', value: '已解决'}],
|
|
|
},
|
|
|
{name: 'is_intercept', type: 'checkbox', tip: '是否已拦截', data: [{name: 'ture', value: '已拦截'}]},
|
|
|
{
|
|
|
@@ -1909,7 +1909,7 @@
|
|
|
button.text("商品" + length + "件,点击展开");
|
|
|
}
|
|
|
},
|
|
|
- toggleseCondOrderNumbers(id, length) {
|
|
|
+ toggleSeCondOrderNumbers(id, length) {
|
|
|
let button = $("#secondOrderNumbersBtn" + id);
|
|
|
let isShow = button.attr('aria-expanded');
|
|
|
if (isShow === 'false') {
|
|
|
@@ -1924,7 +1924,7 @@
|
|
|
toggleRejectedBill() {
|
|
|
this.isShowRejectedBill = !this.isShowRejectedBill;
|
|
|
},
|
|
|
- togglSecondeOrder() {
|
|
|
+ toggleSeCondeOrder() {
|
|
|
this.isShowSecondOrderInfo = !this.isShowSecondOrderInfo;
|
|
|
},
|
|
|
updateOrderIssue(orderIssue, column, e) {
|
|
|
@@ -1957,8 +1957,9 @@
|
|
|
}
|
|
|
if (!confirm('是否删除当前问题件')) return;
|
|
|
let _this = this
|
|
|
- let data = {ids: this.checkData}
|
|
|
- axios.post('{{url('apiLocal/order/issue/batchDestroy')}}', data).then(function (response) {
|
|
|
+ let data = {ids: this.checkData};
|
|
|
+ let url = '{{route('order.issue.batchDestroyApi')}}';
|
|
|
+ window.axios.post(url, data).then(function (response) {
|
|
|
if (response.data.success) {
|
|
|
for (let index = _this.orderIssues.length - 1; index >= 0; index--) {
|
|
|
let item = _this.orderIssues[index]
|
|
|
@@ -1994,27 +1995,27 @@
|
|
|
batchStoreLogs() {
|
|
|
let _this = this;
|
|
|
let data = {orderIssueIds: this.checkData, content: this.edit.batchStoreLogs};
|
|
|
- axios.post('{{url("apiLocal/order/issue/log/batchStore")}}', data).then(function (response) {
|
|
|
- if (response.data.success) {
|
|
|
- _this.edit.batchStoreLogs = ''
|
|
|
- let logs = response.data.logs
|
|
|
- _this.orderIssues.forEach(function (item) {
|
|
|
+ let url = "{{route('order.issue.log.batchStoreApi')}}";
|
|
|
+ tempTip.setDuration(2000)
|
|
|
+ tempTip.setIndex(100)
|
|
|
+ window.axios.post(url, data).then( res=> {
|
|
|
+ if (res.data.success) {
|
|
|
+ this.edit.batchStoreLogs = ''
|
|
|
+ let logs = res.data.logs;
|
|
|
+ this.orderIssues.forEach(item=>{
|
|
|
let id = item['id']
|
|
|
if (_this.checkData.includes(id)) {
|
|
|
item['logs'].unshift(logs[id])
|
|
|
}
|
|
|
})
|
|
|
- tempTip.setDuration(2000)
|
|
|
- tempTip.setIndex(100)
|
|
|
tempTip.showSuccess('添加成功')
|
|
|
$("#batchStoreLogsModel").modal('hide')
|
|
|
} else {
|
|
|
- tempTip.setIndex(100)
|
|
|
tempTip.show('添加失败' + response.data.fail_info)
|
|
|
}
|
|
|
- }).catch(function (error) {
|
|
|
+ }).catch( err => {
|
|
|
tempTip.setDuration(3000)
|
|
|
- tempTip.show('处理结果添加异常:' + error)
|
|
|
+ tempTip.show('处理结果添加异常:' + err);
|
|
|
})
|
|
|
},
|
|
|
batchOthers() {
|