| 
					
				 | 
			
			
				@@ -8,9 +8,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-form-item label="入库时间"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-range-picker 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   style="width:100%" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  id="chainTransferInList-bundleNamesss" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  id="chainTransferInList-time" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   :disabledDate="disabledDate" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  v-model="queryParam.brand" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  v-model="time" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   :format="dateFormat" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   :placeholder="['开始时间', '结束时间']" /> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               </a-form-item> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -19,9 +19,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-form-item label="调出对象"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <v-select 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                v-model="queryParam.billStatus" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                ref="billStatus" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                id="chainTransferInList-billStatus" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                v-model="queryParam.outTenantName" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ref="outTenantName" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                id="chainTransferInList-outTenantName" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 code="PAYMENT_TYPE" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 placeholder="请选择调出对象" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 allowClear></v-select> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -30,9 +30,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-form-item label="调拨产品类型"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <v-select 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                v-model="queryParam.billStatus" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                ref="billStatus" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                id="chainTransferInList-billStatus" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                v-model="queryParam.allocationType" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ref="allocationType" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                id="chainTransferInList-allocationType" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 code="PAYMENT_TYPE" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 placeholder="请选择调拨产品类型" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 allowClear></v-select> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -42,9 +42,9 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             <a-col :md="6" :sm="24"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               <a-form-item label="单据状态"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <v-select 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  v-model="queryParam.billStatus" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  ref="billStatus" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                  id="chainTransferInList-billStatus" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  v-model="queryParam.state" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  ref="state" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                  id="chainTransferInList-state" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   code="PAYMENT_TYPE" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   placeholder="请选择单据状态" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                   allowClear></v-select> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -62,10 +62,6 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         </a-row> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </a-form> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </div> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <!-- 操作按钮 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <!-- <div class="table-operator"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <a-button id="chainTransferInList-add" type="primary" @click="handleEdit()">新增调入单</a-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    </div> --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <!-- 列表 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     <s-table 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       class="sTable" 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -76,8 +72,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       :data="loadData" 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       bordered> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <!-- 状态 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      <template slot="status" slot-scope="text, record"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        <span :class="record.status==1?'green':'red'"> {{ record.status==1? '待入库': '待审核' }} </span> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      <template slot="state" slot-scope="text, record"> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        <span :class="record.state==1?'green':'red'"> {{ record.state==1? '待入库': '待审核' }} </span> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <!-- 操作 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       <template slot="action" slot-scope="text, record"> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -87,66 +83,50 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         <a-button size="small" @click="handleDetail(record)" id="chainTransferInList-detail-btn" style="margin: 0 0 0 8px;">详情</a-button> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     </s-table> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <!-- 新增/编辑产品品牌 --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    <!-- <product-brand-edit-modal :openModal="openModal" :itemId="itemId" @close="closeModal" /> --> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   </a-card> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 </template> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 <script> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-// import { customerBundleDelayList, customerBundleExportDelay } from '@/api/FinancialManagement' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import { allocLinkagePutList } from '@/api/allocLinkagePut' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import { STable, VSelect } from '@/components' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-// import productBrandEditModal from './editModal.vue' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   components: { STable, VSelect }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   data () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       advanced: false, // 高级搜索 展开/关闭 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      time: undefined,  //  入库时间 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       queryParam: { //  查询条件 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        bundleName: '', //  品牌名称 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        state: undefined, //  状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        outTenantName: undefined, //  调出对象 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        allocationType: undefined, //  调拨产品类型 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        state: undefined, //  单据状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       disabled: false, //  查询、重置按钮是否可操作 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       dateFormat: 'YYYY-MM-DD', 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       columns: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '创建时间', dataIndex: 'no', width: 70, align: 'center', width: 180 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '创建时间', dataIndex: 'createDate', width: 70, align: 'center', width: 180 }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '连锁调出单号', dataIndex: 'productName', align: 'center', ellipsis: true }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '店内单号', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '调往对象', dataIndex: 'inventoryMoney', width: 180, align: 'center', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '总款数', dataIndex: 'inventsoryMoney', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '总数量', dataIndex: 'inventoryModney', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '总成本', dataIndex: 'inventoryaMoney', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '入库时间', dataIndex: 'inventoryMongey', width: 180, align: 'center', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '调拨产品类型', dataIndex: 'indventoryMoney', width: 180, align: 'center', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        { title: '状态', scopedSlots: { customRender: 'status' }, width: 180, align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '店内单号', dataIndex: 'allocationLinkagePutNo', width: 160, align: 'center', ellipsis: true }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '调出对象', dataIndex: 'outTenantName', width: 180, align: 'center', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '总款数', dataIndex: 'productTotalCategory', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '总数量', dataIndex: 'productTotalQty', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '总成本', dataIndex: 'productTotalCost', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '入库时间', dataIndex: 'putWarehouseTime', width: 180, align: 'center', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '调拨产品类型', dataIndex: 'allocationType', width: 180, align: 'center', customRender: function (text) { return text || '--' } }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { title: '状态', scopedSlots: { customRender: 'state' }, width: 180, align: 'center' }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { title: '操作', scopedSlots: { customRender: 'action' }, width: 300, align: 'center' } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       ], 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       // 加载数据方法 必须为 Promise 对象 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       loadData: parameter => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.disabled = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // return customerBundleDelayList( Object.assign(parameter, this.queryParam) ).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //   const data = res.data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //   const no = (data.pageNo - 1) * data.pageSize 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //   for (var i = 0; i < data.list.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //     data.list[i].no = no + i + 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //   this.disabled = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        //   return data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        // }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        const _this = this 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return new Promise(function(resolve, reject){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          const data = { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            pageNo: 1, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            pageSize: 10, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            list: [ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ] 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        this.queryParam = {} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return allocLinkagePutList( Object.assign(parameter, this.queryParam) ).then(res => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          const data = res.data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           const no = (data.pageNo - 1) * data.pageSize 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           for (var i = 0; i < data.list.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             data.list[i].no = no + i + 1 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          _this.disabled = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-          resolve(data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          this.disabled = false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+          return data 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       openModal: false, //  新增编辑产品品牌  弹框 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -160,12 +140,10 @@ export default { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //  重置 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     resetSearchForm () { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.orderBundleNo = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.orderBundle.custMobile = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.bundleName = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.queryParam.itemName = '' 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.oldTime = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      this.newTime = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.outTenantName = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.allocationType = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.queryParam.state = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      this.time = undefined 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       this.$refs.table.refresh(true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     //  入库 
			 |