Bladeren bron

添加启用禁用

liuxiaona 2 jaren geleden
bovenliggende
commit
f3e4c99a90

+ 2 - 7
.idea/workspace.xml

@@ -3,14 +3,9 @@
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="326b77ef-a0bc-4d8a-bd1c-34c4541ee400" name="Changes" comment="">
5 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/conTwo.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/conTwo.vue" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/customerServiceFC.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/assembly/screen/customerServiceFC.vue" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/project/src/components/assembly/screen/customerServiceFCbf.vue" beforeDir="false" />
9 6
       <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/createFriendsCircle.vue" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/QWdetial.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/QWdetial.vue" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/employee_bulk_messaging_log.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/employee_bulk_messaging_log.vue" afterDir="false" />
11 8
       <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/QWfc.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/QWfc.vue" afterDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/fcList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/fcList.vue" afterDir="false" />
13
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/fcListdetial.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/friendsCircle/fcListdetial.vue" afterDir="false" />
14 9
     </list>
15 10
     <option name="SHOW_DIALOG" value="false" />
16 11
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -129,7 +124,7 @@
129 124
       <workItem from="1652617650540" duration="272000" />
130 125
       <workItem from="1653271650799" duration="18349000" />
131 126
       <workItem from="1653444395016" duration="24196000" />
132
-      <workItem from="1653616597711" duration="25695000" />
127
+      <workItem from="1653616597711" duration="29019000" />
133 128
     </task>
134 129
     <servers />
135 130
   </component>

+ 2 - 0
project/src/components/customOperate/createFriendsCircle.vue

@@ -272,6 +272,8 @@ export default {
272 272
             this.partUser = rebackInfo.sender_list
273 273
             this.partDepart =  rebackInfo.department_list
274 274
           }
275
+          this.afferent_tag_obj.tag_id_list = rebackInfo.customer_tag_list
276
+          // this.afferent_tag_obj.tag = rebackInfo.customer_tag_list
275 277
 
276 278
 
277 279
         } else if (res.errno != 4002) {

+ 4 - 2
project/src/components/customOperate/employee_bulk_messaging_log.vue

@@ -54,7 +54,9 @@
54 54
       <el-table-column label="操作" align="center">
55 55
         <template slot-scope="scope">
56 56
           <div class="flex" style="justify-content:center">
57
-            <div :class="['pointer','table_button',scope.row.enable == 1 ? 'c-FF604D' :'c-007AFF']" v-if="scope.row.enable == 1 || scope.row.enable == 0" @click="welcomeMsg_del(scope.row)">{{scope.row.enable == 1 ? '禁用' : scope.row.enable == 0 ? '启用':''}}</div>
57
+            <div :class="['pointer','table_button',scope.row.enable == 1 ? 'c-FF604D' :'c-007AFF']" v-if="scope.row.enable == 1 || scope.row.enable == 0" @click="welcomeMsg_del(scope.row)">
58
+              {{scope.row.enable == 1 ? '禁用' : scope.row.enable == 0 ? '启用':''}}
59
+            </div>
58 60
             <div class="c-00B38A pointer table_button" @click="goDetail(scope.row.rule_id)">详情</div>
59 61
           </div>
60 62
         </template>
@@ -223,4 +225,4 @@ export default {
223 225
   margin: 0 4px;
224 226
   min-width: 26px;
225 227
 }
226
-</style>
228
+</style>

+ 42 - 3
project/src/components/customOperate/friendsCircle/QWfc.vue

@@ -101,12 +101,15 @@
101 101
       <el-table-column label="操作" align="center" width="150px">
102 102
         <template slot-scope="scope">
103 103
           <div class="flex" style="justify-content:center">
104
-            <div class="c-00B38A pointer table_button" @click="goDetail(scope.row.rule_id)">详情</div>
105
-            <div class="c-00B38A pointer table_button lMar14" v-if="scope.row.send_type == 2" @click="createFriCircle('edit',scope.row.rule_id)">编辑</div>
104
+            <div :class="['pointer','table_button',scope.row.enable == 1 ? 'c-FF604D' :'c-007AFF']" v-if="scope.row.enable == 1 || scope.row.enable == 0"
105
+                 @click="enableForbidden(scope.row)">
106
+              {{scope.row.enable == 1 ? '禁用' : scope.row.enable == 0 ? '启用':''}}
107
+            </div>
108
+            <div class="c-00B38A pointer table_button lMar5" @click="scope.row.send_type == 2 ? createFriCircle('edit',scope.row.rule_id) : goDetail(scope.row.rule_id)">详情</div>
106 109
             <el-popconfirm
107 110
               @confirm="remindClick(scope.row.rule_id)"
108 111
               :title="'企微助手将提醒未发送朋友圈的'+scope.row.unpublished_count+'名员工发朋友圈,是否确认提醒 ?'">
109
-              <div slot="reference" class="c-00B38A pointer table_button lMar14">提醒</div>
112
+              <div slot="reference" class="c-00B38A pointer table_button lMar5">提醒</div>
110 113
             </el-popconfirm>
111 114
           </div>
112 115
         </template>
@@ -162,6 +165,42 @@ export default {
162 165
     this.init(1)
163 166
   },
164 167
   methods:{
168
+    enableForbidden (item) {
169
+      if (item.enable != 1 && item.enable != 0) {
170
+        return
171
+      }
172
+      this.$confirm(`确定${item.enable == 1 ? '禁用' : '启用'}【${item.name}】?`, '提示', {
173
+        confirmButtonText: '确定',
174
+        cancelButtonText: '取消',
175
+        type: 'warning'
176
+      }).then(() => {
177
+        this.$loading(this.$loadingConfig);
178
+        this.$axios.get(this.URL.BASEURL + this.URL.FriendsCircleChangeStatus, {
179
+          params: {
180
+            rule_id: item.rule_id,
181
+            status: item.enable == 1 ? 0 : 1
182
+          }
183
+        }).then((res) => {
184
+          var res = res.data;
185
+          this.$loading(this.$loadingConfig).close();
186
+          if (res && res.errno == 0) {
187
+            this.$message({
188
+              message: '操作成功!',
189
+              type: 'success'
190
+            })
191
+            this.init(1)
192
+          } else {
193
+            this.$message({
194
+              message: res.err,
195
+              type: 'warning'
196
+            })
197
+          }
198
+        }).catch(() => {
199
+          this.$loading(this.$loadingConfig).close();
200
+        })
201
+      }).catch(() => {
202
+      })
203
+    },
165 204
     changeDrawerSize () {
166 205
       this.drawerSize = this.drawerSize == '100%' ? '60%' : '100%'
167 206
     },