Browse Source

提交问题修改

wenmenghao 10 months ago
parent
commit
25a2139970

+ 6 - 6
src/views/order/components/otherOrder.vue

@@ -106,23 +106,23 @@
             </Select>
             </Select>
           </FormItem>
           </FormItem>
           <FormItem style="margin-left:10px;">
           <FormItem style="margin-left:10px;">
-            <Checkbox v-if="!showOrderStatus && others.vipType == '0'" v-model="others.paybackOpenServer">全额回款当日自动开通
+            <Checkbox v-if="!showOrderStatus && (others.vipType == '0' || others.vipType == '3')" v-model="others.paybackOpenServer">全额回款当日自动开通
             </Checkbox>
             </Checkbox>
           </FormItem>
           </FormItem>
           <span class="cycle-tip" v-if="showCycleTip">全额回款后将自动续费开通权益,如若回款时间晚于原服务到期时间,则开始日期为回款日期。</span>
           <span class="cycle-tip" v-if="showCycleTip">全额回款后将自动续费开通权益,如若回款时间晚于原服务到期时间,则开始日期为回款日期。</span>
 
 
           <FormItem label="开始日期" :required="showOrderStatus"
           <FormItem label="开始日期" :required="showOrderStatus"
-            v-show="others.productType == '5' && showOrderStatus && !(others.vipType !== '0' || (!showOrderStatus && others.vipType === '0'))">
+            v-show="others.productType == '5' && showOrderStatus && !(others.vipType !== '0' || (!showOrderStatus && (others.vipType == '0' || others.vipType == '3')))">
             <date-sigle style="width: 120px;" ref="sigleRef1" :dateType="'date'" :placeholderd="'请选择'"
             <date-sigle style="width: 120px;" ref="sigleRef1" :dateType="'date'" :placeholderd="'请选择'"
               @startDate="startDate1" :disabledDateCallback="disabledDateForVIPCallback" class="no-pass"
               @startDate="startDate1" :disabledDateCallback="disabledDateForVIPCallback" class="no-pass"
               :beginDis="noPass"
               :beginDis="noPass"
-              :dateDis="others.vipType !== '0' || (!showOrderStatus && others.vipType === '0')"></date-sigle>
+              :dateDis="others.vipType !== '0' || (!showOrderStatus && (others.vipType == '0' || others.vipType == '3'))"></date-sigle>
             <!-- <Checkbox v-if="!showOrderStatus&&others.vipType === '0'" v-model="noPass"  @on-change="noTchange" disabled>暂不开通</Checkbox > -->
             <!-- <Checkbox v-if="!showOrderStatus&&others.vipType === '0'" v-model="noPass"  @on-change="noTchange" disabled>暂不开通</Checkbox > -->
             <Checkbox v-model="noPass" @on-change="noTchange"
             <Checkbox v-model="noPass" @on-change="noTchange"
-              :disabled="(others.vipType !== '0') || (!showOrderStatus && others.vipType === '0')">暂不开通
+              :disabled="(others.vipType !== '0') || (!showOrderStatus && (others.vipType == '0' || others.vipType == '3'))">暂不开通
             </Checkbox>
             </Checkbox>
             <Checkbox v-model="others.paybackOpenServer" @on-change="noTchange"
             <Checkbox v-model="others.paybackOpenServer" @on-change="noTchange"
-              :disabled="(showOrderStatus && !noPass) || (others.vipType !== '0') || (!showOrderStatus && others.vipType === '0')">
+              :disabled="(showOrderStatus && !noPass) || (others.vipType !== '0') || (!showOrderStatus && (others.vipType == '0' || others.vipType == '3'))">
               全额回款当日自动开通
               全额回款当日自动开通
             </Checkbox>
             </Checkbox>
           </FormItem>
           </FormItem>
@@ -396,7 +396,7 @@ export default {
       // 1. 产品类型是超级订阅(且付费类型为“购买”、“续费”)才展示。
       // 1. 产品类型是超级订阅(且付费类型为“购买”、“续费”)才展示。
       // 2. 产品类型是“大会员”且会员套餐为“商机版2.0”、“专家版2.0”(且服务类型为“新购服务”、“延长服务”)
       // 2. 产品类型是“大会员”且会员套餐为“商机版2.0”、“专家版2.0”(且服务类型为“新购服务”、“延长服务”)
       // productType = 5即超级订阅,此处创建其他订单无大会员选项,此处不考虑大会员
       // productType = 5即超级订阅,此处创建其他订单无大会员选项,此处不考虑大会员
-      const vipBuyOrRenew = this.others.productType == '5' && (this.others.vipType == '0' || this.others.vipType == '1')
+      const vipBuyOrRenew = this.others.productType == '5' && (this.others.vipType == '0' || this.others.vipType == '1' || this.others.vipType == '3' )
       const productTypeCheck = vipBuyOrRenew
       const productTypeCheck = vipBuyOrRenew
       return paybackCompanyCheck && contractStatusCheck && productTypeCheck
       return paybackCompanyCheck && contractStatusCheck && productTypeCheck
     },
     },

+ 4 - 4
src/views/order/components/otherOrderEdit.vue

@@ -122,7 +122,7 @@
               </Select>
               </Select>
             </FormItem>
             </FormItem>
             <span class="cycle-tip" v-if="showCycleTip">全额回款后将自动续费开通权益,如若回款时间晚于原服务到期时间,则开始日期为回款日期。</span>
             <span class="cycle-tip" v-if="showCycleTip">全额回款后将自动续费开通权益,如若回款时间晚于原服务到期时间,则开始日期为回款日期。</span>
-            <FormItem label="开始日期" prop="vipStartTime" v-if="others.vipType=='0'">
+            <FormItem label="开始日期" prop="vipStartTime" v-if="(others.vipType == '0' || others.vipType == '3')">
               <date-sigle
               <date-sigle
                   style="width: 120px;"
                   style="width: 120px;"
                   ref="sigleRef1"
                   ref="sigleRef1"
@@ -135,10 +135,10 @@
                   :dateDis="interested || !returnMyOther"
                   :dateDis="interested || !returnMyOther"
               ></date-sigle>
               ></date-sigle>
               <Checkbox v-model="noPass" @on-change="noTchange"
               <Checkbox v-model="noPass" @on-change="noTchange"
-                        :disabled="others.vipType!=='0' || interested || (!returnMyOther&&others.vipType === '0')">暂不开通
+                        :disabled="others.vipType!=='0' || interested || (!returnMyOther&&(others.vipType == '0' || others.vipType == '3'))">暂不开通
               </Checkbox>
               </Checkbox>
               <Checkbox  v-model="others.paybackOpenServer"
               <Checkbox  v-model="others.paybackOpenServer"
-                         :disabled="(returnMyOther && !noPass) || (others.vipType!=='0') || (!returnMyOther && others.vipType === '0')">全额回款当日自动开通
+                         :disabled="(returnMyOther && !noPass) || (others.vipType!=='0') || (!returnMyOther && (others.vipType == '0' || others.vipType == '3'))">全额回款当日自动开通
               </Checkbox>
               </Checkbox>
             </FormItem>
             </FormItem>
           </div>
           </div>
@@ -462,7 +462,7 @@ export default {
       // 1. 产品类型是超级订阅(且付费类型为“购买”、“续费”)才展示。
       // 1. 产品类型是超级订阅(且付费类型为“购买”、“续费”)才展示。
       // 2. 产品类型是“大会员”且会员套餐为“商机版2.0”、“专家版2.0”(且服务类型为“新购服务”、“延长服务”)
       // 2. 产品类型是“大会员”且会员套餐为“商机版2.0”、“专家版2.0”(且服务类型为“新购服务”、“延长服务”)
       // productType=5即超级订阅,此处创建其他订单无大会员选项,此处不考虑大会员
       // productType=5即超级订阅,此处创建其他订单无大会员选项,此处不考虑大会员
-      const vipBuyOrRenew = this.others.productType == '5' && (this.others.vipType == '0' || this.others.vipType == '1')
+      const vipBuyOrRenew = this.others.productType == '5' && (this.others.vipType == '0' || this.others.vipType == '1' || this.others.vipType == '3')
       const productTypeCheck = vipBuyOrRenew
       const productTypeCheck = vipBuyOrRenew
       return paybackCompanyCheck && contractStatusCheck && productTypeCheck
       return paybackCompanyCheck && contractStatusCheck && productTypeCheck
     },
     },