1

src/components/UserMan/distributionOrder.vue

@@ -65,7 +65,7 @@
                             <div flex="cross:center" class="app-order-head">
                                 <div class="app-order-time">{{item.CreateDate}}</div>
                                 <div class="app-order-user">
-                                    <span class="app-order-time">订单号：</span>{{item.OrderNo}}
+                                    <span class="app-order-time">订单号：</span>{{item.OrderNo}}({{item.OrderId}})
                                 </div>
                                 <div flex="cross:center" class="app-order-user">
                                     <img v-if="item.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">

src/components/orderMan/orderList.vue

@@ -72,7 +72,7 @@
               <div flex="cross:center" class="app-order-head">
                 <div class="app-order-time">{{item.CreateDate}}</div>
                 <div class="app-order-user">
-                  <span class="app-order-time">订单号：</span>{{item.OrderNo}}
+                  <span class="app-order-time">订单号：</span>{{item.OrderNo}}({{item.OrderId}})
                 </div>
                 <div flex="cross:center" class="app-order-user">
                   <img v-if="item.OrderSource==1" src="../../assets/img/userman/wx.png" alt="">
@@ -146,12 +146,20 @@
                         <span>货号：{{list.ProductCode}}</span>
                       </div>
                     </div>
-                    <div flex="dir:left box:mean" style="width: 250px;">
-                      <div flex="cross:center main:center">
-                        <span>小计：￥{{list.Final_Price}}
+                    <div flex="dir:left box:mean" style="width: 300px;">
+                      <div flex="cross:center main:center" style="display: flex;flex-direction: column;align-items: center;">
+                        <span style="">小计：￥{{list.Final_Price}}
                           <img v-if="item.PaymentTime==''" @click="EditPrice(item,1,list)"
                             src="../../assets/img/userman/edit1.png" alt="">
                         </span>
+                        <span style="">商品成本：￥{{ list.CostMoney}}
+                          <img v-if="item.OrderStatus==1||item.OrderStatus==2" @click="costBtn(list,1)"
+                               src="../../assets/img/userman/edit1.png" alt="">
+                        </span>
+                        <span style="">运费成本：￥{{list.FreightCostMoney>0?list.FreightCostMoney: list.FreightMoney}}
+                          <img v-if="item.OrderStatus==1||item.OrderStatus==2" @click="costBtn(list,2)"
+                               src="../../assets/img/userman/edit1.png" alt="">
+                        </span>
                       </div>
                       <div flex="cross:center main:center">数量：x {{list.Number}}</div>
                     </div>
@@ -446,6 +454,19 @@
         <el-button size="small" type="primary" @click="priceForm('priceMsg')">确 定</el-button>
       </span>
     </el-dialog>
+
+    <!-- 商品、运费成本的修改 -->
+    <el-dialog :title="cosType==1?'商品成本修改':'运费成本修改'" :visible.sync="costDig" width="600px">
+      <el-form :model="costMsg" ref="costMsg" label-width="80px">
+        <el-form-item :label="cosType==1?'商品成本':'运费成本'">
+          <el-input size="small" v-model="costMsg.Money" step="1"  min="0" onkeyup="this.value= this.value.match(/\d+(\.\d{0,3})?/) ? this.value.match(/\d+(\.\d{0,3})?/)[0] : ''"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="costDig = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="costForm('costMsg')">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -461,6 +482,12 @@
           FreightMoney: '',
         },
         priceDig: false,
+        costDig:false,//商品、运费成本的修改
+        cosType:1,
+        costMsg:{
+          Id:0,
+          Money:0,
+        },
         hstips: '是否放入回收站(可在回收站中恢复)?',
         orderStatusList: [],
         checkAll: false,
@@ -502,6 +529,7 @@
             trigger: 'blur'
           }],
         },
+
         fhrules: {
           ExpressId: [{
             required: true,
@@ -1273,6 +1301,53 @@
           }
         })
       },
+      costBtn(list,type){
+        this.cosType=type;
+        if(type==1){
+          this.costMsg.Id = list.Id;
+          this.costMsg.Money = list.CostMoney;
+        }else if(type==2){
+          this.costMsg.Id = list.Id;
+          this.costMsg.Money = list.FreightCostMoney>0 ? list.FreightCostMoney:list.FreightMoney;
+        }
+        this.costDig = true;
+      },
+
+      costForm(formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            let cmd = '';
+            let msg = {}
+            if (this.cosType == 1) {
+              cmd = '/api/order/SetOrderCostMoney';
+              msg = {
+                Id:this.costMsg.Id,
+                CostMoney:Number(this.costMsg.Money),
+              }
+            } else if(this.cosType == 2){
+              cmd = '/api/order/SetOrderFreightCostMoney';
+              msg = {
+                Id:this.costMsg.Id,
+                FreightCostMoney:Number(this.costMsg.Money) ,
+              }
+            }
+            this.apipost(cmd, msg,
+              res => {
+                if (res.data.resultCode === 1) {
+                  this.getList();
+                  this.Success(res.data.message)
+                  this.costDig = false;
+                } else {
+                  this.Error(res.data.message);
+                }
+              },
+              null
+            );
+          } else {
+            return false;
+          }
+        });
+      },
     },
   };