Browse Source

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

master_hella_20240701
yufei0306 7 months ago
parent
commit
58c84bcebb
  1. 4
      src/api/wms/supplierinvoiceRequestMain/index.ts
  2. 2
      src/views/qms/aql/aql.data.ts
  3. 6
      src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts
  4. 1
      src/views/qms/basicDataManage/selectedSet/index.vue
  5. 2
      src/views/qms/qualityNotice/components/notaicType.vue
  6. 10
      src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

4
src/api/wms/supplierinvoiceRequestMain/index.ts

@ -68,11 +68,11 @@ export const cloSupplierinvoiceRequestMain = async (id: number) => {
export const subSupplierinvoiceRequestMain = async (id: number) => {
return await request.post({ url: `/wms/supplierinvoice-request-main/sub?id=` + id })
}
// 供应商--审批通过供应商发货申请主
// 采购--审批通过供应商发货申请主
export const appSupplierinvoiceRequestMain = async (id: number) => {
return await request.post({ url: `/wms/supplierinvoice-request-main/app?id=` + id })
}
// 供应商--驳回供应商发货申请主
// 采购--驳回供应商发货申请主
export const rejSupplierinvoiceRequestMain = async (id: number) => {
return await request.post({ url: `/wms/supplierinvoice-request-main/rej?id=` + id })
}

2
src/views/qms/aql/aql.data.ts

@ -7,7 +7,7 @@ import {validateNum} from "@/utils/validator";
export const AqlRules = reactive({
code: [required],
inspectionQualification: [required],
sampleCharacterCode: [required],
sampleCharacterCode: [{ required, max: 1, message: '长度不得超过1个字符', trigger: 'blur' }],
sampleSize: [required],
a0separator010: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],
r0separator010: [{ validator: validateNum, message: '请输入整数', trigger: 'blur' }],

6
src/views/qms/basicDataManage/dynamicRule/dynamicRule.data.ts

@ -36,11 +36,11 @@ export const DynamicRule = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '操作',
field: 'action',
isForm: false,
isDetail: false,
isForm: false,
table: {
width: 150,
width: 330,
fixed: 'right'
}
},
}
]))

1
src/views/qms/basicDataManage/selectedSet/index.vue

@ -77,6 +77,7 @@
:detailButtonIsShowDelete=true
@detailOpenForm="detailOpenForm"
@detailBasicFormOnChange="detailBasiFormOnChange"
:detailButtonIsShowFilter="false"
/>
<!-- 导入 -->

2
src/views/qms/qualityNotice/components/notaicType.vue

@ -175,7 +175,7 @@ nextTick(()=>{
type.value = parseInt(props.data.type)
q1.value = props.data?.q1 ? props.data?.q1 :{}
q2.value = props.data?.q2 ? props.data?.q2 :{}
q3.value = props.data?.q3 ? props.data?.q3 :{},
q3.value = props.data?.q3 ? props.data?.q3 :{}
})
//

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

@ -254,8 +254,8 @@
// -
const butttondata = (row) => {
return [
defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1']) }), //
defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), //
defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['1','6']) }), //
defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1','6']) }), //
{
label: '采购通过',
name: 'purchase_mainPlanSub',
@ -303,8 +303,8 @@
},
// defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), //
//defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), //
defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8'])}), //
defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1','8']) }), //
defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierinvoice-request-main:update' , hide: isShowMainButton(row, ['1','8','6'])}), //
defaultButtons.mainListPurchasePlanCloBtn({ hide: isShowMainButton(row, ['1','8','6']) }), //
//
// {
// label: '',
@ -440,7 +440,7 @@ const handleImport = () => {
}
}
/** 审批通过按钮操作 */
/** 采购审批通过按钮操作 */
const handleApp = async (id : number) => {
try {
//

Loading…
Cancel
Save