Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/views/admin/user/index.vue

@@ -330,6 +330,7 @@
       },
       // 角色
       handleSelect2(item) {
+         this.form.members=[]
          this.form.members.push(item.id);
       },
       /**

src/views/userManagement/memberEnter.vue

@@ -83,7 +83,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" width="100" fixed="right">
         <template scope="scope">
-          <el-button type="danger" size="small" @click="deleteHandler(scope.row)" v-if="memberEnter_btn_del">删除</el-button>
+          <el-button type="danger" size="small" @click="deleteHandler(scope.row)" v-if="memberEnter_btn_del&&scope.row.status!=1">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -148,7 +148,7 @@
       <el-form :model="fileForm">
         <el-form-item label="上传文件" :label-width="formLabelWidth">
           <el-button type="primary" icon="el-icon-download">
-            <a class="el-icon-download" :href="BASE_API+'/api/admin/admin/member/app/unauth/user/excel_model/dowload'">下载模板
+            <a class="el-icon-download" href="https://mgmt.dfangche.com/axshare/usermember.xlsx">下载模板
             </a>
           </el-button>
 

src/views/vehicle/vehicleInfo/index.vue

@@ -338,7 +338,7 @@
           </el-button>
           <el-button size="small" class="el-button el-button--text el-button--small" @click="handleBookInfo(scope.row)">预订信息</el-button>
           <el-button size="small" class="el-button el-button--text el-button--small" @click="handleDepartureLog(scope.row)">出车记录</el-button>
-          <el-button type="danger" size="small" @click="deleteHandler(scope.row)" style="margin-left:0px" v-if="vehicleInfo_btn_ret">删除</el-button>
+          <el-button  size="small" style="color:red;" @click="deleteHandler(scope.row)" class="el-button el-button--text el-button--small" v-if="vehicleInfo_btn_ret">删除</el-button>
 
         </template>
       </el-table-column>
@@ -488,10 +488,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="停靠分公司" v-if="dialogStatus=='update'" prop="parkBranchCompanyName">
-              <el-input  v-model="form.parkBranchCompanyName" placeholder="停靠分公司" readonly disabled></el-input>
-            </el-form-item>
-            <el-form-item label="停靠分公司" v-else-if="dialogStatus=='create'" prop="parkBranchCompanyName">
+            <!--<el-form-item label="停靠分公司" v-if="dialogStatus=='update'" prop="parkBranchCompanyName">-->
+              <!--<el-input  v-model="form.parkBranchCompanyName" placeholder="停靠分公司" readonly disabled></el-input>-->
+            <!--</el-form-item>-->
+            <!--v-else-if="dialogStatus=='create'"-->
+            <el-form-item label="停靠分公司"  prop="parkBranchCompanyName">
               <el-autocomplete
                 class="inline-input"
                 v-model="form.parkBranchCompanyName"

static/utf8-jsp/ueditor.config.js

@@ -19,9 +19,20 @@
      * 因此，UEditor提供了针对不同页面的编辑器可单独配置的根路径，具体来说，在需要实例化编辑器的页面最顶部写上如下代码即可。当然，需要令此处的URL等于对应的配置。
      * window.UEDITOR_HOME_URL = "/xxxx/xxxx/";
      */
-    window.UEDITOR_HOME_URL = "/static/utf8-jsp/";
-    var URL = window.UEDITOR_HOME_URL || getUEBasePath();
-	
+    // window.UEDITOR_HOME_URL = "/static/utf8-jsp/";
+    var URL = document.domain;
+    var getHost = function(url) {
+      var host = "null";
+      if(typeof url == "undefined"
+        || null == url)
+        url = window.location.href;
+      var regex = /.*\:\/\/([^\/]*).*/;
+      var match = url.match(regex);
+      if(typeof match != "undefined"
+        && null != match)
+        host = match[1];
+      return host;
+    }
 
     /**
      * 配置项主体。注意，此处所有涉及到路径的配置别遗漏URL变量。
@@ -32,7 +43,7 @@
         UEDITOR_HOME_URL: URL
 
         // 服务器统一请求接口路径
-        , serverUrl:"https://xxtest.upyuns.com/api/universal/file/app/unauth/ueditor"
+        , serverUrl:getHost()+"/api/universal/file/app/unauth/ueditor"
 
         //工具栏上的所有的功能按钮和下拉框，可以在new编辑器的实例时选择自己需要的重新定义
         , toolbars: [[
@@ -430,11 +441,11 @@
 			video:  ['autoplay', 'controls', 'loop', 'preload', 'src', 'height', 'width', 'class', 'style']
 		}
     };
-	
 
 
 
-    function getUEBasePath(docUrl, confUrl) {
+
+    function getUEBasePath(docUrl, confUrl) {debugger
 
         return getBasePath(docUrl || self.document.URL || self.location.href, confUrl || getConfigFilePath());