Merge remote-tracking branch 'origin/master'

src/api/live/liveOrder.js

@@ -85,6 +85,14 @@ export function exportLiveOrderZm(query) {
     params: query
   })
 }
+export function exportZmNew(query) {
+  return request({
+    url: '/live/liveOrder/exportZmNew',
+    method: 'get',
+    params: query
+  })
+}
+
 
 export function getExpress(data) {
   return request({

src/views/hisStore/storeOrder/healthStoreList.vue

@@ -475,7 +475,8 @@
         </el-table-column>
 
       <el-table-column label="成本价格" align="center" prop="cost" v-if="showFinanceTableField"/>
-      <el-table-column label="结算价格" align="center" prop="fprice"  v-if="showFinanceTableField"/>
+      <!-- <el-table-column label="结算价格" align="center" prop="fprice"  v-if="showFinanceTableField"/> -->
+       <el-table-column label="实付金额" align="center" prop="payMoney"  v-if="showFinanceTableField"/>
       <el-table-column label="额外运费" align="center" prop="payPostage" v-if="showFinanceTableField"/>
       <el-table-column label="商品编码" align="center" prop="barCode"  v-if="showFinanceTableField"/>
       <el-table-column label="商品分类" align="center" prop="cateName" v-if="showFinanceTableField"/>

src/views/hisStore/storeOrder/index.vue

@@ -492,7 +492,7 @@
       </el-table-column>
 
       <el-table-column label="成本价格" align="center" prop="cost" v-if="showFinanceTableField"/>
-      <el-table-column label="结算价格" align="center" prop="fprice"  v-if="showFinanceTableField"/>
+      <!-- <el-table-column label="结算价格" align="center" prop="fprice"  v-if="showFinanceTableField"/> -->
       <el-table-column label="额外运费" align="center" prop="payPostage" v-if="showFinanceTableField"/>
       <el-table-column label="商品编码" align="center" prop="barCode"  v-if="showFinanceTableField"/>
       <el-table-column label="商品分类" align="center" prop="cateName" v-if="showFinanceTableField"/>
@@ -509,8 +509,8 @@
         </el-table-column>
       <el-table-column label="实付金额" align="center" prop="payMoney" >
         <template slot="header" slot-scope="scope">
-          <span>实收金额</span>
-          <el-tooltip content="按实收金额排序" placement="top"/>
+          <span>实付金额</span>
+          <el-tooltip content="按实付金额排序" placement="top"/>
         </template>
       </el-table-column>
       <el-table-column label="物流代收金额" align="center" prop="payDelivery" >
@@ -1040,6 +1040,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getConfigByKey } from '@/api/system/config'
 import {list as getAppMallOptions} from '@/api/course/coursePlaySourceConfig';
 import {checkPermi} from "@/utils/permission";
+import {getSignProjectName} from "@/api/course/qw/courseWatchLog";
 
 export default {
   components: { productOrder,productSelect,addUser,addUserAddress,Treeselect },
@@ -1311,9 +1312,16 @@ export default {
         miniAppId: null,
       },
       showFinanceTableField: false,
+      signProjectName:null,
     };
   },
   created() {
+    getSignProjectName().then(res=>{
+      this.signProjectName = res.signProjectName;
+      console.log(this.signProjectName)
+    }).catch(res=>{
+
+    })
     getCompanyList().then(response => {
         this.companys = response.data;
          if(this.companys!=null&&this.companys.length>0){

src/views/hisStore/storeProduct/indexZm.vue

@@ -1488,6 +1488,7 @@ export default {
     getTreeselect() {
       getAllStoreProductCategory().then(response => {
         this.categoryOptions = [];
+        debugger;
         const data = this.handleTree(response.data, "cateId", "pid");
         this.categoryOptions=data;
       });

src/views/live/liveOrder/index.vue

@@ -333,7 +333,7 @@
 </template>
 
 <script>
-import { listLiveOrderZm, exportLiveOrderZm,healthExportShippingOrder,importDeliveryNoteExpressTemplate } from "@/api/live/liveOrder";
+import { listLiveOrderZm, exportLiveOrderZm,healthExportShippingOrder,importDeliveryNoteExpressTemplate,exportZmNew } from "@/api/live/liveOrder";
 import liveOrderDetails from './liveOrderDetails.vue';
 import {getCompanyList} from "@/api/company/company";
 import Treeselect from "@riophae/vue-treeselect";
@@ -610,7 +610,8 @@ export default {
         type: "warning"
       }).then(() => {
         this.exportLoading = true;
-        return exportLiveOrderZm(queryParams);
+        return exportZmNew(queryParams);
+        // return exportLiveOrderZm(queryParams);
       }).then(response => {
         this.download(response.msg);
         this.exportLoading = false;