浏览代码

Merge branch 'develop_yh22' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh22

lilei 1 年之前
父节点
当前提交
15907d369b

+ 8 - 8
src/config/router.config.js

@@ -566,8 +566,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '销售一览表',
-              icon: 'file-protect'
-              // permission: 'M_salesList'
+              icon: 'file-protect',
+              permission: 'M_salesList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -578,8 +578,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '销售一览表',
                   icon: 'file-protect',
-                  hidden: true
-                  // permission: 'M_salesList'
+                  hidden: true,
+                  permission: 'M_salesList'
                 }
               }
             ]
@@ -1667,8 +1667,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '调拨一览表',
-              icon: 'vertical-align-top'
-              // permission: 'M_allocationList'
+              icon: 'vertical-align-top',
+              permission: 'M_allocationList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1679,8 +1679,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '调拨一览表',
                   icon: 'vertical-align-top',
-                  hidden: true
-                  // permission: 'M_allocationList'
+                  hidden: true,
+                  permission: 'M_allocationList'
                 }
               }
             ]

+ 9 - 2
src/views/allocationManagement/allocationList/list.vue

@@ -77,7 +77,7 @@
             </a-col>
           </template>
           <a-col :md="6" :sm="24">
-            <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
+            <a-button type="primary" @click="handleSearch" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
             <a @click="advanced=!advanced" style="margin-left: 5px">
               {{ advanced ? '收起' : '展开' }}
@@ -135,7 +135,7 @@
         <allocationDetailModal v-if="showDetailModal" :outBizSn="bizSn" />
       </commonModal>
       <!-- 发货单详情 -->
-      <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false" @ok="sendSuccess"></detailModal>
+      <detailModal v-drag ref="detailModal" :openModal="showTipModal" @cancel="showTipModal=false"></detailModal>
     </a-spin>
   </a-card>
   </div></template>
@@ -247,6 +247,13 @@ export default {
     }
   },
   methods: {
+    handleSearch () {
+      if (!this.queryParam.beginDate || !this.queryParam.endDate) {
+        this.$message.error('请选择创建时间')
+        return
+      }
+      this.$refs.table.refresh(true)
+    },
     // 调拨详情
     handleDetail (row, typeNum) {
       if (typeNum == 2) {

+ 5 - 5
src/views/salesManagement/salesList/list.vue

@@ -241,20 +241,20 @@ export default {
         { title: '审核时间', dataIndex: 'auditDate', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '下推数量', dataIndex: 'dispatchTotalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '下推金额', dataIndex: 'dispatchTotalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
+        { title: '收款金额', dataIndex: 'dispatchSettledAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
+        { title: '收款时间', dataIndex: 'dispatchSettleTime', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
+
         { title: '备货允许打印时间', dataIndex: 'dispatchAllowPrintTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备货时间', dataIndex: 'dispatchAuditDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '发货编号', dataIndex: 'dispatchSendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货创建时间', dataIndex: 'sendCreateDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-
         { title: '业务状态', dataIndex: 'billStatus', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货状态', dataIndex: 'sendFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款金额', dataIndex: 'dispatchSettledAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
-        { title: '收款时间', dataIndex: 'dispatchSettleTime', width: '130px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货编号', dataIndex: 'dispatchSendNo', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
+
         { title: '托运日期', dataIndex: 'sendDate', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收货人', dataIndex: 'sendCustomerContactName', width: '80px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '物流电话', dataIndex: 'sendTransportTele', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '物流单号', dataIndex: 'sendTransportNo', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },
-
         { title: '总件数', dataIndex: 'sendTotalQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '运费合计', dataIndex: 'totalAmount', width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
         { title: '收货状态', dataIndex: 'sendReceiveFlagDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' } },