页面修改

src/components/sale/perCustomer-form.vue

@@ -72,6 +72,7 @@
     display: table-row;
     height: 20px;
   }
+
 </style>
 <template>
   <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale">
@@ -87,11 +88,11 @@
         <div class="row wrap">
           <div class="col-6">
             <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.CustomerName"
-              ref="CustomerName" class="col-6 q-pb-lg" label="客户名称" :rules="[val => !!val || '请输入客户名称']" />
+              ref="CustomerName" class="col-6 q-pb-lg q-pr-lg" label="客户名称" :rules="[val => !!val || '请输入客户名称']" />
           </div>
           <div class="col-6">
-            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Sex" ref="Sex"
-              class="col-6 q-pb-lg" label="性别" />
+            <q-radio v-model="objOption.Sex" :val="1" label="男" />
+            <q-radio v-model="objOption.Sex" :val="2" label="女" />
           </div>
         </div>
         <div class="row wrap">
@@ -101,7 +102,7 @@
           </div>
           <div class="col-6">
             <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Fax" ref="Fax"
-              class="col-6 q-pr-lg q-pb-lg" label="传真" />
+              class="col-6 q-pb-lg" label="传真" />
           </div>
         </div>
         <div class="row wrap">
@@ -111,12 +112,12 @@
           </div>
           <div class="col-6">
             <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Email" ref="Email"
-              class="col-6 q-pr-lg q-pb-lg" label="Email" />
+              class="col-6 q-pb-lg" label="Email" />
           </div>
         </div>
         <div class="row wrap">
           <div class="col-6">
-            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Account" ref="QQ"
+            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.Account" ref="Account"
               class="col-6 q-pr-lg q-pb-lg" label="账号" />
           </div>
           <div class="col-6">
@@ -126,15 +127,15 @@
         </div>
         <div class="row wrap">
           <div class="col-12">
-            <q-input filled stack-label :dense="false" v-model="objOption.Remark" ref="Remark" class="col-6 q-pb-lg"
-              label="备注" :rules="[val => !!val || '请输入备注']" />
+            <q-input filled type="textarea" stack-label :dense="false" v-model="objOption.Remark" ref="Remark"
+              class="col-6 q-pb-lg" label="备注" />
           </div>
         </div>
       </q-card-section>
       <q-separator />
       <q-card-actions align="right" class="bg-white">
         <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeCourseForm" />
-        <q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important" :loading="saveCourseLoading"
+        <q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important" :loading="saveCustomLoading"
           @click="saveCourse">
         </q-btn>
       </q-card-actions>
@@ -149,7 +150,7 @@
   export default {
     components: {},
     props: {
-      saveObj: {
+      customerObj: {
         type: Object,
         default: null
       }
@@ -177,11 +178,12 @@
           Account: "", //账号
           Remark: "", //备注
         },
-        saveCourseLoading: false,
+        saveCustomLoading: false,
         provinceList: [], //省
         cityList: [], //市  
         regionList: [], //区
         CustomerBrandList: [], //所属品牌下拉
+        optionTitle:''
       }
     },
     created() {},
@@ -191,23 +193,63 @@
     methods: {
       //初始化表单
       initObj() {
-        GetCustomer({
-          CustomerId: 1
-        }).then(res => {
-          console.log("res", res);
-          var tempData = res.Data;
-
-        })
-        if (this.saveObj && this.saveObj.CustomerId > 0) {
-
+        if (this.customerObj && this.customerObj.CustomerId > 0) {
+          let msg = {
+            CustomerId: this.customerObj.CustomerId
+          }
+          GetCustomer(msg).then(res => {
+              console.log(res,'数据');
+            if (res.Code == 1) {
+              let tempData = res.Data;
+              this.objOption.CustomerId = tempData.CustomerId;
+              this.objOption.CustomerName = tempData.CustomerName;
+              this.objOption.ContactNumber = tempData.ContactNumber;
+              this.objOption.Sex = tempData.Sex;
+              this.objOption.Fax = tempData.Fax;
+              this.objOption.QQ = tempData.QQ;
+              this.objOption.Email = tempData.Email;
+              this.objOption.Address = tempData.Address;
+              this.objOption.Account = tempData.Account;
+              this.objOption.Remark = tempData.Remark;
+            }
+          })
           this.optionTitle = "修改客户信息"
         } else {
+          this.objOption.CustomerId = 0;
+          this.objOption.CustomerName = '';
+          this.objOption.ContactNumber = '';
+          this.objOption.Sex = 1;
+          this.objOption.Fax = '';
+          this.objOption.QQ = '';
+          this.objOption.Email = '';
+          this.objOption.Address = '';
+          this.objOption.Account = '';
+          this.objOption.Remark = '';
           this.optionTitle = "新增客户信息"
         }
       },
       //保存
       saveCourse() {
-
+        this.$refs.CustomerName.validate();
+        this.$refs.ContactNumber.validate();
+        this.$refs.Address.validate();
+        if (!this.$refs.CustomerName.hasError && !this.$refs.ContactNumber.hasError && !this.$refs.Address.hasError) {
+          this.saveCustomLoading = true;
+          SetCustomer(this.objOption).then(res => {
+            if (res.Code == 1) {
+              this.saveCustomLoading = false;
+              this.$q.notify({
+                icon: "iconfont icon-chenggong",
+                color: "accent",
+                timeout: 2000,
+                message: "数据保存成功！",
+                position: "top",
+              });
+              this.$emit("success");
+              this.closeCourseForm()
+            }
+          })
+        }
       },
       //关闭弹窗
       closeCourseForm() {
@@ -216,4 +258,5 @@
       },
     },
   }
-</script>
+
\ No newline at end of file
+</script>

src/pages/sale/peerManagement.vue

@@ -41,11 +41,17 @@
         </template>
         <template v-slot:body-cell-optioned="props">
           <q-td :props="props" style="width:200px;">
+<<<<<<< HEAD
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
               @click="EditCustom(props.rows)" />
             <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="客户审批"
               @click="AuditCustomer(props.rows)" />
 
+=======
+            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" @click="EditCustom(props.row)" />
+            <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="客户审批" @click="AuditCustomer(props.row)" />
+ 
+>>>>>>> 29ded45511ea95ccb28a26bb4c112eea321df0ff
           </q-td>
         </template>
       </q-table>