瀏覽代碼

Merge branch 'develop_szhj' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_szhj

lilei 3 年之前
父節點
當前提交
f2e17ed50c

+ 1 - 1
src/views/numsGoodsShelves/recallManagement/list.vue

@@ -133,7 +133,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调回单号', dataIndex: 'recallBillNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '货架名称', dataIndex: 'shelfInfo.shelfName', width: '25%', align: 'left', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'state', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'billStateDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调回总量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '实退总量', dataIndex: 'totalConfirmQty', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', width: '10%', align: 'left', scopedSlots: { customRender: 'action' } }

+ 4 - 5
src/views/numsGoodsShelves/replenishmentManagement/list.vue

@@ -31,7 +31,7 @@
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <a-button type="info" style="margin-left: 5px" @click="taskIn" :disabled="disabled" >定时任务</a-button>
-                <a-button type="primary" style="margin-left: 5px" @click="$refs.table.refresh(true)" :disabled="disabled" id="replenishmentManagementList-refresh">查询</a-button>
+                <a-button type="primary" style="margin-left: 5px" @click="queryByTypeSum" :disabled="disabled" id="replenishmentManagementList-refresh">查询</a-button>
                 <a-button style="margin-left: 5px" @click="resetSearchForm()" :disabled="disabled" id="replenishmentManagementList-reset">重置</a-button>
                 <a @click="advanced = !advanced" style="margin-left: 5px">
                   {{ advanced ? '收起' : '展开' }}
@@ -45,7 +45,7 @@
       <!-- 标签页 -->
       <a-tabs type="card" v-model="queryParam.bizType" @change="handleTabChange" class="replenishmentManagementList-tabs ">
         <a-tab-pane v-for="item in tabPaneData" :key="item.bizType">
-          <p slot="tab">{{ item.bizName }}<span v-if="(item.countNum || item.countNum==0)&&item.bizName!='全部'">({{ item.countNum }})</span></p>
+          <p slot="tab">{{ item.bizName }}<span v-if="item.countNum && item.bizName!='全部'&&item.bizName!='已完成'&&item.bizName!='已取消'" style="color: red;">({{ item.countNum }})</span></p>
         </a-tab-pane>
       </a-tabs>
       <s-table
@@ -60,7 +60,6 @@
         @expand="expandFun"
         :expandRowByClick="true"
         :scroll="{ y: tableHeight }"
-        :showPagination="false"
         :defaultLoadData="false"
         bordered>
         <a-table
@@ -350,7 +349,7 @@ export default {
     // 重置
     resetSearchForm () {
       this.resetData()
-      this.$refs.table.refresh(true)
+      this.queryByTypeSum()
     },
     // 重置数据
     resetData () {
@@ -402,7 +401,7 @@ export default {
           this.tabPaneData[3].countNum = res.data.WAIT_CHECK || 0
           this.tabPaneData[4].countNum = res.data.FINISH || 0
           this.tabPaneData[5].countNum = res.data.CANCEL || 0
-          this.$refs.table.refresh()
+          this.$refs.table.refresh(true)
         }
       })
     },

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/printStickerModal.vue

@@ -31,7 +31,7 @@
         <!-- 打印数量 -->
         <template slot="printQty" slot-scope="text, record">
           <a-input-number
-            v-if="record.confirmQty!=0"
+            v-if="record.confirmQty&&record.confirmQty!=0"
             size="small"
             id="replenishmentManagement-printSticker-printQty"
             v-model="record.printQty"

+ 1 - 1
src/views/numsGoodsShelves/replenishmentManagement/printView.vue

@@ -35,7 +35,7 @@
           <div style="float: right;">
             <div class="productSno" style="font-size: 15pt;text-align: center;">{{ item.shelfPlaceCode }}</div>
             <div class="qrcode" ref="qrCodeUrl">
-              <vue-qr :text="`dealerSn=${nowData.dealerSn}&shelfSn=${item.shelfSn}&productSn=${item.productSn}&productCode=${item.productCode}&shelfPlaceCode=${item.shelfPlaceCode}&shelfPlaceSn=${item.shelfPlaceSn}&replenishBillDetailSn=${item.replenishBillDetailSn}`" :margin="0" :size="70"></vue-qr>
+              <vue-qr :text="`dealerSn=${nowData.dealerSn}&shelfSn=${item.shelfSn}&productSn=${item.productSn}&productCode=${item.productCode}&shelfPlaceCode=${item.shelfPlaceCode}&shelfPlaceSn=${item.shelfPlaceSn}`" :margin="0" :size="70"></vue-qr>
             </div>
           </div>
         </div>

+ 2 - 2
src/views/numsGoodsShelves/shelfMonitoring/warehouseDetail.vue

@@ -140,8 +140,8 @@ export default {
     },
     //  时间  change
     dateChange (date) {
-      this.queryParam.beginDate = date[0] || null
-      this.queryParam.endDate = date[1] || null
+      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : null
+      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : null
     }
   },
   mounted () {

+ 4 - 4
src/views/numsGoodsShelves/shelfSet/set.vue

@@ -187,7 +187,7 @@ export default {
     },
     // 更换产品
     handleReplace (row) {
-      if (row.qty) {
+      if (row.shelfProductApiEntity.qty) {
         this.openTipsModal = true
       } else {
         this.handleProduct(row, 'replace')
@@ -195,9 +195,9 @@ export default {
     },
     // 更换产品/绑定产品/修改信息
     handleProduct (row, type) {
-      if(row){
-        this.nowData = Object.assign(row, { customerSn: this.basicInfoData&&this.basicInfoData.customerEntity&&this.basicInfoData.customerEntity.customerSn })
-      }else{
+      if (row) {
+        this.nowData = Object.assign(row, { customerSn: this.basicInfoData && this.basicInfoData.customerEntity && this.basicInfoData.customerEntity.customerSn })
+      } else {
         this.nowData = null
       }
       this.modalType = type