From 8b3268e488910544a4dcf0c803933a541812a3e7 Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Wed, 7 Sep 2022 10:17:58 +0800
Subject: [PATCH 1/3] =?UTF-8?q?20220907-syy-=E5=9F=BA=E6=9C=AC=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F-=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/process/modules/ZyProcessDetail.vue | 222 ++++++++++--------
 1 file changed, 118 insertions(+), 104 deletions(-)

diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
index c0b10288..56262f57 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+  <div>
     <a-modal
       title="标准作业指导书"
       :visible="visible"
@@ -9,59 +9,73 @@
       @cancel="handleCancel"
       style="display:flex;"
     >
-      <div style="height:300px;width: 100%;display:flex;">
-           <table border="1" style="width: 85%;height:100%;font-size:14px;">
-              <tr>
-                <td><span style="font-weight:bold;">工序代码：</span>{{data.processCode}}</td>
-                <td><span style="font-weight:bold;">工序名称：</span>{{data.processName}}</td>
-                <td><span style="font-weight:bold;">工艺描述：</span>{{data.processDescribe}}</td>
-                <td><span style="font-weight:bold;">做工说明：</span>{{data.mkExplain}}</td>
-                <td><span style="font-weight:bold;">品质要求：</span>{{data.qualityRequire}}</td>
-              </tr>
-              <tr>
-                <td><span style="font-weight:bold;">工序时间：</span>{{data.processTime}}</td>
-                <td><span style="font-weight:bold;">工序单价：</span>{{data.price}}</td>
-                <td><span style="font-weight:bold;">工序等级：</span>{{data.grade}}</td>
-                <td><span style="font-weight:bold;">面料代码：</span>{{data.fabricNum}}</td>
-                <td><span style="font-weight:bold;">面料等级：</span>{{data.fabricGrade}}</td>
-              </tr>
-              <tr>
-                <td><span style="font-weight:bold;">针距(厘米)：</span>{{data.needlePitch}}</td>
-                <td><span style="font-weight:bold;">机器名称：</span>{{data.machineId}}</td>
-                <td><span style="font-weight:bold;">手工宽放：</span>{{data.manualWide}}</td>
-                <td><span style="font-weight:bold;">手工时间：</span>{{data.manualTime}}</td>
-                <td><span style="font-weight:bold;">机器转速：</span>{{data.machineSpeed}}</td>
-              </tr>
-              <tr>
-                <td><span style="font-weight:bold;">机器宽放：</span>{{data.machineWide}}</td>
-                <td><span style="font-weight:bold;">机器时间：</span>{{data.machineTime}}</td>
-                <td><span style="font-weight:bold;">机器浮于：</span>{{data.machineFloat}}</td>
-                <td><span style="font-weight:bold;">绑包宽放：</span>{{data.bundleWide}}</td>
-                <td><span style="font-weight:bold;">绑包时间：</span>{{data.bundleTime}}</td>
-              </tr>
-              <tr>
-                <td><span style="font-weight:bold;">部件表名：</span>{{data.componentId}}</td>
-                <td><span style="font-weight:bold;">是否瓶颈：</span>{{data.isBottleneck}}</td>
-                <td><span style="font-weight:bold;">企业名称：</span>{{data.enterpriseId}}</td>
-                <td><span style="font-weight:bold;">工具名称：</span>{{data.toolId}}</td>
-                <td><span style="font-weight:bold;">款式名称：</span>{{data.styleId}}</td>
-              </tr>
-              <tr>
-                <td><span style="font-weight:bold;">工段代码：</span>{{data.worksectionCode}}</td>
-                <td><span style="font-weight:bold;">合同号：</span>{{data.totalManualTmu}}</td>
-                <td><span style="font-weight:bold;">合计(手工TMU)：</span>{{data.totalManualTmu}}</td>
-                <td><span style="font-weight:bold;">合计(机器TMU)：</span>{{data.totalMachineTmu}}</td>
-                <td><span style="font-weight:bold;">合计(手工秒)：</span>{{data.totalMaunal}}</td>
-
-              </tr>
-              <tr>
-                   <td><span style="font-weight:bold;">合计(机器秒)：</span>{{data.totalMachine}}</td>
-              </tr>
-            </table>
-            <div style="width:14.9%;height:100%;">
-                <img :src="img" style="width:90%;height:75%;margin:5% 0 0 10%;">
-                <video :src="mp4" style="border:1px solid #213;width:80%;height:30%;margin:0 0 0 15%"/>
-            </div>
+      <div style="width: 96%;margin:0 auto 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 30px">
+        <h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>基本工序</span></h1>
+        <div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between;margin-bottom: 20px;" class="coin">
+          <img :src="img == ''?img:img1" style="width:32%;">
+          <table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">
+            <tr>
+              <td><span>工序代码：</span>{{data.processCode}}</td>
+              <td><span>工序名称：</span>{{data.processName}}</td>
+              <td><span>工序时间：</span>{{data.processTime}}</td>
+              <td><span>工序单价：</span>{{data.price}}</td>
+            </tr>
+            <tr>
+              <td><span>工序等级：</span>{{data.grade}}</td>
+              <td><span>面料代码：</span>{{data.fabricNum}}</td>
+              <td><span>面料等级：</span>{{data.fabricGrade}}</td>
+              <td><span>针距(厘米)：</span>{{data.needlePitch}}</td>
+            </tr>
+            <tr>
+              <td><span>机器名称：</span>{{data.machineId}}</td>
+              <td><span>手工宽放：</span>{{data.manualWide}}</td>
+              <td><span>手工时间：</span>{{data.manualTime}}</td>
+              <td><span>机器转速：</span>{{data.machineSpeed}}</td>
+            </tr>
+            <tr>
+              <td><span>机器宽放：</span>{{data.machineWide}}</td>
+              <td><span>机器时间：</span>{{data.machineTime}}</td>
+              <td><span>机器浮于：</span>{{data.machineFloat}}</td>
+              <td><span>绑包宽放：</span>{{data.bundleWide}}</td>
+            </tr>
+            <tr>
+              <td><span>绑包时间：</span>{{data.bundleTime}}</td>
+              <td><span>部件表名：</span>{{data.componentId}}</td>
+              <td><span>是否瓶颈：</span>{{data.isBottleneck}}</td>
+              <td><span>企业名称：</span>{{data.enterpriseId}}</td>
+            </tr>
+            <tr>
+              <td><span>工具名称：</span>{{data.toolId}}</td>
+              <td><span>款式名称：</span>{{data.styleId}}</td>
+              <td><span>工段代码：</span>{{data.worksectionCode}}</td>
+              <td><span>合同号：</span>{{data.totalManualTmu}}</td>
+            </tr>
+            <tr>
+              <td><span>合计(手工TMU)：</span>{{data.totalManualTmu}}</td>
+              <td><span>合计(机器TMU)：</span>{{data.totalMachineTmu}}</td>
+              <td><span>合计(手工秒)：</span>{{data.totalMaunal}}</td>
+              <td><span>合计(机器秒)：</span>{{data.totalMachine}}</td>
+            </tr>
+          </table>
+        </div>
+        <div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between">
+          <video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:32%;"/>
+          <p v-else style="padding-top: 20px"> 暂无视频</p>
+          <table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">
+            <tr>
+              <td style="text-align: center;width: 120px"><span>工艺描述：</span></td>
+              <td><span>{{data.processDescribe}}</span></td>
+            </tr>
+            <tr>
+              <td style="text-align: center;width: 120px"><span>做工说明：</span></td>
+              <td>{{data.mkExplain}}</td>
+            </tr>
+            <tr>
+              <td style="text-align: center;width: 120px"><span>品质要求：</span></td>
+              <td>{{data.qualityRequire}}</td>
+            </tr>
+          </table>
+        </div>
       </div>
       <a-card :title="`动作`+(index+1)" v-for="(item,index) in data.zyClothAction" :key="item.id" :headStyle="headStyle">
         <div style="width:100%;height:20px;display:flex;font-size:18px">
@@ -74,61 +88,61 @@
               <td style="width:20%">描述：{{item.descr}}</td>
             </tr>
           </table>
-          <!-- <p>编号：{{item.nums}}</p>
-          <p>频率：{{item.freq}}</p>
-         <p>机器TMU：{{item.machineTmu}}</p>
-         <p>手工TMU：{{item.machineTmu}}</p>
-         <p>描述：{{item.descr}}</p> -->
         </div>
-
       </a-card>
+      <div style="width: 96%;margin:0 auto 30px">
+        <h2 style="text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">基础动作</h2>
+      </div>
     </a-modal>
   </div>
 </template>
 <script>
-export default {
+  export default {
     data() {
-  return{
-    ModalText: 'Content of the modal',
-    visible: false,
-    confirmLoading: false,
-    selectId:'2',
-    img:'',
-    mp4:'',
-    data:{},
-    headStyle:{
-      height:'10px'
-    }
-  }
-},
-created(){
-},
-methods: {
-  showModal(id) {
-    // console.log(this.selectId)
-    this.visible = true;
-    this.$http.get('/base/zyProcess/queryById?id='+id).then(
-      res=>{
-        this.data = res.result
-        this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
-        this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
-        console.log(this.data)
+      return{
+        ModalText: 'Content of the modal',
+        visible: false,
+        confirmLoading: false,
+        selectId:'2',
+        img:'',
+        img1:require('@/assets/9-2.png'),//默认图片
+        mp4:'',
+        data:{},
+        headStyle:{
+          height:'10px'
+        }
       }
-    )
-  },
-  handleOk(e) {
-    this.ModalText = 'The modal will be closed after two seconds';
-    this.confirmLoading = true;
-    console.log(this.data)
-    setTimeout(() => {
-      this.visible = false;
-      this.confirmLoading = false;
-    }, 1);
-  },
-  handleCancel(e) {
-    console.log('Clicked cancel button');
-    this.visible = false;
-  },
-},
-}
-</script>
\ No newline at end of file
+    },
+    created(){
+    },
+    methods: {
+      showModal(id) {
+        this.visible = true;
+        this.$http.get('/base/zyProcess/queryById?id='+id).then(
+          res=>{
+            this.data = res.result
+            this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
+            this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
+            console.log(this.data)
+          }
+        )
+      },
+      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>
+  .table{border-color:#d9d9d9;border-radius: 3px}
+  .table td{padding: 10px 20px;max-width: 380px;white-space:nowrap}
+  .table td span{color: #333}
+</style>
\ No newline at end of file

From 1ffbf529281553fbfab258fb5f90b4ea969d370b Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Wed, 7 Sep 2022 10:26:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?20220907-syy-=E5=9F=BA=E7=A1=80=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C-=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/procedure/basicAction.vue  | 58 +++++++++++++++++
 .../src/views/process/ZyClothActionList.vue   | 19 +++---
 .../modules/ZyClothActionFormDetail.vue       | 63 +++++++++++++++++++
 3 files changed, 133 insertions(+), 7 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/components/procedure/basicAction.vue
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue

diff --git a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
new file mode 100644
index 00000000..641b5ce5
--- /dev/null
+++ b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
@@ -0,0 +1,58 @@
+<template>
+  <div style="padding: 15px 25px;display: flex;justify-content: space-between">
+      <img :src="img == ''?img1:img" style="width:30%;">
+      <video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/>
+      <p v-else style="padding-top: 20px"> 暂无视频</p>
+      <table border="1" style="width:30%;font-size:14px;margin-bottom: 20px;" class="table">
+        <!--          <tr>-->
+        <!--            <td style="text-align: center">添加人:</td>-->
+        <!--            <td>{{model.addPeople}}</td>-->
+        <!--          </tr>-->
+        <tr>
+          <td style="text-align: center">频率:</td>
+          <td>{{tableModel.freq}}</td>
+        </tr>
+        <tr>
+          <td style="text-align: center">描述:</td>
+          <td>{{tableModel.descr}}</td>
+        </tr>
+        <tr>
+          <td style="text-align: center">机器TMU:</td>
+          <td>{{tableModel.machineTmu}}</td>
+        </tr>
+        <tr>
+          <td style="text-align: center">手工TMU:</td>
+          <td>{{tableModel.machineTmu}}</td>
+        </tr>
+        <tr>
+          <td style="text-align: center">编号:</td>
+          <td>{{tableModel.nums}}</td>
+        </tr>
+      </table>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'basicAction',
+    props:['tableModel'],
+    data () {
+      return {
+        model:{
+        },
+        img:'',//图片地址
+        img1:require('@/assets/9-2.png'),// 默认图片
+        mp4:'',//视频地址
+        visible: false,
+        confirmLoading: false,
+        validatorRules: {
+        },
+      }},
+    methods: {
+    }
+      }
+</script>
+<style scoped>
+  .table{border-color:#d9d9d9;border-radius: 3px}
+  .table td{padding: 10px 20px;max-width: 380px; }
+  .table td span{color: #333}
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue
index bbe1717c..4701f83c 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue
@@ -29,9 +29,9 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('zy_cloth_action')">导出</a-button>
-<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-<!--        <a-button type="primary" icon="import">导入</a-button>-->
-<!--      </a-upload>-->
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -88,7 +88,7 @@
 
           <a-divider type="vertical" />
 
-                <a @click="handleDetail(record)">详情</a>
+                <a @click="handleDetail(record.id)">详情</a>
               <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
@@ -100,6 +100,7 @@
     </div>
 
     <zy-cloth-action-modal ref="modalForm" @ok="modalFormOk"></zy-cloth-action-modal>
+    <ZyClothActionFormDetail ref="ZyClothActionFormDetail"></ZyClothActionFormDetail>
   </a-card>
 </template>
 
@@ -109,12 +110,13 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ZyClothActionModal from './modules/ZyClothActionModal'
+  import ZyClothActionFormDetail from './modules/ZyClothActionFormDetail'
 
   export default {
     name: 'ZyClothActionList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      ZyClothActionModal
+      ZyClothActionModal,ZyClothActionFormDetail
     },
     data () {
       return {
@@ -198,7 +200,7 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
     },
     computed: {
       importExcelUrl: function(){
@@ -217,10 +219,13 @@
         fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''})
         fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
         this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyClothActionFormDetail.showModal(id)
       }
     }
   }
 </script>
-<style scoped>
+<style scoped lang="less">
   @import '~@assets/less/common.less';
 </style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
new file mode 100644
index 00000000..0f0a0de4
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
@@ -0,0 +1,63 @@
+<template>
+  <a-modal
+    title="基础动作-详情"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :width='1200'
+    @ok="handleOk"
+    @cancel="handleCancel">
+    <h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;">黄淮学院服装智能制造管理平台 - <span>基础动作</span></h1>
+      <basicAction :tableModel="model"></basicAction>
+  </a-modal>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+import basicAction from '@/components/procedure/basicAction'
+  export default {
+    name: 'ZyClothActionFormDetail',
+    components: {
+      basicAction
+    },
+    data () {
+      return {
+        model:{
+         },
+        img:'',//图片地址
+        img1:require('@/assets/9-2.png'),// 默认图片
+        mp4:'',//视频地址
+        visible: false,
+        confirmLoading: false,
+        validatorRules: {
+        },
+      }
+    },
+    methods: {
+      showModal(id) {
+        this.visible = true;
+        this.$http.get('base/zyClothAction/queryById?id='+id).then(
+          res=>{
+            this.model = res.result
+          }
+        )
+      },
+      handleOk() {
+        this.confirmLoading = true;
+        setTimeout(() => {
+          this.visible = false;
+          this.confirmLoading = false;
+        }, 1);
+      },
+      handleCancel() {
+        this.visible = false;
+      },
+    }
+  }
+</script>
+<style scoped>
+  .table{border-color:#d9d9d9;border-radius: 3px}
+  .table td{padding: 10px 20px;max-width: 380px; }
+  .table td span{color: #333}
+</style>
\ No newline at end of file

From a1054a7ae0d3753451301ca84729b1d6a09e8dd3 Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Wed, 7 Sep 2022 10:50:02 +0800
Subject: [PATCH 3/3] =?UTF-8?q?20220907-syy-=E5=B7=A5=E5=BA=8F=E8=BE=85?=
 =?UTF-8?q?=E6=96=99-=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/procedure/processFabric.vue    | 40 +++++++++++
 .../src/views/cloths/ZyProcessFabricList.vue  | 10 ++-
 .../modules/ZyProcessFabricFormDetail.vue     | 70 +++++++++++++++++++
 3 files changed, 117 insertions(+), 3 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/components/procedure/processFabric.vue
 create mode 100644 ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue

diff --git a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
new file mode 100644
index 00000000..f06fad2f
--- /dev/null
+++ b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
@@ -0,0 +1,40 @@
+<template>
+  <div style="padding: 15px 25px;display: flex;justify-content: space-between">
+    <img :src="img == ''?img1:img" style="width:30%;">
+    <video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/>
+    <p v-else style="padding-top: 20px"> 暂无视频</p>
+    <table border="1" style="font-size:14px;" class="table" >
+      <tr>
+        <td style="text-align: center">工序:</td>
+        <td>{{tableModel.processId}}</td>
+      </tr>
+      <tr>
+        <td style="text-align: center">辅料:</td>
+        <td>{{tableModel.fabricId}}</td>
+      </tr>
+    </table>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'processFabric',
+    props:['tableModel'],
+    data () {
+      return {
+        model:{
+        },
+        img:'',//图片地址
+        img1:require('@/assets/9-2.png'),// 默认图片
+        mp4:'',//视频地址
+        visible: false,
+        confirmLoading: false,
+        validatorRules: {
+        },
+      }},
+  }
+</script>
+<style scoped>
+  .table{border-color:#d9d9d9;border-radius: 3px}
+  .table td{padding: 10px 20px;max-width: 380px;}
+  .table td span{color: #333}
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue b/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue
index 11bf8380..1aba9052 100644
--- a/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/cloths/ZyProcessFabricList.vue
@@ -88,7 +88,7 @@
 
            <a-divider type="vertical" />
 
-                <a @click="handleDetail(record)">详情</a>
+                <a @click="handleDetail(record.id)">详情</a>
                       <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
@@ -100,6 +100,7 @@
     </div>
 
     <zy-process-fabric-modal ref="modalForm" @ok="modalFormOk"></zy-process-fabric-modal>
+    <ZyProcessFabricFormDetail ref="ZyProcessFabricFormDetail"></ZyProcessFabricFormDetail>
   </a-card>
 </template>
 
@@ -110,12 +111,12 @@
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ZyProcessFabricModal from './modules/ZyProcessFabricModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
-
+  import ZyProcessFabricFormDetail from './modules/ZyProcessFabricFormDetail'
   export default {
     name: 'ZyProcessFabricList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      ZyProcessFabricModal
+      ZyProcessFabricModal,ZyProcessFabricFormDetail
     },
     data () {
       return {
@@ -197,6 +198,9 @@
         fieldList.push({type:'string',value:'processId',text:'工序',dictCode:'zy_process,process_name,id'})
         fieldList.push({type:'string',value:'fabricId',text:'辅料',dictCode:'zy_fabric,name,id'})
         this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyProcessFabricFormDetail.showModal(id)
       }
     }
   }
diff --git a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
new file mode 100644
index 00000000..49b68453
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
@@ -0,0 +1,70 @@
+<template>
+  <a-modal
+    title="工序辅料-详情"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :width='1000'
+    @ok="handleOk"
+    @cancel="handleCancel">
+    <h1 style="text-align: center;margin-bottom: 50px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序辅料</span></h1>
+    <processFabric :tableModel="model"></processFabric>
+  </a-modal>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+import processFabric from '@/components/procedure/processFabric'
+  export default {
+    name: 'ZyProcessFabricFormDetail',
+    components: {
+      processFabric
+    },
+    data () {
+      return {
+        code:'',
+        id:'',
+        model:{
+         },
+        visible:false,
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+      }
+    },
+    methods: {
+      showModal(id) {
+        this.visible = true;
+        this.$http.get('pro/zyProcessFabric/queryById?id='+id).then(
+          res=>{
+            this.model = res.result
+          }
+        )
+      },
+      handleOk() {
+        this.confirmLoading = true;
+        setTimeout(() => {
+          this.visible = false;
+          this.confirmLoading = false;
+        }, 1);
+      },
+      handleCancel() {
+        this.visible = false;
+      },
+    }
+  }
+</script>
+<style scoped>
+  .table{border-color:#d9d9d9;border-radius: 3px}
+  .table td{padding: 10px 20px;max-width: 380px; }
+  .table td span{color: #333}
+</style>
\ No newline at end of file