sc

src/api/clue/clueRemark.js

@@ -35,8 +35,8 @@ export const registerClue = (data) => {
 }
 
 // 分页查询报备信息
-export const getClueRemarkPage = (params) => {
+export const getClueRemarkPage = (data) => {
-  return request.get({ url: '/admin-api/crm/clue-remark/page', params })
+  return request.post({ url: '/admin-api/crm/clue-remark/page', data })
 }
 
 // 区域查询报备信息

src/views/Clue/Order/Comp/DialogOrder.vue

@@ -36,7 +36,7 @@
         <el-divider direction="horizontal" content-position="left">
           其他费用<span v-if="extraTotalPrice">，应收：{{ extraTotalPrice }}</span>
         </el-divider>
-        <el-table :data="orderInfo.extraPay" border stripe>
+        <el-table :data="orderInfo.otherPay" border stripe>
           <el-table-column type="index" width="50" />
           <el-table-column prop="extraPayType" label="费用项" />
           <el-table-column prop="extraPayMoney" label="金额" />
@@ -110,7 +110,8 @@ const show = ref(false)
 const clueInfo = ref({})
 const orderInfo = ref({
   signProducts: [],
-  extraPay: []
+  extraPay: [],
+  otherPay: []
 })
 const returnRecordList = ref([])
 const aftersaleList = ref([])
@@ -127,7 +128,7 @@ const prodTotalPrice = computed(() => {
 
 // 其他费用
 const extraTotalPrice = computed(() => {
-  return orderInfo.value.extraPay.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
+  return orderInfo.value.otherPay?.reduce((pre, cur) => pre + cur.extraPayMoney, 0)
 })
 
 // 额外支出

src/views/Clue/Order/Comp/OrderRemark.vue

@@ -160,16 +160,7 @@ async function getList() {
   loading.value = true
   try {
     let params = { ...removeNullField(searchForm.value) }
-    if (params.remarkDate && params.remarkDate.length === 2) {
+
-      params.remarkDateStart = params.remarkDate[0] + ' 00:00:00'
-      params.remarkDateEnd = params.remarkDate[1] + ' 23:59:59'
-      delete params.remarkDate
-    }
-    if (params.signDate && params.signDate.length === 2) {
-      params.signDateStart = params.signDate[0] + ' 00:00:00'
-      params.signDateEnd = params.signDate[1] + ' 23:59:59'
-      delete params.signDate
-    }
     const data = await getClueRemarkPage(params)
     tableList.value = data.list
     total.value = data.total

src/views/Clue/Pool/ClueEnroll.vue

@@ -186,13 +186,13 @@
                 添加其他费用
               </el-button>
               <el-table :data="form.otherPay" border size="small">
-                <el-table-column type="index" width="50" />
+                <el-table-column type="index" width="30" />
-                <el-table-column prop="extraPayType" label="费用类型" width="200px">
+                <el-table-column prop="extraPayType" label="费用类型">
                   <template #default="{ row }">
                     <el-select
                       v-model="row.extraPayType"
                       size="small"
-                      placeholder="其他费用类型"
+                      placeholder="费用类型"
                       filterable
                     >
                       <el-option
@@ -204,7 +204,7 @@
                     </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column prop="extraPayMoney" label="费用金额" width="180px">
+                <el-table-column prop="extraPayMoney" label="费用金额">
                   <template #default="{ row }">
                     <el-input-number v-model="row.extraPayMoney" size="small" :controls="false" />
                   </template>
@@ -214,7 +214,7 @@
                     <el-input v-model="row.remark" size="small" placeholder="备注信息" />
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="60px">
+                <el-table-column label="操作" width="50px">
                   <template #default="{ $index }">
                     <Icon
                       icon="ep:remove-filled"
@@ -243,26 +243,26 @@
                 添加额外支出
               </el-button>
               <el-table :data="form.extraPay" border size="small">
-                <el-table-column type="index" width="50" />
+                <el-table-column type="index" width="30" />
-                <el-table-column prop="extraPayType" label="费用类型" width="200px">
+                <el-table-column prop="extraPayType" label="支出类型">
                   <template #default="{ row }">
                     <el-select
                       v-if="row.editabled"
                       v-model="row.extraPayType"
                       size="small"
-                      placeholder="其他费用类型"
+                      placeholder="支出类型"
                       filterable
                     >
                       <el-option
                         v-for="item in extraPayOptions"
-                        :key="item.value"
+                        :key="item.id"
-                        :label="item.label"
+                        :label="item.extraPayName"
-                        :value="item.value"
+                        :value="item.id"
                       />
                     </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column prop="extraPayMoney" label="费用金额" width="180px">
+                <el-table-column prop="extraPayMoney" label="支出金额">
                   <template #default="{ row }">
                     <el-input-number
                       v-if="row.editabled"
@@ -282,7 +282,7 @@
                     />
                   </template>
                 </el-table-column>
-                <el-table-column label="操作" width="60px">
+                <el-table-column label="操作" width="50px">
                   <template #default="{ row, $index }">
                     <Icon
                       icon="ep:remove-filled"
@@ -301,12 +301,20 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-button v-if="!remarkInfo.isEnroll && info.clueId" type="primary" @click="handleSave">
+        <div class="p-10px">
+          <el-button
+            v-if="!remarkInfo.isEnroll && info.clueId"
+            type="primary"
+            size="large"
+            style="width: 100%"
+            @click="handleSave"
+          >
             提 交
           </el-button>
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <script setup>
@@ -319,6 +327,7 @@ import { getClassTypeList } from '@/api/school/class'
 import { getConfigByConfigKey } from '@/api/system/set'
 import { getSimpleFieldList as getClueField } from '@/api/clue/clueField'
 import { getSimpleFieldList } from '@/api/clue/orderField'
+import { getExtraFeeSimpleList } from '@/api/clue/extraFee'
 
 import { formatDate } from '@/utils/formatTime'
 import { getDictOptions } from '@/utils/dict'
@@ -345,7 +354,7 @@ const userStore = useUserStore()
 const showSchema = ref([])
 
 const otherPayOptions = getDictOptions('other_pay_type')
-const extraPayOptions = getDictOptions('extra_pay_type')
+const extraPayOptions = ref([])
 
 const remarkInfo = ref({})
 
@@ -367,14 +376,14 @@ onMounted(() => {
         ClueApi.getClue(remarkInfo.value.clueId).then((data) => {
           info.value = { ...data, ...data.diyParams, signInfo: remarkInfo.value.signInfo }
           let str = ''
-          if (!remarkInfo.value.remarkContent.includes(data.name)) {
+          // if (!remarkInfo.value.remarkContent.includes(data.name)) {
-            // 提示姓名不一致
+          //   // 提示姓名不一致
-            str += '学员姓名不一致'
+          //   str += '学员姓名不一致'
-          }
+          // }
-          if (!remarkInfo.value.remarkContent.includes(data.phone)) {
+          // if (!remarkInfo.value.remarkContent.includes(data.phone)) {
-            // 提示姓名不一致
+          //   // 提示姓名不一致
-            str += '手机号不一致'
+          //   str += '手机号不一致'
-          }
+          // }
           if (str.length) {
             message.warning(`请注意：${str}`)
           }
@@ -519,6 +528,9 @@ function getOptions() {
   getDiyFieldList().then((data) => {
     diyFieldList.value = data
   })
+  getExtraFeeSimpleList().then((data) => {
+    extraPayOptions.value = data
+  })
 }
 
 function changeSchool() {