Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/views/authority/datascope.vue

@@ -394,7 +394,7 @@
               label: "规则值",
               prop: "scopeValue",
               span: 24,
-              minRows: 5,
+              minRows: 6,
               type: "textarea",
               display: true,
               hide: true,
@@ -403,6 +403,9 @@
               label: "备注",
               prop: "remark",
               span: 24,
+              // minRows: 6,
+              // type: "textarea",
+              // display: true,
               hide: true,
             },
           ]

src/views/iosBasicData/SeafreightExportF/bills/assembly/businessReports.vue

@@ -34,7 +34,11 @@ export default {
     disabled: {
       type: Boolean,
       default: false,
-    }
+    },
+      classifycode:{
+          type: String,
+          default: '',
+      },
   },
   data() {
     return {
@@ -49,6 +53,7 @@ export default {
         businessType: 'HYCK',
         classifyCode: '业务',
       },
+      classifyCodeReadonly: false,
       loading: true,
       page: {
         pageSize: 10,
@@ -137,14 +142,27 @@ export default {
     };
   },
   async created() {
-    this.option = await this.getColumnData(this.getColumnName(312.4), this.optionBack);
-    getUserApprovalList().then(res => {
-      this.findObject(this.option.column, "authorizedUsersId").dicData = res.data.data
-    })
-    // 获取业务类型
-    bbusinesstypeList(1, 20).then(res => {
-      this.findObject(this.option.column, "businessType").dicData = res.data.data.records
-    })
+      if(!!this.classifycode) {
+          this.query.classifyCode = this.classifycode;
+          this.classifyCodeReadonly = true;
+          let col = this.optionBack.column.find(c=>c.prop=="classifyCode")
+          if(col){
+              col.search = false;
+          }
+      }
+
+      this.option = await this.getColumnData(this.getColumnName(312.4), this.optionBack);
+      console.log('report.create', this.option)
+
+      getUserApprovalList().then(res => {
+          this.findObject(this.option.column, "authorizedUsersId").dicData = res.data.data
+      })
+      // 获取业务类型
+      bbusinesstypeList(1, 20).then(res => {
+          this.findObject(this.option.column, "businessType").dicData = res.data.data.records
+      })
+  },
+  async mounted () {
   },
   computed: {
     ...mapGetters(["permission"]),

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -45,7 +45,7 @@
         </div>
         <!--显示 admin，应收修改，应收查看，应收查看只有打印账单一个功能 -->
         <el-card
-            v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1 ? true : roleName.indexOf('应收查看') != -1"
+            v-show="isFeeViewD"
             class="box-card">
             <avue-crud :option="optionD" :table-loading="loadingD" :data="assemblyForm.feeCenterListD" v-model="formD"
                 id="out-table" :header-cell-class-name="headerClassName" ref="crudD" :row-style="{ height: '20px' }"
@@ -57,37 +57,37 @@
                         <i class="el-icon-coin"></i>
                         <span>应收费用</span>
                     </div>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger"
+                    <el-button v-if="isFeeEditD" type="danger"
                         plain size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="batchDelete('D')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success"
+                    <el-button v-if="isFeeEditD" type="success"
                         plain size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="GenerateBillsfun('D')">生成账单
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="danger"
+                    <el-button v-if="isFeeEditD" type="danger"
                         plain size="small" :disabled="!selectionDList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('D')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('D')">打印账单</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="success"
+                    <el-button v-if="isFeeEditD" type="success"
                         plain size="small" :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('D')">应收模板</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info"
+                    <el-button v-if="isFeeEditD" type="info"
                         plain size="small" :disabled="disabled || pleasereviewType"
                         @click="feecenterSubmitListfun">一键保存</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="info"
+                    <el-button v-if="isFeeEditD" type="info"
                         plain size="small" :disabled="disabled || pleasereviewType" @click="feecenterEditfun('D')">一键编辑
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
+                    <el-button v-if="isFeeEditD" type="primary"
                         plain size="small" :disabled="disabled || pleasereviewType"
                         @click="copyfun('D')">生成应付</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
+                    <el-button v-if="isFeeEditD" type="primary"
                         plain size="small" :disabled="disabled || pleasereviewType"
                         @click="allClick('发票申请', 'D')">发票申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应收修改') != -1" type="primary"
+                    <el-button v-if="isFeeEditD" type="primary"
                         size="small" icon="el-icon-plus" circle :disabled="disabled || pleasereviewType"
                         @click="addDfun"></el-button>
                 </template>
@@ -178,7 +178,7 @@
         </el-card>
         <!--显示 admin，应付修改，应付查看，应付查看只有打印账单一个功能 -->
         <el-card
-            v-show="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1 ? true : roleName.indexOf('应付查看') != -1"
+            v-show="isFeeViewC"
             class="box-card" style="margin: 2px 0">
             <avue-crud :option="optionC" :table-loading="loadingC" :data="assemblyForm.feeCenterListC" v-model="formC"
                 id="out-table" :header-cell-class-name="headerClassName" ref="crudC" :row-style="{ height: '20px' }"
@@ -190,37 +190,37 @@
                         <i class="el-icon-coin"></i>
                         <span>应付费用</span>
                     </div>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger"
+                    <el-button v-if="isFeeEditC" type="danger"
                         plain size="small" :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="batchDelete('C')">一键删除
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
+                    <el-button v-if="isFeeEditC" type="primary"
                         plain size="small" :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="GenerateBillsfun('C')">生成账单
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="danger"
+                    <el-button v-if="isFeeEditC" type="danger"
                         plain size="small" :disabled="!selectionCList.length || disabled || pleasereviewType"
                         @click="RevokingBillsfun('C')">撤销账单
                     </el-button>
                     <el-button type="primary" plain size="small" @click="printingCostsfun('C')">打印账单</el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="success"
+                    <el-button v-if="isFeeEditC" type="success"
                         plain size="small" :disabled="!this.assemblyForm.id || disabled || pleasereviewType"
                         @click="templateClick('C')">应付模板
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info"
+                    <el-button v-if="isFeeEditC" type="info"
                         plain size="small" :disabled="disabled || pleasereviewType" @click="feecenterSubmitListfun">一键保存
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="info"
+                    <el-button v-if="isFeeEditC" type="info"
                         plain size="small" :disabled="disabled || pleasereviewType" @click="feecenterEditfun('C')">一键编辑
                     </el-button>
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
+                    <el-button v-if="isFeeEditC" type="primary"
                         plain size="small" :disabled="disabled || pleasereviewType" @click="copyfun('C')">生成应收
                     </el-button>
                     <el-button type="info" plain size="small" :disabled="disabled"
                         @click="allClick('付费申请', 'C')">付费申请</el-button>
                 </template>
                 <template slot="indexHeader" slot-scope="scope">
-                    <el-button v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('应付修改') != -1" type="primary"
+                    <el-button v-if="isFeeEditC" type="primary"
                         size="small" icon="el-icon-plus" circle :disabled="disabled || pleasereviewType"
                         @click="addCfun">
                     </el-button>
@@ -313,7 +313,7 @@
         <avue-crud v-show="assemblyForm.feeCenterAmendList.length > 0" id="out-table" class="box-card"
             :header-cell-class-name="headerClassName" ref="crud" :row-style="{ height: '16px' }"
             :cell-style="{ padding: '0px' }" :data="assemblyForm.feeCenterAmendList" :option="amendOption"></avue-crud>
-        <div v-if="(roleName.indexOf('admin') != -1 || roleName.indexOf('利润查看') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))) && amendsStatus"
+        <div v-if="(isProfitView || (isFeeViewD && isFeeViewC)) && amendsStatus"
             style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
@@ -381,7 +381,7 @@
             :row-style="{ height: '16px' }" :cell-style="{ padding: '0px' }" :option="sumOption"
             :data="sumData"></avue-crud>
         <!--有admin 显示，有收和付各一个也显示出来-->
-        <div v-if="roleName.indexOf('admin') != -1 || roleName.indexOf('利润查看') != -1 || ((roleName.indexOf('应收修改') != -1 || roleName.indexOf('应收查看') != -1) && (roleName.indexOf('应付修改') != -1 || roleName.indexOf('应付查看') != -1))"
+        <div v-if="isProfitView || (isFeeViewD && isFeeViewC)"
             style="display: flex;align-items: center;justify-content: space-around">
             <div style="width: 30%">
                 <div class="bottomFlex" style="justify-content: space-around">
@@ -1378,6 +1378,14 @@ export default {
                 },
             ],
             roleName: [], // 当前登录人的角色权限
+            isAdmin: false, // 当前登录人是否有系统管理员角色
+            isFeeView: false, // 当前登录人是否有应收或应付费用查看角色
+            isFeeViewD: false, // 当前登录人是否有应收费用查看角色
+            isFeeViewC: false, // 当前登录人是否有应付费用查看角色
+            isFeeEdit: false, // 当前登录人是否有应收或应付费用修改角色
+            isFeeEditD: false, // 当前登录人是否有应收费用修改角色
+            isFeeEditC: false, // 当前登录人是否有应付费用修改角色
+            isProfitView: false, // 当前登录人是否有利润查看角色
             idArr: [],
         }
     },
@@ -1392,6 +1400,16 @@ export default {
             }
         })
         this.roleName = localStorage.getItem('roleName').split(',') // 获取角色数据
+        console.log("roleName", this.roleName)
+        this.isAdmin = this.roleName.indexOf('admin') >= 0;
+        this.isFeeViewD = this.isAdmin || this.roleName.indexOf('应收查看') >= 0;
+        this.isFeeViewC = this.isAdmin || this.roleName.indexOf('应付查看') >= 0;
+        this.isFeeView = this.isAdmin || this.isFeeViewD || this.isFeeViewC;
+        this.isFeeEditD = this.isAdmin || this.isFeeViewD && this.roleName.indexOf('应收修改') >= 0;
+        this.isFeeEditC = this.isAdmin || this.isFeeViewC && this.roleName.indexOf('应付修改') >= 0;
+        this.isFeeEdit = this.isAdmin || this.isFeeEditD || this.isFeeEditC;
+        this.isProfitView = this.isAdmin || this.roleName.indexOf('利润查看') >= 0;
+
         this.optionD = await this.getColumnData(this.getColumnName(309.2), this.optionDBack);
         this.optionC = await this.getColumnData(this.getColumnName(309.3), this.optionCBack);
         // 导入弹窗的表格

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -298,7 +298,7 @@
         <!--预览报表弹窗-->
         <el-dialog append-to-body title="预览报表" class="el-dialogDeep" :visible.sync="previewDialog" width="60%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
-            <business-reports :id="form.id" :disabled="detailData.seeDisabled"></business-reports>
+            <business-reports :id="form.id" :classifycode="getReportTypeByBigHandle()" :disabled="detailData.seeDisabled"></business-reports>
         </el-dialog>
     </div>
 </template>
@@ -2481,6 +2481,13 @@ export default {
                 }
             }
         },
+        getReportTypeByBigHandle() {
+            var rt="";
+            if (this.bigtabs == 'wt') rt="业务";
+            if (this.bigtabs == 'fy') rt="费用";
+            if (this.bigtabs == 'dz') rt="单证";
+            return rt;
+        },
         // 获取不分页的分单列表
         billsListAllfun(masterId) {
             billsListAll({ masterId }).then(res => {

src/views/system/user.vue

@@ -871,11 +871,24 @@
       initData(tenantId) {
         getRoleTree(tenantId).then(res => {
           const column = this.findObject(this.option.group, "roleId");
+            let data = res.data.data;
+            // 没有提取 sort
+            // data.sort((a, b)=>{
+            //     return a.sort>b.sort ? 1 : (a.sort<b.sort ? -1 : 0)
+            // })
+            // data.forEach(d=>{
+            //     if(Array.isArray(d.children)){
+            //         d.children.sort((a, b)=>{
+            //             return a.sort>b.sort ? 1 : (a.sort<b.sort ? -1 : 0)
+            //         })
+            //     }
+            // })
+
             column.dicData = []
             if (localStorage.getItem('roleName').indexOf('admin') != -1) {
-                column.dicData = res.data.data
+                column.dicData = data
             }else {
-                for (let item of res.data.data) {
+                for (let item of data) {
                     if (item.title != '管理员') {
                         column.dicData.push(item)
                     }