页面修改

src/components/sale/eduinfo-form.vue

@@ -304,15 +304,7 @@
               </q-input>
             </td>
             <td>
-              <q-input filled disable class="col-6 q-pb-lg" mask="date">
-                <template v-slot:append>
-                  <q-icon name="event" class="cursor-pointer">
-                    <q-popup-proxy ref="qDateProxy3" transition-show="scale" transition-hide="scale">
-                      <q-date @input="() => $refs.qDateProxy3.hide()" />
-                    </q-popup-proxy>
-                  </q-icon>
-                </template>
-              </q-input>
+
             </td>
           </tr>
         </table>
@@ -353,8 +345,8 @@
         persistent: true,
         objOption: {
           Id: 0,
-          OrderId:0,
-          GuestId:0,
+          OrderId: 0,
+          GuestId: 0,
           CType: 1, //类型1培训 2留学
           StudentName: '', //学生姓名
           StuBirth: '', //学生生日
@@ -407,29 +399,27 @@
         fourthTotal: 0, // 培训课件费总计
         fifthTotal: 0, // 折让价格
         sixthTotal: 0, // 费用总计
-
         firstFYXJ: 0,
         secondFYXJ: 0,
         thirdFYXJ: 0,
         fyxjTotal: 0,
         saveLoading: false,
-        StudentMsg:{
-          OrderId:0,
-          GuestId:0
+        StudentMsg: {
+          OrderId: 0,
+          GuestId: 0
         }
-
       }
     },
     created() {},
     mounted() {
-      if(this.setingObj){
+      if (this.setingObj) {
         this.StudentMsg.OrderId = this.setingObj.OrderId;
         this.StudentMsg.GuestId = this.setingObj.GuestId;
         this.objOption.OrderId = this.setingObj.OrderId;
         this.objOption.GuestId = this.setingObj.GuestId;
-        if(this.setingObj.ContractId>0){
+        if (this.setingObj.ContractId > 0) {
           this.getInfoList();
-        }else{
+        } else {
           this.getStudentContract();
         }
       }
@@ -463,7 +453,6 @@
           }
         })
       },
-
       //计算培训课件费总价
       getTotalClassFee() {
         let arr = [this.objOption.FirstClassFee, this.objOption.SecondClassFee, this.objOption.ThirdClassFee];
@@ -474,7 +463,6 @@
           }
         })
       },
-
       //计算折让价格总价
       getTotalDiscountMoney() {
         let arr = [this.objOption.FirstDiscountMoney, this.objOption.SecondDiscountMoney, this.objOption
@@ -487,8 +475,6 @@
           }
         })
       },
-
-
       //计算第一列费用小计
       getFirstFYXJ() {
         let arr = [this.objOption.FirstCourseFee, this.objOption.FirstBookFee, this.objOption.FirstClassFee];
@@ -500,7 +486,6 @@
         })
         this.getTotalFYXJ();
       },
-
       //计算第二列费用小计
       getSecondFYXJ() {
         let arr = [this.objOption.SecondCourseFee, this.objOption.SecondBookFee, this.objOption.SecondClassFee];
@@ -512,7 +497,6 @@
         })
         this.getTotalFYXJ();
       },
-
       //计算第三列费用小计
       getthirdFYXJ() {
         let arr = [this.objOption.ThirdCourseFee, this.objOption.ThirdBookFee, this.objOption.ThirdClassFee];
@@ -524,8 +508,6 @@
         })
         this.getTotalFYXJ();
       },
-
-
       //获取费用小计总计
       getTotalFYXJ() {
         let arr = [this.firstFYXJ, this.secondFYXJ, this.thirdFYXJ];
@@ -536,7 +518,6 @@
           }
         })
       },
-
       //计算第一列费用总计
       getfirstFeiyongTotal() {
         if (this.firstFYXJ != '' && this.objOption.FirstDiscountMoney != '') {
@@ -545,7 +526,6 @@
         }
         this.getTotal();
       },
-
       //计算第二列费用总计
       getsecondFeiyongTotal() {
         if (this.secondFYXJ != '' && this.objOption.SecondDiscountMoney != '') {
@@ -562,7 +542,6 @@
         }
         this.getTotal();
       },
-
       //获取费用总计合计
       getTotal() {
         let arr = [this.objOption.FirstMoney, this.objOption.SecondMoney, this.objOption.ThirdMoney]
@@ -573,9 +552,9 @@
           }
         })
       },
-
       //保存合同
       saveContract() {
+        this.objOption.Money = this.sixthTotal;
         SetEducationContractInfo(this.objOption).then(res => {
           if (res.Code == 1) {
             this.$q.notify({
@@ -595,7 +574,7 @@
         this.persistent = false
       },
       //获取学生信息
-      getStudentContract(){
+      getStudentContract() {
         GetStudentInfo(this.StudentMsg).then(res => {
           if (res.Code == 1) {
             var tempData = res.Data;
@@ -633,19 +612,19 @@
         })
       },
       //获取详情
-      getInfoList(){
+      getInfoList() {
         let msg = {
-          ContractId:this.setingObj.ContractId
+          ContractId: this.setingObj.ContractId
         }
         GetEducationContractInfo(msg).then(res => {
-          console.log(res,'详情数据');
           if (res.Code == 1) {
             var tempData = res.Data;
+            this.objOption.Id = tempData.Id;
             this.objOption.StudentName = tempData.StudentName;
             this.objOption.StuTel = tempData.StuTel;
             this.objOption.StuSex = tempData.StuSex;
             this.objOption.StuEmail = tempData.StuEmail;
-            this.objOption.StuBirth = tempData.StuBirth;
+            this.objOption.StuBirth = tempData.StuBirthStr;
             this.objOption.StuAddress = tempData.StuAddress;
             this.objOption.StartLevel = tempData.StartLevel;
             this.objOption.SchoolPrincipal = tempData.SchoolPrincipal;
@@ -653,7 +632,7 @@
             this.objOption.Payee = tempData.Payee;
             this.objOption.Money = tempData.Money;
             this.objOption.FirstMoney = tempData.FirstMoney;
-            this.objOption.FirstPayDate = tempData.FirstPayDate;
+            this.objOption.FirstPayDate = tempData.FirstPayDateStr;
             this.objOption.FirstDiscountMoney = tempData.FirstDiscountMoney;
             this.objOption.FirstCourseFee = tempData.FirstCourseFee;
             this.objOption.FirstClassHours = tempData.FirstClassHours;
@@ -665,14 +644,14 @@
             this.objOption.SecondClassFee = tempData.SecondClassFee;
             this.objOption.SecondDiscountMoney = tempData.SecondDiscountMoney;
             this.objOption.SecondMoney = tempData.SecondMoney;
-            this.objOption.SecondPayDate = tempData.SecondPayDate;
+            this.objOption.SecondPayDate = tempData.SecondPayDateStr;
             this.objOption.ThirdClassHours = tempData.ThirdClassHours;
             this.objOption.ThirdCourseFee = tempData.ThirdCourseFee;
             this.objOption.ThirdBookFee = tempData.ThirdBookFee;
             this.objOption.ThirdClassFee = tempData.ThirdClassFee;
             this.objOption.ThirdDiscountMoney = tempData.ThirdDiscountMoney;
             this.objOption.ThirdMoney = tempData.ThirdMoney;
-            this.objOption.ThirdPayDate = tempData.ThirdPayDate;
+            this.objOption.ThirdPayDate = tempData.ThirdPayDateStr;
             this.objOption.CourseName = tempData.CourseName;
             this.objOption.CourseConsultant = tempData.CourseConsultant;
             this.objOption.CNYCaps = tempData.CNYCaps;
@@ -699,13 +678,11 @@
             this.getTotal();
           }
         })
-
       }
     },
   }
 
 </script>
-
 <style>
 
 </style>

src/components/sale/orderlist.vue

@@ -549,7 +549,7 @@
     <viewquotation-form v-if="isShowviewQuo" :rId="offerId" :isShowCancle="1" @close="closeQuota"
       @success="refreshOrder">
     </viewquotation-form>
-
+    <!--合同信息-->
     <eduinfo-form v-if="isShowEduForm" :seting-obj="eduObj" @close="closeEdudia" @success="refreshPage">
     </eduinfo-form>
 

src/pages/sale/contractManage.vue

@@ -33,7 +33,7 @@
           <div class="col-2 q-table__title">合同信息</div>
           <q-space />
           <div class="page-option">
-            <q-btn color="accent" size="sm" icon="add" label="新增合同" @click="EditContract(null)" />
+
           </div>
         </template>
         <template v-slot:body-cell-CreateByName="props">
@@ -80,7 +80,7 @@
                 style="font-weight:400" @click="EditContract(props.row)" label="编辑" />
               <el-tooltip content="复制链接发送给客人签字" placement="top" effect="light">
                 <q-btn flat size="xs" v-if="props.row.Status==2" icon="iconfont icon-qianming" color="accent"
-                style="font-weight:400" @click="CopyUrl(props.row)" label="客人签字" />
+                  style="font-weight:400" @click="CopyUrl(props.row)" label="客人签字" />
               </el-tooltip>
               <q-btn flat size="xs" icon="iconfont icon-View" color="accent" @click="goContract(props.row)"
                 style="font-weight:400" label="查看" />
@@ -126,7 +126,7 @@
     SetEducationContractCopy
   } from '../../api/sale/contract'
 
-    import {
+  import {
     downloadLocalFile
   } from '../../api/common/common'
 
@@ -158,24 +158,12 @@
             field: 'StudentName',
             align: 'left'
           },
-          //   {
-          //     name: 'SchoolName',
-          //     label: '学校名称',
-          //     align: 'left',
-          //     field: 'SchoolName'
-          //   },
           {
             name: 'CourseName',
             label: '课程名称',
             align: 'left',
             field: 'CourseName'
           },
-          {
-            name: 'CourseContent',
-            label: '课程内容',
-            align: 'left',
-            field: 'CourseContent'
-          },
           {
             name: 'CreateByName',
             label: '创建人',
@@ -275,7 +263,6 @@
         this.msg.pageIndex = 1;
         this.getList();
       },
-
       //分页改变
       changePage(val) {
         this.msg.pageIndex = val;
@@ -283,18 +270,22 @@
       },
       //跳转至编辑
       goContract(item) {
-         let routeUrl = this.$router.resolve({
-           path: "/contractView",
-           query: {
+        let routeUrl = this.$router.resolve({
+          path: "/contractView",
+          query: {
 
           }
-         });
-         window.open(routeUrl.href, '_blank');
+        });
+        window.open(routeUrl.href, '_blank');
       },
       //新增修改合同
       EditContract(obj) {
         if (obj) {
-          this.eduObj = obj
+          this.eduObj = {
+            OrderId: obj.OrderId,
+            GuestId: obj.GuestId,
+            ContractId: obj.Id
+          }
         } else {
           this.eduObj = null
         }
@@ -331,24 +322,24 @@
       //下载pdf
       downloadContract(item) {
         let msg = {
-          ContractId:item.Id,
-          CType:item.CType
+          ContractId: item.Id,
+          CType: item.CType
         }
         GetDownLoadEducationContract(msg).then(res => {
           if (res.Code == 1) {
-            let sign=item.StudentName+'-'+item.ContractNo;
-            downloadLocalFile(sign,res.Data);
+            let sign = item.StudentName + '-' + item.ContractNo;
+            downloadLocalFile(sign, res.Data);
           }
         })
       },
       //复制合同
-      copyContract(item){
+      copyContract(item) {
         let msg = {
-          ContractId:item.Id
+          ContractId: item.Id
         }
-         SetEducationContractCopy(msg).then(res => {
+        SetEducationContractCopy(msg).then(res => {
           if (res.Code == 1) {
-             this.getList();
+            this.getList();
           }
         })
       },
@@ -356,7 +347,7 @@
       CopyUrl(item) {
         var oInput = document.createElement('input');
         var url = window.location.host;
-        oInput.value = url+'/#/contractConfirm'+`?ContractId=${item.Id}`;
+        oInput.value = url + '/#/contractConfirm' + `?ContractId=${item.Id}`;
         document.body.appendChild(oInput);
         oInput.select(); // 选择对象
         document.execCommand("Copy"); // 执行浏览器复制命令