Browse Source

研报发布推送配置,手工指标增加更新时间配置

cxmo 1 year ago
parent
commit
aad53b1e4f

+ 1 - 0
src/utils/buttonConfig.js

@@ -164,6 +164,7 @@ export const dataSourcePermission = {
     /*--------手工指标列表---- */
     manualData_del:'manualData:del',
     manualData_add:'manualData:add',//新增编辑
+    manualData_add_updateRemind:'manualData:add:updateRemind',//新增编辑-更新提醒
     /*--------手工数据录入---- */
     manualDataWrite_edit:'manualDataWrite:edit',//编辑按钮,直接编辑没有禁
     manualDataWrite_export:'manualDataWrite:export',//导出

+ 1 - 1
src/views/dataEntry_manage/components/addTarget.vue

@@ -88,7 +88,7 @@
 							<!-- <span class="require_tag">*</span> -->
 							<el-input v-model="formData.targetName"  placeholder="请输入指标名称" style="width: 321px;"></el-input>
 						</el-form-item>
-						<el-form-item label="更新提醒" prop="up_week">
+						<el-form-item label="更新提醒" prop="up_week" v-permission="permissionBtn.dataSourcePermission.manualData_add_updateRemind">
 							<el-select v-model="formData.up_week" placeholder="请选择更新周" style="width:145px" v-if="formData.frequency === '周度'">
 								<el-option label="周一" value="周一"></el-option>
 								<el-option label="周二" value="周二"></el-option>

+ 1 - 1
src/views/dataEntry_manage/components/editTarget.vue

@@ -86,7 +86,7 @@
 							<!-- <span class="require_tag">*</span> -->
 							<el-input v-model="formData.targetName"  placeholder="请输入指标名称" style="width: 321px"></el-input>
 						</el-form-item>
-						<el-form-item label="更新提醒" prop="up_week">
+						<el-form-item label="更新提醒" prop="up_week" v-permission="permissionBtn.dataSourcePermission.manualData_add_updateRemind">
 							<el-select v-model="formData.up_week" placeholder="请选择更新周" style="width:145px" v-if="formData.frequency === '周度'">
 								<el-option label="周一" value="周一"></el-option>
 								<el-option label="周二" value="周二"></el-option>

+ 9 - 2
src/views/report_manage/addreportNew.vue

@@ -562,6 +562,7 @@ export default {
 			if (tp == 'fb') {
 				this.isPublishloading = true;
 			}
+			const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)
 			// 如果已经添加过就修改 否则新增
 			if (this.isAddEnter) {
 				let params2 = {
@@ -594,7 +595,7 @@ export default {
 					if(hasTel==1){
 						this.isMessagePost = false; 
 						this.reporteditMsg(params2,tp)
-					}else{
+					}else if(isPost){
 						this.$confirm('发布后,是否推送模板消息和客户群?', '发布提示', {
 								confirmButtonText: '推送',
 								cancelButtonText: '不推送',
@@ -616,6 +617,9 @@ export default {
 									done()
 								}
 						})
+					}else{
+						this.isMessagePost = false;
+						this.reporteditMsg(params2,tp)
 					}
 					
 				}else {
@@ -628,7 +632,7 @@ export default {
 					if(hasTel==1){
 						this.isMessagePost = false; 
 						this.reportaddMsg(params,tp)
-					}else{
+					}else if(isPost){
 						this.$confirm('发布后,是否推送模板消息和客户群?', '发布提示', {
 								confirmButtonText: '推送',
 								cancelButtonText: '不推送',
@@ -651,6 +655,9 @@ export default {
 									done()
 								}
 						})
+					}else{
+						this.isMessagePost = false;
+						this.reportaddMsg(params,tp)
 					}
 						
 				}else {

+ 5 - 1
src/views/report_manage/editreportNew.vue

@@ -582,6 +582,7 @@ export default {
 				window.open(href, '_blank');
 				return false;
 			}
+			const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)
 			if (tp == 'fb') {
 				this.isPublishloading = true;
 				// 判断是否要推送客群
@@ -605,7 +606,7 @@ export default {
 				if(hasTel==1||this.ThsMsgIsSend==1){
 					this.isMessagePost = false; 
 					this.reporteditMsg(params,tp)
-				}else{
+				}else if(isPost){
 					this.$confirm('发布后,是否推送模板消息和客户群?', '发布提示', {
 						    confirmButtonText: '推送',
 						    cancelButtonText: '不推送',
@@ -628,6 +629,9 @@ export default {
 						        done()
 						    }
 					})
+				}else{
+					this.isMessagePost = false; 
+					this.reporteditMsg(params,tp)
 				}
 			}else {
 				this.reporteditMsg(params,tp)

+ 7 - 2
src/views/report_manage/reportlist.vue

@@ -912,8 +912,13 @@ export default {
         // this.handlePublic(1)
         return;
       }
-
-      this.showPublish = true;
+      const isPost = this.permissionBtn.checkPermissionBtn(this.permissionBtn.reportManageBtn.reportManage_sendMsg)
+      if(isPost){
+          this.showPublish = true;
+      }else{
+        this.handlePublic(1)
+      }
+      
     },
     // 点击确认发布&推送报告
     // 1 仅发布 2发布且推送