Selaa lähdekoodia

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

lilei 2 vuotta sitten
vanhempi
commit
e01010d333

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

@@ -761,8 +761,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '采购退货',
-              icon: 'gold'
-              // permission: 'M_purchaseReturnList'
+              icon: 'gold',
+              permission: 'M_purchaseReturn'
             },
             hideChildrenInMenu: true,
             children: [
@@ -773,8 +773,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '采购退货',
                   icon: 'gold',
-                  hidden: true
-                  // permission: 'M_purchaseReturnList'
+                  hidden: true,
+                  permission: 'M_purchaseReturnList'
                 }
               },
               {
@@ -1736,7 +1736,7 @@ export const asyncRouterMap = [
             meta: {
               title: '采购退货单报表',
               icon: 'profile'
-              // permission: 'M_allocationDetailsList'
+              // permission: 'M_urchaseReturn'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1748,7 +1748,7 @@ export const asyncRouterMap = [
                   title: '采购退货单报表列表',
                   icon: 'profile',
                   hidden: true
-                  // permission: 'M_allocationDetailsList'
+                  // permission: 'M_urchaseReturnList'
                 }
               }
             ]
@@ -1761,7 +1761,7 @@ export const asyncRouterMap = [
             meta: {
               title: '采购退货单明细报表',
               icon: 'profile'
-              // permission: 'M_allocationDetailsList'
+              // permission: 'M_urchaseDetailReturn'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1773,7 +1773,7 @@ export const asyncRouterMap = [
                   title: '采购退货单明细报表列表',
                   icon: 'profile',
                   hidden: true
-                  // permission: 'M_allocationDetailsList'
+                  // permission: 'M_urchaseDetailReturnList'
                 }
               }
             ]

+ 3 - 2
src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue

@@ -44,8 +44,9 @@
         :columns="columns"
         :data="loadData"
         bordered>
+        <!-- 产品名称 -->
         <template slot="productName" slot-scope="text, record">
-          {{record.productName}}
+          {{ record.productName }}
           <a-tag color="red" v-if="record.giftFlag==1">赠品</a-tag>
         </template>
       </s-table>
@@ -101,7 +102,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', scopedSlots: { customRender: 'productName' },width: '40%', align: 'center' },
+        { title: '产品名称', scopedSlots: { customRender: 'productName' }, width: '40%', align: 'center', ellipsis: true },
         { title: '单位', dataIndex: 'unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库数量', dataIndex: 'productQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '入库单价', dataIndex: 'productCost',width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 46 - 24
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -19,12 +19,12 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="采购退货单号">
-                <a-input id="bulkWarehousingOrderList-productCode" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
+                <a-input v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="供应商名称">
-                <custList id="salesReturnsReportList-dealerName" ref="custList" :itemSn="queryParam.dealerSn" @change="custChange"></custList>
+                <supplier v-model="queryParam.supplierSn" placeholder="请输入供应商名称"></supplier>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -33,7 +33,6 @@
                   <v-select
                     v-model="queryParam.returnReason"
                     ref="returnReason"
-                    id="purchaseReturn-returnReason"
                     code="SPARE_PARTS_RETURN_REASON"
                     placeholder="请选择退货原因"
                     allowClear></v-select>
@@ -41,22 +40,22 @@
               </a-col>
               <a-col :md="5" :sm="24">
                 <a-form-model-item label="产品编码">
-                  <a-input id="salesReturnDetailList-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
+                  <a-input id="urchaseDetailReturn-productCode" v-model.trim="queryParam.productCode" allowClear placeholder="请输入产品编码"/>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品名称">
-                  <a-input id="salesReturnDetailList-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
+                  <a-input id="urchaseDetailReturn-productName" v-model.trim="queryParam.productName" allowClear placeholder="请输入产品名称"/>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品品牌">
-                  <ProductBrand id="salesReturnDetailList-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
+                  <ProductBrand id="urchaseDetailReturn-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="品牌分类">
-                  <v-select code="BRAND_TYPE" id="salesReturnDetailList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
+                  <v-select code="BRAND_TYPE" id="urchaseDetailReturn-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
                 </a-form-model-item>
               </a-col>
               <!-- <a-col :md="6" :sm="24">
@@ -138,13 +137,36 @@
         :defaultLoadData="false"
         bordered>
         <template slot="footer">
-          <a-row :gutter="15">
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">入库单据量:{{ (totalData && (totalData.totalPrice || totalData.totalPrice==0)) ? totalData.totalPrice : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">供应商数量:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? totalData.totalRealAmount : '--' }}</a-col>
-            <a-col :md="4" :sm="24">产品款数:{{ (totalData && (totalData.receiveQty || totalData.receiveQty==0)) ? totalData.receiveQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24">入库数量:{{ (totalData && (totalData.totalBadQty || totalData.totalBadQty==0)) ? totalData.totalBadQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24">退货数量:{{ (totalData && (totalData.goodQty || totalData.goodQty==0)) ? totalData.goodQty : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('B_isShowPrice')">退货金额:{{ (totalData && (totalData.totalNormalPrice || totalData.totalNormalPrice==0)) ? totalData.totalNormalPrice : '--' }}</a-col>
+          <a-row>
+            <a-col span="2">合计:</a-col>
+            <a-col span="22">
+              <a-row>
+                <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
+                <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
+                <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
+                <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
+                <a-col span="4">箭牌感应线:{{ (totalData && (totalData.jpGyxAmount || totalData.jpGyxAmount==0)) ? totalData.jpGyxAmount : '--' }}</a-col>
+                <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
+                <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
+                <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
+                <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
+                <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
+                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
+                <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
+                <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
+                <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
+                <a-col span="4">瓦尔塔:{{ (totalData && (totalData.wetAmount || totalData.wetAmount==0)) ? totalData.wetAmount : '--' }}</a-col>
+                <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
+                <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
+                <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
+                <a-col span="6" v-if="$hasPermissions('B_isShowPrice')">实售销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
+              </a-row>
+            </a-col>
           </a-row>
         </template>
       </s-table>
@@ -160,7 +182,7 @@ import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
-import custList from '@/views/common/custList.vue'
+import supplier from '@/views/common/supplier.js'
 import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { productBrandQuery } from '@/api/productBrand'
@@ -169,9 +191,9 @@ import ProductBrand from '@/views/common/productBrand.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesReturnDetailList, reportSalesReturnDetailCount, reportSalesReturnDetailExport } from '@/api/reportData'
 export default {
-  name: 'SalesReturnDetailReportList',
+  name: 'UrchaseDetailReturnList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, custList, subarea, ProductBrand, reportModal },
+  components: { STable, VSelect, rangeDate, supplier, subarea, ProductBrand, reportModal },
   data () {
     return {
       spinning: false,
@@ -185,21 +207,21 @@ export default {
         ],
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
-        salesReturnBillNo: '',
+        sparePartsReturnNo: '', // 采购退货单号
+        supplierSn: '', // 供应商sn
+        returnReason: '',
         productCode: '',
         productName: '',
-        dealerName: '',
-        dealerLevel: undefined,
         productBrandTypeSn: undefined,
         productBrandSn: undefined, //  产品品牌
-        productTypeSn1: '', //  产品一级分类
-        productTypeSn2: '', //  产品二级分类
-        productTypeSn3: '', //  产品三级分类
-        subareaSn: undefined,
+        // productTypeSn1: '', //  产品一级分类
+        // productTypeSn2: '', //  产品二级分类
+        // productTypeSn3: '', //  产品三级分类
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined
       },
+
       productType: [],
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]

+ 13 - 17
src/views/reportData/urchaseReturn/list.vue

@@ -1,10 +1,10 @@
 <template>
-  <a-card size="small" :bordered="false" class="salesReturnsReportList-wrap">
+  <a-card size="small" :bordered="false" class="urchaseReturn-wrap">
     <a-spin :spinning="spinning" tip="Loading...">
       <!-- 搜索条件 -->
       <div class="table-page-search-wrapper">
         <a-form-model
-          id="salesReturnsReportList-form"
+          id="urchaseReturn-form"
           ref="ruleForm"
           class="form-model-con"
           layout="inline"
@@ -19,12 +19,12 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="采购退货单号">
-                <a-input id="bulkWarehousingOrderList-productCode" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
+                <a-input id="urchaseReturnList-productCode" v-model.trim="queryParam.sparePartsReturnNo" allowClear placeholder="请输入采购退货单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="供应商名称">
-                <custList id="salesReturnsReportList-dealerName" ref="custList" :itemSn="queryParam.dealerSn" @change="custChange"></custList>
+                <supplier v-model="queryParam.supplierSn" placeholder="请输入供应商名称"></supplier>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -39,8 +39,8 @@
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24" style="margin-bottom: 10px;">
-              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnsReportList-refresh">查询</a-button>
-              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesReturnsReportList-reset">重置</a-button>
+              <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="urchaseReturn-refresh">查询</a-button>
+              <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="urchaseReturn-reset">重置</a-button>
               <a-button
                 style="margin-left: 5px"
                 type="primary"
@@ -49,7 +49,7 @@
                 :disabled="disabled"
                 :loading="exportLoading"
                 v-if="$hasPermissions('B_salesReturns_report')"
-                id="salesReturnsReportList-export">导出</a-button>
+                id="urchaseReturn-export">导出</a-button>
             </a-col>
           </a-row>
         </a-form-model>
@@ -88,15 +88,15 @@ import getDate from '@/libs/getDate.js'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
-import custList from '@/views/common/custList.vue'
+import supplier from '@/views/common/supplier.js'
 import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesReturnList, reportSalesReturnCount, salesReturnsExport } from '@/api/reportData'
 export default {
-  name: 'SalesReturnsReportList',
+  name: 'UrchaseReturn',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, custList, reportModal },
+  components: { STable, VSelect, rangeDate, subarea, supplier, reportModal },
   data () {
     return {
       spinning: false,
@@ -111,13 +111,9 @@ export default {
         ],
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
-        salesReturnBillNo: '',
-        subareaSn: undefined,
-        dealerSn: '',
-        dealerLevel: undefined,
-        dealerProvinceSn: undefined,
-        dealerCitySn: undefined,
-        dealerCountySn: undefined
+        sparePartsReturnNo: undefined,
+        supplierSn: undefined,
+        returnReason: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择退货完成日期', trigger: 'change' }]