Sfoglia il codice sorgente

对接店内调出列表接口

chenrui 4 anni fa
parent
commit
96b1cec942

+ 13 - 0
src/api/storeCallOut.js

@@ -0,0 +1,13 @@
+import { axios } from '@/utils/request'
+
+//  店内调出列表  分页
+export const storeCallOutList = (params) => {
+  const url = `/storeCallOut/findPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 35 - 50
src/views/allocationManagement/storeTransferOut/list.vue

@@ -10,7 +10,7 @@
                   style="width:100%"
                   id="storeTransferOutList-bundleNamesss"
                   :disabledDate="disabledDate"
-                  v-model="queryParam.brand"
+                  v-model="createDate"
                   :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="storeTransferOutList-billStatus"
+                v-model="queryParam.putPersonName"
+                ref="putPersonName"
+                id="storeTransferOutList-putPersonName"
                 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="storeTransferOutList-billStatus"
+                v-model="queryParam.callOutType"
+                ref="callOutType"
+                id="storeTransferOutList-callOutType"
                 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="storeTransferOutList-billStatus"
+                  v-model="queryParam.state"
+                  ref="state"
+                  id="storeTransferOutList-state"
                   code="PAYMENT_TYPE"
                   placeholder="请选择单据状态"
                   allowClear></v-select>
@@ -76,8 +76,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">
@@ -94,7 +94,7 @@
 </template>
 
 <script>
-// import { customerBundleDelayList, customerBundleExportDelay } from '@/api/FinancialManagement'
+import { storeCallOutList } from '@/api/storeCallOut'
 import { STable, VSelect } from '@/components'
 import basicInfoModal from './basicInfoModal.vue'
 export default {
@@ -102,51 +102,38 @@ export default {
   data () {
     return {
       advanced: false,  // 高级搜索 展开/关闭
+      createDate: undefined,  //  创建时间
       queryParam: { //  查询条件
-        bundleName: '', //  品牌名称
-        state: undefined,  //  状态
+        putPersonName: undefined, //  调往对象
+        callOutType: undefined, //  调拨类型
+        state: undefined,  //  单据状态
       },
       disabled: false, //  查询、重置按钮是否可操作
       dateFormat: 'YYYY-MM-DD',
       columns: [
-        { title: '创建时间', dataIndex: 'no', width: 70, align: 'center', width: 180 },
-        { title: '店内调出单号', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '调往对象', dataIndex: 'inventoryMoney', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨类型', dataIndex: 'productOldNum', width: 160, 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: '状态', scopedSlots: { customRender: 'status' }, width: 180, align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: 70, align: 'center', width: 180 },
+        { title: '店内调出单号', dataIndex: 'storeCallOutNo', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'putPersonName', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨类型', dataIndex: 'callOutType', width: 160, 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: 'auditTime', 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 storeCallOutList( 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 +147,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.putPersonName = undefined
+      this.queryParam.callOutType = undefined
+      this.queryParam.state = undefined
+      this.createDate = undefined
       this.$refs.table.refresh(true)
     },
     //  基本信息  保存