From dd65c0bc2a936309c2e239cb6d458dc6f0afc1bf Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Mon, 14 Nov 2022 21:37:34 +0800
Subject: [PATCH] =?UTF-8?q?2022-11-14=20=E8=B5=B5=E7=8E=89=E7=91=9E=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/ZyClothsModularCompentList.vue    | 91 ++++++++++++++-----
 .../src/views/process/ZyClothsModularList.vue | 15 +--
 .../modules/ZyClothsModularCompentForm.vue    | 25 +++--
 .../modules/ZyClothsModularCompentModal.vue   |  4 +-
 .../base/entity/ZyClothsModularCompent.java   |  5 +
 5 files changed, 101 insertions(+), 39 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
index ad0c0f5f..7532e21a 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularCompentList.vue
@@ -1,5 +1,13 @@
 <template>
-  <a-card :bordered="false">
+<!--  <a-card :bordered="false">-->
+  <a-modal
+    width="70%"
+    title="评分项管理"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
     <!-- 查询区域 -->
 <!--    <div class="table-page-search-wrapper">-->
 <!--      <a-form layout="inline" @keyup.enter.native="searchQuery">-->
@@ -11,7 +19,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button @click="handleAdd1(yid)" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('制衣模块部件中间表')">导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
                 @change="handleImportExcel">
@@ -76,9 +84,9 @@
           </a-button>
         </template>
 
-        <span slot="action2" slot-scope="text, record">
-          <a @click="viewVid(record)">查看</a>
-        </span>
+<!--        <span slot="action2" slot-scope="text, record">-->
+<!--          <a @click="viewVid(record)">查看</a>-->
+<!--        </span>-->
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
@@ -107,8 +115,8 @@
     </div>
 
     <zy-cloths-modular-compent-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-modular-compent-modal>
-    <ZyClothsMccList ref="ZyClothsMccList"></ZyClothsMccList>
-  </a-card>
+<!--    <ZyClothsMccList ref="ZyClothsMccList"></ZyClothsMccList>-->
+  </a-modal>
 </template>
 
 <script>
@@ -123,12 +131,14 @@ export default {
   name: 'ZyClothsModularCompentList',
   mixins: [JeecgListMixin, mixinDevice],
   components: {
-    ZyClothsMccList,
     ZyClothsModularCompentModal
   },
   data() {
     return {
       description: '制衣模块部件中间表管理页面',
+      visible: false,
+      confirmLoading: false,
+      yid:'',
       // 表头
       columns: [
         {
@@ -146,11 +156,11 @@ export default {
           align: "center",
           dataIndex: 'nums'
         },
-        {
-          title: '模块部件名称',
-          align: "center",
-          dataIndex: 'modularType_dictText'
-        },
+        // {
+        //   title: '模块部件名称',
+        //   align: "center",
+        //   dataIndex: 'modularType_dictText'
+        // },
         // {
         //   title:'制衣模块类型',
         //   align:"center",
@@ -168,17 +178,27 @@ export default {
         // },
 
         {
-          title: '创建时间',
+          title: '模块名称',
           align: "center",
-          dataIndex: 'createTime'
+          dataIndex: 'modularId_dictText'
         },
         {
-          title: '制衣部件',
-          dataIndex: 'action2',
+          title: '部件名称',
           align: "center",
-          width: "100",
-          scopedSlots: {customRender: 'action2'}
+          dataIndex: 'partsName_dictText'
         },
+        {
+          title: '创建时间',
+          align: "center",
+          dataIndex: 'createTime'
+        },
+        // {
+        //   title: '制衣部件',
+        //   dataIndex: 'action2',
+        //   align: "center",
+        //   width: "100",
+        //   scopedSlots: {customRender: 'action2'}
+        // },
         {
           title: '操作',
           dataIndex: 'action',
@@ -209,11 +229,36 @@ export default {
     },
   },
   methods: {
-    viewVid(record){
-      this.$refs.ZyClothsMccList.showModal();
-      this.$refs.ZyClothsMccList.edit(record);
-      this.$refs.ZyClothsMccList.disableSubmit = false;
+    edit1(record) {
+      this.model = Object.assign({}, record);
+      //this.ax= this.model.id;
+      //console.log(topicid);
+      this.yid = this.model.id;
+      this.queryParam.modularId = this.model.id;
+      console.log( "aaaaaaa     "+this.queryParam.modularId);
+      this.loadData();
+      this.visible = true;
+    },
+    showModal1() {
+      this.visible = true;
+    },
+    handleOk(e) {
+      this.ModalText = 'The modal will be closed after two seconds';
+      this.confirmLoading = true;
+      setTimeout(() => {
+        this.visible = false;
+        this.confirmLoading = false;
+      }, 2000);
+    },
+    handleCancel(e) {
+      console.log('Clicked cancel button');
+      this.visible = false;
     },
+    // viewVid(record){
+    //   this.$refs.ZyClothsMccList.showModal();
+    //   this.$refs.ZyClothsMccList.edit(record);
+    //   this.$refs.ZyClothsMccList.disableSubmit = false;
+    // },
     initDictConfig() {
     },
     getSuperFieldList() {
diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
index afe8ad78..ef3242d3 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothsModularList.vue
@@ -109,7 +109,8 @@
     </div>
 
     <zy-cloths-modular-modal ref="modalForm" @ok="modalFormOk"></zy-cloths-modular-modal>
-    <ZyClothsMcList ref="ZyClothsMcList"></ZyClothsMcList>
+<!--    <ZyClothsMcList ref="ZyClothsMcList"></ZyClothsMcList>-->
+    <ZyClothsModularCompentList ref="ZyClothsModularCompentList"></ZyClothsModularCompentList>
   </a-card>
 </template>
 
@@ -120,13 +121,13 @@ import {mixinDevice} from '@/utils/mixin'
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import ZyClothsModularModal from './modules/ZyClothsModularModal'
 import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-import ZyClothsMcList from "@views/process/ZyClothsMcList";
+import ZyClothsModularCompentList from "@views/process/ZyClothsModularCompentList";
 
 export default {
   name: 'ZyClothsModularList',
   mixins: [JeecgListMixin, mixinDevice],
   components: {
-    ZyClothsMcList,
+    ZyClothsModularCompentList,
     ZyClothsModularModal
   },
   data() {
@@ -224,10 +225,10 @@ export default {
   },
   methods: {
     viewVid(record){
-      this.$refs.ZyClothsMcList.showModal();
-      this.$refs.ZyClothsMcList.edit(record);
-      console.log("zyclothsMclist"+record.ids);
-      this.$refs.ZyClothsMcList.disableSubmit = false;
+      this.$refs.ZyClothsModularCompentList.showModal1();
+      this.$refs.ZyClothsModularCompentList.edit1(record);
+      console.log("zyclothsMclist"+record.id);
+      this.$refs.ZyClothsModularCompentList.disableSubmit = false;
     },
     initDictConfig() {
     },
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue
index 63952834..c5eaf630 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentForm.vue
@@ -8,16 +8,25 @@
               <a-input v-model="model.nums" placeholder="请输入编码"  ></a-input>
             </a-form-model-item>
           </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">-->
+<!--              <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
-            <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
-              <j-dict-select-tag type="list" v-model="model.modularType" dictCode="zyModularType" placeholder="请选择制衣模块类型" />
+            <a-form-model-item label="模块名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularId">
+              <j-dict-select-tag type="list" v-model="model.modularId"
+                                 dictCode="zy_cloths_modular,modular_name,id" placeholder="请选择模块名称" disabled/>
             </a-form-model-item>
           </a-col>
-<!--          <a-col :span="24">-->
-<!--            <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">-->
+
+          <a-col :span="24">
+            <a-form-model-item label="部件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partsName">
 <!--              <a-input v-model="model.partsName" placeholder="请输入部件名称"  ></a-input>-->
-<!--            </a-form-model-item>-->
-<!--          </a-col>-->
+              <j-dict-select-tag type="list" v-model="model.partsName"
+                                 dictCode="zy_cloths_component,parts_name,id" placeholder="请选择制衣模块类型" />
+            </a-form-model-item>
+          </a-col>
 <!--          <a-col :span="24">
             <a-form-model-item label="制衣模块类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="modularType">
               <a-input v-model="model.modularType" placeholder="请输入制衣模块类型"  ></a-input>
@@ -55,6 +64,7 @@
     data () {
       return {
         model:{
+          modularId:'',
          },
         labelCol: {
           xs: { span: 24 },
@@ -84,8 +94,9 @@
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
-      add () {
+      add1 (id) {
         this.edit(this.modelDefault);
+        this.model.modularId = id;
       },
       edit (record) {
         this.model = Object.assign({}, record);
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 051ce1ca..1bcc9cc8 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothsModularCompentModal.vue
@@ -29,10 +29,10 @@
       }
     },
     methods: {
-      add () {
+      add1 (id) {
         this.visible=true
         this.$nextTick(()=>{
-          this.$refs.realForm.add();
+          this.$refs.realForm.add1(id);
         })
       },
       edit (record) {
diff --git a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java
index dee6db7e..6055d090 100644
--- a/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java
+++ b/jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/base/entity/ZyClothsModularCompent.java
@@ -57,9 +57,14 @@ public class ZyClothsModularCompent implements Serializable {
 	@Excel(name = "编码", width = 15)
     @ApiModelProperty(value = "编码")
     private String nums;
+    @Excel(name = "模块名称", width = 15)
+    @ApiModelProperty(value = "模块名称")
+    @Dict(dictTable = "zy_cloths_modular",dicText = "modular_name",dicCode = "id")
+    private String modularId;
 	/**部件名称*/
 	@Excel(name = "部件名称", width = 15)
     @ApiModelProperty(value = "部件名称")
+    @Dict(dictTable = "zy_cloths_component",dicText = "parts_name",dicCode = "id")
     private String partsName;
 	/**制衣模块类型*/
 	@Excel(name = "制衣模块类型", width = 15)