Merge remote-tracking branch 'origin/anhui-mall-ui-test' into anhui-mall-ui-test

src/assets/styles/element-ui.scss

@@ -82,3 +82,21 @@
 .el-range-separator {
   box-sizing: content-box;
 }
+
+// .el-loading-mask{
+//   background-color:#E5EEF5;
+//   display: flex;
+//   align-items: center;justify-content: center;
+// }
+// .el-loading-spinner{
+//   width: 10%;
+//   height: 18%;
+//   border-radius: 10px;
+//   background-image: url('../../../public/lodingCar.gif');
+//   background-size: 100% 100%;
+//   background-repeat: no-repeat;
+//   background-position: center;
+// }
+// .el-loading-spinner>svg{
+//   display: none;
+// }

src/views/EquipmentLedger/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container"  v-loading="tableLoading">
     <el-row :gutter="24" class="main-content" type="justify">
       <el-col :span="collapsed ? 1 : 5" class="tree-column" style="">
         <div class="card-container" v-if="!collapsed" style="min-width: 100%">
@@ -378,7 +378,6 @@
             :data="tableData"
             :key="Date.now()"
             @selection-change="handleSelectionChange"
-            v-loading="tableLoading"
             border
             stripe
             fit
@@ -2267,4 +2266,26 @@ export default {
   margin: 2px 0; /* 上下边距，避免内容贴边 */
 }
 
+
+.app-container{
+  // height: 100vh;
+  ::v-deep.el-loading-mask{
+    background-color:#E5EEF5;
+  }
+  ::v-deep.el-loading-spinner{
+    position: absolute;
+    top: 30%;
+    left: 44%;
+    width: 12%;
+    height: 15%;
+    border-radius: 10px;
+    background-image: url('../../../public/lodingCar.gif');
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    background-position: center;
+  }
+  ::v-deep.el-loading-spinner>svg{
+    display: none;
+  }
+}
 </style>

src/views/toolsManage/codeToolsLedger/index.vue

@@ -1,8 +1,8 @@
 <template>
   <!-- 基础页面 -->
-  <div class="app-container">
+  <div class="app-container" v-loading="isLoading">
     <el-card v-show="showSearch" style="margin-bottom: 20px">
-      <el-form :model="queryParams" ref="queryForm" size="small" inline @submit.native.prevent>
+      <el-form :model="queryParams" ref="queryForm" size="small" label-width="140px" inline @submit.native.prevent>
         <el-form-item label="产权单位" prop="propertyUnitIds">
           <el-cascader
             clearable
@@ -10,7 +10,7 @@
             placeholder="请选择产权单位"
             :options="propertyUnitList"
             :props="{ label: 'label', value: 'id', children: 'children', checkStrictly: true }"
-            style="width: 240px"
+            style="width: 300px"
             @change="handleUnitChange"
           />
         </el-form-item>
@@ -21,7 +21,7 @@
             clearable
             filterable
             @change="(val) => changeType(val, '2')"
-            style="width: 240px"
+            style="width: 300px"
           >
             <el-option v-for="item in fourthParentList" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
@@ -34,7 +34,7 @@
             filterable
             :disabled="!queryParams.fourthParentId"
             @change="(val) => changeType(val, '3')"
-            style="width: 240px"
+            style="width: 300px"
           >
             <el-option v-for="item in greatGrandparentList" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
@@ -47,7 +47,7 @@
             filterable
             :disabled="!queryParams.greatGrandparentId"
             @change="(val) => changeType(val, '4')"
-            style="width: 240px"
+            style="width: 300px"
           >
             <el-option v-for="item in grandparentTypeList" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
@@ -59,7 +59,7 @@
             clearable
             filterable
             :disabled="!queryParams.grandparentTypeId"
-            style="width: 240px"
+            style="width: 300px"
           >
             <el-option v-for="item in parentTypeList" :key="item.id" :label="item.label" :value="item.id" />
           </el-select>
@@ -70,7 +70,7 @@
             placeholder="请输入规格型号"
             clearable
             @keyup.enter.native="handleQuery"
-            style="width: 240px"
+            style="width: 300px"
           />
         </el-form-item>
         <el-form-item label="工具编码" prop="toolCode">
@@ -79,7 +79,7 @@
             placeholder="请输入工具编码"
             clearable
             @keyup.enter.native="handleQuery"
-            style="width: 240px"
+            style="width: 300px"
           />
         </el-form-item>
 
@@ -93,19 +93,18 @@
 
     <el-card class="content-box">
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+        <el-col :span="8">
           <div style="font-size: 20px; font-weight: 800">编码工具台账列表</div>
         </el-col>
-
+        <el-col :span="16" style="text-align: right;">
-        <el-button icon="el-icon-download" style="margin-left: 1250px" type="primary" size="mini" @click="handleExport">
+             <el-button icon="el-icon-download" style="margin-right: 20px" type="primary" size="mini" @click="handleExport">
-          导出数据
+              导出数据
-        </el-button>
+            </el-button>
-
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
+        </el-col>
       </el-row>
 
       <el-table
-        v-loading="isLoading"
         :data="tableList"
         highlight-current-row
         border
@@ -158,7 +157,7 @@
     </el-card>
 
     <!-- 弹框 -->
-    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="60%" v-loading="isLoading">
+    <el-dialog :title="dialogTitle" :visible.sync="dialogVisible" width="60%">
       <el-form
         ref="dialogForm"
         :model="dialogForm"
@@ -1015,4 +1014,25 @@ export default {
   margin-bottom: 16px;
 }
 
+.app-container{
+  // height: 100vh;
+  ::v-deep.el-loading-mask{
+    background-color:#E5EEF5;
+  }
+  ::v-deep.el-loading-spinner{
+    position: absolute;
+    top: 30%;
+    left: 44%;
+    width: 12%;
+    height: 15%;
+    border-radius: 10px;
+    background-image: url('../../../../public/lodingCar.gif');
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    background-position: center;
+  }
+  ::v-deep.el-loading-spinner>svg{
+    display: none;
+  }
+}
 </style>

src/views/toolsManage/toolsLedger/index.vue

@@ -1,8 +1,8 @@
 <template>
   <!-- 基础页面 -->
-  <div class="app-container">
+  <div class="app-container"  v-loading="isLoading"> 
     <el-card v-show="showSearch" style="margin-bottom: 20px">
-      <el-form :model="queryParams" ref="queryForm" size="small" inline @submit.native.prevent>
+      <el-form :model="queryParams" ref="queryForm" size="small" label-width="120px"  inline @submit.native.prevent>
         <!-- <el-form-item label="管理模式" prop="manageMode">
           <el-select v-model="queryParams.manageMode" placeholder="请选择管理模式" clearable style="width: 240px">
             <el-option label="编码工具" value="0"/>
@@ -95,9 +95,8 @@
             style="width: 240px"
           />
         </el-form-item> 
-
         <!-- 表单按钮 -->
-        <el-form-item style="display: flex; justify-content: flex-end">
+        <el-form-item style="float: right">
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="background-color: #2CBAB2;border-color: #2CBAB2;">查询</el-button>
           <el-button icon="el-icon-refresh" size="mini" @click="handleReset">重置</el-button>
         </el-form-item>
@@ -106,18 +105,19 @@
 
     <el-card class="content-box">
       <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
+        <el-col :span="8">
           <!-- <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button> -->
           <div style="font-size: 20px; font-weight: 800">数量工具台账列表</div>
         </el-col>
-        <el-button icon="el-icon-download" style="margin-left: 1250px" type="primary" size="mini" @click="handleExport">
+        <el-col :span="16" style="text-align: right;">
-          导出数据
+             <el-button icon="el-icon-download" style="margin-right: 20px" type="primary" size="mini" @click="handleExport">
-        </el-button>
+              导出数据
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
+            </el-button>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"/>
+        </el-col> 
       </el-row>
 
       <el-table 
-        v-loading="isLoading"
         :data="tableList"
         highlight-current-row
         border
@@ -174,7 +174,6 @@
         :data="dialogList"
         fit
         highlight-current-row
-        v-loading="isLoading"
         height="546"
         border
         stripe
@@ -663,6 +662,27 @@ export default {
     border-color: #2CBAB2;
     color: #FFF;
 } 
-
 }
+.app-container{
+  // height: 100vh;
+  ::v-deep.el-loading-mask{
+    background-color:#E5EEF5;
+  }
+  ::v-deep.el-loading-spinner{
+    position: absolute;
+    top: 30%;
+    left: 44%;
+    width: 12%;
+    height: 15%;
+    border-radius: 10px;
+    background-image: url('../../../../public/lodingCar.gif');
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    background-position: center;
+  }
+  ::v-deep.el-loading-spinner>svg{
+    display: none;
+  }
+}
+
 </style>