Merge branch 'ch/ht_3.0' of eta_mini/eta_mini_crm_front into debug_ht

src/views/order/PaymentList.vue

@@ -7,12 +7,12 @@ import { apiSystemCommon } from '@/api/system'
 const tableColumns = [
     {
         label:'支付单号',
-        key:'transaction_id',
+        key:'TransactionID',
         sortable:false
     },
     {
         label:'订单编号',
-        key:'product_order_id',
+        key:'ProductOrderID',
         sortable:false
     },
     {
@@ -32,17 +32,17 @@ const tableColumns = [
         sortable:false
     },{
         label:'支付金额',
-        key:'amount',
+        key:'Amount',
         sortable:false,
         widthsty:100,
     },{
         label:'支付状态',
-        key:'payment_status',
+        key:'PaymentStatus',
         sortable:false,
         widthsty:100,
     },{
         label:'支付渠道',
-        key:'payment_way',
+        key:'PaymentWay',
         sortable:false,
         widthsty:90,
     },{
@@ -51,7 +51,7 @@ const tableColumns = [
         sortable:false
     },{
         label:'收款方',
-        key:'merchant_id',
+        key:'MerchantID',
         sortable:false,
         widthsty:120,
     },{

src/views/order/RefundList.vue

@@ -7,12 +7,12 @@ import { apiMediaCommon } from '@/api/media'
 const tableColumns = [
     {
         label:'支付单号',
-        key:'transaction_id',
+        key:'TransactionID',
         sortable:false
     },
     {
         label:'订单编号',
-        key:'product_order_id',
+        key:'ProductOrderID',
         sortable:false
     },
     {
@@ -32,16 +32,16 @@ const tableColumns = [
         sortable:false
     },{
         label:'支付金额',
-        key:'amount',
+        key:'Amount',
         sortable:false
     },{
         label:'支付状态',
-        key:'payment_status',
+        key:'PaymentStatus',
         sortable:false,
         widthsty:90,
     },{
         label:'支付渠道',
-        key:'payment_way',
+        key:'PaymentWay',
         sortable:false,
         widthsty:90,
     },{
@@ -50,7 +50,7 @@ const tableColumns = [
         sortable:false
     },{
         label:'收款方',
-        key:'merchant_id',
+        key:'MerchantID',
         sortable:false,
         widthsty:100,
     },{

src/views/products/PackageConfigList.vue

@@ -95,6 +95,8 @@ const tableQuery = reactive({
     SaleStatus:null,
     CreatedTime:'',
     UpdatedTime:'',
+    SortColumn:'created_time',
+    sortType:'desc',
 })
 
 function getTableData(){
@@ -107,6 +109,8 @@ function getTableData(){
         CreatedTime:tableQuery.CreatedTime,
         UpdatedTime:tableQuery.UpdatedTime,
         SaleStatus:tableQuery.SaleStatus,
+        SortType:tableQuery.sortType,
+        SortColumn:tableQuery.SortColumn,
     }).then(res=>{
         if(res.Ret!==200) return 
         tableData.value = res.Data.List||[]
@@ -128,14 +132,12 @@ function handlePageChange(page){
     getTableData()
 }
 function handleSortChange({order,prop}){
-    // ascending 
     const propMap = {
-        0:'CreatedTime',
-        1:'ReadCount',
-        2:'LastReadTime',
+        'PublishedTime':'created_time',
+        'UpdatedTime':'updated_time',
     }
-    tableQuery.sortParam = propMap[prop]||2
-    tableQuery.sortType = order==='ascending'?1:0
+   tableQuery.SortColumn = propMap[prop]
+    tableQuery.sortType = order==='ascending' ? 'asc': 'desc'
     getTableData()
 }
 function handleSelectChange() {

src/views/products/SingleConfigList.vue

@@ -92,6 +92,8 @@ const tableQuery = reactive({
     SaleStatus:null,
     CreatedTime:'',
     UpdatedTime:'',
+    SortColumn:'created_time',
+    sortType:'desc',
 })
 
 function getTableData(){
@@ -104,6 +106,8 @@ function getTableData(){
         CreatedTime:tableQuery.CreatedTime,
         UpdatedTime:tableQuery.UpdatedTime,
         SaleStatus:tableQuery.SaleStatus,
+        SortType:tableQuery.sortType,
+        SortColumn:tableQuery.SortColumn,
     }).then(res=>{
         if(res.Ret!==200) return 
         tableData.value = res.Data.List||[]
@@ -125,14 +129,12 @@ function handlePageChange(page){
     getTableData()
 }
 function handleSortChange({order,prop}){
-    // ascending 
     const propMap = {
-        0:'CreatedTime',
-        1:'ReadCount',
-        2:'LastReadTime',
+        'PublishedTime':'created_time',
+        'UpdatedTime':'updated_time',
     }
-    tableQuery.sortParam = propMap[prop]||2
-    tableQuery.sortType = order==='ascending'?1:0
+    tableQuery.SortColumn = propMap[prop]
+    tableQuery.sortType = order==='ascending' ? 'asc': 'desc'
     getTableData()
 }
 function handleSelectChange() {

src/views/products/addSingleList.vue

@@ -93,6 +93,12 @@ function handleSortChange({order,prop}){
     tableQuery.sortType = order==='ascending'?1:0
     getTableData()
 }
+function handleSelectType(type){
+    tableQuery.keyWord = ''
+    tableQuery.currentPage = 1
+    tableQuery.PermissionIds = []
+    getTableData()
+}
 function handleSelectChange(){
     getTableData()
 }
@@ -121,7 +127,7 @@ function stockProducts(row){
     <el-card>
         <div class="dialog-content">
             <div>
-                <el-radio-group v-model="tableQuery.ProductType" size="large" @change="handleSelectChange()">
+                <el-radio-group v-model="tableQuery.ProductType" size="large" @change="handleSelectType()">
                     <el-radio-button label="报告" value="report" />
                     <el-radio-button label="音视频" value="media" />
                 </el-radio-group>