Merge branch 'blueBranch' into testToMerge

src/HDrpManagement/contractManage/index.vue

@@ -140,9 +140,9 @@
           {{scope.data.column.data[[scope.data.column.columnname]] < 1?Math.round((scope.data.column.data[[scope.data.column.columnname]] * 100)*100)/100:100}}
         </div>
         <div v-else>
-          {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+          {{$t(scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--')}}
         </div>
-        <span v-if="!scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.data[[scope.data.column.columnname]] !== 0 && scope.data.column.columnname !== 'enterprisename'">--</span>
+<!--        <span v-if="!scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.data[[scope.data.column.columnname]] !== 0 && scope.data.column.columnname !== 'enterprisename'">&#45;&#45;</span>-->
       </template>
       <template v-slot:tbOpreation="scope">
 <!--        <el-button size="mini" @click="$router.push({path:'/directSelling',query:{id:scope.data.data.sa_contractid,sys_enterpriseid:scope.data.data.sys_enterpriseid}})" type="text" >打印</el-button>-->

src/HManagement/department/staff/list/modules/edit.vue

@@ -80,8 +80,8 @@
             <el-col :span="24" >
               <el-form-item :label="$t(`状态`)+':'">
                 <el-radio-group v-model="form.status">
-                  <el-radio :label="0">{{ $t('在职') }}</el-radio>
-                  <el-radio :label="1">{{ $t('离职') }}</el-radio>
+                  <el-radio label="0">{{ $t('在职') }}</el-radio>
+                  <el-radio label="1">{{ $t('离职') }}</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>