lilei 2 éve
szülő
commit
41601e2895

+ 3 - 2
src/utils/util.js

@@ -121,7 +121,7 @@ export function getAuthPriceCode (config, router, store) {
     return priceOptions.find(k => k.value == a[a.length-1])
   })
   // console.log(userAuthCode)
-  // console.log(authCode)
+  console.log(authCode)
   // 如果有权限code
   if(authCode){
     // 当前正在调用的接口url
@@ -130,7 +130,8 @@ export function getAuthPriceCode (config, router, store) {
     const authTree = store.state.app.authMenusList
     // 从所有的权限菜单中查找当前权限code对应的权限菜单数据
     const authNode = treeFind(authTree,(item)=>item.code == authCode)
-    // console.log(authNode)
+    console.log(authNode)
+    if(!authNode.permission){return []}
     // 从找到的对应权限菜单数据中判断当前调用接口的url是否存在,这里和权限菜单中的后台权限code比较
     const hasReqUrl = authNode.permission.split(',').find(item => url.replace(/\//g,'_').indexOf(item)>=0)
     // 如果存在则返回一个如 [1,0,1,0,0] 的格式的价格权限字符串给后台接口

+ 0 - 1
src/views/bnSetting/menu/storeMenus.vue

@@ -405,7 +405,6 @@ export default {
         return this.$message.warning('您还未选择要删除的数据')
       }
       const _this = this
-      console.log(_this.formData.id, '_this.formData.id')
       this.$confirm({
         title: '警告',
         content: `确定要删除您选择的 ${_this.formData.name} 的数据吗?`,

+ 6 - 2
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -68,7 +68,7 @@
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
-                <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
+                <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a @click="advanced=!advanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
@@ -364,6 +364,10 @@ export default {
         }
       })
     },
+    searchForm(){
+      this.$refs.table.refresh(true)
+      this.$refs.table.clearSelected()
+    },
     // 重置
     resetSearchForm () {
       this.queryParam = {
@@ -376,7 +380,7 @@ export default {
         applyPersonSn: undefined
       }
       this.expenseTypes = []
-      this.$refs.table.refresh(true)
+      this.searchForm()
     },
     pageInit () {
       const _this = this

+ 5 - 2
src/views/financialManagement/collectionDetailStatic/invoiceModal.vue

@@ -6,7 +6,7 @@
     :maskClosable="false"
     :footer="null"
     @cancel="cancel"
-    width="40%">
+    width="600px">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-form-model
         id="chooseCustom-form"
@@ -26,6 +26,9 @@
             v-model="form.invoiceDate"/>
           <div style="color:#999">如果没有开票,则不填写即可</div>
         </a-form-model-item>
+        <!-- <a-form-model-item label="备注:">
+          <a-textarea id="noticeEdit-remarks" rows="4" v-model="form.remarks" :maxlenght="100" placeholder="请输入备注(最多100字符)"></a-textarea>
+        </a-form-model-item> -->
         <a-form-model-item :wrapper-col="{ span: 12, offset: 6 }" style="text-align: center;margin-top: 50px;">
           <a-button @click="cancel" style="margin-right: 15px" id="chooseCustom-btn-back">取消</a-button>
           <a-button type="primary" :loading="confirmLoading" @click="handleSubmit" id="chooseCustom-btn-submit">确定
@@ -64,7 +67,7 @@ export default {
           span: 6
         },
         wrapperCol: {
-          span: 18
+          span: 14
         }
       },
       form: {

+ 43 - 13
src/views/financialManagement/collectionDetailStatic/list.vue

@@ -107,7 +107,7 @@
               </a-col>
             </template>
             <a-col :md="24" :sm="24" style="text-align:center;">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
+              <a-button type="primary" @click="searchForm" :disabled="disabled" id="collectionDetail-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="collectionDetail-reset">重置</a-button>
               <a-button
                 style="margin-left: 10px"
@@ -128,16 +128,6 @@
       </div>
     </a-card>
     <a-card size="small" :bordered="false" class="collectionDetail-wrap" style="margin-top:5px;">
-      <div>
-        <a-dropdown>
-          <a-menu slot="overlay" @click="handleMenuClick">
-            <a-menu-item key="1"> <a-icon type="printer" />批量允许打印 </a-menu-item>
-            <a-menu-item key="2"> <a-icon type="block" />批量设置开票 </a-menu-item>
-          </a-menu>
-          <a-button type="primary" ghost> 批量处理 <a-icon type="down" /></a-button>
-        </a-dropdown>
-        <span style="margin-left:10px;">已选{{ selNums }}项</span>
-      </div>
       <div class="gatherMessage">
         订单总金额:<strong> {{ toThousands(countData&&countData.orderAmount||0) }}</strong>;
         收款总金额:<strong>{{ toThousands(countData&&countData.receiptAmount||0) }}</strong>;
@@ -146,6 +136,16 @@
         余款抵扣总金额:<strong>{{ toThousands(countData&&countData.balanceAmount||0) }}</strong>;
         跨月打款总金额:<strong>{{ toThousands(countData&&countData.nextMonthAmount||0) }}</strong>;
       </div>
+      <div class="gatherMessage">
+        <a-dropdown>
+          <a-menu slot="overlay" @click="handleMenuClick">
+            <a-menu-item key="1"> <a-icon type="printer" />批量允许打印 </a-menu-item>
+            <a-menu-item key="2"> <a-icon type="block" />批量设置开票 </a-menu-item>
+          </a-menu>
+          <a-button type="primary" ghost> 批量处理 <a-icon type="down" /></a-button>
+        </a-dropdown>
+        <span v-if="selNums" style="margin-left:10px;">已选{{ selNums }}项</span>
+      </div>
       <a-spin :spinning="spinning" tip="Loading...">
         <!-- 列表 -->
         <s-table
@@ -333,7 +333,7 @@ export default {
       this.invoiceIsShow = false
       this.noteIsShow = false
       this.printIsShow = false
-      this.$refs.table.refresh(true)
+      this.searchForm()
     },
     getCount (params) {
       financeBookReportDetailCount(params).then(res => {
@@ -342,6 +342,30 @@ export default {
     },
     handleMenuClick (e) {
       console.log('click', e)
+      const _this = this
+      const rows = _this.rowSelectionInfo && _this.rowSelectionInfo.selectedRows || []
+      const slen = rows.length
+      if (!_this.rowSelectionInfo || (_this.rowSelectionInfo && slen < 1)) {
+        _this.$message.warning('请在列表勾选后再进行批量操作!')
+        return false
+      }
+
+      if(e.key == 1){ // 批量允许打印
+        const dataList = rows.filter(item => item.printStatus=='NO_PRINT' || item.printStatus=='PRINT')
+        this.$confirm({
+        title: '批量允许打印',
+        content: `已选有效数据 ${dataList.length} 条,确认将收款打印状态变更为允许打印吗?`,
+        okText: '确定',
+        centered: true,
+        cancelText: '取消',
+        onOk () {
+           // 批量允许打印接口
+        }
+      })
+      }
+      if(e.key == 2){ // 批量开票
+        
+      }
     },
     // 表格选中项
     rowSelectionFun (obj) {
@@ -372,6 +396,10 @@ export default {
       this.queryParam.auditBeginDate = date[0] ? date[0] : ''
       this.queryParam.auditEndDate = date[1] ? date[1] : ''
     },
+    searchForm(){
+      this.$refs.table.refresh(true)
+      this.$refs.table.clearSelected()
+    },
     //  重置
     resetSearchForm () {
       // 审核日期
@@ -410,16 +438,18 @@ export default {
       this.queryParam.invoiceDateType = undefined
       this.queryParam.invoiceDate = ''
       this.queryParam.payerType = undefined
-      this.$refs.table.refresh(true)
+      this.searchForm()
     },
     //  导出
     handleExport () {
       const _this = this
       _this.exportLoading = true
       _this.spinning = true
+      _this.$store.state.app.curActionPermission = 'M_FC_Details_Export'
       hdExportExcel(financeBookDetailExport, _this.queryParam, '财务收款明细统计', function () {
         _this.exportLoading = false
         _this.spinning = false
+        _this.$store.state.app.curActionPermission = ''
       })
     },
     pageInit () {

+ 0 - 1
src/views/salesManagement/sendOutOrder/list.vue

@@ -64,7 +64,6 @@
                     <Area id="sendOut-provinceSn" v-model="queryParam.provinceSn" placeholder="请选择省"></Area>
                   </a-form-model-item>
                 </a-form-model-item>
-                </a-form-model-item>
               </a-col>
             </template>
             <a-col :md="6" :sm="24">