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

src/components/finance/consult-form.vue

@@ -87,7 +87,6 @@
   /deep/ .q-field__prepend {
     padding-right: 0px !important;
   }
-
 </style>
 <template>
   <q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale">
@@ -102,35 +101,35 @@
         </div>
         <div class="row wrap">
           <div class="col-6">
-            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.PlanName" ref="PlanName"
-              class="col-6 q-pb-lg q-pr-lg" label="方案名称" :rules="[val => !!val || '请输入方案名称']" />
+            <q-select filled option-value="Id" option-label="Name" class="col-6 q-pb-lg q-pr-lg"
+              v-model="objOption.PlanType" :options="TypeList" emit-value map-options label="方案类型" />
           </div>
           <div class="col-6">
-            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.BasicSalary" ref="BasicSalary"
-              class="col-6 q-pb-lg" label="基本工资" @keyup.native="checkPrice(objOption,'BasicSalary')" />
+            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.PlanName" ref="PlanName"
+              class="col-6 q-pb-lg" label="方案名称" :rules="[val => !!val || '请输入方案名称']" />
           </div>
         </div>
         <div class="row wrap">
           <div class="col-6">
-            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.OpenBonus" ref="OpenBonus"
-              class="col-6 q-pb-lg q-pr-lg" label="开单奖金" @keyup.native="checkPrice(objOption,'OpenBonus')" />
+            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.BasicSalary" ref="BasicSalary"
+              class="col-6 q-pb-lg q-pr-lg" label="基本工资" @keyup.native="checkPrice(objOption,'BasicSalary')" />
+
           </div>
           <div class="col-6">
-            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.WorkAgeSalary"
-              ref="WorkAgeSalary" class="col-6 q-pb-lg" label="工龄工资"
-              @keyup.native="checkPrice(objOption,'WorkAgeSalary')" />
+            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.OpenBonus" ref="OpenBonus"
+              class="col-6 q-pb-lg" label="开单奖金" @keyup.native="checkPrice(objOption,'OpenBonus')" suffix="/月" />
           </div>
         </div>
         <div class="row wrap">
           <div class="col-6">
-            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.ClueNumSalary"
-              ref="ClueNumSalary" class="col-6 q-pb-lg q-pr-lg" label="线索奖金"
-              @keyup.native="checkPrice(objOption,'ClueNumSalary')" />
+            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.WorkAgeSalary"
+              ref="WorkAgeSalary" class="col-6 q-pb-lg q-pr-lg" label="工龄工资"
+              @keyup.native="checkPrice(objOption,'WorkAgeSalary')" suffix="/年" />
           </div>
           <div class="col-6">
-            <q-select filled v-model="SaleIdsArray" multiple @filter="filterEmployee" use-input
-              :options="myEmployeeList" label="销售人员" option-label="EmployeeName" option-value="Id" emit-value
-              map-options />
+            <q-input filled stack-label maxlength="20" :dense="false" v-model="objOption.ClueNumSalary"
+              ref="ClueNumSalary" class="col-6 q-pb-lg" label="线索奖金"
+              @keyup.native="checkPrice(objOption,'ClueNumSalary')" suffix="大于5条" />
           </div>
         </div>
         <div class="row wrap">
@@ -147,16 +146,18 @@
         </div>
         <div class="row wrap">
           <div class="col-6">
-            <q-select filled option-value="Id" option-label="Name" class="col-6 q-pb-lg q-pr-lg"
-              v-model="objOption.PlanType" :options="TypeList" emit-value map-options label="方案类型" clearable />
+            <q-select filled v-model="SaleIdsArray" multiple @filter="filterEmployee" use-input class="col-6 q-pb-lg q-pr-lg"
+              :options="myEmployeeList" label="适用人员" option-label="EmployeeName" option-value="Id" emit-value
+              map-options />
           </div>
         </div>
-        <div class="row wrap" style="margin-bottom:20px;">
-          <div class="col-6">
-            业绩
-            <q-btn style="margin-left:30px;" size="10px" @click="addCourse()" round color="primary"
-              icon="iconfont icon-img_haha" />
-          </div>
+      </q-card-section>
+      <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
+        <div class="EmpLine_title">
+          <div class="Emp_Line"></div>
+          <div>达标人头数配置</div>
+          <q-btn style="margin-left:30px;" size="10px" @click="addCourse()" round color="primary"
+            icon="iconfont icon-img_haha" />
         </div>
         <div class="row wrap" v-for="(item,index) in objOption.DetailList" :key="index">
           <div class="col-4">
@@ -315,19 +316,19 @@
               var dataStrArr2 = tempData.UseCourseIds.split(",")
               var dataStrArr3 = tempData.NotUseCourseIds.split(",")
 
-              if(dataStrArr){
+              if (dataStrArr) {
                 this.SaleIdsArray = dataStrArr.map(item => {
-                    return +item;
+                  return +item;
                 });
               }
-              if(dataStrArr2){
+              if (dataStrArr2) {
                 this.UseCourseIdsArray = dataStrArr2.map(item => {
-                    return +item;
+                  return +item;
                 });
               }
-              if(dataStrArr3){
+              if (dataStrArr3) {
                 this.NotUseCourseIdsArray = dataStrArr3.map(item => {
-                    return +item;
+                  return +item;
                 });
               }
             }
@@ -378,5 +379,4 @@
       }
     },
   }
-
-</script>
+</script>
\ No newline at end of file

src/pages/financial/market/courseConsultant.vue

@@ -33,6 +33,7 @@
   .marketRules .singeRowTable tr th {
     border: 1px solid #d2d2d2;
   }
+
   .border-bottom {
     border-bottom: 1px dashed #EEE;
     padding-bottom: 5px;
@@ -68,9 +69,10 @@
         <template v-slot:body-cell-Id="props">
           <q-td :props="props">
             <div>
-              <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑" @click="AddMsg(props.row)" />
+              <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400" label="编辑"
+                @click="AddMsg(props.row)" />
               <q-btn flat size="xs" icon="delete" color="negative" class="q-mr-xs" label="删除"
-              @click="delConsult(props.row.Id)" />
+                @click="delConsult(props.row.Id)" />
             </div>
           </q-td>
         </template>
@@ -112,6 +114,12 @@
             field: "PlanName",
             align: "left"
           },
+          {
+            name: "PlanTypeStr",
+            label: "类型",
+            field: "PlanTypeStr",
+            align: "left"
+          },
           {
             name: "BasicSalary",
             label: "基本工资",
@@ -131,13 +139,6 @@
             align: "left",
             field: 'WorkAgeSalary'
           },
-          {
-            name: "CustomerTel",
-            required: true,
-            label: "客户电话",
-            align: "left",
-            field: row => row.CustomerTel
-          },
           {
             name: "ClueNumSalary",
             required: true,
@@ -201,7 +202,6 @@
       getList() {
         this.loading = true;
         GetBounsPlanPage(this.msg).then(res => {
-          console.log(res, '数据');
           if (res.Code == 1) {
             this.dataList = res.Data.PageData;
             this.pageCount = res.Data.PageCount;
@@ -220,7 +220,7 @@
       closeSaveForm() {
         this.isShowConsult = false;
       },
-      delConsult(Id){
+      delConsult(Id) {
         let delMsg = {
           Id: Id
         };
@@ -250,9 +250,7 @@
       }
     },
   }
-
 </script>
 <style lang="sass">
   @import url('~assets/css/table.sass')
-
-</style>
+</style>
\ No newline at end of file