From e34a8dd8da2af67a00f48c5d29b00d61fef7751a Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Wed, 15 May 2024 18:33:31 +0800
Subject: [PATCH] edit

---
 src/api/order.js                              |   6 +
 src/api/setting.js                            |   6 +
 src/views/order/index.vue                     |   6 +-
 src/views/product/addProduct/index.vue        | 153 ++++++++++++++----
 src/views/product/productList/proDetails.vue  |   2 +-
 .../systemForm/setSystem/modifyStoreInfo.vue  |  13 +-
 6 files changed, 147 insertions(+), 39 deletions(-)

diff --git a/src/api/order.js b/src/api/order.js
index 67ae2aa..b2ca282 100644
--- a/src/api/order.js
+++ b/src/api/order.js
@@ -7,6 +7,12 @@ import request from './request'
 export function orderListApi(data) {
   return request.get('store/order/lst', data)
 }
+/**
+ * @description 订单 -- 下载物流公司对照表
+ */
+export function downloadLogisticsApi() {
+  return request.get('/excel/download/express')
+}
 /**
  * @description 开启退款
  */
diff --git a/src/api/setting.js b/src/api/setting.js
index fcb5386..261196e 100644
--- a/src/api/setting.js
+++ b/src/api/setting.js
@@ -14,6 +14,12 @@ export function menuRoleApi(data) {
 export function serviceCodeApi() {
   return request.get(`service/code`)
 }
+/**
+ * @description 签署 -- 签署链接
+ */
+export function contactApi() {
+  return request.get(`contact`)
+}
 /**
  * @description 商品上架费用 -- 列表
  * @param {Object} param params {Object} 传值参数
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index da55485..c433b9a 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -128,6 +128,7 @@
           <el-button size="small">导入批量发货</el-button>
         </el-upload>
         <el-button size="small" @click="getDeliveryList">批量发货记录</el-button>
+        <el-button size="small" @click="downloadLogistics">导出全部物流公司</el-button>
         <!-- <el-button size="small" @click="batchSend">批量发送货</el-button> -->
       </div>
       <el-table v-loading="listLoading" :data="tableData.data" size="small" class="table mt20" highlight-current-row :cell-class-name="addTdClass">
@@ -477,7 +478,8 @@ import {
   exprTempsLst,
   getEleTempData,
   getDeliveryStoreLst,
-  openRefundApi
+  openRefundApi,
+  downloadLogisticsApi
 } from '@/api/order'
 import createWorkBook from '@/utils/newToExcel.js'
 import { serveInfoApi } from '@/api/setting'
@@ -1013,7 +1015,7 @@ export default {
     },
     // 下载物流公司对照表
     downloadLogistics() {
-      window.open(SettingMer.https + `/excel/download/express?token=` + getToken())
+      window.open(`${location.origin}/statics/express.xlsx`)
     },
     // 订单核销
     orderCancellation(code) {
diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index fa62b8d..6950cb1 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -538,7 +538,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="助农文件及其他资质：" prop="qualification.otherList">
+              <el-form-item label="其他资质：" prop="qualification.otherList">
                 <el-upload
                   class="upload-demo"
                   ref="otherList"
@@ -572,7 +572,6 @@
                     </span>
                   </div>
                   <el-button :disabled='virStatus' size="small" type="primary">点击上传</el-button>
-                  <!-- <div slot="tip" class="el-upload__tip">只能上传图片和PDF文件</div> -->
                 </el-upload>
               </el-form-item>
             </el-col>
@@ -1059,6 +1058,14 @@
                         class="priceBox"
                         disabled
                       />
+                      <el-select @change="proportionChange(scope.row,iii,$event)" v-else-if="formThead[iii].title === '占比'" v-model="scope.row[iii]" placeholder="请选择">
+                        <el-option
+                          v-for="item in proportionList"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
                       <el-input
                         v-else
                         v-model="scope.row[iii]"
@@ -1221,6 +1228,14 @@
                         @input="handleCost(scope.row,iii,$event)"
                         class="priceBox"
                       />
+                      <el-select @change="proportionChange(scope.row,iii,$event)" v-else-if="formThead[iii].title === '占比'" v-model="scope.row[iii]" placeholder="请选择">
+                        <el-option
+                          v-for="item in proportionList"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
                       <el-input-number
                         v-else
                         v-model="scope.row[iii]"
@@ -1234,22 +1249,6 @@
                     </div>
                   </template>
                 </el-table-column>
-                <!-- <template v-if="formValidate.type == 2">
-                  <el-table-column
-                    align="center"
-                    label="卡密设置"
-                    min-width="120"
-                  >
-                    <template slot-scope="scope">
-                      <el-button
-                        v-if="scope.row.cdkey && !scope.row.cdkey.list && !scope.row.stock"
-                        size="small"
-                        @click="addVirtual(0, 'OneattrValue')"
-                      >添加卡密</el-button>
-                      <span v-else class="seeCatMy" @click="seeVirtual(OneattrValue[0], 'OneattrValue', 0)">已设置</span>
-                    </template>
-                  </el-table-column>
-                </template> -->
                 <template v-if="formValidate.extension_type === 1">
                   <el-table-column
                     align="center"
@@ -1345,13 +1344,6 @@
                         class="priceBox"
                         controls-position="right"
                       />
-                      <!-- <el-input
-                        v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接'"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                      /> -->
                       <el-input
                         v-if="isSpecification(iii)"
                         v-model="scope.row[iii]"
@@ -1388,13 +1380,6 @@
                       />
                     </div>
                     <div v-else>
-                      <!-- <el-input
-                        v-if="formThead[iii].title === '商品编号' || formThead[iii].title === '依据链接'"
-                        v-model="scope.row[iii]"
-                        type="text"
-                        size="small"
-                        class="priceBox"
-                      /> -->
                       <el-input
                         v-if="isSpecification(iii)"
                         v-model="scope.row[iii]"
@@ -1413,6 +1398,14 @@
                         class="priceBox"
                         disabled
                       />
+                      <el-select @change="proportionChange(scope.row,iii,$event)" v-else-if="formThead[iii].title === '占比'" v-model="scope.row[iii]" placeholder="请选择">
+                        <el-option
+                          v-for="item in proportionList"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value">
+                        </el-option>
+                      </el-select>
                       <el-input-number
                         v-else
                         v-model="scope.row[iii]"
@@ -2116,6 +2109,7 @@ const defaultObj = {
       svip_price: null,
       select: false,
       proportion:0.6,
+      coupon:'',
       growth:0,
       stock: null,
       cdkey: {},
@@ -2174,6 +2168,9 @@ const objTitle = {
   proportion: {
     title: '占比'
   },
+  coupon:{
+    title:'抵扣卷'
+  },
   stock: {
     title: '库存'
   },
@@ -2233,6 +2230,74 @@ export default {
         children: 'children',
         emitPath: false
       },
+      proportionList:[
+        {
+          value: '0.60',
+          label: '0.60',
+          coupon:0.3,
+          growth:0.5
+        }, 
+        {
+          value: '0.55',
+          label: '0.55',
+          coupon:0.35,
+          growth:0.55
+        }, 
+        {
+          value: '0.50',
+          label: '0.50',
+          coupon:0.4,
+          growth:0.6
+        },
+        {
+          value: '0.45',
+          label: '0.45',
+          coupon:0.45,
+          growth:0.65
+        }, 
+        {
+          value: '0.40',
+          label: '0.40',
+          coupon:0.5,
+          growth:0.7
+        },
+        {
+          value: '0.35',
+          label: '0.35',
+          coupon:0.55,
+          growth:0.75
+        },
+        {
+          value: '0.30',
+          label: '0.30',
+          coupon:0.6,
+          growth:0.8
+        },
+        {
+          value: '0.25',
+          label: '0.25',
+          coupon:0.65,
+          growth:0.85
+        },
+        {
+          value: '0.20',
+          label: '0.20',
+          coupon:0.7,
+          growth:0.9
+        },
+        // {
+        //   value: '0.15',
+        //   label: '0.15',
+        //   coupon:0.75,
+        //   growth:0.95
+        // },
+        // {
+        //   value: '0.1',
+        //   label: '0.10',
+        //   coupon:0.8,
+        //   growth:1
+        // },
+      ],
       businessList: [],
       fileList: [],
       roterPre: roterPre,
@@ -2481,6 +2546,7 @@ export default {
         cost: null,
         ot_price: null,
         proportion:0.6,
+        coupon:'',
         stock: null,
         // growth:0,
         bar_code: '',
@@ -2518,6 +2584,7 @@ export default {
           ot_price: '',
           svip_price: '',
           proportion:'0.6',
+          coupon:'',
           gist_url:'',
           growth:0,
           stock: '',
@@ -2633,7 +2700,7 @@ export default {
       return this.virStatus&&arr.includes(this.formThead[iii].title)
     },
     isForbidden(iii){
-      let arr = ['成本价','占比','成长值']
+      let arr = ['成本价','抵扣卷','成长值']
       let forbidden = ['库存','重量（KG）','体积(m³)']
       return arr.includes(this.formThead[iii].title) || (this.virStatus&&forbidden.includes(this.formThead[iii].title))
     },
@@ -2647,6 +2714,13 @@ export default {
     resetForm(){
       this.dialogVisible = false
     },
+    // 占比值变化处理
+    proportionChange(val,i,e){
+      val.cost = (val.price * e).toFixed(2)
+      let obj = this.proportionList.find(item=>item.value==e)
+      val.coupon = Math.floor(val.price*obj.coupon)
+      val.growth = Math.floor(val.price*obj.growth)
+    },
     // 规格值变化
     handleCost(val,i,e,type){
       if(type == 'batchAdd'){
@@ -2655,8 +2729,10 @@ export default {
       if(i=='price'){
         val.price=val.price.replace(/^([0-9-]\d*\.?\d{0,2})?.*$/,'$1')
         val.cost = (e * val.proportion).toFixed(2)
-        // val.growth = parseInt(val.price*(0.9-(val.cost/val.price)))
-        val.growth = parseInt(val.price*0.5)
+
+        let obj = this.proportionList.find(item=>item.value==val.proportion)
+        val.coupon = Math.floor(val.price*obj.coupon)
+        val.growth = Math.floor(val.price*obj.growth)
       }
       if(i=='bar_code'){
         val.bar_code = val.bar_code.replace(/[\W]/g,'')
@@ -3142,6 +3218,7 @@ export default {
                       volume: 0,
                       growth:0,
                       proportion:'0.6',
+                      coupon:'',
                       extension_one: 0,
                       extension_two: 0
                     }
@@ -3181,6 +3258,7 @@ export default {
                 volume: 0,
                 growth:0,
                 proportion:'0.6',
+                coupon:'',
                 extension_one: 0,
                 extension_two: 0,
                 detail: { [v['value']]: vv }
@@ -3207,6 +3285,7 @@ export default {
             res[i]['growth'] = v.growth
             res[i]['gist_url'] = v.gist_url
             res[i]['proportion'] = v.proportion
+            res[i]['coupon'] = v.coupon
             res[i]['extension_one'] = v.extension_one
             res[i]['extension_two'] = v.extension_two
             res[i]['cdkey'] = v.cdkey && v.cdkey.length && v.cdkey[0] || null
@@ -3447,6 +3526,7 @@ export default {
           svip_price: null,
           stock: null,
           proportion:0.6,
+          coupon:'',
           growth:0,
           bar_code: '',
           weight: null,
@@ -3473,6 +3553,7 @@ export default {
           weight: null,
           volume: null,
           proportion:0.6,
+          coupon:'',
           growth:0,
           gist_url:''
         }
@@ -3523,6 +3604,7 @@ export default {
           if (this.oneFormBatch[0].volume != null && this.oneFormBatch[0].volume != '') this.$set(val, 'volume', this.oneFormBatch[0].volume)
           if (this.oneFormBatch[0].growth != null && this.oneFormBatch[0].growth != '') this.$set(val, 'growth', this.oneFormBatch[0].growth)
           if (this.oneFormBatch[0].proportion != null && this.oneFormBatch[0].proportion != '') this.$set(val, 'proportion', this.oneFormBatch[0].proportion)
+          if (this.oneFormBatch[0].coupon != null && this.oneFormBatch[0].coupon != '') this.$set(val, 'coupon', this.oneFormBatch[0].coupon)
           if (this.oneFormBatch[0].gist_url != null && this.oneFormBatch[0].gist_url != '') this.$set(val, 'gist_url', this.oneFormBatch[0].gist_url)
           if (this.oneFormBatch[0].extension_one != null && this.oneFormBatch[0].extension_one != '') this.$set(val, 'extension_one', this.oneFormBatch[0].extension_one)
           if (this.oneFormBatch[0].extension_two != null && this.oneFormBatch[0].extension_two != '') this.$set(val, 'extension_two', this.oneFormBatch[0].extension_two)
@@ -3733,6 +3815,7 @@ export default {
           svip_price: null,
           stock: null,
           proportion:0.6,
+          coupon:'',
           growth:0,
           // cdkey: {},
           bar_code: "",
diff --git a/src/views/product/productList/proDetails.vue b/src/views/product/productList/proDetails.vue
index 67f6287..5ec79d8 100644
--- a/src/views/product/productList/proDetails.vue
+++ b/src/views/product/productList/proDetails.vue
@@ -520,7 +520,7 @@
           </div>
         </span>
         <span class="upload">
-          <div class="upload_left">助农文件及其他资质：</div>
+          <div class="upload_left">其他资质：</div>
           <div class="upload_right">
             <div
               v-for="(item,index) in qualification.otherList"
diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue
index f168588..4e38d9c 100644
--- a/src/views/systemForm/setSystem/modifyStoreInfo.vue
+++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue
@@ -192,6 +192,10 @@
           <span class="mr10 spanBtn" @click="viewOffRecords">查看记录</span>
         </div>
       </div>
+        <div class="basic-information">
+          <span class="basic-label"> 签署电子合同：</span>
+          <span class="mr10 spanBtn" @click="handleSign">去签署</span>
+        </div>
       <!--申请退回保障金银行信息弹窗-->
       <el-dialog
         v-if="modalBank"
@@ -549,7 +553,7 @@
 
 <script>
 
-import { serviceCodeApi,goodsCodeApi,storeGetInfoApi, marginCode, marginMakeCode, marginRecordLst,offlineRecordLst, marginRefund, marginRefundApply,offlinePayApi } from '@/api/setting'
+import { serviceCodeApi,goodsCodeApi,storeGetInfoApi, marginCode, marginMakeCode, marginRecordLst,offlineRecordLst, marginRefund, marginRefundApply,offlinePayApi,contactApi } from '@/api/setting'
 import { getBaseInfo, merchantUpdate } from '@/api/user.js'
 import Maps from '@/components/map/map.vue'
 
@@ -791,6 +795,13 @@ export default {
     this.getInfo()
   },
   methods: {
+    // 去签署
+    handleSign(){
+      contactApi().then((res)=>{
+       window.open(res.message)
+        // console.log(res.message);
+      })
+    },
     handleShow(){
       console.log(this.merData.offline.includes('30'));
     },