From 2f44e519400cf15060f519830c3cff01d1d3484f Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Wed, 7 Sep 2022 11:02:19 +0800
Subject: [PATCH] =?UTF-8?q?20220907-syy-=E5=B7=A5=E5=BA=8F=E9=9D=A2?=
 =?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

---
 .../procedure/processAccessories.vue          | 40 ++++++++++++
 .../views/cloths/ZyProcessAccessoriesList.vue | 11 +++-
 .../ZyProcessAccessoriesFormDetail.vue        | 65 +++++++++++++++++++
 3 files changed, 113 insertions(+), 3 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/components/procedure/processAccessories.vue
 create mode 100644 ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue

diff --git a/ant-design-vue-jeecg/src/components/procedure/processAccessories.vue b/ant-design-vue-jeecg/src/components/procedure/processAccessories.vue
new file mode 100644
index 00000000..093cb509
--- /dev/null
+++ b/ant-design-vue-jeecg/src/components/procedure/processAccessories.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.accessoriesId}}</td>
+      </tr>
+    </table>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'processAccessories',
+    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/ZyProcessAccessoriesList.vue b/ant-design-vue-jeecg/src/views/cloths/ZyProcessAccessoriesList.vue
index 55d1a9af..ad2569d4 100644
--- a/ant-design-vue-jeecg/src/views/cloths/ZyProcessAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/cloths/ZyProcessAccessoriesList.vue
@@ -89,7 +89,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>
@@ -101,6 +101,7 @@
     </div>
 
     <zy-process-accessories-modal ref="modalForm" @ok="modalFormOk"></zy-process-accessories-modal>
+    <ZyProcessAccessoriesFormDetail ref="ZyProcessAccessoriesFormDetail"></ZyProcessAccessoriesFormDetail>
   </a-card>
 </template>
 
@@ -110,12 +111,13 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ZyProcessAccessoriesModal from './modules/ZyProcessAccessoriesModal'
+  import ZyProcessAccessoriesFormDetail from './modules/ZyProcessAccessoriesFormDetail'
 
   export default {
     name: 'ZyProcessAccessoriesList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      ZyProcessAccessoriesModal
+      ZyProcessAccessoriesModal,ZyProcessAccessoriesFormDetail
     },
     data () {
       return {
@@ -175,7 +177,7 @@
           deleteBatch: "/pro/zyProcessAccessories/deleteBatch",
           exportXlsUrl: "/pro/zyProcessAccessories/exportXls",
           importExcelUrl: "pro/zyProcessAccessories/importExcel",
-          
+
         },
         dictOptions:{},
         superFieldList:[],
@@ -197,6 +199,9 @@
         fieldList.push({type:'popup',value:'processId',text:'工序表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
         fieldList.push({type:'popup',value:'accessoriesId',text:'面料表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
         this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyProcessAccessoriesFormDetail.showModal(id)
       }
     }
   }
diff --git a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue
new file mode 100644
index 00000000..9cd876f0
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue
@@ -0,0 +1,65 @@
+<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>
+      <processAccessories :tableModel="model"></processAccessories>
+  </a-modal>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+import processAccessories from '@/components/procedure/processAccessories'
+  export default {
+    name: 'ZyProcessAccessoriesFormDetail',
+    components: {
+      processAccessories
+    },
+    data () {
+      return {
+        code:'',
+        id:'',
+        model:{
+         },
+        visible:false,
+        confirmLoading: false,
+        validatorRules: {
+        },
+      }
+    },
+    methods: {
+      showModal(id) {
+        this.visible = true;
+        this.$http.get('pro/zyProcessAccessories/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;
+      },
+      popupCallback(value,row){
+         this.model = Object.assign(this.model, row);
+      },
+    }
+  }
+</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