修改

src/components/sale/eduinfo-form.vue

@@ -7,19 +7,20 @@
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
         <div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div>
         <div class="row wrap">
-          <q-select filled stack-label option-value="Id" option-label="Name" v-model="objOption.CType" ref="CType"
+          <q-select filled stack-label v-if="objOption.Id==0" option-value="Id" option-label="Name" v-model="objOption.CType" ref="CType"
             :options="CTypeList" label="类型" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value map-options
             :rules="[val => !!val || '请选择所属校区']" />
+          <q-select v-else filled stack-label option-value="Id" option-label="Name" v-model="objOption.CType" ref="CType"
+            :options="CTypeList" label="类型" :dense="false" disable class="col-6 q-pr-lg q-pb-lg" emit-value map-options
+            :rules="[val => !!val || '请选择所属校区']" />
           <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.StudentName" ref="StudentName"
             class="col-6 q-pb-lg" label="学生姓名" :rules="[val => !!val || '请填写学生姓名']" />
-          <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.SchoolName" ref="SchoolName"
-            class="col-6 q-pr-lg q-pb-lg" label="学校名称" :rules="[val => !!val || '请填写学校名称']" />
+          <!-- <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.SchoolName" ref="SchoolName"
+            class="col-6 q-pr-lg q-pb-lg" label="学校名称" :rules="[val => !!val || '请填写学校名称']" /> -->
           <q-input filled stack-label maxlength="100" :dense="false" v-model="objOption.CourseName" ref="CourseName"
-            class="col-6 q-pb-lg" label="课程名称" :rules="[val => !!val || '请填写课程名称']" />
+            class="col-6 q-pr-lg q-pb-lg" label="课程名称" :rules="[val => !!val || '请填写课程名称']" />
           <q-input filled stack-label maxlength="300" :dense="false" v-model="objOption.CourseContent"
-            ref="CourseContent" class="col-6 q-pr-lg q-pb-lg" label="课程内容" :rules="[val => !!val || '请填写课程内容']" />
-          <q-input filled stack-label maxlength="300" :dense="false" v-model="objOption.CNYCaps" ref="CNYCaps"
-            class="col-6 q-pb-lg" label="人民币大写" :rules="[val => !!val || '请填写人民币大写金额']" />
+            ref="CourseContent" class="col-6 q-pb-lg" label="课程内容" :rules="[val => !!val || '请填写课程内容']" />
           <q-input filled stack-label :dense="false" @keyup.native="checkPrice(objOption,'Money')"
             v-model="objOption.Money" ref="Money" class="col-6 q-pb-lg q-pr-lg" label="金额"
             :rules="[val => !!val || '请填写金额']" />
@@ -82,16 +83,12 @@
       //保存合同
       saveContract() {
         this.$refs.StudentName.validate()
-        this.$refs.SchoolName.validate()
         this.$refs.CourseName.validate()
         this.$refs.CourseContent.validate()
-        this.$refs.CNYCaps.validate()
         this.$refs.Money.validate()
         if (!this.$refs.StudentName.hasError &&
-          !this.$refs.SchoolName.hasError &&
           !this.$refs.CourseName.hasError &&
           !this.$refs.CourseContent.hasError &&
-          !this.$refs.CNYCaps.hasError &&
           !this.$refs.Money.hasError) {
           SetEducationContractInfo(this.objOption).then(res => {
             if (res.Code == 1) {

src/pages/sale/contractAudit.vue

@@ -45,7 +45,7 @@
         </template>
         <template v-slot:body-cell-StudentName="props">
           <q-td auto-width :props="props">
-            <span v-if="props.row.Sign" style="color:#e95252;">【{{props.row.Sign}}】</span>
+            <span v-if="props.row.Sign" style="color:#67C23A;">【已签字】</span>
             <span v-else style="color:#e95252;">【未签字】</span>
             {{props.row.StudentName}}
           </q-td>
@@ -71,9 +71,9 @@
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props">
             <div>
-              <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="operationContract(props.row,2)" label="审核通过" />
+              <q-btn flat size="xs" icon="edit" color="accent" v-if="props.row.Status==1" style="font-weight:400" @click="operationContract(props.row,2)" label="审核通过" />
               <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" @click="operationContract(props.row,3)" label="驳回" />
-              <q-btn flat size="xs" icon="edit" color="accent" v-if="props.row.IsCompanySeal==0" style="font-weight:400" @click="operationContract(props.row,5)" label="盖章" />
+              <q-btn flat size="xs" icon="edit" color="accent" v-if="props.row.IsCompanySeal==0&&props.row.Status==2" style="font-weight:400" @click="operationContract(props.row,5)" label="盖章" />
               <q-btn flat size="xs" icon="iconfont icon-View" color="accent" @click="goContract(props.row)" style="font-weight:400" label="查看" />
             </div>
           </q-td>

src/pages/sale/contractEdit.vue

@@ -64,6 +64,7 @@
     border-bottom: 1px solid #c0c0c0;
     width: 300px;
     font-size: 16px;
+    text-align: center;
   }
 
   .Con_Suojin50 {
@@ -228,7 +229,7 @@
       <div class="Con_Normal Con_Suojin">
         C 日本留学生考试（EJU）：文科（日语）、综合科目、数学。
       </div>
-      <div class="Con_Normal" style="margin-left:10px;">1.3 乙方当前选择考试<div class="contractInput">{{dataList.Exam}}</div></div>
+      <div class="Con_Normal" style="margin-left:10px;">1.3 乙方当前选择考试：<div class="contractInput">{{dataList.Exam}}</div></div>
       <div class="Con_Normal">
         2、高级课程增值课程特别条款
       </div>
@@ -454,7 +455,9 @@
       </div>
       <div class="Con_Gaizhang Con_Normal">
         <div class="">
-          <div>甲方签字（盖章）：</div>
+          <div style="position:relative;">甲方签字（盖章）：
+            <img style="width:120px;position:absolute;top:-50px;" :src="dataList.CompanySealImage" />
+          </div>
           <div style="margin-top:30px;">
             <div class="contractInput" style="width:50px;">
              {{getDate(dataList.SealDate,1)}}
@@ -463,8 +466,10 @@
             月<div class="contractInput" style="width:50px;">{{getDate(dataList.SealDate,3)}}</div>日
           </div>
         </div>
-        <div>
-          <div>乙方签字（盖章）：</div>
+        <div style="margin-right:100px;">
+          <div style="position:relative;">乙方签字（盖章）：
+            <img style="width:80px;position:absolute;top:-60px;" :src="dataList.Sign" />
+          </div>
           <div style="margin-top:30px;">
             <div class="contractInput" style="width:50px;">{{getDate(dataList.SignDate,1)}}</div>年
             <div class="contractInput" style="width:50px;">{{getDate(dataList.SignDate,2)}}</div>月

src/pages/sale/contractManage.vue

@@ -139,6 +139,12 @@
             align: 'left',
             field: 'ContractNo',
           },
+          {
+            name: 'CTypeName',
+            label: '类型',
+            align: 'left',
+            field: 'CTypeName'
+          },
           {
             name: 'StudentName',
             label: '学生名称',
@@ -157,12 +163,6 @@
             align: 'left',
             field: 'CourseName'
           },
-          {
-            name: 'CTypeName',
-            label: '状态',
-            align: 'left',
-            field: 'CTypeName'
-          },
           {
             name: 'CourseContent',
             label: '课程内容',
@@ -175,6 +175,12 @@
             align: 'left',
             field: 'CreateByName'
           },
+          {
+            name: 'CreateTime',
+            label: '创建时间',
+            align: 'left',
+            field: 'CreateTime'
+          },
           {
             name: 'Status',
             label: '合同状态',