Browse Source

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

master_hella_20240701
陈薪名 8 months ago
parent
commit
e636d0d0e0
  1. 1
      src/api/wms/supplierdeliverRequestMain/index.ts
  2. 8
      src/components/BasicForm/src/BasicForm.vue
  3. 5
      src/views/wms/basicDataManage/itemManage/itemarea/index.vue
  4. 16
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

1
src/api/wms/supplierdeliverRequestMain/index.ts

@ -31,6 +31,7 @@ export interface SupplierdeliverRequestMainVO {
autoAgree: string autoAgree: string
autoExecute: string autoExecute: string
directCreateRecord: string directCreateRecord: string
labelStatus: string
} }
// 查询供应商发货申请主列表 // 查询供应商发货申请主列表

8
src/components/BasicForm/src/BasicForm.vue

@ -245,6 +245,12 @@ const props = defineProps({
type: Boolean, type: Boolean,
required: false, required: false,
default: true default: true
},
//
tableFormDataLength: {
type: Boolean,
required: false,
default: true
} }
}) })
@ -432,7 +438,7 @@ const submitForm = async () => {
formLoading.value = true formLoading.value = true
if (formType.value == 'create') { if (formType.value == 'create') {
const validateForm = await tableFormRef.value.validateForm() const validateForm = await tableFormRef.value.validateForm()
if (!validateForm) { if (!validateForm && props.tableFormDataLength) {
if (props.tableData.length == 0) { if (props.tableData.length == 0) {
message.warning('请填写明细信息!') message.warning('请填写明细信息!')
formLoading.value = false formLoading.value = false

5
src/views/wms/basicDataManage/itemManage/itemarea/index.vue

@ -57,6 +57,7 @@
@submitForm="submitForm" @submitForm="submitForm"
:isShowButton = isShowButton :isShowButton = isShowButton
:basicFormWidth="75" :basicFormWidth="75"
:tableFormDataLength="false"
/> />
<!-- 详情 --> <!-- 详情 -->
@ -130,6 +131,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
setV['inPackUnit'] = val[0]['code'] setV['inPackUnit'] = val[0]['code']
}else if(formField == 'outPackUnit') { }else if(formField == 'outPackUnit') {
setV['outPackUnit'] = val[0]['code'] setV['outPackUnit'] = val[0]['code']
}else if(formField == 'itemCode') {
setV['itemCode'] = val[0]['code']
}else{ }else{
setV[formField] = setV[0][searchField] setV[formField] = setV[0][searchField]
} }
@ -285,7 +288,7 @@ const handleExport = async () => {
// //
exportLoading.value = true exportLoading.value = true
const data = await ItemareaApi.exportItemarea(tableObject.params) const data = await ItemareaApi.exportItemarea(tableObject.params)
download.excel(data, '发货申请主.xlsx') download.excel(data, '物料库区配置管理主.xlsx')
} catch { } catch {
} finally { } finally {
exportLoading.value = false exportLoading.value = false

16
src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@ -264,6 +264,20 @@ const isShowMainButton = (row, val) => {
} }
} }
//
const isShowMainButtonLabel = (row, val) => {
if (val.indexOf(row.status) > -1) {
if(row.labelStatus == '2'){
return true
}else{
return false
}
} else {
return true
}
}
// - // -
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
@ -280,7 +294,7 @@ const butttondata = (row) => {
{ {
label: '生成标签', label: '生成标签',
name: 'ssbq', name: 'ssbq',
hide: isShowMainButton(row, ['3']), hide: isShowMainButtonLabel(row, ['3']),
type: 'primary', type: 'primary',
icon: '', icon: '',
color: '', color: '',

Loading…
Cancel
Save