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

src/api/modules/finance.ts

@@ -53,6 +53,8 @@ const financeApi = (axiosInstance: ApiInstance) => ({
     getOtherReceivableList: (data: any) => axiosInstance.post('/receivable/getOtherReceivableList', data),
     // 私有协议-批量修改功能
     batchModify: (data: any) => axiosInstance.post('/receivable/batchModify', data),
+    // 单条应收修改-私有、跟单、平台通用
+    updateInsPlyIncome: (data: any) => axiosInstance.post('/receivable/updateInsPlyIncome', data),
     // 私有协议-驾意跟单
     getJyOtherReceivableList: (data: any) => axiosInstance.post('/receivable/getJyOtherReceivableList', data),
     // 跟单费导入

src/views/insurancePolicy/order/orderDetail.vue

@@ -1131,7 +1131,7 @@
               <span v-else>单品</span>
             </template>
           </el-table-column>
-          <el-table-column prop="rightsType" label="接收人" align="center"></el-table-column>
+          <el-table-column prop="receiverShow" label="接收人" align="center"></el-table-column>
           <el-table-column prop="rightsCount" label="发放数量" align="center"></el-table-column>
           <el-table-column prop="packagePrice" label="总价" align="center">
             <template #default="scope">

src/views/platform/index.vue

@@ -462,6 +462,34 @@
         <el-button type="primary" @click="handelComfirm(CountFormRef)">确定结算</el-button>
       </template>
     </el-dialog>
+    <el-dialog :close-on-click-modal="false" title="编辑" v-model="singleEditShow" width="700">
+      <el-form :model="singleForm">
+        <el-row :gutter="20">
+          <el-col :span="12" v-if="activeName === '1'">
+            <el-form-item label="交强保单号">
+              <el-input v-model="singleForm.jqPolicyNo" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="activeName === '1'">
+            <el-form-item label="商业保单号">
+              <el-input v-model="singleForm.syPolicyNo" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="activeName === '2'">
+            <el-form-item label="驾意保单号">
+              <el-input v-model="singleForm.jyPolicyNo" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="singleEditShow = false">取消</el-button>
+        <el-button type="primary" v-if="subActiveName === 'first'" @click="handleSingleEditSubmit()">确定</el-button>
+      </template>
+    </el-dialog>
     <el-image-viewer v-if="imageShow" :url-list="[bigImageUrl]" @close="imageShow = false" />
   </PageMain>
   <ticket ref="ticketRef" />
@@ -624,7 +652,7 @@ let receiveData = ref([])
 
 // 应收添加
 let addShow = ref(false)
-let addSearchValue = ref('1932252903508697088')
+let addSearchValue = ref('')
 let placeholder = ref('订单号查询')
 let addSelectType = ref('1')
 const handleAddSelectTypeChange = (e) => {
@@ -765,10 +793,12 @@ const handleSelectAll1 = (row: any) => {
 
 // 批量修改比例
 let batchEditShow = ref(false)
+let singleEditShow = ref(false)
 let feeRate = ref(null)
 let signTime = ref(null)
 let people = ref(null)
 let editForm = ref({})
+let singleForm = ref({})
 const handleBatchEdit = (str: string) => {
   if (selectedList.value.length < 1 && str === 'first') {
     ElMessage({
@@ -883,10 +913,31 @@ const initDept = () => {
     }
   })
 }
+// 单条修改提交
+const handleSingleEditSubmit = async () => {
+  const { code, data, msg } = await api.financeApi.updateInsPlyIncome({...singleForm.value})
+  if (code === 200) {
+    ElMessage.success(msg)
+    singleEditShow.value = false
+    getPlatFormReceivableList()
+  }
+}
 // 编辑
 const toEdit = (row: any) => {
-  selectedList.value = [row]
-  handleBatchEdit()
+  singleForm.value = {}
+  singleEditShow.value = true
+  singleForm.value.incomeId = row.id;
+  singleForm.value.orderNo = row.orderNo;
+  switch (activeName.value) {
+    case '1':
+      singleForm.value.jqPolicyNo = row.jqPolicyNo;
+      singleForm.value.syPolicyNo = row.syPolicyNo;
+      break;
+    case '2':
+      singleForm.value.jyPolicyNo = row.jyPolicyNo;
+      break;
+    default:
+  }
 }
 // 车险列表
 const getPlatFormReceivableList = () => {

src/views/receivable/documentary/index.vue

@@ -187,7 +187,7 @@
           <el-table-column prop="dockingPerson" label="对接人" width="100"></el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="scope">
-              <el-button link type="primary" @click="toEdit(scope.row, '1')">编辑</el-button>
+              <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>
               <el-button link type="primary" @click="toDelete([scope.row.id])">删除</el-button>
             </template>
           </el-table-column>
@@ -374,7 +374,7 @@
             <template #default="scope">
               <div style="display: flex; align-items: center; justify-content: center">
                 <el-button link type="primary" @click="toDelete([scope.row.id])">删除</el-button>
-                <el-button link type="primary" @click="toEdit(scope.row, '2')">编辑</el-button>
+                <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>
                 <!-- <el-dropdown trigger="click" placement="bottom" @command="dropdownCommand">
                   <el-button link type="primary">
                     更多
@@ -477,7 +477,7 @@
       </template>
     </el-dialog>
     <el-dialog :close-on-click-modal="false" title="批量修改" v-model="batchEditShow" width="700">
-      <el-tabs v-model="subActiveName" class="demo-tabs" >
+      <el-tabs v-model="subActiveName" class="demo-tabs">
         <el-tab-pane label="User" name="first" v-if="subActiveName === 'first'">
           <template #label>选中修改（{{ selectedList.length }}）</template>
           <el-form :model="editForm">
@@ -561,6 +561,34 @@
         <el-button type="primary" v-if="subActiveName === 'first'" @click="handleBatchEditSubmit()">确定</el-button>
       </template>
     </el-dialog>
+    <el-dialog :close-on-click-modal="false" title="编辑" v-model="singleEditShow" width="700">
+      <el-form :model="singleForm">
+        <el-row :gutter="20">
+          <el-col :span="12" v-if="activeName === '1'">
+            <el-form-item label="交强保单号">
+              <el-input v-model="singleForm.jqPolicyNo" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="activeName === '1'">
+            <el-form-item label="商业保单号">
+              <el-input v-model="singleForm.syPolicyNo" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="activeName === '2'">
+            <el-form-item label="驾意保单号">
+              <el-input v-model="singleForm.jyPolicyNo" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="singleEditShow = false">取消</el-button>
+        <el-button type="primary" v-if="subActiveName === 'first'" @click="handleSingleEditSubmit()">确定</el-button>
+      </template>
+    </el-dialog>
   </PageMain>
 </template>
 
@@ -708,17 +736,7 @@ const selectTypeChange = (type) => {
     selectedList.value = allData.value
   }
 }
-// 编辑
-const toEdit = (row: any, type: string) => {
-  const tableRef = activeName.value == '1' ? ReceiveDataRef1 : ReceiveDataRef2
-  receiveData.value.forEach(item => {
-    tableRef.value!.toggleRowSelection(item, false)
-  })
-  tableRef.value!.toggleRowSelection(row, true)
-  selectedList.value = [row]
-  batchEditShow.value = true
 
-}
 // 获取协议列表
 const agreementList = ref()
 const getagreementList = () => {
@@ -783,7 +801,7 @@ let receiveData = ref([])
 
 // 应收添加
 let addShow = ref(false)
-let addSearchValue = ref('1932252903508697088')
+let addSearchValue = ref('')
 let placeholder = ref('订单号查询')
 let addSelectType = ref('1')
 const handleAddSelectTypeChange = (e) => {
@@ -919,11 +937,13 @@ const handleSelectAll2 = (e) => {
 
 // 批量修改比例
 // 批量修改比例
-let batchEditShow = ref(false)
+let batchEditShow = ref(false)//批量修改
+let singleEditShow = ref(false)//单条修改
 let feeRate = ref(null)
 let signTime = ref(null)
 let people = ref(null)
-let editForm = ref({})
+let editForm = ref({})//批量修改form
+let singleForm = ref({})//单条修改form
 const handleBatchEdit = (str: string) => {
   if (selectedList.value.length < 1 && str === 'first') {
     ElMessage({
@@ -938,6 +958,7 @@ const handleBatchEdit = (str: string) => {
   subActiveName.value = str
 }
 
+// 批量修改提交
 const handleBatchEditSubmit = async () => {
   const params = {
     incomeIds: selectedList.value.map(item => item.id),
@@ -953,6 +974,32 @@ const handleBatchEditSubmit = async () => {
     search()
   }
 }
+// 单条修改提交
+const handleSingleEditSubmit = async () => {
+  const { code, data, msg } = await api.financeApi.updateInsPlyIncome({...singleForm.value})
+  if (code === 200) {
+    ElMessage.success(msg)
+    singleEditShow.value = false
+    search()
+  }
+}
+// 编辑操作
+const toEdit = (row: any) => {
+  singleForm.value = {}
+  singleEditShow.value = true
+  singleForm.value.incomeId= row.id;
+  singleForm.value.orderNo= row.orderNo;
+  switch (activeName.value) {
+    case '1':
+      singleForm.value.jqPolicyNo= row.jqPolicyNo;
+      singleForm.value.syPolicyNo= row.syPolicyNo;
+      break;
+    case '2':
+      singleForm.value.jyPolicyNo= row.jyPolicyNo;
+      break;
+    default:
+  }
+}
 const downloadImportTemplate = () => {
   let params = {
     licenseNo: receivableForm.value?.licenseNo,

src/views/receivable/handingFee/index.vue

@@ -200,7 +200,7 @@
           <el-table-column prop="dockingPerson" label="对接人" width="100"></el-table-column>
           <el-table-column label="操作" width="120" fixed="right">
             <template #default="scope">
-              <!-- <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button> -->
+              <el-button link type="primary" @click="toEdit(scope.row)">编辑</el-button>
               <el-button link type="primary" @click="toDelete([scope.row.id])">删除</el-button>
             </template>
           </el-table-column>
@@ -571,6 +571,34 @@
         <el-button v-if="subActiveName == 'first'" type="primary" @click="handleBatchEditSubmit">确定</el-button>
       </template>
     </el-dialog>
+    <el-dialog :close-on-click-modal="false" title="编辑" v-model="singleEditShow" width="700">
+      <el-form :model="singleForm">
+        <el-row :gutter="20">
+          <el-col :span="12" v-if="activeName === '1'">
+            <el-form-item label="交强保单号">
+              <el-input v-model="singleForm.jqPolicyNo" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="activeName === '1'">
+            <el-form-item label="商业保单号">
+              <el-input v-model="singleForm.syPolicyNo" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="activeName === '2'">
+            <el-form-item label="驾意保单号">
+              <el-input v-model="singleForm.jyPolicyNo" clearable>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button class="border-[#0083FF] color-[#0083FF]" plain @click="singleEditShow = false">取消</el-button>
+        <el-button type="primary" v-if="subActiveName === 'first'" @click="handleSingleEditSubmit()">确定</el-button>
+      </template>
+    </el-dialog>
   </PageMain>
 </template>
 
@@ -956,10 +984,12 @@ const handleSelectAll2 = (e) => {
 
 // 批量修改比例
 let batchEditShow = ref(false)
+let singleEditShow = ref(false)
 let feeRate = ref(null)
 let signTime = ref(null)
 let people = ref(null)
 let editForm = ref({})
+let singleForm = ref({})
 const handleBatchEdit = (str: string) => {
   if (selectedList.value.length < 1 && str === 'first') {
     ElMessage({
@@ -1039,17 +1069,32 @@ const handleCurrentChange = (page) => {
     getJyReceivableList()
   }
 }
-
+// 单条修改提交
+const handleSingleEditSubmit = async () => {
+  const { code, data, msg } = await api.financeApi.updateInsPlyIncome({...singleForm.value})
+  if (code === 200) {
+    ElMessage.success(msg)
+    singleEditShow.value = false
+    search()
+  }
+}
 // 编辑
 const toEdit = (row: any) => {
-  console.log(row)
-  myRouter.push({
-    path: '/finance/auditOrderDetail',
-    query: {
-      id: row.orderNo,
-      jumpType: 'costMsg'
-    }
-  })
+  singleForm.value = {}
+  singleEditShow.value = true
+  singleForm.value.incomeId= row.id;
+  singleForm.value.orderNo= row.orderNo;
+  switch (activeName.value) {
+    case '1':
+      singleForm.value.jqPolicyNo= row.jqPolicyNo;
+      singleForm.value.syPolicyNo= row.syPolicyNo;
+      break;
+    case '2':
+      singleForm.value.jyPolicyNo= row.jyPolicyNo;
+      break;
+    default:
+  }
+
 }
 const search = () => {
   pages.value = 1