BUG修改

src/utils/dict.ts

@@ -13,21 +13,21 @@ const dictStore = useDictStoreWithOut()
  * @returns {*|Array} 数据字典数组
  */
 export interface DictDataType {
-  dictType: string
+  dictType : string
-  label: string
+  label : string
-  value: string | number | boolean
+  value : string | number | boolean
-  colorType: ElementPlusInfoType | ''
+  colorType : ElementPlusInfoType | ''
-  cssClass: string
+  cssClass : string
 }
 
-export const getDictOptions = (dictType: string) => {
+export const getDictOptions = (dictType : string) => {
   return dictStore.getDictByType(dictType) || []
 }
 
-export const getIntDictOptions = (dictType: string) => {
+export const getIntDictOptions = (dictType : string) => {
-  const dictOption: DictDataType[] = []
+  const dictOption : DictDataType[] = []
-  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  const dictOptions : DictDataType[] = getDictOptions(dictType)
-  dictOptions.forEach((dict: DictDataType) => {
+  dictOptions.forEach((dict : DictDataType) => {
     dictOption.push({
       ...dict,
       value: parseInt(dict.value + '')
@@ -36,10 +36,10 @@ export const getIntDictOptions = (dictType: string) => {
   return dictOption
 }
 
-export const getStrDictOptions = (dictType: string) => {
+export const getStrDictOptions = (dictType : string) => {
-  const dictOption: DictDataType[] = []
+  const dictOption : DictDataType[] = []
-  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  const dictOptions : DictDataType[] = getDictOptions(dictType)
-  dictOptions.forEach((dict: DictDataType) => {
+  dictOptions.forEach((dict : DictDataType) => {
     dictOption.push({
       ...dict,
       value: dict.value + ''
@@ -48,10 +48,10 @@ export const getStrDictOptions = (dictType: string) => {
   return dictOption
 }
 
-export const getBoolDictOptions = (dictType: string) => {
+export const getBoolDictOptions = (dictType : string) => {
-  const dictOption: DictDataType[] = []
+  const dictOption : DictDataType[] = []
-  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  const dictOptions : DictDataType[] = getDictOptions(dictType)
-  dictOptions.forEach((dict: DictDataType) => {
+  dictOptions.forEach((dict : DictDataType) => {
     dictOption.push({
       ...dict,
       value: dict.value + '' === 'true'
@@ -66,8 +66,8 @@ export const getBoolDictOptions = (dictType: string) => {
  * @param value 字典值
  * @return DictDataType 字典对象
  */
-export const getDictObj = (dictType: string, value: any): DictDataType | undefined => {
+export const getDictObj = (dictType : string, value : any) : DictDataType | undefined => {
-  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  const dictOptions : DictDataType[] = getDictOptions(dictType)
   for (const dict of dictOptions) {
     if (dict.value === value + '') {
       return dict
@@ -82,10 +82,10 @@ export const getDictObj = (dictType: string, value: any): DictDataType | undefin
  * @param value 字典数据的值
  * @return 字典名称
  */
-export const getDictLabel = (dictType: string, value: any): string => {
+export const getDictLabel = (dictType : string, value : any) : string => {
-  const dictOptions: DictDataType[] = getDictOptions(dictType)
+  const dictOptions : DictDataType[] = getDictOptions(dictType)
   const dictLabel = ref('')
-  dictOptions.forEach((dict: DictDataType) => {
+  dictOptions.forEach((dict : DictDataType) => {
     if (dict.value === value + '') {
       dictLabel.value = dict.label
     }
@@ -277,7 +277,7 @@ export enum DICT_TYPE {
   DEVICE_MOLD_TYPE = 'device_mold_type', // 设备/模具类型
   TRANSACTION_TYPE = 'transaction_Type', // 事务类型
   RESULT = 'result', // 事务类型
-  
+  REQUEST_APPLY = 'class_type', // 班组类型
 
 
 }

src/views/eam/basic/item/index.vue

@@ -147,7 +147,6 @@
   }
 
   /** 添加设备操作 */
-
   // (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any )
   const searchTableRef = ref()
   const selectDevice = (row) => {

src/views/eam/item/itemApplyMain/index.vue

@@ -76,7 +76,8 @@
        // 明细查询页赋值
        row[formField] = val[0][searchField]
        row['itemNumber'] = val[0]['number']
-       
+       row['isRadeIn'] = val[0]['isRadeIn']
+       row['available'] = val[0]['available']
      }else {
         const setV = {}
         setV[formField] = val[0][searchField]

src/views/eam/item/itemApplyMain/itemApplyMain.data.ts

@@ -1,10 +1,7 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import { dateFormatter } from '@/utils/formatTime'
-
 import { Item } from '@/views/eam/basic/item/item.data'
 import * as ItemApi from '@/api/eam/basic/item'
-
-
 import { validateHanset, validateEmail } from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
@@ -16,109 +13,39 @@ export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '申请编号',
     field: 'number',
     sort: 'custom',
+    isForm: false,
     isSearch: true,
-  },
+    table: {
-  {
+      width: 180,
-    label: '描述',
+      fixed: 'left'
-    field: 'name',
-    sort: 'custom',
-  },
-  {
-    label: '维修申领、以旧换新',
-    field: 'type',
-    sort: 'custom',
-    form: {
-      component: 'Select'
     },
   },
   {
-    label: '申领人id',
+    label: '申领人',
     field: 'applyId',
     sort: 'custom',
-    form: {
+    isForm: false,
-      component: 'InputNumber',
+    isSearch: true,
-      value: 0
-    },
-  },
-  {
-    label: '申领人部门id',
-    field: 'applyDeptId',
-    sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
   },
   {
-    label: '审批人id',
+    label: '审批人',
     field: 'approveId',
     sort: 'custom',
-    form: {
+    isForm: false,
-      component: 'InputNumber',
+    isSearch: true,
-      value: 0
-    },
-  },
-  {
-    label: '审批时间',
-    field: 'approveTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
   },
   {
-    label: '出库人id',
+    label: '出库人',
     field: 'outId',
     sort: 'custom',
-    form: {
+    isForm: false,
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '出库时间',
-    field: 'outTime',
-    sort: 'custom',
-    formatter: dateFormatter,
     isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        type: 'datetime',
-        valueFormat: 'x'
-      }
-    },
   },
   {
-    label: '创建时间',
+    label: '描述',
-    field: 'createTime',
+    field: 'name',
     sort: 'custom',
-    formatter: dateFormatter,
-    isSearch: true,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
   },
-    isForm: false,
-  },
-
   {
     label: '是否可用',
     field: 'available',
@@ -144,7 +71,6 @@ export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-
   {
     label: '操作',
     field: 'action',
@@ -158,8 +84,8 @@ export const ItemApplyMain = useCrudSchemas(reactive<CrudSchema[]>([
 
 //表单校验
 export const ItemApplyMainRules = reactive({
-  type: [
+  name: [
-    { required: true, message: '请选择订单类型', trigger: 'change' }
+    { required: true, message: '请填写描述', trigger: 'change' }
   ],
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
@@ -193,17 +119,50 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
       ]
     },
   },
-
   {
-    label: '备注',
+    label: '数量',
-    field: 'remark',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '库存数量',
+    field: 'currentQty',
+    sort: 'custom',
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
   },
   {
     label: '是否可用',
     field: 'available',
+    sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
@@ -213,42 +172,35 @@ export const ItemApplyDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       type: 'Select',
-      default: 'TRUE',
+      disabled: true
-      inactiveValue: 'FALSE',
-      activeValue: 'TRUE'
-    },
-    form: {
-      component: 'Switch',
-      value: 'TRUE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
     }
   },
+  
+  
   {
-    label: '创建时间',
+    label: '是否以旧换新',
-    field: 'createTime',
+    field: 'isRadeIn',
+    sort: 'custom',
+    dictType: DICT_TYPE.TRUE_FALSE,
+    dictClass: 'string',
+    isSearch: true,
     isTable: true,
-    isTableForm: false,
-    formatter: dateFormatter,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
     table: {
-      width: 180
+      width: 150
     },
-    isForm: false,
+    tableForm: {
-    form: {
+      type: 'Select',
-      component: 'DatePicker',
+      disabled: true
-      componentProps: {
-        style: { width: '100%' },
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
     }
   },
+  {
+    label: '备注',
+    field: 'remark',
+    table: {
+      width: 150
+    },
+  },
+
   {
     label: '操作',
     field: 'action',

src/views/system/dept/DeptForm.vue

@@ -51,27 +51,9 @@
         </el-select>
       </el-form-item>
       
-      <el-form-item label="是否设备维修班组" prop="isDeviceClass">
+      <el-form-item label="班组类型" prop="classType">
        <el-select v-model="formData.classType" clearable placeholder="请选择班组类型">
          <el-option
            v-for="dict in getIntDictOptions(DICT_TYPE.REQUEST_APPLY)"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
-        <el-select v-model="formData.isDeviceClass" clearable placeholder="请选择是否设备维修班组">
+      
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
       
-      <el-form-item label="是否模具维修班组" prop="isMoldClass">
-        <el-select v-model="formData.isMoldClass" clearable placeholder="请选择是否模具维修班组">
-          <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -105,8 +87,7 @@ const formData = ref({
   phone: undefined,
   email: undefined,
   status: CommonStatusEnum.ENABLE,
-  isDeviceClass: CommonStatusEnum.DISABLE,
+  classType: undefined,
-  isMoldClass: CommonStatusEnum.DISABLE,
 })
 const formRules = reactive({
   parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
@@ -116,7 +97,8 @@ const formRules = reactive({
   phone: [
     { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
   ],
-  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+  classType: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 const deptTree = ref() // 树形结构