Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/course/record-form.vue

@@ -81,8 +81,8 @@
     <div class="page-content recordForm">
       <div class="row wrap" style="display:flex;justify-content:flex-end">
         <div class="col-3">
-          <q-select filled stack-label option-value="TId" @input="getRecord()" option-label="TeacherName"
-            v-model="msg.TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师" :dense="false"
+          <q-select filled stack-label option-value="TId" @input="changeRecord()" option-label="TeacherName"
+            v-model="TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师" :dense="false"
             class="col-6 q-pr-lg q-pb-lg" emit-value map-options />
         </div>
       </div>
@@ -139,6 +139,7 @@
           School_Id: 0,
           ClassId: 0
         },
+        TeacherId:0,
         dataList: {},
         TeacherList: [], //关联老师下拉
       }
@@ -147,6 +148,7 @@
 
     },
     mounted() {
+      this.TeacherId = this.setingObj.Teacher_Id;
       this.getRecord();
       this.GetTeacherList();
     },
@@ -161,6 +163,17 @@
           }
         })
       },
+      changeRecord(){
+        this.msg.School_Id = this.setingObj.School_Id;
+        this.msg.ClassId = this.setingObj.ClassId;
+        this.msg.TeacherId = this.TeacherId;
+        GetClassPlanLogPageList(this.msg).then(res => {
+          if (res.Code == 1) {
+            this.dataList = res.Data.PageData;
+          }
+        })
+
+      },
       //获取教师下拉
       GetTeacherList() {
         getTeacherDropDownList({}).then(res => {

src/components/sale/backclass-form.vue

@@ -6,22 +6,24 @@
       <q-card-section>
         <div class="text-h6">退课申请</div>
       </q-card-section>
-      <q-table :loading="loading" no-data-label="暂无相关学员数据" flat class="sticky-column-table" separator="none"
-        :data="studentList" :columns="columns" hide-bottom row-key="Id">
-        <template v-slot:body-cell-optioned="props">
-          <q-td :props="props">
-            <div style="min-width:190px;width:100%">
-              <q-btn v-if="props.row.GuestState==1" flat size="xs" icon="iconfont icon-shenhe" color="info"
-                style="font-weight:400" class="q-mr-xs" label="申请" @click="clickItem(props.row,1)" />
-              <q-btn v-if="props.row.AuditStatus==3" flat size="xs" icon="iconfont icon-ziyuan" color="warning"
-                style="font-weight:400" class="q-mr-xs" label="重新申请" @click="clickItem(props.row,2)" />
-            </div>
-          </q-td>
-        </template>
-      </q-table>
-      <q-input filled stack-label :dense="false" v-model="applyReason" style="margin-top: 20px" type="textarea"
-        class="col-12" label="申请理由" />
-      <q-separator />
+      <div style="margin:20px;">
+        <q-table :loading="loading" no-data-label="暂无相关学员数据" flat class="sticky-column-table" separator="none"
+          :data="studentList" :columns="columns" hide-bottom row-key="Id">
+          <template v-slot:body-cell-optioned="props">
+            <q-td :props="props">
+              <div style="min-width:190px;width:100%">
+                <q-btn v-if="props.row.GuestState==1" flat size="xs" icon="iconfont icon-shenhe" color="info"
+                  style="font-weight:400" class="q-mr-xs" label="申请" @click="clickItem(props.row,1)" />
+                <q-btn v-if="props.row.AuditStatus==3" flat size="xs" icon="iconfont icon-ziyuan" color="warning"
+                  style="font-weight:400" class="q-mr-xs" label="重新申请" @click="clickItem(props.row,2)" />
+              </div>
+            </q-td>
+          </template>
+        </q-table>
+        <q-input filled stack-label :dense="false" v-model="applyReason" style="margin-top: 20px" type="textarea"
+          class="col-12" label="申请理由" />
+        <q-separator />
+      </div>
       <q-card-actions align="right" class="bg-white">
         <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeBackClassForm" />
         <q-btn label="确认申请" color="accent" class="q-px-md" style="font-weight:400 !important"

src/components/sale/orderlist.vue

@@ -285,9 +285,9 @@
                         <span style="color: #02C499">{{item.OrderStateName}}</span>
                     </div>
                 </td>
-                <td style="border:none">
-                    <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" @click="editOrder(item)" />
-                    <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
+                <td style="border:none;">
+                    <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;display:none;" label="编辑" @click="editOrder(item)" />
+                    <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;display:none;">
                         <q-list>
                             <q-item clickable v-close-popup>
                                 <q-item-section @click="gostudent(item)">

src/pages/administration/forMyApproval.vue

@@ -271,6 +271,9 @@
   import {
     getEmployeeAddrBook
   } from '../../api/users/user'
+  import {
+    UploadSelfFile
+  } from '../../api/common/common'
   export default {
     data() {
       return {
@@ -341,10 +344,14 @@
         let newArr=[];
         newArr.push(file.file)
         let path="/Upload/Temporary/"
-        this.UploadSelfFileT(path,newArr,x=>{
-          let url = this.domainManager().ViittoFileUrl + x.data.FilePath
-          this.appMsg.Image.push(url)
-          this.fileList.push({url:url})
+
+        UploadSelfFile('Temporary', file.file, x => {
+          if(x.Code==1){
+            let url =  x.FileUrl
+            this.appMsg.Image.push(url)
+            this.fileList.push({url: url})
+          }
+
         });
       },
       handleRemove(file){   //删除
@@ -521,7 +528,7 @@
         });
       },
       updateAapproval(path,cmd,submitCmd,workFlowId,templateId){
-        this.$router.push({ name: path, query:{cmd:cmd,submitCmd:submitCmd,workFlowId:workFlowId,templateId:templateId}})
+        this.$router.push({ path: path, query:{cmd:cmd,submitCmd:submitCmd,workFlowId:workFlowId,templateId:templateId}})
       },
       getBigpic(obj){
 

src/pages/administration/leaveApproval.vue

@@ -146,12 +146,14 @@
         let newArr = [];
         newArr.push(file.file)
         UploadSelfFile('Temporary', file.file, x => {
-          console.log(x)
-          let url = x.FileUrl
-          this.submitFileList.push(url)
-          this.fileList.push({
-            url: x.FileUrl
-          })
+          if(x.Code==1){
+            let url = x.FileUrl
+            this.submitFileList.push(url)
+            this.fileList.push({
+              url: x.FileUrl
+            })
+          }
+
         });
       },
       handleRemove(file) { //删除

src/pages/administration/myApprovalList.vue

@@ -265,6 +265,9 @@
   import {
     getEmployeeAddrBook
   } from '../../api/users/user'
+  import {
+    UploadSelfFile
+  } from '../../api/common/common'
   export default {
     data() {
       return {
@@ -335,10 +338,12 @@
         let newArr=[];
         newArr.push(file.file)
         let path="/Upload/Temporary/"
-        this.UploadSelfFileT(path,newArr,x=>{
-          let url = this.domainManager().ViittoFileUrl + x.data.FilePath
-          this.appMsg.Image.push(url)
-          this.fileList.push({url: url})
+        UploadSelfFile('Temporary', file.file, x => {
+          if(x.Code==1){
+            let url =  x.FileUrl
+            this.appMsg.Image.push(url)
+            this.fileList.push({url: url})
+          }
 
         });
 

src/pages/administration/sendToMeApproval.vue

@@ -267,6 +267,9 @@
     setCareOf,
     copyTomyaudit
   } from '../../api/administration/administration';
+  import {
+    UploadSelfFile
+  } from '../../api/common/common'
   export default {
     data() {
       return {
@@ -337,10 +340,12 @@
         let newArr=[];
         newArr.push(file.file)
         let path="/Upload/Temporary/"
-        this.UploadSelfFileT(path,newArr,x=>{
-          let url = this.domainManager().ViittoFileUrl + x.data.FilePath
-          this.appMsg.Image.push(url)
-          this.fileList.push({url: url})
+        UploadSelfFile('Temporary', file.file, x => {
+          if(x.Code==1){
+            let url =  x.FileUrl
+            this.appMsg.Image.push(url)
+            this.fileList.push({url: url})
+          }
 
         });
 

src/pages/financial/financalDocument/FinancialDocumentsDetail.vue

@@ -809,7 +809,7 @@
             </div>
           </div>
           <div style="padding-left: 75px;">
-            <button class="hollowFixedBtn" v-if="(bossID===1 || bossID===5||bossID===1903) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" @click="bohui()">驳回</button>
+<!--            <button class="hollowFixedBtn" v-if="(bossID===1 || bossID===5||bossID===1903) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" @click="bohui()">驳回</button>-->
             <button class="hollowFixedBtn" @click="AuditOrRefund()">返回</button>
           </div>
         </div>

src/pages/financial/financalDocument/addFinancialDocuments.vue

@@ -1088,14 +1088,17 @@
         let path = "/Upload/Temporary/"
         this.$message.info(this.$t('tips.shangchuanzhong'))
         UploadSelfFile('Temporary', file.file, x => {
-          let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
-          this.saveMsg.push({
-            Content: x.FileUrl,
-            ID: 0,
-            Type: fileTypeNumber,
-            Url:  x.FileUrl,
-          })
-          this.$message.success(this.$t('tips.scchenggong'))
+          if(x.Code==1){
+            let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
+            this.saveMsg.push({
+              Content: x.FileUrl,
+              ID: 0,
+              Type: fileTypeNumber,
+              Url:  x.FileUrl,
+            })
+            this.$message.success(this.$t('tips.scchenggong'))
+          }
+
         }, 1);
       },
       AuditOrRefund() {

src/pages/financial/financalDocument/addReceivablesDocuments.vue

@@ -989,46 +989,48 @@
         let path = "/Upload/Temporary/"
         this.$message.info(this.$t('tips.shangchuanzhong'))
         UploadSelfFile('Temporary', file.file, x => {
-          let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
-          this.saveMsg.push({
-            Content: x.FileUrl,
-            ID: 0,
-            Type: fileTypeNumber,
-            Url:  x.FileUrl,
-          })
-          this.Success(this.$t('tips.scchenggong'))
-          if (this.bankType == 13 && x.data.Ocr.length > 0) {
-            var OcrStr = '';
-            x.data.Ocr.forEach(x => {
-              OcrStr += x.words
+          if(x.Code==1){
+            let fileSize = file.file.size < 1024 ? file.file.size : (file.file.size / 1024).toFixed(0);
+            this.saveMsg.push({
+              Content: x.FileUrl,
+              ID: 0,
+              Type: fileTypeNumber,
+              Url:  x.FileUrl,
             })
-            var wechat = [];
-            var zhifu = [];
-            wechat = OcrStr.match(/商户单号.\d+/);
-            zhifu = OcrStr.match(/商家可扫码退款或查询交易.\d+/);
-            let barcode = x.data.Barcode;
-            if (wechat == null && zhifu == null && barcode == "") {
-              return;
-            }
-            if (zhifu == null && wechat != null && wechat.length > 0 && wechat[wechat.length - 1].length > 20) {
-              this.setCode = wechat[wechat.length - 1].replace('商户单号', '');
-            } else if (wechat == null && zhifu != null && zhifu.length > 0 && zhifu[zhifu.length - 1].length > 20) {
-              this.setCode = zhifu[zhifu.length - 1].replace('商家可扫码退款或查询交易', '');
-            } else if (barcode != "") {
-              this.setCode = barcode;
-            }
-            this.$confirm('匹配到交易流水号是否替换?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              this.msg.AccountNumber = this.setCode
-            }).catch(() => {
-              this.$message({
-                type: 'info',
-                message: '已取消删除'
+            this.Success(this.$t('tips.scchenggong'))
+            if (this.bankType == 13 && x.data.Ocr.length > 0) {
+              var OcrStr = '';
+              x.data.Ocr.forEach(x => {
+                OcrStr += x.words
+              })
+              var wechat = [];
+              var zhifu = [];
+              wechat = OcrStr.match(/商户单号.\d+/);
+              zhifu = OcrStr.match(/商家可扫码退款或查询交易.\d+/);
+              let barcode = x.data.Barcode;
+              if (wechat == null && zhifu == null && barcode == "") {
+                return;
+              }
+              if (zhifu == null && wechat != null && wechat.length > 0 && wechat[wechat.length - 1].length > 20) {
+                this.setCode = wechat[wechat.length - 1].replace('商户单号', '');
+              } else if (wechat == null && zhifu != null && zhifu.length > 0 && zhifu[zhifu.length - 1].length > 20) {
+                this.setCode = zhifu[zhifu.length - 1].replace('商家可扫码退款或查询交易', '');
+              } else if (barcode != "") {
+                this.setCode = barcode;
+              }
+              this.$confirm('匹配到交易流水号是否替换?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+              }).then(() => {
+                this.msg.AccountNumber = this.setCode
+              }).catch(() => {
+                this.$message({
+                  type: 'info',
+                  message: '已取消删除'
+                });
               });
-            });
+            }
           }
         }, 1);
       },