浏览代码

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

lilei 2 年之前
父节点
当前提交
f172da8469

+ 8 - 2
src/components/index.less

@@ -367,8 +367,7 @@
 }
 
 
-//表格搜索里需新演示
-
+//表格查询条件样式修改
 .newTableSearchName{
    margin-bottom: 6px;
    .ant-form.ant-form-inline .ant-form-item .ant-input, .ant-form.ant-form-inline .ant-form-item .ant-select-selection{
@@ -385,4 +384,11 @@
        padding-right: 0!important;
      }
    }
+}
+// 数据汇总样式
+.gatherMessage {
+  margin:10px 0;
+  strong{
+    color: #ed1c24;
+  }
 }

+ 32 - 7
src/config/router.config.js

@@ -2247,25 +2247,25 @@ export const asyncRouterMap = [
           },
           {
             path: '/reportData/receivedSendStorageReport',
-            redirect: '/reportData/receivedSendStorageReport/list',
+            redirect: '/reportData/receivedSendStorageReport/index',
             name: 'receivedSendStorageReport',
             component: BlankLayout,
             meta: {
               title: '收发存报表',
               icon: 'profile'
-              // permission: 'M_receivedSendStorageReportList'
+              // permission: 'M_receivedSendStorageReportIndex'
             },
             hideChildrenInMenu: true,
             children: [
               {
-                path: 'list',
-                name: 'receivedSendStorageReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/receivedSendStorageReport/list.vue'),
+                path: 'index',
+                name: 'receivedSendStorageReportIndex',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/receivedSendStorageReport/index.vue'),
                 meta: {
-                  title: '收发存报表列表',
+                  title: '收发存报表',
                   icon: 'profile',
                   hidden: true
-                  // permission: 'M_receivedSendStorageReportList'
+                  // permission: 'M_receivedSendStorageReportIndex'
                 }
               }
             ]
@@ -3320,6 +3320,31 @@ export const asyncRouterMap = [
                 }
               }
             ]
+          },
+          {
+            path: '/setting/erpMessageManagement',
+            redirect: '/setting/erpMessageManagement/list',
+            name: 'erpMessageManagement',
+            component: BlankLayout,
+            meta: {
+              title: 'ERP数据同步记录',
+              icon: 'sketch'
+              // permission: 'M_erpMessageList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'M_erpMessageList',
+                component: () => import(/* webpackChunkName: "setting" */ '@/views/setting/erpMessageManagement/list.vue'),
+                meta: {
+                  title: 'ERP数据同步列表',
+                  icon: 'sketch',
+                  hidden: true
+                  // permission: 'M_erpMessageList'
+                }
+              }
+            ]
           }
         ]
       }

+ 10 - 1
src/views/allocationManagement/transferOut/dsModal.vue

@@ -41,6 +41,14 @@
               常用:<a-button size="small" v-for="i in 5" @click="setSendNo(i)" type="link">{{ i }}</a-button>
             </div>
           </a-form-model-item>
+          <a-form-model-item label="发货说明">
+            <a-input
+              id="dealerAccountEdit-sendGoodsDesc"
+              type="textarea"
+              :maxLength="630"
+              v-model.trim="form.sendGoodsDesc"
+              placeholder="请输入发货说明"/>
+          </a-form-model-item>
           <a-form-model-item label="备货打印" prop="printState">
             <a-radio-group v-model="form.printState">
               <a-radio value="NO_PRINT">
@@ -93,7 +101,8 @@ export default {
         sendNo: '',
         printState: '',
         receiverSn: '',
-        receiverName: ''
+        receiverName: '',
+        sendGoodsDesc: ''
       },
       rules: {
         sendNo: [{ required: true, message: '请输入发货编号', trigger: 'change' }],

+ 4 - 3
src/views/allocationManagement/transferOut/list.vue

@@ -258,7 +258,8 @@ export default {
         { title: '起止时间', scopedSlots: { customRender: 'promoDate' }, align: 'center', width: '6%' },
         { title: '调往对象', dataIndex: 'targetName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户类型', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '发货编号', dataIndex: 'sendNo', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '发货说明', dataIndex: 'sendNo', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总售价', dataIndex: 'totalPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -288,10 +289,10 @@ export default {
       this.$refs.table.refresh(true)
     },
     custChange (val) {
-      if(val.row){
+      if (val.row) {
         this.queryParam.receiverSn = val.row.dealerSn
         this.queryParam.receiverName = undefined
-      }else{
+      } else {
         this.queryParam.receiverSn = undefined
         this.queryParam.receiverName = val.key
       }

+ 111 - 87
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -1,8 +1,8 @@
 <template>
-  <a-card size="small" :bordered="false" class="collectionDetail-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+  <div>
+    <a-card size="small" :bordered="false" class="collectionDetail-wrap">
       <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
+      <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
         <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
@@ -10,48 +10,47 @@
                 <rangeDate ref="rangeAuditDate" :value="auditDate" @change="dateAuditChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="收款单号">
                 <a-input id="collectionDetail-bookNo" v-model.trim="queryParam.bookNo" allowClear placeholder="请输入收款单号"/>
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
+            <a-col :md="6" :sm="24">
               <a-form-item label="申请人">
                 <employee style="width: 100%;" id="collectionDetail-Employee" placeholder="请选择申请人" v-model="queryParam.applyPersonSn"></employee>
               </a-form-item>
             </a-col>
-
             <a-col :md="6" :sm="24">
               <a-form-item label="收款日期">
                 <rangeDate ref="receiptDate" :value="receiptDate" @change="receiptDateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="付款方类型">
-                <v-select
-                  v-model="queryParam.payerType"
-                  code="PAYER_TYPE"
-                  placeholder="请选择付款方类型"
-                ></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="付款方">
-                <a-input id="financialCollectionList-payerName" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="财务编码">
-                <a-input id="collectionDetail-kdMidCustomerFnumber" placeholder="请输入财务编码" v-model="queryParam.kdMidCustomerFnumber"></a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :md="4" :sm="24">
-              <a-form-item label="付款账户">
-                <a-input id="collectionDetail-payerAccountInfo" placeholder="请输入付款账户" v-model="queryParam.payerAccountInfo"></a-input>
-              </a-form-item>
-            </a-col>
             <template v-if="advanced">
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="付款方类型">
+                  <v-select
+                    v-model="queryParam.payerType"
+                    code="PAYER_TYPE"
+                    placeholder="请选择付款方类型"
+                  ></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="付款方">
+                  <a-input id="financialCollectionList-payerName" v-model.trim="queryParam.payerName" allowClear placeholder="请输入付款方"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="财务编码">
+                  <a-input id="collectionDetail-kdMidCustomerFnumber" placeholder="请输入财务编码" v-model="queryParam.kdMidCustomerFnumber"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="付款账户">
+                  <a-input id="collectionDetail-payerAccountInfo" placeholder="请输入付款账户" v-model="queryParam.payerAccountInfo"></a-input>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
                 <a-form-item label="足额打款">
                   <v-select
                     v-model="queryParam.fullPaymentFlag"
@@ -62,7 +61,7 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="3" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="户名/汇入银行">
                   <a-select placeholder="请选择户名" allowClear v-model="queryParam.bankAccount" style="width: 100%" @change="handleChange">
                     <a-select-option v-for="item in bankList" :value="item.bankAccount">
@@ -70,7 +69,7 @@
                     </a-select-option>
                   </a-select>
                 </a-form-item></a-col>
-              <a-col :md="3" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item>
                   <a-select placeholder="请选择汇入银行" allowClear v-model="queryParam.bankName" style="width: 100%">
                     <a-select-option v-for="item in bankNameList" :value="item">
@@ -79,7 +78,7 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="开票状态">
                   <a-select v-model="queryParam.invoiceDateType" style="width: 100%" placeholder="请选择开票状态">
                     <a-select-option value="1">
@@ -96,18 +95,18 @@
                   <rangeDate ref="invoiceDate" :value="invoiceDate" @change="invoiceDateChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="所属区域">
                   <subarea id="collectionDetail-subarea" v-model="queryParam.subareaSn"></subarea>
                 </a-form-item>
               </a-col>
-              <a-col :md="4" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="所属省份">
                   <Area id="collectionDetail-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="24" :sm="24" style="text-align:center;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="collectionDetail-reset">重置</a-button>
               <a-button
@@ -119,62 +118,76 @@
                 :loading="exportLoading"
                 v-if="$hasPermissions('M_FC_Details_Export')"
                 id="sendOut-export">导出</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 5px">
+              <a @click="advanced=!advanced" style="margin-left: 5px;">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
               </a>
             </a-col>
           </a-row>
         </a-form>
-        <a-alert type="info" style="margin-bottom:10px">
-          <div slot="message">
-            订单总金额:{{ toThousands(countData&&countData.orderAmount||0) }};
-            收款总金额:{{ toThousands(countData&&countData.receiptAmount||0) }};
-            使用授信总金额:{{ toThousands(countData&&countData.useCreditAmount||0) }};
-            授信还款总金额:{{ toThousands(countData&&countData.payCreditAmount||0) }};
-            余款抵扣总金额:{{ toThousands(countData&&countData.balanceAmount||0) }};
-            跨月打款总金额:{{ toThousands(countData&&countData.nextMonthAmount||0) }};
-          </div>
-        </a-alert>
       </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        bordered>
-        <!-- 开票日期 -->
-        <template slot="draftDate" slot-scope="text, record">
-          <div @click="handleInvoice(record)">
-            <span v-if="record.invoiceDate" class="link-bule">{{ record.invoiceDate }}</span>
-            <span class="link-bule" v-else>--</span>
-          </div>
-        </template>
-        <!-- 收款打印状态 -->
-        <template slot="printStatus" slot-scope="text, record">
-          <span v-if="record.printStatus=='NO_PRINT' || record.printStatus=='PRINT'">{{ record.printStatusDictValue }}</span>
-          <span @click="handlePrint(record)" class="link-bule" v-else>{{ record.printStatusDictValue }}</span>
-        </template>
-        <!-- 备注 -->
-        <template slot="note" slot-scope="text, record">
-          <div @click="handleNote(record)">
-            <span :title="record.remarks" class="link-bule" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;width:100%;display:block;">{{ record.remarks || '--' }}</span>
-          </div>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 开票日期弹窗 -->
-    <invoiceModal v-drag :show="invoiceIsShow" :info="invoiceInfo" @cancel="cancel"></invoiceModal>
-    <!-- 备注弹窗 -->
-    <noteModal ref="remarksModal" v-drag :show="noteIsShow" @cancel="cancel"></noteModal>
-    <!-- 收款打印状态 -->
-    <printModal v-drag :show="printIsShow" :info="printInfo" @cancel="cancel"></printModal>
-  </a-card>
+    </a-card>
+    <a-card size="small" :bordered="false" class="collectionDetail-wrap" style="margin-top:5px;">
+      <div>
+        <a-dropdown>
+          <a-menu slot="overlay" @click="handleMenuClick">
+            <a-menu-item key="1"> <a-icon type="printer" />批量允许打印 </a-menu-item>
+            <a-menu-item key="2"> <a-icon type="block" />批量设置开票 </a-menu-item>
+          </a-menu>
+          <a-button type="primary" ghost> 批量处理 <a-icon type="down" /></a-button>
+        </a-dropdown>
+        <span style="margin-left:10px;">已选{{ selNums }}项</span>
+      </div>
+      <div class="gatherMessage">
+        订单总金额:<strong> {{ toThousands(countData&&countData.orderAmount||0) }}</strong>;
+        收款总金额:<strong>{{ toThousands(countData&&countData.receiptAmount||0) }}</strong>;
+        使用授信总金额:<strong>{{ toThousands(countData&&countData.useCreditAmount||0) }}</strong>;
+        授信还款总金额:<strong>{{ toThousands(countData&&countData.payCreditAmount||0) }}</strong>;
+        余款抵扣总金额:<strong>{{ toThousands(countData&&countData.balanceAmount||0) }}</strong>;
+        跨月打款总金额:<strong>{{ toThousands(countData&&countData.nextMonthAmount||0) }}</strong>;
+      </div>
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :row-selection="{ columnWidth: 40 }"
+          @rowSelection="rowSelectionFun"
+          :scroll="{ y: tableHeight }"
+          bordered>
+          <!-- 开票日期 -->
+          <template slot="draftDate" slot-scope="text, record">
+            <div @click="handleInvoice(record)">
+              <span v-if="record.invoiceDate" class="link-bule">{{ record.invoiceDate }}</span>
+              <span class="link-bule" v-else>--</span>
+            </div>
+          </template>
+          <!-- 收款打印状态 -->
+          <template slot="printStatus" slot-scope="text, record">
+            <span v-if="record.printStatus=='NO_PRINT' || record.printStatus=='PRINT'">{{ record.printStatusDictValue }}</span>
+            <span @click="handlePrint(record)" class="link-bule" v-else>{{ record.printStatusDictValue }}</span>
+          </template>
+          <!-- 备注 -->
+          <template slot="note" slot-scope="text, record">
+            <div @click="handleNote(record)">
+              <span :title="record.remarks" class="link-bule" style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;width:100%;display:block;">{{ record.remarks || '--' }}</span>
+            </div>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 开票日期弹窗 -->
+      <invoiceModal v-drag :show="invoiceIsShow" :info="invoiceInfo" @cancel="cancel"></invoiceModal>
+      <!-- 备注弹窗 -->
+      <noteModal ref="remarksModal" v-drag :show="noteIsShow" @cancel="cancel"></noteModal>
+      <!-- 收款打印状态 -->
+      <printModal v-drag :show="printIsShow" :info="printInfo" @cancel="cancel"></printModal>
+    </a-card>
+  </div>
 </template>
 
 <script>
@@ -276,11 +289,15 @@ export default {
       ],
       bankNameList: [],
       invoiceInfo: null,
-      printInfo: null
+      printInfo: null,
+      rowSelectionInfo: null
     }
   },
   // 根据权限显示列表字段
   computed: {
+    selNums () {
+      return this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys.length || 0
+    },
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -323,6 +340,13 @@ export default {
         this.countData = res.data
       })
     },
+    handleMenuClick (e) {
+      console.log('click', e)
+    },
+    // 表格选中项
+    rowSelectionFun (obj) {
+      this.rowSelectionInfo = obj || null
+    },
     handleChange (v) {
       if (v) {
         const row = this.bankList.find(item => item.bankAccount == v)

+ 159 - 0
src/views/reportData/receivedSendStorageReport/index.vue

@@ -0,0 +1,159 @@
+<template>
+  <a-card size="small" :bordered="false" class="receivedSendStorageReport-wrap">
+    <div ref="tableSearch" class="table-page-search-wrapper newTableSearchName">
+      <a-form layout="inline">
+        <a-row :gutter="15">
+          <a-col :md="5" :sm="24">
+            <a-form-item label="选择月份">
+              <a-range-picker
+                :placeholder="['开始月份', '结束月份']"
+                format="YYYY-MM"
+                :value="monthVal"
+                :mode="['month','month']"
+                @panelChange="handlePanelChange"
+                @change="handleChange"
+              >
+              </a-range-picker>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="24">
+            <a-form-item label="产品名称">
+              <a-input id="receivedSendStorageReport-name" v-model.trim="queryParam.name" allowClear placeholder="请输入产品名称"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="4" :sm="24">
+            <a-form-item label="产品编码">
+              <a-input id="receivedSendStorageReport-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码"/>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="24">
+            <a-form-item label="产品品牌">
+              <ProductBrand id="receivedSendStorageReport-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :md="5" :sm="24">
+            <a-form-item label="产品分类">
+              <a-cascader
+                @change="changeProductType"
+                expand-trigger="hover"
+                change-on-select
+                :options="productTypeList"
+                :fieldNames="{ label: 'productTypeName', value: 'productTypeSn', children: 'children' }"
+                id="receivedSendStorageReport-productType"
+                placeholder="请选择产品分类"
+                allowClear
+                v-model="productType" />
+            </a-form-item>
+          </a-col>
+          <a-col :md="24" :sm="24" style="margin-bottom: 10px;display:flex;align-item:center;justify-content:center;">
+            <a-button type="primary" @click="searchForm" :disabled="disabled" id="receivedSendStorageReport-refresh">查询</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="receivedSendStorageReport-reset">重置</a-button>
+            <a-button
+              style="margin-left: 5px"
+              type="primary"
+              class="button-warning"
+              @click="handleExport"
+              :disabled="disabled"
+              v-if="$hasPermissions('B_ProductPriceExoprt')"
+              id="productInfoList-export">导出</a-button>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <div :style="{ height: tableHeight+84.5+'px' }">
+      <a-tabs default-active-key="1" @change="tabsCallback">
+        <a-tab-pane key="1" tab="明细">
+          明细
+        </a-tab-pane>
+        <a-tab-pane key="2" tab="汇总" force-render>
+          <gatherList></gatherList>
+        </a-tab-pane>
+      </a-tabs>
+    </div>
+  </a-card>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import ProductBrand from '@/views/common/productBrand.js'
+import { STable, VSelect } from '@/components'
+import { productTypeQueryAll } from '@/api/productType'
+import gatherList from './list'
+export default {
+  name: 'PriceDifferenceDetailReportList',
+  mixins: [commonMixin],
+  components: { STable, VSelect, ProductBrand, gatherList },
+  data () {
+    return {
+      queryParam: {
+        name: '',
+        queryWord: '',
+        productBrandSn: undefined,
+        productTypeSn1: undefined,
+        productTypeSn2: undefined,
+        productTypeSn3: undefined
+      },
+      productType: undefined,
+      productTypeList: [],
+      monthVal: [],
+      disabled: false,
+      tableHeight: 0
+    }
+  },
+  methods: {
+    handlePanelChange (value, mode) {
+      this.monthVal = value
+    },
+    handleChange (value) {
+      this.monthVal = value
+    },
+    //  产品分类  change
+    changeProductType (val, opt) {
+      this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
+      this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
+      this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
+    },
+    //  产品分类  列表
+    getProductType () {
+      productTypeQueryAll({}).then(res => {
+        if (res.status == 200) {
+          this.productTypeList = res.data
+        } else {
+          this.productTypeList = []
+        }
+      })
+    },
+    handleExport () {
+
+    },
+    searchForm () {
+
+    },
+    resetSearchForm () {
+
+    },
+    tabsCallback () {
+
+    },
+    pageInit () {
+      this.getProductType()
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 200
+    }
+  },
+  mounted () {
+    this.pageInit()
+  }
+}
+
+</script>
+
+<style>
+</style>

+ 173 - 2
src/views/reportData/receivedSendStorageReport/list.vue

@@ -1,8 +1,179 @@
 <template>
+  <div class="productInfoList-wrap">
+    <!-- 列表 -->
+    <s-table
+      class="sTable"
+      ref="table"
+      size="small"
+      :rowKey="(record) => record.id"
+      :columns="columns"
+      :data="loadData"
+      :customRow="handleClickRow"
+      :scroll="{ y: 149 }"
+      :defaultLoadData="false"
+      bordered>
+      <template slot="footer">
+        <a-row>
+          <a-col span="2">合计:</a-col>
+          <a-col span="22">
+            <a-row>
+              <a-col span="4">初期结存数量:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? toThousands(totalData.jpLqqAmount) : '--' }}</a-col>
+              <a-col span="4">初期结存单价:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? toThousands(totalData.jpBsxLqqAmount) : '--' }}</a-col>
+              <a-col span="4">初期结存金额:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? toThousands(totalData.gpLqqAmount) : '--' }}</a-col>
+              <a-col span="4">本期收入数量:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? toThousands(totalData.gpLqqAmount) : '--' }}</a-col>
+              <a-col span="4">本期收入单价:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? toThousands(totalData.jpYgpAmount) : '--' }}</a-col>
+              <a-col span="4">本期收入金额:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? toThousands(totalData.jpYgpAmount) : '--' }}</a-col>
+              <a-col span="4">本期发出数量:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? toThousands(totalData.gpYgpAmount) : '--' }}</a-col>
+              <a-col span="4">本期发出单价:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? toThousands(totalData.gpYgpAmount) : '--' }}</a-col>
+              <a-col span="4">本期发出金额:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? toThousands(totalData.jpLbAmount) : '--' }}</a-col>
+              <a-col span="4">本期结存数量:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? toThousands(totalData.jpScpAmount) : '--' }}</a-col>
+              <a-col span="4">本期结存单价:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? toThousands(totalData.gpScpAmount) : '--' }}</a-col>
+              <a-col span="4">本期结存金额:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? toThousands(totalData.tbuAmount) : '--' }}</a-col>
+            </a-row>
+          </a-col>
+        </a-row>
+      </template>
+    </s-table>
+  </div>
 </template>
 
 <script>
+import { commonMixin } from '@/utils/mixin'
+import { queryStockProductPage } from '@/api/stock'
+import ProductType from '@/views/common/productType.js'
+import ProductBrand from '@/views/common/productBrand.js'
+import { STable, VSelect } from '@/components'
+export default {
+  name: 'QueryPart',
+  mixins: [commonMixin],
+  components: { STable, VSelect, ProductBrand, ProductType },
+  props: {
+    newLoading: Boolean
+  },
+  data () {
+    return {
+      advanced: false, // 高级搜索 展开/关闭
+      showSetting: false, // 设置弹框
+      productType: [],
+      buyerSn: '',
+      queryParam: { //  查询条件
+        productCode: '', //  产品编码
+        productName: '', //  产品名称
+        productOrigCode: '', //  原厂编码
+        productBrandSn: undefined, //  产品品牌
+        productTypeSn1: '', //  产品一级分类
+        productTypeSn2: '', //  产品二级分类
+        productTypeSn3: '' //  产品三级分类
+      },
+      columns: [
+        { title: '二级分类', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '三级分类', dataIndex: 'productName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '品牌', dataIndex: 'productBrandName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '期初结存数量', dataIndex: 'currentStockQty', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '期初结存单价', dataIndex: 'productPrice', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '期初结存金额', dataIndex: 'productPrice', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本期收入数量', dataIndex: 'productUnit', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '本期收入单价', dataIndex: 'productPrice', width: '12%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '本期收入金额', dataIndex: 'productPrice', width: '12%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '本期发出数量', dataIndex: 'packQtyV', width: '12%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本期发出单价', dataIndex: 'productPrice', width: '12%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '本期发出金额', dataIndex: 'productPrice', width: '12%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '期末结存数量', dataIndex: 'salesNums', scopedSlots: { customRender: 'nums' }, width: '12%', align: 'center' },
+        { title: '期末结存单价', dataIndex: 'productPrice', width: '12%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') },
+        { title: '期末结存金额', dataIndex: 'productPrice', width: '12%', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') }
+      ],
+      disabled: false, //  查询、重置按钮是否可操作
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.queryParam.dealerSn = this.buyerSn
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, { onlineFalg: '1', pricingState: 'PRICED' })).then(res => {
+          let data
+          if (res.status == 200) {
+            data = res.data
+            data.list = data.list.filter(item => item != null)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].salesNums = 1
+              data.list[i].currentStockQty = data.list[i].currentStockQty || 0
+              const productPackQty = (data.list[i].productPackQty || data.list[i].productPackQty == 0) ? data.list[i].productPackQty : '--'
+              const productUnit = data.list[i].productUnit || '--'
+              const productPackQtyUnit = data.list[i].productPackQtyUnit || '--'
+              data.list[i].packQtyV = productPackQty + productUnit + '/' + productPackQtyUnit
+            }
+            this.disabled = false
+          }
+          return data
+        })
+      }
+    }
+  },
+  methods: {
+    // 双击列表
+    handleClickRow (record) {
+      const _this = this
+      return {
+        on: {
+          dblclick: (event) => {
+            if (!record.productPrice || record.productPrice <= 0) {
+              _this.$message.info('该产品暂时不能添加')
+            } else {
+              event.stopPropagation()
+              _this.$emit('add', record, 0)
+            }
+          }
+        }
+      }
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.productCode = ''
+      this.queryParam.productName = ''
+      this.queryParam.productOrigCode = ''
+      this.queryParam.productBrandSn = undefined
+      this.queryParam.productTypeSn1 = ''
+      this.queryParam.productTypeSn2 = ''
+      this.queryParam.productTypeSn3 = ''
+      this.productType = []
+      this.$refs.table.refresh(true)
+    },
+    pageInit (buyerSn) {
+      this.buyerSn = buyerSn
+      this.resetSearchForm()
+    },
+    // 刷新当前页面
+    resetCurForm () {
+      this.$refs.table.refresh()
+    },
+    // 选择配件
+    handleAdd (row) {
+      this.$emit('add', row, 0)
+    },
+    //  产品分类  change
+    changeProductType (val, opt) {
+      this.queryParam.productTypeSn1 = val[0] ? val[0] : ''
+      this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
+      this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
+    }
+  }
+}
 </script>
-
-<style>
+<style lang="less" scoped>
+  .productInfoList-wrap{
+    .ellipsisCon{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .ellipsisText{
+        width: 100%;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: box;
+        display: -webkit-box;
+        -webkit-line-clamp: 1;
+        -webkit-box-orient: vertical;
+      }
+    }
+  }
 </style>

+ 172 - 0
src/views/setting/erpMessageManagement/list.vue

@@ -0,0 +1,172 @@
+<template>
+  <a-card size="small" :bordered="false" class="rebateSettingsList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="同步时间">
+                <rangeDate ref="rangeDate" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="同步状态">
+                <a-select placeholder="请选择同步状态">
+                  <a-select-option value="1">
+                    同步成功
+                  </a-select-option>
+                  <a-select-option value="2">
+                    同步失败
+                  </a-select-option>
+                </a-select>
+                </a-select@change="handlechange"></a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="rebateSettingsList-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="rebateSettingsList-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
+        bordered>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
+          <a-button
+            size="small"
+            type="link"
+            v-if="$hasPermissions('B_rebateSettings_edit')"
+            class="button-info"
+            @click="handleEdit(record)"
+            id="rebateSettingsList-edit-btn">重新同步</a-button>
+          <span v-else>--</span>
+        </template>
+      </s-table>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import { commonMixin } from '@/utils/mixin'
+import { STable, VSelect } from '@/components'
+import { queryRebatePage } from '@/api/dealerRelation'
+import rangeDate from '@/views/common/rangeDate.vue'
+export default {
+  name: 'RebateSettingsList',
+  mixins: [commonMixin],
+  components: { STable, VSelect, rangeDate },
+  data () {
+    return {
+      spinning: false,
+      tableHeight: 0,
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 16 }
+      },
+      queryParam: {
+        dealerName: '',
+        beginDate: '',
+        endDate: ''
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      columns: [
+        { title: '序号', dataIndex: 'no', width: '3.5%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '同步时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务模块', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务编码', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '同步状态', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '错误信息', dataIndex: 'createDate', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        this.disabled = true
+        this.spinning = true
+        return queryRebatePage(Object.assign(parameter, this.queryParam)).then(res => {
+          let data
+          if (res.status == 200) {
+            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
+          }
+          this.spinning = false
+          return data
+        })
+      },
+      defaultExpandedRowKeys: [], //  树形数据默认展开项
+      openModal: false, //  新增编辑  弹框
+      nowData: null //  当前记录数据
+    }
+  },
+  methods: {
+    //  时间  change
+    dateChange (date) {
+      this.queryParam.beginDate = date[0] ? date[0] : ''
+      this.queryParam.endDate = date[1] ? date[1] : ''
+    },
+    //  重置
+    resetSearchForm () {
+      this.queryParam.dealerName = ''
+      this.$refs.table.refresh(true)
+    },
+    // 编辑
+    handleEdit (row) {
+      this.nowData = row
+      this.openModal = true
+    },
+    //  关闭弹框
+    closeModal () {
+      this.nowData = null
+      this.openModal = false
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 195
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+      this.resetSearchForm()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+      this.resetSearchForm()
+    }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+      this.$refs.table.refresh()
+    }
+  }
+}
+</script>