Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

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

@@ -8,7 +8,7 @@
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.state" placeholder="审核状态" clearable>
+        <el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
           <el-option label="待审核" :value="1" />
           <el-option label="已撤销" :value="2" />
           <el-option label="已通过" :value="3" />
@@ -16,7 +16,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+        <el-select
+          v-model="searchForm.signUser"
+          placeholder="登记人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -34,10 +40,17 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
+        <el-select
+          v-model="searchForm.applyUser"
+          placeholder="申请人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -55,12 +68,31 @@
           range-separator="-"
           start-placeholder="申请日期"
           end-placeholder="申请日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
+        <el-date-picker
-        <el-button @click="handleReset">重置</el-button>
+          v-model="searchForm.checkTime"
-        <el-button @click="batchAudit">批量审核</el-button>
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="审核日期"
+          end-placeholder="审核日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']">
+          查询
+        </el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:after-sale-reset']">
+          重置
+        </el-button>
+        <el-button @click="batchAudit" v-hasPermi="['clue:order:after-sale-batch-audit']">
+          批量审核
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -94,10 +126,23 @@
         min-width="120px"
         :formatter="dateFormatter"
       />
+      <el-table-column prop="checkUser" label="审核人" min-width="90" />
+      <el-table-column
+        prop="checkTime"
+        label="审核时间"
+        min-width="120px"
+        :formatter="dateFormatter"
+      />
       <el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90px" />
       <el-table-column label="操作" width="150px" fixed="right">
         <template #default="{ row }">
-          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-hasPermi="['clue:order:after-sale-detail']"
+            @click="handleDetail(row.id)"
+          >
             详情
           </el-button>
           <el-button
@@ -162,6 +207,7 @@ const searchForm = ref({
   dealUser: undefined,
   createDate: [],
   createUser: undefined,
+  checkTime: [],
   pageNo: 1,
   pageSize: 20
 })
@@ -185,6 +231,7 @@ function handleReset() {
     dealUser: undefined,
     createDate: [],
     createUser: undefined,
+    checkTime: [],
     pageNo: 1,
     pageSize: 20
   }

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

@@ -6,16 +6,39 @@
       <el-table-column prop="followTime" label="最新跟进时间" :formatter="dateFormatter" />
       <el-table-column prop="signSate" label="成交状态" />
     </el-table>
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+    <el-form
-      <el-form-item label="状态" prop="state">
+      ref="formRef"
-        <el-radio-group v-model="formData.state">
+      v-loading="formLoading"
-          <el-radio :label="3"> 通过 </el-radio>
+      :model="formData"
-          <el-radio :label="4"> 驳回 </el-radio>
+      :rules="ruels"
-        </el-radio-group>
+      label-width="80px"
-      </el-form-item>
+    >
-      <el-form-item label="备注" prop="remark">
+      <el-row :gutter="20">
-        <Editor v-model:modelValue="formData.remark" />
+        <el-col :span="12" :offset="0">
-      </el-form-item>
+          <el-form-item label="状态" prop="state">
+            <el-radio-group v-model="formData.state">
+              <el-radio :label="3"> 通过 </el-radio>
+              <el-radio :label="4"> 驳回 </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" :offset="0">
+          <el-form-item label="审核日期" prop="checkTime">
+            <el-date-picker
+              v-model="formData.checkTime"
+              type="date"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24" :offset="0">
+          <el-form-item label="备注" prop="remark">
+            <Editor v-model:modelValue="formData.remark" />
+          </el-form-item>
+        </el-col>
+      </el-row>
     </el-form>
     <template #footer>
       <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -26,8 +49,8 @@
 <script name="DialogFeebackAudit" setup>
 import { getFollowUserList } from '@/api/clue'
 import { auditPayment } from '@/api/clue/payment'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
-
+import {} from '@/utils/formatTime'
 const message = useMessage() // 消息弹窗
 
 const dialogVisible = ref(false) // 弹窗的是否展示
@@ -89,6 +112,11 @@ const formData = ref({
   state: 3,
   remark: ''
 })
+
+const ruels = {
+  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
+}
+
 const formRef = ref() // 表单 Ref
 
 const orderInfo = ref({})
@@ -129,6 +157,7 @@ const resetForm = (signId) => {
   formData.value = {
     payId: signId,
     state: 3,
+    checkTime: formatDate(new Date()),
     remark: ''
   }
   formRef.value?.resetFields()

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

@@ -87,9 +87,11 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:settle-search']">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:settle-reset']">重置</el-button>
-        <el-button @click="batchSettle">批量结算</el-button>
+        <el-button @click="batchSettle" v-hasPermi="['clue:order:settle-batch-audit']">
+          批量结算
+        </el-button>
       </el-form-item>
     </el-form>
 

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

@@ -8,7 +8,7 @@
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.state" placeholder="审核状态" clearable>
+        <el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
           <el-option label="待审核" :value="1" />
           <el-option label="已撤销" :value="2" />
           <el-option label="已通过" :value="3" />
@@ -16,7 +16,13 @@
         </el-select>
       </el-form-item>
       <el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
-        <el-select v-model="searchForm.receiver" placeholder="接待人" clearable filterable>
+        <el-select
+          v-model="searchForm.receiver"
+          placeholder="接待人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in allUserOptions"
             :key="item.id"
@@ -26,7 +32,13 @@
         </el-select>
       </el-form-item>
       <el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
-        <el-select v-model="searchForm.convertPeople" placeholder="转化人" clearable filterable>
+        <el-select
+          v-model="searchForm.convertPeople"
+          placeholder="转化人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in allUserOptions"
             :key="item.id"
@@ -36,7 +48,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
+        <el-select
+          v-model="searchForm.signUser"
+          placeholder="登记人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -54,10 +72,17 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
+        <el-select
+          v-model="searchForm.applyUser"
+          placeholder="申请人"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -75,12 +100,27 @@
           range-separator="-"
           start-placeholder="申请日期"
           end-placeholder="申请日期"
+          style="width: 240px"
         />
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
+        <el-date-picker
-        <el-button @click="handleReset">重置</el-button>
+          v-model="searchForm.checkTime"
-        <el-button @click="batchAudit">批量审核</el-button>
+          type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
+          range-separator="-"
+          start-placeholder="审核日期"
+          end-placeholder="审核日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:return-search']">查询</el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:return-reset']">重置</el-button>
+        <el-button @click="batchAudit" v-hasPermi="['clue:order:return-batch-audit']">
+          批量审核
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -169,14 +209,27 @@
       <el-table-column prop="applyUserName" label="申请人" min-width="90" />
       <el-table-column
         prop="applyTime"
-        label="申请时间"
+        label="审核人"
+        min-width="120px"
+        :formatter="dateFormatter"
+      />
+      <el-table-column prop="checkUser" label="审核人" min-width="90" />
+      <el-table-column
+        prop="checkTime"
+        label="审核时间"
         min-width="120px"
         :formatter="dateFormatter"
       />
       <el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90" />
       <el-table-column label="操作" width="220px" fixed="right">
         <template #default="{ row }">
-          <el-button type="primary" style="padding: 0" text @click="handleDetail(row)">
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-hasPermi="['clue:order:return-detail']"
+            @click="handleDetail(row)"
+          >
             详情
           </el-button>
           <el-button
@@ -254,6 +307,7 @@ const searchForm = ref({
   signUser: undefined,
   applyTime: [],
   applyUser: undefined,
+  checkTime: [],
   pageNo: 1,
   pageSize: 20
 })
@@ -280,6 +334,7 @@ function handleReset() {
     signUser: undefined,
     applyTime: [],
     applyUser: undefined,
+    checkTime: [],
     pageNo: 1,
     pageSize: 20
   }
@@ -354,7 +409,7 @@ function getSummaries(param) {
     } else if (column.property == 'personProfit') {
       sums[index] = totalInfo.value.totalPersonProfit
     } else if (column.property == 'companyProfit') {
-      sums[index] = totalInfo.value.totalPersonProfit
+      sums[index] = totalInfo.value.totalCompanyProfit
     } else if (column.property == 'signPrice') {
       sums[index] = totalInfo.value.totalSignPrice
     } else {

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

@@ -93,9 +93,11 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item>
-        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleSearch" v-hasPermi="['clue:order:settle-search']">查询</el-button>
-        <el-button @click="handleReset">重置</el-button>
+        <el-button @click="handleReset" v-hasPermi="['clue:order:settle-reset']">重置</el-button>
-        <el-button @click="batchSettle">批量结算</el-button>
+        <el-button @click="batchSettle" v-hasPermi="['clue:order:settle-settle-batch-audit']">
+          批量结算
+        </el-button>
       </el-form-item>
     </el-form>
 

src/views/Clue/Order/index.vue

@@ -1,21 +1,29 @@
 <template>
   <el-tabs v-model="tabName">
-    <el-tab-pane label="成交列表" name="list">
+    <el-tab-pane label="成交列表" name="list" v-if="checkPermi(['clue:order:order-list'])">
       <template v-if="tabName == 'list'">
         <OrderList v-if="appStore.getAppInfo?.instanceType == 1" />
         <MallOrderList v-else-if="appStore.getAppInfo?.instanceType == 2" />
       </template>
     </el-tab-pane>
-    <el-tab-pane label="回款申请" name="commission">
+    <el-tab-pane label="回款申请" name="commission" v-if="checkPermi(['clue:order:return-list'])">
       <Reback v-if="tabName == 'commission'" />
     </el-tab-pane>
-    <el-tab-pane label="售后申请" name="aftersale">
+    <el-tab-pane
+      label="售后申请"
+      name="aftersale"
+      v-if="checkPermi(['clue:order:after-sale-list'])"
+    >
       <AfterSales v-if="tabName == 'aftersale'" />
     </el-tab-pane>
-    <el-tab-pane label="发货列表" name="delivery" v-if="appStore.getAppInfo?.instanceType == 2">
+    <el-tab-pane
+      label="发货列表"
+      name="delivery"
+      v-if="appStore.getAppInfo?.instanceType == 2 && checkPermi(['clue:order:delivery-list'])"
+    >
       <Delivery v-if="tabName == 'delivery'" />
     </el-tab-pane>
-    <el-tab-pane label="对外结算" name="settle" v-if="checkPermi(['clue:order:settle'])">
+    <el-tab-pane label="对外结算" name="settle" v-if="checkPermi(['clue:order:settle-list'])">
       <Settle v-if="tabName == 'settle'" />
     </el-tab-pane>
   </el-tabs>