Browse Source

调回管理

lilei 3 years ago
parent
commit
afcf591dc2

+ 4 - 2
src/config/router.config.js

@@ -152,7 +152,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '待结算明细',
                   icon: 'monitor',
-                  hidden: true
+                  hidden: true,
+                  replaceTab: true,
                   // permission: 'M_salesQueryList'
                 }
               },
@@ -163,7 +164,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '结算历史',
                   icon: 'monitor',
-                  hidden: true
+                  hidden: true,
+                  replaceTab: true,
                   // permission: 'M_salesQueryList'
                 }
               }

+ 32 - 44
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -11,17 +11,13 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="调单号">
-                <a-input allowClear placeholder="请输入调单号" v-model.tirm="queryParam.recallBillNo"/>
+              <a-form-item label="调单号">
+                <a-input allowClear placeholder="请输入调单号" v-model.tirm="queryParam.recallBillNo"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="货架名称">
-                <a-select placeholder="请搜索货架名称" allowClear style="width: 100%;" v-model="queryParam.shelfSn">
-                  <a-select-option v-for="item in goodsShelveList" >
-                    {{ }}
-                  </a-select-option>
-                </a-select>
+                <shelfList @change="shelfChange"></shelfList>
               </a-form-item>
             </a-col>
             <template v-if="advanced">
@@ -36,7 +32,7 @@
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="padding-top: 4px;">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="outboundOrderList-refresh" >查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="outboundOrderList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px" v-if="activeKey==0">
@@ -47,7 +43,7 @@
           </a-row>
         </a-form>
       </div>
-      <a-tabs v-model="activeKey" type="card" size="small" @change="callback">
+      <a-tabs v-model="activeKey" type="card" size="small" @change="tabChange">
         <a-tab-pane :key="0" tab="全部">
         </a-tab-pane>
         <a-tab-pane :key="1">
@@ -61,14 +57,6 @@
         <a-tab-pane :key="3" tab="已取消">
         </a-tab-pane>
       </a-tabs>
-      <!-- <a-tabs v-model="activeKey" type="card" @change="callback" size="small">
-        <a-tab-pane :key="item.code" :tab="item.name" v-for="item in tabsList">
-          <span slot="tab">
-            <a-badge count="5" :offset="[0,-20]"/>
-          </span>
-        </a-tab-pane>
-      </a-tabs> -->
-
       <s-table
         class="sTable fixPagination"
         ref="table"
@@ -88,13 +76,13 @@
             size="small"
             type="link"
             class="button-primary"
-            @click="handleEdit(record)"
+            @click.stop="handleEdit(record)"
             id="shelfMonitoringList-warehousing-btn">退库</a-button>
           <a-button
             size="small"
             type="link"
             class="button-primary"
-            @click="handleCancel(record)"
+            @click.stop="handleCancel(record)"
             id="shelfMonitoringList-warehousing-btn">取消调回单</a-button>
         </template>
         <a-table
@@ -110,8 +98,8 @@
         </a-table>
       </s-table>
     </a-spin>
-    <!-- 申请提现 -->
-    <confirmModal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="$refs.table.refresh(true)"></confirmModal>
+    <!-- 退库 -->
+    <recallModal :isOpenModal="showModal" :currentData="currentData" @close="showModal=false" @refresh="$refs.table.refresh(true)"></recallModal>
   </a-card>
 </template>
 
@@ -120,11 +108,13 @@ import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { STable } from '@/components'
-import confirmModal from './confirmModal.vue'
+import recallModal from './recallModal.vue'
 import getDate from '@/libs/getDate.js'
+import shelfList from '@/views/common/shelfList.vue'
 import { shelfRecallList, shelfRecallDetailList, shelfRecallCancel } from '@/api/shelfRecall.js'
 export default {
-  components: { STable, confirmModal, rangeDate, commonMixin },
+  components: { STable, recallModal, rangeDate, shelfList },
+  mixins: [commonMixin],
   data () {
     return {
       spinning: false,
@@ -139,7 +129,6 @@ export default {
         getDate.getCurrMonthDays().starttime,
         getDate.getCurrMonthDays().endtime
       ],
-      goodsShelveList: [], // 货架数据
       queryParam: {
         beginDate: getDate.getCurrMonthDays().starttime, // 开始时间
         endDate: getDate.getCurrMonthDays().endtime, // 结束时间
@@ -150,37 +139,27 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center' },
         { title: '调回单号', dataIndex: 'recallBillNo', width: '20%', align: 'center' },
-        { title: '货架名称', dataIndex: 'remarks', width: '20%', align: 'left', scopedSlots: { customRender: 'remarks' } },
+        { title: '货架名称', dataIndex: 'remarks', width: '25%', align: 'left', scopedSlots: { customRender: 'remarks' } },
         { title: '状态', dataIndex: 'state', width: '7%', align: 'center' },
         { title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center' },
         { title: '实退总量', dataIndex: 'totalConfirmQty', width: '9%', align: 'center' },
-        { title: '操作', width: '15%', align: 'left', scopedSlots: { customRender: 'action' } }
+        { title: '操作', width: '10%', align: 'left', scopedSlots: { customRender: 'action' } }
       ],
       innerColumns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '产品编码', dataIndex: 'createDate', width: '20%', align: 'center' },
-        { title: '产品名称', dataIndex: 'createDate', width: '30%', align: 'left' },
-        { title: '调回数量', dataIndex: 'createDate', width: '15%', align: 'center' },
-        { title: '实退数量', dataIndex: 'createDate', width: '15%', align: 'center' },
-        { title: '单位', dataIndex: 'createDate', width: '15%', align: 'center' }
+        { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center' },
+        { title: '产品名称', dataIndex: 'productName', width: '30%', align: 'left' },
+        { title: '调回数量', dataIndex: 'qty', width: '15%', align: 'center' },
+        { title: '实退数量', dataIndex: 'confirmQty', width: '15%', align: 'center' },
+        { title: '单位', dataIndex: 'unit', width: '15%', align: 'center' }
       ],
       innerData: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        // return new Promise(function (resolve, reject) {
-        //   const data = {
-        //     list: [{ id: 1, createDate: '2020-08-09' }]
-        //   }
-        //   for (var i = 0; i < data.list.length; i++) {
-        //     data.list[i].no = i + 1
-        //   }
-        //   // this.spinning = false
-        //   // this.disabled = false
-        //   resolve(data)
-        // })
         return shelfRecallList(Object.assign(parameter, this.queryParam)).then(res => {
+          console.log(res, '========')
           let data
           if (res.status == 200) {
             data = res.data
@@ -197,6 +176,10 @@ export default {
     }
   },
   methods: {
+    // 选择货架
+    shelfChange (data) {
+
+    },
     // 时间改变
     dateChange (date) {
       this.queryParam.beginDate = date[0]
@@ -207,7 +190,7 @@ export default {
       return current && current > moment().endOf('day')
     },
     // 切换tab
-    callback (key) {
+    tabChange (key) {
       console.log(key)
       this.activeKey = key
       this.queryParam.billState = key
@@ -225,7 +208,11 @@ export default {
       this.spinning = true
       shelfRecallDetailList({ shelfSn: record.shelfSn }).then(res => {
         if (res.status == 200) {
-          this.innerData = res.data
+          this.innerData = res.data.data
+          const no = 0
+          for (var i = 0; i < this.innerData.length; i++) {
+            this.innerData[i].no = no + i + 1
+          }
         } else {
           this.innerData = []
         }
@@ -241,6 +228,7 @@ export default {
         recallBillNo: '', // 调回单号
         shelfSn: '' // 数字货架sn
       }
+      this.$refs.table.refresh(true)
     },
     // 申请提现
     handleTX () {

+ 5 - 3
src/views/numsGoodsShelves/recallManagement/confirmModal.vue → src/views/numsGoodsShelves/recallManagement/recallModal.vue

@@ -10,8 +10,8 @@
     @cancel="cancel"
   >
     <a-spin :spinning="spinning" tip="Loading...">
-      <a-descriptions>
-        <a-descriptions-item label="调回单号">{{ currentData.createDate||'--' }}</a-descriptions-item>
+      <a-descriptions v-if="currentData">
+        <a-descriptions-item label="调回单号">{{ currentData.recallBillNo||'--' }}</a-descriptions-item>
         <a-descriptions-item label="创建时间">{{ currentData.createDate||'--' }}</a-descriptions-item>
       </a-descriptions>
       <s-table
@@ -33,7 +33,7 @@
             :min="0"
             :max="record.dhNum"
             placeholder="请输入"
-            @change="onChange" />
+          />
         </template>
       </s-table>
       <div class="btn-cont">
@@ -45,9 +45,11 @@
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 export default {
   components: { STable },
+  mixins: [commonMixin],
   props: {
     isOpenModal: {
       type: Boolean,