Просмотр исходного кода

Merge branch 'develop_yh26' of jianguan-web/qpls-md-html into pre-release

刘俊俊 1 год назад
Родитель
Сommit
b48a554c3f

+ 42 - 0
src/api/stockImport.js

@@ -36,6 +36,7 @@ export const stockImportExportError = (params) => {
     responseType: 'blob'
   })
 }
+
 //  库存导入  错误导出
 export const stockImportKCExportError = (params) => {
   return axios({
@@ -45,3 +46,44 @@ export const stockImportKCExportError = (params) => {
     responseType: 'blob'
   })
 }
+// 库存导入、散件导入列表
+export const stockImportAllList = (params) => {
+  const url = `/stockImport/reportPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 库存导入、散件导入统计
+export const stockImportCount = (params) => {
+  const url = `/stockImport/reportCount`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+
+// 库存导入、散件导入 详情列表
+export const stockImportDetailList = (params) => {
+  const url = `/stockImportDetail/reportPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 库存导入、散件导入 详情统计
+export const stockImportDetailCount = (params) => {
+  const url = `/stockImportDetail/reportCount`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

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

@@ -1907,7 +1907,7 @@ export const asyncRouterMap = [
             meta: {
               title: '库存导入',
               icon: 'frown',
-              permission: 'M_inventoryImport'
+              permission: 'M_inventoryImportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1919,7 +1919,7 @@ export const asyncRouterMap = [
                   title: '库存导入列表',
                   icon: 'frown',
                   hidden: true,
-                  permission: 'M_inventoryImport'
+                  permission: 'M_inventoryImportList'
                 }
               }
             ]
@@ -2087,7 +2087,7 @@ export const asyncRouterMap = [
             meta: {
               title: '散件导入',
               icon: 'frown',
-              permission: 'M_bulkImport'
+              permission: 'M_bulkImportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2099,7 +2099,7 @@ export const asyncRouterMap = [
                   title: '散件导入列表',
                   icon: 'frown',
                   hidden: true,
-                  permission: 'M_bulkImport'
+                  permission: 'M_bulkImportList'
                 }
               }
             ]

+ 6 - 6
src/views/bulkManagement/bulkImport/list.vue

@@ -32,9 +32,8 @@
         </a-form-model>
       </div>
       <!-- 导入按钮 -->
-      <!-- v-if="$hasPermissions('B_inventory_warehouse_add')" -->
       <div class="table-operator">
-        <a-button id="inventoryImport-add" type="primary" class="button-error" @click="openGuideModal=true">散件导入</a-button>
+        <a-button id="inventoryImport-add" type="primary" class="button-error" v-if="$hasPermissions('B_bulkImport')" @click="openGuideModal=true">散件导入</a-button>
       </div>
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px">
@@ -60,7 +59,8 @@
         bordered>
         <!-- 导入单号 -->
         <template slot="stockImportNo" slot-scope="text, record">
-          <span class="table-td-link" @click="handleDetail(record)">{{ record.stockImportNo }}</span>
+          <span v-if="$hasPermissions('B_bulkImportDeail')" class="table-td-link" @click="handleDetail(record)">{{ record.stockImportNo }}</span>
+          <span v-else>{{ record.stockImportNo||'--' }}</span>
         </template>
       </s-table>
     </a-spin>
@@ -87,7 +87,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import detailList from '@/views/inventoryManagement/inventoryImport/detailList.vue'
 import getDate from '@/libs/getDate.js'
 import importGuideModal from './importGuideModal.vue'
-import { reportStockImportList, reportStockImportCount } from '@/api/reportData'
+import { stockImportAllList, stockImportCount } from '@/api/stockImport'
 export default {
   components: { STable, VSelect, rangeDate, importGuideModal, detailList },
   mixins: [commonMixin],
@@ -121,7 +121,7 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         delete params.time
-        return reportStockImportList(params).then(res => {
+        return stockImportAllList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -168,7 +168,7 @@ export default {
     },
     // 合计
     getCount (params) {
-      reportStockImportCount(params).then(res => {
+      stockImportCount(params).then(res => {
         if (res.status == 200) {
           this.totalData = res.data
         } else {

+ 4 - 4
src/views/inventoryManagement/inventoryImport/detailList.vue

@@ -50,7 +50,7 @@
         款数:<strong>{{ (countInfo || countInfo==0) ? countInfo : '--' }}</strong>;
         数量:<strong>{{ (totalData && (totalData.putQty || totalData.putQty==0)) ? totalData.putQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          成本:<strong>{{ (totalData && (totalData.cost || totalData.cost==0)) ? toThousands(totalData.cost) : '--' }}</strong>。
+          成本:<strong>{{ (totalData && (totalData.cost || totalData.cost==0)) ? toThousands(totalData.cost) : '--' }}</strong>。
         </div>
       </div>
     </a-alert>
@@ -76,7 +76,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import supplier from '@/views/common/supplier'
-import { reportStockImportDetailList, reportStockImportDetailCount } from '@/api/reportData'
+import { stockImportDetailList, stockImportDetailCount } from '@/api/stockImport'
 export default {
   components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier },
   mixins: [commonMixin],
@@ -119,7 +119,7 @@ export default {
           params.stockImportNo = this.detailSn
           params.importType = this.typeInfo
         }
-        return reportStockImportDetailList(params).then(res => {
+        return stockImportDetailList(params).then(res => {
           let data
           this.countInfo = res.data.count
           if (res.status == 200) {
@@ -172,7 +172,7 @@ export default {
     },
     // 合计
     getCount (params) {
-      reportStockImportDetailCount(params).then(res => {
+      stockImportDetailCount(params).then(res => {
         if (res.status == 200) {
           this.totalData = res.data
         } else {

+ 6 - 6
src/views/inventoryManagement/inventoryImport/list.vue

@@ -32,9 +32,8 @@
         </a-form-model>
       </div>
       <!-- 导入按钮 -->
-      <!-- v-if="$hasPermissions('B_inventory_warehouse_add')" -->
       <div class="table-operator">
-        <a-button id="inventoryImport-add" type="primary" class="button-error" @click="openGuideModal=true">库存导入</a-button>
+        <a-button id="inventoryImport-add" type="primary" class="button-error" v-if="$hasPermissions('B_importContent')" @click="openGuideModal=true">库存导入</a-button>
       </div>
       <!-- 合计 -->
       <a-alert type="info" style="margin-bottom:10px">
@@ -60,7 +59,8 @@
         bordered>
         <!-- 导入单号 -->
         <template slot="stockImportNo" slot-scope="text, record">
-          <span class="table-td-link" @click="handleDetail(record)">{{ record.stockImportNo }}</span>
+          <span class="table-td-link" v-if="$hasPermissions('B_inventoryImport-detail')" @click="handleDetail(record)">{{ record.stockImportNo }}</span>
+          <span v-else>{{ record.stockImportNo || '--' }}</span>
         </template>
       </s-table>
     </a-spin>
@@ -87,7 +87,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import getDate from '@/libs/getDate.js'
 import importGuideModal from './importGuideModal.vue'
 import detailList from './detailList.vue'
-import { reportStockImportList, reportStockImportCount } from '@/api/reportData'
+import { stockImportAllList, stockImportCount } from '@/api/stockImport'
 export default {
   components: { STable, VSelect, rangeDate, importGuideModal, detailList },
   mixins: [commonMixin],
@@ -121,7 +121,7 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         delete params.time
-        return reportStockImportList(params).then(res => {
+        return stockImportAllList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -168,7 +168,7 @@ export default {
     },
     // 合计
     getCount (params) {
-      reportStockImportCount(params).then(res => {
+      stockImportCount(params).then(res => {
         if (res.status == 200) {
           this.totalData = res.data
         } else {