优化

src/views/accountsInfoManagement/index.vue

@@ -152,8 +152,8 @@
           </el-col>
           <!-- 租赁单价 -->
           <el-col :span="12" :offset="0">
-            <el-form-item label="租赁单价" prop="leasePrice">
+            <el-form-item label="租赁价格" prop="leasePrice">
-              <el-input v-model="dialogForm.leasePrice" type="number" :min="0" placeholder="请输入租赁单价" clearable />
+              <el-input v-model="dialogForm.leasePrice" type="number" :min="0" placeholder="请输入租赁价格" clearable />
             </el-form-item>
           </el-col>
           <!-- 是否结算 -->
@@ -202,9 +202,8 @@ export default {
       total: 0, // 总条数
       // 表头
       tableColumns: [
-        { label: 'ID', prop: 'id' },
         { label: '协议ID', prop: 'agreementId' },
-        { label: '机具型号ID', prop: 'typeId' },
+        { label: '机具规格ID', prop: 'typeId' },
         { label: '机具ID', prop: 'maId' },
         { label: '领料数量', prop: 'num' },
         { label: '领料时间', prop: 'outTime', width: '120' },

src/views/materialsStation/equipment/equipmentRecord/index.vue

@@ -38,10 +38,10 @@
       </el-form-item>
 
 
-      <el-form-item label="工程" prop="proName">
+      <el-form-item label="工程名称" prop="proName">
         <el-select
           v-model="queryParams.proName"
-          placeholder="请选择工程"
+          placeholder="请选择工程名称"
           clearable
           filterable
           style="width: 240px"

src/views/materialsStation/equipment/safetyWarn/index.vue

@@ -62,10 +62,10 @@
       </el-form-item>
 
 
-      <el-form-item label="工程" prop="proName">
+      <el-form-item label="工程名称" prop="proName">
         <el-select
           v-model="queryParams.proName"
-          placeholder="请选择工程"
+          placeholder="请选择工程名称"
           clearable
           filterable
           style="width: 240px"
@@ -115,7 +115,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="物资状态" prop="status">
+      <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="请选择状态"

src/views/materialsStation/equipment/totalLeaseRecord/index.vue

@@ -44,6 +44,17 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="领料单位" prop="leaseUnit">
+        <el-input
+          v-model="queryParams.leaseUnit"
+          placeholder="请输入领料单位"
+          clearable
+          maxlength="50"
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="领料工程" prop="leaseProject">
         <el-select
           v-model="queryParams.leaseProject"
@@ -61,17 +72,6 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="领料单位" prop="leaseUnit">
-        <el-input
-          v-model="queryParams.leaseUnit"
-          placeholder="请输入领料单位"
-          clearable
-          maxlength="50"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-
       <el-form-item label="物资名称" prop="maTypeNames">
         <el-select
           v-model="queryParams.maTypeNames"
@@ -128,7 +128,7 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出数据</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出所有数据</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -535,7 +535,7 @@ export default {
         keyWord: '' // 关键字
       },
       dialogColumns: [
-        { label: '类型名称', prop: 'typeCode' },
+        { label: '物资名称', prop: 'typeCode' },
         { label: '规格型号', prop: 'modelCode' },
         { label: '计量单位', prop: 'unitNames' },
         { label: '设备编码', prop: 'maCode' },