Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/orderlist.vue

@@ -354,7 +354,7 @@
                     <span>收款单据：</span>
                     <!-- <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit"
                     style="font-weight:400;color: #02C499" label="修改"  /> -->
-                    <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit"
+                    <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit&&item.OrderType==1"
                       style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
                     <q-popup-proxy v-if="showChooseStudent">
                       <q-banner>
@@ -375,7 +375,7 @@
                             </tr>
                           </table>
                         </div>
-                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
+                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单"
                           style="min-width:70px;float:right;margin-top:10px" />
                       </q-banner>
                     </q-popup-proxy>
@@ -390,7 +390,7 @@
                   </div>
                   <div class="row" style="justify-content: space-between">
                     <span>付款单据：</span>
-                    <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit"
+                    <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&isEdit&&item.OrderType==1"
                       style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
                     <q-popup-proxy v-if="showChooseStudent">
                       <q-banner>
@@ -411,7 +411,7 @@
                             </tr>
                           </table>
                         </div>
-                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
+                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" 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" v-if="AuthorityObj.isShowFinanceBtn"
+                    <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&item.OrderType==1"
                       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)" label="制单"
+                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,1)" label="制单"
                           style="min-width:70px;float:right;margin-top:10px" />
                       </q-banner>
                     </q-popup-proxy>
@@ -636,7 +636,7 @@
                   </div>
                   <div class="row" style="justify-content: space-between">
                     <span>付款单据：</span>
-                    <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn"
+                    <q-btn flat size="xs" icon="edit" v-if="AuthorityObj.isShowFinanceBtn&&item.OrderType==1"
                       style="font-weight:400;color: #02C499" label="修改" @click="showChooseStudent=true" />
                     <q-popup-proxy v-if="showChooseStudent">
                       <q-banner>
@@ -657,7 +657,7 @@
                             </tr>
                           </table>
                         </div>
-                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item)" label="制单"
+                        <q-btn color="accent" size="sm" class="q-mr-md" @click="chanceType(item,2)" label="制单"
                           style="min-width:70px;float:right;margin-top:10px" />
                       </q-banner>
                     </q-popup-proxy>
@@ -1070,8 +1070,9 @@
         })
       },
 
+
       //财务单据
-      chanceType(obj) {
+      chanceType(obj, type) {
         if (obj.OrderType == 1) {
           if (this.chooseStudent == "") {
             this.$q.notify({
@@ -1083,20 +1084,30 @@
             })
             return
           }
-          let ContractNo = ''
-          if (obj && obj.GuestList.length > 0) {
-            obj.GuestList.forEach(x => {
-              if (this.chooseStudent == x.Id) {
-                ContractNo = x.ContractNo
+          if (this.chooseStudent == "") {
+            this.$q.notify({
+              icon: 'close',
+              color: 'accent',
+              timeout: 2000,
+              message: '请选择学生',
+              position: 'top'
+            })
+            return
+          }
+          let ContractNo =''
+          if(obj&&obj.GuestList.length>0){
+            obj.GuestList.forEach(x=>{
+              if(this.chooseStudent == x.Id){
+                ContractNo=x.ContractNo
               }
             })
           }
-          if (ContractNo == '') {
+          if(ContractNo==''){
             this.$q.notify({
               icon: 'close',
               color: 'accent',
               timeout: 2000,
-              message: '领取合同后才能制单',
+              message: '请完善合同信息',
               position: 'top'
             })
             return
@@ -1128,25 +1139,24 @@
               TCIDList: TCIDARR
             }
           }
-        } else {
-          //留学就业订单
-          if (obj && obj.OrderType == 2) {
-            //财务单据类型【教育留学】
-            orderObj.OrderSource = 18;
-          }
-          this.$router.push({
-            path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
-            query: {
-              "Type": type,
-              "companyID": obj.ClassSchoolId,
-              "path": "",
-              'blank': 'y',
-              'orderObj': JSON.stringify(orderObj),
-              'tradeWay': obj.tradeWay,
-              "GuestId": this.chooseStudent
-            }
-          });
         }
+        //留学就业订单
+        if (obj && obj.OrderType == 2) {
+          //财务单据类型【教育留学】
+          orderObj.OrderSource = 18;
+        }
+        this.$router.push({
+          path: '/financial/financalDocument/ChoiceAddFinancialDocuments',
+          query: {
+            "Type": type,
+            "companyID": obj.ClassSchoolId,
+            "path": "",
+            'blank': 'y',
+            'orderObj': JSON.stringify(orderObj),
+            'tradeWay': obj.tradeWay,
+            "GuestId": this.chooseStudent
+          }
+        });
       },
       //打开班级详情组件
       getClassInfo(obj) {