11

src/App.vue

@@ -23,7 +23,7 @@ body,html{
   height: 100%;
 }
 .App{
-  min-width: 1366px;
+  min-width: 1360px;
 }
 *{
   margin: 0;

src/assets/css/reset.css

@@ -51,14 +51,14 @@
 .el-pager li{
     padding: 0;
     font-size: 14px;
-    width: 40px;
-    height: 30px;
-    line-height: 30px;
+    width: 38px;
+    height: 28px;
+    line-height: 28px;
     text-align: center;
 }
 .el-pagination button, .el-pagination span:not([class*=suffix]){
-    height: 30px;
-    line-height: 30px;
+    height: 28px;
+    line-height: 28px;
 }
 
 /* 图片上传 */
@@ -95,7 +95,7 @@
 .el-dialog{
     background:rgba(248,250,251,1);
     border-radius:20px;
-    max-height:85%;
+    max-height:75%;
     overflow-y: scroll;
 }
 .el-dialog__headerbtn .el-dialog__close{

src/components/global/CheckDetails.vue

@@ -12,7 +12,10 @@
         <div class="baseTitle f12">使用信息</div>
         <div class="desItem">
             <p>使用人</p>
-            <p>{{datainfo.EmName}}</p>
+            <p>
+              <span v-if="datainfo.EmName && datainfo.EmName!=''">{{datainfo.EmName}}</span>
+              <span v-else>无</span>
+            </p>
         </div>
         <div class="desItem">
             <p>领取时间</p>
@@ -26,7 +29,10 @@
             </div>
             <div class="desItem">
                 <p>资产分类</p>
-                <p>{{datainfo.CategoryName}}</p>
+                <p>
+                  <span v-if="datainfo.CategoryName && datainfo.CategoryName!=''">{{datainfo.CategoryName}}</span>
+                  <span v-else>无</span>
+                </p>
             </div>
             <div class="desItem">
                 <p>品牌</p>
@@ -41,11 +47,17 @@
             </div>
             <div class="desItem">
                 <p>单位</p>
-                <p>{{datainfo.Units}}</p>
+                <p>
+                  <span v-if="datainfo.Units && datainfo.Units!=''">{{datainfo.Units}}</span>
+                  <span v-else>无</span>
+                </p>
             </div>
             <div class="desItem">
                 <p>序列号</p>
-                <p>{{datainfo.SerialNumber}}</p>
+                <p>
+                  <span v-if="datainfo.SerialNumber && datainfo.SerialNumber!=''">{{datainfo.SerialNumber}}</span>
+                  <span v-else>无</span>
+                </p>
             </div>
             <div class="desItem">
                 <p>购置日期</p>
@@ -57,7 +69,10 @@
             </div>
             <div class="desItem">
                 <p>金额</p>
-                <p>{{datainfo.Money}}</p>
+                <p>
+                  <span v-if="datainfo.Money && datainfo.Money!=''">{{datainfo.Money}}</span>
+                  <span v-else>无</span>
+                </p>
             </div>
             <div class="desItem">
                 <p>使用类型</p>
@@ -79,7 +94,10 @@
             </div>
             <div class="desItem">
                 <p>供应商</p>
-                <p>{{datainfo.SupplierName}}</p>
+                <p>
+                  <span v-if="datainfo.SupplierName && datainfo.SupplierName!=''">{{datainfo.SupplierName}}</span>
+                  <span v-else>无</span>
+                </p>
             </div>
         </div>
         <div class="baseTitle f12">操作记录</div>

src/components/global/Login.vue

@@ -81,6 +81,9 @@ export default {
 </script>
 
 <style>
+.login .el-loading-mask{
+  border-radius: 24px;
+}
 .login{
   position: absolute;
   width: 100%;

src/components/global/index.vue

@@ -61,7 +61,7 @@ export default {
       }
     },
     created(){
-      this.minHeight=document.body.clientHeight-70;
+      this.minHeight=document.body.clientHeight-90;
       if(!this.getLocalStorage()){
         this.$router.push({path: 'login'})
         return;

src/plugins/index.js

@@ -31,7 +31,7 @@ export default {
                     // javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.2.215:9000",
                     // javaUrl: locationName.indexOf('testb2b') == -1 ? "http://efficient.oytour.com" : locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://47.96.12.235:9001" : "http://192.168.2.215:9000",
                 
-                    javaUrl: "http://192.168.2.16:8087",
+                    javaUrl: "http://192.168.2.17:8087",
                     ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://staticfile.oytour.com" : 'http://192.168.2.214:8130',
                     UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('testb2b.oytour.com') !== -1 ? "http://uploadfile.oytour.com" : "http://192.168.2.214:8120",
                     // UploadUrl: "http://uploadfile.oytour.com",
@@ -66,7 +66,6 @@ export default {
                 this.$http.post(apiurl, postData, {
                     responseType: 'arraybuffer'
                 }).then((res) => {
-                    console.log("res",res);
                     let blob = new Blob([res.data], {
                         type: "application/vnd.ms-excel"
                     })
@@ -117,7 +116,6 @@ export default {
                 this.$http.post(apiurl, postData, {
                   responseType: 'arraybuffer'
                 }).then((res) => {
-                    console.log("res",res);
                   let blob = new Blob([res.data], {
                     type: "application/vnd.ms-excel"
                   })