解决冲突

src/api/common/common.js

@@ -115,8 +115,8 @@ export function UploadViittoBlobFile(path, file, callback) {
   uploadLoadding.show({
     message: '正在上传文件,请稍后...'
   })
-  let viewFileUrl = 'http://192.168.10.214:8130';
-  let vtUploadUrl = "http://192.168.10.214:8120/upload/UploadBlob";
+  let viewFileUrl = 'http://192.168.5.214:8130';
+  let vtUploadUrl = "http://192.168.5.214:8120/upload/UploadBlob";
   let locationName = window.location.hostname;
   if (locationName.indexOf('testerp.oytour') !== -1) {
     vtUploadUrl = "http://upload.oytour.com/upload/UploadBlob";

src/components/school/student/student-left.vue

@@ -446,7 +446,7 @@
           StuType: "", //客户类型
           StuNeeds: 0, //客户需求
           StuTel: "", //显示使用
-          FileVoucher: ""//http://192.168.10.214:8130/EduSystem/Test/Upload/SetStudentVoucher/202303221126306360000000004.png
+          FileVoucher: ""
         },
         //日语基础列表
         basicList: [],

src/pages/financial/financalDocument/BasicDocuments.vue

@@ -2014,11 +2014,7 @@
     data() {
       return {
         saveMsg: [
-          // {
-          //   Type: 3,
-          //   Content:'http://192.168.10.214:8130/EduSystem/Test/Upload/Temporary/202311131052426600000000001.png',
-          //   Url:'http://192.168.10.214:8130/EduSystem/Test/Upload/Temporary/202311131052426600000000001.png'
-          // }
+
         ],
         TeamShouZhi: false,
         F_Disbursement_Schedule: false,

src/pages/stuMan/stuList.vue

@@ -170,6 +170,7 @@
     font-weight: 600;
     margin-right: 10px;
   }
+
 </style>
 <template>
   <div :class="[
@@ -290,6 +291,19 @@
             :options="MyTransListData" option-label="StuName" @input="resetSearch" clearable option-value="StuId"
             emit-value map-options />
         </div>
+        <div class="col-3">
+          <q-select filled v-model="msg.Teacher_Id" dense use-input label="班主任" :options="MyTeacherListData"
+            option-label="EmployeeName" @input="resetSearch" @filter="filterTeacher" clearable option-value="Id"
+            emit-value map-options>
+            <template v-slot:no-option>
+              <q-item>
+                <q-item-section class="text-grey">
+                  未找到相关数据
+                </q-item-section>
+              </q-item>
+            </template>
+          </q-select>
+        </div>
       </div>
     </div>
     <div class="col row wrap q-gutter-x-md" v-if="staticObj && !isComponent">
@@ -426,11 +440,7 @@
                       <q-item-label overline>添加事件</q-item-label>
                     </q-item-section>
                   </q-item>
-                  <!-- <q-item dense  clickable v-close-popup @click="showChangeCourse(props.row)">
-                    <q-item-section>
-                      <q-item-label overline >跳课</q-item-label>
-                    </q-item-section>
-                  </q-item> -->
+
                 </q-list>
               </q-btn-dropdown>
             </div>
@@ -559,7 +569,8 @@
           GuestState: "", //学员状态
           CreateType: "", //客户来源
           StuChannelId: "", //收客渠道
-          StuSourceId: ""
+          StuSourceId: "",
+          Teacher_Id: "", //班主任
         },
         pageCount: 0,
         columns: [{
@@ -569,7 +580,6 @@
             align: "left",
             required: true
           },
-
           {
             name: "GuestName",
             label: "姓名",
@@ -812,7 +822,9 @@
         courseName: "",
         isShowChangeCourse: false,
         ChangeCourseObj: {},
-        staticObj: {} //学生统计信息
+        staticObj: {}, //学生统计信息
+        MyTeacherListData: [], //查询老师列表
+        AllTeacherList: [], //所有教师列表
       };
     },
     created() {
@@ -864,6 +876,7 @@
         this.GetStuChannelList();
         this.GetCustomerList();
         this.getEmployeeList();
+        this.findData();
       } else {
         this.msg.rowsPerPage = this.pageSize;
         this.loading = this.outLoading;
@@ -871,6 +884,18 @@
       }
     },
     methods: {
+      //获取班主任
+      findData() {
+        queryEmployee({
+          AccountTypeStr: "2",
+          IsLeave: 1
+        }).then(res => {
+          if (res.Code == 1) {
+            this.MyTeacherListData = res.Data;
+            this.AllTeacherList = res.Data;
+          }
+        })
+      },
       //获取收客渠道
       GetStuChannelList() {
         GetStuChannelList({}).then(res => {
@@ -1010,6 +1035,18 @@
           }
         });
       },
+      filterTeacher(val, update) {
+        update(() => {
+          if (val === "") {
+            this.MyTeacherListData = JSON.parse(JSON.stringify(this.AllTeacherList));
+          } else {
+            const needle = val.toLowerCase();
+            this.MyTeacherListData = this.AllTeacherList.filter(
+              v => v.EmployeeName.toLowerCase().indexOf(needle) > -1
+            );
+          }
+        });
+      },
       //筛选课程
       filterCourse(val, update) {
         update(() => {
@@ -1268,7 +1305,9 @@
       }
     }
   };
+
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-</style>
+
\ No newline at end of file
+</style>

src/pages/wxhtml/uploadFiles.vue

@@ -95,7 +95,6 @@
                 <input v-model="uploadParm.params.ExamName" class="examList-popup-name" placeholder="请输入考试名称"/>
                 <div class="diy-upload-class">
                     <!-- https://jjswapi.oytour.com -->
-                    <!-- http://192.168.10.36:8082 -->
                     <el-upload class="avatar-uploader"
                       :data="uploadParm"
                       name="myfile"