修改

src/components/sale/orderlist.vue

@@ -358,7 +358,7 @@
                       style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
                     <q-popup-proxy v-if="showChooseStudent">
                       <q-banner>
-                        <div style="width:500px;max-height:220px;overflow-y:auto;">
+                        <div style="width:500px;max-height:400px;overflow-y:auto;">
                           <table class="Contract_Table">
                             <tr>
                               <th>选择</th>
@@ -375,7 +375,7 @@
                             </tr>
                           </table>
                         </div>
-                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单"
+                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
                           style="min-width:70px;float:right;margin-top:10px" />
                       </q-banner>
                     </q-popup-proxy>
@@ -394,7 +394,7 @@
                       style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
                     <q-popup-proxy v-if="showChooseStudent">
                       <q-banner>
-                        <div style="width:500px;max-height:220px;overflow-y:auto;">
+                        <div style="width:500px;max-height:400px;overflow-y:auto;">
                           <table class="Contract_Table">
                             <tr>
                               <th>选择</th>
@@ -411,7 +411,7 @@
                             </tr>
                           </table>
                         </div>
-                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单"
+                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
                           style="min-width:70px;float:right;margin-top:10px" />
                       </q-banner>
                     </q-popup-proxy>
@@ -600,7 +600,7 @@
                 <div class="col">
                   <div class="row" style="justify-content: space-between">
                     <span>收款单据：</span>
-                    <q-btn flat size="xs" icon="edit" :disable="true" v-if="AuthorityObj.isShowFinanceBtn"
+                    <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
                       style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
                     <q-popup-proxy v-if="showChooseStudent">
                       <q-banner>
@@ -621,7 +621,7 @@
                             </tr>
                           </table>
                         </div>
-                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单"
+                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
                           style="min-width:70px;float:right;margin-top:10px" />
                       </q-banner>
                     </q-popup-proxy>
@@ -657,7 +657,7 @@
                             </tr>
                           </table>
                         </div>
-                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单"
+                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
                           style="min-width:70px;float:right;margin-top:10px" />
                       </q-banner>
                     </q-popup-proxy>
@@ -1069,8 +1069,10 @@
           })
         })
       },
+
       //财务单据
-      chanceType(obj, type) {
+      chanceType(obj) {
+        if (obj.OrderType == 1) {
           if (this.chooseStudent == "") {
             this.$q.notify({
               icon: 'close',
@@ -1081,6 +1083,24 @@
             })
             return
           }
+          let ContractNo = ''
+          if (obj && obj.GuestList.length > 0) {
+            obj.GuestList.forEach(x => {
+              if (this.chooseStudent == x.Id) {
+                ContractNo = x.ContractNo
+              }
+            })
+          }
+          if (ContractNo == '') {
+            this.$q.notify({
+              icon: 'close',
+              color: 'accent',
+              timeout: 2000,
+              message: '领取合同后才能制单',
+              position: 'top'
+            })
+            return
+          }
           let TCIDARR = []
           //留学就业订单
           if (obj && obj.OrderType == 2) {
@@ -1108,6 +1128,7 @@
               TCIDList: TCIDARR
             }
           }
+        } else {
           //留学就业订单
           if (obj && obj.OrderType == 2) {
             //财务单据类型【教育留学】
@@ -1125,6 +1146,7 @@
               "GuestId": this.chooseStudent
             }
           });
+        }
       },
       //打开班级详情组件
       getClassInfo(obj) {