Browse Source

修改中英文样式

pm 5 months ago
parent
commit
89754f6129

+ 10 - 8
src/i18n/lang/en.js

@@ -40,7 +40,11 @@ export default {
     lastWeek: 'Last Week',
     lastMonth: 'Last Month',
     lastThreeMonths: 'Last Three Months',
-    to: 'To'
+    to: 'To',
+    deleteBatch:'Batch Delete',
+    detail:'Detail',
+    expandCollapse: 'ExpandCollapse',
+    action:'Operation',
   },
   login: {
     title: 'System Login',
@@ -1703,31 +1707,29 @@ export default {
       }
     },
     configuration: {
-      paramName: 'Param. Name',
+      paramName: 'ParamName',
       paramNamePlaceholder: 'Please enter parameter name',
-      paramKey: 'Param. Key',
+      paramKey: 'ParamKey',
       paramKeyPlaceholder: 'Please enter parameter key',
-      paramValue: 'Param. Value',
+      paramValue: 'ParamValue',
       paramValuePlaceholder: 'Please enter parameter value',
       refreshCache: 'Refresh Cache',
-      paramType: 'Param. Type',
+      paramType: 'ParamType',
       dialogTitle: 'Add or Edit Basic Data Config Dialog',
       paramTypePlaceholder: 'Please select parameter type',
-      valueType: 'Value Type',
+      valueType: 'ValueType',
       text: 'Text',
       image: 'Image',
       remarkPlaceholder: 'Please enter remark',
       paramNameRequired: 'Parameter name cannot be empty',
       paramKeyRequired: 'Parameter key cannot be empty',
       paramValueRequired: 'Parameter value cannot be empty',
-      refreshCache: 'Refresh Cache',
       refreshSuccess: 'Refreshed successfully',
       addConfig: 'Add Basic Data',
       editConfig: 'Edit Basic Data',
       editSuccess: 'Updated successfully',
       addSuccess: 'Added successfully',
       deleteSuccess: 'Deleted successfully',
-      dialogTitle: 'Add or Edit Basic Data Config Dialog'
     },
     mapConfig: {
       mapName: 'Map Name',

+ 5 - 1
src/i18n/lang/zh.js

@@ -40,7 +40,11 @@ export default {
     lastWeek: '最近一周',
     lastMonth: '最近一个月',
     lastThreeMonths: '最近三个月',
-    to: '至'
+    to: '至',
+    deleteBatch:'批量删除',
+    detail:'详情',
+    expandCollapse:'折叠',
+    action:'操作'
   },
   login: {
     title: '系统登录',

+ 9 - 9
src/views/mes/Exceptions/Exception/index.vue

@@ -106,20 +106,20 @@
       :data="ExceptionList"
 
     >
-      <el-table-column :label="$t('mes.materialException.code')" align="center" prop="misplaceId" :width="isEnglish ? '120px' : '100px'">
+      <el-table-column :label="$t('mes.materialException.code')" align="center" prop="misplaceId" >
       </el-table-column>
-      <el-table-column :label="$t('mes.materialException.cabinet')" align="center" prop="loanFromName" :width="isEnglish ? '200px' : '160px'" show-overflow-tooltip>
+      <el-table-column :label="$t('mes.materialException.cabinet')" align="center" prop="loanFromName"  show-overflow-tooltip>
       </el-table-column>
 
-      <el-table-column :label="$t('mes.materialException.materialName')" align="center" prop="materialsName" :width="isEnglish ? '200px' : '160px'" show-overflow-tooltip>
+      <el-table-column :label="$t('mes.materialException.materialName')" align="center" prop="materialsName"  show-overflow-tooltip>
       </el-table-column>
-      <el-table-column :label="$t('mes.materialException.rfid')" align="center" prop="materialsRfid" :width="isEnglish ? '320px' : '300px'" show-overflow-tooltip>
+      <el-table-column :label="$t('mes.materialException.rfid')" align="center" prop="materialsRfid"  show-overflow-tooltip>
       </el-table-column>
-      <el-table-column :label="$t('mes.materialException.returnCabinet')" align="center" prop="restitutionToName" :width="isEnglish ? '180px' : '140px'" show-overflow-tooltip>
+      <el-table-column :label="$t('mes.materialException.returnCabinet')" align="center" prop="restitutionToName"  show-overflow-tooltip>
       </el-table-column>
-      <el-table-column :label="$t('mes.materialException.returnUser')" align="center" prop="restitutionUserName" :width="isEnglish ? '160px' : '120px'" show-overflow-tooltip>
+      <el-table-column :label="$t('mes.materialException.returnUser')" align="center" prop="restitutionUserName"  show-overflow-tooltip>
       </el-table-column>
-      <el-table-column :label="$t('mes.materialException.status')" align="center" prop="status" :width="isEnglish ? '140px' : '120px'">
+      <el-table-column :label="$t('mes.materialException.status')" align="center" prop="status" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.material_exception_status" :value="scope.row.status"/>
         </template>
@@ -128,11 +128,11 @@
         :label="$t('mes.materialException.occurTime')"
         align="center"
         prop="occurTime"
-        :width="isEnglish ? '220px' : '180px'"
+
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column :label="$t('mes.materialException.handleTime')" align="center" prop="handleTime" :width="isEnglish ? '220px' : '180px'" show-overflow-tooltip>
+      <el-table-column :label="$t('mes.materialException.handleTime')" align="center" prop="handleTime"  show-overflow-tooltip>
       </el-table-column>
     </el-table>
     <pagination

+ 43 - 41
src/views/mes/Exceptions/manualException/index.vue

@@ -10,9 +10,9 @@
       @submit.native.prevent
     >
       <el-form-item :label="$t('mes.manualException.exceptionCategory')" prop="exceptionCategory">
-        <el-select 
-          v-model="queryParams.exceptionCategory" 
-          :placeholder="$t('common.pleaseSelect')" 
+        <el-select
+          v-model="queryParams.exceptionCategory"
+          :placeholder="$t('common.pleaseSelect')"
           :style="{ width: isEnglish ? '240px' : '215px' }"
           clearable
         >
@@ -35,9 +35,9 @@
         />
       </el-form-item>
       <el-form-item :label="$t('mes.manualException.exceptionType')" prop="exceptionType">
-        <el-select 
-          v-model="queryParams.exceptionType" 
-          :placeholder="$t('common.pleaseSelect')" 
+        <el-select
+          v-model="queryParams.exceptionType"
+          :placeholder="$t('common.pleaseSelect')"
           :style="{ width: isEnglish ? '240px' : '215px' }"
           clearable
         >
@@ -50,9 +50,9 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('mes.manualException.exceptionLevel')" prop="exceptionLevel">
-        <el-select 
-          v-model="queryParams.exceptionLevel" 
-          :placeholder="$t('common.pleaseSelect')" 
+        <el-select
+          v-model="queryParams.exceptionLevel"
+          :placeholder="$t('common.pleaseSelect')"
           :style="{ width: isEnglish ? '240px' : '215px' }"
           clearable
         >
@@ -134,62 +134,62 @@
       v-loading="loading"
       :data="ExceptionList"
     >
-      <el-table-column 
-        :label="$t('mes.manualException.exceptionId')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.manualException.exceptionId')"
+        align="center"
         prop="exceptionId"
         :width="isEnglish ? '150px' : '130px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.manualException.exceptionCategory')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.manualException.exceptionCategory')"
+        align="center"
         prop="exceptionCategory"
-        :width="isEnglish ? '180px' : '150px'"
+
         show-overflow-tooltip
       >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.classification_of_exceptions" :value="scope.row.exceptionCategory"/>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.manualException.sourceName')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.manualException.sourceName')"
+        align="center"
         prop="sourceName"
-        :width="isEnglish ? '150px' : '120px'"
+
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.manualException.exceptionType')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.manualException.exceptionType')"
+        align="center"
         prop="exceptionTypeName"
-        :width="isEnglish ? '180px' : '150px'"
+
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.manualException.exceptionLevel')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.manualException.exceptionLevel')"
+        align="center"
         prop="exceptionLevelName"
-        :width="isEnglish ? '150px' : '120px'"
+
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.manualException.raiserName')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.manualException.raiserName')"
+        align="center"
         prop="raiserName"
-        :width="isEnglish ? '150px' : '120px'"
+
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('common.status')" 
-        align="center" 
+      <el-table-column
+        :label="$t('common.status')"
+        align="center"
         prop="status"
-        :width="isEnglish ? '120px' : '100px'"
+
       >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.manual_status" :value="scope.row.status"/>
@@ -200,18 +200,20 @@
         align="center"
         prop="raiseTime"
         show-overflow-tooltip
+        :width="isEnglish ? '200px' : '180px'"
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.manualException.handleTime')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.manualException.handleTime')"
+        align="center"
         prop="handleTime"
         show-overflow-tooltip
+        :width="isEnglish ? '200px' : '180px'"
       >
       </el-table-column>
-      <el-table-column 
+      <el-table-column
         :label="$t('common.operation')"
-        min-width="100"
+
       >
         <template slot-scope="scope">
           <el-button type="text" @click="handleCheck(scope.row)">{{ $t('common.view') }}</el-button>

+ 34 - 34
src/views/mes/material/Inspectionrecords/index.vue

@@ -89,8 +89,8 @@
 
 
       <el-form-item :label="$t('mes.inspectionRecord.checkResult')" prop="status">
-        <el-select 
-          v-model="queryParams.status" 
+        <el-select
+          v-model="queryParams.status"
           :placeholder="$t('mes.inspectionRecord.checkResult')"
           :style="{ width: isEnglish ? '240px' : '215px' }"
         >
@@ -103,8 +103,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('mes.inspectionRecord.exceptionReason')" prop="reason">
-        <el-select 
-          v-model="queryParams.reason" 
+        <el-select
+          v-model="queryParams.reason"
           :placeholder="$t('common.status')"
           :style="{ width: isEnglish ? '240px' : '215px' }"
         >
@@ -182,11 +182,11 @@
       @selection-change="handleSelectionChange"
     >
       <!--      <el-table-column type="selection" width="55" align="center"/>-->
-      <el-table-column 
-        :label="$t('mes.inspectionRecord.planName')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionRecord.planName')"
+        align="center"
         prop="planName"
-        :width="isEnglish ? '200px' : '180px'"
+        :width="isEnglish ? '200px' : '220px'"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -194,32 +194,32 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionRecord.cabinet')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionRecord.cabinet')"
+        align="center"
         prop="cabinetName"
-        :width="isEnglish ? '150px' : '120px'"
+        :width="isEnglish ? '150px' : '150px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionRecord.materialsId')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionRecord.materialsId')"
+        align="center"
         prop="materialsId"
         :width="isEnglish ? '150px' : '130px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionRecord.materialsName')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionRecord.materialsName')"
+        align="center"
         prop="materialsName"
         :width="isEnglish ? '180px' : '150px'"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.inspectionRecord.materialsType')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionRecord.materialsType')"
+        align="center"
         prop="materialsTypeName"
         :width="isEnglish ? '180px' : '150px'"
         show-overflow-tooltip
@@ -240,11 +240,11 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionRecord.rfid')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionRecord.rfid')"
+        align="center"
         prop="materialsRfid"
-        :width="isEnglish ? '150px' : '130px'"
+        :width="isEnglish ? '250px' : '250px'"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -262,9 +262,9 @@
           {{ scope.row.createTime }}
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionRecord.checkResult')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionRecord.checkResult')"
+        align="center"
         prop="status"
         :width="isEnglish ? '140px' : '120px'"
       >
@@ -272,9 +272,9 @@
           <dict-tag :options="dict.type.checks_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionRecord.exceptionReason')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionRecord.exceptionReason')"
+        align="center"
         prop="reason"
         :width="isEnglish ? '180px' : '150px'"
         show-overflow-tooltip
@@ -296,9 +296,9 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionRecord.replacementRecord')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionRecord.replacementRecord')"
+        align="center"
         prop="status"
         :width="isEnglish ? '160px' : '140px'"
       >

+ 37 - 37
src/views/mes/material/collectionmanagement/index.vue

@@ -93,8 +93,8 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item :label="$t('common.status')" prop="status">
-          <el-select 
-            v-model="queryParams.status" 
+          <el-select
+            v-model="queryParams.status"
             :placeholder="$t('common.status')"
             :style="{ width: isEnglish ? '240px' : '215px' }"
           >
@@ -174,36 +174,36 @@
         :label="$t('mes.collectionManagement.cabinet')"
         align="center"
         prop="loanFromName"
-       
+        :width="isEnglish ? '240px' : '180px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.collectionManagement.materialsId')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.collectionManagement.materialsId')"
+        align="center"
         prop="materialsId"
-        :width="isEnglish ? '150px' : '130px'"
+        :width="isEnglish ? '180px' : '180px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.collectionManagement.materialsName')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.collectionManagement.materialsName')"
+        align="center"
         prop="materialsName"
-        :width="isEnglish ? '180px' : '150px'"
+        :width="isEnglish ? '180px' : '180px'"
         show-overflow-tooltip
       />
       <el-table-column
         :label="$t('mes.collectionManagement.materialsType')"
         align="center"
         prop="materialsTypeName"
-        :width="isEnglish ? '180px' : '150px'"
+        :width="isEnglish ? '180px' : '180px'"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('mes.collectionManagement.materialsPicture')" 
-        prop="materialsTypePicture" 
-        :width="isEnglish ? '150px' : '100px'"
+      <el-table-column
+        :label="$t('mes.collectionManagement.materialsPicture')"
+        prop="materialsTypePicture"
+        :width="isEnglish ? '180px' : '180px'"
         align="center"
       >
         <template slot-scope="scope">
@@ -225,25 +225,25 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.collectionManagement.loanUser')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.collectionManagement.loanUser')"
+        align="center"
         prop="loanUserName"
-        :width="isEnglish ? '150px' : '120px'"
+        :width="isEnglish ? '180px' : '180px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.collectionManagement.loanTime')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.collectionManagement.loanTime')"
+        align="center"
         prop="loanTime"
-        :width="isEnglish ? '180px' : '160px'"
+        :width="isEnglish ? '180px' : '180px'"
       />
-      <el-table-column 
-        :label="$t('mes.collectionManagement.restitutionUser')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.collectionManagement.restitutionUser')"
+        align="center"
         prop="restitutionUserName"
-        :width="isEnglish ? '150px' : '120px'"
+        :width="isEnglish ? '180px' : '180px'"
         show-overflow-tooltip
       >
       </el-table-column>
@@ -252,20 +252,20 @@
         :label="$t('mes.collectionManagement.restitutionTime')"
         align="center"
         prop="actualRestitutionTime"
-        :width="isEnglish ? '180px' : '160px'"
+        :width="isEnglish ? '180px' : '180px'"
       />
-      <el-table-column 
-        :label="$t('mes.collectionManagement.loanDuration')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.collectionManagement.loanDuration')"
+        align="center"
         prop="loanDuration"
-        :width="isEnglish ? '150px' : '120px'"
+        :width="isEnglish ? '180px' : '180px'"
         show-overflow-tooltip
       />
-      <el-table-column 
-        :label="$t('common.status')" 
-        align="center" 
+      <el-table-column
+        :label="$t('common.status')"
+        align="center"
         prop="status"
-        :width="isEnglish ? '120px' : '100px'"
+        :width="isEnglish ? '120px' : '120px'"
       >
         <template slot-scope="scope">
           <dict-tag

+ 69 - 69
src/views/mes/material/inspectionplan/index.vue

@@ -34,9 +34,9 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('mes.inspectionPlan.planDate')">
+      <el-form-item :label="$t('mes.inspectionPlan.planDate')" >
         <el-date-picker
-          :style="{ width: isEnglish ? '240px' : '215px' }"
+          :style="{ width: isEnglish ? '260px' : '205px' }"
           :default-time="['00:00:00', '23:59:59']"
           v-model="createTime"
           type="datetimerange"
@@ -65,8 +65,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('common.status')" prop="status">
-        <el-select 
-          v-model="queryParams.status" 
+        <el-select
+          v-model="queryParams.status"
           :placeholder="$t('common.status')"
           :style="{ width: isEnglish ? '240px' : '215px' }"
         >
@@ -110,7 +110,7 @@
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar>
-   
+
       <!--       <el-col :span="1.5">-->
       <!--        <el-button-->
       <!--          v-no-more-click-->
@@ -205,27 +205,27 @@
       @selection-change="handleSelectionChange"
     >
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
-      <el-table-column 
-        :label="$t('mes.inspectionPlan.planId')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionPlan.planId')"
+        align="center"
         prop="planId"
-        
+
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionPlan.planName')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionPlan.planName')"
+        align="center"
         prop="planName"
-       
+
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionPlan.cabinet')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionPlan.cabinet')"
+        align="center"
         prop="cabinetName"
-   
+
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -235,32 +235,32 @@
           </el-tooltip>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionPlan.planDate')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionPlan.planDate')"
+        align="center"
         prop="planDate"
-     
+
       >
         <template slot-scope="scope">
           {{ scope.row.planDate }}
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionPlan.checkUser')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionPlan.checkUser')"
+        align="center"
         prop="checkUserName"
-     
+
         show-overflow-tooltip
       >
         <template slot-scope="scope">
           {{ scope.row.checkUserName }}
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('common.status')" 
-        align="center" 
+      <el-table-column
+        :label="$t('common.status')"
+        align="center"
         prop="status"
-       
+
       >
         <template slot-scope="scope">
           <dict-tag
@@ -269,11 +269,11 @@
           />
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.inspectionPlan.checkRecord')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.inspectionPlan.checkRecord')"
+        align="center"
         prop="status"
-      
+
       >
         <template slot-scope="scope">
           <el-button type="text" @click="goto(scope.row)">{{ $t('common.view') }}</el-button>
@@ -392,25 +392,25 @@
         <span class="title">{{ $t('mes.inspectionPlan.cabinetDetail') }}</span>
       </div>
       <el-table v-loading="loading" :data="PlanDetailTableList">
-        <el-table-column 
-          :label="$t('mes.inspectionPlan.planName')" 
-          align="center" 
+        <el-table-column
+          :label="$t('mes.inspectionPlan.planName')"
+          align="center"
           prop="planName"
           :width="isEnglish ? '200px' : '180px'"
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column 
-          :label="$t('mes.inspectionPlan.inspectionCabinet')" 
-          align="center" 
+        <el-table-column
+          :label="$t('mes.inspectionPlan.inspectionCabinet')"
+          align="center"
           prop="cabinetName"
           :width="isEnglish ? '180px' : '150px'"
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column 
-          :label="$t('mes.inspectionPlan.signature')" 
-          align="center" 
+        <el-table-column
+          :label="$t('mes.inspectionPlan.signature')"
+          align="center"
           prop="signatureImg"
           :width="isEnglish ? '120px' : '100px'"
         >
@@ -433,9 +433,9 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column 
-          :label="$t('common.operation')" 
-          align="center" 
+        <el-table-column
+          :label="$t('common.operation')"
+          align="center"
           prop=""
           :width="isEnglish ? '120px' : '100px'"
         >
@@ -455,9 +455,9 @@
         <span class="title">{{ $t('mes.inspectionPlan.cabinetCheckRecord') }}</span>
       </div>
       <el-table v-loading="loading" :data="RecordList">
-        <el-table-column 
-          :label="$t('mes.inspectionPlan.planName')" 
-          align="center" 
+        <el-table-column
+          :label="$t('mes.inspectionPlan.planName')"
+          align="center"
           prop="planName"
           :width="isEnglish ? '200px' : '180px'"
           show-overflow-tooltip
@@ -466,32 +466,32 @@
             {{ scope.row.planName }}
           </template>
         </el-table-column>
-        <el-table-column 
-          :label="$t('mes.inspectionPlan.cabinet')" 
-          align="center" 
+        <el-table-column
+          :label="$t('mes.inspectionPlan.cabinet')"
+          align="center"
           prop="cabinetName"
           :width="isEnglish ? '150px' : '120px'"
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column 
-          :label="$t('mes.inspectionPlan.materialsId')" 
-          align="center" 
+        <el-table-column
+          :label="$t('mes.inspectionPlan.materialsId')"
+          align="center"
           prop="materialsId"
           :width="isEnglish ? '150px' : '130px'"
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column 
-          :label="$t('mes.inspectionPlan.materialsName')" 
-          align="center" 
+        <el-table-column
+          :label="$t('mes.inspectionPlan.materialsName')"
+          align="center"
           prop="materialsName"
           :width="isEnglish ? '180px' : '150px'"
           show-overflow-tooltip
         />
-        <el-table-column 
-          :label="$t('mes.inspectionPlan.materialsType')" 
-          align="center" 
+        <el-table-column
+          :label="$t('mes.inspectionPlan.materialsType')"
+          align="center"
           prop="materialsTypeName"
           :width="isEnglish ? '180px' : '150px'"
           show-overflow-tooltip
@@ -512,9 +512,9 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column 
-          :label="$t('mes.inspectionPlan.rfid')" 
-          align="center" 
+        <el-table-column
+          :label="$t('mes.inspectionPlan.rfid')"
+          align="center"
           prop="materialsRfid"
           :width="isEnglish ? '150px' : '130px'"
           show-overflow-tooltip
@@ -530,9 +530,9 @@
             {{ scope.row.createTime }}
           </template>
         </el-table-column>
-        <el-table-column 
-          :label="$t('common.status')" 
-          align="center" 
+        <el-table-column
+          :label="$t('common.status')"
+          align="center"
           prop="status"
           :width="isEnglish ? '120px' : '100px'"
         >
@@ -540,9 +540,9 @@
             <dict-tag :options="dict.type.checks_status" :value="scope.row.status"/>
           </template>
         </el-table-column>
-        <el-table-column 
-          :label="$t('mes.inspectionPlan.exceptionReason')" 
-          align="center" 
+        <el-table-column
+          :label="$t('mes.inspectionPlan.exceptionReason')"
+          align="center"
           prop="reason"
           :width="isEnglish ? '180px' : '150px'"
           show-overflow-tooltip

+ 35 - 35
src/views/mes/material/replacementrecords/index.vue

@@ -99,8 +99,8 @@
         </el-date-picker>
       </el-form-item>
       <el-form-item :label="$t('mes.replacementRecords.operateType')" prop="operateType">
-        <el-select 
-          v-model="queryParams.operateType" 
+        <el-select
+          v-model="queryParams.operateType"
           :placeholder="$t('mes.replacementRecords.operateTypePlaceholder')"
           :style="{ width: isEnglish ? '240px' : '215px' }"
         >
@@ -165,11 +165,11 @@
       @selection-change="handleSelectionChange"
     >
 <!--      <el-table-column type="selection" width="55" align="center"/>-->
-      <el-table-column 
-        :label="$t('mes.replacementRecords.cabinet')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.replacementRecords.cabinet')"
+        align="center"
         prop="cabinetName"
-        :width="isEnglish ? '150px' : '120px'"
+        :width="isEnglish ? '180px' : '120px'"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
@@ -178,9 +178,9 @@
         </template>
       </el-table-column>
 <!--      <el-table-column label="物资名称" align="center" prop="materialsName" />-->
-      <el-table-column 
-        :label="$t('mes.replacementRecords.materialsType')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.replacementRecords.materialsType')"
+        align="center"
         prop="materialsTypeName"
         :width="isEnglish ? '180px' : '150px'"
         show-overflow-tooltip
@@ -189,7 +189,7 @@
         :label="$t('mes.replacementRecords.materialsPicture')"
         align="center"
         prop="materialsTypePicture"
-        :width="isEnglish ? '130px' : '100px'"
+        :width="isEnglish ? '180px' : '100px'"
       >
         <template slot-scope="scope">
           <img
@@ -201,51 +201,51 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.replacementRecords.oldMaterialsId')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.replacementRecords.oldMaterialsId')"
+        align="center"
         prop="oldMaterialsId"
-        :width="isEnglish ? '150px' : '130px'"
+        :width="isEnglish ? '180px' : '180px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.replacementRecords.oldMaterialsName')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.replacementRecords.oldMaterialsName')"
+        align="center"
         prop="oldMaterialsName"
         :width="isEnglish ? '180px' : '150px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.replacementRecords.oldRfid')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.replacementRecords.oldRfid')"
+        align="center"
         prop="oldMaterialsRfid"
-        :width="isEnglish ? '150px' : '130px'"
+        :width="isEnglish ? '250px' : '250px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.replacementRecords.newMaterialsId')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.replacementRecords.newMaterialsId')"
+        align="center"
         prop="newMaterialsId"
-        :width="isEnglish ? '150px' : '130px'"
+        :width="isEnglish ? '180px' : '150px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.replacementRecords.newMaterialsName')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.replacementRecords.newMaterialsName')"
+        align="center"
         prop="newMaterialsName"
         :width="isEnglish ? '180px' : '150px'"
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.replacementRecords.newRfid')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.replacementRecords.newRfid')"
+        align="center"
         prop="newMaterialsRfid"
-        :width="isEnglish ? '150px' : '130px'"
+        :width="isEnglish ? '250px' : '250px'"
         show-overflow-tooltip
       >
       </el-table-column>
@@ -257,9 +257,9 @@
         show-overflow-tooltip
       >
       </el-table-column>
-      <el-table-column 
-        :label="$t('mes.replacementRecords.changeTime')" 
-        align="center" 
+      <el-table-column
+        :label="$t('mes.replacementRecords.changeTime')"
+        align="center"
         prop="changeDate"
         :width="isEnglish ? '180px' : '160px'"
       >

+ 2 - 2
src/views/system/configuration/index.vue

@@ -153,8 +153,8 @@
     />
 
     <!-- 添加或修改基础数据配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="520px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item :label="$t('systemOther.configuration.paramName')" prop="sysAttrName">
           <el-input v-model="form.sysAttrName" :placeholder="$t('systemOther.configuration.paramNamePlaceholder')"/>
         </el-form-item>