sc

4 weeks ago · e44b80966a
parent 36ce6fc87b
commit e44b80966a
4 changed files with 99 additions and 14 deletions
--- a/src/views/Clue/Order/Comp/AfterSales.vue
+++ b/src/views/Clue/Order/Comp/AfterSales.vue
@ -1,7 +1,15 @@
 <template>
  <div>
    <el-form :model="searchForm" label-width="0" inline>
-      <el-form-item>
+      <template v-if="appStore.getAppInfo?.instanceType == 2">
+        <el-form-item>
+          <el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
+        </el-form-item>
+      </template>
+      <el-form-item v-else>
        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
      </el-form-item>
      <el-form-item>
@ -115,7 +123,25 @@
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="55" :selectable="(row) => row.state == 1" />
-      <el-table-column prop="signId" label="成交单号" min-width="150px" />
+      <!-- <el-table-column prop="signId" label="成交单号" min-width="150px" /> -->
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="signId"
+        label="成交单号"
+        min-width="120px"
+      />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 2"
+        prop="signOrderId"
+        label="成交单号"
+        min-width="120px"
+      />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 2"
+        prop="signId"
+        label="子订单号"
+        min-width="120px"
+      />
      <el-table-column prop="name" label="线索名称" min-width="150px" />
      <el-table-column prop="phone" label="联系方式" min-width="120px" />
      <el-table-column
@ -229,6 +255,7 @@ const searchForm = ref({
  createDate: [],
  createUser: undefined,
  checkTime: [],
+  signOrderId: undefined,
  pageNo: 1,
  pageSize: 20
 })
@ -253,6 +280,7 @@ function handleReset() {
    createDate: [],
    createUser: undefined,
    checkTime: [],
+    signOrderId: undefined,
    pageNo: 1,
    pageSize: 20
  }
--- a/src/views/Clue/Order/Comp/Delivery.vue
+++ b/src/views/Clue/Order/Comp/Delivery.vue
@ -2,7 +2,10 @@
  <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.signOrderId" placeholder="成交单号" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
      </el-form-item>
      <el-form-item>
        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
@ -67,7 +70,8 @@
    </el-form>

    <el-table v-loading="loading" :data="tableList" border>
-      <el-table-column prop="signId" label="成交单号" min-width="120px" />
+      <el-table-column prop="signOrderId" label="成交单号" min-width="120px" />
+      <el-table-column prop="signId" label="子订单号" min-width="120px" />
      <el-table-column prop="name" label="线索名称" min-width="120px" />
      <el-table-column prop="phone" label="联系方式" width="120px" />
      <el-table-column prop="signUserName" label="登记人" min-width="90" />
@ -120,6 +124,7 @@ import { dateFormatter } from '@/utils/formatTime'

 const searchForm = ref({
  signId: undefined,
+  signOrderId: undefined,
  name: undefined,
  dealDate: [],
  signUser: undefined,
@ -142,6 +147,7 @@ function handleSearch() {
 function handleReset() {
  searchForm.value = {
    signId: undefined,
+    signOrderId: undefined,
    name: undefined,
    dealDate: [],
    signUser: undefined,
--- a/src/views/Clue/Order/Comp/MallSettle.vue
+++ b/src/views/Clue/Order/Comp/MallSettle.vue
@ -1,13 +1,16 @@
 <template>
  <div>
    <el-form :model="searchForm" label-width="0" inline>
-      <el-form-item>
-        <el-input
-          v-model="searchForm.signId"
-          placeholder="成交单号"
-          clearable
-          style="width: 120px"
-        />
+      <template v-if="appStore.getAppInfo?.instanceType == 2">
+        <el-form-item>
+          <el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
+        </el-form-item>
+      </template>
+      <el-form-item v-else>
+        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
      </el-form-item>
      <el-form-item>
        <el-input v-model="searchForm.name" placeholder="线索名称" clearable style="width: 120px" />
@ -152,7 +155,24 @@
        fixed="left"
        :selectable="(row) => row.settlementState == '待结算'"
      />
-      <el-table-column prop="signId" label="成交单号" min-width="120px" />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="signId"
+        label="成交单号"
+        min-width="120px"
+      />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 2"
+        prop="signOrderId"
+        label="成交单号"
+        min-width="120px"
+      />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 2"
+        prop="signId"
+        label="子订单号"
+        min-width="120px"
+      />
      <el-table-column prop="name" label="线索名称" min-width="120px" />
      <el-table-column prop="phone" label="联系方式" width="120px" />
      <el-table-column prop="signUserName" label="登记人" min-width="90" />
@ -280,8 +300,10 @@ import * as SettleApi from '@/api/clue/settle'
 import { getSupplierSimpleList } from '@/api/school/setting/supplier'
 import { removeNullField } from '@/utils/index'
 import { dateFormatter, formatDate } from '@/utils/formatTime'
+import { useAppStore } from '@/store/modules/app'

 const message = useMessage() // 消息弹窗
+const appStore = useAppStore()

 onMounted(() => {
  getOptions()
@ -297,6 +319,7 @@ const searchForm = ref({
  signProduct: undefined,
  signSpecs: undefined,
  signId: undefined,
+  signOrderId: undefined,
  settlementState: 0,
  settlementType: undefined,
  supplier: undefined,
@ -314,6 +337,7 @@ function handleReset() {
    signProduct: undefined,
    signSpecs: undefined,
    signId: undefined,
+    signOrderId: undefined,
    settlementState: 0,
    settlementType: undefined,
    supplier: undefined,
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@ -1,7 +1,15 @@
 <template>
  <div>
    <el-form :model="searchForm" label-width="0" inline>
-      <el-form-item>
+      <template v-if="appStore.getAppInfo?.instanceType == 2">
+        <el-form-item>
+          <el-input v-model="searchForm.signOrderId" placeholder="成交单号" clearable />
+        </el-form-item>
+        <el-form-item>
+          <el-input v-model="searchForm.signId" placeholder="子订单号" clearable />
+        </el-form-item>
+      </template>
+      <el-form-item v-else>
        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
      </el-form-item>
      <el-form-item>
@ -208,7 +216,24 @@
      @selection-change="handleSelectionChange"
    >
      <el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
-      <el-table-column prop="signId" label="成交单号" min-width="120px" />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="signId"
+        label="成交单号"
+        min-width="120px"
+      />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 2"
+        prop="signOrderId"
+        label="成交单号"
+        min-width="120px"
+      />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 2"
+        prop="signId"
+        label="子订单号"
+        min-width="120px"
+      />
      <el-table-column prop="name" label="线索名称" width="120px" />
      <el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
      <el-table-column prop="money" label="回款金额" min-width="120px">
@ -439,6 +464,7 @@ const currentUserId = userStore.getUser.id

 const searchForm = ref({
  signId: undefined,
+  signOrderId: undefined,
  name: undefined,
  state: undefined,
  dealDate: [],
@ -472,6 +498,7 @@ function handleSearch() {
 function handleReset() {
  searchForm.value = {
    signId: undefined,
+    signOrderId: undefined,
    receiver: undefined,
    convertPeople: undefined,
    name: undefined,