瀏覽代碼

bug 修复

lilei 2 年之前
父節點
當前提交
61f800e858
共有 3 個文件被更改,包括 61 次插入21 次删除
  1. 1 1
      public/version.json
  2. 58 18
      src/views/numsGoodsShelves/replenishmentManagement/list.vue
  3. 2 2
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1668564291810
+  "version": 1668567448287
 }

+ 58 - 18
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -11,7 +11,17 @@
         </a-tabs>
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
+            <a-col :md="6" :sm="24" v-if="queryParam.bizType=='WAIT_CHECK'">
+              <a-form-item label="出库时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" v-else-if="queryParam.bizType=='FINISH'">
+              <a-form-item label="签收时间">
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" v-else>
               <a-form-item label="创建时间">
                 <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
@@ -147,8 +157,8 @@ export default {
       ],
       // 查询参数
       queryParam: {
-        beginDate: getDate.getCurrMonthDays().starttime,
-        endDate: getDate.getCurrMonthDays().endtime,
+        bDate: getDate.getCurrMonthDays().starttime,
+        eDate: getDate.getCurrMonthDays().endtime,
         bizType: 'ALL',
         replenishBillNo: '',
         shelfSn: undefined,
@@ -156,16 +166,6 @@ export default {
         productName: ''
       },
       expandedRowKeys: [],
-      columns: [
-        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '补货单号', dataIndex: 'replenishBillNo', scopedSlots: { customRender: 'replenishBillNo' }, width: '15%', align: 'center' },
-        { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '状态', dataIndex: 'billStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '补货总量', dataIndex: 'totalQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '签收总量', dataIndex: 'totalPutQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '16%', align: 'left' }
-      ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -173,6 +173,16 @@ export default {
         this.expandedRowKeys = []
         parameter.billState = this.queryParam.bizType == 'ALL' ? '' : this.queryParam.bizType
         const params = Object.assign(parameter, this.queryParam)
+        if (params.billState == 'WAIT_CHECK') {
+          params.outStockTimeBegin = this.queryParam.bDate
+          params.outStockTimeEnd = this.queryParam.eDate
+        } else if (params.billState == 'FINISH') {
+          params.putStockTimeBegin = this.queryParam.bDate
+          params.putStockTimeEnd = this.queryParam.eDate
+        } else {
+          params.beginDate = this.queryParam.bDate
+          params.endDate = this.queryParam.eDate
+        }
         delete params.index
         delete params.tableId
         delete params.bizType
@@ -223,6 +233,26 @@ export default {
       paramsData: null
     }
   },
+  computed: {
+    columns () {
+      const ret = [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '补货单号', dataIndex: 'replenishBillNo', scopedSlots: { customRender: 'replenishBillNo' }, width: '15%', align: 'center' },
+        { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '状态', dataIndex: 'billStateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '补货总量', dataIndex: 'totalQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '签收总量', dataIndex: 'totalPutQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '16%', align: 'left' }
+      ]
+      if (this.queryParam.bizType == 'WAIT_CHECK') {
+        ret.splice(1, 1, { title: '出库时间', dataIndex: 'outStockTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } })
+      } else if (this.queryParam.bizType == 'FINISH') {
+        ret.splice(1, 1, { title: '签收时间', dataIndex: 'putStockTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } })
+      }
+      return ret
+    }
+  },
   methods: {
     // 确认
     handleConfirm (row) {
@@ -397,8 +427,8 @@ export default {
     // 重置数据
     resetData () {
       this.$refs.rangeDate.resetDate(this.time)
-      this.queryParam.beginDate = getDate.getCurrMonthDays().starttime
-      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
+      this.queryParam.bDate = getDate.getCurrMonthDays().starttime
+      this.queryParam.eDate = getDate.getCurrMonthDays().endtime
       this.queryParam.bizType = this.curBizType
       this.queryParam.replenishBillNo = ''
       this.queryParam.shelfSn = undefined
@@ -407,15 +437,15 @@ export default {
     },
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] || null
-      this.queryParam.endDate = date[1] || null
+      this.queryParam.bDate = date[0] || null
+      this.queryParam.eDate = date[1] || null
     },
     // 选择类型
     handleTabChange (key) {
       this.expandedRowKeys = []
       this.queryParam.bizType = key
       this.curBizType = key
-      this.$refs.table.refresh(true)
+      this.resetSearchForm()
     },
     // 客户 change
     custChange (obj) {
@@ -424,6 +454,16 @@ export default {
     // 获取类型
     queryByTypeSum (flag) {
       const params = JSON.parse(JSON.stringify(this.queryParam))
+      if (params.bizType == 'WAIT_CHECK') {
+        params.outStockTimeBegin = this.queryParam.bDate
+        params.outStockTimeEnd = this.queryParam.eDate
+      } else if (params.bizType == 'FINISH') {
+        params.putStockTimeBegin = this.queryParam.bDate
+        params.putStockTimeEnd = this.queryParam.eDate
+      } else {
+        params.beginDate = this.queryParam.bDate
+        params.endDate = this.queryParam.eDate
+      }
       delete params.bizType
       this.spinning = true
       shelfReplenishStateCount(params).then(res => {

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.182:8503/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.115:8503/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,