新增页面增加字段

src/locales/en.ts

@@ -1192,6 +1192,7 @@ export default {
     },
     // Equipment Ledger
     EquipmentLedger: {
+      images:'Images',
       deviceCode: 'Code',
       qrcode: 'QR Code/Barcode',
       deviceName: 'Name',

src/locales/zh-CN.ts

@@ -1184,6 +1184,7 @@ export default {
     },
     // 设备台账
     EquipmentLedger: {
+      images:'图片',
       deviceCode: '编码',
       qrcode: '二维码/条形码',
       deviceName: '名称',
@@ -1191,8 +1192,8 @@ export default {
       statusEnabled: '启用',
       statusDisabled: '不启用',
       deviceType: '类型',
-      deviceSpec: '规格',
+      deviceSpec: '规格型号',
-      deviceModel: '型号',
+     /* deviceModel: '型号',*/
       isSchedueld: '是否排产',
       ratedCapacity: '额定产能',
       yes: '是',
@@ -1215,7 +1216,7 @@ export default {
       placeholderDeviceStatus: '请选择状态',
       placeholderDeviceType: '请选择类型',
       placeholderDeviceModel: '请输入型号',
-      placeholderDeviceSpec: '请输入规格',
+      placeholderDeviceSpec: '请输入规格型号',
       placeholderRatedCapacity: '请输入额定产能',
       placeholderProductionDate: '请选择生产日期',
       placeholderFactoryEntryDate: '请选择入厂日期',
@@ -1273,6 +1274,7 @@ export default {
       code: '编码',
       qrcode: '二维码/条形码',
       name: '名称',
+      deviceSpec:'规格型号',
       batchDelete: '批量删除',
       description: '描述',
       remark: '备注',
@@ -1282,6 +1284,7 @@ export default {
       delete: '删除',
       placeholderCode: '请输入编码',
       placeholderName: '请输入名称',
+      placeholderDeviceSpec: '请输入规格型号',
       placeholderDescription: '请输入描述',
       placeholderRemark: '请输入备注',
       placeholderCount: '请输入数量',
@@ -1548,6 +1551,7 @@ export default {
     SpareInfo: {
       name: '备件名称',
       code: '备件编码',
+      deviceSpec:'规格型号',
       qrcode: '二维码/条形码',
       standard: '规格',
       expiryDay: '保质期天数',
@@ -1561,6 +1565,7 @@ export default {
       exportFilename: '备件信息.xls',
       placeholderName: '请输入名称',
       placeholderCode: '请输入编码',
+      placeholderDeviceSpec: '请输入规格型号',
       placeholderUnit: '请选择单位',
       placeholderSafetyNumber: '请输入预警库存数量',
       placeholderRemark: '请输入备注',

src/views/erp/component/product/ProductForm.vue

@@ -36,6 +36,11 @@
             <el-input v-model="formData.name" :placeholder="t('SparePartsManagement.SpareInfo.placeholderName')" />
           </el-form-item>
         </el-col>
+        <el-col :span="12">
+          <el-form-item :label="t('SparePartsManagement.SpareInfo.deviceSpec')" prop="deviceSpec">
+            <el-input v-model="formData.deviceSpec" :placeholder="t('SparePartsManagement.SpareInfo.placeholderDeviceSpec')" />
+          </el-form-item>
+        </el-col>
         <el-col :span="12">
           <el-form-item :label="t('SparePartsManagement.SpareInfo.unit')" prop="unitId">
             <el-select v-model="formData.unitId" clearable :placeholder="t('SparePartsManagement.SpareInfo.placeholderUnit')" class="w-1/1">

src/views/erp/component/product/index.vue

@@ -58,6 +58,7 @@
       <el-table-column :label="t('SparePartsManagement.SpareInfo.code')" align="center" prop="barCode" width="240px"   sortable />
       <el-table-column :label="t('SparePartsManagement.SpareInfo.name')" align="left" prop="name"  width="220px" sortable />
       <el-table-column v-if="checkPermi(['erp:component:standard'])" :label="t('SparePartsManagement.SpareInfo.standard')" align="center" prop="standard" />
+      <el-table-column :label="t('SparePartsManagement.SpareInfo.deviceSpec')" align="center" prop="deviceSpec"  sortable />
       <el-table-column :label="t('SparePartsManagement.SpareInfo.category')" align="center" prop="categoryName"  sortable />
       <el-table-column :label="t('SparePartsManagement.SpareInfo.unit')" align="center" prop="unitName"  sortable />
       <el-table-column :label="t('SparePartsManagement.SpareInfo.safetyNumber')" align="center" prop="safetyNumber" />

src/views/iot/device/index.vue

@@ -1567,7 +1567,7 @@ const handleShowDeviceAlarmHistory = async () => {
   background-color: #fff;
   border-radius: 4px;
   padding: 16px;
-  max-height: calc(100vh - 546px);
+ /* max-height: calc(100vh - 546px);*/
   overflow-y: auto;
 
   .empty-grid {  // 注意：这里缩进要与上面一致

src/views/mes/criticalComponent/CriticalComponentForm.vue

@@ -29,6 +29,13 @@
           clearable
         />
       </el-form-item>
+      <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.deviceSpec')" prop="deviceSpec">
+        <el-input
+          v-model="formData.deviceSpec"
+          :placeholder="t('EquipmentManagement.EquipmentKeyItems.placeholderDeviceSpec')"
+          clearable
+        />
+      </el-form-item>
       <el-form-item :label="t('EquipmentManagement.EquipmentKeyItems.description')" prop="description">
         <el-input
           v-model="formData.description"
@@ -171,6 +178,7 @@ const open = async (type: 'create' | 'update', id?: number) => {
         code: detail?.code,
         isCode: detail?.isCode ?? false,
         name: detail?.name,
+        deviceSpec:detail?.deviceSpec,
         description: detail?.description,
         count: detail?.count,
         remark: detail?.remark,

src/views/mes/criticalComponent/index.vue

@@ -74,6 +74,9 @@ v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"
 :label="t('EquipmentManagement.EquipmentKeyItems.name')" align="center" prop="name"
         min-width="140"  sortable />
       <el-table-column
+        :label="t('EquipmentManagement.EquipmentKeyItems.deviceSpec')" align="center" prop="deviceSpec"
+        min-width="140"  sortable />
+      <el-table-column
 :label="t('EquipmentManagement.EquipmentKeyItems.description')" align="center" prop="description"
         min-width="180" />
               <el-table-column

src/views/mes/deviceledger/DeviceLedgerForm.vue

@@ -13,11 +13,15 @@
             <el-input v-model="formData.id" placeholder="系统自动生成" disabled />
           </el-form-item>
         </el-col> -->
-
+        <el-col :span="8" >
-        <el-col :span="12">
+          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.images')" prop="images">
+            <UploadImg style="height: 100px" v-model="formData.images" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceCode')" prop="deviceCode">
-            <el-row :gutter="10" style="width: 100%">
+            <el-row :gutter="20" style="width: 100%">
-              <el-col :xs="24" :sm="18" :md="16" :lg="14" :xl="12">
+              <el-col :xs="18" :sm="18" :md="16" :lg="14" :xl="10">
                 <el-input
                   v-model="formData.deviceCode"
                   :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceCode')"
@@ -33,16 +37,17 @@
                   />
                 </div>
               </el-col>
+
             </el-row>
           </el-form-item>
-        </el-col>
+
+          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceName')" prop="deviceName" required>
                 <el-input v-model="formData.deviceName" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceName')" />
               </el-form-item>
             </el-col>
-
+            <el-col :span="12">
-        <el-col :span="24">
               <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceType')" prop="deviceType" required>
                 <el-tree-select
                   v-model="formData.deviceType"
@@ -56,35 +61,14 @@
                 />
               </el-form-item>
             </el-col>
+          </el-row>
 
-        <!-- <el-col :span="12">
+          <el-row :gutter="20">
-          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceBrand')" prop="deviceBrand">
+            <el-col :span="12">
-            <el-input v-model="formData.deviceBrand" placeholder="请输入品牌" />
-          </el-form-item>
-        </el-col> -->
-        <el-col :span="24">
-          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceModel')" prop="deviceModel">
-            <el-input v-model="formData.deviceModel" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceModel')" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="24">
               <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceSpec')" prop="deviceSpec">
                 <el-input v-model="formData.deviceSpec" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceSpec')" />
               </el-form-item>
             </el-col>
-        <el-col :span="12">
-          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.isSchedueld')" prop="isSchedueld">
-            <el-switch
-              v-model="formData.isSchedueld"
-              :active-value="1"
-              :inactive-value="0"
-              :active-text="t('EquipmentManagement.EquipmentLedger.yes')"
-              :inactive-text="t('EquipmentManagement.EquipmentLedger.no')"
-              inline-prompt
-            />
-          </el-form-item>
-        </el-col>
             <el-col :span="12">
               <el-form-item :label="t('EquipmentManagement.EquipmentLedger.ratedCapacity')" prop="ratedCapacity">
                 <el-input-number
@@ -97,6 +81,21 @@
                 />
               </el-form-item>
             </el-col>
+          </el-row>
+
+
+        </el-col>
+        <!-- <el-col :span="12">
+          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceBrand')" prop="deviceBrand">
+            <el-input v-model="formData.deviceBrand" placeholder="请输入品牌" />
+          </el-form-item>
+        </el-col> -->
+<!--        <el-col :span="24">
+          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceModel')" prop="deviceModel">
+            <el-input v-model="formData.deviceModel" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceModel')" />
+          </el-form-item>
+        </el-col>-->
+
 
         <!-- <el-col :span="12">
           <el-form-item label="供应商" prop="supplier">
@@ -125,20 +124,31 @@
         -->
         <!-- </el-form-item>
       </el-col> -->
-
+        <el-col :span="8">
-        <el-col :span="24">
+          <el-form-item :label="t('EquipmentManagement.EquipmentLedger.isSchedueld')" prop="isSchedueld">
+            <el-switch
+              v-model="formData.isSchedueld"
+              :active-value="1"
+              :inactive-value="0"
+              :active-text="t('EquipmentManagement.EquipmentLedger.yes')"
+              :inactive-text="t('EquipmentManagement.EquipmentLedger.no')"
+              inline-prompt
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.productionDate')" prop="productionDate" required>
             <el-date-picker v-model="formData.productionDate" type="date" value-format="YYYY-MM-DD" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderProductionDate')" class="!w-full" />
           </el-form-item>
         </el-col>
 
-        <el-col :span="24">
+        <el-col :span="8">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.factoryEntryDate')" prop="factoryEntryDate" required>
             <el-date-picker v-model="formData.factoryEntryDate" type="date" value-format="YYYY-MM-DD" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderFactoryEntryDate')" class="!w-full" />
           </el-form-item>
         </el-col>
 
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceLocation')" prop="deviceLocation">
             <el-input v-model="formData.deviceLocation" :placeholder="t('EquipmentManagement.EquipmentLedger.placeholderDeviceLocation')" />
           </el-form-item>
@@ -162,7 +172,7 @@
         <!-- </el-form-item>
       </el-col> -->
 
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item :label="t('EquipmentManagement.EquipmentLedger.deviceManagerName')" prop="deviceManagerIds">
             <el-select
               v-model="formData.deviceManagerIds"

src/views/mes/deviceledger/index.vue

@@ -123,8 +123,8 @@
                              align="center" prop="ratedCapacity" min-width="120px"/>
             <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceSpec')"
                              align="center" prop="deviceSpec"/>
-            <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceModel')"
+<!--            <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceModel')"
-                             align="center" prop="deviceModel"/>
+                             align="center" prop="deviceModel"/>-->
             <!-- <el-table-column :label="t('EquipmentManagement.EquipmentLedger.deviceBrand')" align="center" prop="deviceBrand" /> -->
             <el-table-column
               :label="t('EquipmentManagement.EquipmentLedger.productionDate')" align="center"