qymljy hace 2 años
padre
commit
6fb46b9461

+ 2 - 3
src/Form/QuotedPrice/edit.vue

@@ -277,7 +277,7 @@
                     v-model="salesmanVisible"
                     width="500">
                   <selectSalesman  ref="selectSalesman"  :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange" v-model="form.name" placeholder="请选择业务员"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange" v-model="form.salername" placeholder="请选择业务员"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -477,12 +477,11 @@ export default {
   methods:{
     onShow(){
       this.drawer = true
-      console.log("编辑内容3",this.data)
       this.form = Object.assign({},this.form,this.data)
-      console.log("编辑内容3",this.data)
       this.form.date[0] = this.form.begdate
       this.form.date[1] = this.form.enddate
       this.form.discountrate = Math.round((this.form.discountrate * 100)*100)/100
+      this.form.salername = this.form.leader[0].name
       if (this.form.quotedpricetype === '项目报价'){
         this.isQuotedPrice = true
       }else {

+ 3 - 2
src/HDrpManagement/contractManage/components/itemClass/add.vue

@@ -288,7 +288,7 @@ export default {
         return {
           "sa_contract_itemsaleclassid":0,
           "itemclassid":e.itemclassid,
-          "discountrate":e.discountrate /100
+          "discountrate":e.discountrate
         }
       })
       this.selectData = obj
@@ -311,11 +311,12 @@ export default {
     selectionChange(val){
       this.tableSelectData = []
       this.tableSelectData = val
+      console.log(this.tableSelectData,"tableSelectData")
       let obj = this.tableSelectData.map(e=>{
         return {
           "sa_contract_itemsaleclassid":0,
           "itemclassid":e.itemclassid,
-          "discountrate":e.discountrate / 100
+          "discountrate":e.discountrate
         }
       })
       this.selectData = obj

+ 0 - 42
src/HDrpManagement/projectChange/modules/modules/contacts/components/add.vue

@@ -177,8 +177,6 @@
                     width="900"
                     v-model="associatedCustomers.show"
                     trigger="click">
-                  <el-tabs type="border-card" @tab-click="changeTabCustomers">
-                    <el-tab-pane label="关联客户">
                       <el-table
                           border
                           :data="associatedCustomers.listData"
@@ -215,46 +213,6 @@
                         </div>
                         <slot name="footerLeft"></slot>
                       </div>
-                    </el-tab-pane>
-                    <el-tab-pane label="我的客户" >
-                      <el-table
-                          border
-                          :data="myCustomers.listData"
-                          @row-click="myCustomersSelect"
-                          :header-cell-style="{background:'#EEEEEE',color:'#333'}"
-                          size="mini">
-                        <el-table-column width="80" label="单位编号">
-                          <template slot-scope="scope">
-                            <span >{{ scope.row.sys_enterpriseid?scope.row.sys_enterpriseid:'--' }}</span>
-                          </template>
-                        </el-table-column>
-                        <el-table-column width="190" label="单位名称">
-                          <template slot-scope="scope">
-                            <span >{{ scope.row.enterprisename?scope.row.enterprisename:'--' }}</span>
-                          </template>
-                        </el-table-column>
-                        <el-table-column  label="单位地址">
-                          <template slot-scope="scope">
-                            <span >{{ scope.row.address?scope.row.address:'--' }}</span>
-                          </template>
-                        </el-table-column>
-                      </el-table>
-                      <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
-                        <div class="container normal-panel" style="text-align:right">
-                          <el-pagination
-                              background
-                              @size-change="handleSizeMyCustomers"
-                              @current-change="handleCurrentMyCustomers"
-                              :current-page="myCustomers.currentPage"
-                              :page-sizes="[20, 50, 100, 200]"
-                              layout="total,sizes, prev, pager, next, jumper"
-                              :total="myCustomers.total">
-                          </el-pagination>
-                        </div>
-                        <slot name="footerLeft"></slot>
-                      </div>
-                    </el-tab-pane>
-                  </el-tabs>
                   <el-input  slot="reference" :disabled="form.contactsid !== 0"  autosize v-model="form.enterprisename" placeholder="请输入单位" @input="changeTabCustomers"></el-input>
                 </el-popover>
               </el-form-item>

+ 630 - 0
src/HDrpManagement/projectChange/modules/modules/contacts/components/addCopy.vue

@@ -0,0 +1,630 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="onshow">新 建</el-button>
+    <el-drawer
+        title="新建联系人"
+        :visible.sync="dialogFormVisible"
+        size="600px"
+        direction="rtl"
+        :show-close="false"
+        append-to-body
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="75px">
+            <el-col :span="24">
+              <el-form-item  label="姓名:" prop="name">
+                <el-popover
+                    placement="bottom-start"
+                    width="900"
+                    v-model="enterpriseContact.show"
+                    trigger="click">
+                  <el-tabs type="border-card" @tab-click="changeTab">
+                    <el-tab-pane label="企业联系人">
+                      <el-table
+                          border
+                          :data="enterpriseContact.listData"
+                          @row-click="enterpriseContactSelect"
+                          :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+                          size="mini">
+                        <el-table-column width="80" label="姓名">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.name?scope.row.name:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120" label="手机号">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.phonenumber?scope.row.phonenumber:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="邮箱">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.email?scope.row.email:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="部门">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.position?scope.row.position:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="职位">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.depname?scope.row.depname:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="80"  label="性别">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.sex?scope.row.sex:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="生日">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.birthday?scope.row.birthday:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="300"  label="家庭住址">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.address?scope.row.address:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="备注">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.remarks?scope.row.remarks:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
+                        <div class="container normal-panel" style="text-align:right">
+                          <el-pagination
+                              background
+                              @size-change="handleSizeChangeEnterprise"
+                              @current-change="handleCurrentChangeEnterprise"
+                              :current-page="enterpriseContact.currentPage"
+                              :page-sizes="[20, 50, 100, 200]"
+                              layout="total,sizes, prev, pager, next, jumper"
+                              :total="enterpriseContact.total">
+                          </el-pagination>
+                        </div>
+                        <slot name="footerLeft"></slot>
+                      </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="我的联系人" >
+                      <el-table
+                          border
+                          :data="myContacts.listData"
+                          @row-click="myContactSelect"
+                          :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+                          size="mini">
+                        <el-table-column width="80" label="姓名">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.name?scope.row.name:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120" label="手机号">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.phonenumber?scope.row.phonenumber:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="邮箱">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.email?scope.row.email:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="120"  label="部门">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.position?scope.row.position:'--' }}</span>
+                          </template>
+                        </el-table-column><el-table-column width="120"  label="职位">
+                        <template slot-scope="scope">
+                          <span >{{ scope.row.depname?scope.row.depname:'--' }}</span>
+                        </template>
+                      </el-table-column><el-table-column width="80"  label="性别">
+                        <template slot-scope="scope">
+                          <span >{{ scope.row.sex?scope.row.sex:'--' }}</span>
+                        </template>
+                      </el-table-column><el-table-column width="120"  label="生日">
+                        <template slot-scope="scope">
+                          <span >{{ scope.row.birthday?scope.row.birthday:'--' }}</span>
+                        </template>
+                      </el-table-column>
+                        <el-table-column width="300"  label="家庭住址">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.address?scope.row.address:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="200"  label="备注">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.remarks?scope.row.remarks:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
+                        <div class="container normal-panel" style="text-align:right">
+                          <el-pagination
+                              background
+                              @size-change="handleSizeChangeMy"
+                              @current-change="handleCurrentChangeMy"
+                              :current-page="myContacts.currentPage"
+                              :page-sizes="[20, 50, 100, 200]"
+                              layout="total,sizes, prev, pager, next, jumper"
+                              :total="myContacts.total">
+                          </el-pagination>
+                        </div>
+                        <slot name="footerLeft"></slot>
+                      </div>
+                    </el-tab-pane>
+                  </el-tabs>
+                  <el-input  slot="reference"  autosize v-model="form.name" placeholder="请输入姓名" @input="searchData"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="手机号:" prop="phonenumber">
+                <el-input   autosize v-model="form.phonenumber" placeholder="请输入手机号码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="邮箱:" :rules="[
+                { pattern:/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/, message: '请输入有效的邮箱',trigger: 'blur' }
+              ]">
+                <el-input   autosize v-model="form.email" placeholder="请输入邮箱"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="单位:" prop="enterprisename">
+                <el-popover
+                    placement="bottom-start"
+                    width="900"
+                    v-model="associatedCustomers.show"
+                    trigger="click">
+                  <el-tabs type="border-card" @tab-click="changeTabCustomers">
+                    <el-tab-pane label="关联客户">
+                      <el-table
+                          border
+                          :data="associatedCustomers.listData"
+                          @row-click="associatedCustomersSelect"
+                          :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+                          size="mini">
+                        <el-table-column width="80" label="单位编号">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.sys_enterpriseid?scope.row.sys_enterpriseid:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="190" label="单位名称">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.enterprisename?scope.row.enterprisename:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column  label="单位地址">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.address?scope.row.address:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
+                        <div class="container normal-panel" style="text-align:right">
+                          <el-pagination
+                              background
+                              @size-change="handleSizeAssociatedCustomers"
+                              @current-change="handleCurrentAssociatedCustomers"
+                              :current-page="associatedCustomers.currentPage"
+                              :page-sizes="[20, 50, 100, 200]"
+                              layout="total,sizes, prev, pager, next, jumper"
+                              :total="associatedCustomers.total">
+                          </el-pagination>
+                        </div>
+                        <slot name="footerLeft"></slot>
+                      </div>
+                    </el-tab-pane>
+                    <el-tab-pane label="我的客户" >
+                      <el-table
+                          border
+                          :data="myCustomers.listData"
+                          @row-click="myCustomersSelect"
+                          :header-cell-style="{background:'#EEEEEE',color:'#333'}"
+                          size="mini">
+                        <el-table-column width="80" label="单位编号">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.sys_enterpriseid?scope.row.sys_enterpriseid:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column width="190" label="单位名称">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.enterprisename?scope.row.enterprisename:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                        <el-table-column  label="单位地址">
+                          <template slot-scope="scope">
+                            <span >{{ scope.row.address?scope.row.address:'--' }}</span>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                      <div style="display:flex;align-items:center;flex-direction:row-reverse;justify-content:space-between">
+                        <div class="container normal-panel" style="text-align:right">
+                          <el-pagination
+                              background
+                              @size-change="handleSizeMyCustomers"
+                              @current-change="handleCurrentMyCustomers"
+                              :current-page="myCustomers.currentPage"
+                              :page-sizes="[20, 50, 100, 200]"
+                              layout="total,sizes, prev, pager, next, jumper"
+                              :total="myCustomers.total">
+                          </el-pagination>
+                        </div>
+                        <slot name="footerLeft"></slot>
+                      </div>
+                    </el-tab-pane>
+                  </el-tabs>
+                  <el-input  slot="reference" :disabled="form.contactsid !== 0"  autosize v-model="form.enterprisename" placeholder="请输入单位" @input="changeTabCustomers"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="部门:" >
+                <el-input  autosize v-model="form.depname" placeholder="请输入部门"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="职位:" >
+                <el-input  autosize v-model="form.position" placeholder="请输入职位"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="性别:" >
+                <el-radio v-model="form.sex" label="男">男</el-radio>
+                <el-radio v-model="form.sex" label="女">女</el-radio>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="生日:" >
+                <el-date-picker
+                    v-model="form.birthday"
+                    value-format="yyyy-MM-dd"
+                    type="date"
+                    placeholder="选择日期"
+                    style="width: 100%"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="家庭住址:" >
+                <el-input type="textarea" rows="5" v-model="form.address" placeholder="请输入家庭住址"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item  label="备注:" >
+                <el-input type="textarea"  rows="5" v-model="form.remarks" placeholder="请输入备注"></el-input>
+              </el-form-item>
+            </el-col>
+          </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" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "add",
+  props:["data"],
+  data(){
+    var validateMobilePhone = (rule, value, callback) => {
+      if (value === '') {
+        callback(new Error('手机号不可为空'));
+      } else {
+        if (value !== '') {
+          var reg=/^1[3456789]\d{9}$/;
+          if(!reg.test(value)){
+            callback(new Error('请输入有效的手机号码'));
+          }
+        }
+        callback();
+      }
+    };
+    return {
+      dialogFormVisible:false,
+      visible:false,
+      form:{
+        contactsid: 0, //0表示新增,大于0表示选择的联系人
+        sa_projectid: 1, //项目id
+        sys_enterpriseid: 1, //关联的企业id
+        sa_project_contactsid:0,
+        enterprisename:'',
+        name: "",
+        sex: "",
+        depname: "",
+        position: "",
+        isleader: 1,
+        birthday : "",
+        phonenumber: "",
+        email: "",
+        province: "",
+        city: "",
+        county: "",
+        address: "",
+        remarks: "",
+        sys_phonebookid:'',
+        ownerid: this.$route.query.id,
+        ownertable: "sa_project"
+      },
+      rules:{
+        name: [
+          { required: true, message: '姓名不能为空', trigger: 'blur,change' },
+        ],
+        phonenumber: [
+          { required: true, validator: validateMobilePhone, trigger: 'blur' },
+        ],
+        enterprisename: [
+          { required: true, message: '单位不能为空', trigger: 'blur,change' },
+        ]
+      },
+      enterpriseContact:{
+        param:{
+          "content": {
+            "sa_projectid": '',
+            "pageNumber": 1,
+            "pageSize": 10,
+            "where": {
+              "condition": ""
+            }
+          },
+          "id": 20221219201402,
+        },
+        listData:[],
+        total:0,
+        currentPage:0,
+        show:false
+      },
+      myContacts:{
+        param:{
+          "id": 20221219161202,
+          "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": ""
+            }
+          }
+        },
+        listData:[],
+        total:0,
+        currentPage:0,
+        show:false
+      },
+      associatedCustomers:{
+        param:{
+          "id": 20220920083901,
+          "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": "",
+              "sa_projectid":'',
+              "type":4,
+            }
+          }
+        },
+        listData:[],
+        total:0,
+        currentPage:0,
+        show:false
+      },
+      myCustomers:{
+        param:{
+          "id": 20220920083901,
+          "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+              "condition": "",
+              "sa_projectid":'',
+              "type":6,
+              "typemx":"",
+            }
+          }
+        },
+        listData:[],
+        total:0,
+        currentPage:0,
+        show:false
+      }
+    }
+  },
+  methods:{
+    onshow(){
+      this.dialogFormVisible = true
+      this.associatedCustomersList()
+      this.myCustomersList()
+      this.enterpriseContactList()
+      this.myContactList()
+      this.form.sys_enterpriseid = this.data.sys_enterpriseid
+      this.form.enterprisename = this.data.enterprisename
+    },
+    onSubmit(){
+      console.log(this.form,"添加联系人")
+      this.form.sa_projectid = this.data.sa_projectid
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": 20221219135502,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit("insertSuccess")
+          this.$refs['form'].resetFields()
+          this.form = {
+            contactsid: 0, //0表示新增,大于0表示选择的联系人
+            sa_projectid: 1, //项目id
+            sys_enterpriseid: 1, //关联的企业id
+            sa_project_contactsid:0,
+            enterprisename:'',
+            name: "",
+            sex: "",
+            depname: "",
+            position: "",
+            isleader: 1,
+            birthday : "",
+            phonenumber: "",
+            email: "",
+            province: "",
+            city: "",
+            county: "",
+            address: "",
+            remarks: "",
+            sys_phonebookid:''
+          }
+          this.dialogFormVisible = false
+        })
+      })
+    },
+    searchData(){
+      this.changeTab()
+    },
+    changeTab(){
+      this.enterpriseContactList()
+      this.myContactList()
+    },
+    changeTabCustomers(){
+      this.associatedCustomersList()
+      this.myCustomersList()
+    },
+    /*企业联系人*/
+    async enterpriseContactList(){
+      this.enterpriseContact.param.content.where.condition = this.form.name
+      this.enterpriseContact.param.content.sa_projectid = this.data.sa_projectid
+      const res = await this.$api.requested(this.enterpriseContact.param)
+      this.enterpriseContact.listData = res.data
+      this.enterpriseContact.total = res.total
+      this.enterpriseContact.currentPage = res.pageNumber
+    },
+    /*选择企业联系人*/
+    enterpriseContactSelect(val){
+      this.form = Object.assign({},this.form,val)
+      this.enterpriseContact.show = false
+    },
+    handleSizeChangeEnterprise(val) {
+      // console.log(`每页 ${val} 条`);
+      this.enterpriseContact.param.content.pageSize = val
+      this.enterpriseContactList()
+    },
+    handleCurrentChangeEnterprise(val) {
+      // console.log(`当前页: ${val}`);
+      this.enterpriseContact.param.content.pageNumber = val
+      this.enterpriseContactList()
+    },
+    /*我的联系人*/
+    async myContactList(){
+      this.myContacts.param.content.where.condition = this.form.name
+      this.myContacts.param.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.myContacts.param)
+      console.log(res,"我的联系人")
+      this.myContacts.listData = res.data
+      this.myContacts.total = res.total
+      this.myContacts.currentPage = res.pageNumber
+    },
+    /*选择我的联系人*/
+    myContactSelect(val){
+      console.log(val,"选择的联系人")
+      this.form.enterprisename = ''
+      this.form = Object.assign({},this.form,val)
+      this.enterpriseContact.show = false
+    },
+    handleSizeChangeMy(val) {
+      // console.log(`每页 ${val} 条`);
+      this.enterpriseContact.param.content.pageSize = val
+      this.enterpriseContactList()
+    },
+    handleCurrentChangeMy(val) {
+      // console.log(`当前页: ${val}`);
+      this.enterpriseContact.param.content.pageNumber = val
+      this.enterpriseContactList()
+    },
+    /*关联客户*/
+    async associatedCustomersList(){
+      this.associatedCustomers.param.content.where.condition = this.form.enterprisename
+      this.associatedCustomers.param.content.where.sa_projectid = this.data.sa_projectid
+      const res = await this.$api.requested(this.associatedCustomers.param)
+      console.log(res,"关联客户")
+      this.associatedCustomers.listData = res.data
+      this.associatedCustomers.total = res.total
+      this.associatedCustomers.currentPage = res.pageNumber
+    },
+    associatedCustomersSelect(val){
+      console.log(val,"选择关联客户")
+      this.form.sys_enterpriseid = val.sys_enterpriseid
+      this.form.enterprisename = val.enterprisename
+      this.associatedCustomers.show = false
+    },
+    handleSizeAssociatedCustomers(val) {
+      // console.log(`每页 ${val} 条`);
+      this.associatedCustomers.param.content.pageSize = val
+      this.associatedCustomersList()
+    },
+    handleCurrentAssociatedCustomers(val) {
+      // console.log(`当前页: ${val}`);
+      this.associatedCustomers.param.content.pageNumber = val
+      this.associatedCustomersList()
+    },
+    /*我的客户*/
+    async myCustomersList(){
+      this.myCustomers.param.content.where.condition = this.form.enterprisename
+      const res = await this.$api.requested(this.myCustomers.param)
+      console.log(res,"我的客户")
+      this.myCustomers.listData = res.data
+      this.myCustomers.total = res.total
+      this.myCustomers.currentPage = res.pageNumber
+    },
+    myCustomersSelect(val){
+      console.log(val,"选择我的客户")
+      this.form.sys_enterpriseid = val.sys_enterpriseid
+      this.form.enterprisename = val.enterprisename
+      this.associatedCustomers.show = false
+    },
+    handleSizeMyCustomers(val) {
+      // console.log(`每页 ${val} 条`);
+      this.myCustomers.param.content.pageSize = val
+      this.myCustomersList()
+    },
+    handleCurrentMyCustomers(val) {
+      // console.log(`当前页: ${val}`);
+      this.myCustomers.param.content.pageNumber = val
+      this.myCustomersSelect()
+    },
+    onClose(){
+      this.$refs['form'].resetFields()
+      this.form = {
+        contactsid: 0, //0表示新增,大于0表示选择的联系人
+        sa_projectid: 1, //项目id
+        sys_enterpriseid: 1, //关联的企业id
+        sa_project_contactsid:0,
+        enterprisename:'',
+        name: "",
+        sex: "",
+        depname: "",
+        position: "",
+        isleader: 1,
+        birthday : "",
+        phonenumber: "",
+        email: "",
+        province: "",
+        city: "",
+        county: "",
+        address: "",
+        remarks: "",
+        sys_phonebookid:''
+      }
+      this.dialogFormVisible = false
+    },
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>

+ 14 - 4
src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -298,12 +298,12 @@
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==1">
               <el-form-item label="订单金额比例(%):" prop="orderratio" >
-                <el-input type="text" size="small" v-model.number="form.orderratio"></el-input>
+                <el-input type="text" size="small" v-model.number="form.orderratio" placeholder="请输入0-100%" @change="orderratioChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24" v-if="form.calculatemodel==2">
               <el-form-item label="居间产品折扣(%):" prop="productdiscount">
-                <el-input type="text" size="small" v-model.number="form.productdiscount"></el-input>
+                <el-input type="text" size="small" v-model.number="form.productdiscount" placeholder="请输入0-100%" @change="productdiscountChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -360,7 +360,7 @@ export default {
     }
     var NumberSize = (rule, value, callback) => {
       if (+value > 100 || +value < 0 && value) {
-        return callback(new Error('折扣范围(0-100)'));
+        return callback(new Error('折扣范围(0-100%)'));
       }
       callback()
     }
@@ -399,7 +399,7 @@ export default {
         "sys_printmodelid": '',//可选
         "typemx":"",//可选
         "modelname":"",
-        "calculatemodel":'',
+        "calculatemodel":'1',
         "productdiscount":'',
         "orderratio":'',
         "ascription_title":'',
@@ -445,10 +445,14 @@ export default {
         productdiscount: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
+          { validator: checkNumber, trigger: 'blur'},
+          { validator: NumberSize, trigger: 'blur'}
         ],
         orderratio: [
           { message: '必须为数字', type:'number', trigger: 'change' },
           { required: true, message: '请填写折扣', trigger: 'blur' },
+          { validator: checkNumber, trigger: 'blur'},
+          { validator: NumberSize, trigger: 'blur'}
         ],
         salername: [
           { required: true, message: '请选择经销商', trigger: 'change' },
@@ -724,6 +728,12 @@ export default {
     },
     discountrateChange(){
       this.form.discountrate = Math.round(this.form.discountrate * 100)/100
+    },
+    orderratioChange(){
+      this.form.orderratio =  Math.round(this.form.orderratio * 100)/100
+    },
+    productdiscountChange(){
+      this.form.productdiscount =  Math.round(this.form.productdiscount * 100)/100
     }
   },
   created() {

+ 2 - 1
src/HManagement/accountManage/modules/teamInformation/index.vue

@@ -176,7 +176,8 @@ export default {
         "id":"20230302174301",
         "content":{
           "editable":this.isEdit,
-          "userid":this.row.userid
+          "userid":this.row.userid,
+          "leaderuserid":this.$route.query.id
         }
       })
       this.tool.showMessage(res,()=>{

+ 5 - 3
src/SDrpManagement/QuotedPrice/detail/modules/itemClass/add.vue

@@ -58,7 +58,9 @@
                 prop="discountrate"
                 label="折扣(%)"
                 width="150">
-              <span>100</span>
+              <template slot-scope="scope">
+                <span>{{scope.row.discountrate || '--'}}</span>
+              </template>
             </el-table-column>
             <el-table-column
                 fixed="right"
@@ -166,7 +168,7 @@ export default {
         return {
           "sa_quotedprice_itemclassid":0,
           "itemclassid":e.itemclassid,
-          "discountrate":100
+          "discountrate":e.discountrate
         }
       })
       this.selectData = obj
@@ -193,7 +195,7 @@ export default {
         return {
           "sa_quotedprice_itemclassid":0,
           "itemclassid":e.itemclassid,
-          "discountrate":100
+          "discountrate":e.discountrate
         }
       })
       this.selectData = obj

+ 2 - 2
vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites