修改

src/components/sale/orderlist.vue

@@ -66,15 +66,18 @@
                 <q-badge v-if="item.TargetJoinType==3" color="green" label="已续费" style="margin-left:5px;"
                   class="q-mr-xs" />
                 <div style="display:inline-block;">
-                  <q-badge v-if="(item.JoinType==4||item.JoinType==5 ||item.TargetJoinType==4||item.TargetJoinType==5) &&item.FirstOrderId>0" color="blue" label="关联拆分订单"
-                    style="margin-left:5px;cursor:pointer;">
+                  <q-badge
+                    v-if="(item.JoinType==4||item.JoinType==5 ||item.TargetJoinType==4||item.TargetJoinType==5) &&item.FirstOrderId>0"
+                    color="blue" label="关联拆分订单" style="margin-left:5px;cursor:pointer;">
                   </q-badge>
                   <q-popup-proxy>
                     <q-banner>
                       <div style="width: 500px;">
                         <template v-if="item.SplitDetailsList&&item.SplitDetailsList.length>0">
-                          <div style="margin-bottom:5px;color:#000;" v-for="(subItem,subIndex) in item.SplitDetailsList" :key="subIndex">
-                            从 【{{subItem.S_ClassName}}】({{subItem.S_OrderId}}) {{subItem.T_JoinTypeName}}到【{{subItem.T_ClassName}}】({{subItem.T_OrderId}})
+                          <div style="margin-bottom:5px;color:#000;" v-for="(subItem,subIndex) in item.SplitDetailsList"
+                            :key="subIndex">
+                            从 【{{subItem.S_ClassName}}】({{subItem.S_OrderId}})
+                            {{subItem.T_JoinTypeName}}到【{{subItem.T_ClassName}}】({{subItem.T_OrderId}})
                           </div>
                         </template>
                       </div>
@@ -387,7 +390,10 @@
                         </tr>
                         <tr v-for="subItem in item.GuestList">
                           <td>{{subItem.GuestName}}</td>
-                          <td>{{subItem.ContractNo}}</td>
+                          <td>
+                            <span style="color:var(--q-color-primary);cursor:pointer;"
+                              @click="getShowContract(subItem)">{{subItem.ContractNo}}</span>
+                          </td>
                           <td>{{subItem.ContractStatusStr}}</td>
                           <td>
                             <template v-if="subItem.ContractId==0">
@@ -875,6 +881,23 @@
     <!--合同信息-->
     <eduinfo-form v-if="isShowEduForm" :seting-obj="eduObj" @close="closeEdudia" @success="refreshPage">
     </eduinfo-form>
+    <div v-if="isShowContract" class="_show_img_box" @click="(isShowContract = false), (imgViewList = [])">
+      <div style="
+            position: absolute;
+            width: 800px;
+            height: 600px;
+            left: 50%;
+            top: 50%;
+            margin-left: -400px;
+            margin-top: -300px;
+          ">
+        <el-carousel :initial-index="initialIndex" height="600px" :interval="5000" trigger="click">
+          <el-carousel-item style="height: 600px; overflow: auto" v-for="(item, index) in imgViewList" :key="index">
+            <img :src="item" style="" />
+          </el-carousel-item>
+        </el-carousel>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -1017,6 +1040,10 @@
           HelpEnterId: '',
         }, //关联老师参数
         TeacherList: [], //下拉老师
+        isShowContract: false,
+        imgViewUrl: '',
+        imgViewList: [],
+        initialIndex: 0,
       }
     },
     created() {
@@ -1060,6 +1087,21 @@
     },
     mounted() {},
     methods: {
+      //点击合同编号预览
+      getShowContract(item) {
+        this.isShowPop=false;
+        if (item.ContractUrlList.length > 0) {
+          //预览图片
+          if (item.ContractType == 2) {
+            this.isShowContract = true;
+            this.imgViewUrl = item.ContractUrlList[0];
+            this.imgViewList = item.ContractUrlList;
+          }
+          if(item.ContractType==1){
+            this.previewPDF(item.ContractUrlList[0]);
+          }
+        }
+      },
       //初始化权限信息
       initAuth() {
         if (this.authObj) {

src/pages/sale/studentList.vue

@@ -46,10 +46,13 @@
       text-align: center;
       line-height: 20px;
   }
+  .el-image-viewer__wrapper{
+    z-index:9999!important;
+  }
 </style>
 <template>
   <div class="page-body">
-    <div class="page-content">
+    <div class="page-content student_List">
       <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
         class="stickycreatInsertStr-column-table" separator="none" :data="data" :columns="columns" row-key="name"
         :visible-columns="visibleColumns">
@@ -214,14 +217,14 @@
         </div>
         <div>
           <div class="_addUpload_stu" style="margin:15px 0 0 20px;min-height:100px;">
-            <template v-for="(file, fIndex) in saveMsg">
-              <div v-if="file.Type == 2">
+            <template v-for="(file, fIndex) in addMsg.ContractUrl">
+              <div v-if="addMsg.ContractType == 2">
                 <div style="width: 100%; height: 100%; overflow: hidden">
-                  <img :src="file.Url ? file.Url : file.Content" @click="showUpLoadFile(file)" />
+                  <el-image style="width: 100%; height: 100%" :src="file" :preview-src-list="addMsg.ContractUrl"></el-image>
                 </div>
                 <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
               </div>
-              <div v-if="file.Type == 1" style="float:left;">
+              <div v-if="addMsg.ContractType == 1" style="float:left;">
                 <div class="iconfont icon-pdf" style="font-size:38px;color:green;text-align:center;line-height:75px;" @click="showUpLoadFile(file)"></div>
                 <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
               </div>
@@ -244,23 +247,6 @@
         </q-card-actions>
       </q-card>
     </q-dialog>
-    <div v-if="picIsShow" class="_show_img_box" @click="(picIsShow = false), (picObj = [])">
-      <div style="
-            position: absolute;
-            width: 800px;
-            height: 600px;
-            left: 50%;
-            top: 50%;
-            margin-left: -400px;
-            margin-top: -300px;
-          ">
-        <el-carousel :initial-index="initialIndex" height="600px" :interval="5000" trigger="click">
-          <el-carousel-item style="height: 600px; overflow: auto" v-for="(item, index) in picObj" :key="index">
-            <img :src="item" style="" />
-          </el-carousel-item>
-        </el-carousel>
-      </div>
-    </div>
   </div>
 </template>
 
@@ -439,9 +425,6 @@
         visibleColumns: [
 
         ], //可见列
-        saveMsg: [],
-        picObj: [],
-        picIsShow:false,
         initialIndex: 0,
         ContractTypeList:[{
           Name:'PDF',
@@ -491,37 +474,19 @@
     },
     methods: {
       resetContractArr(){
-        this.saveMsg = [];
         this.addMsg.ContractUrl = [];
       },
-      showUpLoadFile(i) {
-        // 预览上传文件
-        if (i.Type == 3) {
-          this.picObj.push(i.Url);
-          // this.imgList.push(i.Url)
-          this.picIsShow = true;
-        } else {
-          if (
-            i.Content.substring(
-              i.Content.lastIndexOf(".") + 1,
-              i.Content.length
-            ).toUpperCase() == "PDF" ||
-            i.Content.substring(
-              i.Content.lastIndexOf(".") + 1,
-              i.Content.length
-            ).toUpperCase() == "TXT"
-          ) {
-            this.previewPDF(i.Url);
+      showUpLoadFile(file) {
+        if (file) {
+          this.previewPDF(file);
         } else {
           window.open(
-              "https://view.officeapps.live.com/op/view.aspx?src=" + i.Url
+            "https://view.officeapps.live.com/op/view.aspx?src=" + file
           );
         }
-        }
       },
       deleteUploadFile(i) {
         // 删除上传文件
-        this.saveMsg.splice(i, 1);
         this.addMsg.ContractUrl.splice(i, 1);
       },
       uploadFileBtn(file) {
@@ -572,12 +537,6 @@
             if (x.Code == 1) {
               if(this.addMsg.ContractType==1){
                 if(this.addMsg.ContractUrl.length<1){
-                  this.saveMsg.push({
-                    Content: x.FileUrl,
-                    ID: 0,
-                    Type: fileTypeNumber,
-                    Url: x.FileUrl,
-                  });
                   this.addMsg.ContractUrl.push(x.FileUrl);
                 }else{
                   this.$q.notify({
@@ -587,12 +546,6 @@
                   })
                 }
               }else{
-                this.saveMsg.push({
-                  Content: x.FileUrl,
-                  ID: 0,
-                  Type: fileTypeNumber,
-                  Url: x.FileUrl,
-                });
                 this.addMsg.ContractUrl.push(x.FileUrl);
               }
               this.$message.success(this.$t("tips.scchenggong"));
@@ -781,17 +734,6 @@
         this.addMsg.ContractType = item.ContractType;
         this.addMsg.GuestContractNo = item.GuestContractNo;
         this.addMsg.ContractUrl = item.ContractUrlList;
-        this.saveMsg=[];
-        if(this.addMsg.ContractUrl&&this.addMsg.ContractUrl.length>0){
-          this.addMsg.ContractUrl.forEach(x=>{
-            this.saveMsg.push({
-              Content: x,
-              ID: 0,
-              Type: this.addMsg.ContractType,
-              Url: x
-            });
-          })
-        }
         this.persistent = true;
       },
       //删除学员