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

src/components/FinancialModule/FinancialDocuments.vue

@@ -1630,7 +1630,7 @@
     mounted() {
       let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
       let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
-      if (this.active == 2) {
+      if (this.active == 2 || this.active == 3) {
         this.productionDate = [StartDate, EndDate]
         this.msg.sDate = this.productionDate[0];
         this.msg.eDate = this.productionDate[1];
@@ -2222,7 +2222,7 @@
       // 切换table栏
       getActive(active, Conditon, BOSSBtn) {
         this.active = active
-        if (this.active == 2) {
+        if (this.active == 2 || this.active == 3) {
           let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
           let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
           this.productionDate = [StartDate, EndDate]

src/components/LeaderManagement/leaderReimbursement.vue

@@ -923,6 +923,9 @@
               </p>
               <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
                 v-model="leadr.LeaderGetPriceT" @input="changePrice"></el-input>
+
+              <el-input class="w300" style="display:none;" type="number" v-model="leadr.LeaderGetPriceT"
+                @input="changePrice"></el-input>
             </template>
           </div>
           <span style="color:red;font-weight:bold;">合团的请分别领款!</span>

src/components/leaderPay2.vue

@@ -847,12 +847,12 @@
             </p>
           </td>
           <td width="80" class="_zhidan">
-            <input v-if="TimeXiao" type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)">
-            <input v-else-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
+            <!-- <input v-if="TimeXiao" type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)"> -->
+            <input v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
               type="button" value="地接费结算制单" style="" class="leader2Btn" @click="goZhiDan(item)">
             <span v-else style="color:red">请在APP中提交实际用款详情信息</span>
 
-            <input style="display:none;" type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)">
+            <input  type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)">
             <input style="margin-top:15px" v-if="item.FinanceIds && item.FinanceIds.length>0" type="button" value="退款制单"
               class="leader2Btn" @click="gofzZd(item)">
           </td>

src/components/systemManagement/CostType.vue

@@ -178,7 +178,8 @@
                         </p>
                         <div class="_bumen" >
                             <p>{{$t('fnc.tanzhang')}}：{{item.IsShareAccount===0?$t('fnc.feitanzhang'): $t('fnc.tanzhang')}}</p>
-                            <p>{{$t('fnc.ysbaobiao')}}：{{item.Is_Report===0? $t('fnc.bujinru') : $t('fnc.jinru')}}</p>
+                            <p v-if="item.PrioritySort>0">审核优先级：{{item.PrioritySort}}</p>
+                            <p v-else>{{$t('fnc.ysbaobiao')}}：{{item.Is_Report===0? $t('fnc.bujinru') : $t('fnc.jinru')}}</p>
                             <p class="_b_edit">
                                 <!-- <button type="button" class="el-button el-tooltip item el-button--danger is-circle" aria-describedby="el-tooltip-694" tabindex="0" @click="financeinfoRemove(item.ID,item.Name)"><i class="el-icon-delete"></i></button> -->
                                 <button v-if="msg.EmployeeID==910" type="button" class="el-button el-tooltip item el-button--primary is-circle" aria-describedby="el-tooltip-5781" tabindex="0" @click="editCurency(item.ID),text='修改'"><i class="el-icon-edit"></i></button>
@@ -440,6 +441,11 @@
                             <el-radio v-model="addMsg.IsSecret" :label="0">{{$t('fnc.fou')}}</el-radio>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="4">
+                        <el-form-item label="审核优先级:">
+                            <el-input v-model="addMsg.PrioritySort"></el-input><span>*数值越大越靠前</span>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
             </el-form>
         </div>
@@ -506,6 +512,7 @@
                   list:[],
                   Is_Report:0,
                   IsSecret:0,
+                  PrioritySort:0
                 },
                 EmployeeIDList:[],
                 text:'',
@@ -889,6 +896,7 @@
                     list:[],
                     Is_Report:0,
                     IsSecret:0,
+                    PrioritySort:0
                 }
                 if(!t){
                     this.addShow=false
@@ -947,6 +955,7 @@
                         this.addMsg.Sort = dataList.Sort;
                         this.addMsg.Is_Report = dataList.Is_Report;
                         this.addMsg.IsSecret = dataList.IsSecret;
+                        this.addMsg.PrioritySort = dataList.PrioritySort;
                         
                         // this.addMsg = dataList;
                         if(dataList.DepartList.length>0){
@@ -996,6 +1005,7 @@
                     list:[],
                     Is_Report:0,
                     IsSecret:0,
+                    PrioritySort:0
                 }
                 this.addMsg = msg;
             },