From 6a5aca28e34a0743ce30df789414274078136d5a Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Sat, 17 Sep 2022 17:40:52 +0800
Subject: [PATCH] 20220917-syy

---
 .../src/components/procedure/basicAction.vue  | 29 +++-----------
 .../components/procedure/processFabric.vue    | 24 ++++++------
 .../src/components/procedure/zyProcess.vue    |  2 +-
 .../modules/ZyAccessoriesFormDetail.vue       | 38 +------------------
 .../modules/ZyClothActionFormDetail.vue       | 12 +++---
 .../views/process/modules/ZyProcessDetail.vue | 20 +++++-----
 6 files changed, 36 insertions(+), 89 deletions(-)

diff --git a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
index 90a5db78..d00a357b 100644
--- a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
+++ b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
@@ -1,16 +1,12 @@
 <template>
   <div>
     <div v-for="(item,index) in tableModel" :key="index">
-      <h3  v-if="index>0">动作{{index+1}}</h3>
+      <h3 v-if="flag">动作{{index+1}}</h3>
       <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>{{item.freq}}</td>
@@ -33,21 +29,12 @@
           </tr>
         </table>
       </div>
-
     </div>
-
   </div>
 </template>
 <script>
   export default {
     name: 'basicAction',
-    // props: {
-    //   model: {
-    //     type: Array,
-    //     default() {
-    //       return []
-    //     }
-    //   }},
     props:['model'],
     data () {
       return {
@@ -55,6 +42,7 @@
         img1:require('@/assets/9-2.png'),// 默认图片
         mp4:'',//视频地址
         tableModel:[],
+        flag:true,
         visible: false,
         confirmLoading: false,
         validatorRules: {
@@ -65,17 +53,10 @@
     watch: {
       //正确给 tableModel 赋值的 方法
       model: function(newVal,oldVal){
-        if(Array.isArray(newVal)){
-          this.tableModel = newVal;
-        }else{
-          this.tableModel.push(newVal)
+        this.tableModel = newVal;
+        if(this.tableModel.length == 1){
+          this.flag = false
         }
-        newVal && this.getTableModel();
-      }
-    },
-    methods: {
-      getTableModel(){
-        //执行其他逻辑
       }
     },
       }
diff --git a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
index f245970e..ed6c6367 100644
--- a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
+++ b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
@@ -1,7 +1,5 @@
 <template>
   <div>
-<!--    <div v-for="(item,index) in tableModel" :key="index">-->
-<!--      <h3>辅料{{index+1}}</h3>-->
       <div style="padding: 15px 25px;">
         <el-descriptions class="margin-top" :column="3" border style="margin-top: 50px">
           <el-descriptions-item>
@@ -44,32 +42,36 @@
 <script>
   export default {
     name: 'processFabric',
-    props:['model'],
+    props:['model','fabricId'],
     data () {
       return {
         img:'',//图片地址
         img1:require('@/assets/9-2.png'),// 默认图片
         mp4:'',//视频地址
         tableModel:[],
+        id:'',
         visible: false,
         confirmLoading: false,
         validatorRules: {
         },
       }},
     created() {
+      console.log(this.id)
     },
     watch: {
       //正确给 cData 赋值的 方法
       model: function(newVal,oldVal){
-        // if(Array.isArray(newVal)){
-        //   this.tableModel = newVal;
-        // }else{
-          // this.tableModel.push(newVal)
           this.tableModel= newVal
-          console.log('组件页面')
-          console.log(this.tableModel)
-        // }
-        // newVal && this.getTableModel();
+      },
+      fabricId: function(newVal,oldVal){
+        this.id = newVal
+        // this.$http.get('/accessories/zyAccessories/queryById?id='+this.id).then(
+        //     res=>{
+        //       // this.model = res.result
+        //       console.log(this.id)
+        //       console.log(res)
+        //       console.log(res.result)
+        //     })
       }
     },
     methods: {
diff --git a/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue b/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
index 46708f3f..914ffe2a 100644
--- a/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
+++ b/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="padding: 15px 25px;">
+  <div style="">
     <div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between;margin-bottom: 20px;" class="coin">
       <img :src="data.image?data.image:img1" style="width:32%;">
       <table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">
diff --git a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue
index 9aaebfc7..950ff309 100644
--- a/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue
+++ b/ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue
@@ -9,40 +9,6 @@
       @cancel="handleCancel"
     >
       <h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px;">黄淮学院服装智能制造管理平台 - <span>辅料管理</span></h1>
-<!--      <el-descriptions class="margin-top" :column="3" border style="margin-top: 50px">-->
-<!--        <el-descriptions-item>-->
-<!--          <template slot="label"><i class="el-icon-receiving"></i>类型id</template>-->
-<!--          {{model.typeId}}-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item>-->
-<!--          <template slot="label"><i class="el-icon-coin"></i>编号</template>-->
-<!--          {{model.nums}}-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item>-->
-<!--          <template slot="label"><i class="el-icon-postcard"></i>名称</template>-->
-<!--          {{model.contents}}-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item>-->
-<!--          <template slot="label"><i class="el-icon-copy-document"></i>图片</template>-->
-<!--          {{model.picture}}-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item>-->
-<!--          <template slot="label"><i class="el-icon-price-tag"></i>材质</template>-->
-<!--          {{model.material}}-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item>-->
-<!--          <template slot="label"><i class="el-icon-files"></i>规格</template>-->
-<!--          {{model.specs}}-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item>-->
-<!--          <template slot="label"><i class="el-icon-takeaway-box"></i>库存量</template>-->
-<!--          {{model.store}}-->
-<!--        </el-descriptions-item>-->
-<!--        <el-descriptions-item>-->
-<!--          <template slot="label"><i class="el-icon-location-outline"></i>供货商</template>-->
-<!--          {{model.supplierInfo}}-->
-<!--        </el-descriptions-item>-->
-<!--      </el-descriptions>-->
       <processFabric :model="model"></processFabric>
     </a-modal>
   </div>
@@ -74,10 +40,8 @@ import processFabric from '@/components/procedure/processFabric'
         this.$http.get('/accessories/zyAccessories/queryById?id='+id).then(
           res=>{
             this.model = res.result
-            console.log('详情页面')
-            console.log(this.model)
           })
-        },
+      },
       handleOk() {
         this.ModalText = 'The modal will be closed after two seconds';
         this.confirmLoading = true;
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
index d0633887..2675c5d9 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
@@ -23,8 +23,7 @@ import basicAction from '@/components/procedure/basicAction'
     },
     data () {
       return {
-        model:{
-         },
+        model:[],
         id:'',
         img:'',//图片地址
         img1:require('@/assets/9-2.png'),// 默认图片
@@ -38,11 +37,12 @@ import basicAction from '@/components/procedure/basicAction'
     methods: {
       showModal(id) {
         this.visible = true;
-        this.$http.get('base/zyClothAction/queryById?id='+id).then(
+        this.$http.get('/base/zyClothAction/queryById?id='+id).then(
           res=>{
-            this.model = res.result
-            console.log('this.model')
-            console.log(this.model)
+
+            if(this.model.length == 0){
+              this.model.push(res.result)
+            }
           }
         )
       },
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 ff1e96c9..0663e0db 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 style="">
     <a-modal
       title="标准作业指导书"
       :visible="visible"
@@ -9,10 +9,10 @@
       @cancel="handleCancel"
       style="display:flex;"
     >
-      <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: 96%;margin:0 auto 40px;padding-bottom: 30px">
+        <h1 style="text-align: center;margin-bottom: 0px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>基本工序</span></h1>
 <!--        基本工序-->
-        <zyProcess :data="ProcessData"></zyProcess>
+        <zyProcess :data="ProcessData" style="border: 1px solid #e8e8e8;border-top: none;padding: 30px 25px"></zyProcess>
       </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">-->
@@ -29,16 +29,16 @@
       <!--      </a-card>-->
 <!--      基础动作-->
       <div class="coin">
-        <h2>基础动作</h2>
-        <basicAction :model="basicActionData"></basicAction>
+        <h2 style="padding: 20px">基础动作</h2>
+        <basicAction :model="basicActionData" style="padding:20px;"></basicAction>
       </div>
       <div class="coin">
         <h2>工序面料</h2>
-        <processAccessories :model="accessoriesData"></processAccessories>
+        <processAccessories :model="accessoriesData" style="padding:0 20px"></processAccessories>
       </div>
       <div class="coin">
         <h2>工序辅料</h2>
-        <processFabric :model="fabricData"></processFabric>
+        <processFabric :model="fabricData" style="padding:0 20px"></processFabric>
       </div>
     </a-modal>
   </div>
@@ -108,6 +108,6 @@
   .table{border-color:#d9d9d9;border-radius: 3px}
   .table td{padding: 10px 20px;max-width: 380px;white-space:nowrap}
   .table td span{color: #333}
-  .coin{width: 96%;margin:0 auto 30px;border-bottom: 1px solid #e8e8e8;}
-  .coin h2{text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px}
+  .coin{width: 96%;margin:0 auto 30px;border: 1px solid #e8e8e8;}
+  .coin h2{text-align: left;border-bottom: 1px solid #e8e8e8;padding: 20px;background: rgba(247,247,247,1);margin: 0;}
 </style>
\ No newline at end of file