Pārlūkot izejas kodu

Finish Hotfix-zh-153

howie 3 gadi atpakaļ
vecāks
revīzija
0b27645632

+ 11 - 1
src/api/supply/implement.js

@@ -16,4 +16,14 @@ export function getDetail(params) {
     method: 'get',
     params
   })
-}
+}
+
+// 获取列表
+export function getTotalList(params) {
+  return request({
+    url: '/retail/exec/list/total',
+    method: 'get',
+    params
+  })
+}
+

+ 12 - 5
src/views/deposit_commerce/deposit_list.vue

@@ -58,6 +58,7 @@
                 <el-date-picker
                   v-model="screenForm.startSubmitTime"
                   class="dateStyle"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="选择日期"
                 />
@@ -68,6 +69,7 @@
                 <el-date-picker
                   v-model="screenForm.endSubmitTime"
                   class="dateStyle"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="选择日期"
                 />
@@ -78,6 +80,7 @@
                 <el-date-picker
                   v-model="screenForm.startConfirmTime"
                   class="dateStyle"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="选择日期"
                 />
@@ -88,6 +91,7 @@
                 <el-date-picker
                   v-model="screenForm.endConfirmTime"
                   class="dateStyle"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="选择日期"
                 />
@@ -95,8 +99,8 @@
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  placeholder="请选择是否退押 " >
-              <el-option  label="默认" :value="null"></el-option>
+              <el-select style="width:100%" v-model="screenForm.isRefundDeposit" clearable  placeholder="请选择是否退押 " >
+
 
                 <el-option v-for="item in refundDepositArr"
                   :key="item.value"
@@ -108,8 +112,7 @@
             </el-col>
    <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态 " prop="examineStatus">
-              <el-select style="width:100%" v-model="screenForm.examineStatus"  placeholder="请选择状态 " >
-              <el-option  label="默认" :value="null"></el-option>
+              <el-select style="width:100%" v-model="screenForm.examineStatus"  clearable  placeholder="请选择状态 " >
 
                 <el-option v-for="item in examineStatusArr"
                   :key="item.value"
@@ -154,6 +157,7 @@
                           <el-date-picker
                   v-model="screenForm.startInstallTime"
                   class="dateStyle"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="选择日期"
                 />
@@ -165,6 +169,7 @@
                   v-model="screenForm.endInstallTime"
                   class="dateStyle"
                   type="datetime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="选择日期"
                 />
 
@@ -575,7 +580,9 @@ export default {
         ...this.screenForm
       }
       params.isRefundDeposit = this.deduction === '已退押' ? true : ''
-
+   if (this.screenForm.isRefundDeposit == true || this.screenForm.isRefundDeposit == false ) {
+      params.isRefundDeposit =this.screenForm.isRefundDeposit
+    }
       getList(params).then((res) => {
         this.dataList = res.data.records
         res.data.records.forEach((item) => {

+ 13 - 5
src/views/deposit_home/deposit_list.vue

@@ -57,6 +57,7 @@
               <el-form-item label="开始申请日期" prop="startSubmitTime">
                 <el-date-picker
                   v-model="screenForm.startSubmitTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -67,6 +68,7 @@
               <el-form-item label="结束申请日期" prop="endSubmitTime">
                 <el-date-picker
                   v-model="screenForm.endSubmitTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -77,6 +79,7 @@
               <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
                   v-model="screenForm.startConfirmTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -87,6 +90,7 @@
               <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
                   v-model="screenForm.endConfirmTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -95,8 +99,8 @@
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  placeholder="请选择是否退押 " >
-              <el-option  label="默认" :value="null"></el-option>
+              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  clearable placeholder="请选择是否退押 " >
+
 
                 <el-option v-for="item in refundDepositArr"
                   :key="item.value"
@@ -108,8 +112,8 @@
             </el-col>
    <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态 " prop="examineStatus">
-              <el-select style="width:100%" v-model="screenForm.examineStatus"  placeholder="请选择状态 " >
-              <el-option  label="默认" :value="null"></el-option>
+              <el-select style="width:100%" v-model="screenForm.examineStatus"  clearable placeholder="请选择状态 " >
+
 
                 <el-option v-for="item in examineStatusArr"
                   :key="item.value"
@@ -153,6 +157,7 @@
                      <el-form-item prop="startInstallTime">
                           <el-date-picker
                   v-model="screenForm.startInstallTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -163,6 +168,7 @@
                     <el-form-item prop="endInstallTime">
                                  <el-date-picker
                   v-model="screenForm.endInstallTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -575,7 +581,9 @@ export default {
         ...this.screenForm
       }
       params.isRefundDeposit = this.deduction === '已退押' ? true : ''
-
+    if (this.screenForm.isRefundDeposit == true || this.screenForm.isRefundDeposit == false ) {
+      params.isRefundDeposit =this.screenForm.isRefundDeposit
+    }
       getList(params).then((res) => {
         this.dataList = res.data.records
         res.data.records.forEach((item) => {

+ 11 - 7
src/views/finance/standbook_list.vue

@@ -57,8 +57,12 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="18">
+        <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编码" prop="customerNumber">
+              <el-input v-model="searchForm.customerNumber" placeholder="请输入经销商编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12">
             <el-form-item label="" class="fr">
               <el-button size="mini" @click="resetFn">清空</el-button>
               <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
@@ -338,6 +342,7 @@ export default {
         billNo: "",
         startTime: "",
         endTime: "",
+        customerNumber:''
       }, //搜索表单
       listLoading: false, // 列表加载loading
 
@@ -831,18 +836,17 @@ export default {
       if (this.$route.query.customerName && this.$route.query.customerNumber) {
         this.getDataList({
           ...this.searchForm,
-
           pageSize: this.pageSize,
           pageNum: this.currentPage,
           type: this.bill,
           customerName: this.$route.query.customerName,
-          customerNumber: this.$route.query.customerNumber,
+          customerNumber: this.$route.query.customerNumber || this.searchForm.customerNumber,
         });
         this.getAmountList({
           ...this.searchForm,
           type: this.bill,
           customerName: this.$route.query.customerName,
-          customerNumber: this.$route.query.customerNumber,
+          customerNumber: this.$route.query.customerNumber  ,
         });
       } else if (this.isCustomer) {
         this.getDataList({
@@ -861,7 +865,7 @@ export default {
         this.getDataList({
           ...this.searchForm,
           customerName: this.customerName,
-          customerNumber: this.customerNumber,
+          customerNumber: this.customerNumber  || this.searchForm.customerNumber,
 
           pageSize: this.pageSize,
           pageNum: this.currentPage,
@@ -871,7 +875,7 @@ export default {
           ...this.searchForm,
           type: this.bill,
           customerName: this.customerName,
-          customerNumber: this.customerNumber,
+          customerNumber: this.customerNumber  ,
         });
       }
     },

+ 2 - 1
src/views/supply/apply/components/apply_form.vue

@@ -44,7 +44,7 @@
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="备注" prop="headerRemark">
-            <el-input v-model="mainForm.headerheaderRemark" placeholder="请输入备注"></el-input>
+            <el-input v-model="mainForm.headerRemark" placeholder="请输入备注"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="8" :lg="8">
@@ -280,6 +280,7 @@ export default {
         this.mainForm.jxsName = data.customerName;
         this.mainForm.createMan = data.createBy;
         this.mainForm.headerRemark = data.headerRemark;
+         this.mainForm.remark = data.remark;
         this.screenForm.warehouse = data.correspondId;
         this.fileList = data.fileUrl ? [{
           url: data.fileUrl,

+ 0 - 1
src/views/supply/apply/components/engin_form.vue

@@ -726,7 +726,6 @@ export default {
           let correspondName = this.warehouseList[findElem(this.warehouseList, 'id', this.screenForm.warehouse)].name;
           let params = {
             // orderTime: this.mainForm.orderDate + ' 00:00:00',
-            remark: this.mainForm.remark,
             enginOrderNo: this.mainForm.loginNum,
             refProjectName: this.mainForm.refProjectName,
             refTradeCategory:this.mainForm.refTradeCategory,

+ 4 - 0
src/views/supply/implement/implement_list.vue

@@ -162,6 +162,10 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+
+             <el-table-column align="left" label="直调状态" prop="directTransferStatusName" min-width="100" show-overflow-tooltip>
+             </el-table-column>
+
             <el-table-column align="left" label="钱包" prop="walletName" min-width="250" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>

+ 385 - 0
src/views/supply/implement/implement_total_list.vue

@@ -0,0 +1,385 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!-- 筛选条件 -->
+      <div class="screen-container">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+          <el-row :gutter="20">
+            <!-- <el-col :xs="24" :sm="24" :lg="24">
+              <el-form-item prop="status" label-width="0">
+                <el-radio-group v-model="screenForm.status" @change="getList()">
+                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
+                </el-radio-group>
+              </el-form-item>
+            </el-col> -->
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品编码" prop="goodsCode">
+                <el-input v-model="screenForm.goodsCode" placeholder="请输入产品编码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="销售订单" prop="saleNum">
+                <el-input v-model="screenForm.saleNum" placeholder="请输入销售订单"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="经销商" prop="dealer">
+                <el-input v-model="screenForm.dealer" placeholder="请输入经销商"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品名称" prop="goodsName">
+                <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="规格型号" prop="model">
+                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="项目名称" prop="enginName">
+                <el-input v-model="screenForm.enginName" placeholder="请输入项目名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="工程登录编号" prop="loginNum">
+                <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+              </el-form-item>
+            </el-col>
+               <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="存货类别" prop="k3CategoryNumber">
+                 <el-select v-model="screenForm.k3CategoryNumber" filterable  placeholder="请选择">
+                    <el-option
+                      v-for="item in categoryList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+              </el-form-item>
+              <!-- categoryList -->
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="下单日期" prop="date">
+                <el-date-picker
+                  v-model="screenForm.date"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%;"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表头业务员" prop="serviceName ">
+                <el-input v-model="screenForm.serviceName " placeholder="请输入表头业务员"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表体业务员" prop="itemServiceName">
+                <el-input v-model="screenForm.itemServiceName" placeholder="请输入表体业务员"></el-input>
+              </el-form-item>
+            </el-col>
+    <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="归属业务员" prop="newServiceName">
+                <el-input v-model="screenForm.newServiceName" placeholder="请输入归属业务员"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="tr">
+              <el-form-item label="">
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+
+      <div class="mymain-container">
+        <div class="btn-group clearfix">
+          <div class="fr">
+            <ExportButton :exUrl="'/retail/exec/listTotalExport'" :exParams="exParams" />
+          </div>
+        </div>
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            show-summary
+            :summary-method="$getSummaries">
+            <el-table-column align="left" label="下单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="受订日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="销售订单" prop="id" min-width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.id" />
+                <span>{{scope.row.id}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerNumber" />
+                <span>{{scope.row.customerNumber}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerName" />
+                <span>{{scope.row.customerName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialCode" />
+                <span>{{scope.row.materialCode}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <span>{{scope.row.materialOldNumber}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.specification}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="直调状态" prop="directTransferStatusName" min-width="100" show-overflow-tooltip>
+             </el-table-column>
+            <el-table-column align="left" label="钱包" prop="walletName" min-width="250" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="退订数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="退货数量" prop="refundProductQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.payAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="订单返利金额" prop="payRebateAmount" min-width="110" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.payRebateAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="发货金额" prop="hasSendAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.hasSendAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="退订金额" prop="retiredAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.retiredAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="退货金额" prop="refundProductAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.refundProductAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+           <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="归属业务员" prop="newServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div class="pagination clearfix">
+        <div class="fr">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal">
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { getTotalList  } from '@/api/supply/implement'
+import { getCategoryList } from '@/api/common'
+
+let that
+export default {
+  filters: {
+    statusFilter(val) {
+      let obj = that.statusList.find(o => o.value == val);
+      return obj ? obj.label : ''
+    }
+  },
+  data() {
+    return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+      dataList: null, // 列表数据
+      listLoading: false, // 列表加载loading
+      screenForm: { // 筛选表单数据
+        status: '2',
+        goodsCode: '',
+        saleNum: '',
+        dealer: '',
+        goodsName: '',
+        model: '',
+        date: '',
+        serviceName : '',
+        itemServiceName:'',
+        newServiceName: '',
+        enginName: '',
+        loginNum: '',
+        k3CategoryNumber:''
+      },
+      categoryList:[],
+      statusList: [
+        { label: '政策零售订单', value: '2' },
+        { label: '零售订单', value: '1' },
+        { label: '家用工程订单', value: 'HOME' },
+        { label: '商用工程订单', value: 'TRADE' },
+      ],
+    }
+  },
+
+  computed: {
+    exParams() {
+      return {
+        type: this.screenForm.status,
+        materialOldNumber: this.screenForm.goodsCode,
+        id: this.screenForm.saleNum,
+        customerName: this.screenForm.dealer,
+        materialName: this.screenForm.goodsName,
+        specification: this.screenForm.model,
+        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
+        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        serviceName: this.screenForm.serviceName ,
+        newServiceName: this.screenForm.newServiceName,
+          itemServiceName:this.screenForm.itemServiceName,
+        projectName: this.screenForm.enginName,
+        enginRecordNo: this.screenForm.orderNum,
+        k3CategoryNumber:this.screenForm.k3CategoryNumber
+      }
+    },
+  },
+
+  beforeCreate() {
+    that = this;
+  },
+
+  created() {
+    this.getList();
+    this.getCategoryList()
+  },
+
+  methods: {
+    // 查询按钮权限
+    checkBtnRole(value) {
+      // let btnRole = this.$route.meta.roles;
+      // if(!btnRole) {return true}
+      // let index = btnRole.indexOf(value);
+      // return index >= 0;
+      return true
+    },
+
+    // 查询列表
+    getList() {
+      this.listLoading = true;
+
+      let params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        type: this.screenForm.status,
+        materialOldNumber: this.screenForm.goodsCode,
+        id: this.screenForm.saleNum,
+        customerName: this.screenForm.dealer,
+        materialName: this.screenForm.goodsName,
+        specification: this.screenForm.model,
+        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
+        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        serviceName: this.screenForm.serviceName ,
+        newServiceName: this.screenForm.newServiceName,
+            itemServiceName:this.screenForm.itemServiceName,
+        projectName: this.screenForm.enginName,
+        enginRecordNo: this.screenForm.orderNum,
+        k3CategoryNumber:this.screenForm.k3CategoryNumber
+      };
+      getTotalList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.sums1 = ['refundableQty', 'qty', 'retiredQty', 'hasSendQty', 'directTransferQty', 'refundProductQty'];
+          item.sums2 = ['payAmount', 'payRebateAmount', 'hasSendAmount', 'retiredAmount', 'refundProductAmount'];
+        })
+        this.dataList = res.data.records;
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+      })
+    },
+    // 获取存货类别列表
+  getCategoryList(){
+    getCategoryList({
+      pageNum:1,
+      pageSize:-1,
+      keyword:''
+    }).then(res=>{
+
+      this.categoryList =   res.data.records
+    })
+  },
+    // 提交筛选表单
+    submitScreenForm() {
+      this.currentPage = 1;
+      this.getList();
+    },
+
+    // 重置筛选表单
+    resetScreenForm() {
+      this.$refs.screenForm.resetFields();
+      this.currentPage = 1;
+      this.getList();
+    },
+
+    // 更改每页数量
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.getList();
+    },
+
+    // 更改当前页
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getList();
+    },
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>