Merge branch 'xiaoqin' into mergeBranch

src/Form/marketing2/agent/add.vue

@@ -92,8 +92,8 @@
             <el-col :span="12">
               <el-form-item label="开票节点" prop="invoicingpoint">
                 <el-radio-group v-model="form.invoicingpoint">
-                  <el-radio :value="1" label="订单审核"></el-radio>
-                  <el-radio :value="2" label="发货"></el-radio>
+                  <el-radio :label="1">订单审核</el-radio>
+                  <el-radio :label="2">发货</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>

src/HDrpManagement/AccountMoney/modules/detail.vue

@@ -6,7 +6,12 @@
         <el-input type="text" size="small" class="inline-16" style="width:200px;margin-bottom:10px" clearable @clear="getList" v-model="params.content.where.condition" placeholder="请输入搜索内容" @keyup.native.enter="getList(params.content.pageNumber=1)"></el-input>
         <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="600px">
           <template v-slot:customcol="scope">
-            <p>{{scope.column.data[scope.column.columnname]}}</p>
+            <div v-if="scope.column.columnname == 'type'">
+              <span>{{scope.column.data[[scope.column.columnname]] ? '收入' : '支出'}}</span>
+            </div>
+            <div v-else>
+              {{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]]:'--'}}
+            </div>
           </template>
           <template v-slot:opreation="scope">
             <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data"/>

src/HDrpManagement/afterSalesmag/components/add.vue

@@ -62,6 +62,7 @@
 <script>
 import selectAgent from '@/template/selectAgent/index'
 import selectOrder from './selectOrder'
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   name: "add",
   components:{selectAgent,selectOrder},
@@ -120,6 +121,8 @@ export default {
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
           this.dialogFormVisible = false
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/afterSalesmagDetail',query:{id:res.data.sa_aftersalesmagid,rowindex:res.data.rowindex,type:'退货单'}})
         })
       })
     },

src/HDrpManagement/aftersalesBill/components/add.vue

@@ -119,6 +119,8 @@ export default {
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
           this.dialogFormVisible = false
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/aftersalesBillDetail',query:{id:res.data.sa_aftersalesmagid,rowindex:res.data.rowindex,type:'退货单'}})
         })
       })
     },

src/HDrpManagement/invoiceapp/index.vue

@@ -49,9 +49,8 @@
           <span>{{scope.data.column.data.byhand == 1?'手工':'线上'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname == 'suminvoiceamount'">
-          <span>{{this.tool.formatAmount(scope.data.column.data.suminvoiceamount,2)}}</span>
+          <span>{{tool.formatAmount(scope.data.column.data.suminvoiceamount,2)}}</span>
         </div>
-        
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>

src/HDrpManagement/orderManage/details/index.vue

@@ -56,7 +56,7 @@
         <product-list @select="select" @onSuccess="queryMainData()" :data="mainData" ref="prod">
           <div slot="operation">
             <importFile v-if="tool.checkAuth($route.name,'importOrderMx')" class="inline-16" :bindData="{ownertable:'sa_order',ownerid:$route.query.id,usetype:'default'}" :errorUrl="errorUrl" @clearUrl="errorUrl = null" @onSuccess="bindImportOrder"></importFile>
-            <changeOrderMx v-if="mainData.status === '审核'" :tableData="selection" class="inline-16" :data="mainData" @onSuccess="$refs['prod'].listData()"></changeOrderMx>
+            <changeOrderMx v-if="mainData.status === '审核'" :tableData="selection" class="inline-16" :data="mainData" @onSuccess="$refs['prod'].listData();queryMainData"></changeOrderMx>
             <el-button :disabled="mainData.status !== '审核' || selection.length === 0"  size="small" type="primary" style="margin-bottom:12px" @click="adddispatch">一键发货</el-button>
           </div>
         </product-list>

src/HDrpManagement/toolBill/components/add.vue

@@ -119,6 +119,8 @@ export default {
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
           this.dialogFormVisible = false
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/toolBillDetail',query:{id:res.data.sa_aftersalesmagid,rowindex:res.data.rowindex,type:'借用归还单'}})
         })
       })
     },

src/HDrpManagement/toolBillMag/components/add.vue

@@ -117,6 +117,8 @@ export default {
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
           this.dialogFormVisible = false
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/toolManageDetail',query:{id:res.data.sa_aftersalesmagid,rowindex:res.data.rowindex,type:'借用归还单'}})
         })
       })
     },