Browse Source

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

1004749546@qq.com 3 years ago
parent
commit
e4ed1c1fae

+ 1 - 1
src/components/MultiTab/MultiTab.vue

@@ -144,13 +144,13 @@ export default {
     },
     activeKey: function (newPathKey) {
       const row = this.pages.find(item => item.name == newPathKey)
-      // console.log(row, '+++', row.fullPath)
       if (row.fullPath.indexOf('/list') == -1) {
         this.$router.push({ path: row.fullPath })
       } else {
         // this.$router.push({ path: row.fullPath, query: { closeLastOldTab: true } })  //  需求:切换页签需关掉子页面
         this.$router.push({ path: row.path }) //  需求:切换页签不需关掉子页面
       }
+      this.$store.state.app.routeList = this.tabsList
     }
   },
   render () {

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

@@ -1191,8 +1191,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '库存导入',
-              icon: 'frown'
-              // permission: 'M_bulkReturnGoodsList'
+              icon: 'frown',
+              permission: 'M_inventoryImport'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1203,8 +1203,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '库存导入列表',
                   icon: 'frown',
-                  hidden: true
-                  // permission: 'M_bulkReturnGoodsList'
+                  hidden: true,
+                  permission: 'M_inventoryImport'
                 }
               }
             ]
@@ -1255,7 +1255,7 @@ export const asyncRouterMap = [
         meta: {
           title: '散件管理',
           icon: 'gold',
-          permission: 'M_bulkWarehousingOrderList'
+          permission: 'M_bulkManagement'
         },
         children: [
           {
@@ -1370,8 +1370,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '散件导入',
-              icon: 'frown'
-              // permission: 'M_bulkReturnGoodsList'
+              icon: 'frown',
+              permission: 'M_bulkImport'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1382,8 +1382,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '散件导入列表',
                   icon: 'frown',
-                  hidden: true
-                  // permission: 'M_bulkReturnGoodsList'
+                  hidden: true,
+                  permission: 'M_bulkImport'
                 }
               }
             ]

+ 2 - 1
src/store/getters.js

@@ -15,7 +15,8 @@ const getters = {
   multiTab: state => state.app.multiTab,
   lang: state => state.i18n.lang,
   nowRoute: state => state.app.nowRoute,
-  isShowVideo: state => state.app.isShowVideo
+  isShowVideo: state => state.app.isShowVideo,
+  routeList: state => state.app.routeList
 }
 
 export default getters

+ 47 - 22
src/store/modules/app.js

@@ -25,8 +25,9 @@ const app = {
     color: null,
     weak: false,
     multiTab: true,
-	nowRoute: '', // 当前路由
-	isShowVideo: false // 是否显示视频弹窗
+    nowRoute: '', // 当前路由
+    isShowVideo: false ,// 是否显示视频弹窗
+    routeList: [] // 路由数组
   },
   mutations: {
     SET_SIDEBAR_TYPE: (state, type) => {
@@ -77,53 +78,77 @@ const app = {
       Vue.ls.set(DEFAULT_MULTI_TAB, bool)
       state.multiTab = bool
     },
-	// 当前路由
-	TOGGLE_NOW_ROUTER: (state, bool) => {
-	  state.nowRoute = bool
-	},
-	// 是否显示视频弹窗
-	IS_ShOW_VIDEO: (state, bool) => {
-		state.isShowVideo = bool
-	}
+    // 当前路由
+    TOGGLE_NOW_ROUTER: (state, bool) => {
+      state.nowRoute = bool
+    },
+    // 是否显示视频弹窗
+    IS_ShOW_VIDEO: (state, bool) => {
+      state.isShowVideo = bool
+    }
   },
   actions: {
-    setSidebar ({ commit }, type) {
+    setSidebar({
+      commit
+    }, type) {
       commit('SET_SIDEBAR_TYPE', type)
     },
-    CloseSidebar ({ commit }) {
+    CloseSidebar({
+      commit
+    }) {
       commit('CLOSE_SIDEBAR')
     },
-    ToggleDevice ({ commit }, device) {
+    ToggleDevice({
+      commit
+    }, device) {
       commit('TOGGLE_DEVICE', device)
     },
-    ToggleTheme ({ commit }, theme) {
+    ToggleTheme({
+      commit
+    }, theme) {
       commit('TOGGLE_THEME', theme)
     },
-    ToggleLayoutMode ({ commit }, mode) {
+    ToggleLayoutMode({
+      commit
+    }, mode) {
       commit('TOGGLE_LAYOUT_MODE', mode)
     },
-    ToggleFixedHeader ({ commit }, fixedHeader) {
+    ToggleFixedHeader({
+      commit
+    }, fixedHeader) {
       if (!fixedHeader) {
         commit('TOGGLE_FIXED_HEADER_HIDDEN', false)
       }
       commit('TOGGLE_FIXED_HEADER', fixedHeader)
     },
-    ToggleFixSiderbar ({ commit }, fixSiderbar) {
+    ToggleFixSiderbar({
+      commit
+    }, fixSiderbar) {
       commit('TOGGLE_FIXED_SIDERBAR', fixSiderbar)
     },
-    ToggleFixedHeaderHidden ({ commit }, show) {
+    ToggleFixedHeaderHidden({
+      commit
+    }, show) {
       commit('TOGGLE_FIXED_HEADER_HIDDEN', show)
     },
-    ToggleContentWidth ({ commit }, type) {
+    ToggleContentWidth({
+      commit
+    }, type) {
       commit('TOGGLE_CONTENT_WIDTH', type)
     },
-    ToggleColor ({ commit }, color) {
+    ToggleColor({
+      commit
+    }, color) {
       commit('TOGGLE_COLOR', color)
     },
-    ToggleWeak ({ commit }, weakFlag) {
+    ToggleWeak({
+      commit
+    }, weakFlag) {
       commit('TOGGLE_WEAK', weakFlag)
     },
-    ToggleMultiTab ({ commit }, bool) {
+    ToggleMultiTab({
+      commit
+    }, bool) {
       commit('TOGGLE_MULTI_TAB', bool)
     }
   }

+ 1 - 1
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -14,7 +14,7 @@
             @click.stop="handleEdit">编辑</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra" v-if="$hasPermissions('B_allocLinkageOutPrint')">
+        <template slot="extra" v-if="outBizSn ? $hasPermissions('B_outboundOrderDetail') : $hasPermissions('B_allocLinkageOutPrint')">
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>

+ 1 - 1
src/views/allocationManagement/storeTransferOut/detail.vue

@@ -14,7 +14,7 @@
             @click.stop="handleEdit">编辑</a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template slot="extra" v-if="$hasPermissions('B_storeCallOutPrint')">
+        <template slot="extra" v-if="outBizSn ? $hasPermissions('B_outboundOrderDetail') : $hasPermissions('B_storeCallOutPrint')">
           <a-checkbox key="4" v-model="printCostChecked">打印成本</a-checkbox>
           <a-radio-group key="3" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>

+ 12 - 13
src/views/outboundOrderManagement/outboundOrder/list.vue

@@ -60,7 +60,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1270, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         bordered>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
@@ -132,18 +132,17 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '关联单号', dataIndex: 'outBizNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '单位名称', dataIndex: 'demanderName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: 60, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总售价', dataIndex: 'productTotalPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库时间', dataIndex: 'outTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '出库状态', dataIndex: 'stateDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
+        { title: '关联单号', dataIndex: 'outBizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位名称', dataIndex: 'demanderName', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'productTotalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'productTotalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总售价', dataIndex: 'productTotalPrice', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库时间', dataIndex: 'outTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '出库状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       selectedRowKeys: [], // Check here to configure the default column
       loading: false,

+ 6 - 6
src/views/reportData/chainCustomerReport/list.vue

@@ -15,12 +15,12 @@
           @keyup.enter.native="handleSearch" >
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-model-item label="连锁店" prop="dealerSn">
+              <a-form-model-item label="连锁店" prop="tenantId">
                 <a-select
                   placeholder="请选择连锁店"
-                  id="customerReportList-dealerSn"
+                  id="customerReportList-tenantId"
                   allowClear
-                  v-model="queryParam.dealerSn"
+                  v-model="queryParam.tenantId"
                   :showSearch="true"
                   option-filter-prop="children"
                   :filter-option="filterOption">
@@ -125,7 +125,7 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
-        dealerSn: undefined,
+        tenantId: undefined,
         time: [],
         beginDate: '',
         endDate: '',
@@ -138,7 +138,7 @@ export default {
       },
       productType: [],
       rules: {
-        'dealerSn': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
+        'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
         'time': [{ required: true, message: '请选择添加时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -224,7 +224,7 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.queryParam.dealerSn = undefined
+      this.queryParam.tenantId = undefined
       this.$refs.rangeDate.resetDate()
       this.queryParam.time = []
       this.queryParam.beginDate = ''

+ 6 - 4
src/views/salesManagement/salesQuery/detail.vue

@@ -12,7 +12,7 @@
             id="salesDetail-edit-btn"
             @click.stop="handleEdit">编辑</a-button>
         </template>
-        <template slot="extra" v-if="$hasPermissions('B_salesPrint')">
+        <template slot="extra" v-if="outBizSn ? $hasPermissions('B_outboundOrderDetail') : $hasPermissions('B_salesPrint')">
           <a-radio-group key="4" v-model="printerType">
             <a-radio value="NEEDLE">针式</a-radio>
             <a-radio value="INK">喷墨</a-radio>
@@ -34,7 +34,7 @@
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions size="small" :column="3">
               <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="客户地址">
+              <a-descriptions-item label="客户地址" :span="2">
                 <div v-if="detailData&&(detailData.shippingAddressProvinceName || detailData.shippingAddressCityName || detailData.shippingAddressCountyName || detailData.shippingAddress)">
                   {{ detailData&&detailData.shippingAddressProvinceName || '' }}
                   {{ detailData&&detailData.shippingAddressCityName || '' }}
@@ -46,9 +46,11 @@
               <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleEntity&&detailData.settleStyleEntity.name || '--' }}</a-descriptions-item>
               <a-descriptions-item label="联系电话">{{ detailData&&detailData.consigneeTel || '--' }}</a-descriptions-item>
               <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="销售单号">{{ detailData&&detailData.salesBillNo || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="店内单号">{{ detailData&&detailData.salesBillNo || '--' }}</a-descriptions-item>
               <a-descriptions-item label="制单人">{{ detailData&&detailData.operatorName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="业务员">{{ detailData&&detailData.salesManName || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="来源">{{ detailData&&detailData.salesBillSourceDictValue || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="下级采购单号" v-if="detailData&&detailData.salesBillSource=='PURCHASE'">{{ detailData&&detailData.purchaseBillNo || '--' }}</a-descriptions-item>
               <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
             </a-descriptions>
@@ -113,7 +115,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '成本价', dataIndex: 'cost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
         { title: '售价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },

+ 10 - 10
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -58,7 +58,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1100, y: tableHeight }"
+        :scroll="{ y: tableHeight }"
         bordered>
         <!-- 单号 -->
         <template slot="urgentBillNo" slot-scope="text, record">
@@ -92,15 +92,15 @@ export default {
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: 180, align: 'center' },
-        { title: '店内单号', dataIndex: 'salesBillNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'totalCategory', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'totalQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '创建时间', dataIndex: 'createDate', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '冲减时间', dataIndex: 'offSetTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '状态', dataIndex: 'statusDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '急件单号', scopedSlots: { customRender: 'urgentBillNo' }, width: '15%', align: 'center' },
+        { title: '店内单号', dataIndex: 'salesBillNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'buyerName', width: '25%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '冲减时间', dataIndex: 'offSetTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'statusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {