Merge remote-tracking branch 'origin/project2024-3-5' into project2024-3-5

src/views/equipment/inventoryManagement/index.vue

@@ -42,7 +42,7 @@
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
-      <el-form-item style="float: right">
+      <el-form-item>
         <el-button
           type="warning"
           icon="el-icon-upload"
@@ -76,7 +76,7 @@
             {{ scope.row.plocation || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="厚度" prop="厚度" :show-overflow-tooltip="true">
+        <el-table-column label="厚度" prop="厚度"  :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.phd || '-' }}
           </template>
@@ -91,7 +91,7 @@
             <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" width="150px">
+        <el-table-column label="操作" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="handleDetail(scope.row)">
               详情
@@ -105,7 +105,7 @@
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-delete"
+              class="del-button"
               @click="handleDelete(scope.row)"
             >删除
             </el-button>
@@ -233,9 +233,9 @@
         </div>
         <div slot="tip" class="el-upload__tip">
           <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
-          <el-link type="info" class="download-template" @click="importTemplate">下载模板</el-link>
+          <el-link type="info" class="downloadTem"  @click="importTemplate">下载模板</el-link>
         </div>
-        <div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+        <div slot="tip" class="el-upload__tip__red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
       </el-upload>
       <div slot="footer" class="dialog-footer">
         <el-button @click="upload.open = false">取 消</el-button>
@@ -458,7 +458,7 @@ export default {
     submitForm: function() {
       this.$refs.form.validate((valid) => {
         if (valid) {
-          this.$confirm('是否确认导出所有库存信息?', '提示', {
+          this.$confirm('是否确认修改信息?', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
@@ -677,6 +677,16 @@ el-form.el-form-item.el-input{
 .el-link--inner{
   font-size: 12px;
 }
+.el-upload__tip__red{
+  color: red;
+}
+.downloadTem{
+  font-size: 11px;
+  margin-top: -2px;
+}
+.del-button{
+  color: rgba(255, 38, 0, 0.99);
+}
 
 </style>