Merge branch 'redUrgent' into allTestUrgent

src/HDrpManagement/competitor/detail/modules/advantAndDisadvant/index.vue

@@ -76,9 +76,9 @@ export default {
       })
     },
     onDel(data){
-      this.$confirm('确定删除此优势劣势信息吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+      this.$confirm(this.$t('确定删除此优势劣势信息吗?'), this.$t('提示'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
         type: 'warning'
       }).then(async () => {
         const res = await this.$api.requested({
@@ -94,7 +94,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: '已取消删除'
+          message: this.$t('已取消删除')
         });
       });
     },

src/HManagement/personalTarget/personalTargetStatistics/index.vue

@@ -523,12 +523,13 @@ export default {
       tableData:[],
       currentPage:0,
       height:'calc(100vh - 330px)',
-      target:'3',
+      target:'1',
       yearData:[],
       options: [
         { label: '开票金额', value: '1' },
         { label: '订单金额', value: '2' },
         { label: '出货金额', value: '3' },
+        { label: '回款金额', value: '4' },
       ],
       total:0,
       year:String((new Date()).getFullYear()),
@@ -539,7 +540,7 @@ export default {
           "year": '',
           "pageNumber": 1,
           "pageSize": 20,
-          "type":3,
+          "type":1,
           "where":{
             "condition":""//支持部门名称查询
           }

src/HManagement/projectTarget/projectTargetStatistics/index.vue

@@ -542,17 +542,18 @@ export default {
       condition:'',
       total:0,
       currentPage:0,
-      target:'3',
+      target:'1',
       options: [
         { label: '开票金额', value: '1' },
         { label: '订单金额', value: '2' },
         { label: '出货金额', value: '3' },
+        { label: '回款金额', value: '4' },
       ],
       param:{
         "id": 20220909153802,
         "content": {
           "year": this.year,
-          "type":3,
+          "type":1,
           "where":{
             "condition":''
           }

src/SManagement/personal_target/components/table.vue

@@ -490,7 +490,7 @@ export default {
           "pageNumber": 1,
           "pageSize": 20,
           "year": '',
-          "type":3,
+          "type":1,
           "where":{
               "condition":""//支持部门名称查询
           }

src/SManagement/project_target/components/selectPanel.vue

@@ -39,13 +39,14 @@ export default {
   data () {
     return {
       year: '',
-      target:'3',
+      target:'1',
       search:'',
       yearOptions:[],
       options: [
         { label: '开票金额', value: '1' },
         { label: '订单金额', value: '2' },
         { label: '出货金额', value: '3' },
+        { label: '回款金额', value: '4'}
       ]
     };
   },

src/SManagement/project_target/components/table.vue

@@ -525,7 +525,7 @@ export default {
           "pageNumber": 1,
           "pageSize": 20,
             "year": '',
-            "type":3,
+            "type":1,
             "where":{
                 "condition":''//支持部门名称查询
             }