Merge remote-tracking branch 'origin/master'

src/views/course/courseTrafficLog/statistics.vue

@@ -43,7 +43,7 @@
           size="mini"
           :loading="exportLoading"
           @click="handleExport"
-          v-hasPermi="['course:courseRedPacketLog:export']"
+          v-hasPermi="['course:courseTrafficLog:statisticsExport']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>

src/views/his/adv/index.vue

@@ -212,6 +212,9 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="排序">
+          <el-input-number v-model="form.sort"  label="排序"></el-input-number>
+        </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.status">
              <el-radio :label="item.dictValue" v-for="item in statusOptions" >{{item.dictLabel}}</el-radio>

src/views/system/user/index.vue

@@ -154,6 +154,26 @@
               <span v-else>-</span>
             </template>
           </el-table-column>
+          <el-table-column
+            label="订单权限"
+            align="center"
+            width="120">
+            <template #header>
+              <span>
+                订单权限
+                <el-tooltip
+                  content="此列显示用户所属公司，决定了用户可以查看和操作哪些订单数据。不同公司对应不同的数据访问范围。"
+                  placement="top">
+                  <i class="el-icon-question" style="margin-left:4px;cursor:pointer;"></i>
+                </el-tooltip>
+              </span>
+            </template>
+
+            <template #default="{ row }">
+              <el-tag v-for="item in companys" v-if="item.companyId == row.companyId" >{{item.companyName}}</el-tag>
+            </template>
+          </el-table-column>
+
           <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
             <template slot-scope="scope">
               <el-switch
@@ -200,7 +220,7 @@
                   <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
                     v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
                     <el-dropdown-item command="handleSetUser" icon="el-icon-warning-outline"
-                    v-hasPermi="['system:user:edit']">用户设置</el-dropdown-item>  
+                    v-hasPermi="['system:user:edit']">用户设置</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
             </template>
@@ -308,6 +328,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="订单权限">
+              <el-select filterable  v-model="form.companyId" clearable placeholder="请选择公司名" size="small">
+                <el-option
+                  v-for="item in companys"
+                  :key="item.companyId"
+                  :label="item.companyName"
+                  :value="item.companyId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -362,6 +394,7 @@ import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getCompanyList } from '@/api/company/company'
 
 export default {
   name: "User",
@@ -493,8 +526,12 @@ export default {
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
+    getCompanyList().then(response => {
+      this.companys = response.data;
+    });
   },
   methods: {
+
     /** 查询用户列表 */
     getList() {
       this.loading = true;
@@ -587,7 +624,7 @@ export default {
           break;
         case "handleSetUser":
           this.handleSetUser(row);
-          break  
+          break
         default:
           break;
       }
@@ -760,4 +797,4 @@ export default {
     }
   }
 };
-</script>
+</script>