Merge remote-tracking branch 'origin/gzb' into wzl

src/views/school/index.vue

@@ -20,7 +20,12 @@
     <div>
       <Table border :data="school.list" :columns="columns">
         <template slot-scope="{ row }" slot="schoollogo">
-          <img class="img" v-if="row.schoollogo" :src="$api.showImageUrl +row.schoollogo" v-viewer />
+          <img
+            class="img"
+            v-if="row.schoollogo"
+            :src="$api.showImageUrl + row.schoollogo"
+            v-viewer
+          />
         </template>
       </Table>
       <div class="foot_page" v-if="school.total > 0">
@@ -243,6 +248,7 @@ export default {
                   class: "theme_color",
                   on: {
                     click: () => {
+                      this.$refs["reForm"].resetFields();
                       this.revise_data = {
                         show: true,
                         data: params.row
@@ -350,13 +356,13 @@ export default {
             return v;
           });
           this.school.total = res.obj.total;
-          console.log(res.obj)
         } else {
           this.$Message.error(res.msg);
         }
       });
     },
     add() {
+      this.$refs["AddForm"].resetFields();
       this.add_form.show = true;
       this.add_form.slorder = this.school.total + 1;
     },

src/views/service/index.vue

@@ -243,6 +243,7 @@ export default {
                   class: "theme_color",
                   on: {
                     click: () => {
+                      this.$refs["reForm"].resetFields();
                       this.revise_data = {
                         show: true,
                         data: params.row
@@ -356,6 +357,7 @@ export default {
       });
     },
     add() {
+      this.$refs["AddForm"].resetFields();
       this.add_form.show = true;
       this.add_form.scorder = this.service.total + 1;
     },

src/views/trial/index.vue

@@ -15,10 +15,19 @@
           v-model="form_search.account"
         />
       </div>
-      <Button @click="add" type="primary"> 添加 </Button>
+      <Button @click="add" type="primary">
+        {{ form_search.ltype == 1 ? "添加" : "修改" }}
+      </Button>
     </div>
     <div>
-      <Table border :data="userinfo.list" :columns="columns"> </Table>
+      <Table
+        v-if="form_search.ltype == 1"
+        border
+        :data="userinfo.list"
+        :columns="columns"
+      >
+      </Table>
+      <Table v-else border :data="userinfo.list" :columns="columns1"> </Table>
       <div class="foot_page" v-if="userinfo.total > 0">
         <Page
           :total="userinfo.total"
@@ -56,7 +65,7 @@
             placeholder="请输入电话"
           />
         </FormItem>
-        <FormItem label="邮箱">
+        <FormItem label="邮箱" prop="mailbox">
           <Input
             v-model="add_form.mailbox"
             maxlength="64"
@@ -77,6 +86,40 @@
         <Button @click="toSaveAdd()" type="primary">保存</Button>
       </div>
     </Modal>
+    <!--    修改-->
+    <Modal
+      v-model="revise_form.show"
+      class="modal1"
+      :mask-closable="false"
+      title="修改负责人"
+    >
+      <Form
+        :label-width="90"
+        label-position="right"
+        ref="reForm"
+        :rules="addFormRules"
+        :model="revise_form"
+      >
+        <FormItem label="联系人" prop="account">
+          <Input
+            v-model="revise_form.account"
+            maxlength="32"
+            placeholder="请输入联系人"
+          />
+        </FormItem>
+        <FormItem label="电话" prop="phone">
+          <Input
+            v-model="revise_form.phone"
+            maxlength="16"
+            placeholder="请输入电话"
+          />
+        </FormItem>
+      </Form>
+      <div slot="footer" style="text-align: right">
+        <Button @click="revise_form.show = false">取消</Button>
+        <Button @click="toSavere()" type="primary">保存</Button>
+      </div>
+    </Modal>
     <!-- 等待窗 -->
     <Spin fix v-if="showLoading" style="background-color: transparent">
       <Icon type="ios-loading" size="18" class="demo-spin-icon-load"></Icon>
@@ -87,14 +130,7 @@
 
 <script>
 import axios from "axios";
-import {
-  sl_list,
-  sl_save,
-  sl_update,
-  sl_del,
-  fc_list,
-  fc_add
-} from "@/api/index";
+import { fcu_add, fc_list, fc_add, fcu_get_user } from "@/api/index";
 import { dateFormat } from "@/utils/index";
 export default {
   data() {
@@ -102,13 +138,25 @@ export default {
     const phoneCheck = async (rule, value, callback) => {
       var filter = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
       if (!value) {
-        return;
+        return callback(new Error("手机号码不能为空"));
       }
       let blnTest = filter.test(value);
       if (!blnTest) {
         return callback(new Error("手机号码格式不正确"));
       }
     };
+    // 邮箱验证
+    const mailboxCheck = async (rule, value, callback) => {
+      var filter =
+        /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
+      if (!value) {
+        return;
+      }
+      let blnTest = filter.test(value);
+      if (!blnTest) {
+        return callback(new Error("邮箱格式不正确"));
+      }
+    };
     return {
       userInfo: {},
       showLoading: false,
@@ -167,13 +215,49 @@ export default {
           align: "center"
         }
       ], //列表表格
+      columns1: [
+        {
+          title: "序号",
+          align: "center",
+          key: "slorder",
+          width: 70,
+          render: (h, params) => {
+            return h(
+              "span",
+              params.index +
+                (this.form_search.page - 1) * this.form_search.size +
+                1
+            );
+          }
+        },
+        {
+          title: "联系人",
+          key: "account",
+          align: "center"
+        },
+        {
+          title: "联系电话",
+          key: "phone",
+          align: "center"
+        },
+        {
+          title: "提交时间",
+          key: "backtime",
+          align: "center"
+        }
+      ], //列表表格
       add_form: {
-        show: true,
+        show: false,
         account: "",
         phone: "",
         mailbox: "",
         comm: ""
       },
+      revise_form: {
+        show: false,
+        account: "",
+        phone: ""
+      },
       addFormRules: {
         account: [
           {
@@ -182,7 +266,8 @@ export default {
             trigger: "blur"
           }
         ],
-        phone: [{ validator: phoneCheck, trigger: "blur" }]
+        phone: [{ validator: phoneCheck, required: true, trigger: "blur" }],
+        mailbox: [{ validator: mailboxCheck, trigger: "blur" }]
       }
     };
   },
@@ -193,7 +278,26 @@ export default {
   methods: {
     seach() {
       this.form_search.page = 1;
-      this.init();
+      //ltype 1申请试用/2申请试用负责人
+      if (this.form_search.ltype == 1) {
+        this.init();
+      } else {
+        this.getuser();
+      }
+    },
+    getuser() {
+      fcu_get_user().then((res) => {
+        if (res.code == 0) {
+          this.userinfo.list = [res.obj];
+          this.userinfo.list[0].backtime = dateFormat(
+            this.userinfo.list[0].createtime
+          );
+          this.userinfo.list[0].account = this.userinfo.list[0].username;
+          this.userinfo.total = Object.keys(res.obj).length;
+        } else {
+          this.$Message.error(res.msg);
+        }
+      });
     },
     init() {
       fc_list(this.form_search).then((res) => {
@@ -203,21 +307,49 @@ export default {
             return v;
           });
           this.userinfo.total = res.obj.total;
-          console.log(res.obj);
         } else {
           this.$Message.error(res.msg);
         }
       });
     },
     add() {
-      this.add_form = {
-        show: true,
-        account: "",
-        phone: "",
-        mailbox: "",
-        comm: ""
-      };
-      console.log(this.add_form);
+      if (this.form_search.ltype == 1) {
+        this.$refs["AddForm"].resetFields();
+        this.add_form = {
+          show: true,
+          account: "",
+          phone: "",
+          mailbox: "",
+          comm: ""
+        };
+      } else {
+        this.$refs["reForm"].resetFields();
+        var data = JSON.parse(JSON.stringify(this.userinfo.list[0]));
+        this.revise_form = {
+          show: true,
+          account: data.account,
+          phone: data.phone
+        };
+      }
+    },
+    //修改负责人
+    toSavere() {
+      this.$refs["reForm"].validate((valid) => {
+        if (valid) {
+          fcu_add({
+            username: this.revise_form.account,
+            phone: this.revise_form.phone
+          }).then((res) => {
+            if (res.code == 0) {
+              this.revise_form.show = false;
+              this.$Message.success(res.msg);
+              this.getuser();
+            } else {
+              this.$Message.error(res.msg);
+            }
+          });
+        }
+      });
     },
     //确定添加
     toSaveAdd() {
@@ -231,6 +363,7 @@ export default {
           }).then((res) => {
             if (res.code == 0) {
               this.add_form.show = false;
+              this.$Message.success(res.msg);
               this.init();
             } else {
               this.$Message.error(res.msg);