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

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -16,7 +16,6 @@
                   filterable
                   v-model="msg.OutBranchId"
                   @change="getChange"
-                  clearable
                   :disabled="PermissionState==2"
                 >
                   <el-option
@@ -122,10 +121,10 @@
               style="width: 100%;" filterable multiple collapse-tags
               v-model="msg.LineIdList" @change="getStatement"
               clearable>
-                <el-option  v-if="activeName!=2"
+                <!-- <el-option  v-if="activeName!=2"
                   :value="0"
                   :label="$t('pub.unlimitedSel')"
-                ></el-option>
+                ></el-option> -->
                 <el-option
                   v-for="item in LineList"
                   :label="item.LineName"
@@ -459,7 +458,7 @@ export default {
         }else{
           this.msg.OutBranchIdList = this.msg.OutBranchIdList.filter(x=>{return x!=-1})
         }
-        if(this.msg.OutBranchIdList.indexOf('-1')!=-1) {
+        if(this.msg.OutBranchIdList.indexOf('-1')!=-1 || this.msg.OutBranchIdList.length ==0) {
           this.coinGetShow = false
           this.msg.StandardCurrencyId = 1
         }else {

src/components/FinancialModule/DataAnalysis/index.vue

@@ -15,7 +15,6 @@
                 filterable
                 v-model="msg.OutBranchId"
                 @change="getChange"
-                clearable
                 :disabled="PermissionState==2"
               >
                 <el-option
@@ -146,7 +145,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="2" v-if="activeName!=2&&activeName!=3">
+          <el-col :span="2" v-if="activeName!=3">
             <el-form-item label="季度汇总">
               <el-checkbox v-model="msg.LossType" true-label="1" false-label="0" @change="getStatement"></el-checkbox>
             </el-form-item>