帮机构下单

src/main/resources/static/css/supplier-center/order/order-create.css

@@ -25,7 +25,8 @@
     .order-product-total .order-product-note{float: left;width: 70%;height: 100%;line-height: 42px;font-size: 16px;color: #22272E;}
     .order-product-total .order-product-note .el-input{width: 480px !important; }
     .order-product-total .order-product-price{float: right;width: 30%;height: 100%;line-height: 42px;}
-    .order-product-total .order-totalPrice{float: left;font-size: 16px;color: #22272E;margin-right: 20px;}
+    .order-product-total .order-totalPrice{float: right;font-size: 16px;color: #22272E;margin-right: 20px;}
+    .order-product-total .freight{float: left;}
     .order-product-total .order-totalPrice .red{color: #F94B4B;}
     .freight-radio{ width: 100%;height: 28px;line-height: 28px;float: left;margin-bottom: 10px;}
     .order-product-bsn { width: 100%;height: auto;padding:0 16px 16px 16px;box-sizing: border-box;background: #FFFFFF;margin-top: 16px;}

src/main/resources/static/js/supplier-center/order/detail.js

@@ -223,11 +223,23 @@ const seeDetail = new Vue({
         },
         // 复制分享链接
         handleCopy(){
-            navigator.clipboard.writeText(this.dialogShareLink).then(() => {
-                this.$message.success('复制成功');
-            }).catch(err => {
-                this.$message.error('复制失败');
-            });
+            const hiddenInput = document.createElement('textarea');
+            hiddenInput.style.position = 'fixed';
+            hiddenInput.style.left = '0';
+            hiddenInput.style.top = '0';
+            hiddenInput.style.opacity = '0';
+            hiddenInput.value = this.dialogShareLink;
+            // 将隐藏的 `<textarea>` 元素添加到文档中
+            document.body.appendChild(hiddenInput);
+            // 选中隐藏的 `<textarea>` 中的文本
+            hiddenInput.focus();
+            hiddenInput.select();
+            // 执行复制操作
+            document.execCommand('copy');
+            // 删除隐藏的 `<textarea>` 元素
+            document.body.removeChild(hiddenInput);
+            // 提示用户文本已复制到剪贴板
+            this.$message.success('复制链接成功');
         },
         SubtrAount(arg1, arg2) {
             var r1, r2, m, n

src/main/resources/static/js/supplier-center/order/orderlist.js

@@ -233,11 +233,23 @@ var orderList = new Vue({
         },
         // 复制分享链接
         handleCopy(){
-            navigator.clipboard.writeText(this.dialogShareLink).then(() => {
-                this.$message.success('复制成功');
-            }).catch(err => {
-                this.$message.error('复制失败');
-            });
+            const hiddenInput = document.createElement('textarea');
+            hiddenInput.style.position = 'fixed';
+            hiddenInput.style.left = '0';
+            hiddenInput.style.top = '0';
+            hiddenInput.style.opacity = '0';
+            hiddenInput.value = this.dialogShareLink;
+            // 将隐藏的 `<textarea>` 元素添加到文档中
+            document.body.appendChild(hiddenInput);
+            // 选中隐藏的 `<textarea>` 中的文本
+            hiddenInput.focus();
+            hiddenInput.select();
+            // 执行复制操作
+            document.execCommand('copy');
+            // 删除隐藏的 `<textarea>` 元素
+            document.body.removeChild(hiddenInput);
+            // 提示用户文本已复制到剪贴板
+            this.$message.success('复制链接成功');
         },
         //订单详情
         handleDetail (shopOrderId) {

src/main/resources/templates/supplier-center/order/detail.html

@@ -84,7 +84,9 @@
                             <p>商品金额：<span class="red">￥{{ order.productAmount | amountfilters }}</span> </p>
                             <p>结算商品金额：<span class="red">￥{{ order.shopProductAmount | amountfilters }}</span> </p>
 <!--                            <p>结算税费：<span class="red">￥{{ order.shopTaxFee | amountfilters }}</span> </p>-->
-                            <p>订单来源：<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span></p>
+                            <p  v-if="order.status !== 0">
+                                订单来源：<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span>
+                            </p>
                           </div>
                           <div class="order-item">
                               <p>结算运费：<span class="red">{{ order.postageInfo }}</span> </p>

src/main/resources/templates/supplier-center/order/list.html

@@ -95,6 +95,14 @@
                             <el-option label="【丽格集采联盟平台】" value="4"></el-option>
                         </el-select>
                     </div>
+                    <div class="form-row">
+                        <span v-if="isPC">订单类型：</span>
+                        <el-select v-model="listQuery.orderType" class="state" clearable @change="getList">
+                            <el-option label="所有" value="" ></el-option>
+                            <el-option label="机构自主订单" value="0"></el-option>
+                            <el-option label="供应商采购员订单" value="1"></el-option>
+                        </el-select>
+                    </div>
                     <div id="newBtn">
                         <el-button type="primary" @click="getList">查询</el-button>
                     </div>
@@ -129,8 +137,10 @@
                             <div class="order-item">
                                 <p>商品金额：<span class="red">￥{{order.productAmount| amountfilters}}</span> </p>
                                 <p>结算商品金额：<span class="red">￥{{order.shopProductAmount | amountfilters}}</span> </p>
-<!--                                <p>结算税费：<span class="red">￥{{order.shopTaxFee| amountfilters}}</span> </p>-->
-                                <p>订单来源：<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span></p>
+<!--                             <p>结算税费：<span class="red">￥{{order.shopTaxFee| amountfilters}}</span> </p>-->
+                                <p  v-if="order.status !== 0">
+                                    订单来源：<span class="red">{{ order.organizeId === 0 ? '【采美平台】' : '【丽格集采联盟平台】' }}</span>
+                                </p>
                             </div>
                             <div class="order-item">
                                 <p>结算运费：<span class="red">{{order.postageInfo }}</span> </p>

src/main/resources/templates/supplier-center/order/order-create.html

@@ -168,10 +168,6 @@
                 留言：<el-input v-model="supplier.note" placeholder="告诉卖家您的特殊要求"  maxlength="50"></el-input>
               </div>
               <div class="order-product-price">
-                <div class="order-totalPrice">
-                  <span>合计：</span>
-                  <span class="red">¥{{ supplier.totalPrice  | amountfilters }}</span>
-                </div>
                 <div class="freight">
                   <template v-if="supplier.postageFlag === 0">
                     运费：<span>包邮</span>
@@ -243,6 +239,10 @@
                     <span>到付</span>
                   </template>
                 </div>
+                <div class="order-totalPrice">
+                  <span>合计：</span>
+                  <span class="red">¥{{ supplier.totalPrice  | amountfilters }}</span>
+                </div>
               </div>
             </div>
           </template>
@@ -345,7 +345,7 @@
         <el-table-column prop="name" label="商品名称" align="center"></el-table-column>
         <el-table-column prop="unit" label="规格" align="center">
           <template slot-scope="{ row }">
-            <el-select v-model="row.skuId" clearable @change="handleChangeSku(row)">
+            <el-select v-model="row.skuId" @change="handleChangeSku(row)">
               <el-option v-for="(sku, index) in row.skus" :key="index" :label="sku.unit" :value="sku.skuId"></el-option>
             </el-select>
           </template>