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

src/api/system/tenant/index.ts

@@ -33,7 +33,15 @@ export interface TenantExportReqVO {
 
 // 查询租户列表
 export const getTenantPage = (params: TenantPageReqVO) => {
-  return request.get({ url: '/system/tenant/page', params })
+  console.log(params)
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = { ...params }
+    return request.post({ url: '/system/tenant/senior', data })
+  } else {
+    return request.get({ url: '/system/tenant/page', params })
+  }
+  // return request.get({ url: '/system/tenant/page', params })
 }
 
 // 查询租户详情

src/api/wms/balance/index.ts

@@ -83,7 +83,7 @@ export const getBalancePageByBusinessType = async (params) => {
 }
 
 
-// 查询库存余额列表根据业务类型
+// 查询库存余额列表根据业务类型的物料类型
 export const getBalancePageByBusinessTypeByItemType = async (params) => {
   if (params.isSearch) {
     delete params.isSearch

src/components/Form/src/Form.vue

@@ -175,10 +175,7 @@ export default defineComponent({
           const Com = componentMap['Divider'] as ReturnType<typeof defineComponent>
           let labelName = item?.label || '' 
           if(item?.label){
-            labelName = t(`ts.${item?.label}`)
+            labelName = t(`ts.${item?.label}`).replace('ts.','')
-            if(labelName === 'ts.' + item?.label){
-              labelName = item?.label
-            }
           }
           return isDivider ? (
             <Com {...{ contentPosition: 'left', ...item.componentProps }}>{labelName}</Com>
@@ -227,18 +224,12 @@ export default defineComponent({
       if (item?.labelMessage) {
         let labelName = item.label || '' 
         if(item.label){
-          labelName = t(`ts.${item.label}`)
+          labelName = t(`ts.${item.label}`).replace('ts.','')
-          if(labelName === 'ts.' + item.label){
-            labelName = item.label
-          }
         }
 
         let labelMessage = item.labelMessage || ''
         if(item.labelMessage){
-          labelMessage = t(`ts.${item.labelMessage}`)
+          labelMessage = t(`ts.${item.labelMessage}`).replace('ts.','')
-          if(labelMessage === 'ts.' + item.labelMessage){
-            labelMessage = item.labelMessage
-          }
         }
         formItemSlots.label = () => {
           return (
@@ -367,10 +358,7 @@ export default defineComponent({
       }
       let labelName = item.label || '' 
       if(item.label){
-        labelName = t(`ts.${item.label}`)
+        labelName = t(`ts.${item.label}`).replace('ts.','')
-        if(labelName === 'ts.' + item.label){
-          labelName = item.label
-        }
       }
       return (
         <ElFormItem {...(item.formItemProps || {})} prop={item.field} label={labelName}>

src/components/Form/src/components/useRenderSelect.tsx

@@ -35,10 +35,7 @@ export const useRenderSelect = (slots: Slots) => {
 
     const { label, value, ...other } = option
     const zhName = labelAlias ? option[labelAlias] : label;//中文名称
-    let labelName = t(`ts.${zhName}`)
+    let labelName = t(`ts.${zhName}`).replace('ts.','')
-    if(labelName === 'ts.' + zhName){
-      labelName = zhName
-    }
 
     return (
       <ElOption

src/components/Form/src/helper.ts

@@ -17,12 +17,7 @@ export const setTextPlaceholder = (schema: FormSchema): PlaceholderModel => {
 
   let labelName = schema.label || '' 
   if(schema.label){
-    labelName = t(`ts.${schema.label}`)
+    labelName = ' '+t(`ts.${schema.label}`).replace('ts.','')
-    if(labelName === 'ts.' + schema.label){
-      labelName = ' '+schema.label
-    }else{
-      labelName = ' ' + labelName
-    }
   }
 
   if (textMap.includes(schema?.component as string)) {

src/components/Table/src/Table.vue

@@ -283,10 +283,7 @@ export default defineComponent({
       return [...[renderTableExpand()], ...[renderTableSelection()]].concat(
         (columnsChildren || columns).map((v) => {
           const zhName = v.label || '';//中文名称
-          let labelName = t(`ts.${v.label}`)
+          let labelName = t(`ts.${v.label}`).replace('ts.','')
-          if(labelName === 'ts.' + zhName){
-            labelName = zhName
-          }
           // 自定生成序号
           if (v.type === 'index') {
             return (

src/utils/disposition/defaultButtons.ts

@@ -289,7 +289,7 @@ export function mainListDisableBtn(option:any) {
 // 主列表-中止按钮1
 export function mainListSuspend1Btn(option:any) {
   return __defaultBtnOption(option,{
-    label: t(`ts.中止`),
+    label: t(`ts.中止`).replace('ts.',''),
     name: 'suspend',
     hide: false,
     type: 'danger',
@@ -624,7 +624,7 @@ export function mainListPurchasePlanModBtn(option:any) {
 // 主列表-要货计划流程-下架按钮
 export function mainListPurchasePlanWitBtn(option:any) {
   return __defaultBtnOption(option,{
-    label: t(`ts.下架`),
+    label: t(`ts.下架`).replace('ts.',''),
     name: 'mainPurPlanWit',
     hide: false,
     type: 'danger',

src/views/login/components/LoginForm.vue

@@ -15,7 +15,7 @@
             <el-option
               v-for="item in tenantArray"
               :key="item"
-              :label="t(`ts.${item}`)"
+              :label="t(`ts.${item}`).replace('ts.','')"
               :value="item"
             />
           </el-select>

src/views/mes/hrPersonAbility/hrPersonAbility.data.ts

@@ -123,10 +123,11 @@ export const HrPersonAbility = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '人员信息', // 查询弹窗标题
         searchAllSchemas: searchUser.allSchemas, // 查询弹窗所需类
         searchField: 'username', // 查询弹窗赋值字段
+        searchListPlaceholder: '请选择 人员工号', // 输入框占位文本
         searchPage: UserApi.getUserPage, // 查询弹窗所需分页方法
         searchCondition: [{
-          action: "==",
+          action: '==',
-          column: 'userType',
+          key: 'userType',
           value: 'WORKER'
         }]
       }

src/views/mes/ordermonthplan/mesOrderMonthMain.data.ts

@@ -46,12 +46,13 @@ export const MesOrderMonthMain = useCrudSchemas(reactive<CrudSchema[]>([
         searchAllSchemas: FactoryList.allSchemas, // 查询弹窗所需类
         searchPage: TenantApi.getTenantPage, // 查询弹窗所需分页方法
         isHideFilterButton: true,
-        searchCondition: [{
+        // searchCondition: [{
-          key: 'available',
+        //   key: 'available',
-          value: 'TRUE',
+        //   value: 'TRUE',
-          isMainValue: false
+        //   action: '==',
-        }
+        //   // isMainValue: false
-        ]
+        // }
+        // ]
       }
     }
   },

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

@@ -29,8 +29,13 @@ const confgiDataOne = await confgiApi.queryByKey("WorkStation-IN")
 // 表单校验
 export const CallmaterialsRules = reactive({
   itemCode: [required],
-  itemName: [required],
+  packUnit: [required],
-  barcodeString: [required]
+  qty: [required],
+  productionLineCode: [required],
+  callmaterialQtySum: [required],
+  warehouseCode: [required],
+  workshopCode: [required],
+  workStationCode: [required],
 })
 
 export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
@@ -72,7 +77,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         isSearch:true,
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择物料代码', // 输入框占位文本
+        searchListPlaceholder: '请选择包装规格', // 输入框占位文本
         searchField: 'itemCode', // 查询弹窗赋值字段
         searchTitle: '物料包装信息', // 查询弹窗标题
         searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
@@ -91,12 +96,45 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '包装数量',
+    label: '叫料包装数量',
     field: 'qty',
     sort: 'custom',
     table: {
       width: 120
     },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled: true,
+        style: {width:'100%'},
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'callmaterialQty',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        style: {width:'100%'},
+        min: 0,
+        precision: 6
+      }
+    }
+  },
+  {
+    label: '叫料总数量',
+    field: 'callmaterialQtySum',
+    sort: 'custom',
+    table: {
+      width: 120
+    },
     form: {
       component: 'InputNumber',
       componentProps: {

src/views/wms/basicDataManage/labelManage/callmaterials/index.vue

@@ -90,6 +90,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     } else  if (formField == 'packUnit') {
       setV['uom'] = val[0]['uom']
       setV['packUnit'] = val[0]['packUnit']
+      setV['callmaterialQty'] = val[0]['packQty']
     }else {
       setV[formField] = val[0][searchField]
     }

src/views/wms/basicDataManage/labelManage/locationLabel/index.vue

@@ -187,17 +187,17 @@ const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
 const src = ref(BASE_URL + '/jmreport/view/929174607016689664?token=' + getAccessToken())
 // 标签打印
 const handlePoint = async (row) => {
-  window.open(src.value+'&id='+row.id)
+  window.open(src.value+'&relateNumber='+row.id)
 }
 
-const srcPoint = ref(BASE_URL + '/jmreport/view/953469704945139712?token=' + getAccessToken())
+// const srcPoint = ref(BASE_URL + '/jmreport/view/929174607016689664?token=' + getAccessToken())
 const handleSelectionPoint = async ()=>{
   let rows:any = []
   selectionRows.value.forEach(item=>{
     rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
   })
   console.log('批量打印',rows.join(','))
-  window.open(srcPoint.value+'&relateNumber='+rows.join(','))
+  window.open(src.value+'&relateNumber='+rows.join(','))
 }
 
 // 筛选提交

src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts

@@ -615,7 +615,7 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
   },
   {
     label: '是否冻结',
-    field: 'available',
+    field: 'frozen',
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -94,7 +94,6 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...InventorychangeRequestMain.allSchemas.tableColumns,...InventorychangeRequestDetail.allSchemas.tableMainColumns])
-
 const { tableObject, tableMethods } = useTable({
   getListApi: InventorychangeRequestDetailApi.getInventorychangeRequestDetailPage // 分页接口
 })

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

@@ -4,7 +4,7 @@ import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as BalanceApi  from '@/api/wms/balance'
 import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
-
+import * as getBusinessTypeApi  from '@/api/wms/businesstype/index'
 import * as OwnerApi from '@/api/wms/owner'
 import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
 
@@ -15,10 +15,16 @@ const queryParams = {
   pageSize:10,
   pageNo:1,
   code:'InventoryChangeRequest'
+}
+const businessTypeQueryParams = {
+  pageSize:10,
+  pageNo:1,
+  code:'Change'
 }
  const data = await getRequestsettingApi.getRequestsettingPage(queryParams)
  const requestsettingData =data?.list[0]||{}
-
+ const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams)
+ const businessTypeData =businessTypeValue?.list[0]||{}
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
@@ -374,7 +380,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
       searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
+      searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
+      searchCondition: [{
+        key: 'businessType',
+        value: businessTypeData.code,
+      }]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -384,7 +394,11 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
         searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
+        searchPage: BalanceApi.getBalancePageByBusinessTypeByItemType,
+        searchCondition: [{
+          key: 'businessType',
+          value: businessTypeData.code,
+        }]
       }
     }
   },
@@ -841,7 +855,7 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
   },
   {
     label: '是否冻结',
-    field: 'available',
+    field: 'frozen',
     sort: 'custom',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts

@@ -289,33 +289,33 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  {
+  // {
-    label: '到仓库代码',
+  //   label: '到仓库代码',
-    field: 'toWarehouseCode',
+  //   field: 'toWarehouseCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: false,
+  //   isTable: false,
-  },
+  // },
-  {
+  // {
-    label: '从库区代码范围',
+  //   label: '从库区代码范围',
-    field: 'fromAreaCodes',
+  //   field: 'fromAreaCodes',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: false,
+  //   isTable: false,
-  },
+  // },
-  {
+  // {
-    label: '到库区代码范围',
+  //   label: '到库区代码范围',
-    field: 'toAreaCodes',
+  //   field: 'toAreaCodes',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: false,
+  //   isTable: false,
-  },
+  // },
   {
     label: '自动完成',
     field: 'autoComplete',
@@ -506,15 +506,15 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
+  // {
-    label: '物料号',
+  //   label: '物料号',
-    field: 'code',
+  //   field: 'code',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: false,
+  //   isTable: false,
-  },
+  // },
   {
     label: '来源库位',
     field: 'fromLocationCode',
@@ -542,18 +542,18 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
-  {
+  // {
-    label: '单位',
+  //   label: '单位',
-    field: 'unit',
+  //   field: 'unit',
-    sort: 'custom',
+  //   sort: 'custom',
-    dictType: DICT_TYPE.PACK_UNIT,
+  //   dictType: DICT_TYPE.PACK_UNIT,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isSearch: false,
+  //   isSearch: false,
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: false,
+  //   isTable: false,
-  },
+  // },
   {
     label: '操作',
     field: 'action',
@@ -1265,4 +1265,4 @@ export const PutawayJobDetailPackingNumber = useCrudSchemas(reactive<CrudSchema[
       disabled: true,
     }
   },
-]))
+]))

src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts

@@ -16,18 +16,6 @@ export const PutawayRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     sortSearchDefault:1,
     isSearch: true
   },
-  {
-    label: '状态',
-    field: 'status',
-    dictType: DICT_TYPE.JOB_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:1,
-  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -1272,4 +1260,4 @@ export const PutawayRecordDetailChildPackingNumber = useCrudSchemas(reactive<Cru
       disabled: true,
     }
   },
-]))
+]))

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -9,6 +9,7 @@ import { validateHanset, validateEmail } from '@/utils/validator'
 import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
 import * as ItemPackageApi from '@/api/wms/itempackage/index'
 
+import {validateInteger} from '@/utils/validator'
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -1101,7 +1102,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
     { required: true, message: '请输入生产日期', trigger: 'blur' }
   ],
   packQty: [
-    { required: true, message: '请输入包装数量', trigger: 'blur' }
+    { required: true, message: '请输入包装数量', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的整数', trigger: 'blur' }
   ],
   poNumber: [
     { required: true, message: '请选择订单号', trigger: 'change' }
@@ -1121,6 +1123,8 @@ export const SupplierdeliverRequestDetailRules = reactive({
   remark: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  
+  secondPackQty:[required,{ validator:validateInteger, message: '请输入正确的整数', trigger: 'blur'}]
 })
 
 export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
@@ -1520,11 +1524,10 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
     form: {
       componentProps: {
-        disabled: true
       }
     },
     tableForm: {
-      disabled: true,
+      // disabled: true,
     }
   },
   {
@@ -1590,11 +1593,10 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     },
     form: {
       componentProps: {
-        disabled:true
       }
     },
     tableForm: {
-      disabled: true,
+      // disabled: true,
     }
   },
   {

src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts

@@ -68,57 +68,60 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '状态',
+    label: '供应商代码',
-    field: 'status',
+    field: 'supplierCode',
-    dictType: DICT_TYPE.SUPPLIERINVOICE_STATUS,
-    dictClass: 'string',
-    isTable: true,
-    isForm:false,
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
-    isSearch: true,
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    }
   },
   {
-    label: '物流单据号',
+    label: '订单号',
-    field: 'recvBillNum',
+    field: 'poNumber',
     sort: 'custom',
-    isSearch: true,
     table: {
       width: 150
     },
   },
   {
-    label: '发货单号',
+    label: '物流单据号',
-    field: 'asnBillNum',
+    field: 'recvBillNum',
     sort: 'custom',
+    isSearch: true,
     table: {
       width: 150
     },
   },
   {
-    label: '供应商代码',
+    label: '发货单号',
-    field: 'supplierCode',
+    field: 'asnBillNum',
     sort: 'custom',
     table: {
       width: 150
     },
   },
   {
-    label: '订单号',
+    label: '状态',
-    field: 'poNumber',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    isForm:false,
     sort: 'custom',
     table: {
       width: 150
     },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
   },
+  
+  
   {
     label: '订单行',
     field: 'poLine',