-
规则配置
+
{{t('ts.规则配置').replace('ts.','')}}
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
index 9e358a5d5..b6b18e322 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue
@@ -4,19 +4,19 @@
-
-
+
-
-
+
+
- 搜索
+ {{t('ts.搜索')}}
- 重置
+ {{t('ts.重置')}}
@@ -26,16 +26,16 @@
-
-
-
-
-
+
+
+
+
+
-
+
diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue
index 8fcfd22b5..5d441845d 100644
--- a/src/views/wms/buttMesManage/mesBarCode/index.vue
+++ b/src/views/wms/buttMesManage/mesBarCode/index.vue
@@ -72,6 +72,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
import TableHead from '@/components/TableHead/src/TableHead.vue'
import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
import Detail from '@/components/Detail/src/Detail.vue'
+import { getTenantId }from '@/utils/auth'
+
defineOptions({ name: 'MesBarCode' })
@@ -83,6 +85,9 @@ const routeName = ref()
routeName.value = route.name
const tableColumns = ref(MesBarCode.allSchemas.tableColumns)
+let names =[{"text":"1379","value":1},{"text":"1397","value":2},{"text":"2379","value":3}]
+let tenant = names.find(item=>item.value == getTenantId())
+
// 查询页面返回
const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
@@ -165,6 +170,7 @@ const formsSuccess = async (formType,data) => {
basicFormRef.value.formLoading = true
try {
if (formType === 'create') {
+ data.plnt = tenant?.text
await MesBarCodeApi.createMesBarCode(data)
message.success(t('common.createSuccess'))
} else {
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
index 493689051..286652a40 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue
@@ -143,7 +143,9 @@ const labelType = ref('') // 标签类别 采购还是制造等
const handlePoint = async (row) => {
// 查询是否已创建过标签
await PackageApi.getPackagePage({
- requestNumber: row.number
+ requestNumber: row.number,
+ pageSize: 500,
+ pageNo: 1
}).then((res) => {
if(res.list.length > 0) {
if (res.list[0].productionLineCode != null) {
diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
index 9f65f96aa..43b0edb6f 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue
+++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue
@@ -300,7 +300,8 @@ const butttondata = (row,$index) => {
defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:issue-request-main:submit'}), // 提交审批
defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:issue-request-main:refused'}), // 驳回
defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:issue-request-main:handle'}), // 审批通过
- defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','7']), hasPermi:'wms:issue-request-main:update'}), // 处理
+ // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','7']), hasPermi:'wms:issue-request-main:update'}), // 处理
+ defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:issue-request-main:update'}), // 处理
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:issue-request-main:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除
]
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
index 0ca2ebe15..3f8cae170 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue
@@ -341,17 +341,17 @@ const butttondata = (row,$index) => {
defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:productionscrap-request-main:update'}), // 编辑
// defaultButtons.mainListDeleteBtn({hasPermi:'wms:productionreturn-request-main:delete'}), // 删除
// 创建标签
- {
- label: '创建标签',
- name: 'cjbq',
- hide: isShowMainButton(row,['3']),
- type: 'primary',
- icon: '',
- color: '',
- hasPermi: '',
- link: true, // 文本展现按钮
- },
- defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
+ // {
+ // label: '创建标签',
+ // name: 'cjbq',
+ // hide: isShowMainButton(row,['3']),
+ // type: 'primary',
+ // icon: '',
+ // color: '',
+ // hasPermi: '',
+ // link: true, // 文本展现按钮
+ // },
+ // defaultButtons.mainListPointBtn({hide:isShowMainButton(row,['3','6','8'])}), // 标签打印
]
}
@@ -483,19 +483,19 @@ const buttonTableClick = async (val, row) => {
})
} else if (val == 'mainHandle') { // 处理
- // 判断 是否已创建标签
- let isCreateLabel = false
- await PackageApi.getPackagePage({
- requestNumber: row.number
- }).then(res => {
- if (res) {
- if (res.list.length > 0) isCreateLabel = true
- }
- })
- if (!isCreateLabel) {
- message.warning('请先创建标签')
- return
- }
+ // // 判断 是否已创建标签
+ // let isCreateLabel = false
+ // await PackageApi.getPackagePage({
+ // requestNumber: row.number
+ // }).then(res => {
+ // if (res) {
+ // if (res.list.length > 0) isCreateLabel = true
+ // }
+ // })
+ // if (!isCreateLabel) {
+ // message.warning('请先创建标签')
+ // return
+ // }
tableObject.loading = true
ProductionscrapRequestMainApi.handle(row.masterId).then(() => {
message.success(t('common.updateSuccess'))
@@ -654,11 +654,11 @@ const submitForm = async (formType, submitData) => {
isZC = false
}
})
- if(!isZC) {
- formRef.value.formLoading = false
- await message.confirm('含有不整箱情况,是否继续?')
- formRef.value.formLoading = true
- }
+ // if(!isZC) {
+ // formRef.value.formLoading = false
+ // await message.confirm('含有不整箱情况,是否继续?')
+ // formRef.value.formLoading = true
+ // }
// 合格退料 添加参数 isOK
data.isOK = true
try {
diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
index 5f5c3248e..5acd62749 100644
--- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
+++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts
@@ -26,6 +26,9 @@ import { TableColumn } from '@/types/table'
import * as InspectionQ3Api from '@/api/qms/inspectionQ3'
import { Q3 } from '@/views/qms/inspectionQ3/inspectionQ3.data'
+// import * as LocationApi from '@/api/wms/location'
+// import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
const { t } = useI18n() // 国际化
// 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -697,6 +700,53 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive {
data.subList = tableData.value // 拼接子表数据参数
let isExist = false
tableData.value.forEach(item => {
- let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber) )
- console.log(rs,5666);
+ let rs = tableData.value.filter(filterItem => (filterItem.fromPackingNumber&&filterItem.fromPackingNumber == item.fromPackingNumber) )
+ console.log(rs,5666);
if(rs.length > 1) isExist = true
})
if (isExist) {
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
index 539a42f47..5899a7623 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts
@@ -709,6 +709,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive(
value: 'in',
isMainValue: false
}],
+ isRepeat:true,
verificationParams: [{
key: 'code',
action: '==',
@@ -920,6 +921,9 @@ export const InventorymoveRequestDetailRules = reactive({
fromLocationCode: [
{ required: true, message: '请选择从库位代码', trigger: 'change' }
],
+ fromPackingNumber: [
+ { required: true, message: '请选择从包装号', trigger: 'change' }
+ ],
fromInventoryStatus: [
{ required: true, message: '请选择从库存状态', trigger: 'change' }
],
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index d34af2d33..2fe873942 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -128,7 +128,23 @@
:isShowFooterButtton="false"
/>
-
+
+
+
+
+
+
+
+
+ 查询
+
+
+ 重置
+
+
+
+
+
{
+ printItemCode.value = printItemCode.value.trim()
+ if(printItemCode.value == ''){
+ searchTableRef.value.updateData(printTableList.value)
+ }else{
+ console.log(printItemCode.value)
+ let printItemCodes = printItemCode.value.split(',')
+ console.log(printItemCodes)
+ let itemCodesList = printTableList.value.filter(item=>!!printItemCodes.find(item1=>item['itemCode']==item1))
+ searchTableRef.value.updateData(itemCodesList)
+ }
+
+}
+const resetPrint = ()=>{
+ printItemCode.value = ''
+ searchPrint()
+}
const labelPrint = async (row) => {
tableObject.loading = true
const defaultParams = {'moduleName':'purchasereceipt_request','recordNumber':row.asnNumber}
@@ -488,12 +525,14 @@ const labelPrint = async (row) => {
// 获得表格的各种操作
const { getList:getListPrint } = tableMethods
- getListPrint()
+ await getListPrint()
tableObject.loading = false
const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
tableColumns.forEach((item) => {
item.width = item.table?.width
})
+ printItemCode.value = ''
+ printTableList.value = JSON.parse(JSON.stringify(tableObjectPrint.tableList))
searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
}
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 13199b0e4..5ea315e1c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -1574,9 +1574,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive
//表单校验
export const PurchasereturnRequestDetailRules = reactive({
- packingNumber: [
- { required: true, message: '请输入包装号', trigger: 'blur' }
- ],
+ // packingNumber: [
+ // { required: true, message: '请输入包装号', trigger: 'blur' }
+ // ],
// batch: [
// { required: true, message: '请输入批次', trigger: 'blur' }
// ],
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
index 2c40fa884..013ff8a88 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue
@@ -96,6 +96,7 @@
editHasPermi="wms:purchase-plan-main:update"
deleteHasPermi="wms:purchase-plan-main:delete"
:isOpenSearchTable="true"
+ :mainSubmitCreateApi="true"
fieldTableColumn="poLine"
/>
@@ -302,8 +303,23 @@ const getSearchTableData = async (number,formField,searchField)=>{
})
}
// 查询页面返回——详情
- const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
+ const searchTableSuccessDetail = (formField, searchField, val, formRef,formModel) => {
+ console.log('searchTableSuccessDetail',formField, searchField, val, formRef,formModel)
nextTick(async () => {
+ if(formModel){
+ console.log(formModel)
+ //明细中新增
+ let data = {...val[0]}
+ data['planQty'] = val[0]['orderQty']
+ data['poLine'] = val[0]['lineNumber']
+ data['number'] = formModel['number']
+ data['poNumber'] = formModel['poNumber']
+ console.log('data',data)
+ await PurchasePlanDetailApi.createPurchasePlanDetail(data)
+ message.success(t('common.createSuccess'))
+ detailRef.value.updateList()
+ return
+ }
const setV = {}
setV[formField] = val[0][searchField]
setV['poNumber'] = val[0]['number']
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index bc1b0ad40..3794079fb 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -39,6 +39,7 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive([
table: {
width: 180
},
+ isSearch: true
},
{
label: '供应商代码',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index f3405d481..154d21323 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1261,6 +1261,9 @@ export const SupplierdeliverRequestDetailRules = reactive({
{ required: true, message: '请输入发货数量1', trigger: 'change' },
// { validator: validateQty, trigger: 'change' },
],
+ supplierBatch: [
+ { required: true, message: '请输入供应商批次', trigger: 'blur' }
+ ],
batch: [
{ required: true, message: '请输入批次', trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' },