修改

src/api/sale/contract.js

@@ -84,3 +84,15 @@ export function SetEducationContractSign(data) {
   })
 }
 
+/**
+ * 领取合同
+ *
+ */
+export function SetOrderReceiveContract(data) {
+  return request({
+    url: '/order/SetOrderReceiveContract',
+    method: 'post',
+    data
+  })
+}
+

src/components/sale/orderlist.vue

@@ -145,6 +145,38 @@
               <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==1"
                 style="color:#2961FE;margin-right: 5px">{{x.GuestName}} </span>
             </div>
+            <div v-if="item.GuestList.length>0&&item.ContractList.length==0" class="takeContract" @click="takeContract(item)">领取合同</div>
+            <div v-if="item.ContractList.length>0" class="takeContract">
+              查看合同
+              <q-popup-proxy>
+                <q-banner>
+                  <div style="width: 450px;max-height:220px;overflow:auto;">
+                    <table class="Contract_Table">
+                      <tr>
+                        <th>姓名</th>
+                        <th style="width:180px;">合同编号</th>
+                        <th>状态</th>
+                        <th width="110px;">操作</th>
+                      </tr>
+                      <tr v-for="subItem in item.ContractList">
+                        <td>{{subItem.StudentName}}</td>
+                        <td>{{subItem.ContractNo}}</td>
+                        <td>
+                          <span v-if="subItem.Status==0">草稿</span>
+                          <span v-if="subItem.Status==1">提交审核</span>
+                          <span v-if="subItem.Status==2">审核通过</span>
+                          <span v-if="subItem.Status==3">驳回</span>
+                          <span v-if="subItem.Status==4">取消</span>
+                        </td>
+                        <td>
+                          <q-btn color="accent" v-if="subItem.ContractNo==''" size="sm" class="q-mr-md" @click="takeContractTwo(item,subItem)" label="领取合同" />
+                        </td>
+                      </tr>
+                    </table>
+                  </div>
+                </q-banner>
+              </q-popup-proxy>
+            </div>
             <div class="row" v-if=" item.GuestList.length>0&&getTkshow(item.GuestList)">
               退课名单：
               <span v-for="(x,j) in item.GuestList" :index="j" v-if="x.GuestState==2"
@@ -541,6 +573,10 @@
   import {
     queryEmployee //员工列表
   } from '../../api/users/user'
+  import {
+    SetOrderReceiveContract //领取合同
+  } from '../../api/sale/contract'
+
   export default {
     components: {
       editorderForm,
@@ -900,6 +936,49 @@
         this.moneyObj = item;
         this.CommonType = type;
         this.isShowMoney = true;
+      },
+      //领取合同
+      takeContract(item){
+        let msg = {
+          OrderId:item.OrderId,
+          GuestId:0
+        }
+        SetOrderReceiveContract(msg).then(res => {
+          if (res.Code == 1) {
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: '操作成功',
+              position: 'top'
+            })
+            //调用父页面成功方法
+            this.$emit('success');
+          }
+        }).catch(() => {
+
+        })
+      },
+      takeContractTwo(item,subItem){
+        let msg = {
+          OrderId:item.OrderId,
+          GuestId:subItem.GuestId
+        }
+        SetOrderReceiveContract(msg).then(res => {
+          if (res.Code == 1) {
+            this.$q.notify({
+              icon: 'iconfont icon-chenggong',
+              color: 'accent',
+              timeout: 2000,
+              message: '操作成功',
+              position: 'top'
+            })
+            //调用父页面成功方法
+            this.$emit('success');
+          }
+        }).catch(() => {
+
+        })
       }
     }
   }
@@ -1117,5 +1196,18 @@
     text-decoration: underline;
     cursor: pointer
   }
+  .takeContract{
+    cursor: pointer;
+    color:rgb(41, 97, 254);
+  }
+   .Contract_Table{
+    width:100%;
+    border-collapse:collapse;
+  }
+  .Contract_Table ,th, td{
+    padding:5px;
+    color:#000;
+    text-align: center;
+  }
 
 </style>

src/pages/sale/studentList.vue

@@ -37,39 +37,45 @@
         <div class="text-caption q-mb-lg q-px-md text-grey-6">基础信息</div>
         <q-card-section class="q-pt-none">
           <div class="row wrap">
-            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white"
+            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg"
               v-model="addMsg.GuestName" label="姓名" :rules="[val => !!val || '姓名']" />
-            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white"
+            <q-input clearable filled class="col-6 q-pb-lg"
               v-model="addMsg.Profession" label="职业" :rules="[val => !!val || '职业']" />
-            <div class="col-6 q-pb-lg q-pr-lg">
+            <div class="col-6 q-pb-lg">
               <q-radio v-model="addMsg.Sex" val="1" label="男" />
               <q-radio v-model="addMsg.Sex" val="2" label="女" />
             </div>
-            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white"
+            <q-input clearable filled class="col-6 q-pb-lg"
               v-model="addMsg.Age" label="年龄" :rules="[val => !!val || '年龄']" />
-            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white"
+            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg"
               v-model="addMsg.Mobile" label="电话" :rules="[val => !!val || '电话']" type="number" />
-            <q-select class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" option-value="Name"
+            <q-select class="col-6 q-pb-lg" option-value="Name" standout="bg-primary text-white"
               option-label="Name" v-model="addMsg.Basics" :options="GBList" emit-value map-options label="语音基础"
               use-input new-value-mode="add-unique" hint="自己输入语音基础的话，输入之后按回车！" />
-            <q-select class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" option-value="Id"
+            <q-select class="col-6 q-pb-lg q-pr-lg" option-value="Id" standout="bg-primary text-white"
               option-label="Name" v-model="addMsg.Education" :options="GEList" emit-value map-options label="最高学历" />
-            <q-select class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" option-value="Id"
+            <q-select class="col-6 q-pb-lg" option-value="Id" standout="bg-primary text-white"
               option-label="Name" v-model="addMsg.LearningGoals" :options="GLList" emit-value map-options
               label="学习目的" />
             <q-select class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" option-value="Id"
               option-label="Name" v-model="addMsg.GuestSource" :options="OFList" emit-value map-options label="客人来源" />
+            <q-input clearable filled class="col-6 q-pb-lg"
+            v-model="addMsg.ContactAddress" label="现居住地址" />
           </div>
         </q-card-section>
         <div class="text-caption q-mb-lg q-px-md text-grey-6">附加信息</div>
-        <q-card-section>
-          <div class="row wrap">
-            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white"
-              v-model="addMsg.Contact" label="重要联系人" />
-            <q-input clearable filled class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white"
-              v-model="addMsg.ContactMobile" label="重要联系电话" />
-          </div>
-        </q-card-section>
+        <div class="row wrap" style="margin:0 20px;">
+          <q-input clearable filled class="col-6 q-pb-lg q-pr-lg"
+            v-model="addMsg.IDCard" label="身份证" />
+          <q-input clearable filled class="col-6 q-pb-lg"
+            v-model="addMsg.Domicile" label="身份证居住地" />
+        </div>
+        <div class="row wrap"style="margin:0 20px;">
+          <q-input clearable filled class="col-6 q-pb-lg q-pr-lg"
+            v-model="addMsg.Contact" label="重要联系人" />
+          <q-input clearable filled class="col-6 q-pb-lg"
+            v-model="addMsg.ContactMobile" label="重要联系电话" />
+        </div>
         <q-separator />
         <q-card-actions align="right" class="bg-white">
           <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeSaveForm" />
@@ -191,6 +197,9 @@
           LearningGoals: "", //	学习目的
           Contact: '', //紧急联系人
           ContactMobile: '', //紧急联系电话
+          IDCard:'', //身份证
+          Domicile:'', //身份证居住地
+          ContactAddress:'' //联系地址
         },
         GBList: [],
         GEList: [],
@@ -325,6 +334,9 @@
           LearningGoals: this.GLList[0].Id, //	学习目的
           Contact: '', //紧急联系人
           ContactMobile: '', //紧急联系电话
+          IDCard:'', //身份证
+          Domicile:'', //身份证居住地
+          ContactAddress:'' //联系地址
         }
       },
       addxue() {
@@ -344,6 +356,9 @@
         this.addMsg.LearningGoals = item.LearningGoals
         this.addMsg.Contact = item.Contact
         this.addMsg.ContactMobile = item.ContactMobile;
+        this.addMsg.IDCard = item.IDCard;
+        this.addMsg.Domicile = item.Domicile;
+        this.addMsg.ContactAddress = item.ContactAddress;
         this.persistent = true
       },
       deleteUser(item) {