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

src/views/school/index.vue

@@ -51,6 +51,12 @@
         :rules="addFormRules"
         :model="add_form"
       >
+        <FormItem label="语言" prop="ltype">
+          <RadioGroup v-model="add_form.ltype">
+            <Radio :label="1">中文</Radio>
+            <Radio :label="2">英文</Radio>
+          </RadioGroup>
+        </FormItem>
         <FormItem label="服务案例" prop="schoolname">
           <Input v-model="add_form.schoolname" placeholder="请输入学校名称" />
         </FormItem>
@@ -211,8 +217,8 @@ export default {
           width: 70,
           render: (h, params) => {
             return h(
-                "span",
-                params.index +
+              "span",
+              params.index +
                 (this.form_search.page - 1) * this.form_search.size +
                 1
             );
@@ -314,7 +320,8 @@ export default {
         show: false,
         schoolname: "",
         schoollogo: "",
-        slorder: 0
+        slorder: 0,
+        ltype: 1
       },
       revise_data: {
         show: false,
@@ -337,6 +344,14 @@ export default {
         ]
       },
       addFormRules: {
+        ltype: [
+          {
+            required: true,
+            type: "number",
+            message: "请选择语言",
+            trigger: "change"
+          }
+        ],
         schoolname: [
           {
             required: true,
@@ -379,6 +394,7 @@ export default {
     add() {
       this.$refs["AddForm"].resetFields();
       this.add_form.show = true;
+      this.add_form.ltype = JSON.parse(JSON.stringify(this.form_search.ltype));
       this.add_form.slorder = this.school.total + 1;
     },
     revise() {
@@ -392,7 +408,8 @@ export default {
             schoolname: this.revise_data.data.schoolname,
             schoollogo: this.revise_data.data.schoollogo,
             slorder: this.revise_data.data.slorder,
-            scid: this.revise_data.data.scid
+            slid: this.revise_data.data.slid,
+            ltype: this.revise_data.data.ltype
           }).then((res) => {
             if (res.code == 0) {
               this.revise_data.show = false;
@@ -406,7 +423,7 @@ export default {
       });
     },
     del(data) {
-      sl_del({ scid: data.scid }).then((res) => {
+      sl_del({ slid: data.slid }).then((res) => {
         if (res.code == 0) {
           if (this.form_search.page != 1 && this.school.list.length == 1) {
             this.form_search.page--;
@@ -429,7 +446,7 @@ export default {
           sl_save({
             schoolname: this.add_form.schoolname,
             schoollogo: this.add_form.schoollogo,
-            ltype: this.form_search.ltype,
+            ltype: this.add_form.ltype,
             slorder: this.add_form.slorder,
             createid: this.userInfo.userid
           }).then((res) => {
@@ -463,7 +480,7 @@ export default {
       }
       let formData = new FormData();
       formData.append("file", file);
-      formData.append("savefolder", "servicecase");
+      formData.append("savefolder", "schoollogo");
       let url = that.$api.baseUrl + "file/upload";
       that.showLoading = true;
       axios

src/views/service/index.vue

@@ -20,7 +20,12 @@
     <div>
       <Table border :data="service.list" :columns="columns">
         <template slot-scope="{ row }" slot="scpic">
-          <img class="img" v-if="row.scpic" :src="$api.showImageUrl +row.scpic" v-viewer />
+          <img
+            class="img"
+            v-if="row.scpic"
+            :src="$api.showImageUrl + row.scpic"
+            v-viewer
+          />
         </template>
       </Table>
       <div class="foot_page" v-if="service.total > 0">
@@ -46,6 +51,12 @@
         :rules="addFormRules"
         :model="add_form"
       >
+        <FormItem label="语言" prop="ltype">
+          <RadioGroup v-model="add_form.ltype">
+            <Radio :label="1">中文</Radio>
+            <Radio :label="2">英文</Radio>
+          </RadioGroup>
+        </FormItem>
         <FormItem label="服务案例" prop="scname">
           <Input v-model="add_form.scname" placeholder="请输入服务案例" />
         </FormItem>
@@ -206,8 +217,8 @@ export default {
           width: 70,
           render: (h, params) => {
             return h(
-                "span",
-                params.index +
+              "span",
+              params.index +
                 (this.form_search.page - 1) * this.form_search.size +
                 1
             );
@@ -309,7 +320,8 @@ export default {
         show: false,
         scname: "",
         scpic: "",
-        scorder: 0
+        scorder: 0,
+        ltype: 1
       },
       revise_data: {
         show: false,
@@ -332,6 +344,14 @@ export default {
         ]
       },
       addFormRules: {
+        ltype: [
+          {
+            required: true,
+            type: "number",
+            message: "请选择语言",
+            trigger: "change"
+          }
+        ],
         scname: [
           {
             required: true,
@@ -374,6 +394,7 @@ export default {
     add() {
       this.$refs["AddForm"].resetFields();
       this.add_form.show = true;
+      this.add_form.ltype = JSON.parse(JSON.stringify(this.form_search.ltype));
       this.add_form.scorder = this.service.total + 1;
     },
     revise() {

src/views/trial/index.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="userinfo">
     <div class="header">
-      <div>
+      <div style="height: 32px; line-height: 32px">
         <RadioGroup v-model="form_search.ltype" @on-change="seach">
           <Radio :label="1" :value="1">申请试用</Radio>
           <Radio :label="2" :value="2">申请试用负责人</Radio>
         </RadioGroup>
         <Input
+          v-if="form_search.ltype == 1"
           style="width: 200px; margin-left: 20px"
           placeholder="请输入联系人"
           @on-enter="seach"
@@ -28,7 +29,10 @@
       >
       </Table>
       <Table v-else border :data="userinfo.list" :columns="columns1"> </Table>
-      <div class="foot_page" v-if="userinfo.total > 0">
+      <div
+        class="foot_page"
+        v-if="userinfo.total > 0 && form_search.ltype == 1"
+      >
         <Page
           :total="userinfo.total"
           @on-change="changePage"
@@ -231,7 +235,7 @@ export default {
           }
         },
         {
-          title: "联系人",
+          title: "负责人",
           key: "account",
           align: "center"
         },