浏览代码

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

chenrui 1 年之前
父节点
当前提交
c0f00a7f4b

+ 10 - 41
src/api/reportData.js

@@ -1005,12 +1005,12 @@ export const getWarrantyInfo = (params) => {
   })
 }
 /*
-*   轮胎销售统计报表
+*   轮胎统计报表
 */
 
-// 轮胎销售报表(经销商)   列表
-export const querybyDealerList = (params) => {
-  const url = `/report/tracecode/querySaleDealerPage/${params.pageNo}/${params.pageSize}`
+// 轮胎统计报表   列表
+export const queryTireList = (params) => {
+  const url = `/report/tire/queryTirePage/${params.pageNo}/${params.pageSize}`
   delete params.pageNo
   delete params.pageSize
   return axios({
@@ -1020,49 +1020,18 @@ export const querybyDealerList = (params) => {
   })
 }
 
-// 轮胎销售报表(经销商)  统计
-export const querySaleDealercount = (params) => {
-  const url = '/report/tracecode/querySaleDealercount'
+// 轮胎统计报表  统计
+export const queryTireCount = (params) => {
   return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-// 轮胎销售报表(经销商)  导出
-export const excelSaleOnlineExport = (params) => {
-  return axios({
-    url: '/report/tracecode/excelSaleOnlineList',
-    data: params,
-    method: 'post',
-    responseType: 'blob'
-  })
-}
-
-// 轮胎销售报表(区域/分区)  列表
-export const querySaleAreaPage = (params) => {
-  const url = `/report/tracecode/querySaleAreaPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
-  return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-// 轮胎销售报表(区域/分区)  统计
-export const querySaleAreaCount = (params) => {
-  const url = '/report/tracecode/querySaleAreaCount'
-  return axios({
-    url: url,
+    url: '/report/tire/queryTireCount',
     data: params,
     method: 'post'
   })
 }
-// 轮胎销售报表(区域/分区)  导出
-export const excelSaleAreaOnlineExport = (params) => {
+// 轮胎统计报表  导出
+export const excelTireOnlineExport = (params) => {
   return axios({
-    url: '/report/tracecode/excelSaleAreaOnlineList',
+    url: '/report/tire/excelTireOnlineList',
     data: params,
     method: 'post',
     responseType: 'blob'

二进制
src/assets/img/finishImg.png


二进制
src/assets/img/ongoing.png


二进制
src/assets/img/outOfDateImg.png


+ 1 - 8
src/views/expenseManagement/expenseReimbursement/epenseCdfModal.vue

@@ -48,12 +48,6 @@
                 enableFlag="1"
                 v-model="record.splitObjSn"
                 placeholder="请选择(输入名称搜索)"></supplier>
-              <!-- 其它往来 -->
-              <otherTransactions 
-              style="width: 100%;"
-              v-show="record.splitObjType=='OTHER_ORG'" 
-              v-model="record.splitObjSn" 
-              placeholder="请选择(输入名称搜索)"></otherTransactions>
               <span v-if="!record.splitObjType">--</span>
             </template>
             <!-- 费用承担金额 -->
@@ -137,9 +131,8 @@ import department from './department.js'
 import employee from './employee.js'
 import custList from '@/views/common/custList.vue'
 import supplier from '@/views/common/supplier.js'
-import otherTransactions from '@/views/common/otherTransactions.js'
 export default {
-  components: { VSelect, department, employee, custList, supplier, otherTransactions },
+  components: { VSelect, department, employee, custList, supplier },
   name: 'EpenseCdfModal',
   props: {
     list: { //  弹框显示状态

+ 1 - 4
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -38,8 +38,6 @@
                   <custList v-show="form.accountType=='CUSTOMER'" cooperateFlag="1" ref="custList" @change="accountNameSnChange" placeholder="请选择记账名称(输入名称搜索)"></custList>
                   <!-- 供应商 -->
                   <supplier v-show="form.accountType=='OUT_ACCOUNT'" enableFlag="1" @change="accountNameSnChange" v-model="form.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></supplier>
-                  <!-- 其它往来 -->
-                  <otherTransactions v-show="form.accountType=='OTHER_ACCOUNT'" @change="accountNameSnChange" v-model="form.accountNameSn" placeholder="请选择记账名称(输入名称搜索)"></otherTransactions>
                   <span v-if="!form.accountType">
                     <a-select style="width: 100%" placeholder="请选择记账名称">
                       <a-select-option value="" :disabled="true">
@@ -120,12 +118,11 @@ import subarea from '@/views/common/subarea.js'
 import Area from '@/views/common/area.js'
 import custList from '@/views/common/custList.vue'
 import supplier from '@/views/common/supplier.js'
-import otherTransactions from '@/views/common/otherTransactions.js'
 import department from './department.js'
 import { expenseAcctDetailSave, expenseAcctDetailFindBySn } from '@/api/expenseManagement.js'
 export default {
   name: 'EpenseDetailModal',
-  components: { VSelect, subarea, Area, epenseCdfModal, custList, supplier, department, otherTransactions },
+  components: { VSelect, subarea, Area, epenseCdfModal, custList, supplier, department },
   props: {
     openModal: { //  弹框显示状态
       type: Boolean,

+ 7 - 2
src/views/productManagement/productSourcePath/warrantyInfoModal.vue

@@ -47,8 +47,13 @@
               align="middle"
               @click="viewLargeImg"/>
             <div style="text-align:right;">
-              <img v-if="detailsData.state ==='END'" src="@/assets/img/finishImg.png" alt="" width="50" height="50">
-              <img v-if="detailsData.state ==='RUN'" src="@/assets/img/ongoing.png" alt="" width="50" height="50">
+              <img
+                v-if="detailsData.state ==='END'"
+                src="@/assets/img/outOfDateImg.png"
+                alt=""
+                width="50"
+                height="50" />
+              <img v-if="detailsData.state ==='RUN'" src="@/assets/img/ongoing.png" alt="" width="50" height="50" />
             </div>
           </div>
         </div>

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -623,4 +623,4 @@ export default {
     }
   }
 
-</style>
+</style>

+ 54 - 35
src/views/reportData/tireSalesReport/list.vue

@@ -25,10 +25,21 @@
                 <subarea id="tireSalesDealerList-subarea" ref="subarea" @change="subareaChange"></subarea>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-model-item label="客户名称">
+                <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesDealerList-dealerName" @change="custChange" />
+              </a-form-model-item>
+            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="客户名称">
-                  <dealerSubareaScopeList ref="dealerSubareaScopeList" id="tireSalesDealerList-dealerName" @change="custChange" />
+                <a-form-model-item label="客户级别">
+                  <v-select
+                    v-model="queryParam.dealerLevel"
+                    ref="dealerLevel"
+                    id="tireSalesDealerList-dealerLevel"
+                    code="DEALER_LEVEL"
+                    placeholder="请选择客户级别"
+                    allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -38,7 +49,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品编码/原厂编码">
-                  <a-input id="tireSalesDealerList-queryWord" v-model.trim="queryParam.queryWord" allowClear placeholder="请输入产品编码/原厂编码"/>
+                  <a-input id="tireSalesDealerList-productWord" v-model.trim="queryParam.productWord" allowClear placeholder="请输入产品编码/原厂编码"/>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -47,7 +58,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="text-align:center;margin-bottom:10px;">
               <a-button
                 style="margin-left: 5px"
                 type="primary"
@@ -59,7 +70,6 @@
                 @click="resetSearchForm"
                 :disabled="disabled"
                 id="tireSalesDealerList-reset">重置</a-button>
-              <!-- v-if="$hasPermissions('B_tireSalesReportExport')" -->
               <a-button
                 style="margin-left: 10px"
                 type="primary"
@@ -67,7 +77,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-
+                v-if="$hasPermissions('B_tireSalesReportExport')"
                 id="tireSalesDealerList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
@@ -99,8 +109,8 @@
           <template slot="footer">
             <a-row :gutter="15">
               <a-col :md="4" :sm="24">订货数量:{{ (totalData && (totalData.totalbuyAmount || totalData.totalbuyAmount==0)) ? totalData.totalbuyAmount : '--' }}</a-col>
-              <a-col :md="4" :sm="24">订货金额:{{ (totalData && (totalData.totalstoreAmount || totalData.totalstoreAmount==0)) ? toThousands(totalData.totalstoreAmount): '--' }}</a-col>
-              <a-col :md="4" :sm="24">库存数量:{{ (totalData && (totalData.totalsellAmount || totalData.totalsellAmount==0)) ?totalData.totalsellAmount: '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_tireSalesReportList_salesPrice')">订货金额:{{ (totalData && (totalData.totalbuyPriceAmount || totalData.totalbuyPriceAmount==0)) ? toThousands(totalData.totalbuyPriceAmount): '--' }}</a-col>
+              <a-col :md="4" :sm="24">客户现有库存数量:{{ (totalData && (totalData.totalstoreAmount || totalData.totalstoreAmount==0)) ?totalData.totalstoreAmount: '--' }}</a-col>
               <a-col :md="4" :sm="24">已绑质保单数量:{{ (totalData && (totalData.totalwarrantyAmount || totalData.totalwarrantyAmount==0)) ?totalData.totalwarrantyAmount: '--' }}</a-col>
             </a-row>
           </template>
@@ -122,14 +132,13 @@ import AreaList from '@/views/common/areaList.js'
 import BizUser from '@/views/common/bizUser.js'
 import reportModal from '@/views/common/reportModal.vue'
 import { hdExportExcel } from '@/libs/exportExcel'
-import { queryTireList, queryTireCount, celTireOnlineExport } from '@/api/reportData'
+import { queryTireList, queryTireCount, excelTireOnlineExport } from '@/api/reportData'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 export default {
   name: 'TireSalesDealerList',
   mixins: [commonMixin],
   components: { STable, VSelect, rangeDate, subarea, AreaList, BizUser, dealerSubareaScopeList, reportModal },
   data () {
-    const _this = this
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
@@ -149,8 +158,9 @@ export default {
         subareaSn: undefined,
         subareaAreaSn: undefined,
         bizUserSn: undefined,
-        queryWord: '', // 产品编码
-        productName: ''// 产品名称
+        productWord: '', // 产品编码/原厂编码
+        productName: '', // 产品名称
+        dealerLevel: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -175,24 +185,7 @@ export default {
           return data
         })
       },
-      totalData: null,
-      columns: [
-        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '12%', align: 'center' },
-        { title: '区域', dataIndex: 'subareaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '分区', dataIndex: 'subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '区域负责人', dataIndex: 'userNameQyfzrs', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户名称', dataIndex: 'dealerName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户类型', dataIndex: 'dealerTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品编码', dataIndex: 'productcode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'storeAmount', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productname', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '订货数量', dataIndex: 'storeAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '订货金额', dataIndex: 'storeAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '客户现有库存数量', dataIndex: 'sellAmount', width: '11%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已绑质保单数量', dataIndex: 'warrantyAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
-      ]
+      totalData: null
     }
   },
   watch: {
@@ -206,6 +199,30 @@ export default {
       this.setTableH()
     }
   },
+  computed: {
+    columns () {
+      const _this = this
+      const arr = [
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '地区', scopedSlots: { customRender: 'addressInfo' }, width: '12%', align: 'center' },
+        { title: '区域', dataIndex: 'subareaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '分区', dataIndex: 'subareaAreaName', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '区域负责人', dataIndex: 'userNameQyfzrs', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOrgiCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '订货数量', dataIndex: 'buyAmount', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: <div>客户现有<div>库存数量</div></div>, dataIndex: 'storeAmount', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: <div>已绑质保单<div>数量</div></div>, dataIndex: 'warrantyAmount', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+      ]
+      if (this.$hasPermissions('M_tireSalesReportList_salesPrice')) {
+        arr.splice(11, 0, { title: '订货金额', dataIndex: 'buyPriceAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      return arr
+    }
+  },
   methods: {
     custChange (val) {
       this.queryParam.dealerName = val.name
@@ -258,8 +275,9 @@ export default {
       this.queryParam.subareaSn = undefined
       this.queryParam.subareaAreaSn = undefined
       this.queryParam.bizUserSn = undefined
-      this.queryParam.queryWord = undefined
+      this.queryParam.productWord = undefined
       this.queryParam.productName = undefined
+      this.queryParam.dealerLevel = undefined
       this.totalData = null
       this.$refs.areaList.clearData()
       if (this.advanced) {
@@ -275,10 +293,11 @@ export default {
       _this.exportLoading = true
       _this.spinning = true
       _this.showExport = true
-      hdExportExcel(celTireOnlineExport, params, '轮胎统计报表', function () {
+      _this.$store.state.app.curActionPermission = 'B_tireSalesReportExport'
+      hdExportExcel(excelTireOnlineExport, params, '轮胎统计报表', function () {
         _this.exportLoading = false
-        _this.showExport = false
         _this.spinning = false
+        _this.$store.state.app.curActionPermission = ''
       })
     },
     pageInit () {
@@ -290,7 +309,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 245
+      this.tableHeight = window.innerHeight - tableSearchH - 198
     }
   },
   mounted () {
@@ -308,4 +327,4 @@ export default {
     next(vm => {})
   }
 }
-</script>
+</script>

+ 1 - 11
src/views/salesManagement/pushOrderManagement/detailForOut.vue

@@ -61,7 +61,6 @@
               </a-descriptions-item>
               <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="唯一码"><span class="link-bule" @click="showCodeModal = true">查看</span></a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -118,13 +117,6 @@
     <export-excel-modal :openModal="openExcelModal" :itemData="detailData" @ok="handleExcelOk" @close="openExcelModal=false" />
     <!-- 打印 -->
     <div id="print"></div>
-    <!-- 唯一码 -->
-    <uniqueCodeModal
-      ref="uniqueCode"
-      modalTit="轮胎唯一码"
-      :openModal="showCodeModal"
-      @choose="getProductTotal"
-      @cancel="showCodeModal=false"></uniqueCodeModal>
   </div>
 </template>
 
@@ -133,13 +125,12 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import sendTypeModal from './sendTypeModal.vue'
 import exportExcelModal from './exportExcelModal.vue'
-import uniqueCodeModal from './uniqueCodeModal.vue'
 import { printBase64Fun, exportExcel } from '@/libs/JGPrint.js'
 import { dispatchDetaillListForOut, dispatchFindBySn, dispatchDetailPrint, dispatchDetailExcel } from '@/api/dispatch'
 export default {
   name: 'DetailForOut',
   mixins: [commonMixin],
-  components: { STable, VSelect, sendTypeModal, exportExcelModal, uniqueCodeModal },
+  components: { STable, VSelect, sendTypeModal, exportExcelModal },
   props: {
     outBizSubSn: { //  有值则为弹框,无值则为页面
       type: [Number, String],
@@ -194,7 +185,6 @@ export default {
       openExcelModal: false,
       fromRouter: null,
       nowType: 'print',
-      showCodeModal: false
     }
   },
   computed: {