Browse Source

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

chenrui 1 year ago
parent
commit
d9706d086c

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

@@ -2692,8 +2692,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '产品上线信息',
-              icon: 'rise'
-              // permission: 'M_productLaunchInfoList'
+              icon: 'rise',
+              permission: 'M_productLaunchInfoList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2704,8 +2704,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '产品上线信息列表',
                   icon: 'rise',
-                  hidden: true
-                  // permission: 'M_productLaunchInfoList'
+                  hidden: true,
+                  permission: 'M_productLaunchInfoList'
                 }
               }
             ]

+ 3 - 3
src/views/reportData/regionTypeSalesReport/list.vue

@@ -17,7 +17,7 @@
             @keyup.enter.native="handleSearch">
             <a-row :gutter="15">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="销售审核时间" prop="time">
+                <a-form-model-item label="时间" prop="time">
                   <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange"/>
                 </a-form-model-item>
               </a-col>
@@ -127,7 +127,7 @@ export default {
       exportLoading: false,
       tableHeight: 0,
       rules: {
-        'time': [{ required: true, message: '请选择销售审核时间', trigger: 'change' }],
+        'time': [{ required: true, message: '请选择时间', trigger: 'change' }],
         'salesStatusType': [{ required: true, message: '请选择销售状态', trigger: 'change' }]
       },
       // 加载数据方法 必须为 Promise 对象
@@ -177,7 +177,7 @@ export default {
         if (valid) {
           _this.$refs.table.refresh(true)
         } else {
-          _this.$message.error('请选择销售审核时间和销售状态')
+          _this.$message.error('请选择时间和销售状态')
           return false
         }
       })

+ 8 - 2
src/views/reportData/salesReturnDetailReport/list.vue

@@ -159,9 +159,9 @@
               <a-col :md="4" :sm="24">良品数量:{{ (totalData && (totalData.goodQty || totalData.goodQty==0)) ? totalData.goodQty : '--' }}</a-col>
               <a-col :md="4" :sm="24">返库数量:{{ (totalData && (totalData.totalBackStockQty || totalData.totalBackStockQty==0)) ? totalData.totalBackStockQty : '--' }}</a-col>
               <a-col :md="4" :sm="24">正常退货数量:{{ (totalData && (totalData.totalNormalQty || totalData.totalNormalQty==0)) ? totalData.totalNormalQty : '--' }}</a-col>
-              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">成本金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_costPrice')">成本金额:{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</a-col>
               <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">正常退货金额:{{ (totalData && (totalData.totalNormalPrice || totalData.totalNormalPrice==0)) ? toThousands(totalData.totalNormalPrice) : '--' }}</a-col>
-              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">正常再入库金额:{{ (totalData && (totalData.totalNormalCost || totalData.totalNormalCost==0)) ? toThousands(totalData.totalNormalCost) : '--' }}</a-col>
+              <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_costPrice')">正常再入库金额:{{ (totalData && (totalData.totalNormalCost || totalData.totalNormalCost==0)) ? toThousands(totalData.totalNormalCost) : '--' }}</a-col>
               <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnDetailReportList_salesPrice')">正常退货入库差额:{{ (totalData && (totalData.totalNormalBalance || totalData.totalNormalBalance==0)) ? toThousands(totalData.totalNormalBalance) : '--' }}</a-col>
             </a-row>
           </template>
@@ -313,12 +313,18 @@ export default {
       if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) {
         arr.push({ title: '直接差价', dataIndex: 'directRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.push({ title: '间接差价', dataIndex: 'indirectRebateAmount', width: 80, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_salesReturnDetailReportList_costPrice')) {
         arr.push({ title: '再入库单价', dataIndex: 'cost', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       arr.push({ title: '正常退货数量', dataIndex: 'normalQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) { //  价权限
         arr.push({ title: '正常退货金额', dataIndex: 'totalNormalPrice', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_salesReturnDetailReportList_costPrice')) {
         arr.push({ title: '正常再入库金额', dataIndex: 'totalNormalCost', width: 100, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
+      if (this.$hasPermissions('M_salesReturnDetailReportList_salesPrice')) { //  价权限
         arr.push({ title: '正常退货入库差额', dataIndex: 'totalNormalBalance', width: 110, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr