From ab23f3f6577937c12a55ab938981199fbeaa7a11 Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Fri, 15 Apr 2022 16:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.js                              |  8 ++++++
 src/components/Sidebar.vue                    | 17 +++++++++++-
 src/components/dateSelect/index.vue           |  2 +-
 src/components/orderDetails/index.vue         |  2 +-
 src/components/page/admission/index.vue       |  2 +-
 .../page/classification/DataQuery.vue         | 26 ++++++++++++-------
 src/components/page/order/closed.vue          |  4 +--
 src/components/page/order/completed.vue       |  4 +--
 src/components/page/order/index.vue           |  4 +--
 src/components/page/order/pendingPayment.vue  |  4 +--
 src/components/page/order/toBeDelivered.vue   |  4 +--
 src/components/page/order/toBeSettled.vue     |  4 +--
 src/utils/request.js                          |  3 ++-
 13 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index b43acd7..09a87ab 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -232,3 +232,11 @@ export const setPaySetting = query => {
       data: query
   });
 };
+//手动下架委托数据
+export const offGoods = query => {
+  return request({
+      url: '/admin/goods.Goods/offGoods',
+      method: 'post',
+      data: query
+  });
+};
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 01abcde..bb4a06b 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="sidebar_body">
-    <a-menu theme="dark" mode="inline" :default-selected-keys="[key]"  class="sidebar" :defaultOpenKeys="[openKey]">
+    <a-menu theme="dark" mode="inline" :default-selected-keys="[key]"  class="sidebar" :defaultOpenKeys="[openKey]" :open-keys="openKeys" @openChange="onOpenChange">
       <template v-for="item in items">
         <a-menu-item v-if="!item.children" :key="item.key">
           <router-link :to="item.url">
@@ -32,6 +32,7 @@ export default {
     return{
       key:'',
       openKey:'',
+      openKeys:[],
       items:[
         {
           icon:'',
@@ -94,9 +95,21 @@ export default {
   },
   created(){
     this.key=this.$route.path
+
     this.showMenu()
   },
   methods:{
+    onOpenChange(openKeys) {
+
+      const latestOpenKey = openKeys.find(key => this.openKeys.indexOf(key) === -1);
+      console.info(latestOpenKey)
+      console.info(openKeys)
+      if (this.items.length <=latestOpenKey) {
+        this.openKeys = openKeys;
+      } else {
+        this.openKeys = latestOpenKey ? [latestOpenKey] : [];
+      }
+    },
     showMenu(){
       this.items.map(item=>{
         if(item.children){
@@ -104,6 +117,8 @@ export default {
             let item1=item.children[i]
             if(item1.key==this.key){
               this.openKey=item.key
+              this.openKeys.push(item.key)
+              console.info(this.openKeys)
               break
             }
           }
diff --git a/src/components/dateSelect/index.vue b/src/components/dateSelect/index.vue
index 45d217e..d516b93 100644
--- a/src/components/dateSelect/index.vue
+++ b/src/components/dateSelect/index.vue
@@ -61,7 +61,7 @@
                     <div class="content_info_left">
                       <p>标志码：{{item.goods_islicode}}</p>
                       <p>标的类型：{{item.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
-                      <p>委托类型：{{item.goods_entrust==1?'转让':'许可'}}</p>
+                      <p>交易方式：{{item.goods_entrust==1?'转让':'许可'}}</p>
                       <p>权益：{{item.goods_ownership_str}}</p>
                       <p>委托周期：{{item.contractual_period==1?'永久':item.contractual_period==2?'单次':'周期'}}</p>
                       <p>收费类型：{{item.charges_type==1?'免费':'付费'}}</p>
diff --git a/src/components/orderDetails/index.vue b/src/components/orderDetails/index.vue
index 357206a..3890c62 100644
--- a/src/components/orderDetails/index.vue
+++ b/src/components/orderDetails/index.vue
@@ -51,7 +51,7 @@
             <div class="oreder_info">
               <p>标的名称：{{order_info.goods_name}}</p>
               <p>标的类型：{{order_info.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
-              <p>委托类型：{{order_info.goods_entrust==1?'转让':'授权'}}</p>
+              <p>交易方式：{{order_info.goods_entrust==1?'转让':'授权'}}</p>
               <p>权属类型：{{order_info.goods_ownership_str}}</p>
               <p>交易价额：¥ {{order_info.price}}</p>
               <p>交易数量：{{order_info.transaction_count}}</p>
diff --git a/src/components/page/admission/index.vue b/src/components/page/admission/index.vue
index 6210bf1..ccecb61 100644
--- a/src/components/page/admission/index.vue
+++ b/src/components/page/admission/index.vue
@@ -39,7 +39,7 @@
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item">
-            <span>委托类型：</span>
+            <span>交易方式：</span>
             <a-select default-value=""   v-model="query.goods_entrust">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">转让</a-select-option>
diff --git a/src/components/page/classification/DataQuery.vue b/src/components/page/classification/DataQuery.vue
index 903728f..143bdd6 100644
--- a/src/components/page/classification/DataQuery.vue
+++ b/src/components/page/classification/DataQuery.vue
@@ -40,7 +40,7 @@
             </a-select>
           </a-col>
           <a-col :span="5" class="query_item">
-            <span>委托类型：</span>
+            <span>交易方式：</span>
             <a-select    v-model="query.goods_entrust">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">转让</a-select-option>
@@ -72,9 +72,9 @@
       <div class="table">
         <div class="table_title">
           <span >查询结果</span>
-          <a-button type="primary" class="query_button" @click="getGoods">获 取</a-button>
+          <a-button type="primary" class="query_button" @click="getGoods">下 架</a-button>
         </div>
-        <a-table :columns="columns" :data-source="data" bordered :pagination="false">
+        <a-table :columns="columns" :data-source="data" bordered :pagination="false" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
           <template slot="goods_status" slot-scope="goods_status">
             <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
           </template>
@@ -113,7 +113,7 @@
 import Operation from '../../Operation.vue'
 import dataSelect from '../../dateSelect/index.vue'
 import operationRecords from '../../operationRecords/index.vue'
-import {getAllDate,getLog,manualGetGoods} from '../../../api/index'
+import {getAllDate,getLog,offGoods} from '../../../api/index'
 export default {
   data() {
     return{
@@ -126,6 +126,7 @@ export default {
         data_type:'',
         createtime:[],
       },
+      selectedRowKeys:[],
       visible:false,
       //数据查看所需要的数据
       goods_islicode:'',
@@ -200,15 +201,19 @@ export default {
     this.getAllDate()
   },
   methods:{
+    onSelectChange(selectedRowKeys) {
+      this.selectedRowKeys = selectedRowKeys;
+    },
     getGoods(){
-      manualGetGoods().then(res=>{
+      let data={goods_isli:this.selectedRowKeys}
+      offGoods(data).then(res=>{
         if(res.code==200){
-          if(res.data.count==0){
-            this.$message.success('无新增委托数据');
-          }else{
-            this.$message.success('成功获取'+res.data.count+'个委托数据！');
+          // if(res.data.count==0){
+          //   this.$message.success('无新增委托数据');
+          // }else{
+            this.$message.success('下架成功');
             this.getAllDate()
-          }
+          // }
         }else{
           this.$message.error(res.msg);
         }
@@ -230,6 +235,7 @@ export default {
           this.startTotal=res.data.start
           this.endTotal=res.data.end
           this.total=res.data.total
+          this.selectedRowKeys=[]
         }else{
           this.$message.error(res.msg);
         }
diff --git a/src/components/page/order/closed.vue b/src/components/page/order/closed.vue
index 89229fe..469f215 100644
--- a/src/components/page/order/closed.vue
+++ b/src/components/page/order/closed.vue
@@ -37,7 +37,7 @@
           </a-col>
 
           <a-col :span="5" class="query_item">
-            <span>委托类型：</span>
+            <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">转让</a-select-option>
@@ -160,7 +160,7 @@ export default {
           align:'center'
         },
         {
-          title: '委托类型',
+          title: '交易方式',
           dataIndex: 'entrust_type',
           align:'center'
         },
diff --git a/src/components/page/order/completed.vue b/src/components/page/order/completed.vue
index 44916b3..f8fb0c8 100644
--- a/src/components/page/order/completed.vue
+++ b/src/components/page/order/completed.vue
@@ -37,7 +37,7 @@
           </a-col>
 
           <a-col :span="5" class="query_item">
-            <span>委托类型：</span>
+            <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">转让</a-select-option>
@@ -160,7 +160,7 @@ export default {
           align:'center'
         },
         {
-          title: '委托类型',
+          title: '交易方式',
           dataIndex: 'entrust_type',
           align:'center'
         },
diff --git a/src/components/page/order/index.vue b/src/components/page/order/index.vue
index 4605224..3b38554 100644
--- a/src/components/page/order/index.vue
+++ b/src/components/page/order/index.vue
@@ -37,7 +37,7 @@
           </a-col>
 
           <a-col :span="5" class="query_item">
-            <span>委托类型：</span>
+            <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">转让</a-select-option>
@@ -174,7 +174,7 @@ export default {
           align:'center'
         },
         {
-          title: '委托类型',
+          title: '交易方式',
           dataIndex: 'entrust_type',
           align:'center'
         },
diff --git a/src/components/page/order/pendingPayment.vue b/src/components/page/order/pendingPayment.vue
index ea35ded..189ed95 100644
--- a/src/components/page/order/pendingPayment.vue
+++ b/src/components/page/order/pendingPayment.vue
@@ -37,7 +37,7 @@
           </a-col>
 
           <a-col :span="5" class="query_item">
-            <span>委托类型：</span>
+            <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">转让</a-select-option>
@@ -159,7 +159,7 @@ export default {
           align:'center'
         },
         {
-          title: '委托类型',
+          title: '交易方式',
           dataIndex: 'entrust_type',
           align:'center'
         },
diff --git a/src/components/page/order/toBeDelivered.vue b/src/components/page/order/toBeDelivered.vue
index 6da99fd..a6ae4fa 100644
--- a/src/components/page/order/toBeDelivered.vue
+++ b/src/components/page/order/toBeDelivered.vue
@@ -37,7 +37,7 @@
           </a-col>
 
           <a-col :span="5" class="query_item">
-            <span>委托类型：</span>
+            <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">转让</a-select-option>
@@ -160,7 +160,7 @@ export default {
           align:'center'
         },
         {
-          title: '委托类型',
+          title: '交易方式',
           dataIndex: 'entrust_type',
           align:'center'
         },
diff --git a/src/components/page/order/toBeSettled.vue b/src/components/page/order/toBeSettled.vue
index c2b199f..e347f24 100644
--- a/src/components/page/order/toBeSettled.vue
+++ b/src/components/page/order/toBeSettled.vue
@@ -37,7 +37,7 @@
           </a-col>
 
           <a-col :span="5" class="query_item">
-            <span>委托类型：</span>
+            <span>交易方式：</span>
             <a-select default-value=""   v-model="query.entrust_type">
               <a-select-option value="">全部</a-select-option>
               <a-select-option value="1">转让</a-select-option>
@@ -160,7 +160,7 @@ export default {
           align:'center'
         },
         {
-          title: '委托类型',
+          title: '交易方式',
           dataIndex: 'entrust_type',
           align:'center'
         },
diff --git a/src/utils/request.js b/src/utils/request.js
index 0115762..c192981 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,8 @@ const service = axios.create({
     // process.env.NODE_ENV === 'development' 来判断是否开发环境
     // baseURL:process.env.NODE_ENV == 'production' ? 'https://yztapi.xingtongworld.com' : '/api/',
     // baseURL:'http://jiao.api.alpha.xingtongworld.com',
-    baseURL:'http://192.168.66.254:8080',
+    baseURL:'http://58.30.231.138:8899',
+    // baseURL:'http://192.168.66.254:8080',
     timeout: 5000,
 });