更新

src/views/market/orders/index.vue

@@ -30,11 +30,14 @@
       </div>
     </el-card>
 
-<br>
+    <br>
+    <button style="float: right; padding: 3px 10px" type="text" @click="reclaim">回收站</button>
+    <br>
     <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 10px">
       <div slot="header" class="clearfix">
         <span>数据列表</span>
         <button @click="add(1)" style="float: right; padding: 3px 10px" type="text">添加</button>
+        <button style="float: right; padding: 3px 10px" type="text" @click="getOut">导出</button>
       </div>
 
       <el-table :data="arr" style="width: 100%" @selection-change="handleSelectionChange">
@@ -90,12 +93,12 @@
                 <el-button
                   size="mini"
                   type="danger"
-              @click="ordersDelete(scope.row)">删除</el-button>
+                  @click="updateByeExist(scope.row)">删除</el-button>
                 <el-button
                   type="primary"
                   size="small"
                   @click="pay(scope.row)" >支付</el-button>
-<!--              v-if="scope.row.status === '待支付'"-->
+                <!--              v-if="scope.row.status === '待支付'"-->
               </template>
             </el-table-column>
           </el-table-column>
@@ -105,7 +108,7 @@
                      @size-change="handleSizeChange"
                      @current-change="handleCurrentChange"
                      :current-page="orders.pageNum"
-                   :page-sizes="[2, 4, 6, 8]"
+                     :page-sizes="[5, 10, 50, 100]"
                      :page-size="orders.pageSize"
                      layout="total, sizes, prev, pager, next, jumper"
                      :total="orders.total">
@@ -145,13 +148,22 @@
   </span>
     </el-dialog>
 
-</div>
+  </div>
 </template>
 
 
 <script>
-import { selectList, updateOrders, addordersup, ordersDelete ,pay} from '@/api/market/orders'
+import {
+  selectList,
+  updateOrders,
+  addordersup,
+  ordersDelete,
+  pay,
+  getOut,
+  updateByeExist
+} from '@/api/market/orders'
 import { diGui } from "@/api/market/orders";
+import axios from 'axios'
 
 
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
@@ -225,13 +237,24 @@ export default {
       )
     },
     // 删除
-    ordersDelete(row){
+
-      ordersDelete(row.ordersId).then(
+    updateByeExist(row){
+      const result = window.confirm(`你确定要执行此操作吗？`);
+      if (result) {
+        updateByeExist(row.ordersId).then(
           res => {
             this.$message.success(res.msg)
             this.selectList()
           }
         )
+        location.reload();
+        // 用户点击确定后的逻辑处理，这里可以使用传入的 id
+        console.log(`用户点击了确定，ID 为 ${row.ordersId}`);
+      } else {
+        // 用户点击取消后的逻辑处理
+        console.log('用户点击了取消');
+      }
+
     },
     // 分页
     handleSizeChange(val) {
@@ -284,12 +307,34 @@ export default {
     },
 
     pay(row){
-        window.open("http://localhost:9701/alipay/pay?subject=" + row.name
+      console.log(row)
-          + "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
+      window.open("http://21.12.0.10:80/alipay/pay?productName="+row.productName +"&ordersNum="+row.ordersNum+"&ordersPrice="+row.ordersPrice)
       this.$message.success('付款成功')
-      this.load();
+    },
+
+    getOut(){
+      this.download('system/operlog/export', {
+        ...this.queryParams
+      }, `operlog_${new Date().getTime()}.xlsx`)
+
+    },
+
+    reclaim(){
+      this.$router.push({path:"/reclaim/index"})
     }
 
+    // getOut(){
+    //   axios.get('/market/orders/getOutAll').
+    //   then(response =>{
+    //     if(response.data && response.data instanceof ArrayBuffer)
+    //     {
+    //      const blob = new Blob([response.data],{type:'application/octet-stream'});
+    //      saveAs(blob ,'订单信息表');
+    //     }else{
+    //       console.error("导出失败:" ,error);
+    //     }
+    //   })
+    // }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {

src/views/market/reclaim/index.vue

@@ -9,8 +9,7 @@
       <div class="text item">
         <el-form ref="form" :model="orders" label-width="100px">
           <el-form-item>
-
+            订单编号：<el-input v-model="orders.ordersNum" placeholder="编号" style="width: 130px;margin-right: 50px"></el-input>
-            订单编号：<el-input v-model="orders.ordersNum" placeholder="编号" style="width: 180px;margin-right: 50px"></el-input>
             订单款项状态：
             <el-select v-model="orders.ordersState" placeholder="请选择状态" style="margin-right: 30px" clearable>
               <el-option v-for="item in options"
@@ -19,24 +18,21 @@
                          :value="item.value">
               </el-option>
             </el-select>
-            <br/> <br/>
             选择时间:
-            <el-date-picker v-model="orders.startDate" type="date" placeholder="开始时间" />
+            <el-date-picker v-model="orders.startDate" type="date" placeholder="开始时间" style="width: 130px;"/>
             -----
-            <el-date-picker v-model="orders.endDate" type="date" placeholder="结束时间"/>
+            <el-date-picker v-model="orders.endDate" type="date" placeholder="结束时间" style="width: 130px;"/>
-
           </el-form-item>
         </el-form>
       </div>
     </el-card>
-
+    <br>
-<br>
+    <button style="float: right; padding: 3px 10px" type="text" @click="orderslist">返回订单列表</button>
+    <br>
     <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 10px">
       <div slot="header" class="clearfix">
         <span>回收站列表</span>
-        <button @click="add(1)" style="float: right; padding: 3px 10px" type="text">添加</button>
       </div>
-
       <el-table :data="arr" style="width: 100%" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column   label="日期" width="150" align="center">
@@ -45,7 +41,7 @@
           </template>
         </el-table-column>
         <el-table-column label="购买信息">
-        <el-table-column  label="订单编号" width="120" align="center">
+          <el-table-column  label="订单编号" width="150" align="center">
             <template slot-scope="scope">
               <span style="margin-left: 10px"> {{ scope.row.ordersNum }}</span>
             </template>
@@ -57,7 +53,7 @@
           </el-table-column>
 
           <el-table-column label="购买详情">
-          <el-table-column prop="province" label="购买接口" width="150" align="center">
+            <el-table-column prop="province" label="购买接口" width="200" align="center">
               <template slot-scope="scope">
                 <span style="margin-left: 10px">{{ scope.row.productName }}</span>
               </template>
@@ -73,7 +69,7 @@
                 <span style="margin-left: 10px">{{ scope.row.ordersSpecification }}</span>
               </template>
             </el-table-column>
-        <el-table-column label="订单款项状态" width="110" align="center">
+            <el-table-column label="订单款项状态" width="130" align="center">
               <template slot-scope="scope">
                 <span style="margin-left: 10px" v-if="scope.row.ordersState==0">待支付</span>
                 <span style="margin-left: 10px" v-if="scope.row.ordersState==1">已付款</span>
@@ -86,16 +82,11 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-              @click="handleEdit(scope.row)">编辑</el-button>
+                  @click="handleEdit(scope.row)">恢复</el-button>
                 <el-button
                   size="mini"
                   type="danger"
-              @click="ordersDelete(scope.row)">删除</el-button>
+                  @click="ordersDelete(scope.row)">彻底删除</el-button>
-            <el-button
-              type="primary"
-              size="small"
-              @click="pay(scope.row)" >支付</el-button>
-<!--              v-if="scope.row.status === '待支付'"-->
               </template>
             </el-table-column>
           </el-table-column>
@@ -105,59 +96,25 @@
                      @size-change="handleSizeChange"
                      @current-change="handleCurrentChange"
                      :current-page="orders.pageNum"
-                   :page-sizes="[2, 4, 6, 8]"
+                     :page-sizes="[5, 10, 50, 100]"
                      :page-size="orders.pageSize"
                      layout="total, sizes, prev, pager, next, jumper"
                      :total="orders.total">
       </el-pagination>
     </el-card>
 
-    <el-dialog
-      :title="addtitle"
-      :visible.sync="addordersoff"
-      width="50%"
-      :before-close="handleClose">
-      <div v-if="this.index==1">
-        <h2>管理员慎重填写</h2><br>
-        <el-form :model="ordersForm" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-          <el-form-item label="订单编号：" prop="ordersNum">
-            <el-input type="text" v-model="ordersForm.ordersNum" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单产品：" prop="ordersProduct">
-            <el-input type="text" v-model="ordersForm.ordersProduct" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单所属人：" prop="ordersUser">
-            <el-input type="text" v-model="ordersForm.ordersUser" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单金额：" prop="ordersPrice">
-            <el-input type="text" v-model="ordersForm.ordersPrice" autocomplete="off"></el-input>
-          </el-form-item>
-          <el-form-item label="订单规格：" prop="ordersSpecification">
-            <el-input type="text" v-model="ordersForm.ordersSpecification" autocomplete="off"></el-input>
-          </el-form-item>
-        </el-form>
-        <center>
-          <el-button @click="addordersoff = false">取 消</el-button>
-          <el-button type="primary" @click="addorders(ordersForm)">提交</el-button>
-        </center>
   </div>
-      <span slot="footer" class="dialog-footer">
-  </span>
-    </el-dialog>
-
-</div>
 </template>
 
 
 <script>
-import { selectList, update, addordersup, ordersDelete ,pay} from '@/api/market/orders'
+import { ordersDelete, listreclaim, updateByExist} from '@/api/market/orders'
 import { diGui } from "@/api/market/orders";
 
 
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
 export default {
-  dicts:['product_name','orders_num','orders_state','orders_launchdate'],
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
@@ -172,15 +129,9 @@ export default {
       },
       arr:[],
       type:[],
-
-      Cascader:{ expandTrigger:'hover',value:'id',label:'typeName',children:'parentPOS' },
-      typeId:[],
       startDate: null,
       endDate: null,
-
       index:'',
-      addtitle:'',
-      addordersoff:false,
       ordersForm:{},
 
       options: [{
@@ -210,110 +161,83 @@ export default {
   watch: {},
   //方法集合",
   methods: {
-    // 删除
-    ordersDelete(row){
-      ordersDelete(row.ordersId).then(
-        res => {
-          this.$message.success(res.msg)
-          this.selectList()
-        }
-      )
-    },
-    // 重置
-    chong(){
-      this.orders={}
-      this.selectList()
-    },
-    // 分页
-    handleSizeChange(val) {
-      this.orders.pageSize=val
-      this.selectList()
-    },
-    handleCurrentChange(val) {
-      this.orders.pageNum=val
-      this.selectList()
-    },
-
-    handleClose(done) {
-      this.$confirm('确认关闭？')
-        .then(_ => {
-          done();
-        })
-        .catch(_ => {});
-    },
-
-
-      pay(row){
-        window.open("http://localhost:9701/alipay/pay?subject=" + row.name
-          + "&amp; traceNo=" + row.no + "&amp; totalAmount=" + row.ordersPrice)
-      this.$message.success('付款成功')
-      this.load();
-
-      }
-      ,
-    // 上架，新品，推荐修改
-    updateShop(orders){
-      update(orders).then(
-        res => {
-          this.$message.success(res.msg)
-          this.selectList()
-        }
-      )
-    },
-    // 修改跳转路径
-    handleEdit(orders){
-      if (this.orders.serviceIds && typeof this.orders.serviceIds === 'string') {
-        orders.serviceid = this.orders.serviceIds.split(',');
-        // ... 后续操作
-      }
-      console.log(JSON.stringify(orders))
-      orders.serviceid=orders.serviceIds.split(',').map(id => parseInt(id, 10));
-      console.log(JSON.stringify(orders))
-      this.$router.push({path:'/product/info/update',query:{orders:orders}})
-    },
-
-    addorders(ordersForm){
-      addordersup(ordersForm).then(response=>{
-        alert(response.msg)
-        if (response.code==200){}
-        this.addordersoff=false
-      })
-      location.reload();
-    },
-    // 查询
-    findShop(){
-      this.selectList()
-    },
-    // 添加跳转路径
-    add(index){
-        this.index=index
-        if (this.index === 1) {
-          this.addtitle= '添加订单';
-        }
-        // else if (this.index === 2) {
-        //   this.dialogtitle= '';
-        // }
-        this.addordersoff=true
-    },
-    // 多选框
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
     //商品列表
-    selectList() {
+    listreclaim() {
-      selectList(this.orders).then(
+      listreclaim(this.orders).then(
         res => {
           console.log(res)
           this.arr = res.data.list
           this.orders.total = res.data.total
         }
       )
+    },
+    //复原
+    handleEdit(row){
+      const result = window.confirm(`你确定要执行此操作吗？`);
+      if (result) {
+        updateByExist(row.ordersId).then(
+          res =>{
+            this.$message.success(res.msg)
+            this.listreclaim()
           }
+        )
+        location.reload();
+        // 用户点击确定后的逻辑处理，这里可以使用传入的 id
+        console.log(`用户点击了确定，ID 为 ${id}`);
+      } else {
+        // 用户点击取消后的逻辑处理
+        console.log('用户点击了取消');
+      }
+
+    },
+    // 删除
+    ordersDelete(row){
+      const result = window.confirm(`你确定要执行此操作吗？`);
+      if (result) {
+        ordersDelete(row.ordersId).then(
+          res => {
+            this.$message.success(res.msg)
+            this.listreclaim()
+          }
+        )
+        location.reload();
+        // 用户点击确定后的逻辑处理，这里可以使用传入的 id
+        console.log(`用户点击了确定，ID 为 ${id}`);
+      } else {
+        // 用户点击取消后的逻辑处理
+        console.log('用户点击了取消');
+      }
+    },
+    // 重置
+    chong(){
+      this.orders={}
+      this.listreclaim()
+    },
+    // 多选框
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.orders.pageSize=val
+      this.listreclaim()
+    },
+    handleCurrentChange(val) {
+      this.orders.pageNum=val
+      this.listreclaim()
+    },
+    orderslist(){
+      this.$router.push({path:"/market/orders"})
+    },
+    // 查询
+    findShop(){
+      this.listreclaim()
+    }
+
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
-    // this.diGui()
+    this.listreclaim()
-    this.selectList()
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {

src/views/market/updorders/index.vue

@@ -1,44 +1,43 @@
 <template>
   <div>
     {{orders}}
-
+    <br><br><br>
     <center>
-      <el-form :model="api" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-form :model="orders" status-icon :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
-        <el-form-item label="序号" prop="productId" style="width: 70%">
+        <el-form-item label="订单编号" prop="ordersNum" style="width: 70% " >
-          {{orders.productId}}
+          {{orders.ordersNum}}
         </el-form-item>
-        <el-form-item label="接口名称" prop="productName" style="width: 70%">
+        <el-form-item label="订单产品" prop="productName" style="width: 70%">
-          {{orders.productName}}
+          <el-select v-model="orders.productName" placeholder="请选择产品">
+            <el-option v-model="orders.productName" :value="orders.productId"></el-option>
+            <el-option v-for="item in product" :label="item.productName" :key="item.productId" :value="item.productId" ></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="接口类型" prop="productType" style="width: 70%">
+        <el-form-item label="订单所属人" prop="userName" style="width: 70%">
-          {{orders.productType}}
+          {{orders.userName}}
         </el-form-item>
-        <el-form-item label="接口描述" prop="productContent" style="width: 70%">
+        <el-form-item label="订单金额" prop="ordersPrice" style="width: 70%">
-          {{orders.productContent}}
+          <el-input type="text" v-model="orders.ordersPrice" autocomplete="off" style="width: 100px"></el-input>
         </el-form-item>
-        <el-form-item label="接口销量" prop="productSales" style="width: 70%">
+        <el-form-item label="订单规格" prop="ordersSpecification" style="width: 70%">
-          {{orders.productSales}}
+          <el-input type="text" v-model="orders.ordersSpecification" autocomplete="off" style="width: 250px"></el-input>
         </el-form-item>
-        <el-form-item label="接口价格" prop="productPrice" style="width: 70%">
+        <el-form-item label="订单款项状态" prop="ordersState" style="width: 70%">
-          {{orders.productPrice}}
+
+          <el-select v-model="orders.ordersState" placeholder="订单款项状态" >
+            <el-option label="待支付-0" value="0"></el-option>
+            <el-option label="已支付-1" value="1"></el-option>
+            <el-option label="未支付-2" value="2"></el-option>
+            <el-option label="售后(审核退款)-3" value="3"></el-option>
+            <el-option label="退款成功-4" value="4"></el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="接口来源" prop="productFrom" style="width: 70%">
+        <el-form-item label="订单日期" prop="ordersLaunchdate" style="width: 70%">
-          {{orders.productFrom}}
+          {{orders.ordersLaunchdate}}
-        </el-form-item>
-        <el-form-item label="重要路由" prop="apiRouter" style="width: 70%">
-          {{orders.apiRouter}}
-        </el-form-item>
-        <el-form-item label="接口地址" prop="apiAddress" style="width: 70%">
-          {{orders.apiAddress}}
-        </el-form-item>
-        <el-form-item label="返回格式" prop="returnFormat" style="width: 70%">
-          {{orders.returnFormat}}
-        </el-form-item>
-        <el-form-item label="请求方式" prop="requestMethod" style="width: 70%">
-          {{orders.requestMethod}}
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitForm('ruleForm')">返回</el-button>
+          <el-button type="primary" @click="update(row)">提交</el-button>
         </el-form-item>
       </el-form>
     </center>
@@ -48,15 +47,18 @@
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）,
 //例如：import 《组件名称》 from '《组件路径》,
+import { updateOrders } from '@/api/market/orders'
+
 export default {
-  name: "Apidetailmessage",
+
   //import引入的组件需要注入到对象中才能使用"
   components: {},
   props: {},
   data() {
     //这里存放数据"
     return {
-      orders:{}
+      orders:{},
+      product:[]
     };
   },
   //计算属性 类似于data概念",
@@ -66,7 +68,15 @@ export default {
   //方法集合",
   methods: {
     submitForm(){
-      this.$router.push("/apimanage/index")
+      this.$router.push("/market/orders")
+    },
+
+    update(row){
+      updateOrders(this.orders).then(
+        res =>{
+          this.$message.success(res.msg)
+        }
+      )
     }
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
@@ -74,7 +84,7 @@ export default {
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {
-    this.api = this.$route.query.api
+    this.orders = this.$route.query.orders
   },
   beforeCreate() {
   }, //生命周期 - 创建之前",