Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/views/tenant/main/serve/index.vue

@@ -63,7 +63,10 @@
           </template>
           <template slot="status" slot-scope="{ row }">
             <div>
-              <span>
+              <span v-if="row.status == 1" style="color: green">
+                <b>{{ statusArr[row.status] }}</b>
+              </span>
+              <span v-if="row.status == 0" style="color: red">
                 <b>{{ statusArr[row.status] }}</b>
               </span>
             </div>
@@ -109,7 +112,7 @@
              icon="el-icon-video-pause"
              size="small"
              @click="pauseServe(row)"
-            >暂停</el-button>
+            >关闭</el-button>
           </template>
           <!--/父子表-->
         </avue-crud>
@@ -223,10 +226,10 @@
             :append-to-body="true"
             :before-close="handleCloseLog"
             :visible.sync="innerDrawer3">
-            <div>
+            <!-- <div>
               <span>姓名：</span>
               <span>身份证号：</span>
-            </div>
+            </div> -->
             <avue-crud
               :data="logData"
               :option="logOption"
@@ -619,12 +622,12 @@ export default {
             label: "手机号",
             prop: "telphone",
           },
+          // {
+          //   label: "用户类型",
+          //   prop: "userId",
+          // },
           {
-            label: "用户类型",
+            label: "身份标签",
-            prop: "userId",
-          },
-          {
-            label: "标签",
             prop: "labelsBase",
           },
         ]
@@ -1224,13 +1227,14 @@ export default {
     },
     // 启用服务
     playServe(row) {
-      console.log(row)
+      this.$confirm('是否确认启用该服务？', {
-      update({
+          confirmButtonText: "确定",
-        id: row.id,
+          cancelButtonText: "取消",
-        status: 1
+          type: "warning"
-      }).then(
+        }).then(() => {
-        () => {
+          return update({id: row.id, status: 1})
-          // done();
+        }).then(
+          () => {
           this.$message({
             type: "success",
             message: "启用成功!",
@@ -1239,29 +1243,26 @@ export default {
         },
         (error) => {
           window.console.log(error);
-          // done();
+        })
-        }
-      );
     },
     pauseServe(row) {
-      console.log(row)
+      this.$confirm('是否确认关闭该服务？', {
-      update({
+          confirmButtonText: "确定",
-        id: row.id,
+          cancelButtonText: "取消",
-        status: 0
+          type: "warning"
-      }).then(
+        }).then(() => {
-        () => {
+          return update({id: row.id, status: 0})
-          // done();
+        }).then(
+          () => {
           this.$message({
             type: "success",
-            message: "暂停成功!",
+            message: "关闭成功!",
           });
           this.refresh();
         },
         (error) => {
           window.console.log(error);
-          // done();
+        })
-        }
-      );
     }
   },
 };

src/views/tenant/main/talents/index.vue

@@ -340,7 +340,7 @@ export default {
             label: "手机号",
             prop: "telphone",
             span: 24,
-            hide: true,
+            hide: false,
             rules: [
               {
                 required: true,

src/views/tenant/mission/index.vue

@@ -16,18 +16,7 @@
                 :value="item.value"
               ></el-option>
           </el-select>
-          <!-- <el-radio-group v-model="search.status" size="small">
-            <el-radio-button v-for="(item,key,index) in missionTypes" :key="index" :label="item.value">{{item.label}}
-            </el-radio-button>
-          </el-radio-group> -->
-
         </el-form-item>
-        <!-- <el-form-item label="任务编号:">
-          <el-input v-model="search.missionNo" placeholder="任务编号" clearable></el-input>
-        </el-form-item> -->
-
-
-
         <el-form-item label="">
           <el-select v-model="search.state" placeholder="请选择搜索时间类型" style="width: 100%" @change="date">
             <el-option