qymljy hai 2 meses
pai
achega
0a67463fa2

+ 1 - 1
src/Form/marketing2/agent/add.vue

@@ -130,7 +130,7 @@
             <el-form-item :label="$t(`开票节点`)+':'" prop="invoicingpoint">
               <el-radio-group v-model="form.invoicingpoint">
                 <el-radio :label="1">{{$t('订单审核')}}</el-radio>
-                <el-radio :label="2">{{ $t('发货') }}</el-radio>
+                <el-radio :label="2">{{ $t('发货单关闭') }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

+ 1 - 1
src/Form/marketing2/agent/edit.vue

@@ -131,7 +131,7 @@
             <el-form-item :label="$t(`开票节点`)+':'" prop="invoicingpoint">
               <el-radio-group v-model="form.invoicingpoint">
                 <el-radio :label="1">{{$t('订单审核')}}</el-radio>
-                <el-radio :label="2">{{ $t('发货') }}</el-radio>
+                <el-radio :label="2">{{ $t('发货单关闭') }}</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>

+ 1 - 1
src/HManagement/accountManage/modules/account_detail.vue

@@ -198,7 +198,7 @@ export default {
             {label:this.$t('税号'),value:this.accountInfo.taxno},
             {label:this.$t('免运费金额'),value:this.accountInfo.freefreightamount},
             {label:this.$t('订单可退货天数'),value:this.accountInfo.limitreturnday},
-            {label:this.$t('是否订单审核可开票'),value:this.accountInfo.invoicingpoint == '1' ? this.$t('订单审核') : this.$t('发货')},
+            {label:this.$t('开票节点'),value:this.accountInfo.invoicingpoint == '1' ? this.$t('订单审核') : this.$t('发货单关闭')},
             {label:this.$t('是否授权所有营销类别'),value:this.accountInfo.saleclassauth ? this.$t('否') : this.$t('是')},
             {
               label:this.$t('商品授权管控'),

+ 2 - 2
src/HManagement/marketing2/agent/details/index.vue

@@ -279,8 +279,8 @@ export default {
           }
         },
         {
-          label:this.$t('是否订单审核可开票'),
-          value: this.mainData.invoicingpoint == '1' ? this.$t('订单审核'): this.$t('发货')
+          label:this.$t('开票节点'),
+          value: this.mainData.invoicingpoint == '1' ? this.$t('订单审核'): this.$t('发货单关闭')
         },
         {
           label:this.$t('是否授权所有营销类别'),

+ 2 - 2
src/components/normal-basic-layout/details/modules/followUp/addLog.vue

@@ -143,7 +143,6 @@ export default {
       this.followUpType = res.data
     },
     submitLog () {
-      console.log(this.form.squarestage,'阶段')
       if (this.squarestageList.length == 0){
         this.stageData()
       }else {
@@ -156,8 +155,9 @@ export default {
       this.$refs.form.validate(async (valid)=>{
         if (!valid) return false
         let resource = this.$route.matched[1].meta.title
+
         let content = {}
-        if (this.$route.path === '/projectChangeDetail' || $route.path === '/funnelProjectDetail'){
+        if (this.$route.path === '/projectChangeDetail' || this.$route.path === '/funnelProjectDetail'){
           content = {
             "sys_datafollowupid":0,
             "ownertable":this.ownertable,