Merge branch 'mergeBranch' into greenUrgent

src/SDrpManagement/shopCart/modules/list.vue

@@ -8,7 +8,8 @@
         <el-radio-button :label="1">工具</el-radio-button>
       </el-radio-group>
       <el-input style="width:300px" size="small" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
-      <ExportBtn v-if="tool.checkAuth($route.name,'export')" :tablecols="layout" :param="params" :total="total" excelTitle="购物车"></ExportBtn>
+<!--      <ExportBtn v-if="tool.checkAuth($route.name,'export')" :tablecols="layout" :param="params" :total="total" excelTitle="购物车"></ExportBtn>-->
+      <exportFile :param="params"  fileName="购物车"></exportFile>
     </div>
   </div>
   <div class="produtMag-panel">
@@ -58,7 +59,7 @@
           <el-input-number size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" @change="changeQty(scope.column.data.$index,scope.column.data)" :step="scope.column.data.orderaddqty" label="输入数量"></el-input-number>
         </div>
         <div v-else-if="scope.column.columnname === 'amount'">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data.oldprice * scope.column.data.qty,2)}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</p>
         </div>
         <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname === 'operation'?scope.column.data[scope.column.columnname]:'--'}}</p>
       </template>
@@ -85,6 +86,7 @@
 <script>
 import previewImage from '@/components/previewImage/index'
 import ExportBtn from './exportBtn'
+import exportFile from '@/components/export_file/index2'
 
 export default {
   data () {
@@ -112,7 +114,8 @@ export default {
   },
   components:{
     previewImage,
-    ExportBtn
+    ExportBtn,
+    exportFile
   },
   methods:{
     async listData () {