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

生产计划

master_hella_20240701
李达明 5 months ago
parent
b60022ce96
commit
5b1d705538
8 changed files with 80 additions and 42 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      src/views/wms/productionManage/productionplan/productionMain/index.vue
  2. 14
      src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
  3. 20
      src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
  4. 8
      src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
  5. 20
      src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
  6. 10
      src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
  7. 19
      src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
  8. 12
      src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts

19
src/views/wms/productionManage/productionplan/productionMain/index.vue
View File

@ -76,7 +76,7 @@
/> />
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'" /> @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'" />
</template> </template>
@ -361,7 +361,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.masterId) handleDelete(row.masterId)
} }
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
@ -499,10 +499,19 @@ const importSuccess = () => {
// 筛选提交 // 筛选提交
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
tableObject.params = { tableObject.params.isSearch = true
isSearch: true, if(!searchData.filters){//重置的时候应用
filters: searchData.filters searchData.filters = []
}
let filters = [...searchData.filters]
if(!filters.find(item=>item.column=='plan_type')){
filters = [...filters,{
action:'==',
column:'plan_type',
value:'predict',
}]
} }
tableObject.params.filters = filters
getList() // 刷新当前列表 getList() // 刷新当前列表
} }

14
src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
View File

@ -307,7 +307,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isForm: false, isForm: false,
}, },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
@ -651,7 +651,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}], }],
}, },
}, },
{ {
@ -833,8 +833,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: false,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -852,8 +852,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
type: 'Select', type: 'Select',
default: 'TRUE' default: 'TRUE'
}, },
// isTableForm: false, isTableForm: false,
// isForm: false isForm: false
}, },
{ {
label: '单据号', label: '单据号',
@ -914,7 +914,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
}, },
{ {
label: '操作', label: '操作',
hiddenInMain:true, hiddenInMain:true,

20
src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
View File

@ -74,7 +74,7 @@
/> />
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assemble'"/> @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assemble'"/>
</template> </template>
@ -349,7 +349,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.masterId) handleDelete(row.masterId)
} }
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
@ -487,10 +487,20 @@ const importSuccess = () => {
// 筛选提交 // 筛选提交
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
tableObject.params = { tableObject.params.isSearch = true
isSearch: true, if(!searchData.filters){//重置的时候应用
filters: searchData.filters searchData.filters = []
}
let filters = [...searchData.filters]
console.log('searchData',routeName.value);
if(!filters.find(item=>item.column=='plan_type')){
filters = [...filters,{
action:'==',
column:'plan_type',
value:'assemble',
}]
} }
tableObject.params.filters = filters
getList() // 刷新当前列表 getList() // 刷新当前列表
} }

8
src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
View File

@ -298,7 +298,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isForm: false, isForm: false,
}, },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
@ -641,7 +641,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}], }],
}, },
}, },
{ {
@ -820,8 +820,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: false,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150

20
src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
View File

@ -74,7 +74,7 @@
/> />
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assembleSparePart'"/> @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assembleSparePart'"/>
</template> </template>
@ -349,7 +349,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.masterId) handleDelete(row.masterId)
} }
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
@ -486,10 +486,20 @@ const importSuccess = () => {
// 筛选提交 // 筛选提交
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
tableObject.params = { tableObject.params.isSearch = true
isSearch: true, if(!searchData.filters){//重置的时候应用
filters: searchData.filters searchData.filters = []
}
let filters = [...searchData.filters]
console.log('searchData',routeName.value);
if(!filters.find(item=>item.column=='plan_type')){
filters = [...filters,{
action:'==',
column:'plan_type',
value:'assembleSparePart',
}]
} }
tableObject.params.filters = filters
getList() // 刷新当前列表 getList() // 刷新当前列表
} }

10
src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
View File

@ -298,7 +298,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
isTable: false, isTable: false,
isForm: false, isForm: false,
}, },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
@ -641,7 +641,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}], }],
}, },
}, },
{ {
@ -820,8 +820,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: false,
isTable: true, isTable: false,
sort: 'custom', sort: 'custom',
table: { table: {
width: 150 width: 150
@ -901,7 +901,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
}, },
{ {
label: '操作', label: '操作',
hiddenInMain:true, hiddenInMain:true,

19
src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
View File

@ -74,7 +74,7 @@
/> />
<!-- 导入 --> <!-- 导入 -->
<ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData" <ImportForm ref="importFormRef" url="/wms/production-main/import" :importTemplateData="importTemplateData"
@success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assembleSparePart'"/> @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'assembleSparePart'"/>
</template> </template>
@ -349,7 +349,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'delete') { // 删除 } else if (val == 'delete') { // 删除
handleDelete(row.masterId) handleDelete(row.masterId)
} }
} }
/** 添加/修改操作 */ /** 添加/修改操作 */
@ -487,10 +487,19 @@ const importSuccess = () => {
// 筛选提交 // 筛选提交
const searchFormClick = (searchData) => { const searchFormClick = (searchData) => {
tableObject.params = { tableObject.params.isSearch = true
isSearch: true, if(!searchData.filters){//重置的时候应用
filters: searchData.filters searchData.filters = []
}
let filters = [...searchData.filters]
if(!filters.find(item=>item.column=='plan_type')){
filters = [...filters,{
action:'==',
column:'plan_type',
value:'predictSparePart',
}]
} }
tableObject.params.filters = filters
getList() // 刷新当前列表 getList() // 刷新当前列表
} }

12
src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts
View File

@ -195,7 +195,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
} }
} }
}, },
{ {
label: '物料代码', label: '物料代码',
field: 'detailItemCode', field: 'detailItemCode',
@ -299,7 +299,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
}, },
isForm: false, isForm: false,
}, },
{ {
label: '备注', label: '备注',
field: 'remark', field: 'remark',
@ -642,7 +642,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
key: 'available', key: 'available',
value: 'TRUE', value: 'TRUE',
isMainValue: false isMainValue: false
}], }],
}, },
}, },
{ {
@ -792,7 +792,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
isTableForm: false, isTableForm: false,
isForm: false, isForm: false,
}, },
{ {
label: '创建时间', label: '创建时间',
field: 'createTime', field: 'createTime',
@ -822,8 +822,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
field: 'available', field: 'available',
dictType: DICT_TYPE.TRUE_FALSE, dictType: DICT_TYPE.TRUE_FALSE,
dictClass: 'string', dictClass: 'string',
isSearch: true, isSearch: false,
isTable: true, isTable: false,
hiddenInMain: true, hiddenInMain: true,
sort: 'custom', sort: 'custom',
table: { table: {

Write Preview
Loading…
Cancel
Save