浏览代码

feat(生产管理-部件类型): 修改表单组件

添加一些新的表单提交属性
wyoujia 1 年之前
父节点
当前提交
a7e92809ac

+ 2 - 1
admin.ui.plus-master/src/api/admin/productionManagement/ComponentTypeDto.ts

@@ -40,5 +40,6 @@ export interface typeTable {
   guid?: number
   img?: string
   remark?: string | null
-  status: number
+  status?: number | string
+  type?:number | string
 }

+ 22 - 56
admin.ui.plus-master/src/views/admin/product/components/form-edit.vue

@@ -8,6 +8,11 @@
                size="default"
                label-width="80px">
         <el-row :gutter="35">
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="部件类型" prop="type">
+              <el-input v-model="formData.editData.type" placeholder="格式:message.router.xxx" clearable></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="部件名称" prop="bomName">
               <el-input v-model="formData.editData.bomName" placeholder="格式:message.router.xxx" clearable></el-input>
@@ -23,38 +28,16 @@
               <el-input v-model="formData.editData.status" placeholder="格式:message.router.xxx" clearable></el-input>
             </el-form-item>
           </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+            <el-form-item label="图片" prop="img">
+              <el-input v-model="formData.editData.img" placeholder="格式:message.router.xxx" clearable></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
             <el-form-item label="备注" prop="remark">
               <el-input v-model="formData.editData.remark" placeholder="格式:message.router.xxx" clearable type="textarea"></el-input>
             </el-form-item>
           </el-col>
-<!--          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">-->
-<!--            <el-form-item label="有效时间" prop="expiedTime">-->
-<!--              <el-date-picker-->
-<!--                v-model="formData.editData.expiedTime"-->
-<!--                type="datetime"-->
-<!--                value-format="YYYY-MM-DD HH:mm:ss"-->
-<!--                placeholder="选择有效时间"-->
-<!--              />-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">-->
-<!--            <el-form-item label="状态" prop="state">-->
-<!--              <el-select v-model="formData.editData.state" class="m-2" placeholder="选择状态" >-->
-<!--                <el-option-->
-<!--                  v-for="item in formData.options"-->
-<!--                  :key="item.value"-->
-<!--                  :label="item.label"-->
-<!--                  :value="item.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">-->
-<!--            <el-form-item label="备注" prop="remark">-->
-<!--              <el-input v-model="formData.editData.remark" placeholder="格式:message.router.xxx" clearable type="textarea"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
         </el-row>
       </el-form>
       <template #footer>
@@ -87,31 +70,24 @@ const formData = reactive({
   titleText:'',
   buttonText:'',
   isShowDialog: false,
+  //表单数据对象
   editData:{} as typeTable,
-  /**动态表头 */
-  dynamicColumns: [
-    { prop: 'bomName', label: '部件名称' },
-    { prop: 'bomNo', label: '物料号' },
-    { prop: 'remark', label: '备注' },
-    { prop: 'status', label: '状态' },
-  ],
-  options:[
-    {label:'正常',value:'正常'},
-    {label:'未授权',value:'未授权'},
-  ]
 })
 
-/**有效时间选择校验*/
-const validateDate = (rule: any, value: any, callback: any) => {
-  if(new Date(value).getTime() > Date.now()){
-    callback()
-  }else{
-    callback(new Error('选择的时间已失效'))
-  }
-}
+// /**有效时间选择校验*/
+// const validateDate = (rule: any, value: any, callback: any) => {
+//   if(new Date(value).getTime() > Date.now()){
+//     callback()
+//   }else{
+//     callback(new Error('选择的时间已失效'))
+//   }
+// }
 
 /**表单校验*/
 const rules = reactive<FormRules>({
+  type:[
+    {required: true, message: '请选择部件类型', trigger: 'blur' }
+  ],
   bomName: [
     { required: true, message: '请输入部件名称', trigger: 'blur' },
   ],
@@ -119,16 +95,6 @@ const rules = reactive<FormRules>({
     { required: true, message: '请输入物料号', trigger: 'blur' },
   ],
   status: [
-    { required: true, message: '请输入状态', trigger: 'blur' },
-  ],
-  key: [
-    { required: true, message: '请输入设备授权码', trigger: 'blur' },
-  ],
-  expiedTime: [
-    { type: 'date', required: true, message: '请选择有效期', trigger: 'blur' },
-    { validator: validateDate, trigger: 'blur' }
-  ],
-  state: [
     { required: true, message: '请选择状态', trigger: 'blur' },
   ],
 })

+ 1 - 1
admin.ui.plus-master/src/views/admin/product/type.vue

@@ -43,7 +43,7 @@
         <el-card style="height: 70vh" class="my-fill mt8" shadow="hover">
           <el-table v-loading="state.loading" :data="state.bomListData" row-key="id" style="width: 100%">
             <el-table-column prop="guid" label="序号"  />
-            <el-table-column prop="bomType" label="部件类型"  />
+            <el-table-column prop="type" label="部件类型"  />
             <el-table-column prop="bomName" label="部件名称"  />
             <el-table-column prop="bomNo" label="物料号"  />
             <el-table-column prop="status" label="状态"  />