修改机床组件弹窗标题

imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/controller/baseData/vo/CustomerInfoRespVO.java

@@ -61,4 +61,7 @@ public class CustomerInfoRespVO {
     @ExcelProperty("备注")
     private String remark;
 
+    @Schema(description = "租户id")
+    private Long tenantId;
+
 }

imt-server/imt-module-system/imt-module-system-biz/src/main/java/com/inspur/module/system/dal/mysql/equip/EquipInfoMapper.java

@@ -30,6 +30,7 @@ public interface EquipInfoMapper extends BaseMapperX<EquipInfoDO> {
                 .likeIfPresent(EquipInfoDO::getEquipName, reqVO.getEquipName())
                 .likeIfPresent(EquipInfoDO::getEquipNo, reqVO.getEquipNo())
                 .eqIfPresent(EquipInfoDO::getStatus, reqVO.getStatus())
+                .eqIfPresent(EquipInfoDO::getRunStatus, reqVO.getRunStatus())
                 .groupBy(EquipInfoDO::getCustomerId, EquipInfoDO::getModelId)
         );
     }

imt-ui/src/views/system/baseData/customerInfo/CustomerInfoForm.vue

@@ -156,6 +156,15 @@ export default {
   name: "CustomerInfoForm",
   components: {},
   data() {
+    // 定义验证规则
+    var validatePhoneNumber = (rule, value, callback) => {
+      const reg = /^1[3|4|5|6|7|8|9][0-9]{9}$/
+      if (!reg.test(value)) {
+        callback(new Error('请输入有效的手机号码'))
+      } else {
+        callback()
+      }
+    };
     return {
       areaTree: [],
       areaTreeData: [],
@@ -188,6 +197,10 @@ export default {
         industryType: [
           { required: true, message: "请选择所属行业", trigger: "change" },
         ],
+        contactPhone: [
+          { required: true, message: '请输入手机号码', trigger: 'blur' },
+          { validator: validatePhoneNumber, trigger: 'blur' }
+        ],
       },
 
       tenantLists: [],

imt-ui/src/views/system/baseData/modelinfo/ModelInfoForm.vue

@@ -25,7 +25,7 @@
           <el-input v-model="formData.remark" :rows="4" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
         <el-form-item label="型号图片：" prop="modelPicPath">
-          <ImageUpload v-model="formData.modelPicPath"/>
+          <ImageUpload v-model="formData.modelPicPath" :limit="1"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

imt-ui/src/views/system/equip/componentInfo/ComponentInfoForm.vue

@@ -212,12 +212,12 @@ export default {
             this.formData.equipId,
             this.equipCascader
           );
-          this.title = "修改机床组件信息";
+          this.dialogTitle = "修改机床组件信息";
         } finally {
           this.formLoading = false;
         }
       }
-      this.title = "新增机床组件信息";
+      this.dialogTitle = "新增机床组件信息";
     },
     /** 提交按钮 */
     async submitForm() {

imt-ui/src/views/system/equip/equipInfo/EquipInfoForm.vue

@@ -146,7 +146,7 @@
           />
         </el-form-item>
         <el-form-item label="二维码图片">
-          <ImageUpload v-model="formData.qrcodePicPath" />
+          <ImageUpload v-model="formData.qrcodePicPath" :limit="1"/>
         </el-form-item>
       </el-form>
       <div

imt-ui/src/views/system/equip/equipInfo/index.vue

@@ -58,7 +58,7 @@
       </el-form-item>
       <el-form-item
         label="机床状态"
-        prop="status"
+        prop="runStatus"
       >
         <el-select
           v-model="queryParams.status"
@@ -67,7 +67,7 @@
           size="small"
         >
           <el-option
-            v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_STATUS)"
+            v-for="dict in this.getDictDatas(DICT_TYPE.EQUIP_RUN_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -178,12 +178,12 @@
       <el-table-column
         label="机床状态"
         align="center"
-        prop="status"
+        prop="runStatus"
       >
         <template v-slot="scope">
           <dict-tag
-            :type="DICT_TYPE.EQUIP_STATUS"
+            :type="DICT_TYPE.EQUIP_RUN_STATUS"
-            :value="scope.row.status"
+            :value="scope.row.runStatus"
           />
         </template>
       </el-table-column>