Merge branch 'mergeBranch' into redUrgent

.idea/misc.xml

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="WebPackConfiguration">
     <option name="mode" value="DISABLED" />
   </component>

src/HDrpManagement/invoicePredictionManage/details/index.vue

@@ -177,6 +177,9 @@
                         tool.formatAmount(scope.column.data.orderinvoamount, 2)
                       }}</span>
                     </div>
+                    <div
+                        v-else-if="scope.column.columnname === 'status'" :style="tool.getStatusColor(scope.column.data[scope.column.columnname])"
+                    >{{scope.column.data[scope.column.columnname]}}</div>
                     <p v-else>
                       {{
                         scope.column.data[scope.column.columnname]

src/HDrpManagement/orderManage/details/index.vue

@@ -421,7 +421,7 @@ export default {
     onSubmit (type) {
       if (type == '提交' && (this.siteid == 'HY' || this.siteid == 'YOSTEST1')){
         this.$refs.dialogRef.dialogVisible = true
-        this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays
+        this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays ? this.mainData.contract_reminddays : 7
       }else {
         this.$confirm(`${this.$t(`是否`)} ${this.$t(type)} ${this.$t(`该订单`)}`, this.$t('提示'), {
           confirmButtonText: this.$t('确定'),

src/HDrpManagement/projectPredictionManage/details/index.vue

@@ -138,6 +138,9 @@
                       tool.formatAmount(scope.column.data.projectamount, 2)
                     }}</span>
                   </div>
+                  <div
+                      v-else-if="scope.column.columnname === 'status'" :style="tool.getStatusColor(scope.column.data[scope.column.columnname])"
+                  >{{scope.column.data[scope.column.columnname]}}</div>
                   <p v-else>
                     {{
                       scope.column.data[scope.column.columnname]

src/HManagement/task/modules/detail.vue

@@ -141,7 +141,7 @@
                     color:
                       mainData.status == '已完成'
                         ? '#999999'
-                        : tool.getStatusColor(that.mainData.status, true),
+                        : tool.getStatusColor(mainData.status, true),
                   }"
                 >
                   {{ mainData.status ? $t(mainData.status) : "--" }}
@@ -318,7 +318,7 @@ export default {
       console.log("权限结果", this.mainData.disabled);
     },
     changeDataStructure() {
-      let that = this;
+      let that = this
       this.mainAreaData = [
         {
           label: this.$t("创建人"),
@@ -348,7 +348,7 @@ export default {
           label: this.$t("状态"),
           value: this.$t(this.mainData.status),
           style: () => {
-            let color = this.mainData.status == '已完成'?'#999':that.tool.getStatusColor(that.mainData.status, true)
+            let color = this.mainData.status == '已完成'?'#999':this.tool.getStatusColor(this.mainData.status, true)
             return { color: color };
           },
         },

src/SDrpManagement/agentOrder/details/index.vue

@@ -459,7 +459,7 @@ export default {
     onSubmit(type) {
       if (type == '提交' && (this.siteid == 'HY' || this.siteid == 'YOSTEST1')){
         this.$refs.dialogRef.dialogVisible = true
-        this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays
+        this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays ? this.mainData.contract_reminddays : 7
       }else {
         this.$confirm(
             this.$t("是否") + `“${this.$t(type)}”` + this.$t("该订单"),

src/SDrpManagement/salerOrder/details/index.vue

@@ -544,7 +544,7 @@ export default {
         });
       if (type == '提交' && (siteid == 'HY' || siteid == 'YOSTEST1')){
         this.$refs.dialogRef.dialogVisible = true
-        this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays
+        this.$refs.dialogRef.form.reminddays = this.mainData.contract_reminddays ? this.mainData.contract_reminddays : 7
       }else {
         this.$confirm(
             this.$t("是否") + `‘${this.$t(type)}’` + this.$t("该订单"),

src/optionSystem/valveOption/DieFa.vue

@@ -185,6 +185,7 @@
           <MyTable
               :height="tableHeight"
               ref="guangtouRef"
+              fixedName="operation"
               :layout="tool.tabelCol($route.name)['guangtouTable'].tablecols"
               :param="guangtouParam"
               :opwidth="200"

src/utils/i18n.js

@@ -35,6 +35,7 @@ api.requested({
     languages = res.data;
     localStorage.setItem('languages', JSON.stringify(languages))
 })
+console.log("locale", localStorage.getItem('lang') )
 // 准备翻译的语言环境信息
 const i18n = new VueI18n({
     locale: localStorage.getItem('lang') || "ZH", //将语言标识存入localStorage或sessionStorage中，页面刷新不会默认中文显示
@@ -44,4 +45,4 @@ const i18n = new VueI18n({
     fallbackLocale: 'ZH', // 指定的locale没有找到对应的资源或当前语种不存在时，默认设置当前语种为中文
 });
 
-export default i18n
+export default i18n

src/views/login/login.vue

@@ -37,14 +37,14 @@
           </el-dropdown>
         </div>
       </div>
-      <div class="login-wrap">
+      <div class="login-wrap" v-if="nowType">
         <div>
           <div class="logo">
             <span> {{ $t("营销管理平台") }}</span
             ><br />
             <small>SALE-MANAGE-SYSTEM</small>
           </div>
-          <div class="login-form">
+          <div class="login-form" v-if="languagename">
             <h4 class="title">{{ $t("登录") }}</h4>
             <el-tabs v-model="activeName">
               <el-tab-pane :label="$t(`账号登录`)" name="first">
@@ -176,9 +176,18 @@ export default {
     this.languagelist();
     try {
       this.languagename = localStorage.getItem("languagename") || "简体中文";
+      this.nowType = localStorage.getItem("lang") || "ZH";
+      console.log('输出预约',this.languagename)
+      console.log(this.nowType)
     } catch (error) {
       this.languagename = "简体中文";
+      this.nowType = "ZH";
     }
+    this.$nextTick(() => {
+      this.$i18n.locale = this.nowType;
+      console.log(this.nowType,'输出')
+    });
+    // this.i18nChangeLanguage(this.nowType)
     /*this.qusetLanguage();*/
   },
   methods: {
@@ -250,7 +259,7 @@ export default {
         if (flag === 1) {
           this.checked
             ? localStorage.setItem("phonenumber", this.loginForm.phonenumber)
-            : localStorage.clear("phonenumber");
+            : localStorage.removeItem("phonenumber");
           sessionStorage.setItem(
             "account_list",
             JSON.stringify(res.account_list)
@@ -309,7 +318,7 @@ export default {
         if (flag === 1) {
           this.checked
             ? localStorage.setItem("phonenumber", this.loginForm.phonenumber)
-            : localStorage.clear("phonenumber");
+            : localStorage.removeItem("phonenumber");
           sessionStorage.setItem(
             "account_list",
             JSON.stringify(res.account_list)
@@ -322,12 +331,19 @@ export default {
           sessionStorage.setItem("active_password", res.remindchangepassword);
           this.basicData.query_userauth().then(() => {
             this.basicData.querySite_Parameter();
-            let usertype = JSON.parse(sessionStorage.getItem('active_account')).usertype
-            let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
-            if ((usertype == 1 || usertype == 0) && (siteid == 'HY' || siteid == 'YOSTEST1') ){
-              sessionStorage.setItem('isFull','1')
-              this.$router.push('/serviceDataScreen')
-            }else {
+            let usertype = JSON.parse(
+              sessionStorage.getItem("active_account")
+            ).usertype;
+            let siteid = JSON.parse(
+              sessionStorage.getItem("active_account")
+            ).siteid;
+            if (
+              (usertype == 1 || usertype == 0) &&
+              (siteid == "HY" || siteid == "YOSTEST1")
+            ) {
+              sessionStorage.setItem("isFull", "1");
+              this.$router.push("/serviceDataScreen");
+            } else {
               this.$router.push({ path: "/main" });
             }
             this.getAccountInfo();
@@ -367,7 +383,27 @@ export default {
       localStorage.setItem("lang", type);
       this.$nextTick(() => {
         this.$i18n.locale = type;
-        // location.reload();
+
+        this.rules = {
+          phonenumber: [
+            { required: true, message: this.$t("请输入账号"), trigger: "blur" },
+          ],
+          password: [
+            {
+              required: true,
+              message: this.$t("请输入验证码"),
+              trigger: "blur",
+            },
+          ],
+        };
+        this.rules2 = {
+          phonenumber: [
+            { required: true, message: this.$t("请输入账号"), trigger: "blur" },
+          ],
+          password: [
+            { required: true, message: this.$t("请输入密码"), trigger: "blur" },
+          ],
+        };
       });
       this.languagename =
         this.langusge.find((v) => v.languagecode == this.nowType)

src/views/mediaStatistics/modules/boxBorder.vue

@@ -2,7 +2,26 @@
   <div class="box-border-style" :style="{height:height}">
     <div :style="{padding:class1}">
       <div style="display: flex;justify-content: space-between">
-        <div class="font-color-style-black font-class-bold mt-5">{{$t(title)}}</div>
+        <div style="display: flex;justify-content: left">
+          <div class="font-color-style-black font-class-bold mt-5">{{$t(title)}}</div>
+          <div style="margin-left: 5px;margin-top: 2px">
+            <el-tooltip v-if="titleTip" effect="dark" placement="top-start" >
+              <div slot="content">
+                {{
+                  $t(
+                      '预计成交金额 = 预计签约金额 × 项目成交率'
+                  )
+                }}
+              </div>
+              <!--        <i class="el-icon-question" style="color: #afb0be;float: right"></i>-->
+              <img
+                  width="14px"
+                  height="14px"
+                  src="../../../assets/icons/prompt_icon.svg"
+              />
+            </el-tooltip>
+          </div>
+        </div>
         <slot name="select"></slot>
       </div>
       <slot name="content"></slot>
@@ -17,7 +36,8 @@ export default {
   props:{
     title:String,
     class1:String,
-    height:String
+    height:String,
+    titleTip:Boolean
   }
 }
 </script>

src/views/mediaStatistics/modules/futureTwelveMonths.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
-    <boxBorder title="未来12月项目预计签约金额/预计成交金额分析" class1="20px 20px" height="282px">
+    <boxBorder title="未来12月项目预计签约金额/预计成交金额分析" class1="20px 20px" :height="height + 'px'" :titleTip="true">
       <template slot="select">
         <div>
           <label class="search__label">{{$t(`项目阶段`)}}：</label>
-          <el-select v-model="stagename" multiple placeholder="请选择" size="small" @focus="getStage" @change="selectStage" filterable style="width: 370px">
+          <el-select ref="selectRef" v-model="stagename" multiple :placeholder="$t(`请选择`)"  size="small" @focus="getStage" @change="selectStage"  filterable >
             <el-option
                 v-for="item in stagenameList"
                 :key="item.stagename"
@@ -15,22 +15,7 @@
         </div>
       </template>
       <template slot="charts">
-        <el-tooltip effect="dark" placement="top-start" style="margin-top: 3px;margin-left:275px;position: relative;z-index: 50">
-          <div slot="content">
-            {{
-              $t(
-                  '预计成交金额 = 预计签约金额 × 项目成交率'
-              )
-            }}
-          </div>
-          <!--        <i class="el-icon-question" style="color: #afb0be;float: right"></i>-->
-          <img
-              width="14px"
-              height="14px"
-              src="../../../assets/icons/prompt_icon.svg"
-          />
-        </el-tooltip>
-        <div ref="chartRef" style="height: 220px;margin-top: -25px;position: relative;z-index: 20">
+        <div ref="chartRef" style="height: 220px;">
         </div>
       </template>
     </boxBorder>
@@ -50,7 +35,9 @@ export default {
       chartMap:[],
       chartMapData:[],
       stagename:[],
-      stagenameList:[]
+      stagenameList:[],
+      selectHeight:null,
+      height:282
     }
   },
   methods:{
@@ -61,20 +48,23 @@ export default {
         if (num == index){
           this.chartMapData[indexNew] = {
             "signdate_due":item.signdate_due,
-            "value":Math.round(this.tool.unitConversion(item.signamount_due,10000) * 100)/100,
-            "name":this.$t('预计签约金额(万)')
+            "value":Math.round(this.tool.unitConversion(item.signamount_due,10000)),
+            "name":this.$t('预计签约金额')+ this.$t('(万)')
           }
           indexNew = indexNew + 1
           this.chartMapData[indexNew] = {
             "signdate_due":item.signdate_due,
-            "value":Math.round(this.tool.unitConversion(item.dealamount_due,10000) * 100)/100,
-            "name":this.$t('预计成交金额(万)')
+            "value":Math.round(this.tool.unitConversion(item.dealamount_due,10000)),
+            "name":this.$t('预计成交金额') + this.$t('(万)')
           }
           indexNew = indexNew + 1
           index = index + 1
         }
       })
       console.log(this.chartMapData,'chartMapData')
+      console.log(this.$refs.selectRef.$el.clientHeight,'高度&&&&&&&高度')
+      this.height = 282
+      this.height = this.height + (this.$refs.selectRef.$el.clientHeight -32)
       if (init){
         this.chartMap = new Column(this.$refs.chartRef,{
           color:['#3874F6','#F29C37'],
@@ -102,14 +92,14 @@ export default {
               fontSize:12
             },
             formatter: (datum) =>{
-              return '¥' + this.tool.formatAmount(datum.value,2)
+              return '¥' + this.tool.formatAmount(datum.value,0)
             }
           },
           tooltip: {
             formatter: (datum) => {
               return {
                 name:datum.name,
-                value:'¥' + this.tool.formatAmount(datum.value,2)
+                value:'¥' + this.tool.formatAmount(datum.value,0)
               }
             }
           }
@@ -140,8 +130,9 @@ export default {
     selectStage(){
       console.log(this.stagename,'阶段名称')
       this.$emit('selectStage',this.stagename)
-    }
-  }
+
+    },
+  },
 }
 </script>
 

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -868,7 +868,7 @@ export default {
             title2:'金额',
             value2:this.tool.formatAmount(this.tool.unitConversion(res.data.positiveOffsetAmount,10000),2),
             unit2:'万元',
-            description:'依据：每个项目的偏差金额 = 项目成交金额 - 预计签约金额' + '\n' + ' ①项目：合计偏差金额为正数的项目数量' + '\n' + ' ②金额：合计每个项目的正数偏差金额',
+            description:this.$t('依据：每个项目的偏差金额 = 项目成交金额 - 预计签约金额') + '\n ①' + this.$t('项目：合计偏差金额为正数的项目数量') + '\n ②' + this.$t('金额：合计每个项目的正数偏差金额'),
             color:'#E6A23C'
           },
           {
@@ -893,7 +893,7 @@ export default {
             title2:'金额',
             value2:this.tool.formatAmount(this.tool.unitConversion(res.data.negativeOffsetAmount,10000),2),
             unit2:'万元',
-            description:'依据：每个项目的偏差金额 = 项目成交金额 - 预计签约金额' + '\n' + ' ①项目：合计偏差金额为负数的项目数量' + '\n' + ' ②金额：合计每个项目的负数偏差金额',
+            description:this.$t('依据：每个项目的偏差金额 = 项目成交金额 - 预计签约金额') + '\n ①' + this.$t('项目：合计偏差金额为负数的项目数量') + '\n ②' + this.$t('金额：合计每个项目的负数偏差金额'),
             color:'#E6A23C'
           },
           {
@@ -914,7 +914,7 @@ export default {
             title:'预计成交准确率',
             value:Math.round((res.data.rightRate * 100)*100)/100,
             unit:'%',
-            description:'依据：偏差率 = |（项目成交金额 - 预计签约金额）| ÷ 预计签约金额 × 100%' + '\n' + ' 预计成交准确率 = 偏差率≤15%的项目数 ÷ 成交项目数 × 100%',
+            description:this.$t('依据：偏差率 = |（项目成交金额 - 预计签约金额）| ÷ 预计签约金额 × 100%') + '\n ' + this.$t('预计成交准确率 = 偏差率≤15%的项目数 ÷ 成交项目数 × 100%'),
             color:'#E6A23C'
           },
         ]