From 212c4d41ca0e994c262fce2a68f7762151929a34 Mon Sep 17 00:00:00 2001
From: lenovo <123>
Date: Tue, 13 Dec 2022 11:31:25 +0800
Subject: [PATCH] =?UTF-8?q?2022-12-13=E6=9F=A5=E8=AF=A2=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../erp/accessories/ZyAccessoriesList.vue | 16 +++++++++++
.../erp/accessories/ZyAccessoriesTypeList.vue | 20 +++++++++++--
.../src/views/process/ZyProcessList.vue | 28 +++++++++++++++++++
.../views/process/modules/ZyProcessForm.vue | 10 +++----
.../modules/ZyClothSampleForm.vue | 8 ++++--
.../controller/ZyAccessoriesController.java | 4 +--
.../ZyAccessoriesTypeController.java | 4 +--
7 files changed, 77 insertions(+), 13 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
index 4d692164..22643f86 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue
@@ -4,6 +4,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesTypeList.vue b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesTypeList.vue
index 7ba77af3..1e6a4cbf 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesTypeList.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesTypeList.vue
@@ -3,8 +3,24 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
diff --git a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
index 89c2d4e7..f0269e4c 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyProcessList.vue
@@ -10,6 +10,21 @@
v-model="styleId">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
查询
@@ -312,6 +327,9 @@ export default {
//参数
loadRouteType: false,
styleId: "",
+ processCode:'',
+ processName:'',
+ enterpriseId:'',
dictOptions: {},
superFieldList: [],
}
@@ -378,8 +396,18 @@ export default {
param.pageNo = this.ipagination.current;
param.pageSize = this.ipagination.pageSize;
param.styleId = this.styleId;
+ param.enterpriseId=this.enterpriseId;
+ param.processCode=this.processCode;
+ param.processName=this.processName;
return filterObj(param);
},
+ searchReset() {
+ this.styleId = ''
+ this.processCode = ''
+ this.processName = ''
+ this.enterpriseId = ''
+ this.loadData(1);
+ },
getSuperFieldList() {
let fieldList = [];
fieldList.push({type: 'string', value: 'processCode', text: '工序代码', dictCode: ''})
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
index 2af440c6..8309243e 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
@@ -107,11 +107,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
index 9f095782..eb862ab0 100644
--- a/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
+++ b/ant-design-vue-jeecg/src/views/zyclothsample/modules/ZyClothSampleForm.vue
@@ -5,7 +5,7 @@
-
+
@@ -13,7 +13,7 @@
+ :dict-code="dict">
@@ -90,6 +90,7 @@ export default {
model: {
nums:'',
},
+ dict:"zy_cloths_style,style_names,nums",
labelCol: {
xs: {span: 24},
sm: {span: 5},
@@ -150,6 +151,9 @@ export default {
this.edit(this.modelDefault);
},
//
+ kuanshi(){
+ this.dict="zy_cloths_style,style_names,nums,enterprise_id="+"'"+this.model.userId+"'";
+ },
gaibian(){
var n=3;
console.log(this.model)
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java
index 1d5bb51b..7d468284 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesController.java
@@ -67,8 +67,8 @@ public class ZyAccessoriesController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyAccessories, req.getParameterMap());
- QueryWrapper queryWrapper = new QueryWrapper();
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyAccessories, req.getParameterMap());
+// QueryWrapper queryWrapper = new QueryWrapper();
Page page = new Page(pageNo, pageSize);
IPage pageList = zyAccessoriesService.page(page, queryWrapper);
return Result.OK(pageList);
diff --git a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java
index 4d6992c1..72f93fe4 100644
--- a/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java
+++ b/jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/controller/ZyAccessoriesTypeController.java
@@ -66,8 +66,8 @@ public class ZyAccessoriesTypeController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(zyAccessoriesType, req.getParameterMap());
- QueryWrapper queryWrapper = new QueryWrapper();
+ QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(zyAccessoriesType, req.getParameterMap());
+// QueryWrapper queryWrapper = new QueryWrapper();
Page page = new Page(pageNo, pageSize);
IPage pageList = zyAccessoriesTypeService.page(page, queryWrapper);
return Result.OK(pageList);