Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web

src/api/mes/dvsubject/index.ts

@@ -11,6 +11,7 @@ export interface DvSubjectVO {
   isEnable: string // 是否启用
   inspectionMethod: string // 检验方式
   valueType: string // 值类型
+  jobType:string // 作业类型
   judgmentCriteria: string // 判定基准
   creator?: string // 创建人
   createTime?: string | number | Date // 创建时间

src/locales/zh-CN.ts

@@ -1300,6 +1300,7 @@ export default {
       name: '名称',
       inspectionMethod: '作业方式',
       valueType: '结果类型',
+      JobType:'作业类型',
       judgmentCriteria: '判定基准',
       upperVal: '上限值',
       lowerVal: '下限值',
@@ -1319,14 +1320,15 @@ export default {
       placeholderProjectName: '请输入项目名称',
       placeholderInspectionMethod: '请选择检验方式',
       placeholderValueType: '请选择值类型',
+      placeholderJobType: '请选择作业类型',
       placeholderUpperVal: '请输入上限值',
       placeholderLowerVal: '请输入下限值'
     },
 
     // 方案维护
     PlanMaintenance: {
-      planName: '方案名称',
+      planName: '模板名称',
-      planType: '方案类型',
+      planType: '模板类型',
       planTypeMaintain: '保养',
       planTypeInspect: '点检',
       description: '描述',
@@ -1340,14 +1342,14 @@ export default {
       inspectionMethod: '检验方式',
       judgmentCriteria: '判定基准',
       batchDelete: '批量删除',
-      placeholderPlanName: '请输入方案名称',
+      placeholderPlanName: '请输入模板名称',
       placeholderDescription: '请输入描述',
-      placeholderPlanType: '请选择方案类型',
+      placeholderPlanType: '请选择模板类型',
       placeholderSubjectName: '请输入名称',
       placeholderSubjectDescription: '请输入描述',
       placeholderSubjectSelect: '请选择关联项目',
       selectDeleteTip: '请选择需要删除的数据',
-      exportFilename: '方案维护.xls'
+      exportFilename: '模板维护.xls'
     },
 
     // 任务管理
@@ -1459,7 +1461,7 @@ export default {
       repairLineTitle: '设备维修项目行',
       lineSubjectCode: '维修编码',
       lineSubjectName: '维修名称',
-      lineSubjectContent: '维修内容',
+      lineSubjectContent: '维修方法',
       lineRemark: '备注',
       lineResult: '结果',
       lineResultOk: '通过',
@@ -1520,7 +1522,7 @@ export default {
       deviceType: '设备类型',
       device: '设备',
       component: '关键件',
-      projectContent: '维修内容',
+      projectContent: '维修方法',
       createTime: '创建时间',
       deviceName: '设备名称',
       componentName: '关键件名称',
@@ -1534,7 +1536,7 @@ export default {
       placeholderSubjectCode: '请输入维修编码',
       placeholderSubjectName: '请输入维修名称',
       placeholderDeviceType: '请选择设备类型',
-      placeholderProjectContent: '请输入维修内容',
+      placeholderProjectContent: '请输入维修方法',
       placeholderCreateTimeStart: '开始日期',
       placeholderCreateTimeEnd: '结束日期',
       placeholderDevice: '请选择设备',

src/utils/dict.ts

@@ -268,6 +268,7 @@ export enum DICT_TYPE {
   MES_ZJ_PRODUCT = "mes_zj_product",
   FILE_STATUS = "file_status",
   Classification = "classification",
+  MES_JOB_TYPE = "mes_job_type",
   //====iot
   IOT_SIEMENS_TYPE = "iot_siemens_type",
   IOT_MODBUS_TYPE = "iot_modbus_type",

src/views/mes/dvsubject/DvSubjectForm.vue

@@ -42,6 +42,21 @@
           <el-option v-for="dict in valueTypeOptions" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
+      <el-form-item :label="t('EquipmentManagement.DvSubject.JobType')" prop="jobType">
+        <el-select
+          v-model="formData.jobType"
+          clearable
+          :placeholder="t('EquipmentManagement.DvSubject.placeholderJobType')"
+          class="!w-full"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_JOB_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="t('EquipmentManagement.DvSubject.upperVal')" prop="upperVal" v-if="formData.valueType == 0">
         <el-input-number
           v-model="formData.upperVal"
@@ -82,10 +97,9 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { getBoolDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getBoolDictOptions, getStrDictOptions, DICT_TYPE,getIntDictOptions } from '@/utils/dict'
 import { DvSubjectApi, DvSubjectVO } from '@/api/mes/dvsubject'
 import { useDictStoreWithOut } from '@/store/modules/dict'
-
 /** 维保项目 表单 */
 defineOptions({ name: 'DvSubjectForm' })
 
@@ -109,6 +123,7 @@ const formData = ref({
   isEnable: undefined,
   inspectionMethod: undefined,
   valueType: undefined,
+  jobType: undefined,
   judgmentCriteria: undefined,
   upperVal: undefined,
   lowerVal: undefined
@@ -118,6 +133,7 @@ const formRules = reactive({
   subjectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
   inspectionMethod: [{ required: true, message: '检验方式不能为空', trigger: 'change' }],
   valueType: [{ required: true, message: '值类型不能为空', trigger: 'change' }],
+  jobType: [{ required: true, message: '作业类型不能为空', trigger: 'change' }],
   // judgmentCriteria: [{ required: true, message: '判定基准不能为空', trigger: 'blur' }],
   isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'change' }],
 })
@@ -160,6 +176,7 @@ const submitForm = async () => {
       isEnable: formData.value.isEnable,
       inspectionMethod: formData.value.inspectionMethod,
       valueType: formData.value.valueType,
+      jobType: formData.value.jobType,
       judgmentCriteria: formData.value.judgmentCriteria,
       upperVal: formData.value.upperVal,
       lowerVal: formData.value.lowerVal
@@ -188,6 +205,7 @@ const resetForm = () => {
     isEnable: true,
     inspectionMethod: undefined,
     valueType: undefined,
+    jobType: undefined,
     judgmentCriteria: undefined,
     upperVal: undefined,
     lowerVal: undefined

src/views/mes/dvsubject/index.vue

@@ -92,6 +92,11 @@ effect="light" :type="getTagType('value_types', scope.row.valueType)"
           </el-tag>
         </template>
       </el-table-column>
+      <el-table-column :label="t('EquipmentManagement.DvSubject.JobType')" align="center" prop="jobType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_JOB_TYPE" :value="scope.row.jobType" />
+        </template>
+      </el-table-column>
       <el-table-column :label="t('EquipmentManagement.DvSubject.judgmentCriteria')" align="center" width="480px" prop="judgmentCriteria" />
       <el-table-column :label="t('EquipmentManagement.DvSubject.creatorName')" align="center" prop="creatorName"  sortable />
       <el-table-column :label="t('EquipmentManagement.DvSubject.createTime')" align="center" prop="createTime" :formatter="dateFormatter" width="180px"  sortable />
@@ -121,7 +126,7 @@ effect="light" :type="getTagType('value_types', scope.row.valueType)"
 </template>
 
 <script setup lang="ts">
-import { getStrDictOptions } from '@/utils/dict'
+import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { DvSubjectApi, DvSubjectVO } from '@/api/mes/dvsubject'

src/views/mes/workOrderManagement/components/TicketResultDialog.vue

@@ -79,13 +79,16 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="输入值" align="center" min-width="150">
+      <el-table-column label="输入值" align="center" min-width="200">
         <template #default="scope">
           <el-input
             v-if="String(scope.row.valueType) === '0' || String(scope.row.valueType) === '2'"
             v-model="scope.row.textInput"
             :disabled="String(scope.row.inspectionResult) !== '0'"
             clearable
+            :rows="2"
+            type="textarea"
+            style="resize: both;"
             placeholder="请输入"
           />
           <span v-else>-</span>