Browse Source

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

master_hella_20240701
songguoqiang 8 months ago
parent
commit
7fb42d286f
  1. 15
      src/components/TableForm/src/TableForm.vue
  2. 71
      src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts
  3. 125
      src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts
  4. 6
      src/views/qms/inspection/inspectionRequest/index.vue
  5. 70
      src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts
  6. 2
      src/views/qms/inspectionMethod/inspectionMethod.data.ts
  7. 2
      src/views/qms/samplingProcess/samplingProcess.data.ts
  8. 2
      src/views/qms/samplingScheme/samplingScheme.data.ts
  9. 2
      src/views/system/systemInstallPackage/systemInstallPackage.data.ts
  10. 14
      src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue
  11. 8
      src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue
  12. 17
      src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

15
src/components/TableForm/src/TableForm.vue

@ -40,7 +40,7 @@
/> />
<el-table-column <el-table-column
v-slot="{ row, $index }" v-slot="{ row, $index }"
v-for="(headerItem,index) in tableFields" v-for="(headerItem) in tableFields"
:key="headerItem" :key="headerItem"
:fixed="headerItem.tableForm?.fixed" :fixed="headerItem.tableForm?.fixed"
:label="headerItem.label" :prop="headerItem.field" :label="headerItem.label" :prop="headerItem.field"
@ -55,10 +55,10 @@
:rules="tableFormRules" :rules="tableFormRules"
:class="tableFormRules ? '' : 'noRulesForm'"> :class="tableFormRules ? '' : 'noRulesForm'">
<!-- 字符串输入框 --> <!-- 字符串输入框 -->
<el-form-item <el-form-item
v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'" v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
:prop="headerItem.field" style="display: flex;align-items: center;"> :prop="headerItem.field" style="display: flex;align-items: center;">
<el-input <el-input :key="headerItem.field+$index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
clearable clearable
:type="headerItem?.tableForm?.inputType" :type="headerItem?.tableForm?.inputType"
@ -67,7 +67,7 @@
style="flex:1" style="flex:1"
@blur="inputStringBlur(headerItem.field, $event, row)" @blur="inputStringBlur(headerItem.field, $event, row)"
/> />
<el-button v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button> <el-button :key="headerItem.field+$index+'button'" v-if="headerItem?.tableForm?.isInpuFocusShow" @click="inpuFocus(headerItem,row,index)"><Icon icon="ep:search" size="14"/></el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="headerItem?.tableForm?.type == 'slot'"> <el-form-item v-if="headerItem?.tableForm?.type == 'slot'">
<slot :row="row"></slot> <slot :row="row"></slot>
@ -92,6 +92,7 @@
:prop="headerItem.field"> :prop="headerItem.field">
<el-input-number <el-input-number
style="width: 100%;" style="width: 100%;"
:key="headerItem.field+$index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:max="headerItem?.tableForm?.max" :max="headerItem?.tableForm?.max"
:min="headerItem?.tableForm?.min" :min="headerItem?.tableForm?.min"
@ -104,7 +105,7 @@
<el-form-item <el-form-item
v-if="headerItem?.tableForm?.type == 'Select'" v-if="headerItem?.tableForm?.type == 'Select'"
:prop="headerItem.field"> :prop="headerItem.field">
<el-select <el-select :key="headerItem.field+$index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:clearable="headerItem?.tableForm.clearable || true" :clearable="headerItem?.tableForm.clearable || true"
:multiple="headerItem?.tableForm.multiple" :multiple="headerItem?.tableForm.multiple"
@ -175,7 +176,8 @@
<el-form-item <el-form-item
v-if="headerItem?.tableForm?.type == 'FormDate'" v-if="headerItem?.tableForm?.type == 'FormDate'"
:prop="headerItem.field"> :prop="headerItem.field">
<el-date-picker <el-date-picker
:key="headerItem.field+$index"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"
:clearable="true" :clearable="true"
style="width: 100%" style="width: 100%"
@ -190,6 +192,7 @@
v-if="headerItem?.tableForm?.type == 'FormDateTime'" v-if="headerItem?.tableForm?.type == 'FormDateTime'"
:prop="headerItem.field"> :prop="headerItem.field">
<el-date-picker <el-date-picker
:key="headerItem.field+$index"
type="datetime" type="datetime"
:clearable="true" :clearable="true"
v-model="row[headerItem.field]" v-model="row[headerItem.field]"

71
src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts

@ -28,6 +28,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '申请单号', label: '申请单号',
@ -39,6 +42,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '供应商编码', label: '供应商编码',
@ -50,6 +56,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '物料编码', label: '物料编码',
@ -61,6 +70,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '物料批次', label: '物料批次',
@ -72,6 +84,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '订单号', label: '订单号',
@ -83,6 +98,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '订单行', label: '订单行',
@ -96,6 +114,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '凭证号', label: '凭证号',
@ -107,6 +128,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '凭证行', label: '凭证行',
@ -120,6 +144,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '检验方案编码', label: '检验方案编码',
@ -131,6 +158,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
// { // {
// label: '检验方案Json', // label: '检验方案Json',
@ -148,6 +178,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '检验批数量', label: '检验批数量',
@ -159,6 +192,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '采样总数量', label: '采样总数量',
@ -170,6 +206,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '检验类型', label: '检验类型',
@ -184,6 +223,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '检验批来源', label: '检验批来源',
@ -196,6 +238,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps:{ componentProps:{
disabled:true disabled:true
} }
},
table: {
width: 150
} }
}, },
{ {
@ -210,6 +255,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '检验严格性', label: '检验严格性',
@ -222,6 +270,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps:{ componentProps:{
disabled:true disabled:true
} }
},
table: {
width: 150
} }
}, },
{ {
@ -233,6 +284,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps:{ componentProps:{
disabled:true disabled:true
} }
},
table: {
width: 150
} }
}, },
{ {
@ -244,6 +298,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps:{ componentProps:{
disabled:true disabled:true
} }
},
table: {
width: 150
} }
}, },
{ {
@ -268,6 +325,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '计划结束时间', label: '计划结束时间',
@ -291,6 +351,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
disabled:true disabled:true
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '检验水平', label: '检验水平',
@ -303,6 +366,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps:{ componentProps:{
disabled:true disabled:true
} }
},
table: {
width: 150
} }
}, },
{ {
@ -316,6 +382,9 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
componentProps:{ componentProps:{
disabled:true disabled:true
} }
},
table: {
width: 150
} }
}, },
// { // {
@ -347,7 +416,7 @@ export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
activeValue: 'TRUE', activeValue: 'TRUE',
disabled:true disabled:true
} }
}, }
}, },
{ {
label: '操作', label: '操作',

125
src/views/qms/inspection/inspectionRecord/inspectionRecordMain.data.ts

@ -13,101 +13,145 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'number', field: 'number',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '申请编码', label: '申请编码',
field: 'applicationCode', field: 'applicationCode',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '任务编码', label: '任务编码',
field: 'taskCode', field: 'taskCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '供应商编码', label: '供应商编码',
field: 'supplierCode', field: 'supplierCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '物料编码', label: '物料编码',
field: 'materialCode', field: 'materialCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '批次', label: '批次',
field: 'batch', field: 'batch',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '检验方案编码', label: '检验方案编码',
field: 'inspectionSchemeCode', field: 'inspectionSchemeCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '检验方案Json', label: '检验方案Json',
field: 'inspectionSchemeJson', field: 'inspectionSchemeJson',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
isTable:false,
table: {
width: 150
}
}, },
{ {
label: '检验批次', label: '检验批次',
field: 'inspectionBatch', field: 'inspectionBatch',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '检验批数量', label: '检验批数量',
field: 'inspectionBatchAmount', field: 'inspectionBatchAmount',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '采样总数量', label: '采样总数量',
field: 'sampleTatalAmount', field: 'sampleTatalAmount',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '检验类型', label: '检验类型',
field: 'inspectionType', field: 'inspectionType',
dictType: DICT_TYPE.INSPECTION_TYPE,
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false, isForm:false,
form: { form: {
component: 'Select' component: 'Select'
}, },
table: {
width: 150
}
}, },
{ {
label: '检验批来源', label: '检验批来源',
field: 'inspectionBatchSource', field: 'inspectionBatchSource',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '订单号', label: '订单号',
field: 'orderCode', field: 'orderCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '订单行', label: '订单行',
@ -119,13 +163,19 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
value: 0 value: 0
}, },
table: {
width: 150
}
}, },
{ {
label: '凭证号', label: '凭证号',
field: 'certificateCode', field: 'certificateCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false isForm:false,
table: {
width: 150
}
}, },
{ {
label: '凭证行', label: '凭证行',
@ -137,6 +187,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
value: 0 value: 0
}, },
table: {
width: 150
}
}, },
{ {
label: '检验阶段', label: '检验阶段',
@ -148,20 +201,20 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
value: 0 value: 0
}, },
table: {
width: 150
}
}, },
{ {
label: '检验严格性', label: '检验严格性',
field: 'inspectionStringency', field: 'inspectionStringency',
dictType: DICT_TYPE.INSPECTION_SEVERITY,
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false, isForm:false,
}, table: {
{ width: 150
label: '使用决策', }
field: 'useDecision',
sort: 'custom',
isSearch: false,
isForm:false
}, },
{ {
label: '计划开始时间', label: '计划开始时间',
@ -185,6 +238,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x' valueFormat: 'x'
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '计划结束时间', label: '计划结束时间',
@ -208,6 +264,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x' valueFormat: 'x'
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '实际开始时间', label: '实际开始时间',
@ -231,6 +290,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x' valueFormat: 'x'
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '实际结束时间', label: '实际结束时间',
@ -254,27 +316,42 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x' valueFormat: 'x'
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '检验水平', label: '检验水平',
field: 'inspectionLevel', field: 'inspectionLevel',
dictType: DICT_TYPE.INSPECTION_LEVEL,
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false, isForm:false,
table: {
width: 150
}
}, },
{ {
label: 'AQL值', label: 'AQL值',
field: 'aqlValue', field: 'aqlValue',
dictType: DICT_TYPE.BASIC_AQL,
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false, isForm:false,
table: {
width: 150
}
}, },
{ {
label: '是否可用', label: '是否可用',
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE,
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
isForm:false, isForm:false,
table: {
width: 150
}
}, },
{ {
label: '使用决策', label: '使用决策',
@ -282,6 +359,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
dictType: DICT_TYPE.USAGE_DECISION, dictType: DICT_TYPE.USAGE_DECISION,
table: {
width: 150
}
}, },
{ {
@ -299,6 +379,9 @@ export const InspectionRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
}, },
isForm: false, isForm: false,
table: {
width: 150
}
}, },
{ {

6
src/views/qms/inspection/inspectionRequest/index.vue

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

70
src/views/qms/inspection/inspectionRequest/inspectionMain.data.ts

@ -24,6 +24,10 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
field: 'number', field: 'number',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
table: {
width: 200,
fixed: 'left'
}
}, },
{ {
label: '申请日期', label: '申请日期',
@ -46,6 +50,9 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x' valueFormat: 'x'
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '申请时间', label: '申请时间',
@ -68,6 +75,9 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x' valueFormat: 'x'
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '要求开始时间', label: '要求开始时间',
@ -90,6 +100,9 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x' valueFormat: 'x'
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '要求结束时间', label: '要求结束时间',
@ -112,6 +125,9 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x' valueFormat: 'x'
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '完成时间', label: '完成时间',
@ -134,36 +150,54 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
valueFormat: 'x' valueFormat: 'x'
} }
}, },
table: {
width: 150
}
}, },
{ {
label: '供应商编码', label: '供应商编码',
field: 'supplierCode', field: 'supplierCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
table: {
width: 150
}
}, },
{ {
label: '物料编码', label: '物料编码',
field: 'materialCode', field: 'materialCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
table: {
width: 150
}
}, },
{ {
label: '批次', label: '批次',
field: 'batch', field: 'batch',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
table: {
width: 150
}
}, },
{ {
label: '待检数量', label: '待检数量',
field: 'requestInspectionNum', field: 'requestInspectionNum',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
table: {
width: 150
}
}, },
{ {
label: '参考订单号', label: '参考订单号',
field: 'referenceOrderCode', field: 'referenceOrderCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
table: {
width: 150
}
}, },
{ {
label: '参考订单行', label: '参考订单行',
@ -174,12 +208,18 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
value: 0 value: 0
}, },
table: {
width: 150
}
}, },
{ {
label: '参考凭证号', label: '参考凭证号',
field: 'referenceCertificateCode', field: 'referenceCertificateCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
table: {
width: 150
}
}, },
{ {
label: '参考凭证行', label: '参考凭证行',
@ -190,42 +230,70 @@ export const InspectionMain = useCrudSchemas(reactive<CrudSchema[]>([
component: 'InputNumber', component: 'InputNumber',
value: 0 value: 0
}, },
table: {
width: 150
}
}, },
{ {
label: '检验方案编码', label: '检验方案编码',
field: 'inspectionSchemeCode', field: 'inspectionSchemeCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
table: {
width: 150
}
}, },
{ {
label: '检验阶段', label: '检验阶段',
field: 'inspectionStageCode', field: 'inspectionStage',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
form: {
component: 'InputNumber',
value: 0,
componentProps:{
disabled:true
}
},
}, },
{ {
label: '检验申请包装列表', label: '检验申请包装列表',
field: 'applicationPackageCode', field: 'applicationPackageCode',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
table: {
width: 150
}
}, },
{ {
label: '检验水平', label: '检验水平',
field: 'inspectionLevel', field: 'inspectionLevel',
dictType: DICT_TYPE.INSPECTION_LEVEL,
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
table: {
width: 150
}
}, },
{ {
label: 'AQL值', label: 'AQL值',
field: 'aqlValue', field: 'aqlValue',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
dictType: DICT_TYPE.BASIC_AQL,
table: {
width: 150
}
}, },
{ {
label: '是否可用', label: '是否可用',
field: 'available', field: 'available',
sort: 'custom', sort: 'custom',
isSearch: false, isSearch: false,
dictType: DICT_TYPE.TRUE_FALSE,
table: {
width: 150
}
}, },
{ {
label: '操作', label: '操作',

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

@ -3,7 +3,6 @@ import { dateFormatter } from '@/utils/formatTime'
// 表单校验 // 表单校验
export const InspectionMethodRules = reactive({ export const InspectionMethodRules = reactive({
code: [required],
available: [required], available: [required],
description: [required], description: [required],
}) })
@ -21,6 +20,7 @@ export const InspectionMethod = useCrudSchemas(reactive<CrudSchema[]>([
field: 'code', field: 'code',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
ifForm:false,
}, },
{ {
label: '描述', label: '描述',

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

@ -3,7 +3,6 @@ import { dateFormatter } from '@/utils/formatTime'
// 表单校验 // 表单校验
export const SamplingProcessRules = reactive({ export const SamplingProcessRules = reactive({
code: [required],
sampleType: [required], sampleType: [required],
evaluationMode: [required], evaluationMode: [required],
available: [required], available: [required],
@ -23,6 +22,7 @@ export const SamplingProcess = useCrudSchemas(reactive<CrudSchema[]>([
field: 'code', field: 'code',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
isForm: false,
}, },
{ {
label: '描述', label: '描述',

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

@ -3,7 +3,6 @@ import { dateFormatter } from '@/utils/formatTime'
// 表单校验 // 表单校验
export const SamplingSchemeRules = reactive({ export const SamplingSchemeRules = reactive({
code: [required],
available: [required], available: [required],
description: [required], description: [required],
}) })
@ -21,6 +20,7 @@ export const SamplingScheme = useCrudSchemas(reactive<CrudSchema[]>([
field: 'code', field: 'code',
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
isForm: false,
}, },
{ {
label: '描述', label: '描述',

2
src/views/system/systemInstallPackage/systemInstallPackage.data.ts

@ -98,7 +98,7 @@ export const SystemInstallPackage = useCrudSchemas(reactive<CrudSchema[]>([
}, },
limit:1, limit:1,
fileType:['apk'], fileType:['apk'],
fileSize:35 fileSize:100
} }
}, },
}, },

14
src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue

@ -232,6 +232,14 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 收货人 -->
<el-form-item label="收货人" prop="Receiver">
<el-input v-model="formData.configuration.Receiver" placeholder="请输入收货人名称" clearable />
</el-form-item>
<!-- 在途库位 -->
<el-form-item label="联系电话" prop="PhoneNumber">
<el-input v-model="formData.configuration.PhoneNumber" placeholder="请输入联系电话" clearable />
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -291,7 +299,11 @@ const formData = ref({
// //
DockCode: '', DockCode: '',
// //
OnTheWayLocationCode: '' OnTheWayLocationCode: '',
//
Receiver: '',
//
PhoneNumber: ''
} }
}) })

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

@ -196,10 +196,10 @@ const isShowMainButton = (row,val) => {
// - // -
const butttondata = (row) => { const butttondata = (row) => {
return [ return [
// defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), //
// defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), //
// defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), //
// defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), //
{ {
label: '拒收', label: '拒收',
name: 'mainJobClo', name: 'mainJobClo',

17
src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@ -271,6 +271,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
label: '部门', label: '部门',
field: 'departmentCode', field: 'departmentCode',
sort: 'custom', sort: 'custom',
isForm:false,
table: { table: {
width: 150 width: 150
}, },
@ -670,6 +671,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
table: { table: {
width: 150 width: 150
}, },
isTableForm: false,
tableForm:{ tableForm:{
disabled:true disabled:true
}, },
@ -689,6 +691,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
tableForm:{ tableForm:{
disabled:true disabled:true
}, },
isTableForm: false,
form: { form: {
componentProps:{ componentProps:{
disabled:true disabled:true
@ -705,6 +708,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
tableForm:{ tableForm:{
disabled:true disabled:true
}, },
isTableForm: false,
form: { form: {
componentProps:{ componentProps:{
disabled:true disabled:true
@ -767,6 +771,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
disabled:true, disabled:true,
type: 'Select', type: 'Select',
}, },
isTableForm: false,
form: { form: {
componentProps:{ componentProps:{
disabled:true disabled:true
@ -783,6 +788,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
tableForm:{ tableForm:{
disabled:true disabled:true
}, },
isTableForm: false,
form: { form: {
componentProps:{ componentProps:{
disabled:true disabled:true
@ -799,6 +805,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
tableForm:{ tableForm:{
disabled:true disabled:true
}, },
isTableForm: false,
form: { form: {
componentProps:{ componentProps:{
disabled:true disabled:true
@ -815,6 +822,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
tableForm:{ tableForm:{
disabled:true disabled:true
}, },
isTableForm: false,
form: { form: {
componentProps:{ componentProps:{
disabled:true disabled:true
@ -846,7 +854,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
type: 'FormDate', type: 'FormDate',
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
valueFormat: 'x', valueFormat: 'x',
} },
isTableForm: false
}, },
{ {
label: '生产日期', label: '生产日期',
@ -874,7 +883,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
type: 'FormDate', type: 'FormDate',
format: 'YYYY-MM-DD', format: 'YYYY-MM-DD',
valueFormat: 'x', valueFormat: 'x',
} },
isTableForm: false
}, },
{ {
label: '过期日期', label: '过期日期',
@ -897,6 +907,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
valueFormat: 'x', valueFormat: 'x',
} }
}, },
isTableForm: false,
tableForm:{ tableForm:{
disabled:true, disabled:true,
type: 'FormDate', type: 'FormDate',
@ -933,6 +944,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
tableForm:{ tableForm:{
disabled:true disabled:true
}, },
isTableForm: false,
form: { form: {
componentProps:{ componentProps:{
disabled:true disabled:true
@ -985,6 +997,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
tableForm:{ tableForm:{
disabled:true disabled:true
}, },
isTableForm: false,
form: { form: {
componentProps:{ componentProps:{
disabled:true disabled:true

Loading…
Cancel
Save