Merge remote-tracking branch 'origin/main'

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

@@ -116,7 +116,7 @@
                 :precision="0" class="!w-1/1" />
             </el-form-item>
           </el-col>
-          <el-col v-if="isProductCategory" :span="12">
+          <!-- <el-col v-if="isProductCategory" :span="12">
             <el-form-item label="关联设备" prop="devices">
               <el-input :model-value="deviceDisplayText" placeholder="点击选择设备" readonly
                 @click="openDeviceSelectDialog" />
@@ -126,7 +126,7 @@
             <el-form-item label="关联模具" prop="molds">
               <el-input :model-value="moldDisplayText" placeholder="点击选择模具" readonly @click="openMoldSelectDialog" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col v-if="formData.categoryType === 1" :span="12">
             <el-form-item :label="t('FactoryModeling.ProductInformation.dialogPackagingSchemeLabel')"
               prop="packagingSchemes">

src/views/iot/devicemodel/components/DeviceModelAttributeForm.vue

@@ -127,7 +127,8 @@ const formData = ref({
 const formRules = reactive({
   attributeCode: [{ required: true, message: t('DataCollection.DeviceModel.validatorAttributeCodeRequired'), trigger: 'blur' }],
   attributeName: [{ required: true, message: t('DataCollection.DeviceModel.validatorAttributeNameRequired'), trigger: 'blur' }],
-  dataType: [{ required: true, message: t('DataCollection.DeviceModel.validatorDataTypeRequired'), trigger: 'change' }]
+  dataType: [{ required: true, message: t('DataCollection.DeviceModel.validatorDataTypeRequired'), trigger: 'change' }],
+  attributeType: [{ required: true, message: '点位类型不能为空', trigger: 'change' }]
 })
 const formRef = ref() // 表单 Ref
 const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表

src/views/mes/task/components/TaskDetailList.vue

@@ -29,13 +29,13 @@
           >
             {{ t('ProductionPlan.Task.detailListViewActionText') }}
           </el-button>
-          <el-button
+          <!-- <el-button
             link
             type="info"
             @click="openItemNeed(scope.row.productName, scope.row.productId, scope.row.number)"
           >
             {{ t('ProductionPlan.Task.detailListMaterialActionText') }}
-          </el-button>
+          </el-button> -->
           <!-- <el-button
             link
             type="warning"

src/views/mes/workReportRecord/index.vue

@@ -44,7 +44,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableTaskCodeColumn')" align="center" prop="taskCode" min-width="120px" sortable />
       <el-table-column :label="t('ProductionPlan.WorkReportRecord.tablePlanCodeColumn')" align="center" prop="planCode" min-width="120px" sortable />
-      <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableEmployeeIdColumn')" align="center" prop="employeeId" min-width="100px" sortable />
+      <!-- <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableEmployeeIdColumn')" align="center" prop="employeeId" min-width="100px" sortable /> -->
       <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableEmployeeNameColumn')" align="center" prop="employeeName" min-width="100px" sortable />
       <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableProductNameColumn')" align="center" prop="productName" min-width="120px" sortable />
       <el-table-column :label="t('ProductionPlan.WorkReportRecord.tableProductCodeColumn')" align="center" prop="productCode" min-width="100px" sortable />