فهرست منبع

add:添加是否下载app字段

ct 4 هفته پیش
والد
کامیت
3826b923ac
3فایلهای تغییر یافته به همراه158 افزوده شده و 111 حذف شده
  1. 57 40
      src/views/qw/externalContact/deptIndex.vue
  2. 50 36
      src/views/qw/externalContact/index.vue
  3. 51 35
      src/views/qw/externalContact/myExternalContact.vue

+ 57 - 40
src/views/qw/externalContact/deptIndex.vue

@@ -141,47 +141,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="标签" prop="tagIds">
-        <!--        <el-select v-model="selectTags" 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: 250px">
-          <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
-            <el-tag type="success"
-                    closable
-                    :disable-transitions="false"
-                    v-for="list in this.selectTags"
-                    :key="list.tagId"
-                    @close="handleCloseTags(list)"
-                    style="margin: 3px;"
-            >{{list.name}}
-            </el-tag>
-          </div>
-        </div>
-
-
-      </el-form-item>
-      <el-form-item label="排除标签" prop="outTagIds">
-        <div @click="hangleChangeOutTags()"
-             style="cursor: pointer; border: 1px solid #e6e6e6; background-color: white; overflow: hidden; flex-grow: 1;width: 250px">
-          <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
-            <el-tag type="success"
-                    closable
-                    :disable-transitions="false"
-                    v-for="list in this.outSelectTags"
-                    :key="list.tagId"
-                    @close="handleCloseOutTags(list)"
-                    style="margin: 3px;"
-            >{{ list.name }}
-            </el-tag>
-          </div>
-        </div>
-      </el-form-item>
 
       <el-form-item label="备注" prop="remark">
         <el-input
@@ -201,6 +161,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="是否下载app" prop="isDownloadApp" label-width="100px">
+        <el-select v-model="queryParams.isDownloadApp" placeholder="请选择" clearable size="small">
+          <el-option
+            v-for="dict in orOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="添加时间" prop="createTime">
         <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
       </el-form-item>
@@ -224,6 +194,47 @@
                         placeholder="选择删除时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="标签" prop="tagIds">
+        <!--        <el-select v-model="selectTags" 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: 250px">
+          <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
+            <el-tag type="success"
+                    closable
+                    :disable-transitions="false"
+                    v-for="list in this.selectTags"
+                    :key="list.tagId"
+                    @close="handleCloseTags(list)"
+                    style="margin: 3px;"
+            >{{list.name}}
+            </el-tag>
+          </div>
+        </div>
+
+
+      </el-form-item>
+      <el-form-item label="排除标签" prop="outTagIds">
+        <div @click="hangleChangeOutTags()"
+             style="cursor: pointer; border: 1px solid #e6e6e6; background-color: white; overflow: hidden; flex-grow: 1;width: 250px">
+          <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
+            <el-tag type="success"
+                    closable
+                    :disable-transitions="false"
+                    v-for="list in this.outSelectTags"
+                    :key="list.tagId"
+                    @close="handleCloseOutTags(list)"
+                    style="margin: 3px;"
+            >{{ list.name }}
+            </el-tag>
+          </div>
+        </div>
+      </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>
@@ -415,6 +426,7 @@
         </template>
       </el-table-column>
       <el-table-column label="企业id" align="center" prop="corpId" />
+      <el-table-column label="是否下载app" align="center" prop="isDownloadApp" />
       <el-table-column label="是否重粉" align="center" prop="isRepeat" fixed="right">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.isRepeat == 0">否</el-tag>
@@ -846,6 +858,7 @@ export default {
   components:{PaginationMore, mycustomer,customerDetails,SopDialog,selectUser,info,healthRecordDetails,userDetails},
   data() {
     return {
+      orOptions: [],
       userIds: [],
       exportRepeatLoading: false,
       resultDialogVisible: false,
@@ -1074,6 +1087,10 @@ export default {
       this.ratingUpFall = response.data;
     });
 
+    this.getDicts("sys_company_or").then(response => {
+      this.orOptions = response.data;
+    });
+
     getMyQwCompanyList().then(response => {
       this.myQwCompanyList = response.data;
       if(this.myQwCompanyList!=null){

+ 50 - 36
src/views/qw/externalContact/index.vue

@@ -164,38 +164,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="标签" prop="tagIds">
-        <div @click="hangleChangeTags()" style="cursor: pointer; border: 1px solid #e6e6e6; background-color: white; overflow: hidden; flex-grow: 1;width: 250px">
-          <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
-            <el-tag type="success"
-                    closable
-                    :disable-transitions="false"
-                    v-for="list in this.selectTags"
-                    :key="list.tagId"
-                    @close="handleCloseTags(list)"
-                    style="margin: 3px;"
-            >{{list.name}}
-            </el-tag>
-          </div>
-        </div>
-      </el-form-item>
-
-      <el-form-item label="排除标签" prop="outTagIds">
-        <div @click="hangleChangeOutTags()"
-             style="cursor: pointer; border: 1px solid #e6e6e6; background-color: white; overflow: hidden; flex-grow: 1;width: 250px">
-          <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
-            <el-tag type="success"
-                    closable
-                    :disable-transitions="false"
-                    v-for="list in this.outSelectTags"
-                    :key="list.tagId"
-                    @close="handleCloseOutTags(list)"
-                    style="margin: 3px;"
-            >{{ list.name }}
-            </el-tag>
-          </div>
-        </div>
-      </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
@@ -205,8 +173,20 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="是否下载app" prop="isDownloadApp" label-width="100px">
+        <el-select v-model="queryParams.isDownloadApp" placeholder="请选择" clearable size="small">
+          <el-option
+            v-for="dict in orOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
 
-      <el-form-item label="添加时间" prop="createTime">
+
+
+      <el-form-item label="添加时间" prop="createTime" label-width="70px" size="small">
         <el-date-picker
           v-model="createTime"
           size="small"
@@ -220,9 +200,6 @@
         ></el-date-picker>
       </el-form-item>
 
-
-
-
       <el-form-item label="流失时间" prop="lossTime">
         <el-date-picker clearable size="small"
                         v-model="queryParams.lossTime"
@@ -239,6 +216,38 @@
                         placeholder="选择删除时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="标签" prop="tagIds"  label-width="60px" size="small">
+        <div @click="hangleChangeTags()" style="cursor: pointer; border: 1px solid #e6e6e6; background-color: white; overflow: hidden; flex-grow: 1;width: 250px">
+          <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
+            <el-tag type="success"
+                    closable
+                    :disable-transitions="false"
+                    v-for="list in this.selectTags"
+                    :key="list.tagId"
+                    @close="handleCloseTags(list)"
+                    style="margin: 3px;"
+            >{{list.name}}
+            </el-tag>
+          </div>
+        </div>
+      </el-form-item>
+
+      <el-form-item label="排除标签" prop="outTagIds" label-width="70px" size="small">
+        <div @click="hangleChangeOutTags()"
+             style="cursor: pointer; border: 1px solid #e6e6e6; background-color: white; overflow: hidden; flex-grow: 1;width: 250px">
+          <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
+            <el-tag type="success"
+                    closable
+                    :disable-transitions="false"
+                    v-for="list in this.outSelectTags"
+                    :key="list.tagId"
+                    @close="handleCloseOutTags(list)"
+                    style="margin: 3px;"
+            >{{ list.name }}
+            </el-tag>
+          </div>
+        </div>
+      </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>
@@ -465,6 +474,7 @@
         </template>
       </el-table-column>
       <el-table-column label="企业id" align="center" prop="corpId" />
+      <el-table-column label="是否下载app" align="center" prop="isDownloadApp" />
       <el-table-column label="重粉看课历史" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.fsUserId">
@@ -971,6 +981,7 @@ export default {
   components:{PaginationMore, mycustomer,customerDetails,SopDialog,selectUser,info,userDetails,collection},
   data() {
     return {
+      orOptions: [],
       projectOptions: [],
       courseLists: [],
       videoList: [],
@@ -1218,6 +1229,9 @@ export default {
     this.getDicts("sys_qw_sop_rating_upFall").then(response => {
       this.ratingUpFall = response.data;
     });
+    this.getDicts("sys_company_or").then(response => {
+      this.orOptions = response.data;
+    });
 
     getMyQwCompanyList().then(response => {
             this.myQwCompanyList = response.data;

+ 51 - 35
src/views/qw/externalContact/myExternalContact.vue

@@ -125,14 +125,53 @@
           />
         </el-select>
       </el-form-item>
+
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="是否下载app" prop="isDownloadApp" label-width="100px">
+        <el-select v-model="queryParams.isDownloadApp" placeholder="请选择" clearable size="small">
+          <el-option
+            v-for="dict in orOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="添加时间" prop="createTime">
+          <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="流失时间" prop="lossTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.lossTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择流失时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="删除时间" prop="delTime">
+        <el-date-picker clearable size="small"
+                        v-model="queryParams.delTime"
+                        type="date"
+                        value-format="yyyy-MM-dd"
+                        placeholder="选择删除时间">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="标签" prop="tagIds">
-<!--        <el-select v-model="selectTags" 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="selectTags" 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: 250px">
           <div style="min-height: 35px; max-height: 200px; overflow-y: auto;">
@@ -165,34 +204,6 @@
           </div>
         </div>
       </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入备注"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="添加时间" prop="createTime">
-          <el-date-picker v-model="createTime" size="small" style="width: 220px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" @change="change"></el-date-picker>
-      </el-form-item>
-      <el-form-item label="流失时间" prop="lossTime">
-        <el-date-picker clearable size="small"
-                        v-model="queryParams.lossTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择流失时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="删除时间" prop="delTime">
-        <el-date-picker clearable size="small"
-                        v-model="queryParams.delTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择删除时间">
-        </el-date-picker>
-      </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>
@@ -436,6 +447,7 @@
         </template>
       </el-table-column>
       <el-table-column label="企业id" align="center" prop="corpId" />
+      <el-table-column label="是否下载app" align="center" prop="isDownloadApp" />
       <el-table-column label="重粉看课历史" width="100px" align="center" fixed="right">
         <template slot-scope="scope">
           <div v-if="scope.row.fsUserId">
@@ -1044,6 +1056,7 @@ export default {
   components:{PaginationMore, mycustomer,customerDetails,SopDialog,selectUser,info,Collection,userDetails},
   data() {
     return {
+      orOptions: [],
       userIds: [],
       exportRepeatLoading: false,
       member:{
@@ -1289,6 +1302,9 @@ export default {
     this.getDicts("sys_qw_sop_rating_upFall").then(response => {
       this.ratingUpFall = response.data;
     });
+    this.getDicts("sys_company_or").then(response => {
+      this.orOptions = response.data;
+    });
 
     this.handleGetMyQwUserList();