Merge remote-tracking branch 'origin/main' into dev-cl

src/api/clue/clueGetSet.js

@@ -10,9 +10,14 @@ export const deleteClueGainRule = (id) => {
   return request.delete({ url: `/admin-api/crm/sch-clue-gain-rule/delete?id=${id}` })
 }
 
+// 线索获取规则保存
+export const saveClueGainRule = (data) => {
+  return request.put({ url: '/admin-api/crm/sch-clue-gain-rule/batchUpdate', data })
+}
+
 // 线索规则
-export const getClueDistributeRuleList = () => {
+export const getClueDistributeRuleByUser = (params) => {
-  return request.get({ url: '/admin-api/crm/sch-clue-gain-rule/list' })
+  return request.get({ url: '/admin-api/crm/sch-clue-distribution-rule/queryByUserId', params })
 }
 
 // 删除

src/api/clue/delivery.js

@@ -5,7 +5,7 @@ export const getDeliveryList = async (params) => {
   return await request.get({ url: '/admin-api/crm/sign-send/list', params })
 }
 
-// 查询（精简)列表
+// 查询分页列表
 export const getDeliveryPage = async (params) => {
   return await request.get({ url: '/admin-api/crm/sign-send/page', params })
 }

src/api/clue/sign.js

@@ -24,3 +24,8 @@ export const cancelDeal = async (id) => {
 export const signAddPay = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign/extra-pay/save', data: data })
 }
+
+// 查询支出
+export const getSignExtraPayList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign/extra-pay/get', params })
+}

src/config/axios/service.ts

@@ -199,6 +199,16 @@ service.interceptors.response.use(
         console.log(msg)
       } else {
         ElNotification.error({ title: msg })
+        if (code == 403) {
+          // 无访问权限，退出登录
+          const { wsCache } = useCache()
+          const tenantId = wsCache.get('TENANT_ID')
+          const appId = wsCache.get('App_ID')
+          resetRouter() // 重置静态路由表
+          wsCache.clear()
+          removeToken()
+          window.location.href = `/login?tenantId=${tenantId}&appId=${appId}`
+        }
       }
       return Promise.reject('error')
     } else {

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

@@ -30,9 +30,10 @@
       </el-form-item>
       <el-form-item>
         <el-select
-          v-model="searchForm.signProduct"
+          v-model="searchForm.productId"
           placeholder="选择成交产品"
           filterable
+          clearable
           @change="searchForm.specsId = undefined"
         >
           <el-option
@@ -48,10 +49,11 @@
           v-model="searchForm.specsId"
           placeholder="选择规格"
           filterable
-          :disabled="!searchForm.signProduct"
+          clearable
+          :disabled="!searchForm.productId"
         >
           <el-option
-            v-for="item in specsOptions(searchForm.signProduct)"
+            v-for="item in specsOptions(searchForm.productId)"
             :key="item.specsId"
             :label="item.specsName"
             :value="item.specsId"
@@ -69,17 +71,34 @@
       <el-table-column prop="name" label="线索名称" min-width="200px" />
       <el-table-column prop="phone" label="联系方式" min-width="150px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
-      <el-table-column prop="dealDate" label="登记时间" min-width="150px" />
+      <el-table-column
-      <el-table-column prop="" label="成交产品" min-width="150px" />
+        prop="dealDate"
-      <el-table-column prop="" label="产品规格" min-width="150px" />
+        label="登记时间"
-      <el-table-column prop="" label="发货时间" min-width="150px" />
+        min-width="150px"
-      <el-table-column prop="" label="发货仓库" min-width="100px" />
+        :formatter="dateFormatter"
-      <el-table-column prop="" label="备注" min-width="100px" />
+      />
-      <el-table-column label="操作" width="150px" fixed="right">
+      <el-table-column prop="productName" label="成交产品" min-width="150px" />
-        <template #default="{ row }">
+      <el-table-column prop="specsName" label="产品规格" min-width="150px" />
-          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
+      <el-table-column
-            详情
+        prop="createTime"
-          </el-button>
+        label="发货时间"
+        min-width="150px"
+        :formatter="dateFormatter"
+      />
+      <el-table-column prop="warehouseName" label="发货仓库" min-width="100px" />
+      <el-table-column label="发货备注">
+        <template #default="scope">
+          <el-popover
+            placement="top"
+            width="500px"
+            trigger="click"
+            v-if="scope.row.warehouseName && scope.row.remark"
+          >
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="scope.row.remark"></div>
+          </el-popover>
         </template>
       </el-table-column>
     </el-table>
@@ -95,6 +114,9 @@
 <script setup name="Delivery">
 import { getSimpleUserList as getUserOption } from '@/api/system/user'
 import { getSimpleProductList } from '@/api/mall/product'
+import * as DeliveryApi from '@/api/clue/delivery'
+
+import { dateFormatter } from '@/utils/formatTime'
 // const message = useMessage() // 消息弹窗
 
 const searchForm = ref({
@@ -102,6 +124,8 @@ const searchForm = ref({
   name: undefined,
   dealDate: [],
   signUser: undefined,
+  productId: undefined,
+  specsId: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -122,6 +146,8 @@ function handleReset() {
     name: undefined,
     dealDate: [],
     signUser: undefined,
+    productId: undefined,
+    specsId: undefined,
     pageNo: 1,
     pageSize: 20
   }
@@ -131,19 +157,14 @@ const loading = ref(false)
 async function getList() {
   loading.value = true
   try {
-    tableList.value = []
+    const data = await DeliveryApi.getDeliveryPage(searchForm.value)
-    // const data = await FeebackApi.getPaymentPage(searchForm.value)
+    tableList.value = data.list
-    // tableList.value = data.list
+    total.value = data.total
-    // total.value = data.total
   } finally {
     loading.value = false
   }
 }
 
-function handleDetail(id) {
-  console.log(id)
-}
-
 const prodOptions = ref([])
 
 const specsOptions = computed({

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

@@ -28,6 +28,8 @@
 import { getSimpleWarehouseList } from '@/api/mall/warehouse'
 import { createDelivery } from '@/api/clue/delivery'
 
+const message = useMessage() // 消息弹窗
+
 const warehouseOptions = ref([])
 function getOptions() {
   getSimpleWarehouseList().then((data) => {
@@ -50,7 +52,7 @@ const rules = ref({
 })
 function resetForm(id) {
   form.value = {
-    signId: id,
+    signProductId: id,
     warehouseId: undefined,
     remark: undefined
   }
@@ -58,6 +60,7 @@ function resetForm(id) {
 
 const emit = defineEmits(['success'])
 const formLoading = ref(false)
+const formRef = ref()
 async function onSubmit() {
   // 校验表单
   if (!formRef.value) return

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

@@ -8,7 +8,8 @@
         form.extraPay.push({
           extraPayType: undefined,
           extraPayMoney: 0,
-          dictType: 'extra_pay_type'
+          dictType: 'extra_pay_type',
+          editabled: true
         })
       "
     >
@@ -18,7 +19,13 @@
       <el-table-column type="index" width="50" />
       <el-table-column prop="extraPayType" label="费用类型" width="200px">
         <template #default="{ row }">
-          <el-select v-model="row.extraPayType" size="small" placeholder="其他费用类型" filterable>
+          <el-select
+            v-if="row.editabled"
+            v-model="row.extraPayType"
+            size="small"
+            placeholder="其他费用类型"
+            filterable
+          >
             <el-option
               v-for="item in extraPayOptions"
               :key="item.value"
@@ -30,12 +37,17 @@
       </el-table-column>
       <el-table-column prop="extraPayMoney" label="费用金额" width="180px">
         <template #default="{ row }">
-          <el-input-number v-model="row.extraPayMoney" size="small" :controls="false" />
+          <el-input-number
+            v-if="row.editabled"
+            v-model="row.extraPayMoney"
+            size="small"
+            :controls="false"
+          />
         </template>
       </el-table-column>
       <el-table-column prop="remark" label="备注">
         <template #default="{ row }">
-          <el-input v-model="row.remark" size="small" placeholder="备注信息" />
+          <el-input v-if="row.editabled" v-model="row.remark" size="small" placeholder="备注信息" />
         </template>
       </el-table-column>
       <el-table-column label="操作" width="60px">
@@ -43,7 +55,7 @@
           <Icon
             icon="ep:remove-filled"
             class="text-red-500"
-            :disabled="row.id"
+            v-if="row.editabled"
             @click="handleRemove('extraPay', $index)"
           />
         </template>
@@ -60,7 +72,7 @@
 </template>
 
 <script setup name="DialogExtraPay">
-import { signAddPay } from '@/api/clue/sign'
+import { signAddPay, getSignExtraPayList } from '@/api/clue/sign'
 import { getDictOptions } from '@/utils/dict'
 
 const extraPayOptions = getDictOptions('extra_pay_type')
@@ -70,6 +82,7 @@ const show = ref(false)
 function open(id) {
   show.value = true
   resetForm(id)
+  getFormList()
 }
 defineExpose({
   open
@@ -83,6 +96,15 @@ function resetForm(id) {
   }
 }
 
+function getFormList() {
+  getSignExtraPayList({ id: form.value.signId }).then((data) => {
+    form.value.extraPay = data.map((it) => ({
+      ...it,
+      editabled: false
+    }))
+  })
+}
+
 const formLoading = ref(false)
 async function onSubmit() {
   // 校验表单
@@ -99,11 +121,12 @@ async function onSubmit() {
   formLoading.value = true
   try {
     const params = {
-      signId: form.value.id,
+      signId: form.value.signId,
-      extraPay: form.value.extraPay.filter((it) => !it.id)
+      extraPay: form.value.extraPay.filter((it) => it.editabled)
     }
     await signAddPay(params)
     message.success('添加额外支出成功！')
+    getFormList()
   } finally {
     formLoading.value = false
   }

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

@@ -6,6 +6,31 @@
       </el-tab-pane>
       <el-tab-pane label="成交信息" name="orderInfo">
         <Descriptions :data="orderInfo" :schema="orderSchema" :columns="2" labelWidth="130px" />
+        <template v-if="orderInfo.signProducts && orderInfo.signProducts.length">
+          <el-divider direction="horizontal" content-position="left">成交产品</el-divider>
+          <el-table :data="orderInfo.signProducts" border stripe>
+            <el-table-column type="index" width="50" />
+            <el-table-column prop="productName" label="成交产品" />
+            <el-table-column prop="specsName" label="产品规格" />
+            <el-table-column prop="signNum" label="成交数量" />
+            <el-table-column prop="warehouseName" label="发货仓库" />
+            <el-table-column label="发货备注">
+              <template #default="scope">
+                <el-popover
+                  placement="top"
+                  width="500px"
+                  trigger="click"
+                  v-if="scope.row.warehouseName && scope.row.sendRemark"
+                >
+                  <template #reference>
+                    <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+                  </template>
+                  <div v-dompurify-html="scope.row.sendRemark"></div>
+                </el-popover>
+              </template>
+            </el-table-column>
+          </el-table>
+        </template>
         <el-divider direction="horizontal" content-position="left">其他费用</el-divider>
         <el-table :data="orderInfo.extraPay" border stripe>
           <el-table-column type="index" width="50" />
@@ -13,6 +38,13 @@
           <el-table-column prop="extraPayMoney" label="金额" />
           <el-table-column prop="remark" label="备注" />
         </el-table>
+        <el-divider direction="horizontal" content-position="left">额外支出</el-divider>
+        <el-table :data="extraPayList" border stripe>
+          <el-table-column type="index" width="50" />
+          <el-table-column prop="extraPayType" label="支出项" />
+          <el-table-column prop="extraPayMoney" label="金额" />
+          <el-table-column prop="remark" label="备注" />
+        </el-table>
       </el-tab-pane>
       <el-tab-pane label="回款记录" name="returnRecord">
         <el-table :data="returnRecordList" border stripe>
@@ -54,6 +86,7 @@ const clueInfo = ref({})
 const orderInfo = ref({})
 const returnRecordList = ref([])
 const aftersaleList = ref([])
+const extraPayList = ref([])
 
 function open(clueId, orderId) {
   try {
@@ -67,6 +100,9 @@ function open(clueId, orderId) {
       orderInfo.value = { ...data, ...data.diyParams }
       orderInfo.value.dealDate = formatDate(orderInfo.value.dealDate, 'YYYY-MM-DD HH:mm')
     })
+    OrderApi.getSignExtraPayList({ id: orderId }).then((data) => {
+      extraPayList.value = data
+    })
     getPaymentPage({ signId: orderId, pageNo: 1, pageSize: 100 }).then((data) => {
       returnRecordList.value = data.list
     })

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

@@ -68,13 +68,29 @@
               <el-table-column prop="productName" label="成交产品" />
               <el-table-column prop="specsName" label="产品规格" />
               <el-table-column prop="signNum" label="成交数量" />
-              <el-table-column prop="" label="发货仓库" />
+              <el-table-column prop="warehouseName" label="发货仓库" />
+              <el-table-column label="发货备注">
+                <template #default="scope">
+                  <el-popover
+                    placement="top"
+                    width="500px"
+                    trigger="click"
+                    v-if="scope.row.warehouseName && scope.row.sendRemark"
+                  >
+                    <template #reference>
+                      <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+                    </template>
+                    <div v-dompurify-html="scope.row.sendRemark"></div>
+                  </el-popover>
+                </template>
+              </el-table-column>
               <el-table-column label="操作" width="100px">
                 <template #default="scope">
                   <el-button
                     type="primary"
                     class="mr-10px"
                     link
+                    :disabled="!!scope.row.warehouseName"
                     style="padding: 0; margin-left: 0"
                     v-hasPermi="['clue:order:send']"
                     @click="handleDelivery(scope.row)"
@@ -93,7 +109,21 @@
         :prop="item.field"
         :label="item.label"
         min-width="120px"
-      />
+      >
+        <template #default="{ row }">
+          <el-popover
+            placement="top"
+            width="500px"
+            trigger="click"
+            v-if="item.field == 'remark' && row.remark"
+          >
+            <template #reference>
+              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+            </template>
+            <div v-dompurify-html="row.remark"></div>
+          </el-popover>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="240px" fixed="right">
         <template #default="scope">
           <el-button
@@ -297,7 +327,7 @@ function getOptions() {
 }
 const deliveryDialog = ref()
 function handleDelivery(row) {
-  deliveryDialog.value.open(row.signId)
+  deliveryDialog.value.open(row.id)
 }
 
 const userOptions = ref([])

src/views/Clue/Set/Comp/ClueGet.vue

@@ -19,9 +19,9 @@
           >
             <el-option
               v-for="item in resourceOptions"
-              :key="item.value"
+              :key="item.sourceId"
-              :label="item.label"
+              :label="item.sourceName"
-              :value="item.value"
+              :value="item.sourceId"
             />
           </el-select>
           <span>{{ row.channel }}</span>
@@ -36,21 +36,23 @@
       </el-table-column>
       <el-table-column label="操作" width="100px">
         <template #default="{ $index }">
-          <el-button type="primary" style="padding: 0px" text @click="handleRemove($index)"
+          <el-button type="primary" style="padding: 0px" text @click="handleRemove($index)">
-            >删除</el-button
+            删除
-          >
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="mt-20px flex justify-center">
       <el-button type="primary" @click="handleInsert">新增规则</el-button>
-      <el-button type="primary" @click="onSubmit">保存</el-button>
+      <el-button :disabled="formLoading" type="primary" @click="onSubmit">保存</el-button>
     </div>
   </div>
 </template>
 
 <script setup name="ClueSet">
-import { getClueGainRuleList, deleteClueGainRule } from '@/api/clue/clueGetSet'
+import { getClueGainRuleList, deleteClueGainRule, saveClueGainRule } from '@/api/clue/clueGetSet'
+import { getSimpleSourceList as getResourceOptions } from '@/api/clue/source'
+import { listToTree } from '@/utils/tree.ts'
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
@@ -59,6 +61,12 @@ const list = ref([])
 const loading = ref(false)
 const resourceOptions = ref([])
 
+function getOptions() {
+  getResourceOptions().then((data) => {
+    resourceOptions.value = listToTree(data, { id: 'sourceId', pId: 'parentId' })
+  })
+}
+
 async function getList() {
   loading.value = true
   try {
@@ -73,8 +81,20 @@ function handleInsert() {
   list.value.push({ source: '', url: '', edit: true, status: 0 })
 }
 
-function onSubmit() {
+const formLoading = ref(false)
-  console.log('保存成功')
+async function onSubmit() {
+  if (list.value.some((it) => !it.source || !it.resource || !it.channel)) {
+    message.info('请将表格数据填写完整！')
+    return
+  }
+  formLoading.value = true
+  try {
+    await saveClueGainRule(list.value.map((it) => ({ ...it, channel: it.source })))
+    message.success('保存成功')
+    getList()
+  } finally {
+    formLoading.value = false
+  }
 }
 
 async function handleRemove(idx) {
@@ -101,6 +121,7 @@ function handleChange(row) {
 }
 
 onMounted(() => {
+  getOptions()
   getList()
 })
 </script>

src/views/Clue/Set/Comp/ClueSend.vue

@@ -50,6 +50,7 @@
             >
               全选
             </el-checkbox>
+            <!-- 得根据自动获得的线索做配置 -->
             <el-checkbox-group v-model="form.resource" @change="resourceCheckedChange">
               <el-checkbox
                 v-for="(item, index) in resourceOptions"
@@ -63,7 +64,7 @@
           </div>
         </el-form-item>
         <el-form-item label="权重配置">
-          <el-input v-model="form.value" type="number" placeholder="请输入权重">
+          <el-input v-model="form.weight" type="number" placeholder="请输入权重">
             <template #suffix> % </template>
           </el-input>
         </el-form-item>
@@ -78,6 +79,7 @@
 
 <script setup name="ClueSend">
 import { getUserPage } from '@/api/system/user'
+import { getClueDistributeRuleByUser } from '@/api/clue/clueGetSet'
 
 // const message = useMessage() // 消息弹窗
 // const { t } = useI18n() // 国际化
@@ -102,7 +104,7 @@ const form = ref({
   isAuto: 1,
   users: [1, 2],
   resource: [3],
-  sendTime: '00:00'
+  weight: undefined
 })
 const rules = ref({})
 
@@ -145,7 +147,9 @@ function resourceCheckedChange(val) {
 
 function handleRowClick(row) {
   currentRowId.value = row.id
-  form.value = { ...row }
+  getClueDistributeRuleByUser({ employeeId: row.id }).then((data) => {
+    form.value = data
+  })
 }
 
 onMounted(() => {

src/views/Clue/Set/Comp/GeneralSet.vue

@@ -24,7 +24,7 @@
           v-if="getConfig('deliveryAutoStartPurchaseConfig').remark"
           :message="getConfig('deliveryAutoStartPurchaseConfig').remark"
         />
-        <span>发货自动发起采购</span>
+        <span>允许负库存</span>
       </template>
       <el-radio-group v-model="form.deliveryAutoStartPurchaseConfig">
         <el-radio

src/views/Clue/Set/index.vue

@@ -10,7 +10,7 @@
       <el-tab-pane label="线索来源" :name="15" v-if="checkPermi(['clue:setting:clue-resource'])">
         <ClueSource v-if="tabIndex == 15" />
       </el-tab-pane>
-      <el-tab-pane
+      <!-- <el-tab-pane
         label="线索获取规则"
         :name="20"
         v-if="checkPermi(['clue:setting:clue-get-rules'])"
@@ -23,7 +23,7 @@
         v-if="checkPermi(['clue:setting:clue-send-rules'])"
       >
         <ClueSend v-if="tabIndex == 30" />
-      </el-tab-pane>
+      </el-tab-pane> -->
       <el-tab-pane label="意向状态" :name="35" v-if="checkPermi(['clue:setting:intention-status'])">
         <IntentionStatus v-if="tabIndex == 35" />
       </el-tab-pane>
@@ -47,8 +47,8 @@
 import FieldClue from './Comp/FieldClue.vue'
 import FieldOrder from './Comp/FieldOrder.vue'
 import ClueSource from './Comp/ClueSource.vue'
-import ClueGet from './Comp/ClueGet.vue'
+// import ClueGet from './Comp/ClueGet.vue'
-import ClueSend from './Comp/ClueSend.vue'
+// import ClueSend from './Comp/ClueSend.vue'
 // import MsgSend from './Comp/MsgSend.vue'
 import IntentionStatus from './Comp/IntentionStatus.vue'
 import ExtraFeeType from './Comp/ExtraFeeType.vue'

src/views/Login/components/LoginForm.vue

@@ -143,8 +143,8 @@ const loginData = reactive({
   loginForm: {
     tenantId: undefined,
     instanceId: undefined,
-    username: 'admin',
+    username: '',
-    password: 'admin123',
+    password: '',
     captchaVerification: '',
     rememberMe: true
   }

src/views/MiniMall/Inventory/Comp/InventoryRecord.vue

@@ -59,7 +59,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="num" label="数量" />
-      <el-table-column prop="money" label="金额" />
+      <!-- <el-table-column prop="money" label="金额" /> -->
       <el-table-column prop="changeTime" label="变动时间" :formatter="dateFormatter" />
       <el-table-column prop="changeUserName" label="变动人员" />
       <el-table-column prop="warehouseName" label="所属仓库" />