Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/utils/cos.js
#	src/views/course/videoResource/index.vue

public/index.html

@@ -118,7 +118,7 @@
       top: 0;
       width: 51%;
       height: 100%;
-      background: #13c2c2;
+      background: #409eff;
       z-index: 1000;
       -webkit-transform: translateX(0);
       -ms-transform: translateX(0);

src/api/company/companyUser.js

@@ -77,11 +77,20 @@ export function getUserList(companyId){
 }
 
 // 根据登录的用户公司获取所有的销售
-export function getCompanyUserList(query) {
+export function getCompanyUserList(data) {
   return request({
     url: '/company/companyUser/getCompanyUserList',
     method: 'get',
-    query: query
+    params: data
+  })
+}
+
+// 获取所有的公司
+export function getCompanyList(data) {
+  return request({
+    url: '/company/company/getCompanyList',
+    method: 'get',
+    params: data
   })
 }
 

src/api/system/keyword.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询系统关键字列表
+export function listKeyword(query) {
+  return request({
+    url: '/system/keyword/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询系统关键字详细
+export function getKeyword(keywordId) {
+  return request({
+    url: '/system/keyword/' + keywordId,
+    method: 'get'
+  })
+}
+
+// 新增系统关键字
+export function addKeyword(data) {
+  return request({
+    url: '/system/keyword',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改系统关键字
+export function updateKeyword(data) {
+  return request({
+    url: '/system/keyword',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除系统关键字
+export function delKeyword(keywordId) {
+  return request({
+    url: '/system/keyword/' + keywordId,
+    method: 'delete'
+  })
+}
+
+// 导出系统关键字
+export function exportKeyword(query) {
+  return request({
+    url: '/system/keyword/export',
+    method: 'get',
+    params: query
+  })
+}

src/assets/styles/element-variables.scss

@@ -4,7 +4,7 @@
 **/
 
 /* theme color */
-$--color-primary: #13c2c2;
+$--color-primary: #409eff;
 $--color-success: #13ce66;
 $--color-warning: #ffba00;
 $--color-danger: #ff4949;

src/assets/styles/variables.scss

@@ -3,10 +3,10 @@ $blue:#324157;
 $light-blue:#3A71A8;
 $red:#C03639;
 $pink: #E65D6E;
-$green: #30B08F;
-$tiffany: #4AB7BD;
+$green: #409eff;
+$tiffany: #409eff;
 $yellow:#FEC171;
-$panGreen: #30B08F;
+$panGreen: #409eff;
 
 // sidebar
 $menuText:#bfcbd9;

src/components/ThemePicker/index.vue

@@ -9,7 +9,7 @@
 
 <script>
 const version = require('element-ui/package.json').version // element-ui version from node_modules
-const ORIGINAL_THEME = '#13c2c2' // default color
+const ORIGINAL_THEME = '#409eff' // default color
 
 export default {
   data() {

src/components/TopNav/index.vue

@@ -138,7 +138,7 @@ export default {
 }
 
 .el-menu--horizontal > .el-menu-item.is-active {
-  border-bottom: 3px solid #13c2c2;
+  border-bottom: 3px solid #409eff;
   color: #303133;
 }
 </style>

src/utils/obs.js

@@ -29,7 +29,7 @@ export const uploadToOBS = async(file,progressCallback,type) =>  {
         return new Promise((resolve, reject) => {
             //上传对象
             obsClient.putObject({
-                Bucket: 'ylrz-obs2024',//桶名称
+                Bucket: 'fby-hw079058881',//桶名称
                 Key: key,//文件名
                 Body: file,
                 ProgressCallback: callback,//进度回调

src/views/company/company/index.vue

@@ -570,7 +570,7 @@ export default {
 
     handleResetPwd(row) {
       const companyIds = row.companyId || this.ids;
-      this.$confirm('是否确认重复密码为123456?', "警告", {
+      this.$confirm('是否确认重复密码为cq654321!!', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"

src/views/course/courseQuestionBank/index.vue

@@ -227,6 +227,7 @@
         <el-alert v-if="!form.type" title="选择题目类别后添加选项" type="warning" show-icon></el-alert>
 
         <el-form-item label="选项"  v-if="form.type">
+          <el-button @click="addRow" size="mini" type="primary">新增选项</el-button>
           <el-table border :data="question"  :cell-style="{ textAlign: 'center' }"		 :header-cell-style="{textAlign: 'center'}"   >
             <el-table-column label="序号" width="65px" >
               <template slot-scope="scope">
@@ -267,7 +268,6 @@
             <el-table-column label="操作">
               <template slot-scope="scope">
                 <el-button @click="deleteRow(scope.$index)"   size="mini" type="text" v-if="question.length>1">删除</el-button>
-                <el-button @click="addRow(scope.$index+1)" size="mini" type="text" >新增</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -344,6 +344,9 @@ export default {
       statusOptions: [],
       question:[
         { name: "", isAnswer: 0, indexId:0},
+        { name: "", isAnswer: 0, indexId:1},
+        { name: "", isAnswer: 0, indexId:2},
+        { name: "", isAnswer: 0, indexId:3},
       ],
       // 遮罩层
       loading: true,
@@ -486,8 +489,8 @@ export default {
       }
 
     },
-    addRow(val) {
-      this.question.push({ name: '', isAnswer: 0,indexId:val});},
+    addRow() {
+      this.question.push({ name: '', isAnswer: 0,indexId: this.question.length});},
     deleteRow(index) {
       if (this.form.type === 1 && this.question[index] === this.selectedAnswer) {
         this.selectedAnswer = null;
@@ -570,6 +573,12 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+
+          if (this.question.some(q => q.name === "")) {
+            this.$message.error("不能存在空选项")
+            return
+          }
+
           this.form.question=JSON.stringify(this.question)
 
           if (this.form.type===2){

src/views/course/courseUserStatistics/qw/statistics.vue

@@ -475,7 +475,7 @@ export default {
       videoList:[],
       logTypeOptions:[],
       // 遮罩层
-      loading: true,
+      loading: false,
       // 导出遮罩层
       exportLoading: false,
       // 选中数组
@@ -527,9 +527,9 @@ export default {
       if(this.companys!=null&&this.companys.length>0){
       }
     });
-    courseList().then(response => {
-      this.courseLists = response.list;
-    });
+    // courseList().then(response => {
+    //   this.courseLists = response.list;
+    // });
     this.getDicts("sys_course_watch_log_type").then(response => {
       this.logTypeOptions = response.data;
     });

src/views/course/userCourse/index.vue

@@ -95,39 +95,9 @@
         >导出
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-if="queryParams.isShow==0"
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="multiple"
-          @click="putOn"
-          v-hasPermi="['course:userCourse:putOn']"
-        >上架
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-if="queryParams.isShow==1"
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="multiple"
-          @click="pullOff"
-          v-hasPermi="['course:userCourse:pullOff']"
-        >下架
-        </el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-tabs type="card" v-model="queryParams.isShow" @tab-click="handleClick">
-      <el-tab-pane label="已上架" name="1"></el-tab-pane>
-      <el-tab-pane label="待上架" name="0"></el-tab-pane>
-    </el-tabs>
     <el-table height="600" border v-loading="loading" :data="userCourseList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="课程ID" align="center" prop="courseId"/>
@@ -156,15 +126,6 @@
             @click="handleCatalog(scope.row)"
           >目录管理
           </el-button>
-          <el-button
-            size="mini"
-            type="text"
-            :icon="scope.row.isShow === 1 ? 'el-icon-close' : 'el-icon-open'"
-            @click="handleShow(scope.row)"
-            v-hasPermi="['course:userCourse:editShow']"
-          >
-            {{ scope.row.isShow === 1 ? '下架' : '上架' }}
-          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -250,6 +211,16 @@
         <el-form-item label="课程封面" prop="imgUrl">
           <ImageUpload v-model="form.imgUrl" type="image" :num="10" :width="150" :height="150"/>
         </el-form-item>
+        <el-form-item label="关联公司" prop="tags">
+          <el-select v-model="companyIds" multiple placeholder="请选择公司" filterable clearable style="width: 90%;">
+            <el-option
+              v-for="dict in companyOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -494,10 +465,6 @@ export default {
         this.$refs.userCourseCatalogDetails.getDetails(courseId, row.courseName, row.isPrivate);
       }, 200);
     },
-    handleClick(tab, event) {
-      this.queryParams.isShow = tab.name;
-      this.getList();
-    },
     /** 转换课堂分类数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
@@ -566,6 +533,7 @@ export default {
       };
       this.tags = [];
       this.subCategoryOptions = []
+      this.companyIds = []
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -639,6 +607,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
 
+          this.form.companyIds = this.companyIds.toString()
           // 私域课程
           this.form.isPrivate = 1
           if (this.form.courseId != null) {

src/views/course/userCourse/public.vue

@@ -312,20 +312,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="发课时间" prop="sendTime">
-              <el-time-picker
-                v-model="form.sendTime"
-                value-format="HH:mm"
-                format="HH:mm"
-                style="width: 100px"
-                :picker-options="{ selectableRange: startTimeRange }"
-              >
-              </el-time-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="排序" prop="sort">
@@ -440,16 +426,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="关联公司" prop="tags">
-          <el-select v-model="companyIds" multiple placeholder="请选择公司" filterable clearable style="width: 90%;">
-            <el-option
-              v-for="dict in companyOptions"
-              :key="dict.dictValue"
-              :label="dict.dictLabel"
-              :value="dict.dictValue"
-            />
-          </el-select>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -841,7 +817,6 @@ export default {
           } else {
             this.form.tags = null
           }
-          this.form.companyIds = this.companyIds.toString()
           this.form.isPrivate = 0
           if (this.form.courseId != null) {
             updateUserCourse(this.form).then(response => {

src/views/course/videoResource/index.vue

@@ -84,19 +84,19 @@
                 {{ scope.$index + 1 }}
               </template>
             </el-table-column>
-      <el-table-column label="素材名称" align="center" :show-overflow-tooltip="true" prop="resourceName" width="300"/>
-      <el-table-column label="文件名称" align="center" :show-overflow-tooltip="true" prop="fileName" width="300"/>
-      <el-table-column label="分类" align="center" width="120">
+      <el-table-column label="素材名称" align="center" :show-overflow-tooltip="true" prop="resourceName"/>
+      <el-table-column label="文件名称" align="center" :show-overflow-tooltip="true" prop="fileName"/>
+      <el-table-column label="分类" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.typeId">{{ getTypeName(scope.row.typeId) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="子分类" align="center" width="120">
+      <el-table-column label="子分类" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.typeSubId">{{ getTypeName(scope.row.typeSubId) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="视频文件" align="center" width="120">
+      <el-table-column label="视频文件" align="center">
         <template slot-scope="scope">
           <a
             @click="handleVideoPreview(scope.row.videoUrl)"
@@ -105,7 +105,7 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column label="CDN" align="center" width="120">
+      <el-table-column label="CDN" align="center">
         <template slot-scope="scope">
           <a
             @click="copy(scope.row.videoUrl)"
@@ -114,7 +114,7 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column label="关联题目" align="center" width="150">
+      <el-table-column label="关联题目" align="center">
         <template slot-scope="scope">
           <a
             @click="handleViewProject(scope.row, 3)"
@@ -143,12 +143,12 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column label="视频时长" align="center" width="150">
+      <el-table-column label="视频时长" align="center">
         <template slot-scope="scope">
           <div style="padding: 4px 12px;background: linear-gradient(to right, rgb(196 219 255), #409EFF)">{{ formatDuration(scope.row.duration) }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/crm/customer/line.vue

@@ -136,7 +136,7 @@
       <el-tab-pane label="待分配" name="0"></el-tab-pane>
       <el-tab-pane label="已分配" name="1"></el-tab-pane>
     </el-tabs>
-    <el-table  height="500" border v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
+    <el-table border height="500" border v-loading="loading" :data="customerList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="customerId" />
       <el-table-column label="所属公司" align="center" prop="companyName" />

src/views/crm/event/index.vue

@@ -103,7 +103,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="eventList" @selection-change="handleSelectionChange">
+    <el-table border v-loading="loading" :data="eventList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="关联ID" align="center" prop="eventId" />
       <el-table-column label="标题" align="center" prop="title" />
@@ -137,7 +137,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"

src/views/fs/user/index.vue

@@ -51,6 +51,13 @@
           </el-tag>
         </template>
       </el-table-column>
+<!--      <el-table-column label="是否重粉" align="center" prop="isRepeat">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-tag :type="scope.row.isRepeat === 1 ? 'success' : 'danger'">-->
+<!--            {{ scope.row.status === 1 ? '是' : '否' }}-->
+<!--          </el-tag>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="看课数量" align="center" prop="watchCourseCount" />
       <el-table-column label="参与营期数量" align="center" prop="partCourseCount" />
       <el-table-column label="所属销售" align="center" prop="companyUserNickName" />
@@ -71,9 +78,9 @@
 <!--            size="mini"-->
 <!--            type="text"-->
 <!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
+<!--            @click="handleQwAccount(scope.row)"-->
 <!--            v-hasPermi="['fs:user:remove']"-->
-<!--          >删除</el-button>-->
+<!--          >查看重粉列表</el-button>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
     </el-table>
@@ -114,6 +121,16 @@
     <!-- 更换会员归属对话框 -->
     <el-dialog title="更换会员归属" :visible.sync="changeCompanyUserOpen" width="500px" append-to-body>
       <el-form ref="changeCompanyUserForm" :model="changeCompanyUserForm" :rules="changeCompanyUserRules" label-width="100px">
+        <el-form-item label="选择公司" prop="companyId">
+          <el-select v-model="changeCompanyUserForm.companyId" placeholder="请选择公司" style="width: 100%" @change="handleCompanyChange">
+            <el-option
+              v-for="item in companyOptions"
+              :key="item.companyId"
+              :label="item.companyName"
+              :value="item.companyId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="选择销售" prop="companyUserId">
           <el-select v-model="changeCompanyUserForm.companyUserId" placeholder="请选择销售" style="width: 100%" @change="handleCompanyUserChange">
             <el-option
@@ -135,7 +152,7 @@
 
 <script>
 import { listUser, delUser, addUser, updateUser, exportUser } from "@/api/fs/user";
-import { getCompanyUserList, changeCompanyUser } from '@/api/company/companyUser';
+import { getCompanyUserList, changeCompanyUser, getCompanyList } from '@/api/company/companyUser';
 export default {
   name: "User",
   data() {
@@ -187,23 +204,32 @@ export default {
       changeCompanyUserOpen: false,
       // 更换会员归属表单
       changeCompanyUserForm: {
+        companyId: null,
         companyUserId: null,
-        companyId: null
+        userIds: []
       },
       // 更换会员归属表单校验
       changeCompanyUserRules: {
+        companyId: [
+          { required: true, message: '请选择公司', trigger: 'change' }
+        ],
         companyUserId: [
-          { required: true, message: "请选择销售", trigger: "change" }
+          { required: true, message: '请选择销售', trigger: 'change' }
         ]
       },
       // 销售选项
-      companyUserOptions: []
+      companyUserOptions: [],
+      companyOptions: []
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    // 查看企微账号
+    handleQwAccount(row){
+
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;
@@ -302,62 +328,74 @@ export default {
     },
     /** 更换会员归属按钮操作 */
     handleChangeCompanyUser() {
-      // 获取销售列表
-      getCompanyUserList().then(response => {
+      // 获取公司下拉列表
+      getCompanyList().then(response => {
         if (response.code === 200) {
-          this.companyUserOptions = response.data;
-          console.log("列表", this.companyUserOptions);
+          this.companyOptions = response.data;
+          // 重置表单和销售列表
+          this.resetCompanyUserForm();
+          this.companyUserOptions = [];
           this.changeCompanyUserOpen = true;
         } else {
-          this.$message.error(response.msg || '获取销售列表失败');
+          this.$message.error(response.msg || '获取公司列表失败');
         }
       }).catch(() => {
-        this.$message.error('获取销售列表失败');
+        this.$message.error('获取公司列表失败');
       });
     },
-    /** 取消更换会员归属 */
-    cancelChangeCompanyUser() {
-      this.changeCompanyUserOpen = false;
-      this.resetCompanyUserForm();
-    },
     /** 销售选择变化 */
-    handleCompanyUserChange(value) {
-      const selectedUser = this.companyUserOptions.find(item => item.userId === value);
-      if (selectedUser) {
-        this.changeCompanyUserForm.companyId = selectedUser.companyId;
-        console.log("选择的销售信息:", selectedUser);
-        console.log("设置的companyId:", this.changeCompanyUserForm.companyId);
+    handleCompanyUserChange(userId) {
+      if (!this.changeCompanyUserForm.companyId) {
+        this.$message.warning('请先选择公司');
+        this.changeCompanyUserForm.companyUserId = null;
+        return;
       }
     },
     /** 重置更换会员归属表单 */
     resetCompanyUserForm() {
       this.changeCompanyUserForm = {
+        companyId: null,
         companyUserId: null,
-        companyId: null
+        userIds: []
       };
       this.resetForm("changeCompanyUserForm");
     },
+    handleCompanyChange(companyId) {
+      // 清空已选择的销售
+      this.changeCompanyUserForm.companyUserId = null;
+      // 根据公司ID获取对应的销售列表
+      if (companyId) {
+        getCompanyUserList({ companyId: companyId }).then(response => {
+          if (response.code === 200) {
+            this.companyUserOptions = response.data;
+          } else {
+            this.$message.error(response.msg || '获取销售列表失败');
+            this.companyUserOptions = [];
+          }
+        }).catch(() => {
+          this.$message.error('获取销售列表失败');
+          this.companyUserOptions = [];
+        });
+      } else {
+        this.companyUserOptions = [];
+      }
+    },
+    /** 取消更换会员归属 */
+    cancelChangeCompanyUser() {
+      this.changeCompanyUserOpen = false;
+      this.resetCompanyUserForm();
+    },
     /** 提交更换会员归属 */
     submitChangeCompanyUserForm() {
       this.$refs["changeCompanyUserForm"].validate(valid => {
         if (valid) {
           // 调用更换会员归属接口
-          console.log("销售", this.changeCompanyUserForm);
-          console.log("用户", this.ids);
-
           // 检查companyId是否已设置
           if (!this.changeCompanyUserForm.companyId) {
-            this.$message.error('请选择销售');
+            this.$message.error('请选择公司');
             return;
           }
 
-          // 确保userIds是List<Long>类型
-          // const userIds = this.ids.map(id => Number(id));
-          console.log({
-            userIds:  this.ids,
-            companyUserId: this.changeCompanyUserForm.companyUserId,
-            companyId: this.changeCompanyUserForm.companyId
-          })
           changeCompanyUser(this.ids, {
               companyUserId: this.changeCompanyUserForm.companyUserId,
               companyId: this.changeCompanyUserForm.companyId

src/views/index.vue

@@ -175,46 +175,6 @@
         </el-col>
       </el-row>
     </el-card>
-
-    <el-row :gutter="20" class="charts-section">
-      <el-col :span="12">
-        <el-card shadow="never">
-          <div slot="header" class="chart-header">
-            <span>本月订单数</span>
-            <div class="legend">
-              <div class="legend-item">
-                <span class="dot viewer-dot"></span>
-                <span>订单数</span>
-              </div>
-              <div class="legend-item">
-                <span class="dot complete-dot"></span>
-                <span>订单金额</span>
-              </div>
-            </div>
-          </div>
-          <div ref="viewerOrderChart" class="chart-container"></div>
-        </el-card>
-      </el-col>
-      <el-col :span="12">
-        <el-card shadow="never">
-          <div slot="header" class="chart-header">
-            <span>本月收款数</span>
-            <div class="legend">
-              <div class="legend-item">
-                <span class="dot viewer-dot"></span>
-                <span>收款数</span>
-              </div>
-              <div class="legend-item">
-                <span class="dot complete-dot"></span>
-                <span>收款金额</span>
-              </div>
-            </div>
-          </div>
-          <div ref="viewerReceiveChart" class="chart-container"></div>
-        </el-card>
-      </el-col>
-    </el-row>
-    <br/>
     <!-- 分析概览 (Analysis Overview) -->
     <div class="analysis-section" shadow="never">
       <div slot="header" class="header">
@@ -467,6 +427,45 @@
         </el-col>
       </el-row>
     </transition>
+    <el-row :gutter="20" class="charts-section">
+      <el-col :span="12">
+        <el-card shadow="never">
+          <div slot="header" class="chart-header">
+            <span>本月订单数</span>
+            <div class="legend">
+              <div class="legend-item">
+                <span class="dot viewer-dot"></span>
+                <span>订单数</span>
+              </div>
+              <div class="legend-item">
+                <span class="dot complete-dot"></span>
+                <span>订单金额</span>
+              </div>
+            </div>
+          </div>
+          <div ref="viewerOrderChart" class="chart-container"></div>
+        </el-card>
+      </el-col>
+      <el-col :span="12">
+        <el-card shadow="never">
+          <div slot="header" class="chart-header">
+            <span>本月收款数</span>
+            <div class="legend">
+              <div class="legend-item">
+                <span class="dot viewer-dot"></span>
+                <span>收款数</span>
+              </div>
+              <div class="legend-item">
+                <span class="dot complete-dot"></span>
+                <span>收款金额</span>
+              </div>
+            </div>
+          </div>
+          <div ref="viewerReceiveChart" class="chart-container"></div>
+        </el-card>
+      </el-col>
+    </el-row>
+    <br/>
   </div>
 </template>
 
@@ -1456,7 +1455,7 @@ export default {
   background-color: #fff;
   border-radius: 4px;
   padding: 15px;
-  height: 100px;
+  height: 120px;
   display: flex;
   flex-direction: column;
   position: relative;

src/views/login.vue

@@ -86,7 +86,12 @@ export default {
           { required: true, trigger: "blur", message: "用户名不能为空" }
         ],
         password: [
-          { required: true, trigger: "blur", message: "密码不能为空" }
+          { required: true, trigger: "blur", message: "密码不能为空" },
+          {
+            pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[^A-Za-z0-9]).{8,20}$/,
+            message: "密码长度为 8-20 位，必须包含字母、数字和特殊字符",
+            trigger: ["blur", "change"],
+          }
         ],
         code: [{ required: true, trigger: "change", message: "验证码不能为空" }]
       },

src/views/oms/orderInternal/add.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px" style="margin-bottom:40px">
         <div class="bj-divider">
-          <div class="left"> 
+          <div class="left">
                 <span class="default-text">三方订单基本信息</span>
                 <div class="button"></div>
                 <span class="tips"></span>
@@ -29,7 +29,7 @@
                     <el-select  style="width:100%"  @change="channelChange" v-model="form.channelType" :placeholder="storePlaceholder" clearable size="small">
                       <el-option
                             v-for="item in channelTypeOptions"
-                            :key="'channelType'+item.dictValue"  
+                            :key="'channelType'+item.dictValue"
                             :label="item.dictLabel"
                             :value="item.dictValue"/>
                     </el-select>
@@ -40,16 +40,16 @@
                     <el-select style="width:100%" :disabled="storeAvailable" ref="storeId" v-model="form.storeId" placeholder="请选择销售店铺" clearable size="small">
                       <el-option
                             v-for="item in stores"
-                            :key="'omsStore'+item.storeId"  
+                            :key="'omsStore'+item.storeId"
                             :label="item.storeName"
                             :value="item.storeId"/>
                     </el-select>
-                </el-form-item>    
+                </el-form-item>
            </el-col>
            <el-col :span="18">
                 <el-form-item label-width="100px" label="商家备注" prop="channelType">
                     <el-input type="textarea" v-model="form.orderRemark" show-word-limit maxlength="200"></el-input>
-               </el-form-item>   
+               </el-form-item>
            </el-col>
         </el-row>
 
@@ -86,7 +86,7 @@
 
            <el-col :span="9">
               <el-form-item  label-width="10px"  prop="cityIds">
-                  <el-input v-model="form.userAddress" placeholder="详情地址" /> 
+                  <el-input v-model="form.userAddress" placeholder="详情地址" />
               </el-form-item>
           </el-col>
 
@@ -94,10 +94,10 @@
            <el-col :span="18">
                 <el-form-item label-width="100px" label="买家备注" prop="buyerRemark" >
                     <el-input type="textarea" v-model="form.buyerRemark" show-word-limit maxlength="200"></el-input>
-               </el-form-item>   
+               </el-form-item>
            </el-col>
         </el-row>
-  
+
          <div class="bj-divider"><div class="left"><span class="default-text">支付信息</span><div class="button"></div><span class="tips"></span></div></div>
          <el-row>
           <el-col :span="8">
@@ -105,7 +105,7 @@
                     <el-select  style="width:100%"  v-model="form.payType" placeholder="请选择支付方式" clearable size="small">
                       <el-option
                             v-for="item in payTypeOptions"
-                            :key="'payType'+item.dictValue"  
+                            :key="'payType'+item.dictValue"
                             :label="item.dictLabel"
                             :value="item.dictValue"/>
                     </el-select>
@@ -113,7 +113,7 @@
           </el-col>
           <el-col :span="8">
               <el-form-item  label-width="100px" label="支付金额" prop="buyerPayAmount"  style="margin-right:20px">
-                 <el-input v-model="form.buyerPayAmount" type="number"  placeholder="请输入" /> 
+                 <el-input v-model="form.buyerPayAmount" type="number"  placeholder="请输入" />
               </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -130,7 +130,7 @@
                     <el-select  style="width:100%"   v-model="form.payStatus" placeholder="请选择" clearable size="small">
                       <el-option
                             v-for="item in payStatusOptions"
-                            :key="'payStatus'+item.dictValue"  
+                            :key="'payStatus'+item.dictValue"
                             :label="item.dictLabel"
                             :value="item.dictValue"/>
                     </el-select>
@@ -157,7 +157,7 @@
                           <el-radio :key="'isThirdDiscount'+item.dictValue"   :label="item.dictValue" v-for="item in isThirdDiscountOptions" >{{item.dictLabel}}</el-radio>
                         </el-radio-group>
                   </el-form-item>
-              </el-col>  
+              </el-col>
               <el-col :span="9" v-if="form.isThirdDiscount!='0'">
                     <el-form-item label-width="10" label="" prop="thirdDiscount">
                       <el-input v-model="form.thirdDiscount" placeholder="三方平台优惠金额" />
@@ -167,7 +167,7 @@
                   <el-form-item label-width="100px" label="优惠承担" prop="thirdDiscountAmount" style="margin-right:10px">
                       <el-input v-model="form.thirdDiscountAmount" placeholder="三方平台承担优惠金额" />
                     </el-form-item>
-              </el-col>  
+              </el-col>
               <el-col :span="9" v-if="form.isThirdDiscount!='0'">
                     <el-form-item label-width="10" label="" prop="businessDiscountAmount">
                       <el-input v-model="form.businessDiscountAmount" placeholder="商家承担优惠金额" />
@@ -181,7 +181,7 @@
                    <span class="tips"></span>
               </div>
           </div>
-          <el-row> 
+          <el-row>
                <el-col :span="24">
                   <el-form-item label="" label-width="0" prop="productList" style="margin-left:0" >
                         <el-table border width="100%" style="margin-top:5px;"  :data="products">
@@ -239,7 +239,7 @@
                           </el-col>
                         </el-row> -->
                   </el-form-item>
-               </el-col> 
+               </el-col>
           </el-row>
       </el-form>
 
@@ -540,7 +540,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped> 
+<style lang="scss" scoped>
 
 .app-main{
   background: #ffffff;
@@ -585,7 +585,7 @@ export default {
     display: flex
 }
 .bj-divider .default-text {
-    border-left: 4px #13c2c2 solid;
+    border-left: 4px #409eff solid;
     padding-left: 16px;
     font-size: 18px
 }
@@ -634,4 +634,4 @@ export default {
     background: #ffffff;
     height: 65px;
 }
-</style>
+</style>

src/views/qw/forbiddenMessage/index.vue

@@ -28,7 +28,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      
+
       <el-form-item label="消息编号" prop="id">
         <el-input
           v-model="queryParams.id"
@@ -78,7 +78,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" border :data="forbiddenMessageList" @selection-change="handleSelectionChange">
+    <el-table border v-loading="loading" border :data="forbiddenMessageList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="40" align="center" />
       <el-table-column label="公司" width="200" align="center" prop="companyName" />
       <el-table-column label="员工" width="100" align="center" prop="companyUserName" />

src/views/qw/qwCompany/index.vue

@@ -84,7 +84,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="qwCompanyList" @selection-change="handleSelectionChange">
+    <el-table border v-loading="loading" :data="qwCompanyList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="企业CorpID" align="center" prop="corpId" />

src/views/qw/words/index.vue

@@ -10,7 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-    
+
       <el-form-item label="操作人" prop="operator">
         <el-input
           v-model="queryParams.operator"
@@ -68,7 +68,7 @@
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="wordsList" @selection-change="handleSelectionChange">
+    <el-table border v-loading="loading" :data="wordsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号"  width="55" type="index" align="center" />
       <el-table-column label="id" align="center" prop="id" />
@@ -93,7 +93,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -272,4 +272,4 @@ export default {
     }
   }
 };
-</script>
+</script>

src/views/statistics/member/index.vue

@@ -165,31 +165,37 @@
         <!-- 序号列 -->
         <el-table-column label="序号" type="index" width="60" align="center" />
         <!-- 统计日期列 -->
-        <el-table-column prop="date" label="统计日期" min-width="100" align="center" />
+        <el-table-column prop="statDate" label="统计日期" min-width="100" align="center" />
         <!-- 会员名称列 -->
-        <el-table-column prop="memberName" label="会员名称" min-width="100" align="center" />
-        <!-- 性别列 -->
-        <el-table-column prop="gender" label="性别" width="60" align="center" />
+        <el-table-column prop="nickName" label="会员名称" min-width="100" align="center" />
         <!-- 手机号列 -->
-        <el-table-column prop="mobile" label="手机号" min-width="100" align="center" />
+        <el-table-column prop="phone" label="手机号" min-width="100" align="center" />
         <!-- 会员标签列 -->
-        <el-table-column prop="memberTag" label="会员标签" min-width="100" align="center" />
+        <el-table-column prop="tag" label="会员标签" min-width="100" align="center" />
         <!-- 所属群管列 -->
-        <el-table-column prop="groupName" label="所属群管" min-width="100" align="center" />
+        <el-table-column prop="companyUserName" label="所属群管" min-width="100" align="center" />
         <!-- 所属经销商列 -->
-        <el-table-column prop="dealerName" label="所属经销商" min-width="100" align="center" />
+        <el-table-column prop="companyName" label="所属经销商" min-width="100" align="center" />
         <!-- 观看课程列 -->
-        <el-table-column prop="viewCount" label="观看课程" min-width="80" align="center" />
+        <el-table-column prop="count" label="观看课程" min-width="80" align="center" />
         <!-- 完课课程列 -->
-        <el-table-column prop="finishCount" label="完课课程" min-width="80" align="center" />
+        <el-table-column prop="overCount" label="完课课程" min-width="80" align="center" />
         <!-- 完课率列 -->
-        <el-table-column prop="finishRate" label="完课率" min-width="80" align="center" />
+        <el-table-column prop="finishRate" label="完课率" min-width="80" align="center">
+          <template slot-scope="scope">
+            {{ getPercentage(scope.row.overCount,  scope.row.count) }}
+          </template>
+        </el-table-column>
         <!-- 观看次数列 -->
-        <el-table-column prop="viewTimes" label="观看次数" min-width="80" align="center" />
+        <el-table-column prop="watchCount" label="观看次数" min-width="80" align="center" />
         <!-- 完课次数列 -->
-        <el-table-column prop="finishTimes" label="完课次数" min-width="80" align="center" />
+        <el-table-column prop="overCount" label="完课次数" min-width="80" align="center" />
         <!-- 视频率列 -->
-        <el-table-column prop="videoRate" label="视频率" min-width="80" align="center" />
+        <el-table-column prop="videoRate" label="视频率" min-width="80" align="center" >
+          <template slot-scope="scope">
+            {{ getPercentage(scope.row.overCount,  scope.row.watchCount) }}
+          </template>
+        </el-table-column>
 
         <!-- 操作列 -->
         <el-table-column label="操作" fixed="right" min-width="160" align="center">
@@ -315,6 +321,11 @@ export default {
 
   // ============= 组件方法 =============
   methods: {
+    getPercentage(part, total, precision = 2) {
+      if (total === 0) return '0%';
+      const percent = (part / total) * 100;
+      return percent.toFixed(precision) + '%';
+    },
     /**
      * 获取表格数据
      * 根据查询参数从服务器获取会员统计数据

src/views/store/storeCanvas/components/leftBar/panel.vue

@@ -147,7 +147,7 @@ export default {
 
       &.on,
       &:hover {
-        color:#2BC7B9;
+        color:#409eff;
 
         :after {
           content: "";
@@ -156,7 +156,7 @@ export default {
           top: 0;
           width: 2px;
           height: 100%;
-          background-color: #2BC7B9;
+          background-color: #409eff;
         }
       }
     }
@@ -181,7 +181,7 @@ export default {
 
         &:before {
           content: "";
-          border-left: 5px solid #2BC7B9;
+          border-left: 5px solid #409eff;
           border-top: 4px solid transparent;
           border-bottom: 4px solid transparent;
           position: absolute;

src/views/system/config/config.vue

@@ -60,6 +60,9 @@
                 <el-input    v-model="form1.refundAddress"   ></el-input>
               </el-tooltip>
             </el-form-item>
+            <el-form-item label="会员海报图片" prop="userPosterImage">
+              <ImageUpload v-model="form1.userPosterImage" type="image" :num="10" :width="150" :height="150" :limit="1"/>
+            </el-form-item>
            <div   class="footer">
               <el-button type="primary" @click="submitForm1">提  交</el-button>
             </div>
@@ -690,7 +693,7 @@ export default {
           if(key=="store.config"){
               this.configId=response.data.configId;
               this.configKey=response.data.configKey;
-            CompanyRedPackageLogsthis.form1 =JSON.parse(response.data.configValue);
+              this.form1 =JSON.parse(response.data.configValue);
               if(this.form1.certs!=null){
                   this.photoArr=this.form1.certs.split(",");
               }

src/views/system/keyword/index.vue

@@ -0,0 +1,291 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="关键字" prop="keyword">
+        <el-input
+          v-model="queryParams.keyword"
+          placeholder="请输入关键字"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属公司" prop="companyId">
+        <el-input
+          v-model="queryParams.companyId"
+          placeholder="请输入所属公司"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:keyword:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:keyword:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:keyword:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['system:keyword:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="keywordList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="关键字" align="center" prop="keyword" />
+      <el-table-column label="类型" align="center" prop="type" />
+      <el-table-column label="所属公司" align="center" prop="companyId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:keyword:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:keyword:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改系统关键字对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="关键字" prop="keyword">
+          <el-input v-model="form.keyword" placeholder="请输入关键字" />
+        </el-form-item>
+        <el-form-item label="类型：1-看课弹幕；" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型：1-看课弹幕；">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属公司" prop="companyId">
+          <el-input v-model="form.companyId" placeholder="请输入所属公司" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listKeyword, getKeyword, delKeyword, addKeyword, updateKeyword, exportKeyword } from "@/api/system/keyword";
+
+export default {
+  name: "Keyword",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 系统关键字表格数据
+      keywordList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        keyword: null,
+        type: null,
+        companyId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询系统关键字列表 */
+    getList() {
+      this.loading = true;
+      listKeyword(this.queryParams).then(response => {
+        this.keywordList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        keywordId: null,
+        keyword: null,
+        type: null,
+        companyId: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.keywordId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加系统关键字";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const keywordId = row.keywordId || this.ids
+      getKeyword(keywordId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改系统关键字";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.keywordId != null) {
+            updateKeyword(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addKeyword(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const keywordIds = row.keywordId || this.ids;
+      this.$confirm('是否确认删除系统关键字编号为"' + keywordIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delKeyword(keywordIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有系统关键字数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportKeyword(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/system/user/profile/resetPwd.vue

@@ -42,7 +42,11 @@ export default {
         ],
         newPassword: [
           { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+          {
+            pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[^A-Za-z0-9]).{8,20}$/,
+            message: "密码长度为 8-20 位，必须包含字母、数字和特殊字符",
+            trigger: ["blur", "change"],
+          }
         ],
         confirmPassword: [
           { required: true, message: "确认密码不能为空", trigger: "blur" },

src/views/user/transfer/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="公司名" prop="companyId">
         <el-select filterable style="width: 220px" v-model="queryParams.corpId" placeholder="请选择公司名" clearable size="small">
           <el-option
@@ -12,7 +12,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="转移类型" prop="transferType">
-        <el-select v-model="queryParams.transferType" placeholder="请选择转移类型" clearable size="small">
+        <el-select v-model="queryParams.transferType" placeholder="请选择转移类型" clearable size="small" style="width: 220px">
           <el-option
             v-for="item in transferTypeList"
             :key="item.dictValue"
@@ -23,7 +23,7 @@
       <el-form-item label="目标销售" prop="targetUserId">
         <el-select v-model="queryParams.targetUserId" remote
                    placeholder="请选择" filterable clearable
-                   style="width: 100%;" @keyup.enter.native="handleQuery" :remote-method="getAllUserListLimitQuery">
+                   style="width: 220px;" @keyup.enter.native="handleQuery" :remote-method="getAllUserListLimitQuery">
           <el-option
             v-for="dict in companyUserList"
             :key="`${dict.nickName} - ${dict.userName}`"
@@ -34,7 +34,7 @@
       </el-form-item>
       <el-form-item label="发起人" prop="initiatorUserId">
         <el-select v-model="queryParams.initiatorUserId" remote placeholder="请选择" filterable clearable
-                   style="width: 100%;" @keyup.enter.native="handleQuery"
+                   style="width: 220px;" @keyup.enter.native="handleQuery"
                    :remote-method="getAllUserListLimitQuery3"
         >
           <el-option
@@ -46,7 +46,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="审批状态" prop="approvalStatus">
-        <el-select v-model="queryParams.approvalStatus" placeholder="请选择审批状态" clearable size="small">
+        <el-select v-model="queryParams.approvalStatus" placeholder="请选择审批状态" clearable size="small" style="width: 220px">
           <el-option
             v-for="item in approvalStatusList"
             :key="item.dictValue"
@@ -55,31 +55,31 @@
         </el-select>
       </el-form-item>
       <el-form-item label="审批时间" prop="processedAt">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.processedAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择审批处理时间">
+        <el-date-picker clearable size="small" style="width: 220px"
+                        v-model="queryParams.processedAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择审批处理时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="创建时间" prop="createdAt">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.createdAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择记录创建时间">
+        <el-date-picker clearable size="small" style="width: 220px"
+                        v-model="queryParams.createdAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择记录创建时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="更新时间" prop="updatedAt">
-        <el-date-picker clearable size="small" style="width: 200px"
-          v-model="queryParams.updatedAt"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择记录更新时间">
+        <el-date-picker clearable size="small" style="width: 220px"
+                        v-model="queryParams.updatedAt"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择记录更新时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -182,13 +182,13 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="审批意见/备注" prop="approvalRemark">
-          <el-input v-model="form.approvalRemark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.approvalRemark" type="textarea" placeholder="请输入内容"  disabled="disabled"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="success" @click="submitForm(1)" v-if="!viewMode">通过</el-button>
         <el-button type="danger" @click="submitForm(2)" v-if="!viewMode">拒绝</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel">关 闭</el-button>
       </div>
     </el-dialog>
   </div>