Browse Source

Merge branch 'sit' of http://120.46.155.214:3000/xiaodai2022/order-ui-pc into sit

xiaodai2022 2 years ago
parent
commit
110afadc33

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/0.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-libs.js


+ 1 - 0
src/config/env.development.js

@@ -15,6 +15,7 @@ module.exports = {
   },
   webUrl:'http://share.sitw.wanyuhengtong.com/#/test-good-share?id=',
   fileURL: `https://api2.edusit.zretchome.com`,
+  shareWebUrl:'http://ss.test241.wanyuhengtong.com/?prod=0&outCode=',
   appId: 'wx5ac3a2c2d72b6f26',
   ding: {
     //企业id

+ 1 - 0
src/config/env.production.js

@@ -12,6 +12,7 @@ module.exports = {
   },
   webUrl:'http://share.sitw.wanyuhengtong.com/#/good-share?id=',
   fileURL: `https://api2.edu.futurelab.tv`,
+  shareWebUrl:'http://ss.test241.wanyuhengtong.com/?prod=1&outCode=',
   appId: 'wx5ac3a2c2d72b6f26',
   ding: {
     //企业id

+ 1 - 1
src/views/sellOut/sellOutOrder/columns.js

@@ -120,7 +120,7 @@ const columns = [
     fixed: "right",
     _noset_: true,
     _slot_: "operation",
-    width: 50,
+    width: 80,
   },
 ]
 

+ 67 - 13
src/views/sellOut/sellOutOrder/detail.vue

@@ -5,7 +5,8 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <div class="detail-page-title">
-        <span>发货申请单编号:</span><span v-if="sitem">{{ sitem.outCode }}</span>
+        <span>发货申请单编号:</span
+        ><span v-if="sitem">{{ sitem.outCode }}</span>
         <el-button
           class="fr"
           v-if="
@@ -31,6 +32,16 @@
           @click="wentReceive"
           >确认收货
         </el-button>
+        <el-button
+          class="fr"
+          v-if="Number(status) >= 2"
+          type="primary"
+          plain
+          :size="'mini'"
+          style="margin: 0 0 0 10px"
+          @click="handleShare"
+          >分享
+        </el-button>
       </div>
       <!-- 
       <status-bar
@@ -54,8 +65,11 @@
                     :size="'mini'"
                     :type="sitem.status == '0' ? 'warning' : ''"
                     v-text="
-                      (statusOptions.find((item) => item.value == sitem.status) || {})
-                        .label || '--'
+                      (
+                        statusOptions.find(
+                          (item) => item.value == sitem.status
+                        ) || {}
+                      ).label || '--'
                     "
                   ></el-tag>
                 </template>
@@ -117,7 +131,11 @@
               title="售后申请单结果"
               name="4"
               v-if="
-                returnCode && returnCode_type && sitem && sitem.order_return && resitem
+                returnCode &&
+                returnCode_type &&
+                sitem &&
+                sitem.order_return &&
+                resitem
               "
             >
               <show-data-table
@@ -157,7 +175,10 @@
                     style="padding: 3px 0 0 0"
                     placement="top"
                   >
-                    <i class="el-icon-video-play tb-icon" @click="agree_return"></i>
+                    <i
+                      class="el-icon-video-play tb-icon"
+                      @click="agree_return"
+                    ></i>
                   </el-tooltip>
 
                   <el-tooltip
@@ -174,7 +195,10 @@
                     "
                     placement="top"
                   >
-                    <i class="el-icon-circle-close tb-icon" @click="close_return"></i>
+                    <i
+                      class="el-icon-circle-close tb-icon"
+                      @click="close_return"
+                    ></i>
                   </el-tooltip>
                   <el-tooltip
                     class="fr"
@@ -195,15 +219,21 @@
                     "
                     placement="top"
                   >
-                    <i class="el-icon-shopping-cart-2 tb-icon" @click="reissue"></i>
+                    <i
+                      class="el-icon-shopping-cart-2 tb-icon"
+                      @click="reissue"
+                    ></i>
                   </el-tooltip>
                 </template>
                 <template slot="order_type">
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (orderOptions.find((item) => item.id == resitem.order_type) || {})
-                        .label || '--'
+                      (
+                        orderOptions.find(
+                          (item) => item.id == resitem.order_type
+                        ) || {}
+                      ).label || '--'
                     "
                   ></el-tag>
                 </template>
@@ -255,14 +285,18 @@
                   <el-tag
                     :size="'mini'"
                     v-text="
-                      (is_th_options.find((item) => item.value == resitem.is_th) || {})
-                        .label || '--'
+                      (
+                        is_th_options.find(
+                          (item) => item.value == resitem.is_th
+                        ) || {}
+                      ).label || '--'
                     "
                   ></el-tag>
                 </template>
                 <template slot="addr">
                   <span
-                    >{{ resitem.contactor }}---{{ resitem.mobile }}---{{ resitem.addr_cn
+                    >{{ resitem.contactor }}---{{ resitem.mobile }}---{{
+                      resitem.addr_cn
                     }}{{ resitem.addr }}</span
                   >
                 </template>
@@ -333,6 +367,8 @@ import returnExpress from "./components/returnExpress";
 import wantDeliver from "./components/want-deliver.vue";
 import { xs_order_type_options } from "@/assets/js/statusList";
 import { mapGetters } from "vuex";
+import { shareWebUrl } from "@/config";
+
 export default {
   name: "sellOutOrderDetail",
   mixins: [mixinPage, resToken],
@@ -482,6 +518,22 @@ export default {
     this.initData();
   },
   methods: {
+    handleShare() {
+      const url = shareWebUrl + this.sitem.outCode;
+      
+      const input = document.createElement('input');
+
+      document.body.appendChild(input)
+      input.value = url
+
+      input.select()
+
+      document.execCommand('Copy')
+
+      this.$message.success('复制成功')
+
+      document.body.removeChild(input)
+    },
     async updateStatus(e) {
       await this.setstatus(e.status);
     },
@@ -608,7 +660,9 @@ export default {
         this.resitem.error_img = this.resitem.error_img.split(",");
         this.expect_options = JSON.parse(
           JSON.stringify(
-            this.resitem.is_receive === "1" ? this.expect_options1 : this.expect_options0
+            this.resitem.is_receive === "1"
+              ? this.expect_options1
+              : this.expect_options0
           )
         );
       } else if (res && res.code >= 100 && res.code <= 104) {

+ 28 - 0
src/views/sellOut/sellOutOrder/index.vue

@@ -192,6 +192,17 @@
               @click="getRouter('sellOutOrderDetail', scope.row.outCode)"
             ></i>
           </el-tooltip>
+          <el-tooltip
+            v-if="Number(scope.row.status) >= 2"
+            effect="dark"
+            content="分享"
+            placement="top"
+          >
+            <i
+              class="el-icon-share tb-icon"
+              @click="handleShare(scope.row.outCode)"
+            ></i>
+          </el-tooltip>
         </template>
       </ex-table>
       <add-edit
@@ -216,6 +227,7 @@ import urlConfig from "@/apis/url-config";
 import asyncRequest from "@/apis/service/sellOut/sellOutOrder";
 import addEdit from "./components/addEdit.vue";
 import { columns } from "./columns";
+import { shareWebUrl } from "@/config"
 
 export default {
   name: "sellOutOrder",
@@ -329,6 +341,22 @@ export default {
   },
 
   methods: {
+    handleShare(outCode){
+      const url = shareWebUrl + outCode
+      
+      const input = document.createElement('input');
+
+      document.body.appendChild(input)
+      input.value = url
+
+      input.select()
+
+      document.execCommand('Copy')
+
+      this.$message.success('复制成功')
+
+      document.body.removeChild(input)
+    },
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {

Some files were not shown because too many files changed in this diff