From e9dfa60227db9a7b3716a6509fd092b662f90e8f Mon Sep 17 00:00:00 2001
From: mors <3067699729@qq.com>
Date: Wed, 15 Feb 2023 16:41:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A8=A1=E5=9D=97=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pdaccessories/ProductAccessoriesList.vue  |   4 +-
 .../product/pdfabric/ProductFabricList.vue    |   4 +-
 .../productModule/ProductModuleList.vue       | 240 ++++++++----------
 .../modules/ProductModuleDetail.vue           | 112 ++++++++
 .../productProcess/ZyProductProcessList.vue   |   2 +-
 .../src/views/zyWorkProduct/ZyProductList.vue |   2 +-
 .../productModule/entity/ProductModule.java   |  38 +--
 7 files changed, 250 insertions(+), 152 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleDetail.vue

diff --git a/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue b/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
index 17a12e2c..9f8ba355 100644
--- a/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
@@ -28,7 +28,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
+      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
 <!--      <a-button @click="handleAdd" 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">-->
@@ -194,7 +194,7 @@
           deleteBatch: "/pdaccessories/productAccessories/deleteBatch",
           exportXlsUrl: "/pdaccessories/productAccessories/exportXls",
           importExcelUrl: "pdaccessories/productAccessories/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
diff --git a/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue b/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
index ca848817..9a9faa28 100644
--- a/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
@@ -42,7 +42,7 @@
 <!--        </a-menu>-->
 <!--        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>-->
 <!--      </a-dropdown>-->
-      <a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
+      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
     </div>
 
     <!-- table区域-begin -->
@@ -189,7 +189,7 @@
           deleteBatch: "/pdfabric/productFabric/deleteBatch",
           exportXlsUrl: "/pdfabric/productFabric/exportXls",
           importExcelUrl: "pdfabric/productFabric/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
diff --git a/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue b/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue
index a8f1e04f..dfd1c047 100644
--- a/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue
+++ b/ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue
@@ -42,11 +42,6 @@
 
     <!-- table区域-begin -->
     <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
       <a-table
         ref="table"
         size="middle"
@@ -61,31 +56,12 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
         <span slot="action" slot-scope="text, record">
-<!--          <a @click="handleEdit(record)">编辑</a>-->
-          <a-divider type="vertical" />
-          <a @click="handleDetail(record)">详情</a>
-          <a-divider type="vertical" />
+          <!--<a @click="handleEdit(record)">编辑</a>-->
+
+          <!--<a @click="handleDetail(record)">详情</a>-->
+          <a @click="openDetail(record.id)">详情</a>
+          <a-divider type="vertical"/>
           <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>
@@ -94,123 +70,125 @@
       </a-table>
     </div>
 
+    <product-module-detail ref="ProductModuleDetail"/>
     <product-module-modal ref="modalForm" @ok="modalFormOk"></product-module-modal>
   </a-card>
 </template>
 
 <script>
 
-  import '@/assets/less/TableExpand.less'
-  import { mixinDevice } from '@/utils/mixin'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ProductModuleModal from './modules/ProductModuleModal'
+import '@/assets/less/TableExpand.less'
+import {mixinDevice} from '@/utils/mixin'
+import {JeecgListMixin} from '@/mixins/JeecgListMixin'
+import ProductModuleModal from './modules/ProductModuleModal'
+import ProductModuleDetail from '@/views/product/productModule/modules/ProductModuleDetail'
 
-  export default {
-    name: 'ProductModuleList',
-    mixins:[JeecgListMixin, mixinDevice],
-    components: {
-      ProductModuleModal
-    },
-    data () {
-      return {
-        description: '工单管理下面的产品模块管理页面',
-        biaoTi:'',
-        loadRouteType: false,
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title:'产品id',
-            align:"center",
-            dataIndex: 'productId'
-          },
-          {
-            // title:'款式模块id',
-            title:'模块编号',
-            align:"center",
-            dataIndex: 'styleModuleId'
-          },
-          {
-            title:'模块名称',
-            align:"center",
-            dataIndex: 'moduleId'
-          },
-          {
-            title:'部位',
-            align:"center",
-            dataIndex: 'place'
-          },
-          {
-            title: '创建时间',
-            align: "center",
-            dataIndex: 'createTime'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            fixed:"right",
-            width:147,
-            scopedSlots: { customRender: 'action' }
+export default {
+  name: 'ProductModuleList',
+  mixins: [JeecgListMixin, mixinDevice],
+  components: {
+    ProductModuleDetail,
+    ProductModuleModal
+  },
+  data() {
+    return {
+      description: '工单管理下面的产品模块管理页面',
+      biaoTi: '',
+      loadRouteType: false,
+      // 表头
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: "center",
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1;
           }
-        ],
-        url: {
-          list: "/productModule/productModule/list",
-          delete: "/productModule/productModule/delete",
-          deleteBatch: "/productModule/productModule/deleteBatch",
-          exportXlsUrl: "/productModule/productModule/exportXls",
-          importExcelUrl: "productModule/productModule/importExcel",
-
         },
-        dictOptions:{},
-        superFieldList:[],
-      }
-    },
-    created() {
+        {
+          title: '产品编号',
+          align: "center",
+          dataIndex: 'productId'
+        },
+        {
+          // title:'款式模块id',
+          title: '模块编号',
+          align: "center",
+          dataIndex: 'styleModuleId'
+        },
+        {
+          title: '模块名称',
+          align: "center",
+          dataIndex: 'moduleId'
+        },
+        {
+          title: '创建时间',
+          align: "center",
+          dataIndex: 'createTime'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      url: {
+        list: "/productModule/productModule/list",
+        delete: "/productModule/productModule/delete",
+        deleteBatch: "/productModule/productModule/deleteBatch",
+        exportXlsUrl: "/productModule/productModule/exportXls",
+        importExcelUrl: "productModule/productModule/importExcel",
+
+      },
+      dictOptions: {},
+      superFieldList: [],
+    }
+  },
+  created() {
     // this.getSuperFieldList();
-      this.loadParameter();
+    this.loadParameter();
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
     },
-    computed: {
-      importExcelUrl: function(){
-        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-      },
+  },
+  methods: {
+    openDetail(id) {
+      this.$refs.ProductModuleDetail.showModal(id)
+      // this.$children[0].showModal(id)
     },
-    methods: {
-      fanHui(){
-        this.$router.push({
-          /*返回产品*/
-          path: '/WorkProduct',/*在引号中填写返回vue*/
-        });
-      },
-      loadParameter() {
-        if (this.loadRouteType === false) {
-          this.biaoTi=this.$route.query.productName+" 产品模块管理";
-          console.log("***********",this.$route.query.productName)
-          this.loadRouteType = true;
-        }
-      },
-      initDictConfig(){
-      },
-      getSuperFieldList(){
-        let fieldList=[];
-        fieldList.push({type:'string',value:'productId',text:'产品id',dictCode:''})
-        fieldList.push({type:'string',value:'styleModuleId',text:'款式模块id',dictCode:''})
-        fieldList.push({type:'string',value:'moduleId',text:'模块id',dictCode:''})
-        fieldList.push({type:'string',value:'place',text:'部位',dictCode:''})
-        this.superFieldList = fieldList
+    fanHui() {
+      this.$router.push({
+        /*返回产品*/
+        path: '/WorkProduct',/*在引号中填写返回vue*/
+      });
+    },
+    loadParameter() {
+      if (this.loadRouteType === false) {
+        this.biaoTi = this.$route.query.productName + " 产品模块管理";
+        //console.log("***********", this.$route.query.productName)
+        this.loadRouteType = true;
       }
+    },
+    initDictConfig() {
+    },
+    getSuperFieldList() {
+      let fieldList = [];
+      fieldList.push({type: 'string', value: 'productId', text: '产品id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'styleModuleId', text: '款式模块id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'moduleId', text: '模块id', dictCode: ''})
+      fieldList.push({type: 'string', value: 'place', text: '部位', dictCode: ''})
+      this.superFieldList = fieldList
     }
   }
+}
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+@import '~@assets/less/common.less';
 </style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleDetail.vue b/ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleDetail.vue
new file mode 100644
index 00000000..bc449d7c
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleDetail.vue
@@ -0,0 +1,112 @@
+<template>
+
+  <div>
+    <a-modal
+      title="模块管理-详情"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :width='1200'
+      @ok="handleOk"
+      @cancel="handleCancel"
+      style="display:flex;"
+    >
+      <div style="width: 96%;margin:0 auto 40px;padding-bottom: 30px">
+        <h1 style="text-align: center;margin-bottom: 0px;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>模块管理</span></h1>
+        <div>
+          <el-descriptions class="margin-top" :column="4" border style="margin-top: 50px">
+            <el-descriptions-item>
+              <template slot="label"><i class="el-icon-receiving"></i>产品名称</template>
+              {{model.productId}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"><i class="el-icon-coin"></i>模块编号</template>
+              {{model.styleModuleId}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"><i class="el-icon-postcard"></i>模块名称</template>
+              {{model.moduleId}}
+            </el-descriptions-item>
+<!--            <el-descriptions-item>-->
+<!--              <template slot="label"><i class="el-icon-copy-document"></i>颜色</template>-->
+<!--              {{model.color}}-->
+<!--            </el-descriptions-item>-->
+            <el-descriptions-item>
+              <template slot="label"><i class="el-icon-copy-document"></i>创建时间</template>
+              {{model.createTime}}
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </div>
+    </a-modal>
+  </div>
+
+</template>
+
+<script>
+
+
+export default {
+  name: "ProductModuleDetail.vue",
+  components: {
+  },
+  props: {
+    //表单禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+      required: false
+    }
+  },
+  data() {
+    return {
+      model: {},
+      labelCol: {xs: {span: 24}, sm: {span: 5}},
+      wrapperCol: {xs: {span: 24}, sm: {span: 16}},
+      confirmLoading: false,
+
+      url: {
+        add: "/fabric/zyFabric/add",
+        edit: "/fabric/zyFabric/edit",
+        queryById: "/fabric/zyFabric/queryById"
+      },
+      visible: false
+    }
+  },
+  computed: {
+    formDisabled() {
+      return this.disabled
+    },
+  },
+  created() {
+    //备份model原始值
+    this.modelDefault = JSON.parse(JSON.stringify(this.model));
+  },
+  methods: {
+    showModal(id) {
+      this.visible = true;
+      this.$http.get('/productModule/productModule/queryById?id=' + id).then(
+        res => {
+          this.model = res.result
+          console.log(this.model)
+        }
+      )
+    },
+    handleOk() {
+      this.ModalText = 'The modal will be closed after two seconds';
+      this.confirmLoading = true;
+      setTimeout(() => {
+        this.visible = false;
+        this.confirmLoading = false;
+      }, 1);
+    },
+    handleCancel() {
+      this.visible = false;
+    },
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue b/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue
index 903dff23..276ac22c 100644
--- a/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue
+++ b/ant-design-vue-jeecg/src/views/product/productProcess/ZyProductProcessList.vue
@@ -28,7 +28,7 @@
 
     <!-- 操作按钮区域 -->
     <div class="table-operator">
-      <a-button @click="fanhui" type="primary" icon="plus">返回</a-button>
+      <a-button @click="fanhui" type="primary" icon="rollback">返回</a-button>
 <!--      <a-button @click="handleAdd" 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">-->
diff --git a/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
index 788fc37b..40635641 100644
--- a/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
+++ b/ant-design-vue-jeecg/src/views/zyWorkProduct/ZyProductList.vue
@@ -356,7 +356,7 @@
       },
 
       //操作：工序、模块、面料、辅料、设备、工具，提供入口，具体功能由相关功能负责人完成
-      //跳转-模块
+      //跳转-工序
       jumpProcesses(record)
       {
         this.$router.push({
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java
index 534f93ce..e9c9b529 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java
@@ -2,6 +2,7 @@ package org.jeecg.modules.product.productModule.entity;
 
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -43,31 +44,38 @@ public class ProductModule implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private Date createTime;
-//	/**更新人*/
-//    @ApiModelProperty(value = "更新人")
-//    private String updateBy;
-//	/**更新日期*/
-//	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-//    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-//    @ApiModelProperty(value = "更新日期")
-//    private Date updateTime;
-//	/**所属部门*/
-//    @ApiModelProperty(value = "所属部门")
-//    private String sysOrgCode;
-	/**产品id*/
+
+	/**
+     * 产品id 应该是产品编号
+     * 关联产品表 zy_product ZyProductList.vue ZyProduct.java
+     */
 	@Excel(name = "产品id", width = 15)
     @ApiModelProperty(value = "产品id")
     private String productId;
-	/**款式模块id*/
+
+	@TableField(exist = false)
+    private String productName;
+	/**
+     * 款式模块id 应该是模块编号
+     * 关联款式模块表 zy_style_module
+     * 款式表联动，筛选款式模块表数据
+     */
 	@Excel(name = "款式模块id", width = 15)
     @ApiModelProperty(value = "款式模块id")
     private String styleModuleId;
-	/**模块id*/
+	/**
+     * 模块id 应该是模块名称
+     * 关联制衣模块表 zy_cloths_modular
+     * 从款式模块表同步读取
+     */
 	@Excel(name = "模块名称", width = 15)
     @Dict(dictTable = "zy_cloths_modular ", dicText = "modular_name", dicCode = "id")
     @ApiModelProperty(value = "模块名称")
     private String moduleId;
-	/**部位*/
+	/**
+     * 暂时弃用
+     * 部位
+     */
 	@Excel(name = "部位", width = 15)
     @ApiModelProperty(value = "部位")
     private String place;