Merge remote-tracking branch 'origin/master'

src/views/qw/sop/deptSop.vue

@@ -1117,7 +1117,7 @@ export default {
     handleCampSendMsg(){
 
       setTimeout(() => {
-        this.$refs.sendMsgSopOpenTool.oneClickGroupSending(this.ids,2,this.queryParams.corpId);
+        this.$refs.sendMsgSopOpenTool.oneClickGroupSending(this.ids,2,this.queryParams.corpId,0);
       }, 500);
 
     },

src/views/qw/sop/mySop.vue

@@ -1116,7 +1116,7 @@ export default {
     handleCampSendMsg(){
 
       setTimeout(() => {
-        this.$refs.sendMsgSopOpenTool.oneClickGroupSending(this.ids,2,this.queryParams.corpId);
+        this.$refs.sendMsgSopOpenTool.oneClickGroupSending(this.ids,2,this.queryParams.corpId,1);
       }, 500);
 
     },

src/views/qw/sop/sop.vue

@@ -1118,7 +1118,7 @@ export default {
     handleCampSendMsg(){
 
       setTimeout(() => {
-        this.$refs.sendMsgSopOpenTool.oneClickGroupSending(this.ids,2,this.queryParams.corpId);
+        this.$refs.sendMsgSopOpenTool.oneClickGroupSending(this.ids,2,this.queryParams.corpId,0);
       }, 500);
 
     },

src/views/qw/sopTemp/deptIndex.vue

@@ -135,6 +135,8 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="创建人" align="center" prop="createByName"/>
+      <el-table-column label="创建部门" align="center" prop="createByDeptName"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="排序" align="center" prop="sort"/>
 

src/views/qw/sopTemp/index.vue

@@ -144,6 +144,8 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime"/>
+      <el-table-column label="创建人" align="center" prop="createByName"/>
+      <el-table-column label="创建部门" align="center" prop="createByDeptName"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"/>
       <el-table-column label="排序" align="center" prop="sort"/>
 

src/views/qw/sopTemp/sopTemp.vue

@@ -117,7 +117,6 @@ export default {
       if(cuoser == null){
         cuoser = false;
       }
-      console.log(isUpdate)
       this.isUpdateSop = isUpdate;
       this.cuoser = cuoser;
       this.loading = true;
@@ -142,8 +141,9 @@ export default {
 
     getResetList(){
       this.loading = true;
+      console.log("this.formType",this.formType)
       if (this.formType==2 || this.formType==3) {
-        listSopTempMyList(this.queryParams).then(response => {
+        listSopTempDeptList(this.queryParams).then(response => {
           this.sopTempList = response.rows;
           this.total = response.total;
           this.loading = false;

src/views/qw/sopUserLogs/sopUserLogsSchedule.vue

@@ -84,17 +84,17 @@
         </el-tooltip>
       </el-col>
 
-      <el-col :span="1.5">
-        <el-tooltip class="item" effect="dark" content="修改选择的群聊营期时间" placement="top">
-          <el-button
-            type="danger"
-            icon="el-icon-edit"
-            size="medium"
-            :disabled="multiple"
-            @click="updateGroupTime"
-          >批量修改营期时间</el-button>
-        </el-tooltip>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-tooltip class="item" effect="dark" content="修改选择的群聊营期时间" placement="top">-->
+<!--          <el-button-->
+<!--            type="danger"-->
+<!--            icon="el-icon-edit"-->
+<!--            size="medium"-->
+<!--            :disabled="multiple"-->
+<!--            @click="updateGroupTime"-->
+<!--          >批量修改营期时间</el-button>-->
+<!--        </el-tooltip>-->
+<!--      </el-col>-->
 
       <el-col :span="1.5">
         <el-tooltip class="item" effect="dark" content="删除营期之后,将不会在给原营期的客户发送消息，ps:删除之后不可恢复" placement="top">

src/views/qw/sopUserLogsInfo/sendMsgSopOpenTool.vue

@@ -408,12 +408,13 @@ export default {
       this.videoNumOptions.open = false;
 
     },
-    oneClickGroupSending(val,type,corpId){
+    oneClickGroupSending(val,type,corpId,isMine){
 
       this.sendMsgOpen.open= true;
       this.msgForm.sopIds = val;
       this.msgForm.type = type;
       this.msgForm.corpId = corpId;
+      this.msgForm.isMine = isMine;
 
     },
     courseChange() {