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

src/components/sale/editOrder-form.vue

@@ -48,17 +48,16 @@
               :disable="true" v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg" label="应收" />
           </template>
           <template v-else>
-              <q-input filled stack-label :dense="false" maxlength="10"
-                @keyup.native="checkPrice(OrderMsg,'PreferPrice')" :disable="!isHaveModify"
-                v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg" label="应收" />
-            </template>
+            <q-input filled stack-label :dense="false" maxlength="10" @keyup.native="checkPrice(OrderMsg,'PreferPrice')"
+              :disable="!isHaveModify" v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg" label="应收" />
           </template>
-          <q-input filled stack-label :dense="false" v-model="OrderMsg.SaleRemark" style="margin-top: 20px"
-            type="textarea" class="col-12" label="备注" />
-          <div style="margin:30px 10px 70px 0;">
-            <q-btn class="q-mr-md" label="取消" @click="closeEditOrder" />
-            <q-btn color="accent" class="q-mr-md" label="保存" @click="saveOrderInfo()" />
-          </div>
+        </template>
+        <q-input filled stack-label :dense="false" v-model="OrderMsg.SaleRemark" style="margin-top: 20px"
+          type="textarea" class="col-12" label="备注" />
+        <div style="margin:30px 10px 70px 0;">
+          <q-btn class="q-mr-md" label="取消" @click="closeEditOrder" />
+          <q-btn color="accent" class="q-mr-md" label="保存" @click="saveOrderInfo()" />
+        </div>
       </div>
     </q-card>
     <div class="dialog-out-close" @click="closeEditOrder"
@@ -91,6 +90,11 @@
       orderType: {
         type: Number,
         default: 1,
+      },
+      //修改订单类型
+      modityOrderType:{
+        type: Number,
+        default: 0,//1-销售修改，2-OP修改，3-总经理修改
       }
     },
     data() {

src/components/sale/orderlist.vue

@@ -152,9 +152,9 @@
               </div>
             </td>
             <td style="border:none">
-              <template v-if="AuthorityObj.isShowOperate">
+              <template>
                 <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
-                  @click="editOrder(item)" />
+                  @click="editOrder(item)" v-if="AuthorityObj.isShowEdit" />
                 <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;">
                   <q-list>
                     <q-item clickable v-close-popup>
@@ -187,6 +187,11 @@
                         <q-item-label>校长备注</q-item-label>
                       </q-item-section>
                     </q-item>
+                    <q-item clickable v-close-popup v-if="isEditOrder">
+                      <q-item-section @click="editOrder(item)">
+                        <q-item-label>总经理修改</q-item-label>
+                      </q-item-section>
+                    </q-item>
                     <q-item clickable v-close-popup v-if="AuthorityObj.isShowManagerRemark">
                       <q-item-section @click="editOrderRemark(item,4)">
                         <q-item-label>总经理备注</q-item-label>
@@ -252,13 +257,13 @@
                           <th>姓名</th>
                           <th style="width:180px;">合同编号</th>
                           <th>状态</th>
-                          <th width="170px;" v-if="AuthorityObj.isShowOperate">操作</th>
+                          <th width="170px;" v-if="AuthorityObj.isShowEdit">操作</th>
                         </tr>
                         <tr v-for="subItem in item.GuestList">
                           <td>{{subItem.GuestName}}</td>
                           <td>{{subItem.ContractNo}}</td>
                           <td>{{subItem.ContractStatusStr}}</td>
-                          <td v-if="AuthorityObj.isShowOperate">
+                          <td v-if="AuthorityObj.isShowEdit">
                             <template v-if="subItem.ContractId==0">
                               <q-btn color="accent" size="sm" @click="takeContractTwo(item,subItem)" label="领取合同" />
                             </template>
@@ -387,9 +392,9 @@
                   <div class="row" style="justify-content: space-between">
                     <span>收款单据：</span>
                     <q-btn flat size="xs" icon="edit"
-                      v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowOperate&&item.OrderType==2"
+                      v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==2"
                       style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,1)" />
-                    <template v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowOperate&&item.OrderType==1">
+                    <template v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==1">
                       <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
                         @click="showChooseStudent=true" />
                       <q-popup-proxy v-if="showChooseStudent">
@@ -428,9 +433,9 @@
                   <div class="row" style="justify-content: space-between">
                     <span>付款单据：</span>
                     <q-btn flat size="xs" icon="edit"
-                      v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowOperate&&item.OrderType==2"
+                      v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==2"
                       style="font-weight:400;color: #02C499" label="修改" @click="chanceType(item,2)" />
-                    <template v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowOperate&&item.OrderType==1">
+                    <template v-if="AuthorityObj.isShowFinanceBtn&&AuthorityObj.isShowEdit&&item.OrderType==1">
                       <q-btn flat size="xs" icon="edit" style="font-weight:400;color: #02C499" label="修改"
                         @click="showChooseStudent=true" />
                       <q-popup-proxy v-if="showChooseStudent">
@@ -541,7 +546,7 @@
                 <span style="color: #02C499">{{item.OrderStateName}}</span>
               </div>
             </td>
-            <td style="border:none;" v-if="AuthorityObj.isShowOperate">
+            <td style="border:none;" v-if="AuthorityObj.isShowEdit">
               <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;display:none;" label="编辑"
                 @click="editOrder(item)" />
               <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;display:none;">
@@ -823,7 +828,7 @@
           isShowBackClass: false, //是否显示退课按钮
           isShowRenewClass: false, //是否显示续课按钮
           isShowContract: true, //是否显示合同
-          isShowOperate: true, //是否显示操作列
+          isShowEdit: true, //是否显示修改订单按钮
         },
 
         isShowEduForm: false, //是否显示新增修改合同弹窗
@@ -832,6 +837,7 @@
         showChooseStudent: false, //收款单据，是否显示单选学生
         chooseStudent: "", //收款单据，单选学生
         isShowReward: false, // 是否可以修改额外金额
+        isEditOrder: false, //是否有【总经理】修改订单但权限
       }
     },
     created() {
@@ -845,6 +851,9 @@
           if (x.FunctionCode == 'Edit_OrderExtraMoney') {
             this.isShowReward = true
           }
+          if (x.FunctionCode == 'Edit_Order') {
+            this.isEditOrder = true
+          }
         })
       }
 
@@ -893,8 +902,8 @@
           if (this.authObj.isShowRenewClass != null && this.authObj.isShowRenewClass) {
             this.AuthorityObj.isShowRenewClass = this.authObj.isShowRenewClass;
           }
-          if (this.authObj.isShowOperate != null && !this.authObj.isShowOperate) {
-            this.AuthorityObj.isShowOperate = this.authObj.isShowOperate;
+          if (this.authObj.isShowEdit != null && !this.authObj.isShowEdit) {
+            this.AuthorityObj.isShowEdit = this.authObj.isShowEdit;
           }
         }
       },

src/pages/sale/orderStatistics.vue

@@ -169,13 +169,15 @@
         showone: false,
         //权限判断
         authObj: {
-          isShowGuestBtn: 1, //显示新增学员名单按钮
-          isShowFinanceBtn: true, //显示财务单据按钮
-          isShowTransOrder: true, //显示转交订单按钮
-          isShowSaleRemark: true, //显示修改销售备注
-          isShowBackClass: true, //显示退课按钮
-          isShowRenewClass: true, //显示续课按钮
-          isShowOperate:false,//不显示操作列
+          isShowGuestBtn: 0, //显示新增学员名单按钮
+          isShowFinanceBtn: false, //显示财务单据按钮
+          isShowTransOrder: false, //显示转交订单按钮
+          isShowSaleRemark: false, //显示修改销售备注
+          isShowBackClass: false, //显示退课按钮
+          isShowRenewClass: false, //显示续课按钮
+          isShowEdit:false,//不显示修改按钮
+          isShowBackClass:false,//不显示退课
+          isShowRenewClass:false,//不显示续课
         },
         EmployeeList:[],//业务员
       }

src/pages/sale/studyOrderStatistics.vue

@@ -30,8 +30,8 @@
           </q-field>
         </div>
         <div class="col-3">
-          <q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id"
-            option-label="EmployeeName" v-model="msg.EnterID"  :options="EmployeeList" emit-value map-options label="业务员" />
+          <q-select @input="resetSearch" standout="bg-primary text-white" option-value="Id" option-label="EmployeeName"
+            v-model="msg.EnterID" :options="EmployeeList" emit-value map-options label="业务员" />
         </div>
       </div>
     </div>
@@ -84,7 +84,7 @@
       </div>
     </div>
     <div class="page-content">
-      <orderlist :dataList="data.List"  :authObj="authObj" @success="refreshClassOrder" ref="orderL"  >
+      <orderlist :dataList="data.List" :authObj="authObj" @success="refreshClassOrder" ref="orderL">
       </orderlist>
       <div class="row" style="justify-content: flex-end;padding: 5px 20px">
         <q-pagination v-model="msg.pageIndex" :max="pageCount" @input="changePage" class="full-width justify-end"
@@ -99,7 +99,7 @@
 </template>
 <script>
   import {
-    getMyStudyOrderStatisticsPageList,//获取订单列表
+    getMyStudyOrderStatisticsPageList, //获取订单列表
     getOrderStateEnumList //订单状态
   } from '../../api/sale/sale';
   import {
@@ -108,7 +108,9 @@
   import myOrderForm from '../../components/sale/myOrder-form'
   import classinfoForm from '../../components/course/classinfo-form';
   import orderlist from '../../components/sale/orderlist'
-  import {    queryEmployee  } from '../../api/users/user'
+  import {
+    queryEmployee
+  } from '../../api/users/user'
   export default {
     meta: {
       title: "留学就业统计"
@@ -141,7 +143,7 @@
           Q_OrderState: 1, //查询 1正常订单 2取消订单 (默认传1 如果 选择了订单状态 则传 0)
           Q_OrderBy: 2, //写死 =2
           PlatformTax: 0, //平台税金
-          EnterID:"",//业务员id
+          EnterID: "", //业务员id
         },
         //订单状态
         OrderStateList: [],
@@ -152,13 +154,17 @@
         showone: false,
         //权限判断
         authObj: {
-          isShowGuestBtn: 1, //显示新增学员名单按钮
-          isShowFinanceBtn: true, //显示财务单据按钮
-          isShowTransOrder: true, //显示转交订单按钮
-          isShowSaleRemark: true, //显示修改销售备注
-          isShowOperate:false,//不显示操作列
+          isShowGuestBtn: 0, //显示新增学员名单按钮
+          isShowFinanceBtn: false, //显示财务单据按钮
+          isShowTransOrder: false, //显示转交订单按钮
+          isShowSaleRemark: false, //显示修改销售备注
+          isShowBackClass: false, //显示退课按钮
+          isShowRenewClass: false, //显示续课按钮
+          isShowEdit:false,//不显示修改按钮
+          isShowBackClass:false,//不显示退课
+          isShowRenewClass:false,//不显示续课
         },
-        EmployeeList:[],//业务员
+        EmployeeList: [], //业务员
 
       }
     },
@@ -268,18 +274,18 @@
       closeClass() {
         this.isShowClassInfo = false;
       },
-       //业务员
-      getEmployee(id) { 
+      //业务员
+      getEmployee(id) {
         var qMsg = {
           Dept_Id: 0
         }
-        qMsg.Dept_Id=id;
+        qMsg.Dept_Id = id;
         queryEmployee(qMsg).then(res => {
-          if(res.Code==1){
+          if (res.Code == 1) {
             this.EmployeeList = res.Data;
-            let obj={
-                Id:"",
-                EmployeeName:"不限"
+            let obj = {
+              Id: "",
+              EmployeeName: "不限"
             }
             this.EmployeeList.unshift(obj)
           }