Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/receivable/documentary/index.vue

@@ -76,7 +76,7 @@
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="出单人类型">
-                              <el-select v-model="receivableForm.attrType" placeholder="请选择" clearable>
+                              <el-select v-model="receivableForm.typeAttr" placeholder="请选择" clearable>
                                   <el-option label="团队" value="5"></el-option>
                                   <el-option label="个代" value="6"></el-option>
                                   <el-option label="渠道" value="7"></el-option>
@@ -290,7 +290,7 @@
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="出单人类型">
-                              <el-select v-model="receivableForm.attrType" placeholder="请选择" clearable>
+                              <el-select v-model="receivableForm.typeAttr" placeholder="请选择" clearable>
                                   <el-option label="团队" value="5"></el-option>
                                   <el-option label="个代" value="6"></el-option>
                                   <el-option label="渠道" value="7"></el-option>
@@ -968,7 +968,7 @@ const reset = () => {
 const getOtherReceivableList = () => {
     let params = {
         licenseNo: receivableForm.value?.licenseNo,
-        attrType: receivableForm.value?.attrType,
+        typeAttr: receivableForm.value?.typeAttr,
         companyId: receivableForm.value?.companyId,
         signingStartTime: receivableForm.value?.signingTime?.[0],
         signingEndTime: receivableForm.value?.signingTime?.[1],
@@ -1000,7 +1000,7 @@ const getOtherReceivableList = () => {
 const getJyOtherReceivableList = () => {
     let params = {
         licenseNo: receivableForm.value?.licenseNo,
-        attrType: receivableForm.value?.attrType,
+        typeAttr: receivableForm.value?.typeAttr,
         companyId: receivableForm.value?.companyId,
         signingStartTime: receivableForm.value?.signingTime?.[0],
         signingEndTime: receivableForm.value?.signingTime?.[1],

src/views/receivable/handingFee/index.vue

@@ -51,7 +51,7 @@
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="出单人类型">
-                              <el-select v-model="receivableForm.attrType" placeholder="请选择" clearable>
+                              <el-select v-model="receivableForm.typeAttr" placeholder="请选择" clearable>
                                   <el-option label="团队" value="5"></el-option>
                                   <el-option label="个代" value="6"></el-option>
                                   <el-option label="渠道" value="7"></el-option>
@@ -265,7 +265,7 @@
                         </el-col>
                         <el-col :span="8">
                             <el-form-item label="出单人类型">
-                              <el-select v-model="receivableForm.attrType" placeholder="请选择" clearable>
+                              <el-select v-model="receivableForm.typeAttr" placeholder="请选择" clearable>
                                   <el-option label="团队" value="5"></el-option>
                                   <el-option label="个代" value="6"></el-option>
                                   <el-option label="渠道" value="7"></el-option>
@@ -1000,7 +1000,7 @@ const reset = () => {
 const getCommissionReceivableList = () => {
     let params = {
         licenseNo: receivableForm.value?.licenseNo,
-        attrType: receivableForm.value?.attrType,
+        typeAttr: receivableForm.value?.typeAttr,
         companyId: receivableForm.value?.companyId,
         signingStartTime: receivableForm.value?.signingTime?.[0],
         signingEndTime: receivableForm.value?.signingTime?.[1],
@@ -1033,7 +1033,7 @@ const getCommissionReceivableList = () => {
 const getJyReceivableList = () => {
     let params = {
         licenseNo: receivableForm.value?.licenseNo,
-        attrType: receivableForm.value?.attrType,
+        typeAttr: receivableForm.value?.typeAttr,
         companyId: receivableForm.value?.companyId,
         signingStartTime: receivableForm.value?.signingTime?.[0],
         signingEndTime: receivableForm.value?.signingTime?.[1],