Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/controller/material_controller.js

@@ -636,7 +636,7 @@ module.exports = app => {
                         responseData.data.m_tp = await ctx.service.materialBills.del(data.id);
                         break;
                     case 'changeOrder':
-                        responseData.data = await ctx.service.materialBills.changeOrder(data.id1, data.id2);
+                        await ctx.service.materialBills.changeOrder(data.id1, data.id2);
                         break;
                     case 'update':
                         if (data.updateData.code === '' || data.updateData.code === null) {
@@ -691,7 +691,7 @@ module.exports = app => {
                         break;
                     default: throw '参数有误';
                 }
-                if (this.ctx.material.material_tax) {
+                if (ctx.material.material_tax) {
                     responseData.data.m_tax_tp = await ctx.service.material.getMaterialTaxTp(ctx.material.id);
                 }
                 ctx.body = responseData;
@@ -755,7 +755,7 @@ module.exports = app => {
                         break;
                     default: throw '参数有误';
                 }
-                if (this.ctx.material.material_tax) {
+                if (ctx.material.material_tax) {
                     responseData.data.m_tax_tp = await ctx.service.material.getMaterialTaxTp(ctx.material.id);
                 }
                 responseData.data.materialBillsData = await this._getMaterialBillsData(ctx);