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

src/api/wms/productionreturnRequestMainNo/index.ts

@@ -70,7 +70,7 @@ export const exportProductionreturnRequestMain = async (params) => {
 
 // 下载用户导入模板
 export const importTemplate = () => {
-  return request.download({ url: '/wms/productionreturn-request-main/get-import-template' })
+  return request.download({ url: '/wms/productionreturn-request-main/get-import-template-hold' })
 }
 
 // 关闭

src/api/wms/supplierUser/index.ts

@@ -45,7 +45,12 @@ export const deleteSupplierUser = async (id: number) => {
 
 // 导出供应商用户关联信息 Excel
 export const exportSupplierUser = async (params) => {
-  return await request.download({ url: `/wms/supplier-user/export-excel`, params })
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/supplier-user/export-excel-senior`, data })
+  } else {
+    return await request.download({ url: `/wms/supplier-user/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/views/wms/basicDataManage/customerManage/project/index.vue

@@ -155,7 +155,7 @@ const openForm = (type: string, row?: any) => {
               item.componentProps.isSearchList = false
             }
             if (item.field == 'code') {
-              item.componentProps.disabled = TransferissueJobMain
+              item.componentProps.disabled = true
             }
           })       
   }else {

src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts

@@ -85,6 +85,14 @@ export const Documentsetting = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+        max: 50,
+        precision: 0
+      }
+    },
   },
   {
     label: '号码分隔符',
@@ -252,8 +260,7 @@ export const DocumentsettingRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   serialLength: [
-    { required: true, message: '请输入号码流水长度', trigger: 'blur' },
+    { required: true, message: '请输入号码流水长度', trigger: 'blur' }
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   resetPeriod: [
     { required: true, message: '请选择流水重置周期', trigger: 'change' }

src/views/wms/basicDataManage/factoryModeling/process/index.vue

@@ -173,8 +173,8 @@ const openForm = (type: string, row?: any) => {
               item.componentProps.isSearchList = true
             }
             if (item.field == 'productionLineCode') {
-              item.componentProps.disabled = true
+              item.componentProps.disabled = false
-              item.componentProps.isSearchList = false
+              item.componentProps.isSearchList = true
             }
     })  
   }

src/views/wms/basicDataManage/factoryModeling/workstation/index.vue

@@ -170,13 +170,13 @@ const openForm = (type: string, row?: any) => {
         item.componentProps.disabled = false
       }
       if (item.field == 'workshopCode') {
-              item.componentProps.disabled = false
+          item.componentProps.disabled = false
-              item.componentProps.isSearchList = true
+          item.componentProps.isSearchList = true
-            }
+        }
-            if (item.field == 'productionLineCode') {
+        if (item.field == 'productionLineCode') {
-              item.componentProps.disabled = true
+          item.componentProps.disabled = false
-              item.componentProps.isSearchList = false
+          item.componentProps.isSearchList = true
-            }
+        }
     })  
   }
   basicFormRef.value.open(type, row)

src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts

@@ -37,17 +37,17 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
+  // {
-    label: '类型',
+  //   label: '类型',
-    field: 'type',
+  //   field: 'type',
-    dictType: DICT_TYPE.WORK_STATION_TYPE,
+  //   dictType: DICT_TYPE.WORK_STATION_TYPE,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isTable: true,
+  //   isTable: true,
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '车间代码',
     field: 'workshopCode',
@@ -123,7 +123,9 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        }]
+        }
+        // TODO： 陈放修改 ; 数据过滤 查询库区对应成品类型下的所有库位
+      ]
       }
     }
   },
@@ -149,13 +151,16 @@ export const Workstation = useCrudSchemas(reactive<CrudSchema[]>([
           action: '==',
           isSearch: true,
           isMainValue: false
-        },{
+        }
-          key: 'type',
+        // TODO： 陈放修改 ; 数据过滤 查询库区对应成品类型下的所有库位
-          value: 'FG',
+        // ,{
-          action: '==',
+        //   key: 'type',
-          isSearch: true,
+        //   value: 'FG',
-          isMainValue: false
+        //   action: '==',
-        }]
+        //   isSearch: true,
+        //   isMainValue: false
+        // }
+      ]
       }
     }
   },

src/views/wms/basicDataManage/itemManage/bom/bom.data.ts

@@ -245,18 +245,18 @@ export const BomRules = reactive({
   ],
   processCode: [
     { required: true, message: '请输入工序代码', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'change' },
   ],
   version: [
     { required: true, message: '请输入版本', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
   ],
   layer: [
     { required: true, message: '请输入层级', trigger: 'blur' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
   ],
   remark: [
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 50, message: '不得超过50个字符', trigger: 'change' }
   ],
   available:  [
     { required: true, message: '请选择是否可用', trigger: 'change' }

src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts

@@ -16,6 +16,7 @@ export const BarcodeRules = reactive({
   length: [required],
   prefixLenght: [required],
   prefixChar: [
+    { required: true, message: '请输入前缀字符', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   entityProperties: [
@@ -29,6 +30,9 @@ export const BarcodeRules = reactive({
     { required: true, message: '请输入截断尾部空格', trigger: 'blur' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  labelType:[
+    { required: true, message: '请选择标签类型', trigger: 'blur' }
+  ],
   isEncypt: [required],
 })
 

src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts

@@ -121,8 +121,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'activeTime',
     isTable: true,
     formatter: dateFormatter,
-    details: {
+    detail: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -143,8 +143,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'expireTime',
     isTable: true,
     formatter: dateFormatter,
-    details: {
+    detail: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {
@@ -166,8 +166,8 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm:false,
     formatter: dateFormatter,
-    details: {
+    detail: {
-      dateFormatter: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
     table: {

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -85,6 +85,11 @@
       @searchTableSuccess="searchTableSuccess"
       @submitForm="submitFormLabel"
     />
+      
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/import" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+
 </template>
 
 <script setup lang="ts">
@@ -232,6 +237,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:productionreturn-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productionreturn-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -243,6 +249,8 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
@@ -625,6 +633,23 @@ const handlePoint = async (row) => {
   }
 }
 
+  /** 导入 */
+  const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '生产退料导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -637,5 +662,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  importTemplateData.templateUrl = await ProductionreturnRequestMainApi.importTemplate()
 })
 </script>

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue

@@ -84,6 +84,11 @@
       @searchTableSuccess="searchTableSuccess"
       @submitForm="submitFormLabel"
     />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/wms/productionreturn-request-main/importNO" :importTemplateData="importTemplateData"
+    @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" />
+
 </template>
 
 <script setup lang="ts">
@@ -237,6 +242,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:productionreturn-request-main:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:productionreturn-request-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:productionreturn-request-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -248,6 +254,8 @@ const HeadButttondata = [
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
     openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
   } else if (val == 'export') { // 导出
     handleExport()
   } else if (val == 'refresh') { // 刷新
@@ -618,6 +626,23 @@ const handlePoint = async (row) => {
   }
 }
 
+/** 导入 */
+const importFormRef = ref()
+  const handleImport = () => {
+    importFormRef.value.open()
+  }
+
+  // 导入附件弹窗所需的参数
+  const importTemplateData = reactive({
+    templateUrl: '',
+    templateTitle: '隔离退料导入模版.xlsx'
+  })
+
+  // 导入成功之后
+  const importSuccess = () => {
+    getList()
+  }
+
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params = {
@@ -630,5 +655,6 @@ const searchFormClick = (searchData) => {
 /** 初始化 **/
 onMounted(async () => {
   getList()
+  importTemplateData.templateUrl = await ProductionreturnRequestMainNoApi.importTemplate()
 })
 </script>

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -601,6 +601,7 @@ const submitForm = async (formType, data) => {
   })
   if (isExist) {
     formRef.value.formLoading = false
+    isExist = false
     return message.warning('包装号重复')
   }
   data.subList.forEach(item => {