Browse Source

Merge branch 'dev/v2.4.37_wmh' of jianyu/qmx_page_admin into feature/v2.4.37

wenmenghao 10 tháng trước cách đây
mục cha
commit
4b4b41b9c4
1 tập tin đã thay đổi với 4 bổ sung4 xóa
  1. 4 4
      src/views/order/components/otherOrderEdit.vue

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

@@ -135,10 +135,10 @@
                   :dateDis="interested || !returnMyOther"
               ></date-sigle>
               <Checkbox v-model="noPass" @on-change="noTchange"
-                        :disabled="others.vipType!=='0' || interested || (!returnMyOther&&(others.vipType == '0' || others.vipType == '3'))">暂不开通
+                        :disabled="(others.vipType!='0' && others.vipType!='3') || interested || (!returnMyOther&&(others.vipType == '0' || others.vipType == '3'))">暂不开通
               </Checkbox>
               <Checkbox  v-model="others.paybackOpenServer"
-                         :disabled="(returnMyOther && !noPass) || (others.vipType!=='0') || (!returnMyOther && (others.vipType == '0' || others.vipType == '3'))">全额回款当日自动开通
+                         :disabled="(returnMyOther && !noPass) || (others.vipType!='0' && others.vipType!='3') || (!returnMyOther && (others.vipType == '0' || others.vipType == '3'))">全额回款当日自动开通
               </Checkbox>
             </FormItem>
           </div>
@@ -340,7 +340,7 @@
             <sale-select ref="saleRef" @salePerson="salePerson" :setDefaultPerson="this.$store.getters.getAdminUser.username"></sale-select>
           </FormItem> -->
           <FormItem label="销售人员">
-            <sale-select ref="saleRef" :saleType="'1'" @salePerson="salePerson" v-if="oShow"></sale-select>
+            <sale-select ref="saleRef" :saleType="'1'" @salePerson="salePerson" v-if="oShow" :dis="originOrderStatus == '1'"></sale-select>
           </FormItem>
           <FormItem  class="table-order1" v-show="saleTableData.length > 2">
             <Table border :columns="saleTable" :data="saleTableData">
@@ -354,7 +354,7 @@
           </FormItem>
           <FormItem label="销售渠道" prop="salesChannel">
             <v-cascader ref="casRef" type="1" quType="1" placeholderType="请选择销售渠道" reqType="销售渠道"
-                        @levelChange="salesChange"></v-cascader>
+                        @levelChange="salesChange" :disabled="originOrderStatus == '1'"></v-cascader>
           </FormItem>
           <FormItem label="其他信息" class="formTitle">
           </FormItem>