Merge branch 'dev' of http://110.41.143.128:8081/lanbaoming/jiedao-app-operator-master into dev

src/api/report/EcwReportPermission.js

@@ -55,3 +55,13 @@ export function exportExcel(query) {
     responseType: 'blob'
   })
 }
+
+//lanbm 2024-04-19 add
+//获取指定部门的子部门
+export function getDeptChild(query) {
+  return request({
+    url: '/Report/SysDeptEx/getDeptChild',
+    method: 'get',
+    params: query
+  })
+}

src/views/report/EcwReportPermission/index.vue

@@ -44,7 +44,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['my:test:create']"
+          v-hasPermi="['report:permission:create']"
           >新增</el-button
         >
       </el-col>
@@ -101,7 +101,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['my:test:update']"
+            v-hasPermi="['report:permission:update']"
             >修改</el-button
           >
           <el-button
@@ -109,7 +109,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['my:test:delete']"
+            v-hasPermi="['report:permission:delete']"
             >删除</el-button
           >
         </template>

src/views/report/customer_analysis/index.vue

@@ -193,7 +193,7 @@
           :loading="exportLoading"
           >导出</el-button
         >
-        <el-button type="primary" size="mini" @click="test" v-show="false">
+        <el-button type="primary" size="mini" @click="test" v-show="true">
           测试
         </el-button>
       </el-form-item>
@@ -219,7 +219,7 @@
         prop="allsumvolumeTbShow"
       />
 
-      <el-table-column label="海运拼柜" align="center" prop="sumvolume1" />
+      <el-table-column label="海运拼柜" align="center" prop="sumvolumeV1" />
       <el-table-column label="海运占比" align="center" prop="seaZb" />
       <el-table-column
         label="海运拼柜同比"
@@ -227,7 +227,7 @@
         prop="sumvolumeTbShow1"
       />
 
-      <el-table-column label="专线空运" align="center" prop="sumweight3" />
+      <el-table-column label="专线空运" align="center" prop="sumweightV3" />
       <el-table-column label="空运占比" align="center" prop="airZb" />
       <el-table-column
         label="专线空运同比"
@@ -256,7 +256,12 @@
       <el-table-column label="控货总V值" align="center" prop="khSumV" />
       <el-table-column label="控货占比" align="center" prop="khSumZb" />
       <el-table-column label="是否首次成交" align="center" prop="isFirst" />
-      <el-table-column label="首次成交时间" align="center" prop="firstDate">
+      <el-table-column
+        label="首次成交时间"
+        align="center"
+        prop="firstDate"
+        width="200px"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.firstDate) }}</span>
         </template>
@@ -266,7 +271,12 @@
       <el-table-column label="客户来源" align="center" prop="sourcename" />
       <el-table-column label="客户角色" align="center" prop="customerrole" />
       <el-table-column label="客户国家" align="center" prop="country" />
-      <el-table-column label="客户户创建时间" align="center" prop="createtime">
+      <el-table-column
+        label="客户户创建时间"
+        align="center"
+        prop="createtime"
+        width="200px"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createtime) }}</span>
         </template>
@@ -291,7 +301,10 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@/assets/styles/vue-treeselect.css";
 import { listSimpleDepts } from "@/api/system/dept";
 import { getListPage, exportExcel } from "@/api/report/customeranalysis";
-import { getCurUserPermission } from "@/api/report/EcwReportPermission";
+import {
+  getCurUserPermission,
+  getDeptChild,
+} from "@/api/report/EcwReportPermission";
 import { MessageBox } from "element-ui";
 
 function currentTime2() {
@@ -423,8 +436,8 @@ export default {
         first: undefined, //是否首次成交
         cusYjType: undefined, //客户业绩类型，新客户还是老客户
         searchDataType1: undefined, //查询数据类型
-        searchDataType2:undefined,
-        searchDataType3:undefined,
+        searchDataType2: undefined,
+        searchDataType3: undefined,
         searchDateType: "createdate", //日期查询类型
         sdate: formatDate3(),
         edate: formatDate2(), //结束日期
@@ -561,6 +574,13 @@ export default {
         this.deptOptions = [];
         this.deptOptions.push(...this.handleTree(response.data, "id"));
       });
+      
+      /*
+      getDeptChild().then((response) => {
+        this.deptOptions = [];
+        this.deptOptions.push(...this.handleTree(response.data, "id"));
+      });*/
+      
     },
     //格式化部门的下拉框
     normalizer(node) {
@@ -579,7 +599,11 @@ export default {
       return strDate;
     },
     test() {
-      //对象的拷贝
+      let json1 = JSON.stringify(this.deptOptions);
+      alert(json1);
+      return;
+
+      //对象的拷贝 lanbm 2024-04-19 add
       let target = {};
       let source = { c: 3 };
       Object.assign(target, source);

src/views/report/vz/index.vue

@@ -37,7 +37,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['my:test:create']"
+          v-hasPermi="['report:vz:create']"
           >新增</el-button
         >
       </el-col>
@@ -81,7 +81,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['my:test:update']"
+            v-hasPermi="['report:vz:update']"
             >修改</el-button
           >
           <el-button
@@ -89,7 +89,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['my:test:delete']"
+            v-hasPermi="['report:vz:delete']"
             >删除</el-button
           >
         </template>