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

src/components/sale/customerEdit-form.vue

@@ -125,6 +125,15 @@
             ref="EnterpriseName" class="col-6 q-pr-lg q-pb-lg" />
           <q-select stack-label color="primary" v-else filled label="客户" option-value="CategoryId" option-label="CategoryName"
             :options="customList" class="col-6 q-pr-lg q-pb-lg" v-model="objOption.CategoryId" emit-value map-options />
+          <template v-if="objOption.CustomerType!=4">
+            <div class="col-6" v-if="!isShowEdit">
+              <q-btn label="立即添加" @click="isShowEdit=true" size="sm" color="primary" />
+            </div>
+            <div class="col-6" v-if="isShowEdit">
+              <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.CategoryName" lazy-rules
+                ref="CategoryName" class="col-6 q-pb-lg" label="名称" />
+            </div>
+          </template>
         </div>
         <div class="row wrap">
           <div class="col-6">
@@ -237,7 +246,8 @@
           WeChatPhoto: '',
           CustomerType: 1, //同业类型  1企业   2学校
           EnterpriseName: "", //企业名称
-          CategoryId:''
+          CategoryId:'',
+          CategoryName:''
         },
         EnterpriseLabelName: "企业名称",
         saveCustomLoading: false,
@@ -247,7 +257,8 @@
         CustomerBrandList: [], //所属品牌下拉
         optionTitle: '',
         typeOptions: [],
-        customList:[]
+        customList:[],
+        isShowEdit: false
       }
     },
     created() {},
@@ -373,6 +384,7 @@
           CatetoryType:Type
         }
         this.objOption.CategoryId = '';
+        this.isShowEdit=false;
         queryCustomerCategoryList(msg).then(res => {
           if (res.Code == 1) {
             this.customList = res.Data;