Browse Source

FWHL-97

hella_online_20241219
王宇飞 3 months ago
parent
commit
870e719e1e
  1. 58
      src/components/TableFormAdjustment/src/TableFormAdjustment.vue
  2. 65
      src/locales/en-US.ts
  3. 68
      src/locales/zh-CN.ts
  4. 18
      src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts
  5. 28
      src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts
  6. 14
      src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts
  7. 40
      src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts
  8. 10
      src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
  9. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
  10. 2
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
  11. 2
      src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
  12. 12
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  13. 46
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
  14. 34
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

58
src/components/TableFormAdjustment/src/TableFormAdjustment.vue

@ -36,7 +36,7 @@
<div class="bottom" style="display: flex; flex-direction: row;"> <div class="bottom" style="display: flex; flex-direction: row;">
<!-- - --> <!-- - -->
<div style="margin-right:5px"> <div style="margin-right:5px">
<el-button type="info" link>调整事项减项以负数列示</el-button> <el-button type="info" link>{{t(`ts.${'调整事项(减项以负数列示):'}`)}}</el-button>
<el-table border class="top-table" :data="[...bottomLeftTableData,...bottomLeftSumTableData]"> <el-table border class="top-table" :data="[...bottomLeftTableData,...bottomLeftSumTableData]">
<el-table-column <el-table-column
:label="headerItem.label" :label="headerItem.label"
@ -46,29 +46,29 @@
v-for="headerItem in bottomLeftHeader" v-for="headerItem in bottomLeftHeader"
> >
<template #default="scope"> <template #default="scope">
<el-input :disabled="isDetail" v-if="!scope.row.isSum&&headerItem.type=='input'" v-model="scope.row[headerItem.field]" :placeholder="`请输入${headerItem.label}`"/> <el-input :disabled="isDetail" v-if="!scope.row.isSum&&headerItem.type=='input'" v-model="scope.row[headerItem.field]" :placeholder="t('ts.请输入')+`${headerItem.label}`"/>
<el-input-number :disabled="isDetail" v-else-if="!scope.row.disabled&&headerItem.type=='inputnumber'" v-model="scope.row[headerItem.field]" :placeholder="`请输入${headerItem.label}`"/> <el-input-number :disabled="isDetail" v-else-if="!scope.row.disabled&&headerItem.type=='inputnumber'" v-model="scope.row[headerItem.field]" :placeholder="`t('ts.请输入')+${headerItem.label}`"/>
<span v-else>{{ scope.row[headerItem.field] }}</span> <span v-else>{{ scope.row[headerItem.field] }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-form style="margin-top:20px;width:460px" :model="leftForm" :label-width="300" > <el-form style="margin-top:20px;width:460px" :model="leftForm" :label-width="300" >
<el-form-item label="经办人"> <el-form-item :label="t('ts.经办人')">
<el-input :disabled="isDetail" v-model="leftForm.name" placeholder="请输入经办人"/> <el-input :disabled="isDetail" v-model="leftForm.name" :placeholder="t('ts.请输入经办人')"/>
</el-form-item> </el-form-item>
<el-form-item label="对账日期"> <el-form-item :label="t('ts.对账日期')">
<el-date-picker :disabled="isDetail" value-format="YYYY-MM-DD HH:mm:ss" <el-date-picker :disabled="isDetail" value-format="YYYY-MM-DD HH:mm:ss"
v-model="leftForm.date" v-model="leftForm.date"
type="datetime" type="datetime"
placeholder="请选择对账日期" :placeholder="t('ts.请选择对账日期')"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<!-- - --> <!-- - -->
<div> <div>
<el-button type="info" link>调整事项减项以负数列示</el-button> <el-button type="info" link>{{t(`ts.${'调整事项(减项以负数列示):'}`)}}</el-button>
<el-table border class="top-table" :data="[...bottomRightTableData,...bottomRightSumTableData]"> <el-table border class="top-table" :data="[...bottomRightTableData,...bottomRightSumTableData]">
<el-table-column <el-table-column
:label="headerItem.label" :label="headerItem.label"
@ -78,22 +78,22 @@
v-for="headerItem in bottomRightHeader" v-for="headerItem in bottomRightHeader"
> >
<template #default="scope"> <template #default="scope">
<el-input :disabled="isDetail" v-if="!scope.row.isSum&&headerItem.type=='input'" v-model="scope.row[headerItem.field]" :placeholder="`请输入${headerItem.label}`"/> <el-input :disabled="isDetail" v-if="!scope.row.isSum&&headerItem.type=='input'" v-model="scope.row[headerItem.field]" :placeholder="t('ts.请输入')+`${headerItem.label}`"/>
<el-input-number :disabled="isDetail" v-else-if="!scope.row.disabled&&headerItem.type=='inputnumber'" v-model="scope.row[headerItem.field]" :placeholder="`请输入${headerItem.label}`"/> <el-input-number :disabled="isDetail" v-else-if="!scope.row.disabled&&headerItem.type=='inputnumber'" v-model="scope.row[headerItem.field]" :placeholder="t('ts.请输入')+`${headerItem.label}`"/>
<span v-else>{{ scope.row[headerItem.field] }}</span> <span v-else>{{ scope.row[headerItem.field] }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-form style="margin-top:20px;width:460px" :model="rightForm" :label-width="300" > <el-form style="margin-top:20px;width:460px" :model="rightForm" :label-width="300" >
<el-form-item label="经办人"> <el-form-item :label="t('ts.经办人')">
<el-input :disabled="isDetail" v-model="rightForm.name" placeholder="请输入经办人"/> <el-input :disabled="isDetail" v-model="rightForm.name" :placeholder="t('ts.请输入经办人')"/>
</el-form-item> </el-form-item>
<el-form-item label="对账日期"> <el-form-item :label="t('ts.对账日期')">
<el-date-picker :disabled="isDetail" value-format="YYYY-MM-DD HH:mm:ss" <el-date-picker :disabled="isDetail" value-format="YYYY-MM-DD HH:mm:ss"
v-model="rightForm.date" v-model="rightForm.date"
type="datetime" type="datetime"
placeholder="请选择对账日期" :placeholder="t('ts.请选择对账日期')"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -164,15 +164,15 @@ const setTopHeaderData = ()=>{
let myData = unref(props.rowData) let myData = unref(props.rowData)
console.log('myData',myData) console.log('myData',myData)
topHeader.value = [{ topHeader.value = [{
label:`单位名称:${myData?.ttSupplierName}`, label:`${t('ts.单位名称')}:${myData?.ttSupplierName}`,
field:'name1', field:'name1',
width:260 width:260
},{ },{
label:'金额', label: t('ts.金额'),
field:'price1', field:'price1',
width:100 width:100
},{ },{
label:'备注', label:t('ts.备注'),
field:'remark1', field:'remark1',
width:100 width:100
}] }]
@ -181,10 +181,10 @@ const setTopHeaderData = ()=>{
let month = dayjs(myData?.ttGenerateTime).month()+1 let month = dayjs(myData?.ttGenerateTime).month()+1
let day = new Date(year,month,0).getDate() let day = new Date(year,month,0).getDate()
topTableData.value = [{ topTableData.value = [{
name1:`截止${year}${month}${day}日账面金额如下`, name1:`${t('ts.截止')}${year}${t('ts.年')}${month}${t('ts.月')}${day}${t('ts.日')}${t('ts.账面金额如下')}`,
price1:Number(myData?.ttAccountAp)+Number(myData?.ttAccountOthap), price1:Number(myData?.ttAccountAp)+Number(myData?.ttAccountOthap),
remark1:myData?.remark, remark1:myData?.remark,
name2:'截止年月日账面金额如下', name2:t('ts.截止年月日账面金额如下'),
price2:Number(myData?.ttAccountAp)+Number(myData?.ttAccountOthap), price2:Number(myData?.ttAccountAp)+Number(myData?.ttAccountOthap),
remark2:myData?.remark, remark2:myData?.remark,
}] }]
@ -225,31 +225,31 @@ const setDetailData = (adjustmentData)=>{
// //
const bottomLeftHeader = ref([{ const bottomLeftHeader = ref([{
label:'序号', label:t('ts.序号'),
field:'index', field:'index',
width:80 width:80
},{ },{
label:'摘要', label:t('ts.摘要'),
field:'ttAbstractLeft', field:'ttAbstractLeft',
width:180, width:180,
type:'input' type:'input'
},{ },{
label:'金额', label:t('ts.金额'),
field:'ttBalanceLeft', field:'ttBalanceLeft',
width:200, width:200,
type:'inputnumber' type:'inputnumber'
}]) }])
const bottomRightHeader = ref([{ const bottomRightHeader = ref([{
label:'序号', label:t('ts.序号'),
field:'index', field:'index',
width:80 width:80
},{ },{
label:'摘要', label:t('ts.摘要'),
field:'ttAbstractRight', field:'ttAbstractRight',
width:180, width:180,
type:'input' type:'input'
},{ },{
label:'金额', label:t('ts.金额'),
field:'ttBalanceRight', field:'ttBalanceRight',
width:200, width:200,
type:'inputnumber' type:'inputnumber'
@ -341,14 +341,14 @@ const bottomRightTableData = ref([{
// //
const bottomLeftSumTableData = ref([{ const bottomLeftSumTableData = ref([{
index:'', index:'',
ttAbstractLeft:'调整事项合计', ttAbstractLeft:t('ts.调整事项合计'),
ttBalanceLeft:'', ttBalanceLeft:'',
remark:'', remark:'',
isSum:true, isSum:true,
disabled:true disabled:true
},{ },{
index:'', index:'',
ttAbstractLeft:'调整后余额', ttAbstractLeft:t('ts.调整后余额'),
ttBalanceLeft:'', ttBalanceLeft:'',
remark:'', remark:'',
isSum:true isSum:true
@ -379,14 +379,14 @@ watch(
) )
const bottomRightSumTableData = ref([{ const bottomRightSumTableData = ref([{
index:'', index:'',
ttAbstractRight:'调整事项合计', ttAbstractRight:t('ts.调整事项合计'),
ttBalanceRight:'', ttBalanceRight:'',
remark:'', remark:'',
isSum:true, isSum:true,
disabled:true disabled:true
},{ },{
index:'', index:'',
ttAbstractRight:'调整后余额', ttAbstractRight:t('ts.调整后余额'),
ttBalanceRight:'', ttBalanceRight:'',
remark:'', remark:'',
isSum:true isSum:true

65
src/locales/en-US.ts

@ -1543,13 +1543,64 @@ export default {
:'Confirm new password', :'Confirm new password',
:'Please enter a new password again', :'Please enter a new password again',
'两次输入的密码不一致,请重新输入!':'The password you entered twice is different, please enter it again!', '两次输入的密码不一致,请重新输入!':'The password you entered twice is different, please enter it again!',
// 物料描述: '', :'Please enter the correct mobile phone number',
// 返利未税金额: '', :'Please enter a type',
// 财务过账日期: '', :'Please enter the default library bit code',
// Q2通知单: '', :'Please select whether it is a functional area',
// ASN外部收货: '', :'Please select type',
// 数量: '', :'Please enter the abbreviation',
128:'Maximum 128 characters',
:'Please enter the correct email format',
:'Please enter the correct fax',
:'User name',
:'Subtable version',
: 'Please select the version number',
: 'Please enter the untaxed amount',
: 'Please enter the tax amount',
: 'Choose whether to skip the task and generate the record directly',
: 'Select whether to execute automatically',
: 'Please select whether to pass automatically',
: 'Choose whether to submit automatically',
: 'Please enter the department',
: 'Please enter the gold tax voucher number',
: 'Please select the invoice date',
: 'Please enter the spread through the description',
100: 'Up to 100 characters',
'请填订单类型!':'Please fill in the order type!',
:'Please enter the contract price',
'请确认该申请中是否包含返利金额,请注意填写的返利金额应为负数':'Please confirm whether the rebate amount is included in the application. Please note that the rebate amount should be negative',
:'Important Notes',
'调整事项(减项以负数列示):':'Adjustment items (minus items are shown as negative numbers) :',
'请输入':'Please enter',
:'Person in charge',
:'Date of reconciliation',
:'Please select the reconciliation date',
: 'Total adjustment items',
:'Adjusted balance',
:'Abstract',
:'deadline',
:'the carrying amount is as follows',
:'The book amount at the end of the year is as follows',
:'Name of company',
:'Please enter operator',
:'Activity',
:'Deactivate',
A类:'Class A',
B类:'Class B',
C类:'Class C',
Z类:'Class Z',
:'Raw material',
:'Utensils',
:'Finished product',
:'Low value consumables',
:'Special maintenance spare parts',
:'Disposable packaging material',
:'Production consumables',
'漆&胶':'Paint&glue',
:'Self made spare parts',
:'General maintenance spare parts',
'周转箱(周转包装)':'Turnover box (turnover packing)',
'外购件':'Outside purchased parts',
}, },

68
src/locales/zh-CN.ts

@ -1541,15 +1541,69 @@ export default {
:'确认新密码', :'确认新密码',
:'请再次输入新密码', :'请再次输入新密码',
'两次输入的密码不一致,请重新输入!':'两次输入的密码不一致,请重新输入!', '两次输入的密码不一致,请重新输入!':'两次输入的密码不一致,请重新输入!',
// 抽奖规则请填写完全:'抽奖规则请填写完全', :'请输入正确的手机号',
// 抽奖规则请填写完全:'抽奖规则请填写完全', :'请输入类型',
// 抽奖规则请填写完全:'抽奖规则请填写完全', :'请输入默认库位代码',
:'请选择是否是功能区',
:'请选择类型',
:'请输入简称',
128:'不得超过128个字符',
:'请输入正确的邮箱格式',
:'请输入正确的传真',
:'用户名称',
:'子表版本',
:'请选择版本号',
:'请输入未税金额',
: '请输入税额',
: '请选择是否跳过任务直接生成记录',
: '请选择是否自动执行',
: '请选择是否自动通过',
: '请选择是否自动提交',
: '请输入部门',
: '请输入金税票号',
: '请选择发票日期',
: '请输入价差通过说明',
100: '最多100字符',
'请填订单类型!':'请填订单类型!',
:'请输入合同价格',
'请确认该申请中是否包含返利金额,请注意填写的返利金额应为负数':'请确认该申请中是否包含返利金额,请注意填写的返利金额应为负数',
:'重要提示',
'调整事项(减项以负数列示):':'调整事项(减项以负数列示):',
'请输入':'请输入',
:'经办人',
:'对账日期',
:'请选择对账日期',
:'调整事项合计',
:'调整后余额',
:'摘要',
:'截止',
:'账面金额如下',
:'截止年月日账面金额如下',
:'单位名称',
:'请输入经办人',
:'活动',
:'停用',
A类:'A类',
B类:'B类',
C类:'C类',
Z类:'Z类',
:'原材料',
:'器具',
:'产成品',
:'低值易耗品',
:'专用维修备件',
:'一次性包材',
:'生产耗材',
'漆&胶':'漆&胶',
:'自制备件',
:'通用维修备件',
'周转箱(周转包装)':'周转箱(周转包装)',
'外购件':'外购件',
// 自制备件:'',
// 自制备件:'',
// 自制备件:'',
}, },

18
src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts

@ -257,27 +257,27 @@ export const Area = useCrudSchemas(reactive<CrudSchema[]>([
//表单校验 //表单校验
export const AreaRules = reactive({ export const AreaRules = reactive({
code: [ code: [
{ required: true, message: '请输入代码', trigger: 'blur' }, { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }, { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
{ validate: validateYS, message: '请输入正确的代码', trigger: 'blur' } { validate: validateYS, message: t('ts.请输入正确的代码'), trigger: 'blur' }
], ],
name: [ name: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
warehouseCode: [ warehouseCode: [
{ required: true, message: '请输入仓库代码', trigger: 'change' } { required: true, message: t('ts.请输入仓库代码'), trigger: 'change' }
], ],
isFunctional: [ isFunctional: [
{ required: true, message: '请选择是否是功能区', trigger: 'change' } { required: true, message: t('ts.请选择是否是功能区'), trigger: 'change' }
], ],
available: [ available: [
{ required: true, message: '请选择是否可用', trigger: 'change' } { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
], ],
type: [ type: [
{ required: true, message: '请选择类型', trigger: 'change' } { required: true, message: t('ts.请选择类型'), trigger: 'change' }
], ],
manageMode: [ manageMode: [
{ required: true, message: t('ts.请选择管理精度'), trigger: 'change' } { required: true, message: t('ts.请选择管理精度'), trigger: 'change' }

28
src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts

@ -295,39 +295,39 @@ export const Dock = useCrudSchemas(reactive<CrudSchema[]>([
//表单校验 //表单校验
export const DockRules = reactive({ export const DockRules = reactive({
code: [ code: [
{ required: true, message: '请输入代码', trigger: 'blur' }, { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }, { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
{ validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} { validator:validateYS, message: t('ts.请输入正确的代码'), trigger: 'blur'}
], ],
name: [ name: [
{ required: true,max: 50, message: '不得超过50个字符', trigger: 'blur' } { required: true,max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
city: [ city: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
address: [ address: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
contactPerson: [ contactPerson: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
contactPhone: [ contactPhone: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }, { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
{ validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'} { validator:validateHanset, message: t('ts.请输入正确的手机号'), trigger: 'blur'}
], ],
type: [ type: [
{ required: true, message: '请输入类型', trigger: 'change' } { required: true, message: t('ts.请输入类型'), trigger: 'change' }
], ],
warehouseCode: [ warehouseCode: [
{ required: true, message: '请输入仓库代码', trigger: 'change' } { required: true, message: t('ts.请输入仓库代码'), trigger: 'change' }
], ],
defaultLocationCode: [ defaultLocationCode: [
{ required: true, message: '请输入默认库位代码', trigger: 'change' } { required: true, message: t('ts.请输入默认库位代码'), trigger: 'change' }
], ],
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
available: [ available: [
{ required: true, message: '请选择是否可用', trigger: 'change' } { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
], ],
}) })

14
src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts

@ -199,20 +199,20 @@ export const Warehouse = useCrudSchemas(reactive<CrudSchema[]>([
//表单校验 //表单校验
export const WarehouseRules = reactive({ export const WarehouseRules = reactive({
code: [ code: [
{ required: true, message: '请输入代码', trigger: 'blur' }, { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }, { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
{ validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} { validator:validateYS, message: t('ts.请输入正确的代码'), trigger: 'blur'}
], ],
name: [ name: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
description: [ description: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
available: [ available: [
{ required: true, message: '请选择是否可用', trigger: 'change' } { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
], ],
}) })

40
src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts

@ -298,50 +298,50 @@ export const Supplier = useCrudSchemas(reactive<CrudSchema[]>([
//表单校验 //表单校验
export const SupplierRules = reactive({ export const SupplierRules = reactive({
code: [ code: [
{ required: true, message: '请输入代码', trigger: 'blur' }, { required: true, message: t('ts.请输入代码'), trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }, { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
{ validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} { validator:validateYS, message: t('ts.请输入正确的代码'), trigger: 'blur'}
], ],
name: [ name: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
shortName: [ shortName: [
{ required: true, message: '请输入简称', trigger: 'blur' }, { required: true, message: t('ts.请输入简称'), trigger: 'blur' },
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
address: [ address: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
country: [ country: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
city: [ city: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
phone: [ phone: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }, { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
{ validator:validateHanset, message: '请输入正确的手机号', trigger: 'blur'} { validator:validateHanset, message: t('ts.请输入正确的手机号'), trigger: 'blur'}
], ],
fax: [ fax: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }, { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
{ validator:validateFax, message: '请输入正确的传真', trigger: 'blur'} { validator:validateFax, message: t('ts.请输入正确的传真'), trigger: 'blur'}
], ],
postId: [ postId: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }, { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
{ validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'} { validator:validatePostCode, message: '请输入正确的邮编', trigger: 'blur'}
], ],
contacts: [ contacts: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
email: [ email: [
{ required: true, message: '请输入邮箱', trigger: 'blur' }, { required: true, message: t('ts.请输入邮箱'), trigger: 'blur' },
{ max: 128, message: '不得超过128个字符', trigger: 'blur' }, { max: 128, message: t('ts.不得超过128个字符'), trigger: 'blur' },
{ validator:validateEmail, message: '请输入正确的邮箱格式', trigger: 'blur'} { validator:validateEmail, message: t('ts.请输入正确的邮箱格式'), trigger: 'blur'}
], ],
bank: [ bank: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
available: [ available: [
{ required: true, message: '请选择是否可用', trigger: 'change' } { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
], ],
}) })

10
src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts

@ -403,13 +403,13 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
//表单校验 //表单校验
export const SupplieritemRules = reactive({ export const SupplieritemRules = reactive({
supplierCode: [ supplierCode: [
{ required: true, message: '请输入供应商代码', trigger: 'change' } { required: true, message: t('ts.请输入供应商代码'), trigger: 'change' }
], ],
itemCode: [ itemCode: [
{ required: true, message: '请输入物料代码', trigger: 'change' } { required: true, message: t('ts.请输入物料代码'), trigger: 'change' }
], ],
supplierItemCode: [ supplierItemCode: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' }, { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' },
// { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} // { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
], ],
// packUnit: [ // packUnit: [
@ -419,9 +419,9 @@ export const SupplieritemRules = reactive({
// { required: true, message: '请输入供应商包装量', trigger: 'blur' } // { required: true, message: '请输入供应商包装量', trigger: 'blur' }
// ], // ],
available: [ available: [
{ required: true, message: '请选择是否可用', trigger: 'change' } { required: true, message: t('ts.请选择是否可用'), trigger: 'change' }
], ],
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
}) })

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue

@ -348,7 +348,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
// table // table
const buttondataTable = ref([{ const buttondataTable = ref([{
label: '查看子包装', label: t('ts.查看子包装'),
name: 'viewParentPickingNumber', name: 'viewParentPickingNumber',
hide: false, hide: false,
type: 'primary', type: 'primary',

2
src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue

@ -862,7 +862,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
// table // table
const buttondataTable = ref([{ const buttondataTable = ref([{
label: '查看子包装', label: t('ts.查看子包装'),
name: 'viewParentPickingNumber', name: 'viewParentPickingNumber',
hide: false, hide: false,
type: 'primary', type: 'primary',

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

@ -130,7 +130,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
{ {
key: 'supplierCode', key: 'supplierCode',
value: 'supplierCode', value: 'supplierCode',
message: '请填写供应商代码!', message: t(`ts.${'请填写供应商代码!'}`),
isMainValue: true isMainValue: true
}, },
{ {

12
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@ -1120,7 +1120,7 @@ const onChangePurchasePass = (field, cur, formRef)=>{
const submitPurchasePass = async (id, submitData) => { const submitPurchasePass = async (id, submitData) => {
console.log(submitData) console.log(submitData)
if(submitData&&!submitData.balanceStatement.trim()){ if(submitData&&!submitData.balanceStatement.trim()){
message.error('请输入价差通过说明') message.error(t('ts.请输入价差通过说明'))
return return
} }
const id1 = submitData?.id || id const id1 = submitData?.id || id
@ -1151,7 +1151,7 @@ const formFinanceRef = ref()
const handleFinanceApp = async (row) => { const handleFinanceApp = async (row) => {
row.postingDate = dayjs().valueOf() row.postingDate = dayjs().valueOf()
row.voucherNumberRemark = `${row.supplierName?row.supplierName.slice(0,6):''}发票${row.goldenTaxInvoiceNumber?row.goldenTaxInvoiceNumber.length>6?row.goldenTaxInvoiceNumber.slice(row.goldenTaxInvoiceNumber.length-6):row.goldenTaxInvoiceNumber:''}` row.voucherNumberRemark = `${row.supplierName?row.supplierName.slice(0,6):''}发票${row.goldenTaxInvoiceNumber?row.goldenTaxInvoiceNumber.length>6?row.goldenTaxInvoiceNumber.slice(row.goldenTaxInvoiceNumber.length-6):row.goldenTaxInvoiceNumber:''}`
formFinanceRef.value.open('update', row, null, '财务通过', '财务通过') formFinanceRef.value.open('update', row, null, t('ts.财务通过'), t('ts.财务通过'))
} }
const submitFormFinance = async (formType, submitData) => { const submitFormFinance = async (formType, submitData) => {
@ -1425,8 +1425,8 @@ const submitForm = async (formType, submitData) => {
} }
if(data.discountAmount1>0){ if(data.discountAmount1>0){
await ElMessageBox.alert( await ElMessageBox.alert(
'请确认该申请中是否包含返利金额,请注意填写的返利金额应为负数', t(`ts.${'请确认该申请中是否包含返利金额,请注意填写的返利金额应为负数'}`),
'重要提示', t('ts.重要提示'),
{ {
showCancelButton: true showCancelButton: true
} }
@ -1439,8 +1439,8 @@ const submitForm = async (formType, submitData) => {
} else { } else {
if(data.discountAmount1>0){ if(data.discountAmount1>0){
await ElMessageBox.alert( await ElMessageBox.alert(
'请确认该申请中是否包含返利金额,请注意填写的返利金额应为负数', t(`ts.${'请确认该申请中是否包含返利金额,请注意填写的返利金额应为负数'}`),
'重要提示', t('ts.重要提示'),
{ {
showCancelButton: true showCancelButton: true
} }

46
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@ -1643,44 +1643,44 @@ export const SupplierinvoiceRequestMainRules = reactive({
// { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'} // { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'}
], ],
supplierCode: [ supplierCode: [
{ required: true, message: '请选择供应商代码', trigger: 'change' } { required: true, message: t('ts.请选择供应商代码'), trigger: 'change' }
], ],
invoiceTime:[ invoiceTime:[
{ required: false, message: '请选择发票日期', trigger: 'blur' } { required: false, message: t('ts.请选择发票日期'), trigger: 'blur' }
], ],
goldenTaxInvoiceNumber:[ goldenTaxInvoiceNumber:[
{ required: false, message: '请输入金税票号', trigger: 'blur' }, { required: false, message: t('ts.请输入金税票号'), trigger: 'blur' },
// { validator:validateGoldenTaxInvoiceNumber, message: '金税票号只能是数字', trigger: 'blur'} // { validator:validateGoldenTaxInvoiceNumber, message: '金税票号只能是数字', trigger: 'blur'}
], ],
departmentCode: [ departmentCode: [
{ required: true, message: '请输入部门', trigger: 'blur' } { required: true, message: t('ts.请输入部门'), trigger: 'blur' }
], ],
autoCommit: [ autoCommit: [
{ required: true, message: '请选择是否自动提交', trigger: 'change' } { required: true, message: t('ts.请选择是否自动提交'), trigger: 'change' }
], ],
autoAgree: [ autoAgree: [
{ required: true, message: '请选择是否自动通过', trigger: 'change' } { required: true, message: t('ts.请选择是否自动通过'), trigger: 'change' }
], ],
autoExecute: [ autoExecute: [
{ required: true, message: '请选择是否自动执行', trigger: 'change' } { required: true, message: t('ts.请选择是否自动执行'), trigger: 'change' }
], ],
directCreateRecord: [ directCreateRecord: [
{ required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } { required: true, message: t('ts.请选择是否跳过任务直接生成记录'), trigger: 'change' }
], ],
businessType: [ businessType: [
{ required: true, message: '请输入业务类型', trigger: 'blur' } { required: true, message: t('ts.请输入业务类型'), trigger: 'blur' }
], ],
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('ts.不得超过50个字符'), trigger: 'blur' }
], ],
procurementCreator: [ procurementCreator: [
{ required: true, message: '请选择采购员', trigger: 'change' } { required: true, message: t('ts.请选择采购员'), trigger: 'change' }
], ],
beforeTaxAmount: [ beforeTaxAmount: [
{ required: true, message: '请输入未税金额', trigger: 'change' } { required: true, message: t('ts.请输入未税金额'), trigger: 'change' }
], ],
totalTaxAmount: [ totalTaxAmount: [
{ required: true, message: '请输入税额', trigger: 'change' } { required: true, message: t('ts.请输入税额'), trigger: 'change' }
], ],
}) })
@ -1966,7 +1966,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
componentProps: { componentProps: {
multiple:true,//多选 multiple:true,//多选
isSearchList: true, isSearchList: true,
searchListPlaceholder: '请选择订单行', searchListPlaceholder: t('ts.请选择订单行'),
searchField: 'poLine', searchField: 'poLine',
searchTitle: '待开票列表', searchTitle: '待开票列表',
searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas, searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
@ -1975,12 +1975,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
{ {
key: 'supplierCode', key: 'supplierCode',
value: 'supplierCode', value: 'supplierCode',
message: '请填供应商信息!', message: t(`ts.${'请填供应商信息!'}`),
isMainValue: true isMainValue: true
},{ },{
key: 'orderType', key: 'orderType',
value: 'orderType', value: 'orderType',
message: '请填订单类型!', message: t(`ts.${'请填订单类型!'}`),
isMainValue: true isMainValue: true
} }
] ]
@ -1989,7 +1989,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
tableForm: { tableForm: {
multiple:true,//多选 multiple:true,//多选
isInpuFocusShow: true, isInpuFocusShow: true,
searchListPlaceholder: '请选择订单行', searchListPlaceholder: t('ts.请选择订单行'),
searchField: 'poLine', searchField: 'poLine',
searchTitle: '待开票列表', searchTitle: '待开票列表',
searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas, searchAllSchemas: PurchaseReceiptOrReturnRecordDetail.allSchemas,
@ -1998,13 +1998,13 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
{ {
key: 'supplierCode', key: 'supplierCode',
value: 'supplierCode', value: 'supplierCode',
message: '请填供应商信息!', message: t(`ts.${'请填供应商信息!'}`),
isMainValue: true isMainValue: true
}, },
{ {
key: 'orderType', key: 'orderType',
value: 'orderType', value: 'orderType',
message: '请填订单类型!', message: t(`ts.${'请填订单类型!'}`),
isMainValue: true isMainValue: true
} }
], ],
@ -2220,13 +2220,13 @@ const validateSinglePrice = (rule: any, value: any, callback: any) => {
if (Number(value)>0) { if (Number(value)>0) {
callback(); callback();
} else { } else {
callback(new Error('请输入合同价格')); callback(new Error(t('ts.请输入合同价格')));
} }
} }
//表单校验 //表单校验
export const SupplierinvoiceRequestDetailRules = reactive({ export const SupplierinvoiceRequestDetailRules = reactive({
singlePrice: [ singlePrice: [
{ required: true, message: '请输入合同价格', trigger: 'change' }, { required: true, message: t('ts.请输入合同价格'), trigger: 'change' },
{ validator: validateSinglePrice, trigger: 'change' } { validator: validateSinglePrice, trigger: 'change' }
], ],
}) })
@ -2250,7 +2250,7 @@ export const PurchasePass = useCrudSchemas(reactive<CrudSchema[]>([
//表单校验 //表单校验
export const PurchasePassRules = reactive({ export const PurchasePassRules = reactive({
balanceStatement: [ balanceStatement: [
{ required: true, message: '请输入价差通过说明', trigger: 'blur'}, { required: true, message: t('ts.请输入价差通过说明'), trigger: 'blur'},
{ max: 100, message: '最多100字符', trigger: 'blur'} { max: 100, message: t('ts.最多100字符'), trigger: 'blur'}
], ],
}) })

34
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts

@ -1612,43 +1612,43 @@ export const SupplierinvoiceRequestMainRules = reactive({
// { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'} // { validator:validateTaxRate, message: '税率必须大于0', trigger: 'blur'}
], ],
supplierCode: [ supplierCode: [
{ required: true, message: '请选择供应商代码', trigger: 'change' } { required: true, message: t('ts.请选择供应商代码'), trigger: 'change' }
], ],
invoiceTime:[ invoiceTime:[
{ required: false, message: '请选择发票日期', trigger: 'blur' } { required: false, message: t('ts.请选择发票日期'), trigger: 'blur' }
], ],
goldenTaxInvoiceNumber:[ goldenTaxInvoiceNumber:[
{ required: false, message: '请输入金税票号', trigger: 'blur' } { required: false, message: t('ts.请输入金税票号'), trigger: 'blur' }
], ],
departmentCode: [ departmentCode: [
{ required: true, message: '请输入部门', trigger: 'blur' } { required: true, message: t('ts.请输入部门'), trigger: 'blur' }
], ],
autoCommit: [ autoCommit: [
{ required: true, message: '请选择是否自动提交', trigger: 'change' } { required: true, message: t('ts.请选择是否自动提交'), trigger: 'change' }
], ],
autoAgree: [ autoAgree: [
{ required: true, message: '请选择是否自动通过', trigger: 'change' } { required: true, message: t('ts.请选择是否自动通过'), trigger: 'change' }
], ],
autoExecute: [ autoExecute: [
{ required: true, message: '请选择是否自动执行', trigger: 'change' } { required: true, message: t('ts.请选择是否自动执行'), trigger: 'change' }
], ],
directCreateRecord: [ directCreateRecord: [
{ required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } { required: true, message: t('请选择是否跳过任务直接生成记录'), trigger: 'change' }
], ],
businessType: [ businessType: [
{ required: true, message: '请输入业务类型', trigger: 'blur' } { required: true, message: t('请输入业务类型'), trigger: 'blur' }
], ],
remark: [ remark: [
{ max: 50, message: '不得超过50个字符', trigger: 'blur' } { max: 50, message: t('不得超过50个字符'), trigger: 'blur' }
], ],
procurementCreator: [ procurementCreator: [
{ required: true, message: '请选择采购员', trigger: 'change' } { required: true, message: t('请选择采购员'), trigger: 'change' }
], ],
beforeTaxAmount: [ beforeTaxAmount: [
{ required: true, message: '请输入未税金额', trigger: 'change' } { required: true, message: t('请输入未税金额'), trigger: 'change' }
], ],
totalTaxAmount: [ totalTaxAmount: [
{ required: true, message: '请输入税额', trigger: 'change' } { required: true, message: t('请输入税额'), trigger: 'change' }
], ],
}) })
@ -2145,13 +2145,13 @@ const validateSinglePrice = (rule: any, value: any, callback: any) => {
if (Number(value)>0) { if (Number(value)>0) {
callback(); callback();
} else { } else {
callback(new Error('请输入合同价格')); callback(new Error(t('ts.请输入合同价格')));
} }
} }
//表单校验 //表单校验
export const SupplierinvoiceRequestDetailRules = reactive({ export const SupplierinvoiceRequestDetailRules = reactive({
singlePrice: [ singlePrice: [
{ required: true, message: '请输入合同价格', trigger: 'change' }, { required: true, message: t('ts.请输入合同价格'), trigger: 'change' },
{ validator: validateSinglePrice, trigger: 'change' } { validator: validateSinglePrice, trigger: 'change' }
], ],
}) })
@ -2175,7 +2175,7 @@ export const PurchasePass = useCrudSchemas(reactive<CrudSchema[]>([
//表单校验 //表单校验
export const PurchasePassRules = reactive({ export const PurchasePassRules = reactive({
balanceStatement: [ balanceStatement: [
{ required: true, message: '请输入价差通过说明', trigger: 'blur'}, { required: true, message: t('ts.请输入价差通过说明'), trigger: 'blur'},
{ max: 100, message: '最多100字符', trigger: 'blur'} { max: 100, message: t('ts.最多100字符'), trigger: 'blur'}
], ],
}) })

Loading…
Cancel
Save