Merge branch 'anhui-mall-ui-test' of http://192.168.30.2:3000/bonus/bonus-ui into anhui-mall-ui-test

src/views/rentEquipmentManager/index.vue

@@ -26,14 +26,58 @@
                 />
             </el-select>
         </el-form-item>
-        <el-form-item label="装备名称:" prop='maName'>
+        <el-form-item label="外租装备名称:" prop='maName'>
             <el-input
                 v-model.trim='queryParams.maName'
-                style='width: 100%'
+                style='width: 100%' 
-                clearable
+                clearable maxlength='50'
                 placeholder='请输入装备名称'
             />
         </el-form-item>
+        <el-form-item label="施工单位:" prop='deptName'>
+            <el-input    
+                v-model.trim='queryParams.deptName'
+                style='width: 100%' 
+                clearable maxlength='50'
+                placeholder='请输入施工单位'
+            />
+        </el-form-item> 
+        <el-form-item label="所属项目:" prop='proName'>
+            <el-input
+                v-model.trim='queryParams.proName'
+                style='width: 100%' 
+                clearable maxlength='50'
+                placeholder='请输入所属项目'
+            />
+        </el-form-item>
+        <el-form-item label="项目编码:" prop='proCode'>
+            <el-input
+                v-model.trim='queryParams.proCode'
+                style='width: 100%' 
+                clearable maxlength='50'
+                placeholder='请输入项目编码'
+            />
+        </el-form-item>
+        <el-form-item label="出租公司:" prop='rentalCompany'>
+            <el-input
+                v-model.trim='queryParams.rentalCompany'
+                style='width: 100%' 
+                clearable maxlength='50'
+                placeholder='请输入出租公司'
+            />
+        </el-form-item>
+        <el-form-item prop="leaseTerm" label="租赁时间" style="margin-left: 10px">
+          <el-date-picker
+            v-model="leaseTerm"
+            type="daterange"
+            style="width: 240px"
+            range-separator="-"
+            value-format="yyyy-MM-dd"
+            start-placeholder="更新开始日期"
+            end-placeholder="更新结束日期"
+          />
+        </el-form-item>
+        
 
         <!-- 表单按钮 -->
         <el-form-item class="form-right">
@@ -55,7 +99,7 @@
         :data="tableList"
         highlight-current-row
         style="width: 100%"
-        v-loading="isLoading"
+        v-loading="isLoading" 
         border stripe
       >
         <el-table-column
@@ -65,15 +109,17 @@
           align="center"
           :index="(index) => (queryParams.pageNum - 1) * queryParams.pageSize + index + 1"
         />
-        <el-table-column align='center' prop='modelName' label='装备类目' />
+        <el-table-column align='center' prop='modelName' label='装备类目' show-overflow-tooltip/>
-        <el-table-column align='center' prop='maName' label='装备名称' />
+        <el-table-column align='center' prop='maName' label='外租装备名称' />
-        <el-table-column align='center' prop='maNum' label='装备数量' />
+        <el-table-column align='center' prop='maNum' label='数量' />
-        <el-table-column align='center' prop='proCode' label='所属项目' />
+        <el-table-column align='center' prop='deptName' label='施工单位' />
+        <el-table-column align='center' prop='proName' label='所属项目' />
+        <el-table-column align='center' prop='proCode' label='项目编码' />
         <el-table-column align='center' prop='rentalCompany' label='出租公司' />
         <el-table-column align='center' prop='leaseTerm' label='租赁时间' />
         <el-table-column align='center' prop='returnTime' label='归还时间' />
-        <el-table-column align='center' prop='actualNumber' label='实际使用台班数' />
+        <el-table-column align='center' prop='actualNumber' label='实际使用台班数（天）' width="160"/>
-        <el-table-column align='center' prop='rentalAmount' label='租赁金额' />
+        <el-table-column align='center' prop='rentalAmount' label='租赁金额（元）' />
         <el-table-column align='center' prop='fileList' label='装备图'>
             <template v-slot="{ row }">
                 <span
@@ -115,7 +161,7 @@
     <el-dialog
       width="700px"
       @close="handleDialogClose"
-      destroy-on-close
+      destroy-on-close append-to-body
       :title="dialogTitle" top="2vh"
       :visible.sync="addOrEditDialogVisible"
     >
@@ -348,9 +394,14 @@ export default {
         pageNum: 1,
         pageSize: 10,
         // type: '1',
-        modelId: '', // 关键字
+        modelId: '', // 
-        maName: '', // 开始时间
+        maName: '', // 
+        deptName: '', // 
+        proName: '', // 
+        proCode: '', // 
+        rentalCompany: '', // 
       },
+      leaseTerm:[],
       equipmentNameOptions:[],
       projectOption:[],
       total: 0, // 总条数 
@@ -442,6 +493,7 @@ export default {
     },
     // 重置
     handleReset() {
+      this.leaseTerm=[]
       this.$refs.queryForm.resetFields()
       this.queryParams.pageNum = 1
       this.queryParams.pageSize = 10
@@ -454,7 +506,14 @@ export default {
       try {
         const params = {
           ...this.queryParams
-        } 
+        }
+        if (this.leaseTerm&&this.leaseTerm.length > 0) {
+          params.startTime = this.leaseTerm[0]
+          params.endTime = this.leaseTerm[1]
+        }else{
+          params.startTime = null
+          params.endTime = null
+        }
         console.log('🚀 ~ getList ~ params:', params)
         const res = await getContractListApi(params)
         console.log('🚀 ~ 获取列表 ~ res:', res)
@@ -472,7 +531,6 @@ export default {
     handleAdd(row) {
       // 1. 先清空旧表单（放在最前）
       this.$refs.addOrEditFormRef?.resetFields()
-
       // 2. 先判断是新增还是编辑，设置标题和标识
       if (row.id) { 
         this.dialogTitle = '外租装备编辑' // 用新的标题变量
@@ -501,7 +559,10 @@ export default {
         }
       } 
       // 3. 最后打开弹窗
-      this.addOrEditDialogVisible = true
+      this.addOrEditDialogVisible = true;
+      setTimeout(()=>{
+        this.$refs.addOrEditFormRef?.clearValidate()
+      },200)
     },
     /** 提交按钮 */
     submitForm: function() {
@@ -510,6 +571,7 @@ export default {
         if (valid) {
           this.addOrEditForm.type = 1
           if (this.addOrEditForm.id) {
+             this.addOrEditForm.modelName=null
             editContractApi(this.addOrEditForm)  
               .then((response) => { 
                 this.$modal.msgSuccess('修改成功')
@@ -524,7 +586,7 @@ export default {
               .then((response) => { 
                 this.$modal.msgSuccess('新增成功')
                 this.addOrEditDialogVisible = false
-                this.getList() 
+                this.getList()
               })
               .catch(() => {