浏览代码

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

# Conflicts:
#	public/version.json
lilei 2 年之前
父节点
当前提交
c11d3b50ba
共有 3 个文件被更改,包括 2 次插入1 次删除
  1. 二进制
      public/logo1.png
  2. 1 1
      public/version.json
  3. 1 0
      src/views/chainReportData/chainStockReport/list.vue

二进制
public/logo1.png


+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1675735783478
+  "version": 1675737019934
 }

+ 1 - 0
src/views/chainReportData/chainStockReport/list.vue

@@ -338,6 +338,7 @@ export default {
     handleExport () {
       const _this = this
       const params = JSON.parse(JSON.stringify(this.queryParam))
+      params.showCost = this.$hasPermissions('M_ShowAllCost') ? '1' : '0'
       if (params.tenantId) {
         this.exportLoading = true
         _this.spinning = true