业务员、区域管理、项目商机详情

src/Form/marketing2/saler/add.vue

@@ -8,62 +8,66 @@
         direction="rtl"
         append-to-body
         :show-close="false"
-        @close="dialogVisible = false">
+        @close="onClose">
       <div class="drawer__panel">
         <el-row>
           <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="75px" size="small">
-            <el-col :span="12">
-              <el-form-item label="业务员:" prop="hrid">
-                <selectMenber ref="selectMenber"  @selectMenber="selectMenber"></selectMenber>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="手机号:"  prop="phonenumber">
-                <el-input   v-model="form.phonenumber" placeholder="手机号" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="汇报对象:" prop="reporthrname">
-                <el-input   v-model="form.reporthrname" placeholder="汇报对象" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="编号:" prop="hrcode">
-                <el-input   v-model="form.hrcode" placeholder="编号" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="邮箱:" prop="email">
-                <el-input   v-model="form.email" placeholder="邮箱" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="部门:" prop="depname">
-                <el-input   v-model="form.depname" placeholder="部门" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="区域:" prop="areaname">
-<!--                <el-input  v-model="form.areaname" placeholder="区域" ></el-input>-->
-                <areaList :areaname="form.areaname" @selectArea="selectArea"></areaList>
-              </el-form-item>
-            </el-col>
-            <el-col :span="15">
-              <el-form-item  label="最低授权折扣(%):" prop="discountrate" label-width="132px">
-                <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" @change="discountrateChange(form.discountrate)"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item  prop="discountrate" label-width="132px">
-                <!-- <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" @change="discountrateChange(form.discountrate)"></el-input> -->
-                <el-checkbox :true-label="1" :false-label="0" v-model="form.iseditprice">是否可编辑订单价格</el-checkbox>
-              </el-form-item>
-            </el-col>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="业务员:" prop="hrid">
+                  <selectMenber ref="selectMenber"  @selectMenber="selectMenber"></selectMenber>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="手机号:"  prop="phonenumber">
+                  <el-input   v-model="form.phonenumber" placeholder="手机号" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item  label="汇报对象:" prop="reporthrname">
+                  <el-input   v-model="form.reporthrname" placeholder="汇报对象" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item  label="编号:" prop="hrcode">
+                  <el-input   v-model="form.hrcode" placeholder="编号" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item  label="邮箱:" prop="email">
+                  <el-input   v-model="form.email" placeholder="邮箱" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item  label="部门:" prop="depname">
+                  <el-input   v-model="form.depname" placeholder="部门" disabled></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item  label="区域:" prop="areaname">
+  <!--                <el-input  v-model="form.areaname" placeholder="区域" ></el-input>-->
+                  <areaList :areaname="form.areaname" @selectArea="selectArea"></areaList>
+                </el-form-item>
+              </el-col>
+              <el-col :span="15">
+                <el-form-item  label="最低授权折扣(%):" prop="discountrate" label-width="132px">
+                  <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" @change="discountrateChange(form.discountrate)"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item  prop="discountrate" label-width="132px">
+                  <!-- <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" @change="discountrateChange(form.discountrate)"></el-input> -->
+                  <el-checkbox :true-label="1" :false-label="0" v-model="form.iseditprice">是否可编辑订单价格</el-checkbox>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-<!--        <el-button size="small"  @click="onClose" class="normal-btn-width">取 消</el-button>-->
+        <el-button size="small"  @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -121,9 +125,6 @@ export default {
       this.form.sa_saleareaid = this.dataToForm.sa_saleareaid
     },
     onSubmit () {
-      console.log(this.dataToForm)
-
-      console.log(this.form)
       this.$refs['form'].validate((valid) => {
         if (!valid) return false
         this.$confirm('确定将此人设置为业务员吗?', '提示', {
@@ -145,7 +146,8 @@ export default {
             this.form = {
               "sa_saleareaid":'',
               "hrid":'',
-              "discountrate":''
+              "discountrate":'',
+              "iseditprice":"0"
             }
           })
         }).catch((err) => {
@@ -163,10 +165,14 @@ export default {
     },
     onClose(){
       this.dialogVisible = false
+      this.$refs.form.resetFields()
+      this.$refs.selectMenber.value.name = ''
+      this.$refs.selectMenber.value.hrid = ''
       this.form = {
         "sa_saleareaid":'',
         "hrid":'',
-        "discountrate":''
+        "discountrate":'',
+        "iseditprice":"0"
       }
     },
     discountrateChange(val){
@@ -179,7 +185,6 @@ export default {
       }
     },
     selectArea(val){
-      console.log(val,'选择的')
       this.form.areaname = val.label
       this.form.sa_saleareaid = val.sa_saleareaid
     }

src/Form/marketing2/saler/edit.vue

@@ -8,46 +8,50 @@
         direction="rtl"
         append-to-body
         :show-close="false"
-        @close="dialogVisible = false">
+        @close="onClose">
       <div class="drawer__panel">
         <el-row>
           <el-form :model="form"  :rules="rules" ref="form" label-position="right" label-width="75px" size="small" >
-            <el-col :span="12" >
-              <el-form-item label="业务员:" prop="hrid" >
-                <selectMenber ref="salerName"  @selectMenber="selectMenbers" :disabled="true"></selectMenber>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="手机号:"  prop="phonenumber">
-                <el-input   v-model="form.phonenumber" placeholder="手机号" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="汇报对象:" prop="reporthrname">
-                <el-input   v-model="form.reporthrname" placeholder="汇报对象" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="编号:" prop="hrcode">
-                <el-input   v-model="form.hrcode" placeholder="编号" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="邮箱:" prop="email">
-                <el-input   v-model="form.email" placeholder="邮箱" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="部门:" prop="depname">
-                <el-input   v-model="form.depname" placeholder="部门" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item  label="区域:" prop="areaname">
-                <el-input  v-model="form.areaname" placeholder="区域" disabled></el-input>
-<!--                <areaList :areaname="form.areaname" @selectArea="selectArea" disabled=""></areaList>-->
-              </el-form-item>
-            </el-col>
+            <el-row>
+              <el-col :span="12" >
+                <el-form-item label="业务员:" prop="hrid" >
+                  <selectMenber ref="salerName"  @selectMenber="selectMenbers" :disabled="true"></selectMenber>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="手机号:"  prop="phonenumber">
+                  <el-input   v-model="form.phonenumber" placeholder="手机号" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item  label="汇报对象:" prop="reporthrname">
+                  <el-input   v-model="form.reporthrname" placeholder="汇报对象" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item  label="编号:" prop="hrcode">
+                  <el-input   v-model="form.hrcode" placeholder="编号" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item  label="邮箱:" prop="email">
+                  <el-input   v-model="form.email" placeholder="邮箱" disabled></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item  label="部门:" prop="depname">
+                  <el-input   v-model="form.depname" placeholder="部门" disabled></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item  label="区域:" prop="areaname">
+                  <el-input  v-model="form.areaname" placeholder="区域" disabled></el-input>
+  <!--                <areaList :areaname="form.areaname" @selectArea="selectArea" disabled=""></areaList>-->
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
           <el-form :model="form"   :rules="rules" ref="form" label-position="right" label-width="132px" size="small">
             <el-col :span="15">
@@ -64,7 +68,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -105,6 +109,17 @@ export default {
       });
 
     },
+    onClose(){
+      this.dialogVisible = false
+      this.$refs.form.resetFields()
+      this.$refs.selectMenber.value.name = ''
+      this.$refs.selectMenber.value.hrid = ''
+      this.form = {
+        "sa_saleareaid":'',
+        "hrid":'',
+        "discountrate":''
+      }
+    },
     selectMenbers (data) {
       console.log(data)
       this.form = Object.assign({},this.form,data)
@@ -120,6 +135,7 @@ export default {
         })
         this.tool.showMessage(res,()=>{
           this.dialogVisible = false
+          this.$refs.form.resetFields()
           this.$emit('onSuccess')
         })
       })

src/HDrpManagement/projectChange/modules/detail.vue

@@ -459,7 +459,7 @@ export default {
         },
         {
           label:'项目规模',
-          value: this.mainData.scale + this.mainData.unitname
+          value: this.mainData.scale ? this.mainData.scale + this.mainData.unitname:'--'
         },
         {
           label:'项目等级',

src/HManagement/marketing2/salerScope/area/modules/start_area.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-tooltip class="item" effect="dark" :content="data.isused === 1?'停 用':'启 用'" placement="top-start">
-      <p @click="() => append()"><i style="font-weight:bold" :class="data.isused === 1?'el-icon-circle-close':'el-icon-circle-check'" ></i></p>
+    <el-tooltip class="item" effect="dark" :content="dataRow.isused === 1?'停 用':'启 用'" placement="top-start">
+      <p @click="() => append()"><i style="font-weight:bold" :class="dataRow.isused === 1?'el-icon-circle-close':'el-icon-circle-check'" ></i></p>
     </el-tooltip>
 
     <!-- <el-button v-if="data" size="small" :icon="data.isused === 1?'el-icon-circle-close':'el-icon-circle-check'" @click="() => append()">{{data.isused === 1?'停 用':'启 用'}}</el-button> -->
@@ -28,7 +28,7 @@ export default {
         type: 'warning'
       }).then(async () => {
         this.form = Object.assign({},this.form,this.data)
-        this.form.areaname = this.form.label 
+        this.form.areaname = this.form.label
         this.form.isused === 1?this.form.isused = 0:this.form.isused = 1
         const res = await this.$api.requested({
           "classname": "webmanage.sale.salearea.salearea",
@@ -38,7 +38,7 @@ export default {
         this.tool.showMessage(res,()=>{
           this.$emit('onStartArea',this.data.isused)
         })
-      }).catch(() => {     
+      }).catch(() => {
       });
     }
   }
@@ -55,4 +55,4 @@ export default {
   margin-top:32px;
   text-align: center;
 }
-</style>
+</style>