Merge branch 'mergeBranch' into greenUrgent

src/HDrpManagement/customerData/index.vue

@@ -1140,7 +1140,7 @@ export default {
   components:{borderTemp,pageTable,FullScroll,exportFile,btnSelect,dataDetail},
   data () {
     return {
-      dateType:'全部',
+      dateType:'本年',
       isFull:false,
       deplist:[],
       personnelList:[],
@@ -1464,7 +1464,7 @@ export default {
           "dataid": '',
           "type":"",
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":'',
+          "dateType":'本年',
           "where":{
             "isleave":"1"
           }

src/HDrpManagement/orderManage/details/tabs/table.vue

@@ -7,10 +7,10 @@
           type="selection"
           width="35" fixed v-if="checkbox">
       </el-table-column>
-      <el-table-column 
-        v-for="(col,index) in layout" :key="col.tablecolid" 
-        :prop="col.columnname" 
-        :label="col.title" 
+      <el-table-column
+        v-for="(col,index) in layout" :key="col.tablecolid"
+        :prop="col.columnname"
+        :label="col.title"
         :min-width="tool.calcTableColWidth($refs.table,layout,index)"
         :fixed="fixedCalc(col.columnname)"
       >
@@ -48,6 +48,14 @@ export default {
       list:[],
     }
   },
+  watch:{
+    data(){
+      console.log('执行了222')
+      this.$nextTick(() => {
+        this.$refs.table.doLayout()
+      });
+    }
+  },
   computed:{
     ...mapGetters({
       loading:'loading'
@@ -69,9 +77,9 @@ export default {
           }
         } else {
           return false
-        } 
+        }
       }
-      
+
     }
   },
   methods:{
@@ -84,12 +92,32 @@ export default {
     selectionChange(row){
       this.$emit('selectionChange',row)
     },
-    
+
   },
   mounted () {
   }
 }
 
 </script>
-<style>
-</style>
+<style scoped>
+/* 解决横向滚动条被固定列遮住的问题 */
+>>>.el-table__fixed, >>>.el-table__fixed-right {
+  height: calc(100% - 15px) !important;
+}
+/* 解决横向滚动条滑至最右时，列对不齐的问题 */
+>>>.el-table__header-wrapper{
+  padding-right: 15px !important;
+}
+/* 解决竖向滚动条被固定列遮住的问题 */
+>>>.el-table__fixed-right {
+  right: 15px !important;
+}
+/* 解决竖向滚动条滑至底部时，行对不齐的问题 */
+>>>.el-table__fixed-body-wrapper .el-table__body {
+  padding-bottom: 15px;
+}
+/* 解决滑动横向滚动条时，表头最右侧会露出其他列表头的内容，形成的“样式穿透”问题 */
+>>>.el-table__fixed-right-patch {
+  width: 15px !important;
+}
+</style>

src/HDrpManagement/projectData/index.vue

@@ -1807,7 +1807,7 @@ export default {
   },
   data () {
     return {
-      dateType:'全部',
+      dateType:'本年',
       isFull:false,
       isAppend:true,
       colorArr:['#3874f6','#00b32b','#ffae02','#f53f3f','#f2f2f2'],
@@ -2226,7 +2226,7 @@ export default {
           "dataid": '',
           "type":"",
           "username":JSON.parse(sessionStorage.getItem('accountinfo')).name,
-          "dateType":'',
+          "dateType":'本年',
           "where":{
             "isleave":'1'
           }

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -951,7 +951,7 @@
               >
                 <template v-slot:custom="scope">
                   <div v-if="scope.data.columnname == 'specialoffer'">
-                    {{ scope.data.data.specialoffer ? this.$t("是") :  this.$t("否") }}
+                    {{ scope.data.data.specialoffer ? $t("是") :  $t("否") }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'sumamount'">
                     {{

src/HDrpManagement/salerpriceData/index.vue

@@ -281,14 +281,14 @@ export default {
         content: {
           dataid: "",
           type: "",
-          dateType: "",
+          dateType: "本年",
           where: {
             isleave: "1",
           },
         },
       },
       newFollowup: [],
-      dateType: "",
+      dateType: "本年",
       departmentid: "",
       scrollData: "",
       paramDetail:{

src/HManagement/accountManage/modules/account_detail.vue

@@ -213,7 +213,7 @@ export default {
       console.log(this.mainAreaData)
     },
     selectRow (data) {
-      this.$confirm(`${$t('确定将数据转移给')}“${data.name}”?`,this.$t('提示'),{
+      this.$confirm(`${this.$t('确定将数据转移给')}“${data.name}”?`,this.$t('提示'),{
         confirmButtonText:this.$t('确定'),
         cancelButtonText:this.$t('取消'),
         type:'warning'

src/HManagement/marketing/area/modules/start_area.vue

@@ -19,7 +19,7 @@ export default {
   },
   methods:{
     append () {
-      this.$confirm(`${$t('是否')}${this.data.isused === 1?this.$t('停 用'):this.$t('启 用')}${this.$t('当前区域')}?`, this.$t('提示'), {
+      this.$confirm(`${this.$t('是否')}${this.data.isused === 1?this.$t('停 用'):this.$t('启 用')}${this.$t('当前区域')}?`, this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         type: 'warning'

src/HManagement/marketing2/agent/details/modules/achievementTarget/index.vue

@@ -44,7 +44,7 @@
 
       </el-table-column>
       <el-table-column
-          :label="$t('目标')/$t('实际')"
+          :label="$t('目标')+'/'+$t('实际')"
           width="100">
         <template>
           <p class="center d-text">{{$t('目标')}}</p>

src/HManagement/marketing2/salerScope/area/modules/start_area.vue

@@ -22,7 +22,7 @@ export default {
   },
   methods:{
     append () {
-      this.$confirm(`${$t('是否')}${this.data.isused === 1?this.$t('停用'):this.$t('启用')}${$t('当前区域')}?`, this.$t('提示'), {
+      this.$confirm(`${this.$t('是否')}${this.data.isused === 1?this.$t('停用'):this.$t('启用')}${this.$t('当前区域')}?`, this.$t('提示'), {
         confirmButtonText: this.$t('确定'),
         cancelButtonText: this.$t('取消'),
         type: 'warning'

src/HManagement/personalTarget/personalTargetStatistics/index.vue

@@ -77,7 +77,7 @@
               </template>
             </el-table-column>
             <el-table-column
-                :label="$t('目标')/$t('实际')"
+                :label="$t('目标')+'/'+$t('实际')"
                 width="100">
               <template>
                 <p class="center d-text">{{$t('目标')}}</p>

src/HManagement/projectTarget/projectTargetStatistics/index.vue

@@ -92,7 +92,7 @@
               </template>
             </el-table-column>
             <el-table-column
-                :label="$t('目标')/$t('实际')"
+                :label="$t('目标')+'/'+$t('实际')"
                 width="100">
               <template>
                 <p class="center d-text">{{$t('目标')}}</p>

src/SManagement/personal_target/components/table.vue

@@ -33,7 +33,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        :label="$t('目标')/$t('实际')"
+        :label="$t('目标')+'/'+$t('实际')"
         width="100">
         <template>
           <p class="center d-text">{{$t('目标')}}</p>

src/SManagement/project_target/components/table.vue

@@ -63,7 +63,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        :label="$t('目标')/$t('实际')"
+        :label="$t('目标')+'/'+$t('实际')"
         width="100">
         <template>
           <p class="center d-text">{{$t('目标')}}</p>

src/components/table/index10.vue

@@ -0,0 +1,73 @@
+<template>
+  <div>
+    <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
+    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="small"    @row-click="rowClick" show-summary
+              style="width:100%;" :header-cell-style="{height:'60px',fontWeight:'400',fontSize:'22px',color:'#333333',background:'#ddebf7'}"
+              :cell-style="{height:'40px',fontWeight:'400',fontSize:'18px'}" border @selection-change="selectionChange" >
+      <el-table-column
+          type="selection"
+          width="35" fixed v-if="checkbox">
+      </el-table-column>
+      <el-table-column v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?'right':false : false">
+        <template :slot="headerOptions ? headerOptions.includes(col.columnname) ? 'header' : '' : ''" slot-scope="scope">
+          <slot name="header" :column="{data:scope.row,columnname:col.columnname}"></slot>
+        </template>
+        <template slot-scope="scope">
+          <div class="table-panel">
+            <!-- 自定义表格显示内容 -->
+            <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+            <!-- 否则就是默认 -->
+            <span v-else>{{scope.row[col.columnname]}}</span>
+            <!-- 操作结构内容 -->
+            <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import {mapGetters} from "vuex"
+export default {
+  /*
+    layout:表结构数据;
+    data:表渲染数据;
+    custom:是否启用自定义结构;
+    opwidth:操作列宽度
+  */
+  props:['layout','data','custom','height','fixedName','width','checkbox','showSummary','headerOptions'],
+  data () {
+    return {
+      list:[],
+      allArr:[],
+      loading:false
+    }
+  },
+  /*computed:{
+    ...mapGetters({
+      loading:'loading'
+    })
+  },*/
+  methods:{
+    rowClick (row) {
+      this.$emit('rowClick',row)
+    },
+    tableClassName ({row,rowIndex}) {
+      row.index = rowIndex
+    },
+    selectionChange(row){
+      this.allArr = row
+      this.$emit('selectionChange',row)
+    }
+  },
+  mounted () {
+  }
+}
+
+</script>
+<style scoped>
+/deep/ .el-table--small {
+  font-size: 18px;
+}
+</style>

src/components/table/index8.vue

@@ -8,7 +8,7 @@
           type="selection"
           width="35" fixed v-if="checkbox">
       </el-table-column>
-      <el-table-column v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)":fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?'right':false : false">
+      <el-table-column v-for="(col,index) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :min-width="tool.calcTableColWidth($refs.table,layout,index)" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?'right':false : false">
         <template slot-scope="scope">
           <div class="table-panel">
             <!-- 自定义表格显示内容 -->

src/optionSystem/optionOrder/detail/modules/setOrder.vue

@@ -26,8 +26,8 @@
                     <span>{{ resultArr[1] && resultArr[1].model }} {{resultArr.length == 3 ? ` + ${$t('减速箱')}：${resultArr[2] && resultArr[2].itemname}` : '' }}</span>
                 </div>
                 <div class="descript">
-                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorname"><span style="color: #888888;">{{$t('执行器名称')}}：</span>{{resultArr[1].actuatorname }}</div>
-                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatortype"><span style="color: #888888;">{{$t('执行器类型')}}：</span>{{resultArr[1].actuatortype }}</div>
+                    <!-- <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatorname"><span style="color: #888888;">{{$t('执行器名称')}}：</span>{{resultArr[1].actuatorname }}</div> -->
+                    <div class="item" v-if="resultArr.length >= 2 && resultArr[1].actuatortype"><span style="color: #888888;">{{$t('执行器名称')}}：</span>{{resultArr[1].actuatortype }}</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].bodystructure"><span style="color: #888888;">{{$t('执行器结构')}}：</span>{{resultArr[1].bodystructure }}</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].torque"><span style="color: #888888;">{{$t('输出扭矩')}}：</span>{{resultArr[1].torque }}(Nm)</div>
                     <div class="item" v-if="resultArr.length >= 2 && resultArr[1].speed"><span style="color: #888888;">{{$t('转速')}}：</span>{{resultArr[1].speed }}(rpm)</div>

src/optionSystem/selectOption/components/DieFa.vue

@@ -755,7 +755,7 @@
           >{{ $t(position == "单独选型" ? "保存选型单" : "确认添加") }}</el-button
         >
       </div>
-    </div>Fsearch
+    </div>
   </div>
 </template>
 
@@ -1141,7 +1141,7 @@ export default {
       }
     },
     async onSubmit() {
-      this.$confirm(this.$t("确认加入单据吗") + "?", this.$t("提示"), {
+      this.$confirm(this.$t(this.position == '单独选型' ? '是否确认保存':"确认加入单据吗") + "?", this.$t("提示"), {
         confirmButtonText: this.$t("确定"),
         cancelButtonText: this.$t("取消"),
         type: "warning",

src/views/clueData/index.vue

@@ -80,7 +80,7 @@ export default {
         }
       },
       scrollData:'',
-      dateType:'全部',
+      dateType:'本年',
       windowWidth: document.documentElement.clientWidth,  //实时屏幕宽度
       userName:JSON.parse(window.sessionStorage.getItem('active_account')).name
     }

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -31,15 +31,15 @@
       </el-select>
     </div>
     <div class="inline-16">
-      <el-checkbox v-model="unfinish" true-label="0" false-label="1" @change="dataParam.content.where.unfinish = unfinish;projectParam.content.where.unfinish = unfinish;getProportionOfFileModel()">包含失败、结案项目</el-checkbox>
+      <el-checkbox v-model="unfinish" true-label="0" false-label="1" @change="dataParam.content.where.unfinish = unfinish;projectParam.content.where.unfinish = unfinish;getProportionOfFileModel()">{{$t(`包含失败、结案项目`)}}</el-checkbox>
     </div>
     <div class="inline-16" style="margin-top:0px;margin-bottom: 20px">
       <el-button-group>
         <el-button size="small" :type="dataParam.content.dateType==99?'primary':''" @click="dataChange(99)">{{$t(`全部`)}}</el-button>
-        <el-button size="small" :type="dataParam.content.dateType==1?'primary':''" @click="dataChange(1)">近一年</el-button>
-        <el-button size="small" :type="dataParam.content.dateType==2?'primary':''" @click="dataChange(2)">近九个月</el-button>
-        <el-button size="small" :type="dataParam.content.dateType==3?'primary':''" @click="dataChange(3)">近六个月</el-button>
-        <el-button size="small" :type="dataParam.content.dateType==4?'primary':''" @click="dataChange(4)">近三个月</el-button>
+        <el-button size="small" :type="dataParam.content.dateType==1?'primary':''" @click="dataChange(1)">{{$t(`近一年`)}}</el-button>
+        <el-button size="small" :type="dataParam.content.dateType==2?'primary':''" @click="dataChange(2)">{{$t(`近九个月`)}}</el-button>
+        <el-button size="small" :type="dataParam.content.dateType==3?'primary':''" @click="dataChange(3)">{{$t(`近六个月`)}}</el-button>
+        <el-button size="small" :type="dataParam.content.dateType==4?'primary':''" @click="dataChange(4)">{{$t(`近三个月`)}}</el-button>
       </el-button-group>
     </div>
     <div class="inline-16" style="margin-top:0px;margin-bottom: 20px">
@@ -59,47 +59,31 @@
     <div>
       <el-row>
         <el-col :xs="15" :sm="15" :md="15" :lg="15" :xl="14">
-          <p class="title">销售漏斗图</p>
+          <p class="title">{{$t(`销售漏斗图`)}}</p>
           <div class="re-panel">
             <div id="containerFunnel" style="height: calc(60vh)"></div>
           </div>
         </el-col>
         <el-col :offset="1" :xs="8" :sm="8" :md="8" :lg="8" :xl="9">
           <div>
-            <p class="title">表格数据</p>
-            <el-table
-                show-summary
-                :data="tableData"
-                style="width: 100%"
-                size="small"
-                :header-cell-style="{height:'60px',fontWeight:'400',fontSize:'22px',color:'#333333',background:'#ddebf7'}"
-                :cell-style="{height:'40px',fontWeight:'400',fontSize:'18px'}"
-                border>
-              <el-table-column
-                  prop="stagename"
-                  label="阶段"
-                  width="150">
-              </el-table-column>
-              <el-table-column
-                  prop="projectqty"
-                  label="项目数"
-                  width="100">
-              </el-table-column>
-              <el-table-column
-                  prop="signamount_due"
-                  label="预计签约金额(万元)">
-                <template slot-scope="scope">
-                  <div style="white-space: pre-wrap">{{scope.row.signamount_due}}</div>
-                </template>
-              </el-table-column>
-              <el-table-column
-                  prop="dealamount"
-                  label="项目成交金额(万元)">
-                <template slot-scope="scope">
-                  <div style="white-space: pre-wrap">{{scope.row.dealamount}}</div>
-                </template>
-              </el-table-column>
-            </el-table>
+            <p class="title">{{$t(`表格数据`)}}</p>
+            <tableNewTemp :layout="tablecolsData" :data="tableData" :opwidth="200" :custom="true" :headerOptions="['signamount_due','dealamount']">
+              <template v-slot:header="scope">
+                <div v-if="scope.column.columnname == 'signamount_due'">
+                  <p>{{$t(`预计签约`)}}</p>
+                  <p>{{$t(`金额(万元)`)}}</p>
+                </div>
+                <div v-if="scope.column.columnname == 'dealamount'">
+                  <p>{{$t(`项目成交`)}}</p>
+                  <p>{{$t(`金额(万元)`)}}</p>
+                </div>
+              </template>
+              <template v-slot:customcol="scope">
+                <div>
+                  {{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]]:'--'}}
+                </div>
+              </template>
+            </tableNewTemp>
           </div>
         </el-col>
       </el-row>
@@ -179,10 +163,11 @@
 
 <script>
 import tableTemp from '@/components/table/index8'
+import tableNewTemp from '@/components/table/index10'
 import { Funnel,G2 } from '@antv/g2plot';
 const G = G2.getEngine('canvas');
 export default {
-  components:{tableTemp},
+  components:{tableTemp,tableNewTemp},
   data () {
     return {
       chartPie:null,
@@ -209,6 +194,7 @@ export default {
       personnelList:[],
       projectList:[],
       tablecols:[],
+      tablecolsData:[],
       depmentParam:{
         "id": 20230620102004,
         "content": {
@@ -837,6 +823,7 @@ export default {
   },
   created() {
     this.tablecols = this.tool.tabelCol(this.$route.name).projectTable.tablecols
+    this.tablecolsData = this.tool.tabelCol(this.$route.name).tableDatas.tablecols
   }
 }
 
@@ -857,11 +844,4 @@ export default {
 .container{
  /* height:calc(100vh)*/
 }
-/*/deep/.el-table .cell {*/
-
-/*  font-size: 18px;*/
-/*}*/
-/deep/ .el-table--small {
-  font-size: 18px;
-}
 </style>