问题修改

src/api/pages/pur/pur-order.js

@@ -25,6 +25,6 @@ export const routeUrl = {
     //订单转入库
     intoEnter:{key:'intoEnter',routeName:'pur-enter-add',chooseFlag:true},
     //采购跟踪
-    track:{key:'track',routeName:'pur-track-report',chooseFlag:true},
+    purTrack:{key:'purTrack',routeName:'pur-track-report',chooseFlag:true},
   }
 }

src/locale/lang/zh-CN.js

@@ -86,6 +86,9 @@ export const button = {
   logout: '退出登录',
   cancel: '取消',
   check: '查看',
+  follow:'跟进',
+  reception:'接待',
+  measuringStickReceipt:'量尺回执',
   orderOut: '销售出库',
   orderOutReturn: '销售退货',
   outReturn: '出库退货',
@@ -625,6 +628,7 @@ export const columns = {
   purPay:'付款单',
   BillInformation:'账单信息',
   orderTrack:'销售跟踪',
+  purTrack:'采购跟踪',
   totalOrderAmount:'订货总额',
   amtShould:'应收总额',
   amtRecTotal:'收款总额',

src/view/fin/fund-report/index.vue

@@ -1,3 +1,4 @@
+<!-- @desc:资金日记账  @auth:常皓宁  @time:2024/4/26 15:15 -->
 <template>
   <div class="main-div">
     <BaseIndexButtonGroup id="BaseIndexButtonGroup">
@@ -26,6 +27,7 @@
                :page-total="pageInfo.total"
                :current-page="pageInfo.currentPage"
                ref="table-select"
+               :sortable="false"
                :showCheckboxHeader="false"
                :choose-flag="false">
         <DkTableColumn field="macname"></DkTableColumn>

src/view/mst/cus-follow/index.vue

@@ -7,7 +7,6 @@
         <BaseIndexButton ref="search" name="search"></BaseIndexButton>
         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
         <BaseIndexButton ref="follow" name="follow" :isMustChooseFlag="false"></BaseIndexButton>
-        <BaseIndexButton ref="followTask" name="followTask" :isMustChooseFlag="false"></BaseIndexButton>
         <BaseIndexButton ref="reception" name="reception" :isMustChooseFlag="false"></BaseIndexButton>
         <BaseIndexButton ref="measuringStickReceipt" name="measuringStickReceipt"
                          :isMustChooseFlag="false"></BaseIndexButton>
@@ -78,7 +77,7 @@
     </card>
 
     <!--    接待-->
-    <DkModal v-model="receptionModal" :title="$t('reception2')" width="1000px" ref="modal_reception"
+    <DkModal v-model="receptionModal" :title="$t('reception')" width="1000px" ref="modal_reception"
              @on-cancel="cancelReception"
              @modalOk="submitReception"
              @modalCancel="cancelReception"
@@ -373,53 +372,6 @@ export default {
           valueFormat: {code: 'contactPhones'},
           valueKind: 'STR'
         },
-        {
-          valueFormat: {code: 'followTime'},
-          valueKind: 'DATE_RANGE'
-        },
-        {
-          valueFormat: {code: 'nextFollowTime'},
-          valueKind: 'DATE_RANGE'
-        },
-        {
-          valueFormat: {code: 'reportUserName'},
-          valueKind: 'STR'
-        },
-        {
-          valueFormat: {code: 'followCount'},
-          valueKind: 'STR'
-        },
-        {
-          valueFormat: {
-            code: 'customerFromList',
-            data: [],
-            valueKey: 'fromId',
-            labelKey: 'fromName',
-          },
-          valueKind: 'M-CHOICE'
-        },
-        {
-          valueFormat: {
-            code: 'customerTags',
-            data: [],
-            valueKey: 'tagId',
-            labelKey: 'tagName',
-          },
-          valueKind: 'M-CHOICE'
-        },
-        {
-          valueFormat: {
-            code: 'intentionTags',
-            data: [],
-            valueKey: 'dataCode',
-            labelKey: 'dataName',
-          },
-          valueKind: 'M-CHOICE'
-        },
-        {
-          valueFormat: {code: 'intentionQuantity'},
-          valueKind: 'STR'
-        },
       ],
       tableData: [],
       tabsModel: self.$t('allReceipt'),

src/view/mst/customer/index.vue

@@ -9,7 +9,6 @@
         <BaseIndexButton ref="clear" name="clear"></BaseIndexButton>
         <BaseIndexButton ref="edit" name="edit"></BaseIndexButton>
         <BaseIndexButton ref="check" name="check" :isMustChooseFlag="false"></BaseIndexButton>
-        <BaseIndexButton ref="followTask" name="followTask" :isMustChooseFlag="false"></BaseIndexButton>
       </template>
       <template #right>
         <BaseIndexButton ref="add" name="add"></BaseIndexButton>
@@ -37,25 +36,8 @@
         <DkTableColumn field="channelName"></DkTableColumn>
         <DkTableColumn field="addressFull"></DkTableColumn>
         <DkTableColumn field="contactName"></DkTableColumn>
-        <DkTableColumn field="contactPhones"></DkTableColumn>
+        <DkTableColumn field="contactPhone"></DkTableColumn>
         <DkTableColumn field="orgName"></DkTableColumn>
-        <DkTableColumn field="intentionTagsName"></DkTableColumn>
-        <DkTableColumn field="customerClassifiedName" title="客户分类"></DkTableColumn>
-        <DkTableColumn field="intentionQuantityTag"></DkTableColumn>
-        <DkTableColumn field="saleStatusName"></DkTableColumn>
-        <DkTableColumn field="customerTagNames"></DkTableColumn>
-        <DkTableColumn field="opCreateTime"></DkTableColumn>
-        <DkTableColumn field="nextFollowPlan"></DkTableColumn>
-        <DkTableColumn field="nextFollowTime"></DkTableColumn>
-        <DkTableColumn field="reportUserName"></DkTableColumn>
-        <DkTableColumn field="followCount" :digits="0"></DkTableColumn>
-        <DkTableColumn field="customerFromName"></DkTableColumn>
-        <DkTableColumn field="toiletCountName"></DkTableColumn>
-        <DkTableColumn field="fitupTypeName"></DkTableColumn>
-        <DkTableColumn field="houseTypeName"></DkTableColumn>
-        <DkTableColumn field="fitupStyleName"></DkTableColumn>
-        <DkTableColumn field="ageCompositionName"></DkTableColumn>
-        <DkTableColumn field="decisionMakerName"></DkTableColumn>
         <DkTableColumn field="remarks"></DkTableColumn>
       </DkTable>
     </card>
@@ -72,18 +54,6 @@
             :intention-list="intentionList" :invite-result-list="inviteResultList" :follow-type-list="followTypeList"
             ref="modal_follow"
     ></Follow>
-
-
-    <!--    导入-->
-    <Upload v-show="false"
-            :headers="{Authorization: 'Bearer ' + $store.state.user.token}"
-            :action="this.$config.serviceUrl + '/customer-server/sale/customer/import'"
-            accept=".xls, .xlsx" :on-success="uploadSuccess"
-    >
-      <Button ref="uploadButton">
-      </Button>
-    </Upload>
-
   </div>
 </template>
 
@@ -150,88 +120,9 @@ export default {
           valueKind: 'STR'
         },
         {
-          valueFormat: {code: 'contactPhones'},
-          valueKind: 'STR'
-        },
-        {
-          itemName: 'opCreateTime',
-          valueFormat: {
-            code: 'opCreateTime',
-            default: [new Date().addMonths(-1).format('yyyy-MM-dd'), new Date().format('yyyy-MM-dd')]
-          },
-          valueKind: 'DATE_RANGE'
-        },
-        {
-          valueFormat: {code: 'reportUserName'},
+          valueFormat: {code: 'contactPhone'},
           valueKind: 'STR'
         },
-        {
-          valueFormat: {code: 'followCount'},
-          valueKind: 'STR'
-        },
-        {
-          valueFormat: {
-            code: 'customerFromList',
-            data: [],
-            valueKey: 'fromId',
-            labelKey: 'fromName',
-          },
-          valueKind: 'M-CHOICE'
-        },
-        {
-          valueFormat: {
-            code: 'customerTags',
-            data: [],
-            valueKey: 'tagId',
-            labelKey: 'tagName',
-          },
-          valueKind: 'M-CHOICE'
-        },
-        {
-          valueFormat: {
-            code: 'intentionTags',
-            data: [],
-            valueKey: 'dataCode',
-            labelKey: 'dataName',
-          },
-          valueKind: 'M-CHOICE'
-        },
-        {
-          itemName: self.$t('intentionQuantityTag'),
-          valueFormat: {code: 'intentionQuantity'},
-          valueKind: 'STR'
-        },
-        {
-          valueFormat: {code: 'addressFull'},
-          valueKind: 'STR'
-        },
-        {
-          valueFormat: {
-            code: 'channelList',
-            data: [],
-            valueKey: 'channelId',
-            labelKey: 'channelName',
-          },
-          valueKind: 'M-CHOICE'
-        },
-        {
-          valueFormat: {
-            code: 'neverFollowFlag',
-            data: [
-              {label: self.$t('yes'), value: 'true'}, {label: self.$t('no'), value: 'false'}
-            ],
-          },
-          valueKind: 'RADIO'
-        },
-        {
-          valueFormat: {
-            code: 'overFollowTimeFlag',
-            data: [
-              {label: self.$t('yes'), value: 'true'}, {label: self.$t('no'), value: 'false'}
-            ],
-          },
-          valueKind: 'RADIO'
-        },
       ],
       tableData: [],
       tabsModel: self.$t('potentialCus'),

src/view/pur/pur-order/index.vue

@@ -15,7 +15,7 @@
         <!--打印-->
         <BaseIndexButton ref="print" name="print"></BaseIndexButton>
         <!--采购跟踪-->
-        <BaseIndexButton ref="track" name="track"></BaseIndexButton>
+        <BaseIndexButton ref="purTrack" name="purTrack"></BaseIndexButton>
       </template>
       <template #right>
         <BaseIndexButton ref="add" name="add"></BaseIndexButton>