Browse Source

数据面板,日期查询默认值调整为本年;bug修复

qymljy 8 months ago
parent
commit
dd4530163a

+ 1 - 1
src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue

@@ -16,7 +16,7 @@
           idName="sa_itemgroupmxid"
           type="del"
       ></uploadAllData>
-      <label class="search__label">{{$t('搜索555') + ':' }}</label>
+      <label class="search__label">{{$t('搜索') + ':' }}</label>
       <el-input
           size="small"
           style="width: 200px"

+ 10 - 10
src/HDrpManagement/customerData/index.vue

@@ -1233,7 +1233,7 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
           "dataid": '',
-          "dateType":"全部",
+          "dateType":"本年",
           "where":{
             "begdate":"",
             "enddate":"",
@@ -1249,7 +1249,7 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "pageSize":20,
           "pageNumber":1,
-          "dateType":"全部",
+          "dateType":"本年",
           "where": {
               "customerstype":"",// 客户各种类型 以及 无类型  ------ 客户类型情况统计列表使用该字段
               "begdate":"",
@@ -1272,7 +1272,7 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
           "dataid": '',
-          "dateType":"全部",
+          "dateType":"本年",
           "where":{
             "begdate":"",
             "enddate":"",
@@ -1288,7 +1288,7 @@ export default {
           "pageSize":20,
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "pageNumber":1,
-          "dateType":"全部",
+          "dateType":"本年",
           "where": {
               "grade": "", // 1 2 3 4 5 无等级  ------客户等级统计列表使用该字段
               "begdate":"",
@@ -1311,7 +1311,7 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
           "dataid": '',
-          "dateType":"全部",
+          "dateType":"本年",
           "where":{
             "begdate":"",
             "enddate":"",
@@ -1327,7 +1327,7 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "pageSize":20,
           "pageNumber":1,
-          "dateType":"全部",
+          "dateType":"本年",
           "where": {
               "iscontacts": "", //无联系人 有联系人  ------客户联系人情况统计列表使用该字段
               "begdate":"",
@@ -1350,7 +1350,7 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
           "dataid": '',
-          "dateType":"全部",
+          "dateType":"本年",
           "where":{
             "begdate":"",
             "enddate":"",
@@ -1366,7 +1366,7 @@ export default {
           "pageSize":20,
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "pageNumber":1,
-          "dateType":"全部",
+          "dateType":"本年",
           "where": {
               "isproject": "", //无关联项目 有关联项目  ------客户关联项目情况统计列表使用该字段
               "begdate":"",
@@ -1389,7 +1389,7 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "type": '',
           "dataid": '',
-          "dateType":"全部",
+          "dateType":"本年",
           "where":{
             "begdate":"",
             "enddate":"",
@@ -1405,7 +1405,7 @@ export default {
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "pageSize":20,
           "pageNumber":1,
-          "dateType":"全部",
+          "dateType":"本年",
           "where": {
               "isfollowup": "", // 有跟进 无跟进------客户跟进情况统计列表使用该字段
               "begdate":"",

+ 1 - 1
src/HDrpManagement/orderManage/details/index.vue

@@ -94,7 +94,7 @@
       <div slot="slot0">
         <product-list @select="select" @onSuccess="queryMainData()" :data="mainData"  ref="prod">
           <div slot="operation">
-            <importFile ref="importFile" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :ordertype="mainData.type" :errorUrl="errorUrl" @clearUrl="errorUrl = null" @onSuccess="bindImportOrder"></importFile>
+            <importFile v-if="mainData.status !== '提交' && mainData.status !== '审核' && mainData.status !== '关闭'" ref="importFile" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :ordertype="mainData.type" :errorUrl="errorUrl" @clearUrl="errorUrl = null" @onSuccess="bindImportOrder"></importFile>
             <changeOrderMx v-if="mainData.status === '审核'" :tableData="selection" class="inline-16" :data="mainData" @onSuccess="$refs['prod'].listData();queryMainData"></changeOrderMx>
             <el-button :disabled="mainData.status !== '审核' || selection.length === 0"  size="small" type="primary" style="margin-bottom:12px" @click="adddispatch">{{$t(`一键发货`)}}</el-button>
           </div>

+ 12 - 12
src/HDrpManagement/projectData/index.vue

@@ -1841,7 +1841,7 @@ export default {
           "type": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "dataid": '',
-          "dateType":'全部',
+          "dateType":'本年',
           "where":{
               "projecttype":"",
               "begdate":"",
@@ -1857,7 +1857,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":'全部',
+          "dateType":'本年',
           "where": {
               // "isfollowup": "", // 有跟进 无跟进 ------项目跟进情况统计列表使用该字段
               // "grade": "", //  项目等级统计列表使用该字段
@@ -1884,7 +1884,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":'全部',
+          "dateType":'本年',
           "where":{
               "grade":"",
               "begdate":"",
@@ -1900,7 +1900,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":'全部',
+          "dateType":'本年',
           "where": {
               "grade": "", //  项目等级统计列表使用该字段
               "begdate":"",
@@ -2023,7 +2023,7 @@ export default {
           "type": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "dataid": '',
-          "dateType":'全部',
+          "dateType":'本年',
           // "enddate":`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`,
           "where":{
               "grade":"",
@@ -2040,7 +2040,7 @@ export default {
           "type": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
           "dataid": '',
-          "dateType":'全部',
+          "dateType":'本年',
           "where": {
               "isfollowup": "", // 有跟进 无跟进 ------项目跟进情况统计列表使用该字段
               "begdate":"",
@@ -2062,7 +2062,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":'全部',
+          "dateType":'本年',
           "where":{
               "grade":"",
               "begdate":"",
@@ -2078,7 +2078,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":'全部',
+          "dateType":'本年',
           "where": {
               "iscontacts": "", //无联系人 有联系人  ------项目联系人情况统计列表使用该字段
               "begdate":"",
@@ -2100,7 +2100,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":"全部",
+          "dateType":"本年",
           "where":{
               "iscustomers":"",
               "begdate":"",
@@ -2116,7 +2116,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":"全部",
+          "dateType":"本年",
           "where": {
               "iscustomers": "", //无关联客户 有关联客户  ------项目关联客户情况统计列表使用该字段
               "begdate":"",
@@ -2138,7 +2138,7 @@ export default {
           "type": '',
           "dataid": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":"全部",
+          "dateType":"本年",
           "where":{
               "istask":"",
               "begdate":"",
@@ -2153,7 +2153,7 @@ export default {
         "content": {
           "type": '',
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":"全部",
+          "dateType":"本年",
           "dataid": '',
           "where": {
               "istask":"",// 有评估记录 无评估记录  ------ 项目评估情况统计列表使用该字段

+ 1 - 1
src/HDrpManagement/salerpriceData/modules/customerType.vue

@@ -110,7 +110,7 @@
       return {
         chartPie:null,
         type:'金额',
-        dateType:'全部',
+        dateType:'本年',
         monthDate:[],
         list:[],
         tablecols:[],

+ 1 - 1
src/HDrpManagement/salerpriceData/modules/phoneType.vue

@@ -110,7 +110,7 @@
       return {
         chartPie:null,
         type:'金额',
-        dateType:'全部',
+        dateType:'本年',
         monthDate:[],
         list:[],
         tablecols:[],

+ 1 - 1
src/HDrpManagement/salerpriceData/modules/projectType.vue

@@ -110,7 +110,7 @@
       return {
         chartPie:null,
         type:'金额',
-        dateType:'全部',
+        dateType:'本年',
         monthDate:[],
         list:[],
         tablecols:[],

+ 1 - 1
src/HDrpManagement/salerpriceData/modules/salerType.vue

@@ -110,7 +110,7 @@
       return {
         chartPie:null,
         type:'金额',
-        dateType:'全部',
+        dateType:'本年',
         monthDate:[],
         list:[],
         tablecols:[],

+ 1 - 1
src/HManagement/clueManage/clue_private/modules/add.vue

@@ -334,7 +334,7 @@ export default {
           { required: true, message: this.$t('请选择领域'), trigger: 'change'}
         ],
         contactsrole:[
-          {required: false,pattern:/^[\u4e00-\u9fa5]{0,}$/g, message: $t('请输入中文'), trigger: 'blur'}
+          {required: false,pattern:/^[\u4e00-\u9fa5]{0,}$/g, message: this.$t('请输入中文'), trigger: 'blur'}
         ],
         scale:[
           {required: false,pattern:/^\d+(.\d{1,2})?$/, message: this.$t('请输入数字值'), trigger: 'blur'}

+ 1 - 1
src/HManagement/clueManage/clue_rule/modules/setRule.vue

@@ -20,7 +20,7 @@
                   @change="updateOrderclueruleMain">
                 </el-switch>
               </div>
-              <div style="margin-top:10px">
+              <div style="margin-top:20px;display: flex;justify-content: left">
                 <el-radio class="normal-margin" :disabled="!form.autodistribution">{{ $t('默认按业务员指定负责省市县分配') }}</el-radio>
                 <el-radio-group v-model="radio" :disabled="!form.autodistribution" @change="radioChange">
                   <el-radio class="normal-margin" label="distributionbyagentaddress">{{ $t('按经销商档案属地省市县分配') }}</el-radio>

+ 2 - 2
src/views/salesData/modules/orderProductCategory.vue

@@ -142,8 +142,8 @@ export default {
     return {
       chartPie:null,
       type:'金额',
-      dateType:'全部',
-      monthDate:[],
+      dateType:'本年',
+      monthDate:[new Date().getFullYear() + '-1',new Date().getFullYear() + '-12'],
       list:[],
       tablecols:[],
       currentPage:0,

+ 6 - 6
src/views/salesData/modules/orderType.vue

@@ -4,7 +4,7 @@
       <div class="out">
         <div>
           <div class="div-line div-line-right"></div>
-          <div class="title" style="min-width: 220px;"> 订单类型占比分析</div>
+          <div class="title" style="min-width: 220px;"> {{$t(`订单类型占比分析`)}}</div>
         </div>
         <div class="in">
           <div class="inline-16 mt-10">
@@ -19,15 +19,15 @@
           </div>
           <div class="inline-16 mt-10">
             <el-button-group >
-              <el-button size="small" :type="type === '金额'?'primary':''" @click="changeType('金额')">金额</el-button>
-              <el-button size="small" :type="type === '数量'?'primary':''" @click="changeType('数量')">数量</el-button>
+              <el-button size="small" :type="type === '金额'?'primary':''" @click="changeType('金额')">{{$t(`金额`)}}</el-button>
+              <el-button size="small" :type="type === '数量'?'primary':''" @click="changeType('数量')">{{$t(`数量`)}}</el-button>
             </el-button-group>
           </div>
           <div class="inline-16 mt-10">
             <el-button-group >
               <el-button size="small" :type="dateType === '全部'?'primary':''" @click="changeTypeDate('全部')">{{$t(`全部`)}}</el-button>
               <el-button size="small" :type="dateType === '本年'?'primary':''" @click="changeTypeDate('本年')">{{$t(`本年`)}}</el-button>
-              <el-button size="small" :type="dateType === '本月'?'primary':''" @click="changeTypeDate('本月')">本月</el-button>
+              <el-button size="small" :type="dateType === '本月'?'primary':''" @click="changeTypeDate('本月')">{{$t(`本月`)}}</el-button>
             </el-button-group>
           </div>
           <div class="inline-16 mt-10">
@@ -109,8 +109,8 @@ export default {
     return {
       chartPie:null,
       type:'金额',
-      dateType:'全部',
-      monthDate:[],
+      dateType:'本年',
+      monthDate:[new Date().getFullYear() + '-1',new Date().getFullYear() + '-12'],
       list:[],
       tablecols:[],
       currentPage:0,