From 8fb25d6ede3a14adbc327cf5c857acce56fbfe6e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Sun, 27 Jul 2025 11:57:20 +0800
Subject: [PATCH] 优化相关bug

---
 src/components/contract/editContract.vue  |   2 +-
 src/components/role/AddRoleStaff.vue      | 252 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------
 src/components/role/RoleStaff.vue         | 301 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/contract/addContractLang.js     |  10 ++++++++--
 src/views/contract/addContractList.vue    |  22 +++++++++++++++++-----
 src/views/report/reportFeeSummaryList.vue |  12 ++++++++----
 6 files changed, 268 insertions(+), 331 deletions(-)

diff --git a/src/components/contract/editContract.vue b/src/components/contract/editContract.vue
index 1e48cf0..290b26b 100644
--- a/src/components/contract/editContract.vue
+++ b/src/components/contract/editContract.vue
@@ -5,7 +5,7 @@
     width="70%"
     :before-close="handleClose"
   >
-    <el-form :model="editContractInfo" label-width="120px" ref="editForm">
+    <el-form :model="editContractInfo" label-width="120px" class="text-left" ref="editForm">
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item :label="$t('contractManage.edit.contractName')" prop="contractName" required>
diff --git a/src/components/role/AddRoleStaff.vue b/src/components/role/AddRoleStaff.vue
index 6fae35a..d8f48d6 100644
--- a/src/components/role/AddRoleStaff.vue
+++ b/src/components/role/AddRoleStaff.vue
@@ -1,152 +1,118 @@
 <template>
-    <el-dialog
-      :title="$t('role.staff')"
-      :visible.sync="visible"
-      width="70%"
-      @close="resetForm"
-    >
-      <el-row>
-        <el-col :span="24">
-          <el-input
-            v-model="searchForm.staffName"
-            :placeholder="$t('role.staffName')"
-            style="width: 300px; margin-right: 10px"
-          />
-          <el-button type="primary" @click="queryStaffs">
-            {{ $t('common.search') }}
-          </el-button>
-        </el-col>
-      </el-row>
-      
-      <el-table
-        :data="staffs"
-        style="width: 100%; margin-top: 15px"
-        @selection-change="handleSelectionChange"
-      >
-        <el-table-column
-          type="selection"
-          width="55"
-          align="center"
-        />
-        <el-table-column
-          prop="userId"
-          :label="$t('role.staffName')"
-          align="center"
-        />
-        <el-table-column
-          prop="name"
-          :label="$t('role.staffName')"
-          align="center"
-        />
-        <el-table-column
-          prop="address"
-          :label="$t('role.address')"
-          align="center"
-        />
-      </el-table>
-      
-      <el-pagination
-        :current-page="page.current"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="page.size"
-        :total="page.total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-      
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false">{{ $t('role.cancel') }}</el-button>
-        <el-button type="primary" @click="submit">{{ $t('role.save') }}</el-button>
-      </span>
-    </el-dialog>
-  </template>
-  
-  <script>
-  import { listStaffsNoRole, saveRoleStaff } from '@/api/role/roleApi'
-  
-  export default {
-    name: 'AddRoleStaff',
-    props: {
-      roleId: {
-        type: String,
-        required: true
+  <el-dialog :title="$t('role.staff')" :visible.sync="visible" width="70%" @close="resetForm">
+    <el-row>
+      <el-col :span="24">
+        <el-input v-model="searchForm.staffName" :placeholder="$t('role.staffName')"
+          style="width: 300px; margin-right: 10px" />
+        <el-button type="primary" @click="queryStaffs">
+          {{ $t('common.search') }}
+        </el-button>
+      </el-col>
+    </el-row>
+
+    <el-table :data="staffs" style="width: 100%; margin-top: 15px" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column prop="userId" :label="$t('role.staffName')" align="center" />
+      <el-table-column prop="name" :label="$t('role.staffName')" align="center" />
+      <el-table-column prop="address" :label="$t('role.address')" align="center" />
+    </el-table>
+
+    <el-pagination :current-page="page.current" :page-sizes="[10, 20, 30, 50]" :page-size="page.size"
+      :total="page.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+      @current-change="handleCurrentChange" />
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">{{ $t('role.cancel') }}</el-button>
+      <el-button type="primary" @click="submit">{{ $t('role.save') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { listStaffsNoRole, saveRoleStaff } from '@/api/role/roleApi'
+
+export default {
+  name: 'AddRoleStaff',
+  props: {
+    roleId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      visible: false,
+      searchForm: {
+        staffName: ''
+      },
+      staffs: [],
+      selectedStaffs: [],
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
       }
+    }
+  },
+  methods: {
+    show() {
+      this.visible = true
+      this.queryStaffs()
     },
-    data() {
-      return {
-        visible: false,
-        searchForm: {
-          staffName: ''
-        },
-        staffs: [],
-        selectedStaffs: [],
-        page: {
-          current: 1,
-          size: 10,
-          total: 0
+    async queryStaffs() {
+      try {
+        const params = {
+          page: this.page.current,
+          row: this.page.size,
+          searchUserName: this.searchForm.staffName,
+          roleId: this.roleId
         }
+        const res = await listStaffsNoRole(params)
+        this.staffs = res.data
+        this.page.total = res.total
+      } catch (error) {
+        this.$message.error(error.message)
       }
     },
-    methods: {
-      show() {
-        this.visible = true
-        this.queryStaffs()
-      },
-      async queryStaffs() {
-        try {
-          const params = {
-            page: this.page.current,
-            row: this.page.size,
-            userName: this.searchForm.staffName,
-            roleId: this.roleId
-          }
-          const res = await listStaffsNoRole(params)
-          this.staffs = res.data
-          this.page.total = res.total
-        } catch (error) {
-          this.$message.error(error.message)
-        }
-      },
-      handleSelectionChange(val) {
-        this.selectedStaffs = val
-      },
-      async submit() {
-        if (this.selectedStaffs.length === 0) {
-          this.$message.warning(this.$t('role.selectStaff'))
-          return
-        }
-        
-        try {
-          const staffs = this.selectedStaffs.map(item => ({
-            staffId: item.userId,
-            staffName: item.name
-          }))
-          
-          await saveRoleStaff({
-            roleId: this.roleId,
-            staffs
-          })
-          
-          this.$message.success(this.$t('role.saveSuccess'))
-          this.$emit('success')
-          this.visible = false
-        } catch (error) {
-          this.$message.error(error.message)
-        }
-      },
-      handleSizeChange(size) {
-        this.page.size = size
-        this.queryStaffs()
-      },
-      handleCurrentChange(current) {
-        this.page.current = current
-        this.queryStaffs()
-      },
-      resetForm() {
-        this.searchForm.staffName = ''
-        this.selectedStaffs = []
+    handleSelectionChange(val) {
+      this.selectedStaffs = val
+    },
+    async submit() {
+      if (this.selectedStaffs.length === 0) {
+        this.$message.warning(this.$t('role.selectStaff'))
+        return
       }
+
+      try {
+        const staffs = this.selectedStaffs.map(item => ({
+          staffId: item.userId,
+          staffName: item.name
+        }))
+
+        await saveRoleStaff({
+          roleId: this.roleId,
+          staffs
+        })
+
+        this.$message.success(this.$t('role.saveSuccess'))
+        this.$emit('success')
+        this.visible = false
+      } catch (error) {
+        this.$message.error(error.message)
+      }
+    },
+    handleSizeChange(size) {
+      this.page.size = size
+      this.queryStaffs()
+    },
+    handleCurrentChange(current) {
+      this.page.current = current
+      this.queryStaffs()
+    },
+    resetForm() {
+      this.searchForm.staffName = ''
+      this.selectedStaffs = []
     }
   }
-  </script>
\ No newline at end of file
+}
+</script>
\ No newline at end of file
diff --git a/src/components/role/RoleStaff.vue b/src/components/role/RoleStaff.vue
index bb5982b..64e07ee 100644
--- a/src/components/role/RoleStaff.vue
+++ b/src/components/role/RoleStaff.vue
@@ -1,187 +1,136 @@
 <template>
-    <div class="role-staff">
-      <div class="search-wrapper">
-        <el-input
-          v-model="searchForm.staffName"
-          :placeholder="$t('role.staffName')"
-          style="width: 200px; margin-right: 10px"
-        />
-        <el-button type="primary" @click="queryStaffs">
-          <i class="el-icon-search"></i>
-          {{ $t('common.search') }}
-        </el-button>
-        <el-button type="primary" @click="openAddModal">
-          <i class="el-icon-plus"></i>
-          {{ $t('role.staff') }}
-        </el-button>
-      </div>
-      
-      <el-table
-        :data="staffs"
-        border
-        style="width: 100%; margin-top: 15px"
-      >
-        <el-table-column
-          prop="name"
-          :label="$t('role.staffName')"
-          align="center"
-        />
-        <el-table-column
-          prop="tel"
-          :label="$t('role.tel')"
-          align="center"
-        />
-        <el-table-column
-          prop="email"
-          :label="$t('role.email')"
-          align="center"
-        />
-        <el-table-column
-          prop="address"
-          :label="$t('role.address')"
-          align="center"
-        />
-        <el-table-column
-          :label="$t('role.sex')"
-          align="center"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.sex === 0 ? $t('role.male') : $t('role.female') }}
-          </template>
-        </el-table-column>
-        <el-table-column
-          :label="$t('role.operation')"
-          align="center"
-          width="200"
-        >
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="danger"
-              @click="openDeleteModal(scope.row)"
-            >
-              {{ $t('role.delete') }}
-            </el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              @click="viewDetail(scope.row)"
-            >
-              {{ $t('role.detail') }}
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      
-      <el-pagination
-        :current-page="page.current"
-        :page-sizes="[10, 20, 30, 50]"
-        :page-size="page.size"
-        :total="page.total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-      
-      <add-role-staff
-        ref="addRoleStaff"
-        :role-id="pgId"
-        @success="loadStaffs"
-      />
-      <delete-role-staff
-        ref="deleteRoleStaff"
-        @success="loadStaffs"
-      />
+  <div class="role-staff">
+    <div class="search-wrapper">
+      <el-input v-model="searchForm.staffName" :placeholder="$t('role.staffName')"
+        style="width: 200px; margin-right: 10px" />
+      <el-button type="primary" @click="queryStaffs">
+        <i class="el-icon-search"></i>
+        {{ $t('common.search') }}
+      </el-button>
+      <el-button type="primary" @click="openAddModal">
+        <i class="el-icon-plus"></i>
+        {{ $t('role.staff') }}
+      </el-button>
     </div>
-  </template>
-  
-  <script>
-  import { listRoleStaff } from '@/api/role/roleApi'
-  import AddRoleStaff from './AddRoleStaff'
-  import DeleteRoleStaff from './DeleteRoleStaff'
-  
-  export default {
-    name: 'RoleStaff',
-    components: {
-      AddRoleStaff,
-      DeleteRoleStaff
-    },
-    props: {
-      pgId: {
-        type: String,
-        required: true
+
+    <el-table :data="staffs" border style="width: 100%; margin-top: 15px">
+      <el-table-column prop="name" :label="$t('role.staffName')" align="center" />
+      <el-table-column prop="tel" :label="$t('role.tel')" align="center" />
+      <el-table-column prop="email" :label="$t('role.email')" align="center" />
+      <el-table-column prop="address" :label="$t('role.address')" align="center" />
+      <el-table-column :label="$t('role.sex')" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.sex === 0 ? $t('role.male') : $t('role.female') }}
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('role.operation')" align="center" width="200">
+        <template slot-scope="scope">
+          <el-button size="mini" type="danger" @click="openDeleteModal(scope.row)">
+            {{ $t('role.delete') }}
+          </el-button>
+          <el-button size="mini" type="primary" @click="viewDetail(scope.row)">
+            {{ $t('role.detail') }}
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-pagination :current-page="page.current" :page-sizes="[10, 20, 30, 50]" :page-size="page.size"
+      :total="page.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+      @current-change="handleCurrentChange" />
+
+    <add-role-staff ref="addRoleStaff" :role-id="pgId" @success="loadStaffs" />
+    <delete-role-staff ref="deleteRoleStaff" @success="loadStaffs" />
+  </div>
+</template>
+
+<script>
+import { listRoleStaff } from '@/api/role/roleApi'
+import AddRoleStaff from './AddRoleStaff'
+import DeleteRoleStaff from './DeleteRoleStaff'
+
+export default {
+  name: 'RoleStaff',
+  components: {
+    AddRoleStaff,
+    DeleteRoleStaff
+  },
+  props: {
+    pgId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      searchForm: {
+        staffName: ''
+      },
+      staffs: [],
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
       }
-    },
-    data() {
-      return {
-        searchForm: {
-          staffName: ''
-        },
-        staffs: [],
-        page: {
-          current: 1,
-          size: 10,
-          total: 0
+    }
+  },
+  created() {
+    this.loadStaffs()
+  },
+  methods: {
+    async loadStaffs() {
+      try {
+        const params = {
+          page: this.page.current,
+          row: this.page.size,
+          roleId: this.pgId,
+          userName: this.searchForm.staffName
         }
+        const res = await listRoleStaff(params)
+        this.staffs = res.data
+        this.page.total = res.total
+      } catch (error) {
+        this.$message.error(error.message)
       }
     },
-    created() {
+    queryStaffs() {
+      this.page.current = 1
       this.loadStaffs()
     },
-    methods: {
-      async loadStaffs() {
-        try {
-          const params = {
-            page: this.page.current,
-            row: this.page.size,
-            roleId: this.pgId,
-            userName: this.searchForm.staffName
-          }
-          const res = await listRoleStaff(params)
-          this.staffs = res.data
-          this.page.total = res.total
-        } catch (error) {
-          this.$message.error(error.message)
-        }
-      },
-      queryStaffs() {
-        this.page.current = 1
-        this.loadStaffs()
-      },
-      openAddModal() {
-        this.$refs.addRoleStaff.show()
-      },
-      openDeleteModal(staff) {
-        this.$refs.deleteRoleStaff.show(staff,this.pgId)
-      },
-      viewDetail(staff) {
-        this.$router.push(`/staff/detail/${staff.userId}`)
-      },
-      handleSizeChange(size) {
-        this.page.size = size
-        this.loadStaffs()
-      },
-      handleCurrentChange(current) {
-        this.page.current = current
-        this.loadStaffs()
-      }
+    openAddModal() {
+      this.$refs.addRoleStaff.show()
+    },
+    openDeleteModal(staff) {
+      this.$refs.deleteRoleStaff.show(staff, this.pgId)
+    },
+    viewDetail(staff) {
+      this.$router.push(`/staff/detail/${staff.userId}`)
+    },
+    handleSizeChange(size) {
+      this.page.size = size
+      this.loadStaffs()
+    },
+    handleCurrentChange(current) {
+      this.page.current = current
+      this.loadStaffs()
     }
   }
-  </script>
-  
-  <style scoped>
-  .role-staff {
-    margin:15px;
-   
-    .search-wrapper {
-      margin-bottom: 15px;
-      text-align: right;
-    }
-    
-    .el-pagination {
-      margin-top: 15px;
-      margin-bottom: 15px;
-      text-align: right;
-    }
+}
+</script>
+
+<style scoped>
+.role-staff {
+  margin: 15px;
+
+  .search-wrapper {
+    margin-bottom: 15px;
+    text-align: right;
+  }
+
+  .el-pagination {
+    margin-top: 15px;
+    margin-bottom: 15px;
+    text-align: right;
   }
-  </style>
\ No newline at end of file
+}
+</style>
\ No newline at end of file
diff --git a/src/views/contract/addContractLang.js b/src/views/contract/addContractLang.js
index 824e303..1a384c8 100644
--- a/src/views/contract/addContractLang.js
+++ b/src/views/contract/addContractLang.js
@@ -74,7 +74,10 @@ export const messages = {
       contact: 'Contact',
       submitSuccess: 'Submit successfully',
       invalidFileType: 'Operation failed, please upload image or PDF format files',
-      required: 'Required'
+      required: 'Required',
+      requiredOperator: 'Required, please fill in operator',
+      requiredOperatorPhone: 'Required, please fill in operator phone',
+      requiredContractAmount: 'Required, please fill in contract amount'
     }
   },
   zh: {
@@ -152,7 +155,10 @@ export const messages = {
       contact: '联系方式',
       submitSuccess: '提交成功',
       invalidFileType: '操作失败，请上传图片、PDF格式的文件',
-      required: '必填'
+      required: '必填',
+      requiredOperator: '必填，请填写经办人',
+      requiredOperatorPhone: '必填，请填写联系电话',
+      requiredContractAmount: '必填，请填写合同金额'
     }
   }
 }
\ No newline at end of file
diff --git a/src/views/contract/addContractList.vue b/src/views/contract/addContractList.vue
index 0eed952..8803a2f 100644
--- a/src/views/contract/addContractList.vue
+++ b/src/views/contract/addContractList.vue
@@ -9,7 +9,7 @@
         </el-button>
       </div>
 
-      <el-form ref="form" :model="addContractInfo" label-width="120px">
+      <el-form ref="form" :model="addContractInfo" label-width="120px" class="text-left" :rules="rules">
         <!-- Parent Contract Info -->
         <el-row v-if="addContractInfo.parentContractCode" :gutter="20">
           <el-col :span="8">
@@ -103,17 +103,17 @@
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item :label="$t('contract.operator')" prop="operator" required>
-              <el-input v-model="addContractInfo.operator"></el-input>
+              <el-input v-model="addContractInfo.operator" :placeholder="$t('contract.requiredOperator')"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('contract.operatorPhone')" prop="operatorLink" required>
-              <el-input v-model="addContractInfo.operatorLink"></el-input>
+                <el-input v-model="addContractInfo.operatorLink" :placeholder="$t('contract.requiredOperatorPhone')"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('contract.contractAmount')">
-              <el-input v-model="addContractInfo.amount"></el-input>
+              <el-input v-model="addContractInfo.amount" :placeholder="$t('contract.requiredContractAmount')"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -278,7 +278,19 @@ export default {
         staffName: '',
         nextUserId: ''
       },
-      communityId: ''
+      communityId: '',
+      rules: {
+        contractName: [{ required: true, message: this.$t('contract.requiredContractName'), trigger: 'blur' }],
+        contractCode: [{ required: true, message: this.$t('contract.requiredContractCode'), trigger: 'blur' }],
+        contractType: [{ required: true, message: this.$t('contract.requiredContractType'), trigger: 'blur' }],
+        operator: [{ required: true, message: this.$t('contract.requiredOperator'), trigger: 'blur' }],
+        operatorLink: [{ required: true, message: this.$t('contract.requiredOperatorPhone'), trigger: 'blur' }],
+        amount: [{ required: true, message: this.$t('contract.requiredContractAmount'), trigger: 'blur' }],
+        startTime: [{ required: true, message: this.$t('contract.requiredStartTime'), trigger: 'blur' }],
+        endTime: [{ required: true, message: this.$t('contract.requiredEndTime'), trigger: 'blur' }],
+        signingTime: [{ required: true, message: this.$t('contract.requiredSigningTime'), trigger: 'blur' }],
+        partyA: [{ required: true, message: this.$t('contract.requiredPartyA'), trigger: 'blur' }],
+      }
     }
   },
   created() {
diff --git a/src/views/report/reportFeeSummaryList.vue b/src/views/report/reportFeeSummaryList.vue
index 9915370..c27710c 100644
--- a/src/views/report/reportFeeSummaryList.vue
+++ b/src/views/report/reportFeeSummaryList.vue
@@ -13,7 +13,8 @@
             <el-row :gutter="20">
               <el-col :span="4">
                 <el-date-picker v-model="reportFeeSummaryInfo.conditions.startDate" type="date"
-                  :placeholder="$t('reportFeeSummary.selectStartDate')" style="width: 100%" @change="handleDateChange" />
+                  :placeholder="$t('reportFeeSummary.selectStartDate')" style="width: 100%"
+                  @change="handleDateChange" />
               </el-col>
               <el-col :span="4">
                 <el-date-picker v-model="reportFeeSummaryInfo.conditions.endDate" type="date"
@@ -111,7 +112,8 @@
                 <el-table-column prop="preReceivedFee" :label="$t('reportFeeSummary.advancePayment')" align="center" />
                 <el-table-column prop="receivedFee" :label="$t('reportFeeSummary.actualPayment')" align="center" />
               </el-table-column>
-              <el-table-column prop="curReceivableFee" :label="$t('reportFeeSummary.currentReceivable')" align="center" />
+              <el-table-column prop="curReceivableFee" :label="$t('reportFeeSummary.currentReceivable')"
+                align="center" />
               <el-table-column :label="$t('reportFeeSummary.currentActual')" align="center">
                 <template slot-scope="scope">
                   {{ (scope.row.curReceivableFee - scope.row.curOweFee).toFixed(2) }}
@@ -239,7 +241,9 @@ export default {
           page: 1,
           row: 100,
           ...this.reportFeeSummaryInfo.conditions,
-          configIds: this.reportFeeSummaryInfo.configIds.join(',')
+        }
+        if (this.reportFeeSummaryInfo.configIds.length > 0) {
+          params.configIds = this.reportFeeSummaryInfo.configIds.join(',');
         }
 
         const { data } = await queryReportFeeSummary(params)
@@ -269,7 +273,7 @@ export default {
           isDefault: 'F'
         }
 
-        const data  = await queryFeeConfigs(params)
+        const data = await queryFeeConfigs(params)
         this.reportFeeSummaryInfo.feeConfigs = data.feeConfigs
       } catch (error) {
         console.error('Failed to list fee configs:', error)
--
libgit2 0.21.4