From 690c1a6884bcf14004d3664693b64e4bed760a9d Mon Sep 17 00:00:00 2001
From: cgx <2606784146@qq.com>
Date: Mon, 16 Dec 2024 12:30:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-hanhai-vue/src/views/product/TbProductList.vue   | 18 ++++++++++++++++++
 .../src/views/product/modules/TbProductForm.vue        | 11 +++++++++++
 .../src/views/productOrder/TbProductOrderList.vue      | 14 ++++++++++++++
 .../views/productOrder/modules/TbProductOrderForm.vue  | 11 ++++++++++-
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/admin-hanhai-vue/src/views/product/TbProductList.vue b/admin-hanhai-vue/src/views/product/TbProductList.vue
index 0b33207..2488659 100644
--- a/admin-hanhai-vue/src/views/product/TbProductList.vue
+++ b/admin-hanhai-vue/src/views/product/TbProductList.vue
@@ -183,18 +183,34 @@
           scopedSlots: {customRender: 'imgSlot'}
         },
 
+
+
         {
         title:'商品内容图片',
         align:"center",
         dataIndex: 'picDetail',
         scopedSlots: {customRender: 'imgSlot'}
         },
+
+                          {
+                            title:'商品视频',
+                            align:"center",
+                            dataIndex: 'video',
+                            scopedSlots: {customRender: 'fileSlot'}
+                          },
         {
           title:'检测报告图片',
           align:"center",
           dataIndex: 'report',
           scopedSlots: {customRender: 'imgSlot'}
         },
+
+                          {
+                            title:'检测视频',
+                            align:"center",
+                            dataIndex: 'reportVideo',
+                            scopedSlots: {customRender: 'fileSlot'}
+                          },
           {
             title:'单价',
             align:"center",
@@ -273,6 +289,8 @@
         fieldList.push({type:'Text',value:'pic',text:'报价照片',dictCode:''})
         fieldList.push({type:'Text',value:'picDetail',text:'商品内容图片',dictCode:''})
         fieldList.push({type:'Text',value:'report',text:'检测报告图片',dictCode:''})
+        fieldList.push({type:'Text',value:'reportVideo',text:'检测视频',dictCode:''})
+        fieldList.push({type:'Text',value:'video',text:'商品视频',dictCode:''})
         fieldList.push({type:'string',value:'specsName',text:'商品规格',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''})
         fieldList.push({type:'int',value:'num',text:'暂定数量、',dictCode:''})
diff --git a/admin-hanhai-vue/src/views/product/modules/TbProductForm.vue b/admin-hanhai-vue/src/views/product/modules/TbProductForm.vue
index e02292c..b8d61df 100644
--- a/admin-hanhai-vue/src/views/product/modules/TbProductForm.vue
+++ b/admin-hanhai-vue/src/views/product/modules/TbProductForm.vue
@@ -43,6 +43,12 @@
                         <j-image-upload isMultiple  v-model="model.pic" ></j-image-upload>
                       </a-form-model-item>
                     </a-col>
+
+                                                    <a-col :span="24">
+                                                      <a-form-model-item label="商品视频" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="video">
+                                                        <j-upload v-model="model.video"   ></j-upload>
+                                                      </a-form-model-item>
+                                                    </a-col>
                       <a-col :span="24">
                         <a-form-model-item label="商品内容图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="picDetail">
                           <j-image-upload isMultiple  v-model="model.picDetail" ></j-image-upload>
@@ -53,6 +59,11 @@
                             <j-image-upload isMultiple  v-model="model.report" ></j-image-upload>
                           </a-form-model-item>
                         </a-col>
+                                                      <a-col :span="24">
+                                                        <a-form-model-item label="检测视频" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportVideo">
+                                                          <j-upload v-model="model.reportVideo"   ></j-upload>
+                                                        </a-form-model-item>
+                                                      </a-col>
           <a-col :span="24">
             <a-form-model-item label="期货现货" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productType">
               <j-dict-select-tag type="list" v-model="model.productType" dictCode="product_type" placeholder="请选择期货现货" />
diff --git a/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue b/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue
index 0b342af..cea45ed 100644
--- a/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue
+++ b/admin-hanhai-vue/src/views/productOrder/TbProductOrderList.vue
@@ -211,6 +211,18 @@
           dataIndex: 'report',
           scopedSlots: {customRender: 'imgSlot'}
         },
+          {
+            title:'商品视频',
+            align:"center",
+            dataIndex: 'video',
+            scopedSlots: {customRender: 'fileSlot'}
+          },
+          {
+            title:'检测视频',
+            align:"center",
+            dataIndex: 'reportVideo',
+            scopedSlots: {customRender: 'fileSlot'}
+          },
           {
             title:'定金',
             align:"center",
@@ -283,6 +295,8 @@
                 fieldList.push({type:'Text',value:'picDetail',text:'商品内容图片',dictCode:''})
                 fieldList.push({type:'Text',value:'report',text:'检测报告图片',dictCode:''})
                 fieldList.push({type:'string',value:'specsName',text:'商品规格',dictCode:''})
+                fieldList.push({type:'Text',value:'reportVideo',text:'检测视频',dictCode:''})
+                fieldList.push({type:'Text',value:'video',text:'商品视频',dictCode:''})
         fieldList.push({type:'int',value:'auditStatus',text:'审核状态',dictCode:'audit_status'})
         fieldList.push({type:'int',value:'showStatus',text:'挂单状态',dictCode:'show_status'})
         fieldList.push({type:'int',value:'productType',text:'期货现货',dictCode:'product_type'})
diff --git a/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderForm.vue b/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderForm.vue
index de3eca4..e1d38db 100644
--- a/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderForm.vue
+++ b/admin-hanhai-vue/src/views/productOrder/modules/TbProductOrderForm.vue
@@ -53,6 +53,11 @@
                 <j-image-upload isMultiple  v-model="model.pic" ></j-image-upload>
               </a-form-model-item>
             </a-col>
+                      <a-col :span="24">
+                        <a-form-model-item label="商品视频" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="video">
+                          <j-upload v-model="model.video"   ></j-upload>
+                        </a-form-model-item>
+                      </a-col>
               <a-col :span="24">
                 <a-form-model-item label="商品内容图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="picDetail">
                   <j-image-upload isMultiple  v-model="model.picDetail" ></j-image-upload>
@@ -63,7 +68,11 @@
                     <j-image-upload isMultiple  v-model="model.report" ></j-image-upload>
                   </a-form-model-item>
                 </a-col>
-
+          <a-col :span="24">
+            <a-form-model-item label="检测视频" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="reportVideo">
+              <j-upload v-model="model.reportVideo"   ></j-upload>
+            </a-form-model-item>
+          </a-col>
                     <a-col :span="24">
                       <a-form-model-item label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus">
                         <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请审核" />