2

src/components/coffeeManage/edit.vue

@@ -2511,7 +2511,7 @@
           this.addMsg.MaterialId = val.Id
           this.addMsg.CarouselImageList = val.ImageList
           this.addMsg.SellingPrice = val.SellPrice
-          this.addMsg.OriginalPrice = val.Money
+          this.addMsg.OriginalPrice = val.SellPrice
           this.addMsg.CostPrice = val.Money
           this.addMsg.Unit = val.Units||'件'
           this.addMsg.InventoryNum = val.InventoryNum

src/components/coffeeManage/orderList.vue

@@ -58,8 +58,8 @@
           <el-option label="资产类" :value="2"></el-option>
           <el-option label="教室类" :value="3"></el-option>
         </el-select>
-        <el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0"
-            style="margin-left: 15px;font-size:14px" @change="(msg.pageIndex = 1), getList()">只看已付款</el-checkbox>
+        <el-checkbox v-model="IsSelectPayMoney" true-label="1" false-label="0" style="margin-left: 15px;font-size:14px"
+          @change="(msg.pageIndex = 1), getList()">只看已付款</el-checkbox>
       </div>
       <div style="
           display: flex;
@@ -80,7 +80,6 @@
             clearable style="margin-top: 10px; width: 200px" class="input-with-select" placeholder="请输入主播名称"
             v-model="msg.AnchorName" size="small">
           </el-input> -->
-          
         </div>
         <div style="
             display: flex;
@@ -526,11 +525,11 @@
                       <img @click="getOrderSend(item)" v-if="item.OrderStatus == 3" class="app-order-icon"
                         src="../../assets/img/userman/change.png" alt="" />
                     </el-tooltip>
-                    <el-tooltip class="item" effect="dark" content="线下付款"
+                    <!-- <el-tooltip class="item" effect="dark" content="线下付款"
                       v-if="item.OrderStatus == 1 || item.OrderStatus == 7" placement="top">
                       <img @click="Offpayment(item)" v-if="item.OrderStatus == 1 || item.OrderStatus == 7"
                         class="app-order-icon" src="../../assets/img/userman/OfflinePayment.png" alt="" />
-                    </el-tooltip>
+                    </el-tooltip> -->
                   </template>
 
                   <el-tooltip class="item" effect="dark" content="查看订单详情" placement="top">
@@ -927,7 +926,7 @@
           AnchorName: "",
           IsSelectPayMoney: 0,
           IsOffline: -1,
-          GoodsEduType:0,
+          GoodsEduType: 0,
         },
         IsSelectPayMoney: 0,
         platList: [],
@@ -1893,34 +1892,42 @@
           cancelButtonText: '取消',
           type: 'warning'
         }).then(() => {
+          const loading = that.$loading({
+            lock: true,
+            text: '单据生成中...',
+            spinner: 'el-icon-loading',
+          });
           that.i_post("/api/order/SetEduGoodsFreightCostFinance", {
             OrderId: id
           }, (res) => {
+            loading.close()
             if (res.data.resultCode == 1) {
-              console.log(1884, res)
               that.$message({
                 type: 'success',
                 message: '操作成功'
               });
               that.getList()
             }
+          },()=>{
+            loading.close()
           });
         })
       },
       // 是否显示运费制单按钮
-      isShowzhidan(item){
-        const flag= item.DetailList.some(e=>{
-            return e.FreightFinanceId==0&&e.FreightCostMoney>0
+      isShowzhidan(item) {
+        const flag = item.DetailList.some(e => {
+          return e.FreightFinanceId == 0 && e.FreightCostMoney > 0
         })
-        if(item.FreightMoney>0&&flag){
+        if (item.FreightMoney > 0 && flag) {
           return true
-        }else{
-          return false 
+        } else {
+          return false
         }
-        
+
       }
     },
   };
+
 </script>
 
 <style scoped>