2

src/components/coffeeManage/orderList.vue

@@ -37,18 +37,29 @@
         <span style="margin-left: 15px;font-size:14px">配送方式：</span>
         <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.DeliveryMethod" size="small"
           placeholder="请选择">
-          <el-option label="全部订单" :value="0"></el-option>
+          <el-option label="不限" :value="0"></el-option>
           <el-option v-for="item in deliveryList" :key="item.Id" :label="item.Name" :value="item.Id">
           </el-option>
         </el-select>
         <el-input @clear="(msg.pageIndex = 1), getList()" @keyup.enter.native="(msg.pageIndex = 1), getList()" clearable
-          style="margin-left: 15px;font-size:14px; width: 400px" class="input-with-select" placeholder="请输入内容" v-model="msgVal"
-          size="small">
-          <el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择" style="width: 110px">
+          style="margin-left: 15px;font-size:14px; width: 400px" class="input-with-select" placeholder="请输入内容"
+          v-model="msgVal" size="small">
+          <el-select class="pendSelect" @change="ChangeId" v-model="msgId" slot="prepend" placeholder="请选择"
+            style="width: 110px">
             <el-option v-for="item in typeOption" :key="item.Id" :label="item.name" :value="item.Id">
             </el-option>
           </el-select>
         </el-input>
+        <span style="margin-left: 15px;font-size:14px">类型：</span>
+        <el-select class="w120" @change="(msg.pageIndex = 1), getList()" v-model="msg.GoodsEduType" size="small"
+          placeholder="请选择">
+          <el-option label="不限" :value="0"></el-option>
+          <el-option label="咖啡劵" :value="1"></el-option>
+          <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>
       </div>
       <div style="
           display: flex;
@@ -69,14 +80,14 @@
             clearable style="margin-top: 10px; width: 200px" class="input-with-select" placeholder="请输入主播名称"
             v-model="msg.AnchorName" size="small">
           </el-input> -->
-          <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;
             flex-direction: row;
             align-items: center;
             font-size: 12px;
+            margin-top:10px;
           " v-if="TenantId == 1||TenantId == 15">
           <div class="fkbox">
             <div class="fkbox_item" style="background: #00ffff"></div>
@@ -180,6 +191,8 @@
                   <el-tag v-if="item.FinishTime != ''" style="margin-left: 5px" size="small" type="success">已完成</el-tag>
                   <el-tag v-if="item.OrderStatus == 7" style="margin-left: 5px" size="small" type="danger">已取消</el-tag>
                 </div>
+                <el-button type="primary" plain style="margin-left:50px;padding:8px 10px " size="mini"
+                  @click="yunfeizhidan(item.OrderId)">运费一键制单</el-button>
                 <el-tooltip class="item" effect="dark" content="强制取消" placement="top-start">
                   <img v-if="item.OrderStatus == 1 || item.OrderStatus == 2" @click="OrderExit2(item)"
                     style="right: 60px" class="app-order-btnimg" src="../../assets/img/userman/force.png" alt="" />
@@ -287,7 +300,8 @@
                           </span>
                         </div>
                         <!--                      <div flex="cross:center main:center" style="width: 45px;">数量：x {{list.Number}}</div>-->
-                        <div flex="cross:center main:center" style="display: flex; flex-direction: column;font-size:14px;">
+                        <div flex="cross:center main:center"
+                          style="display: flex; flex-direction: column;font-size:14px;">
                           <div>数量：x {{ list.Number }}</div>
                           <el-tag v-if="
                               list.IsApplyForAfterSale &&
@@ -913,11 +927,11 @@
           AnchorName: "",
           IsSelectPayMoney: 0,
           IsOffline: -1,
+          GoodsEduType:0,
         },
         IsSelectPayMoney: 0,
         platList: [],
-        typeOption: [
-          {
+        typeOption: [{
             Id: 0,
             name: "订单Id",
           },
@@ -1002,10 +1016,10 @@
         that.getDelivery();
         that.getOrderType();
       }
-      if(this.$route.query.orderId){
-        this.msgId=0
-        this.msg.OrderId=this.$route.query.orderId
-        this.msgVal=this.$route.query.orderId
+      if (this.$route.query.orderId) {
+        this.msgId = 0
+        this.msg.OrderId = this.$route.query.orderId
+        this.msgVal = this.$route.query.orderId
       }
       window.addEventListener("message", function (messageEvent) {
         let data = messageEvent.data || '';
@@ -1100,7 +1114,7 @@
           this.msg.Consignee = "";
           this.msg.Mobile = "";
           this.msg.ProductCode = "";
-        }else if (val == 1) {
+        } else if (val == 1) {
           this.msg.OrderNo = msgVal;
           this.msg.MerchantsNo = "";
           this.msg.UserName = "";
@@ -1109,7 +1123,7 @@
           this.msg.Consignee = "";
           this.msg.Mobile = "";
           this.msg.ProductCode = "";
-          this.msg.OrderId =0
+          this.msg.OrderId = 0
         } else if (val == 2) {
           this.msg.OrderNo = "";
           this.msg.MerchantsNo = msgVal;
@@ -1119,7 +1133,7 @@
           this.msg.Consignee = "";
           this.msg.Mobile = "";
           this.msg.ProductCode = "";
-          this.msg.OrderId =0
+          this.msg.OrderId = 0
         } else if (val == 3) {
           this.msg.OrderNo = "";
           this.msg.MerchantsNo = "";
@@ -1129,7 +1143,7 @@
           this.msg.Consignee = "";
           this.msg.Mobile = "";
           this.msg.ProductCode = "";
-          this.msg.OrderId =0
+          this.msg.OrderId = 0
         } else if (val == 4) {
           this.msg.OrderNo = "";
           this.msg.MerchantsNo = "";
@@ -1139,7 +1153,7 @@
           this.msg.Consignee = "";
           this.msg.Mobile = "";
           this.msg.ProductCode = "";
-          this.msg.OrderId =0
+          this.msg.OrderId = 0
         } else if (val == 5) {
           this.msg.OrderNo = "";
           this.msg.MerchantsNo = "";
@@ -1149,7 +1163,7 @@
           this.msg.Consignee = "";
           this.msg.Mobile = "";
           this.msg.ProductCode = "";
-          this.msg.OrderId =0
+          this.msg.OrderId = 0
         } else if (val == 6) {
           this.msg.OrderNo = "";
           this.msg.MerchantsNo = "";
@@ -1159,7 +1173,7 @@
           this.msg.Consignee = msgVal;
           this.msg.Mobile = "";
           this.msg.ProductCode = "";
-          this.msg.OrderId =0
+          this.msg.OrderId = 0
         } else if (val == 7) {
           this.msg.OrderNo = "";
           this.msg.MerchantsNo = "";
@@ -1169,7 +1183,7 @@
           this.msg.Consignee = "";
           this.msg.Mobile = msgVal;
           this.msg.ProductCode = "";
-          this.msg.OrderId =0
+          this.msg.OrderId = 0
         } else if (val == 8) {
           this.msg.OrderNo = "";
           this.msg.MerchantsNo = "";
@@ -1179,7 +1193,7 @@
           this.msg.Consignee = "";
           this.msg.Mobile = "";
           this.msg.ProductCode = msgVal;
-          this.msg.OrderId =0
+          this.msg.OrderId = 0
         }
       },
       hszOk() {
@@ -1871,9 +1885,29 @@
           "&Conditon=1&tab=%E5%8D%95%E6%8D%AE%E8%AF%A6%E6%83%85"
         );
       },
+      yunfeizhidan(id) {
+        let that = this
+        this.$confirm('确认一键生成订单运费成本单据？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          that.i_post("/api/Supplier/GetSupplierAllList", {
+            OrderId: id
+          }, (res) => {
+            if (res.data.resultCode == 1) {
+              console.log(1884, res)
+              that.$message({
+                type: 'success',
+                message: '操作成功'
+              });
+              that.getList()
+            }
+          });
+        })
+      }
     },
   };
-
 </script>
 
 <style scoped>
@@ -1934,7 +1968,7 @@
   .app-order-list .card-footer {
     background: #f3f5f6;
     padding: 10px 20px;
-     font-size: 14px;
+    font-size: 14px;
   }
 
   .app-order-list .app-order-info>div {
@@ -2158,7 +2192,8 @@
     margin-right: 4px;
   }
 
-/* /deep/.el-input__inner {
+  /* /deep/.el-input__inner {
   width: 100px;
 } */
+
 </style>