Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/contractManage/components/taskTarget/addTarget.vue

@@ -12,7 +12,7 @@
             :placeholder="$t(`选择年`)">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="$t('市场活动')+':'" prop="year">
+        <el-form-item :label="$t('领域')+':'" prop="year">
           <el-select v-model="form.tradefield" :placeholder="$t('请选择领域')" style="width: 100%">
             <el-option
                 v-for="item in fieldList"

src/HDrpManagement/serveBillMag/index.vue

@@ -71,7 +71,7 @@
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">{{
-            scope.data.column.data[[scope.data.column.columnname]]
+            $t(scope.data.column.data[[scope.data.column.columnname]])
           }}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'province'">

src/HDrpManagement/serveWorkBill/index.vue

@@ -51,7 +51,7 @@
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])">{{
-            scope.data.column.data[[scope.data.column.columnname]]
+            $t(scope.data.column.data[[scope.data.column.columnname]])
           }}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'province'">