推单页面修改

resources/views/rejected/rejectedPushTask/_assignOwner.blade.php

@@ -0,0 +1,28 @@
+<div class="modal fade" id="assignOwner" tabindex="-1">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title text-center">选定指定货主开启攒单</h5>
+                <button type="button" class="close" data-dismiss="modal">
+                    <span>&times;</span>
+                </button>
+            </div>
+            <div class="form-group row">
+                <label for="owner_id" class="col-2 col-form-label text-right font-weight-bolder m-3">选定货主</label>
+                <div class="col-8 form-check-inline" style="min-width: 200px !important;">
+                    <select v-model="assign.ownerId" class="selectpicker form-control" title="选择货主"
+                            data-actions-box="true"
+                            data-live-search="true"
+                            data-live-search-placeholder="搜索"
+                    >
+                        <option v-for="(v,k) of selectData.owners" :value="v.id" :key="v.id">@{{ v.name }}</option>
+                    </select>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary" @click="submitAssignOwner()">提交</button>
+            </div>
+        </div>
+    </div>
+</div>

resources/views/rejected/rejectedPushTask/index.blade.php

@@ -58,7 +58,7 @@
 
         </div>
         <div class="form-group m-3">
-            <button class="btn btn-success btn-sm" >
+            <button class="btn btn-success btn-sm" @click="assignOwner()">
                 货主开启攒单
             </button>
         </div>
@@ -301,6 +301,7 @@
                 </div>
             </div>
         </div>
+        @include('rejected.rejectedPushTask._assignOwner')
     </div>
 
 
@@ -335,6 +336,9 @@
                 },
                 checkAll: false,
                 selectTr: 0,
+                assign:{
+                    ownerId:null
+                },
                 tableData: {
                     firstData: {
                         data: [],
@@ -486,6 +490,22 @@
                 }).init();
             },
             methods: {
+                submitAssignOwner(){
+                    let url = this.getBaseUrl() + `/api/wms/rejectedPushTask/init?ownerId=${this.assign.ownerId}`
+                    axios.get(url).then(res => {
+                        if (res.data.code !== 200) {
+                            tempTip.show('接口异常!');
+                            tempTip.setDuration(2000)
+                        } else {
+                            this.searchData();
+                            tempTip.setDuration(2000)
+                            tempTip.showSuccess('提交成功');
+                        }
+                    });
+                },
+                assignOwner() {
+                    $('#assignOwner').modal('show');
+                },
                 setFirstDataSearach(){
                     this.tableData.firstData.search.ownerId=this.tableData.secondData.search.ownerId;
                     this.tableData.firstData.search.type= this.tableData.secondData.search.type;
@@ -515,7 +535,6 @@
                             data.current = 1
                             data.pages = 0
                         } else {
-                            tempTip.showSuccess('查询成功!');
                             data.data = res.data.data.list;
                             data.total = res.data.data.page.total;
                             data.current = res.data.data.page.pageNum;
@@ -526,7 +545,6 @@
                 },
                 //包裹明细分页
                 packagePagination(flag) {
-                    console.log(flag);
                     if (flag === 'pre' && this.showDetailData.packageDetail.current > 1) {
                         this.showDetailData.packageDetail.current--;
                     } else if (flag === 'next' && this.showDetailData.packageDetail.current < this.showDetailData.packageDetail.pages) {
@@ -551,7 +569,6 @@
                     let url = this.getBaseUrl() + `/api/wms/rejectedPushTask/commodity/list?size=${this.showDetailData.commodityDetail.size}&current=${this.showDetailData.commodityDetail.current}&rejectedPushTaskId=${id}`;
                     tempTip.showSuccess('开始查询,请稍后!');
                     axios.get(url).then(res => {
-                        tempTip.showSuccess('查询成功!');
                         if (res.data.code !== 200) {
                             tempTip.show('接口异常!');
                             this.showDetailData.commodityDetail.data = [];
@@ -576,7 +593,6 @@
                     let url = this.getBaseUrl() + `/api/wms/rejectedPushTask/package/list?size=${this.showDetailData.packageDetail.size}&current=${this.showDetailData.packageDetail.current}&rejectedPushTaskId=${id}`
                     tempTip.showSuccess('开始查询,请稍后!');
                     axios.get(url).then(res => {
-                        tempTip.showSuccess('查询成功!');
                         if (res.data.code !== 200) {
                             tempTip.show('接口异常!');
                             this.showDetailData.packageDetail.data = [];