| 
					
				 | 
			
			
				@@ -1,76 +1,80 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  <a-card size="small" :bordered="false" class="transferReturn-wrap"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <a-spin :spinning="spinning" tip="Loading..."> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <!-- 搜索条件 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <div ref="tableSearch" class="table-page-search-wrapper"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          <a-row :gutter="15"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  <div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  <a-card size="small" :bordered="false" class="searchBoxNormal"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <!-- 搜索条件 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <div ref="tableSearch" class="table-page-search-wrapper"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <a-row :gutter="15"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <a-form-item label="创建时间"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <rangeDate ref="rangeDate" :value="time" @change="dateChange" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <a-form-item label="调拨退货单号"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <a-form-item label="调拨退货对象名称"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <template v-if="advanced"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a-form-item label="创建时间"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <rangeDate ref="rangeDate" :value="time" @change="dateChange" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <a-form-item label="费用/调拨退货类型"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a-form-item label="调拨退货单号"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <a-input id="transferReturn-allocateReturnNo" v-model.trim="queryParam.allocateReturnNo" allowClear placeholder="请输入调拨退货单号"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <a-form-item label="调入仓库"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                <warehouse 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  v-model="queryParam.warehouseSn" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  id="transferReturn-warehouseSn" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  placeholder="请选择调入仓库" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a-form-item label="调拨退货对象名称"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <a-input id="transferReturn-targetName" v-model.trim="queryParam.targetName" allowClear placeholder="请输入调拨退货对象名称"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <a-form-item label="业务状态"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                <v-select 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  v-model="queryParam.state" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  ref="state" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  id="transferReturn-state" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  code="ALLOCATE_RETURN_STATE" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  placeholder="请选择业务状态" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  allowClear 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ></v-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <template v-if="advanced"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <a-form-item label="费用/调拨退货类型"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  <AllocateType id="transferReturn-allocateReturnTypeSn" v-model="allocateTypeVal" :changeOnSelect="true" placeholder="请选择费用/调拨退货类型" @change="changeAllocatype"></AllocateType> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <a-form-item label="调入仓库"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  <warehouse 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    v-model="queryParam.warehouseSn" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    id="transferReturn-warehouseSn" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    placeholder="请选择调入仓库" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <a-form-item label="业务状态"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  <v-select 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    v-model="queryParam.state" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    ref="state" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    id="transferReturn-state" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    code="ALLOCATE_RETURN_STATE" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    placeholder="请选择业务状态" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    allowClear 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  ></v-select> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                </a-form-item> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <!-- <a-button 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                style="margin-left: 5px" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                type="primary" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                class="button-warning" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                v-if="$hasPermissions('B_transferOut_export')" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                @click="handleExport" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                :disabled="disabled" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                :loading="exportLoading" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                id="transferReturn-export">导出</a-button> --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              <a @click="advanced=!advanced" style="margin-left: 5px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                {{ advanced ? '收起' : '展开' }} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <a-icon :type="advanced ? 'up' : 'down'"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              </a> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          </a-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        </a-form> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="transferReturn-refresh">查询</a-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="transferReturn-reset">重置</a-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <!-- <a-button 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              style="margin-left: 5px" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              type="primary" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              class="button-warning" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              v-if="$hasPermissions('B_transferOut_export')" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              @click="handleExport" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              :disabled="disabled" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              :loading="exportLoading" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              id="transferReturn-export">导出</a-button> --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            <a @click="advanced=!advanced" style="margin-left: 5px"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              {{ advanced ? '收起' : '展开' }} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              <a-icon :type="advanced ? 'up' : 'down'"/> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            </a> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          </a-col> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        </a-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      </a-form> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  </a-card> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  <a-card size="small" :bordered="false" class="transferReturn-wrap"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    <a-spin :spinning="spinning" tip="Loading..."> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <!-- 操作按钮 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <div class="table-operator"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" class="button-error" @click="openModal=true">新增</a-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <a-button v-if="$hasPermissions('B_transferReturnNew')" id="transferReturn-add" type="primary" @click="openModal=true">新增</a-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <!-- 列表 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <s-table 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -143,6 +147,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       @ok="auditOrder('WAIT_CHECK')" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       @fail="auditOrder('AUDIT_REJECT')" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   </a-card> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <script> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -330,7 +335,7 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     setTableH () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       const tableSearchH = this.$refs.tableSearch.offsetHeight 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.tableHeight = window.innerHeight - tableSearchH - 242 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.tableHeight = window.innerHeight - tableSearchH - 255 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   watch: { 
			 |