11/13 16:43

订单审核功能除开导入全部完成

src/views/businessManager/orderManager/financeManager.vue

@@ -6,7 +6,7 @@
     <div class="m-core">
       <div class="newBand"
            v-permission="{child: 'routeOrder/add', parent: '/financeManager'}"
-           @click="()=>{routeOrderStatus = true;isAdd=true}">添加订单</div>
+           @click="()=>{routeOrderStatus = true;isAdd=true,form.applyType = null}">添加订单</div>
       <div class="newBand"
            @click="onOrderExport"
            v-permission="{child: 'export/routeOrderList', parent: '/financeManager'}">报表导出</div>
@@ -16,7 +16,7 @@
            @click="onAdaPayExport">汇付订单导出</div>
       <div class="newBand"
            @click="onDownload"
-           v-permission="'import/downloadTemplate'">下载模板</div>
+           v-permission="'import/downloadTemplate?financeManager'">下载模板</div>
       <el-upload v-permission="'import/routeOrder'"
                  style="display: inline-block; margin: 0 10px;"
                  action="/api-web/import/routeOrder"
@@ -877,11 +877,12 @@ export default {
               memo: orderInfo.memo,
               payTime: orderInfo.payTime,
               serviceAmount: res.data.serviceAmount,
-              saleAmount: res.data.saleAmount,
+              saleAmount: res.data.goodsAmount,
               schoolId: parseInt(orderInfo.musicGroupId) || '    ',
-              goodsList: res.data.sellOrders.map(item => { return { id: item.goodsId, number: item.num } })
+              applyType: 'SELL'
             },
-              console.log(this.form)
+              this.$set(this.form, 'goodsList', res.data.sellOrders.map(item => { return { id: item.goodsId, number: item.num } }))
+            console.log(this.form)
             this.routeOrderStatus = true
           })
         }

src/views/businessManager/orderManager/orderAudit/index.vue

@@ -176,7 +176,7 @@ export default {
         auditStatus: null,
         type: null
       },
-      tableList: [{}],
+      tableList: [],
       organList: [],
       orderServerList,
       orderAuditTypeList,

vue.config.js

@@ -20,8 +20,8 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // let target = 'http://dyme.utools.club' //test环境
 // let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.30:8080' //邹璇
-// let target = 'http://192.168.3.204:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 测试服
+let target = 'http://192.168.3.204:8000' //勇哥
+// let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.196' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {