瀏覽代碼

企微打标签

吴树波 2 周之前
父節點
當前提交
58b810bb68

+ 3 - 3
src/api/company/company.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
- 
- 
+
+
 export function getCompanyInfo() {
   return request({
     url: '/company/company/getCompanyInfo',
@@ -27,5 +27,5 @@ export function getCompanyList() {
     method: 'get'
   })
 }
- 
+
 

+ 31 - 8
src/views/qw/autoTags/dayPartingIndex.vue

@@ -167,10 +167,28 @@
                     <div>
                       <div style="display: flex; align-items: center; flex-wrap: nowrap;">
                         <span style="margin-right: 10px;">规则 {{ index + 1 }}:</span>
-                        <el-form-item label="为每:" prop="week" style="flex: 8;margin-bottom: 0">
-                          <el-select v-model="item.week" remote multiple placeholder="请选择时间" filterable style="width: 350px;">
-                            <el-option v-for="dict in weekOptions" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
-                          </el-select>
+                        <el-form-item label="每天" prop="everyDay" style="flex: 8;margin-bottom: 0">
+                          <el-switch
+                            v-model="item.everyDay"
+                            active-text="每天"
+                            inactive-text="时间范围"
+                            :active-value="1"
+                            :inactive-value="0"
+                          >
+                          </el-switch>
+                        </el-form-item>
+                      </div>
+                      <div style="margin-left: 8%;display: flex; align-items: center; flex-wrap: nowrap;">
+                        <el-form-item label="时间范围:" prop="date" style="flex: 8;margin-bottom: 0" v-if="item.everyDay == 0">
+                          <el-date-picker
+                            v-model="item.date"
+                            type="daterange"
+                            @change="dateChange(item)"
+                            value-format="yyyy-MM-dd"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期">
+                          </el-date-picker>
                         </el-form-item>
                         <el-form-item prop="startTime" style="margin:0 5px 0 5px">
                           <el-time-select style="width: 120px;" placeholder="起始时间" v-model="item.startTime" :picker-options="{
@@ -347,6 +365,7 @@ export default {
       },
       //选择成员列表
       userSelectList:[],
+      defaultItem: {everyDay:1, tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,date:null,remarks:null},
 
       //详情表单参数
       detailListFrom:{},
@@ -438,7 +457,7 @@ export default {
         // 遍历 tagListFormIndex 并将 tagId 放入对应位置的 tags
         newList.forEach((tags, index) => {
           if (!this.form.rulesTags[index]) {
-            this.$set(this.form.rulesTags, index, {tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null});
+            this.$set(this.form.rulesTags, index, JSON.parse(JSON.stringify(this.defaultItem)));
           }
 
           // 确保清空原来的 tags 数组
@@ -574,7 +593,7 @@ export default {
       if (this.form.rulesTags.length >=7) {
         return this.$message.error('当前规则已达上限,无法添加规则');
       }
-      this.form.rulesTags.push({tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null})
+      this.form.rulesTags.push(JSON.parse(JSON.stringify(this.defaultItem)))
     },
 
     //选择标签弹窗
@@ -661,7 +680,7 @@ export default {
         createName: null,
         applyUsers: null,
         ruleName: null,
-        rulesTags: [{tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null}],
+        rulesTags: [JSON.parse(JSON.stringify(this.defaultItem))],
         totalNumTags: null,
         numTagsTaday: null,
         isApply: null,
@@ -675,7 +694,7 @@ export default {
       this.tagListFormIndex=[];
 
       //规则
-      this.form.rulesTags=[{tags:[],week:[1,2,3,4,5,6,7],startTime:null,endTime:null,remarks:null}];
+      this.form.rulesTags=[JSON.parse(JSON.stringify(this.defaultItem))];
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -759,6 +778,10 @@ export default {
         });
       }
     },
+    dateChange(item){
+      item.startDate = item.date[0];
+      item.endDate = item.date[1];
+    },
 
     /** 删除按钮操作 */
     handleDelete(row) {

+ 11 - 6
src/views/qw/autoTags/dayPartingIndexDetails.vue

@@ -50,12 +50,17 @@
               <div v-for="(rtList,index) in groupIndexFrom.rulesTags">
                 <div style="margin-left: 10%;margin-top: 1%">
                   <span class="spanSize">|规则 {{index +1}} </span>
-                  <div class="spanSize">客户在 每
-                    <span v-for="id in rtList.week" :key="id" style="display: inline;">
-                      <el-tag :disable-transitions="false"  v-for="list in weekOptions" :key="list.value" style="margin: 3px;" v-if="list.value==id">{{list.label}}</el-tag>
-                    </span>
-                    <span>【{{rtList.startTime}}~{{rtList.endTime}}】</span>
-                    时,打上标签
+                  <div class="spanSize">客户在
+                    <el-tag v-if="rtList.everyDay == 1" type="success">
+                      每天
+                    </el-tag>
+                    <el-tag type="success" v-if="rtList.everyDay == 0">{{rtList.startDate}} 到 {{rtList.endDate}}</el-tag>
+<!--                    <span v-for="id in rtList.week" :key="id" style="display: inline;">-->
+<!--                      <el-tag :disable-transitions="false"  v-for="list in weekOptions" :key="list.value" style="margin: 3px;" v-if="list.value==id">{{list.label}}</el-tag>-->
+<!--                    </span>-->
+                    的
+                    <el-tag type="warning">{{rtList.startTime}}~{{rtList.endTime}}</el-tag>
+                    时间段,打上标签
                     <span v-for="tagId in rtList.tags" :key="tagId" style="display: inline;">
                       <el-tag :disable-transitions="false"  v-for="list in tagList" :key="list.id" style="margin: 3px;" v-if="list.tagId==tagId">{{list.name}}</el-tag>
                     </span>

+ 98 - 38
src/views/qw/sop/addSop.vue

@@ -3,23 +3,23 @@
     <div style="margin: 30px;"> 添加sop任务</div>
     <div style="margin-top: 10px;margin-left: 50px;margin-right: 100px;margin-bottom: 60px;">
 
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="规则名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入规则名称" />
         </el-form-item>
 
         <el-form-item label="状态" prop="status">
-            <dict-tag :options="statusOptions" :value="form.status"></dict-tag>
+          <dict-tag :options="statusOptions" :value="form.status"></dict-tag>
         </el-form-item>
-<!--        <el-form-item label="状态">-->
-<!--          <el-radio-group v-model="form.status">-->
-<!--            <el-radio-->
-<!--              v-for="dict in statusOptions"-->
-<!--              :key="dict.dictValue"-->
-<!--              :label="parseInt(dict.dictValue)"-->
-<!--            >{{dict.dictLabel}}</el-radio>-->
-<!--          </el-radio-group>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item label="状态">-->
+        <!--          <el-radio-group v-model="form.status">-->
+        <!--            <el-radio-->
+        <!--              v-for="dict in statusOptions"-->
+        <!--              :key="dict.dictValue"-->
+        <!--              :label="parseInt(dict.dictValue)"-->
+        <!--            >{{dict.dictLabel}}</el-radio>-->
+        <!--          </el-radio-group>-->
+        <!--        </el-form-item>-->
         <el-form-item label="类别" prop="type">
           <el-radio-group v-model="form.type" @change="clearUser">
             <el-radio
@@ -31,11 +31,11 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="小转天数" prop="minConversionDay">
-<!--          <el-input class="el-input" type="" v-model="form.minConversionDay" placeholder="请输入" />-->
+          <!--          <el-input class="el-input" type="" v-model="form.minConversionDay" placeholder="请输入" />-->
           <el-input-number   v-model="form.minConversionDay"  :min="1" :max="100" ></el-input-number>
         </el-form-item>
         <el-form-item label="大转天数" prop="maxConversionDay">
-<!--          <el-input class="el-input" v-model="form.maxConversionDay" placeholder="请输入" />-->
+          <!--          <el-input class="el-input" v-model="form.maxConversionDay" placeholder="请输入" />-->
           <el-input-number   v-model="form.maxConversionDay"  :min="1" :max="100" ></el-input-number>
         </el-form-item>
 
@@ -93,13 +93,13 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="选择的标签" prop="tags">
-<!--            <el-select v-model="tags" remote multiple placeholder="请选择" filterable  style="width: 100%;">-->
-<!--              <el-option-->
-<!--                v-for="dict in tagList"-->
-<!--                :label="dict.name"-->
-<!--                :value="dict.tagId">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
+            <!--            <el-select v-model="tags" remote multiple placeholder="请选择" filterable  style="width: 100%;">-->
+            <!--              <el-option-->
+            <!--                v-for="dict in tagList"-->
+            <!--                :label="dict.name"-->
+            <!--                :value="dict.tagId">-->
+            <!--              </el-option>-->
+            <!--            </el-select>-->
             <div @click="hangleChangeTags()" style="cursor: pointer; border: 1px solid #e6e6e6; background-color: white; overflow: hidden; flex-grow: 1;width: 390px">
               <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
                 <el-tag type="success"
@@ -116,13 +116,13 @@
 
           </el-form-item>
           <el-form-item label="排除的标签" prop="excludeTags">
-<!--            <el-select v-model="excludeTags" remote multiple placeholder="请选择" filterable  style="width: 100%;">-->
-<!--              <el-option-->
-<!--                v-for="dict in tagList"-->
-<!--                :label="dict.name"-->
-<!--                :value="dict.tagId">-->
-<!--              </el-option>-->
-<!--            </el-select>-->
+            <!--            <el-select v-model="excludeTags" remote multiple placeholder="请选择" filterable  style="width: 100%;">-->
+            <!--              <el-option-->
+            <!--                v-for="dict in tagList"-->
+            <!--                :label="dict.name"-->
+            <!--                :value="dict.tagId">-->
+            <!--              </el-option>-->
+            <!--            </el-select>-->
             <div @click="hangleChangeOutTags()" style="cursor: pointer; border: 1px solid #e6e6e6; background-color: white; overflow: hidden; flex-grow: 1;width: 390px">
               <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
                 <el-tag type="success"
@@ -184,6 +184,16 @@
 
           </el-form-item>
         </div>
+        <el-form-item label="是否固定营期" prop="isFixed">
+          <el-radio-group v-model="form.isFixed">
+            <el-radio
+              :label="1"
+            >是</el-radio>
+            <el-radio
+              :label="0"
+            >否</el-radio>
+          </el-radio-group>
+        </el-form-item>
 
         <el-form-item label="开始时间" prop="startTime">
           <el-date-picker clearable size="small"
@@ -199,7 +209,7 @@
             (小时)
           </el-row>
         </el-form-item>
-        <el-form-item v-if="form.sendType==2 || form.sendType==4" label="自动添加SOP" prop="autoSopTime.autoSopType" >
+        <el-form-item v-if="(form.sendType==2 || form.sendType==4) && form.isFixed == 0" label="自动添加SOP" prop="autoSopTime.autoSopType" >
           <el-radio-group v-model="form.autoSopTime.autoSopType">
             <el-radio
               :label="1"
@@ -210,7 +220,7 @@
           </el-radio-group>
         </el-form-item>
         <div style="display: flex; align-items: center; flex-wrap: nowrap;">
-          <div v-if="form.autoSopTime.autoSopType==1" style="display: flex; align-items: center">
+          <div v-if="form.autoSopTime.autoSopType==1 && form.isFixed == 0" style="display: flex; align-items: center">
             <el-form-item
               label="起始时间"
               prop="autoStartTime"
@@ -246,6 +256,17 @@
             </el-form-item>
           </div>
         </div>
+        <el-form-item label="所属项目" prop="project">
+          <el-select v-model="form.project" placeholder="请选择项目" filterable clearable size="small">
+            <el-option
+              v-for="dict in projectOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="dict.dictValue"
+            />
+          </el-select>
+        </el-form-item>
+
         <el-form-item  v-if="form.autoSopTime.autoSopType==1" label="过期消息是否发送" prop="autoSopSend"  label-width="130px">
           <el-radio-group v-model="form.autoSopTime.autoSopSend">
             <el-radio
@@ -256,6 +277,19 @@
             >否</el-radio>
           </el-radio-group>
         </el-form-item>
+
+
+        <el-form-item label="是否只发送注册用户" prop="isFixed">
+          <el-radio-group v-model="form.isRegister">
+            <el-radio
+              :label="1"
+            >是</el-radio>
+            <el-radio
+              :label="0"
+            >否</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
         <el-alert
           v-if="form.autoSopTime.autoSopType==1"
           title="起始时间-结束时间之内的,当天立即创建SOP,时间之外的 次日创建SOP"
@@ -277,17 +311,17 @@
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
-    <el-dialog :title="listUser.title" :visible.sync="listUser.open" style="width: 1300px;height: 100%" append-to-body>
-      <qwUserList ref="QwUserList" @selectUserList="selectUserList"></qwUserList>
-    </el-dialog>
+      <el-dialog :title="listUser.title" :visible.sync="listUser.open" style="width: 1300px;height: 100%" append-to-body>
+        <qwUserList ref="QwUserList" @selectUserList="selectUserList"></qwUserList>
+      </el-dialog>
 
-    <el-dialog :title="companyUser.title" :visible.sync="companyUser.open" style="width: 110%;height: 100%" append-to-body>
-      <company-user-list ref="companyUserList" @selectCompanyUserList="selectCompanyUserList"></company-user-list>
-    </el-dialog>
+      <el-dialog :title="companyUser.title" :visible.sync="companyUser.open" style="width: 110%;height: 100%" append-to-body>
+        <company-user-list ref="companyUserList" @selectCompanyUserList="selectCompanyUserList"></company-user-list>
+      </el-dialog>
 
-    <el-dialog title="选择模板"  :visible.sync="tempOpen" append-to-body  >
-      <sop-temp ref="SopTempComments" @sopTemp="sopTemp"></sop-temp>
-    </el-dialog>
+      <el-dialog title="选择模板"  :visible.sync="tempOpen" append-to-body  >
+        <sop-temp ref="SopTempComments" @sopTemp="sopTemp"></sop-temp>
+      </el-dialog>
 
       <!--  选择/排除标签   -->
       <el-dialog :title="changeTagDialog.title" :visible.sync="changeTagDialog.open" style="width:100%;height: 100%" append-to-body>
@@ -380,6 +414,8 @@ export default {
       tagsIdsChangeSelectList:null,
       //排除的标签
       outTagsIdsChangeSelectList:null,
+      //添加的标签
+      addTagsIdsChangeSelectList:null,
       //标签弹窗选择
       tagChange:{
         open:false,
@@ -417,6 +453,7 @@ export default {
 
       //企微SOP发送类型
       sysQwSopType: [],
+      projectOptions:[],
 
       sopLogsDialog:{
         title:'',
@@ -427,6 +464,8 @@ export default {
       form: {
         status: 1,
         sendType:2,
+        isFixed: 0,
+        isRegister: 0,
         type: 2,
         filterType:2,
         expiryTime:2,
@@ -470,6 +509,9 @@ export default {
       this.sysQwSopType = response.data;
     });
 
+    this.getDicts("sys_course_project").then(response => {
+      this.projectOptions = response.data;
+    });
     listUser().then(res => {
         this.companyUserLists = res.rows;
       }
@@ -627,6 +669,23 @@ export default {
       }
     },
 
+    //选择排除标签
+    hangleChangeAddTags(){
+      this.changeTagDialog.title="选择排除的标签"
+      this.changeTagDialog.open=true;
+      this.changeTagDialog.type=2;
+
+      // 获取 tagListFormIndex 中的所有 tagId,用于快速查找
+      const selectedTagIds = new Set(
+        (this.outTagsIdsChangeSelectList || []).map(tagItem => tagItem?.tagId)
+      );
+      for (let i = 0; i < this.tagGroupList.length; i++) {
+        for (let x = 0; x < this.tagGroupList[i].tag.length; x++) {
+          this.tagGroupList[i].tag[x].isSelected = selectedTagIds.has(this.tagGroupList[i].tag[x].tagId);
+        }
+      }
+    },
+
     //删除一些选择的标签
     handleCloseTags(list){
       const ls = this.tagsIdsChangeSelectList.findIndex(t => t.tagId === list.tagId);
@@ -734,6 +793,7 @@ export default {
         id: null,
         name: null,
         status: 1,
+        isFixed:0,
         sendType:2,
         type: 2,
         filterType:2,

+ 0 - 12
src/views/qw/sopTemp/index.vue

@@ -292,7 +292,6 @@ import {
   exportSopTemp,
   shareSopTemp
 } from "@/api/qw/sopTemp";
-import {getCompanyList,listCompany} from "@/api/company/company";
 export default {
   name: "SopTemp",
   data() {
@@ -377,7 +376,6 @@ export default {
       this.statusOptions = response.data;
     });
 
-    this.getCompanyList();
 
     this.getDicts("sys_qw_sop_type").then(response => {
       this.sysQwSopType = response.data;
@@ -387,21 +385,11 @@ export default {
 
     handleCompanyQuery(){
       this.queryCompanyParams.pageNum = 1;
-      this.getCompanyList();
     },
     resetCompanyQuery(){
       this.resetForm("queryCompanyForm");
       this.handleCompanyQuery();
     },
-    /** 查询企业列表 */
-    getCompanyList() {
-      this.companysloading = true;
-      listCompany(this.queryCompanyParams).then(response => {
-        this.companyList = response.rows;
-        this.companyTotal = response.total;
-        this.companysloading = false;
-      });
-    },
     /** 查询sop模板列表 */
     getList() {
       this.loading = true;

+ 115 - 90
src/views/qw/tagGroup/index.vue

@@ -2,14 +2,14 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="企微公司" prop="corpId">
-                      <el-select v-model="queryParams.corpId" placeholder="企微公司"  size="small" @change="updateCorpId()">
-                        <el-option
-                          v-for="dict in myQwCompanyList"
-                          :key="dict.dictValue"
-                          :label="dict.dictLabel"
-                          :value="dict.dictValue"
-                        />
-                      </el-select>
+        <el-select v-model="queryParams.corpId" placeholder="企微公司" size="small" @change="updateCorpId()">
+          <el-option
+            v-for="dict in myQwCompanyList"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="名称" prop="name">
         <el-input
@@ -35,7 +35,8 @@
           size="mini"
           @click="handleSync"
           v-hasPermi="['qw:tagGroup:sync']"
-        >同步</el-button>
+        >同步
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -45,7 +46,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['qw:tagGroup:add']"
-        >新增</el-button>
+        >新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -56,7 +58,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['qw:tagGroup:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -67,7 +70,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['qw:tagGroup:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -78,13 +82,14 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['qw:tagGroup:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="tagGroupList" @selection-change="handleSelectionChange" border>
-      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center"/>
 
       <el-table-column label="来源" align="center" prop="groupFrom">
         <template slot-scope="scope">
@@ -92,11 +97,12 @@
           <span v-else>其他创建</span>
         </template>
       </el-table-column>
-      <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="排序" align="center" prop="order" />
-      <el-table-column label="标签" align="center" prop="tag" >
-        <template slot-scope="scope" >
-            <el-tag type="success" v-for="i in scope.row.tag" :key="i.id" style="margin: 2px 5px 0 0;">{{i.name}}</el-tag>
+      <el-table-column label="名称" align="center" prop="name"/>
+      <el-table-column label="排序" align="center" prop="order"/>
+      <el-table-column label="标签" align="center" prop="tag">
+        <template slot-scope="scope">
+          <el-tag type="success" v-for="i in scope.row.tag" :key="i.id" style="margin: 2px 5px 0 0;">{{ i.name }}
+          </el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -107,14 +113,16 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['qw:tagGroup:edit']"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['qw:tagGroup:remove']"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -132,38 +140,42 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item label="名称" prop="name">
-          <el-input v-model="form.name" placeholder="请输入名称"  />
+          <el-input v-model="form.name" placeholder="请输入名称"/>
         </el-form-item>
         <el-form-item label="排序" prop="order">
-          <el-input-number v-model="form.order" placeholder="请输入排序" />
+          <el-input-number v-model="form.order" placeholder="请输入排序"/>
         </el-form-item>
         <el-row>
-           <el-col :span="3"><div style="margin-top: 9px;font-weight: bold;float: right; margin-right: 10px;">标签</div></el-col>
+          <el-col :span="3">
+            <div style="margin-top: 9px;font-weight: bold;float: right; margin-right: 10px;">标签</div>
+          </el-col>
           <el-col :span="21">
-            <el-table :data="form.tag"   >
-            <el-table-column label="来源" prop="tagFrom" align="center" width="90" >
-              <template slot-scope="scope">
+            <el-table :data="form.tag">
+              <el-table-column label="来源" prop="tagFrom" align="center" width="90">
+                <template slot-scope="scope">
                   <span v-if="scope.row.tagFrom==1">本应用创建</span>
                   <span v-if="!scope.row.tagFrom && scope.row.tagId">其他创建</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="名称" prop="name" align="center" >
-              <template slot-scope="scope">
-                <el-input v-model="scope.row.name"   ></el-input>
-              </template>
-            </el-table-column>
-            <el-table-column label="排序" prop="order" align="center" >
-              <template slot-scope="scope">
-                <el-input-number v-model="scope.row.order"  ></el-input-number>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" width="150px" align="center">
-              <template slot-scope="scope" >
-                  <el-button @click="addRow" size="mini" type="text" >新增</el-button>
-                  <el-button @click="deleteRow(scope.$index,scope.row)"   size="mini" type="text" v-if="form.tag.length>1"   >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+                </template>
+              </el-table-column>
+              <el-table-column label="名称" prop="name" align="center">
+                <template slot-scope="scope">
+                  <el-input v-model="scope.row.name"></el-input>
+                </template>
+              </el-table-column>
+              <el-table-column label="排序" prop="order" align="center">
+                <template slot-scope="scope">
+                  <el-input-number v-model="scope.row.order"></el-input-number>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" width="150px" align="center">
+                <template slot-scope="scope">
+                  <el-button @click="addRow" size="mini" type="text">新增</el-button>
+                  <el-button @click="deleteRow(scope.$index,scope.row)" size="mini" type="text"
+                             v-if="form.tag.length>1">删除
+                  </el-button>
+                </template>
+              </el-table-column>
+            </el-table>
           </el-col>
         </el-row>
       </el-form>
@@ -176,8 +188,17 @@
 </template>
 
 <script>
-import { syncTag,listTagGroup, getTagGroup, delTagGroup, addTagGroup, updateTagGroup, exportTagGroup } from "@/api/qw/tagGroup";
-import { getMyQwUserList,getMyQwCompanyList } from "@/api/qw/user";
+import {
+  syncTag,
+  listTagGroup,
+  getTagGroup,
+  delTagGroup,
+  addTagGroup,
+  updateTagGroup,
+  exportTagGroup
+} from "@/api/qw/tagGroup";
+import {getMyQwUserList, getMyQwCompanyList} from "@/api/qw/user";
+
 export default {
   name: "TagGroup",
   data() {
@@ -193,7 +214,7 @@ export default {
       // 非多个禁用
       multiple: true,
       myQwUserList: [],
-      myQwCompanyList:[],
+      myQwCompanyList: [],
       // 显示搜索条件
       showSearch: true,
       // 总条数
@@ -214,32 +235,34 @@ export default {
         corpId: null,
         companyId: null,
       },
-      tagJson:[],
+      tagJson: [],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
 
         name: [
-          { required: true, message: "名称不能为空", trigger: "blur" }
+          {required: true, message: "名称不能为空", trigger: "blur"}
         ],
       }
     };
   },
   created() {
     getMyQwCompanyList().then(response => {
-            this.myQwCompanyList = response.data;
-            if(this.myQwCompanyList!=null){
-              this.queryParams.corpId=this.myQwCompanyList[0].dictValue
-              this.getList();
-            }
+      this.myQwCompanyList = response.data;
+      if (this.myQwCompanyList != null && this.myQwCompanyList.length > 0) {
+        this.queryParams.corpId = this.myQwCompanyList[0].dictValue
+        this.getList();
+      }else{
+        this.loading = false;
+      }
     });
   },
   methods: {
 
-    updateCorpId(){
-           this.getList();
-     },
+    updateCorpId() {
+      this.getList();
+    },
     /** 查询企微客户标签组列表 */
     getList() {
       this.loading = true;
@@ -274,13 +297,13 @@ export default {
       this.getList();
     },
     addRow() {
-      this.form.tag.push({ name: "标签", order:0 ,tagFrom:1},);
+      this.form.tag.push({name: "标签", order: 0, tagFrom: 1},);
     },
-    deleteRow(index,row) {
+    deleteRow(index, row) {
 
-      if (row.tagFrom==1){
+      if (row.tagFrom == 1) {
         this.form.tag.splice(index, 1);
-      }else {
+      } else {
         this.$message.error("不能删除非本应用创建的标签")
       }
     },
@@ -288,21 +311,21 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
-      this.queryParams.corpId= this.myQwCompanyList[0].dictValue;
+      this.queryParams.corpId = this.myQwCompanyList[0].dictValue;
       this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
       this.open = true;
-      this.form.tag= [
-        { name: "标签", order:0,tagFrom:1},
+      this.form.tag = [
+        {name: "标签", order: 0, tagFrom: 1},
       ];
       this.title = "添加企微客户标签组";
     },
@@ -316,15 +339,15 @@ export default {
         this.title = "修改企微客户标签组";
       });
     },
-    handleSync(){
-      this.loading=true;
+    handleSync() {
+      this.loading = true;
       syncTag(this.queryParams.corpId).then(response => {
         this.msgSuccess("同步成功");
 
         this.getList();
       }).finally(
         () => {
-          this.loading=false;
+          this.loading = false;
         }
       );
     },
@@ -332,7 +355,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          this.form.corpId=this.queryParams.corpId
+          this.form.corpId = this.queryParams.corpId
           if (this.form.id != null) {
             updateTagGroup(this.form).then(response => {
               this.msgSuccess("修改成功");
@@ -353,30 +376,32 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       this.$confirm('是否确认删除企微客户标签组名为"' + row.name + '"的数据项?【注意:仅能删除在本后台创建得标签组及标签】', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delTagGroup(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delTagGroup(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
       this.$confirm('是否确认导出所有企微客户标签组数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(() => {
-          this.exportLoading = true;
-          return exportTagGroup(queryParams);
-        }).then(response => {
-          this.download(response.msg);
-          this.exportLoading = false;
-        }).catch(() => {});
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportTagGroup(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {
+      });
     }
   }
 };