| 
					
				 | 
			
			
				@@ -118,7 +118,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         :rowKey="(record) => record.id" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         :columns="columns" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         :data="loadData" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        :scroll="{ y:tableHeight, x:1800 }" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        :scroll="{ y:tableHeight, x:1950 }" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         :defaultLoadData="false" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         bordered> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <!-- 销售单号 --> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -131,6 +131,10 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <span class="link-bule" v-if="$hasPermissions('B_dispatchDetail')" @click="handleDetail(record,1)">{{ record.dispatchBillNo }}</span> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <span v-else>{{ record.dispatchBillNo }}</span> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <!-- 发货说明  --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <template slot="explainInfo" slot-scope="text, record"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <span class="link-bule" @click="handleExplainInfo(record)" :title="record.explainInfo">{{ record.explainInfo||'--' }}</span> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <!-- 操作 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <template slot="action" slot-scope="text, record"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <div> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -164,6 +168,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </commonModal> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <!-- 查看销售单或备货单详情 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <commonModal 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         modalTit="销售单详情" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -174,6 +179,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         @cancel="showDetailModal = false"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <salesDetail v-if="showDetailModal" ref="salesDetail" :bizSn="bizSn"></salesDetail> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </commonModal> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <!-- 发货说明 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <explainInfoModal :rowData="tipData" :openModal="showInfoModal" @close="canselModal"></explainInfoModal> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </a-spin> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   </a-card> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </template> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -189,17 +196,19 @@ import Area from '@/views/common/area.js' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import commonModal from '@/views/common/commonModal.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import salesDetail from '@/views/salesManagement/salesQuery/detail.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import explainInfoModal from './explainInfoModal.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { dispatchlList, dispatchQueryCount, dispatchPrintStatus } from '@/api/dispatch' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   name: 'PushOrderManagementList', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   mixins: [commonMixin], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, subarea, commonModal, Area, salesDetail, explainInfoModal }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   data () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       spinning: false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       advanced: true, // 高级搜索 展开/关闭 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       disabled: false, //  查询、重置按钮是否可操作 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       showDetailModal: false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      showInfoModal: false, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       bizSn: null, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       tableHeight: 0, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       time: [ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -260,6 +269,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '120px', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '发货编号', dataIndex: 'sendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '150px', align: 'center', ellipsis: true }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '客户名称', dataIndex: 'buyerName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '收货客户名称', dataIndex: 'receiverName', width: '150px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '产品款数', dataIndex: 'totalCategory', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -302,6 +312,11 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // 查看发货说明 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    handleExplainInfo (row) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.tipData = row 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.showInfoModal = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 允许备货打印 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     handlePrint (row, type) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.tipData = row 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -311,6 +326,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     canselModal () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.tipData = null 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.showTipModal = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.showInfoModal = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     updatePrintStatus () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       dispatchPrintStatus({ dispatchBillSn: this.tipData.dispatchBillSn, printStatus: this.tipData && this.tipData.printType == 1 ? 'NO_PRINT' : 'CANCEL_PRINT' }).then(res => { 
			 |