diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
index 71f8345c..36d3f58e 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
@@ -102,7 +102,7 @@
-
+
@@ -116,6 +116,8 @@ import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import ZyClothsModularCompentModal from './modules/ZyClothsModularCompentModal'
import ZyClothsComponentListDetail from "@views/process/modules/ZyClothsComponentListDetail";
import ZyClothsModularCompentListDetails from "@views/process/modules/list/ZyClothsModularCompentListDetails";
+import {getAction} from "@api/manage";
+import {filterObj} from "@/utils/util";
export default {
@@ -197,6 +199,9 @@ export default {
},
},
methods: {
+ valueChange(value) {
+ if (value) this.loadData()
+ },
viewDetails(id) {
this.$refs.ZyClothsModularCompentListDetails.showModal(id);
},
@@ -239,7 +244,51 @@ export default {
fieldList.push({type: 'string', value: 'modularType', text: '制衣模块类型', dictCode: ''})
fieldList.push({type: 'string', value: 'componentId', text: '部件id', dictCode: ''})
this.superFieldList = fieldList
- }
+ },
+ loadData(arg) {
+ if(!this.url.list){
+ this.$message.error("请设置url.list属性!")
+ return
+ }
+ //加载数据 若传入参数1则加载第一页的内容
+ if (arg === 1) {
+ this.ipagination.current = 1;
+ }
+ var params = this.getQueryParams();//查询条件
+ this.loading = true;
+ getAction(this.url.list, params).then((res) => {
+ if (res.success) {
+ //update-begin---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------
+ this.dataSource = res.result.records||res.result;
+ if(res.result.total)
+ {
+ this.ipagination.total = res.result.total;
+ }else{
+ this.ipagination.total = 0;
+ }
+ //update-end---author:zhangyafei Date:20201118 for:适配不分页的数据列表------------
+ }
+ if(res.code===510){
+ this.$message.warning(res.message)
+ }
+ this.loading = false;
+ })
+ },
+
+
+ getQueryParams() {
+ //获取查询条件
+ let sqp = {}
+ if(this.superQueryParams){
+ sqp['superQueryParams']=encodeURI(this.superQueryParams)
+ sqp['superQueryMatchType'] = this.superQueryMatchType
+ }
+ var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+ param.field = this.getQueryField();
+ param.pageNo = this.ipagination.current;
+ param.pageSize = this.ipagination.pageSize;
+ return filterObj(param);
+ },
}
}
diff --git a/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue b/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
index 0f735a08..23c45311 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyProcessComponentList.vue
@@ -8,7 +8,7 @@
@ok="handleOk"
@cancel="handleCancel"
>
-
{{biaoTi}} 部件工序管理
+ {{biaoTi}} 模块工序管理
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue
index 61e21d5d..379df1e1 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsComponentListDetail.vue
@@ -50,12 +50,12 @@
key: 'processId',
align:'center'
},
- {
- title: '是否瓶颈工序',
- dataIndex: 'bottleneck',
- key: 'bottleneck',
- align:'center'
- },
+ // {
+ // title: '是否瓶颈工序',
+ // dataIndex: 'bottleneck',
+ // key: 'bottleneck',
+ // align:'center'
+ // },
{
title: '创建时间',
key: 'createTime',
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
index 4ca31dff..3b9ddc97 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
@@ -17,11 +17,14 @@