Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/orderCommon/order-form.vue

@@ -298,7 +298,7 @@
                 "></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="4" v-if="showCity">
           <el-form-item :label="$t('salesModule.SaleNum')" prop="SaleNum">
             <el-input v-model="addMsg.SafeNum" @keyup.native="checkInteger(addMsg, 'SafeNum')" @input="
                   yzSafeNum();
@@ -1628,7 +1628,12 @@
           "sellorder_get_GetSellClientTypeEnumList", {},
           (res) => {
             if (res.data.resultCode == 1) {
+              if(this.showCity) {
               this.customerTypeList = res.data.data;
+              } else {
+              this.customerTypeList = res.data.data.filter(item => item.Id < 3);
+                console.log('this.customerTypeList', this.customerTypeList)
+              }
             }
           },
         );