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

src/components/sale/customerEdit-form.vue

@@ -87,7 +87,19 @@
   /deep/ .q-field__prepend {
     padding-right: 0px !important;
   }
-
+  .custom_Close{
+    width:25px;
+    height:25px;
+    background:red;
+    color:#fff;
+    text-align:center;
+    line-height:25px;
+    border-radius: 50%;
+    cursor: pointer;
+    position: absolute;
+    right:-10px;
+    top:-10px;
+  }
 </style>
 <template>
   <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale">
@@ -123,15 +135,18 @@
         <div class="row wrap">
           <q-input filled  v-if="objOption.CustomerType==4" stack-label maxlength="20" :dense="false" v-model="objOption.EnterpriseName" lazy-rules
             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"
+          <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">
+            <div class="col-6" v-if="isShowEdit" style="position:relative">
               <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 class="custom_Close" @click="isShowEdit=false">
+                <i style="position" class="iconfont icon-guanbi1"></i>
+              </div>
             </div>
           </template>
         </div>
@@ -323,6 +338,17 @@
         this.$refs.CustomerName.validate();
         // this.$refs.ContactNumber.validate();
         this.$refs.Address.validate();
+        if(this.objOption.CustomerType!=4){
+          if (this.objOption.CategoryId=='' && this.objOption.CategoryName=='') {
+            this.$q.notify({
+              type:'warning',
+              message: "请选择客户或输入名称",
+              timeout:2000,
+              position: "top",
+            });
+            return
+          }
+        }
         if (!this.objOption.ContactNumber && !this.objOption.QQ && !this.objOption.WeChatNo) {
           this.$q.notify({
             type:'warning',