From 2c0cf3dd466b765ad26f8fd36951d30c90c8e75b Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Mon, 19 Sep 2022 18:21:25 +0800
Subject: [PATCH] 20220919-syy

---
 .../components/procedure/processFabric.vue    |  13 +-
 .../modules/ZyProcessFabricFormDetail.vue     |  39 ++-
 .../src/views/erp/fabric/ZyFabricList.vue     |  11 +-
 .../modules/ZyFabricFormDetailModel.vue       | 246 ++++++++++++++++++
 4 files changed, 279 insertions(+), 30 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricFormDetailModel.vue

diff --git a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
index ed6c6367..ad266a17 100644
--- a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
+++ b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
@@ -65,13 +65,12 @@
       },
       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)
-        //     })
+        this.$http.get('/accessories/zyAccessories/queryById?id='+this.id).then(
+            res=>{
+              //问题：对应辅料id查不到数据
+              console.log(this.id)
+              console.log(res.result)
+            })
       }
     },
     methods: {
diff --git a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
index ab8afcf4..3816391b 100644
--- a/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
+++ b/ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
@@ -3,26 +3,12 @@
     title="工序辅料-详情"
     :visible="visible"
     :confirm-loading="confirmLoading"
-    :width='1000'
+    :width='1400'
     @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 :model="model"></processFabric>-->
-    <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>{{model.processId}}</td>
-        </tr>
-        <tr>
-          <td style="text-align: center">面料:</td>
-          <td>{{model.fabricId}}</td>
-        </tr>
-      </table>
-    </div>
+    <h1 style="text-align: center;margin-bottom: 0px;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序辅料</span></h1>
+    <zyProcess :data="processData" style="border: 1px solid #e8e8e8;         padding: 30px 25px"></zyProcess>
+    <processFabric :fabricId =fabricId style="padding:0 20px"></processFabric>
   </a-modal>
 </template>
 
@@ -31,10 +17,11 @@
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
 import processFabric from '@/components/procedure/processFabric'
+import zyProcess from '@/components/procedure/zyProcess'
   export default {
     name: 'ZyProcessFabricFormDetail',
     components: {
-      processFabric
+      processFabric,zyProcess
     },
     data () {
       return {
@@ -45,6 +32,9 @@ import processFabric from '@/components/procedure/processFabric'
         mp4:'',//视频地址
         model:{
          },
+        processData:{},
+        processId:'',
+        fabricId:'',
         visible:false,
         labelCol: {
           xs: { span: 24 },
@@ -61,10 +51,15 @@ import processFabric from '@/components/procedure/processFabric'
     },
     methods: {
       showModal(id) {
-        this.visible = true;
+        this.visible = true;//
         this.$http.get('/pro/zyProcessFabric/queryById?id='+id).then(
           res=>{
-            this.model = res.result
+            this.fabricId = res.result.fabricId
+            this.processId = res.result.processId
+            this.$http.get('/base/zyProcess/queryById?id='+this.processId).then(
+              res=>{
+                this.processData = res.result.zyProcess
+              })
           }
         )
       },
@@ -85,4 +80,6 @@ import processFabric from '@/components/procedure/processFabric'
   .table{border-color:#d9d9d9;border-radius: 3px}
   .table td{padding: 10px 20px;max-width: 380px; }
   .table td span{color: #333}
+  .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
diff --git a/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue b/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue
index 7dbf9367..bc90a492 100644
--- a/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/erp/fabric/ZyFabricList.vue
@@ -119,7 +119,7 @@
           <a @click="fuzhi(record)">复制</a>
 
           <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)">
@@ -131,6 +131,7 @@
     </div>
     <ZyFabricFormDetail ref="ZyFabricFormDetail"></ZyFabricFormDetail>
     <zy-fabric-modal ref="modalForm" @ok="modalFormOk"></zy-fabric-modal>
+    <ZyFabricFormDetailModel ref="ZyFabricFormDetailModel"></ZyFabricFormDetailModel>
   </a-card>
 </template>
 
@@ -142,12 +143,14 @@
   import ZyFabricModal from './modules/ZyFabricModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
 import  ZyFabricFormDetail from  './modules/ZyFabricFormDetail'
+import  ZyFabricFormDetailModel from  './modules/ZyFabricFormDetailModel'
   export default {
     name: 'ZyFabricList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
       ZyFabricModal,
-      ZyFabricFormDetail
+      ZyFabricFormDetail,
+      ZyFabricFormDetailModel
     },
     data () {
       return {
@@ -312,6 +315,10 @@ import  ZyFabricFormDetail from  './modules/ZyFabricFormDetail'
         fieldList.push({type:'sel_depart',value:'supplierInfo',text:'供货商信息'})
         fieldList.push({type:'string',value:'createTime',text:'创建时间',dictCode:''})
         this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyFabricFormDetailModel.showModal(id)
+        // this.$children[0].showModal(id)
       }
     }
   }
diff --git a/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricFormDetailModel.vue b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricFormDetailModel.vue
new file mode 100644
index 00000000..613c94c0
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricFormDetailModel.vue
@@ -0,0 +1,246 @@
+<template>
+  <div>
+    <a-modal
+      title="面料管理-详情"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :width='1400'
+      @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.typeId}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-coin"></i>编号</template>
+          {{model.fabricNumber}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-postcard"></i>名称</template>
+          {{model.name}}
+        </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.pattern}}
+        </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.ply}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-files"></i>单价</template>
+          {{model.money}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-files"></i>零售价</template>
+          {{model.money}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-files"></i>品牌</template>
+          {{model.brandId}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-receiving"></i>单位</template>
+          {{model.unit}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-coin"></i>密度</template>
+          {{model.density}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-postcard"></i>名称</template>
+          {{model.clothW}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-copy-document"></i>幅宽</template>
+          {{model.clothW}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-copy-document"></i>销售地区</template>
+          {{model.location}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-price-tag"></i>状态</template>
+          {{model.status}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-location-outline"></i>供货商</template>
+          {{model.supplierInfo}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-picture-outline"></i>图片</template>
+          {{model.imageUrl}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-paperclip"></i>二维码</template>
+          {{model.qRcode}}
+        </el-descriptions-item>
+      </el-descriptions></div>
+      </div>
+    </a-modal>
+  </div>
+
+<!--            <a-form-model-item label="面料类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="typeId">-->
+<!--              <j-popup-->
+<!--                v-model="model.typeId"-->
+<!--                field="id"-->
+<!--                org-fields="id"-->
+<!--                dest-fields="id"-->
+<!--                code="zy_fabric_type"-->
+<!--                :multi="false"-->
+<!--                @input="popupCallback"-->
+
+<!--            <a-form-model-item label="编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fabricNumber">-->
+<!--              <a-input v-model="model.fabricNumber" placeholder="请输入编号"  ></a-input>-->
+<!--            </a-form-model-item>-->
+
+<!--            <a-form-model-item label="花样" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pattern">-->
+<!--              <j-search-select-tag v-model="model.pattern" dict="pattern"  />-->
+<!--            </a-form-model-item>-->
+
+<!--            <a-form-model-item label="材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="material">-->
+<!--              <j-search-select-tag v-model="model.material" dict="material"  />-->
+<!--            </a-form-model-item>-->
+
+<!--            <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit">-->
+<!--              <j-search-select-tag v-model="model.unit" dict="unit1"  />-->
+<!--            </a-form-model-item>-->
+
+<!--            <a-form-model-item label="密度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="density">-->
+<!--              <j-search-select-tag v-model="model.density" dict="density"  />-->
+<!--            </a-form-model-item>-->
+
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">-->
+<!--              <j-search-select-tag v-model="model.status" dict="fabric_status"  />-->
+<!--            </a-form-model-item>-->
+
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="图片地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="imageUrl">-->
+<!--              <j-image-upload isMultiple  v-model="model.imageUrl" ></j-image-upload>-->
+<!--            </a-form-model-item>-->
+
+
+
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+  import OnlineCamera from './Components/OnlineCamera'
+
+  export default {
+    name: 'ZyFabricFormDetailModel',
+    components: {
+      OnlineCamera
+    },
+    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,
+        validatorRules: {
+          typeId: [
+            { required: true, message: '请选择类型!'},
+          ],
+          color: [
+            { required: true, message: '请输入颜色!'},
+          ],
+          pattern: [
+            { required: true, message: '请输入花样!'},
+          ],
+          fabricNumber: [
+            { required: true, message: '请输入面料编号!'},
+          ],
+          name: [
+            { required: true, message: '请输入名称!'},
+          ],
+          money: [
+            { required: false},
+            { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
+          ],
+          retailPrice: [
+            { required: false},
+            { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},
+          ],
+          location: [
+            { required: false},
+            { pattern: /^.{0,30}$/, message: '长度不能超过30位字符'},
+          ],
+        },
+        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('/fabric/zyFabric/queryById?id='+id).then(
+          res=>{
+            this.model = res.result
+
+          }
+        )
+      },
+      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>
+  .margin-top i{margin-right: 5px}
+</style>
\ No newline at end of file