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

src/api/clue/sign.js

@@ -29,3 +29,21 @@ export const signAddPay = async (data) => {
 export const getSignExtraPayList = async (params) => {
   return await request.get({ url: '/admin-api/crm/sign/extra-pay/get', params })
 }
+
+// 安装状态修改
+export const updateInstallStatus = (signIdList, installStatus) => {
+  const data = {
+    signIdList,
+    installStatus
+  }
+  return request.post({ url: '/admin-api/crm/sign/install-status/batchSave', data: data })
+}
+
+// 修改生产状态
+export const updateProduceStatus = (data) => {
+  return request.put({ url: '/admin-api/crm/sign-prodcut/update', data: data })
+}
+
+export const updateProduceSort = (data) => {
+  return request.post({ url: '/admin-api/crm/sign-prodcut/adjust/sort', data: data })
+}

src/components/SSTable/index.vue

@@ -3,6 +3,8 @@
     <div class="flex">
       <el-table
         :data="tableObject.tableList"
+        :row-key="rowkey"
+        :expand-row-keys="expandRowKeys"
         border
         style="flex: 1"
         @selection-change="handleSelectionChange"
@@ -58,7 +60,9 @@ import { useRoute } from 'vue-router'
 
 const props = defineProps({
   tableObject: { type: Object, default: () => ({ tableList: [] }) },
-  tableColumns: { type: Array, default: () => [] }
+  tableColumns: { type: Array, default: () => [] },
+  rowkey: { type: String, default: 'id' },
+  expandRowKeys: { type: Array, default: () => [] }
 })
 
 const emit = defineEmits(['update:tableObject', 'getList', 'getCheckedColumns', 'selection-change'])

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

@@ -1,16 +1,39 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
     <Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :rules="ruels"
+      :model="formData"
+      label-width="80px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
           <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>
@@ -20,6 +43,7 @@
 </template>
 <script name="DialogAfterSaleAudit" setup>
 import { auditAfterSale } from '@/api/clue/afterSale'
+import { formatDate } from '@/utils/formatTime'
 
 const message = useMessage() // 消息弹窗
 
@@ -104,6 +128,10 @@ const formData = ref({
 })
 const formRef = ref() // 表单 Ref
 
+const ruels = {
+  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
+}
+
 const orderInfo = ref({})
 /** 打开弹窗 */
 const open = async (row) => {
@@ -140,6 +168,7 @@ const resetForm = (signId) => {
   formData.value = {
     saleId: signId,
     state: 3,
+    checkTime: formatDate(new Date()),
     remark: ''
   }
   formRef.value?.resetFields()

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

@@ -1,15 +1,38 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
-    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :rules="ruels"
+      :model="formData"
+      label-width="80px"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12" :offset="0">
           <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>
@@ -20,6 +43,7 @@
 <script name="DialogAfterSaleAudit" setup>
 import { batchAuditAfterSale } from '@/api/clue/afterSale'
 import { batchAuditPayment } from '@/api/clue/payment'
+import { formatDate } from '@/utils/formatTime'
 
 const message = useMessage() // 消息弹窗
 
@@ -32,6 +56,10 @@ const formData = ref({
   remark: ''
 })
 const formRef = ref() // 表单 Ref
+const ruels = {
+  checkTime: { required: true, message: '审核日期不可为空', trigger: 'blur,change' }
+}
+
 const formType = ref('aftersale')
 const titleMap = {
   aftersale: '批量售后审核',
@@ -79,6 +107,7 @@ const resetForm = (ids) => {
   formData.value = {
     payIds: ids,
     saleIds: ids,
+    checkTime: formatDate(new Date()),
     state: 3,
     remark: ''
   }

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

@@ -52,6 +52,13 @@
         <template #actionMore>
           <el-button @click="getTableList" v-hasPermi="['clue:order:search']"> 搜索 </el-button>
           <el-button @click="resetQuery" v-hasPermi="['clue:order:reset']"> 重置 </el-button>
+          <el-button
+            type="primary"
+            @click="handleBatchUpdateInstall"
+            v-hasPermi="['clue:order:batch-update-install']"
+          >
+            批量修改安装状态
+          </el-button>
         </template>
       </Search>
     </div>
@@ -61,17 +68,47 @@
       class="mt-10px"
       v-model:tableObject="tableObject"
       :tableColumns="allSchemas.tableColumns"
+      rowkey="signId"
+      :expandRowKeys="expendRows"
       @get-list="getTableList"
       @get-checked-columns="getCheckedColumns"
+      @selection-change="handleSelectionChange"
     >
+      <el-table-column type="selection" width="60" />
       <el-table-column type="expand">
         <template #default="{ row }">
           <div class="p-10px flex justify-center">
-            <el-table :data="row.signProducts" stripe style="width: 900px">
+            <VueDraggable
+              target="tbody"
+              v-model="row.signProducts"
+              :animation="150"
+              @end="onDragEnd"
+              style="width: 100%"
+            >
+              <el-table
+                :data="row.signProducts"
+                row-key="id"
+                stripe
+                style="width: 80%; margin: 0 auto"
+              >
                 <el-table-column prop="productName" label="成交产品" />
-              <el-table-column prop="specsName" label="产品规格" width="100px" />
+                <el-table-column prop="specsName" label="产品规格" />
                 <el-table-column prop="signNum" label="成交数量" width="90px" />
-              <el-table-column prop="remark" label="成交备注" />
+                <el-table-column prop="remark" label="成交备注" width="100px" />
+                <el-table-column label="生产状态" width="160px">
+                  <template #default="scope">
+                    <el-switch
+                      v-model="scope.row.isProduced"
+                      :active-value="true"
+                      :inactive-value="false"
+                      active-text="已生产"
+                      inactive-text="待生产"
+                      :disabled="!checkPermi(['clue:order:update-produce'])"
+                      size="small"
+                      @change="handleChangeProdoce(scope.row)"
+                    />
+                  </template>
+                </el-table-column>
                 <el-table-column label="发货状态" prop="sendState" width="90px">
                   <template #default="scope">
                     <el-tag
@@ -113,6 +150,7 @@
                   </template>
                 </el-table-column>
               </el-table>
+            </VueDraggable>
           </div>
         </template>
       </el-table-column>
@@ -217,6 +255,9 @@ import DialogDelivery from './DialogDelivery.vue'
 
 import { removeNullField } from '@/utils'
 import { formatDate } from '@/utils/formatTime'
+import { ElMessageBox, ElOption, ElSelect } from 'element-plus'
+import { VueDraggable } from 'vue-draggable-plus'
+import { checkPermi } from '@/utils/permission'
 
 const userOptions = ref([])
 const allUserOptions = ref([])
@@ -362,6 +403,96 @@ const deliveryDialog = ref()
 function handleDelivery(row) {
   deliveryDialog.value.open(row)
 }
+
+const batchIds = ref([])
+function handleSelectionChange(val) {
+  batchIds.value = val.map((it) => it.signId)
+}
+
+const selectedValue = ref(undefined)
+const installOptions = [
+  { label: '待安装', value: 1 },
+  { label: '已安装', value: 2 },
+  { label: '无需安装', value: 3 }
+]
+
+const select = () =>
+  h(
+    ElSelect,
+    {
+      modelValue: selectedValue.value,
+      placeholder: '新状态',
+      'onUpdate:modelValue': (val) => {
+        selectedValue.value = val
+      }
+    },
+    () =>
+      installOptions.map((item) => {
+        return h(ElOption, { label: item.label, value: item.value })
+      })
+  )
+
+function handleBatchUpdateInstall() {
+  if (batchIds.value.length) {
+    ElMessageBox({
+      title: '是否确认修改安装状态？',
+      message: select,
+      showCancelButton: true,
+      confirmButtonText: '确定',
+      cancelButtonText: '取消'
+    }).then(async (action) => {
+      // 处理用户点击确定或取消按钮后的逻辑
+      if (action == 'confirm') {
+        try {
+          // 发起修改状态
+          await SignApi.updateInstallStatus(batchIds.value, selectedValue.value)
+          message.success('修改成功')
+          // 刷新列表
+          await getTableList()
+        } catch (err) {
+          // 取消后，进行恢复按钮
+          console.log(err)
+        }
+      }
+    })
+  } else {
+    message.info('请选择表格行')
+  }
+}
+
+async function handleChangeProdoce(row) {
+  try {
+    // 修改状态的二次确认
+    await message.confirm('确认要修改生产状态吗?')
+    // 发起修改状态
+    await SignApi.updateProduceStatus({
+      signId: row.signId,
+      id: row.id,
+      isProduced: row.isProduced
+    })
+    message.success('修改成功')
+    // 刷新列表
+    getTableList()
+  } catch {
+    // 取消后，进行恢复按钮
+    row.isProduced = !row.isProduced
+  }
+}
+
+const expendRows = ref([])
+async function onDragEnd(ev) {
+  try {
+    expendRows.value = [ev.data.signId]
+    const list = tableObject.value.tableList.find((it) => it.signId == ev.data.signId).signProducts
+    await SignApi.updateProduceSort(list.map((it) => it.id))
+    message.success('修改成功')
+    // 刷新列表
+    getTableList()
+  } catch (error) {
+    console.log(error)
+    getTableList()
+  }
+}
 </script>
 
 <style lang="scss" scoped></style>

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

@@ -2,22 +2,44 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
+        <el-input
+          v-model="searchForm.signId"
+          placeholder="成交单号"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.phone" placeholder="联系方式" clearable />
+        <el-input
+          v-model="searchForm.phone"
+          placeholder="联系方式"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.settlementType" placeholder="结算类型" clearable filterable>
+        <el-select
+          v-model="searchForm.settlementType"
+          placeholder="结算类型"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option label="货款" value="货款" />
           <el-option label="其他支出" value="其他支出" />
         </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"
@@ -35,6 +57,19 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.createDate"
+          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>
@@ -44,6 +79,7 @@
           filterable
           clearable
           @change="searchForm.signSpecs = undefined"
+          style="width: 150px"
         >
           <el-option
             v-for="item in prodOptions"
@@ -60,6 +96,7 @@
           filterable
           clearable
           :disabled="!searchForm.signProduct"
+          style="width: 120px"
         >
           <el-option
             v-for="item in specsOptions(searchForm.signProduct)"
@@ -70,7 +107,13 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.supplier" placeholder="选择供应商" filterable clearable>
+        <el-select
+          v-model="searchForm.supplier"
+          placeholder="选择供应商"
+          filterable
+          clearable
+          style="width: 120px"
+        >
           <el-option
             v-for="item in supplierOptions"
             :key="item.value"
@@ -114,6 +157,12 @@
       <el-table-column prop="phone" label="联系方式" width="120px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column prop="dealDate" label="成交日期" width="120px" :formatter="dateFormatter" />
+      <el-table-column
+        prop="createTime"
+        label="支出日期"
+        width="120px"
+        :formatter="dateFormatter"
+      />
       <el-table-column prop="signProduct" label="成交产品" min-width="150px" />
       <el-table-column prop="signSpecs" label="成交规格" min-width="150px" />
       <el-table-column prop="supplier" label="供应商" min-width="150px" />
@@ -199,6 +248,7 @@ const searchForm = ref({
   phone: undefined,
   signUser: undefined,
   dealDate: [],
+  createDate: [],
   signProduct: undefined,
   signSpecs: undefined,
   signId: undefined,
@@ -215,6 +265,7 @@ function handleReset() {
     phone: undefined,
     signUser: undefined,
     dealDate: [],
+    createDate: [],
     signProduct: undefined,
     signSpecs: undefined,
     signId: undefined,

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

@@ -2,22 +2,44 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
+        <el-input
+          v-model="searchForm.signId"
+          placeholder="成交单号"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.phone" placeholder="联系方式" clearable />
+        <el-input
+          v-model="searchForm.phone"
+          placeholder="联系方式"
+          clearable
+          style="width: 120px"
+        />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.settlementType" placeholder="结算类型" clearable filterable>
+        <el-select
+          v-model="searchForm.settlementType"
+          placeholder="结算类型"
+          clearable
+          filterable
+          style="width: 120px"
+        >
           <el-option label="报名费" value="报名费" />
           <el-option label="其他支出" value="其他支出" />
         </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"
@@ -35,6 +57,19 @@
           range-separator="-"
           start-placeholder="成交日期"
           end-placeholder="成交日期"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.createDate"
+          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>
@@ -44,6 +79,7 @@
           filterable
           clearable
           @change="changeSchool"
+          style="width: 120px"
         >
           <el-option
             v-for="item in schoolOptions"
@@ -61,6 +97,7 @@
           clearable
           :disabled="!searchForm.signSchool"
           @change="changePlace"
+          style="width: 120px"
         >
           <el-option
             v-for="item in placeOptions"
@@ -77,6 +114,7 @@
           placeholder="选择班型"
           filterable
           clearable
+          style="width: 120px"
         >
           <el-option
             v-for="item in classOptions"
@@ -120,6 +158,12 @@
       <el-table-column prop="phone" label="联系方式" width="120px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column prop="dealDate" label="成交日期" width="120px" :formatter="dateFormatter" />
+      <el-table-column
+        prop="createTime"
+        label="支出日期"
+        width="120px"
+        :formatter="dateFormatter"
+      />
       <el-table-column prop="signSchool" label="成交驾校" min-width="150px" />
       <el-table-column prop="signPlace" label="成交场地" min-width="150px" />
       <el-table-column prop="signClass" label="成交班型" min-width="150px" />
@@ -206,6 +250,7 @@ const searchForm = ref({
   phone: undefined,
   signUser: undefined,
   dealDate: [],
+  createDate: [],
   signSchool: undefined,
   signPlace: undefined,
   signClass: undefined,
@@ -222,6 +267,7 @@ function handleReset() {
     phone: undefined,
     signUser: undefined,
     dealDate: [],
+    createDate: [],
     signSchool: undefined,
     signPlace: undefined,
     signClass: undefined,

src/views/Clue/Pool/Comp/DialogClue.vue

@@ -33,7 +33,7 @@
                 v-model="row.nextFollowTime"
                 type="date"
                 placeholder="选择日期时间"
-                :disabled="!row.editable"
+                :disabled="row.userId != useUserStore().getUser.id"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 style="width: 100%"
@@ -47,7 +47,7 @@
                 type="textarea"
                 :autoSize="{ minRows: 2 }"
                 placeholder="输入跟进内容"
-                :disabled="!row.editable"
+                :disabled="row.userId != useUserStore().getUser.id"
               />
             </template>
           </el-table-column>
@@ -364,8 +364,8 @@ async function handleSave() {
       const data = await ClueApi.createClue(params)
       message.success(data)
     } else {
-      const data = await ClueApi.updateClue(params)
+      await ClueApi.updateClue(params)
-      message.success(data)
+      message.success('修改成功')
     }
     dialogVisible.value = false
     // 发送操作成功的事件

src/views/Clue/Pool/Comp/DialogSuccess.vue

@@ -118,7 +118,8 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="8" :offset="0" v-if="appStore.getAppInfo?.instanceType == 1">
+        <template v-if="appStore.getAppInfo?.instanceType == 1">
+          <el-col :span="8" :offset="0">
             <el-form-item label="接待人" prop="receiver">
               <el-select v-model="form.receiver" placeholder="选择接待人" clearable filterable>
                 <el-option
@@ -130,6 +131,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </template>
+        <template v-else>
+          <el-col :span="8" :offset="0">
+            <el-form-item label="安装状态" prop="installStatus">
+              <el-select v-model="form.installStatus">
+                <el-option label="待安装" :value="1" />
+                <el-option label="已安装" :value="2" />
+                <el-option label="无需安装" :value="3" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </template>
         <el-col
           :span="fieldItem.component == 'Editor' ? 24 : 8"
           :offset="0"
@@ -462,7 +475,8 @@ async function resetForm(id) {
     isCompanyReceipts: data.configValue == 'true',
     receiver: undefined,
     extraPay: [],
-    signProducts: []
+    signProducts: [],
+    installStatus: 3
   }
 }
 

src/views/Clue/Pool/index.vue

@@ -14,7 +14,7 @@
         </el-tab-pane>
         <el-tab-pane name="2">
           <template #label>
-            <Tooltip message="下次跟进时间在今日之前的未成交线索" />
+            <Tooltip message="下次跟进时间在今日及之前的未成交线索" />
             <el-badge v-if="clueCount.followNum" :value="clueCount.followNum" :max="9999">
               <span class="ml-3px">待跟进</span>
             </el-badge>

src/views/SchoolManagement/Class/Comp/DialogClass.vue

@@ -474,12 +474,15 @@ const opts = ref({
 })
 
 /** 打开弹窗 */
-const open = async (type, id) => {
+const open = async (type, id, sp) => {
   dialogVisible.value = true
   dialogTitle.value = type == 'create' ? '新增班型' : '修改班型'
   formType.value = type
   currentTab.value = 'base'
   resetForm()
+  if (type == 'create' && sp && sp.length) {
+    formData.value.schPlace = sp
+  }
   if (!opts.value.length) {
     const arr = await ClassApi.getCommissionParams()
     arr.map((item) => {

src/views/SchoolManagement/Class/index.vue

@@ -47,20 +47,23 @@
           plain
           @click="handleOpenDialog('create', null)"
           v-hasPermi="['school:class:add']"
-          >新增</el-button
         >
+          新增
+        </el-button>
         <el-button
           type="danger"
           @click="handleBatchDelete([])"
           v-hasPermi="['school:class:batch-delete']"
-          >批量删除</el-button
         >
+          批量删除
+        </el-button>
         <el-button
           type="warning"
           @click="handleBatchStatus"
           v-hasPermi="['school:class:batch-status']"
-          >批量启/停用</el-button
         >
+          批量启/停用
+        </el-button>
       </el-form-item>
     </el-form>
 
@@ -235,7 +238,7 @@ async function getList() {
 
 const ClassDialog = ref()
 function handleOpenDialog(type, id = null) {
-  ClassDialog.value.open(type, id)
+  ClassDialog.value.open(type, id, searchForm.value.schPlace)
 }
 
 function handleReset() {