Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

3 months ago · 79bd859f48
11 changed files with 104 additions and 35 deletions
--- a/src/views/qms/inspectionQ1/index.vue
+++ b/src/views/qms/inspectionQ1/index.vue
@ -185,7 +185,8 @@ const openForm = (type: string, row?: any) => {
 nextTick(() => {
     basicFormRef.value.formRef.setValues({
      handleTime: new Date().getTime(),
-      claimTime: new Date().getTime()
+      claimTime: new Date().getTime(),
+      priority: '3',
     })
   })
  }
--- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts
+++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts
@ -141,10 +141,13 @@ export const Q1 = useCrudSchemas(
        width: 150
      },
      form: {
-        component: 'InputNumber'
+        component: 'InputNumber',
+        componentProps: {
+          min: 1,
+          precision: 2
+        }
      }
    },
-
    {
      label: '单位',
      field: 'uom',
@ -291,7 +294,7 @@ export const Q1 = useCrudSchemas(
        component: 'DatePicker',
        componentProps: {
          type: 'datetime',
-          valueFormat: 'x',
+          valueFormat: 'x'
        }
      }
    },
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@ -193,7 +193,8 @@ const openForm = (type: string, row?: any) => {
 nextTick(() => {
     basicFormRef.value.formRef.setValues({
      handleTime: new Date().getTime(),
-      claimTime: new Date().getTime()
+      claimTime: new Date().getTime(),
+      priority: '3',
     })
   })
  }
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@ -71,6 +71,11 @@ export const Q2 = useCrudSchemas(
              key: 'available',
              value: 'TRUE',
              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
            }
          ]
        }
@ -227,10 +232,13 @@ export const Q2 = useCrudSchemas(
        width: 150
      },
      form: {
-        component: 'InputNumber'
+        component: 'InputNumber',
+        componentProps: {
+          min: 1,
+          precision: 2
+        }
      }
    },
-
    {
      label: '编码',
      field: 'code',
--- a/src/views/qms/inspectionQ3/index.vue
+++ b/src/views/qms/inspectionQ3/index.vue
@ -186,7 +186,8 @@ const openForm = (type: string, row?: any) => {
    if (type=='create') { 
 nextTick(() => {
     basicFormRef.value.formRef.setValues({
-      handleTime: new Date().getTime()
+      handleTime: new Date().getTime(),
+      priority: '3',
     })
   })
  }
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@ -65,6 +65,11 @@ export const Q3 = useCrudSchemas(
              key: 'available',
              value: 'TRUE',
              isMainValue: false
+            },
+            {
+              key: 'status',
+              value: '0',
+              isMainValue: false
            }
          ]
        }
@ -93,6 +98,7 @@ export const Q3 = useCrudSchemas(
      label: '物料代码',
      field: 'itemCode',
      sort: 'custom',
+      isSearch: true,
      table: {
        width: 150
      },
@ -140,7 +146,11 @@ export const Q3 = useCrudSchemas(
        width: 150
      },
      form: {
-        component: 'InputNumber'
+        component: 'InputNumber',
+        componentProps: {
+          min: 1,
+          precision: 2
+        }
      }
    },
    {
--- a/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
+++ b/src/views/qms/inspectionRequest/inspectionRequestMain.data.ts
@ -237,6 +237,7 @@ export const InspectionMain = useCrudSchemas(
        componentProps: {
          isSearchList: true, // 开启查询弹窗
          searchTitle: '供应商信息', // 查询弹窗标题
+          searchListPlaceholder: '请选择供应商', // 输入框占位文本
          searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类
          searchField: 'code', // 查询弹窗赋值字段
          searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法
@ -277,6 +278,7 @@ export const InspectionMain = useCrudSchemas(
        componentProps: {
          isSearchList: true, // 开启查询弹窗
          searchTitle: '物料信息', // 查询弹窗标题
+          searchListPlaceholder: '请选择物料', // 输入框占位文本
          searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类
          searchField: 'code', // 查询弹窗赋值字段
          searchPage: ItemApi.getItembasicPage, // 查询弹窗所需分页方法
--- a/src/views/report/printBusinesstypeTemplate/index.vue
+++ b/src/views/report/printBusinesstypeTemplate/index.vue
@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods

 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:printBusinesstypeTemplate:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:printBusinesstypeTemplate:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:printBusinesstypeTemplate:export'}), // 导出
+  defaultButtons.defaultAddBtn({hasPermi:'wms:print-businesstype-template:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:print-businesstype-template:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:print-businesstype-template:export'}), // 导出
  defaultButtons.defaultFreshBtn(null), // 刷新
  defaultButtons.defaultFilterBtn(null), // 筛选
  defaultButtons.defaultSetBtn(null), // 设置
@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {

 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:printBusinesstypeTemplate:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:printBusinesstypeTemplate:delete'}), // 删除
+  defaultButtons.mainListEditBtn({hasPermi:'wms:print-businesstype-template:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:print-businesstype-template:delete'}), // 删除
 ]

 // 列表-操作按钮事件
--- a/src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts
+++ b/src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts
@ -1,5 +1,12 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import * as BusinesstypeApi from '@/api/wms/businesstype'
+import { Businesstype } from '@//views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts'

+// const templateCodes  = await UserApi.getSimpleUserList()
+const templateCodes  = [{
+  name:1111,
+  id:111
+}]
 // 表单校验
 export const PrintBusinesstypeTemplateRules = reactive({
  businesstypeCode: [required],
@ -18,12 +25,40 @@ export const PrintBusinesstypeTemplate = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'businesstypeCode',
    sort: 'custom',
    isSearch: true,
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择业务类型', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '业务类型', // 查询弹窗标题
+        searchAllSchemas: Businesstype.allSchemas, // 查询弹窗所需类
+        searchPage: BusinesstypeApi.getBusinesstypePage, // 查询弹窗所需分页方法
+        // searchCondition: [{
+        //   key: 'available',
+        //   value: 'TRUE',
+        //   isMainValue: false
+        // }]
+      }
+    }
+    
  },
  {
    label: '模板代码',
    field: 'templateCode',
    sort: 'custom',
    isSearch: true,
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: templateCodes,
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    }
  },
  {
    label: '备注',
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@ -64,27 +64,27 @@ export const Itembasic = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    } ,
  },
-  // {
-  //   label: '状态',
-  //   field: 'status',
-  //   sort: 'custom',
-  //   dictType: DICT_TYPE.ITEM_STATUS,
-  //   dictClass: 'string',
-  //   isForm: false,
-  //   isSearch: false,
-  //   isTable: false,
-  //   table: {
-  //     width: 100
-  //   } ,
-  //   form: {
-  //     component: 'Switch',
-  //     value: 'ENABLE',
-  //     componentProps: {
-  //       inactiveValue: 'DISABLE',
-  //       activeValue: 'ENABLE'
-  //     }
-  //   },
-  // },
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    dictType: DICT_TYPE.ITEM_STATUS,
+    dictClass: 'string',
+    isForm: false,
+    isSearch: false,
+    isTable: false,
+    table: {
+      width: 100
+    } ,
+    form: {
+      component: 'Switch',
+      value: 'ENABLE',
+      componentProps: {
+        inactiveValue: 'DISABLE',
+        activeValue: 'ENABLE'
+      }
+    },
+  },
  {
    label: '计量单位',
    field: 'uom',
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@ -476,6 +476,14 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
      width: 120
    },
  },
+  {
+    label: '到包装号',
+    field: 'toPackingNumber',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+  },
  {
    label: '从库位代码',
    field: 'fromLocationCode',