生产计划

4 months ago · 5b1d705538
8 changed files with 80 additions and 42 deletions
--- a/src/views/wms/productionManage/productionplan/productionMain/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue
@ -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'" />
 </template>

@ -361,7 +361,7 @@ const buttonTableClick = async (val, row) => {
  } else if (val == 'delete') { // 删除
    handleDelete(row.masterId)
  }
-  
+
 }

 /** 添加/修改操作 */
@ -499,10 +499,19 @@ const importSuccess = () => {

 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  tableObject.params.isSearch = true
+  if(!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() // 刷新当前列表
 }

--- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts
@ -307,7 +307,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    },
    isForm: false,
  },
-  
+
  {
    label: '备注',
    field: 'remark',
@ -651,7 +651,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
        key: 'available',
        value: 'TRUE',
        isMainValue: false
-      }], 
+      }],
    },
  },
  {
@ -833,8 +833,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'available',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isSearch: false,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -852,8 +852,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
      type: 'Select',
      default: 'TRUE'
    },
-    // isTableForm: false,
-    // isForm: false
+    isTableForm: false,
+    isForm: false
  },
  {
    label: '单据号',
@ -914,7 +914,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
    isTableForm: false,
    isForm: false,
  },
-  
+
  {
    label: '操作',
    hiddenInMain:true,
--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue
@ -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'"/>
 </template>

@ -349,7 +349,7 @@ const buttonTableClick = async (val, row) => {
  } else if (val == 'delete') { // 删除
    handleDelete(row.masterId)
  }
-  
+
 }

 /** 添加/修改操作 */
@ -487,10 +487,20 @@ const importSuccess = () => {

 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  tableObject.params.isSearch = true
+  if(!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() // 刷新当前列表
 }

--- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts
@ -298,7 +298,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    },
    isForm: false,
  },
-  
+
  {
    label: '备注',
    field: 'remark',
@ -641,7 +641,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
        key: 'available',
        value: 'TRUE',
        isMainValue: false
-      }], 
+      }],
    },
  },
  {
@ -820,8 +820,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'available',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isSearch: false,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue
@ -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'"/>
 </template>

@ -349,7 +349,7 @@ const buttonTableClick = async (val, row) => {
  } else if (val == 'delete') { // 删除
    handleDelete(row.masterId)
  }
-  
+
 }

 /** 添加/修改操作 */
@ -486,10 +486,20 @@ const importSuccess = () => {

 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  tableObject.params.isSearch = true
+  if(!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() // 刷新当前列表
 }

--- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
+++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts
@ -298,7 +298,7 @@ export const ProductionMain = useCrudSchemas(reactive<CrudSchema[]>([
    isTable: false,
    isForm: false,
  },
-  
+
  {
    label: '备注',
    field: 'remark',
@ -641,7 +641,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
        key: 'available',
        value: 'TRUE',
        isMainValue: false
-      }], 
+      }],
    },
  },
  {
@ -820,8 +820,8 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
    field: 'available',
    dictType: DICT_TYPE.TRUE_FALSE,
    dictClass: 'string',
-    isSearch: true,
-    isTable: true,
+    isSearch: false,
+    isTable: false,
    sort: 'custom',
    table: {
      width: 150
@ -901,7 +901,7 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
    isTableForm: false,
    isForm: false,
  },
-  
+
  {
    label: '操作',
    hiddenInMain:true,
--- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
+++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue
@ -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'"/>
 </template>

@ -349,7 +349,7 @@ const buttonTableClick = async (val, row) => {
  } else if (val == 'delete') { // 删除
    handleDelete(row.masterId)
  }
-  
+
 }

 /** 添加/修改操作 */
@ -487,10 +487,19 @@ const importSuccess = () => {

 // 筛选提交
 const searchFormClick = (searchData) => {
-  tableObject.params = {
-    isSearch: true,
-    filters: searchData.filters
+  tableObject.params.isSearch = true
+  if(!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() // 刷新当前列表
 }

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