sfms3.0
/
sfms3.0-ui
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

hella_online_20240829
zhaoxuebing 3 months ago
parent
af6ea5b3ca 74148af753
commit
7c61ffd3d7
9 changed files with 222 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/views/qms/inspectionQ1/index.vue
  2. 40
      src/views/qms/inspectionQ2/index.vue
  3. 91
      src/views/qms/inspectionQ2/inspectionQ2.data.ts
  4. 24
      src/views/qms/inspectionQ3/index.vue
  5. 73
      src/views/qms/inspectionQ3/inspectionQ3.data.ts
  6. 8
      src/views/qms/inspectionRecordFirst/addForm.vue
  7. 6
      src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
  8. 2
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
  9. 82
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

6
src/views/qms/inspectionQ1/index.vue
View File

@ -27,9 +27,9 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
<template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.number)">
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">

40
src/views/qms/inspectionQ2/index.vue
View File

@ -27,9 +27,9 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
<template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.number)">
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
@ -84,21 +84,27 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
nextTick(() => {
const setV = {}
if(formField == 'itemCode'){
console.log(val);
setV['uom'] = val[0]['supplierUom']
}
if (formField == 'q1Number') {
console.log(123)
setV['q1Number'] = val[0]['number']
// if (formField == 'q1Number') {
// console.log(123)
// setV['q1Number'] = val[0]['number']
// }
if (formField == 'purchaseReceiptNumber') {
setV['wmsQty'] = val[0]['qty']
}
// if (formField == 'supplierCode') {
// console.log(123)
// setV['supplierCode'] = val[0]['code']
// }
setV[formField] = val[0][searchField]
formRef.setValues(setV)
if(formField == 'q1Number'){
//Q1通知单号
let list = []
val.forEach(item=>{
list.push(item[searchField])
})
setV[formField] = list.join(',')
formRef.setValues(setV)
}else{
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}
})
}
@ -214,6 +220,10 @@ const formsSuccess = async (formType, data) => {
return;
}
}
if (data.qty>data.wmsQty) {
message.error('数量不能大于记录中的收货数量')
return;
}
if(data.activeTime==0)data.activeTime = null;
if(data.expireTime==0)data.expireTime = null;
if (formType === 'create') {

91
src/views/qms/inspectionQ2/inspectionQ2.data.ts
View File

@ -14,7 +14,7 @@ import * as SupplierApi from '@/api/wms/supplier'
import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
import { PurchasereceiptRecordMain1 } from '@/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data'
import { PurchasereceiptRecordDetail } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
import { useUserStore } from '@/store/modules/user'
const userStore = useUserStore()
@ -60,6 +60,7 @@ export const Q2 = useCrudSchemas(
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
@ -78,14 +79,16 @@ export const Q2 = useCrudSchemas(
isMainValue: false
}
],
verificationParams: [{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
},
isSearch: true
@ -132,14 +135,16 @@ export const Q2 = useCrudSchemas(
isMainValue: false
}
],
verificationParams: [{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
@ -221,8 +226,8 @@ export const Q2 = useCrudSchemas(
searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
searchTitle: '采购收货记录', // 查询弹窗标题
searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法
searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, // 查询弹窗所需类
searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, // 查询弹窗所需分页方法
searchCondition: [
{
key: 'supplierCode',
@ -235,17 +240,29 @@ export const Q2 = useCrudSchemas(
isMainValue: true
}
],
verificationParams: [{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
{
label: '采购收货数量',
field: 'wmsQty',
sort: 'custom',
isSearch: false,
isForm: false,
isTable: false,
isDetail: false
},
{
label: '数量',
field: 'qty',
@ -328,7 +345,7 @@ export const Q2 = useCrudSchemas(
form: {
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch:true,
enterSearch: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择成本中心', // 输入框占位文本
searchField: 'costcentreCode', // 查询弹窗赋值字段
@ -342,14 +359,16 @@ export const Q2 = useCrudSchemas(
isMainValue: false
}
],
verificationParams: [{
key: 'costcentreCode',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
verificationParams: [
{
key: 'costcentreCode',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},

24
src/views/qms/inspectionQ3/index.vue
View File

@ -27,9 +27,9 @@
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
>
<template #code="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.code)">
<span>{{ row.code }}</span>
<template #number="{row}">
<el-button type="primary" link @click="openDetail(row, '代码', row.number)">
<span>{{ row.number }}</span>
</el-button>
</template>
<template #action="{ row }">
@ -87,12 +87,18 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
console.log(val);
setV['uom'] = val[0]['uom']
}
if (formField == 'q1Number') {
console.log(123)
setV['q1Number'] = val[0]['number']
}
setV[formField] = val[0][searchField]
formRef.setValues(setV)
if(formField == 'q1Number'){
//Q1通知单号
let list = []
val.forEach(item=>{
list.push(item[searchField])
})
setV[formField] = list.join(',')
formRef.setValues(setV)
}else{
setV[formField] = val[0][searchField]
formRef.setValues(setV)
}
})
}

73
src/views/qms/inspectionQ3/inspectionQ3.data.ts
View File

@ -54,6 +54,7 @@ export const Q3 = useCrudSchemas(
// labelMessage: '信息提示说明！！！',
componentProps: {
enterSearch: true,
multiple: true,
isSearchList: true, // 开启查询弹窗
searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
searchField: 'number', // 查询弹窗赋值字段
@ -72,14 +73,16 @@ export const Q3 = useCrudSchemas(
isMainValue: false
}
],
verificationParams: [{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
verificationParams: [
{
key: 'number',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
},
isSearch: true
@ -125,14 +128,16 @@ export const Q3 = useCrudSchemas(
isMainValue: false
}
],
verificationParams: [{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
},
form: {
// labelMessage: '信息提示说明！！！',
@ -151,14 +156,16 @@ export const Q3 = useCrudSchemas(
isMainValue: false
}
],
verificationParams: [{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
verificationParams: [
{
key: 'code',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},
@ -311,14 +318,16 @@ export const Q3 = useCrudSchemas(
isMainValue: false
}
],
verificationParams: [{
key: 'costcentreCode',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true,
}], // 失去焦点校验参数
verificationParams: [
{
key: 'costcentreCode',
action: '==',
value: '',
isMainValue: false,
isSearch: true,
isFormModel: true
}
] // 失去焦点校验参数
}
}
},

8
src/views/qms/inspectionRecordFirst/addForm.vue
View File

@ -1169,8 +1169,12 @@ const searchTableSuccess = async (formField, searchField, val, type, row) => {
_searchCondition.filters = filters
const InspectionSchemeArray = await InspectionSchemeApi.InspectionSchemePage(_searchCondition)
const InspectionSchemeObj = InspectionSchemeArray.list[0]
data.value.samplePieceSize = InspectionSchemeObj.samplePieceSize
data.value.inspectionSchemeCode = InspectionSchemeObj.code
data.value.samplePieceSize = InspectionSchemeObj?.samplePieceSize || ''
data.value.inspectionSchemeCode = InspectionSchemeObj?.code || ''
if (!data.value.inspectionSchemeCode) {
data.value.subList = []
return;
}
let list = await InspectionJobDetailApi.getBySchemeCode(data.value.inspectionSchemeCode)
editableTabsValue.value = 1
list.forEach((item, index) => {

6
src/views/qms/inspectionRecordFirst/inspectionRecordFirstMain.data.ts
View File

@ -120,9 +120,9 @@ export const InspectionRecordMain = useCrudSchemas(
search: {
component: 'DatePicker',
componentProps: {
type: 'datetimerange',
dateFormat: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'x'
type: 'daterange',
dateFormat: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD'
}
},

2
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue
View File

@ -343,7 +343,7 @@ const searchTableSuccessDetail = async (formField, searchField, val, formRef,sea
if (type == 'tableForm') {
// 明细查询页赋值
val.forEach(item=>{
if(tableData.value.find(item1=>item1['recvBillNum'] == item['recvBillNum'])) return
if(tableData.value.find(item1=>item1['recvBillNum'] == item['recvBillNum']&&item1['poLine'] == item['poLine'])) return
const newRow = {...row}
newRow[formField] = item[searchField]

82
src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts
View File

@ -1468,6 +1468,35 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
isSearch: false,
isDetail: true,
},
// {
// label: '总价差',
// field: 'differencePriceTotal',
// formatter: accountantFormart,
// sortTableDefault: 6,
// isForm: false,
// isTable: false,
// isSearch: false,
// isDetail: true,
// },
// {
// label: '采购金额',
// field: 'purchaseAmontTotal',
// formatter: accountantFormart,
// sortTableDefault: 6,
// isForm: false,
// isTable: false,
// isSearch: false,
// isDetail: true,
// },
// {
// label: '',
// field: '',
// sortTableDefault: 6,
// isForm: false,
// isTable: false,
// isSearch: false,
// isDetail: true,
// },
]))
@ -2019,18 +2048,53 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
},
},
// {
// label: '操作',
// field: 'action',
// isDetail: false,
// isForm: false,
// label: '合同金额',
// field: 'contractAmountTotal',
// table: {
// width: 250,
// fixed: 'right'
// width: 150
// },
// hiddenInMain:true,
// isTableForm: false,
// }
// isForm:false,
// tableForm:{
// disabled: true
// }
// },
// {
// label: '采购金额',
// field: 'purchaseAmontTotal',
// table: {
// width: 150
// },
// isForm:false,
// tableForm:{
// disabled: true
// }
// },
// {
// label: '总差额',
// field: 'differencePriceTotal',
// table: {
// width: 150
// },
// isForm:false,
// tableForm:{
// disabled: true
// }
// },
{
label: '操作',
field: 'action',
isDetail: false,
isForm: false,
table: {
width: 250,
fixed: 'right'
},
hiddenInMain:true,
isTableForm: false,
}
]))
// 批次校验
const validateSinglePrice = (rule: any, value: any, callback: any) => {
if (Number(value)>0) {

Write Preview
Loading…
Cancel
Save