commit dd7a8e8cd9bb6f38b80de761d6657365adf2e4b8 (HEAD -> master, origin/master, origin/HEAD)
Author: yi_hai0804 <11179565@qq.com>
Date:   Mon Dec 2 16:23:40 2019 +0800

    修改了分配客户的BUG

diff --git a/src/view/baseset/Chargeman.vue b/src/view/baseset/Chargeman.vue
index cd244a5..d952bdf 100644
--- a/src/view/baseset/Chargeman.vue
+++ b/src/view/baseset/Chargeman.vue
@@ -232,7 +232,7 @@
                         {title: 'Email', key: 'Email', width:200, align: 'center'},
                         {title: '传真', key: 'Fax', width:100, align: 'center'},
                         {title: '添加时间', slot: 'Addtime', width:200, align: 'center'},
-                        {title: '联系方式', key: 'Tel', width:100, align: 'center'},
+                        {title: '备注', key: 'Remark', width:100, align: 'center'},
                     ],
                     // 表格数据
                     data:[],
@@ -314,14 +314,9 @@
             //获取数据
             getlist (){
                 customer.FuzzyGetContacter(this.pager.index,this.pager.size, this.search).then((d) => {
-                    
-                    //console.log(JSON.stringify(d.data));
-                    //this.table.data = d.data.rows;
-                    this.table.data = d.data.data.rows;
-                    //console.log(JSON.stringify(this.table.data));
-                
-                    this.pager.total = d.data.data.total;
-                    this.table.selection = [];
+                this.table.data = d.data.data.rows;
+                this.pager.total = d.data.data.total;
+                this.table.selection = [];
                 })
                 .catch(function(e) {
                     
@@ -657,9 +652,9 @@
             //dic.getByTypeCode("FollowStatus").then(d=>{
                 //this.followStatus.data = d.data;
             //})
-            this.getprovince();
+           // this.getprovince();
             this.getlist();
-            this.getlistCustomer();
+            //this.getlistCustomer();
 
             // customer.GetContacter({Name:"aaa5"}).then((d) => {console.log(d.data.data.length);})
         },
diff --git a/src/view/baseset/customer.vue b/src/view/baseset/customer.vue
index c24604c..9bfa0a5 100644
--- a/src/view/baseset/customer.vue
+++ b/src/view/baseset/customer.vue
@@ -29,6 +29,7 @@
           
                  <div style="display:inline-block;padding:0px 0px">
                   <RadioGroup v-model="search.Type" @on-change="onSearch">
+                        <Radio label="所有"> </Radio>
                     <Radio label="公海客户"> </Radio>
                     <Radio label="跟进客户"></Radio>
                      <Radio label="我的客户"></Radio>
@@ -1076,7 +1077,7 @@ const erp = new Erp()
                 search:{
                     Name:"", // 名称
                     Code:"", // 代码
-                    Type:"跟进客户", // 类型
+                    Type:"所有", // 类型
                     FollowStatus:"",//跟进状态
                     days:0,//未跟进天数
                     businessman:"",//归属业务员
@@ -1562,9 +1563,9 @@ const erp = new Erp()
                     this.chinaArea.provinces = d.data;
                     //console.log(JSON.stringify(this.chinaArea.provinces));
                     if(this.form.data.Province==""){
-                    this.form.data.Province = d.data[0].value;
+                    //this.form.data.Province = d.data[0].value;
                     }
-                    this.getcity(d.data[0].value);
+                    //this.getcity(d.data[0].value);
                    
                 })
             },
@@ -2112,7 +2113,8 @@ const erp = new Erp()
                 }
               
                 this.business.timeout = setTimeout(() => {
-                    erp.localemps({name: this.form.data.FEmpName}).then(d => {
+                   // console.log( this.formAssignCustomer.data.FEmpName);
+                    erp.localemps({name: this.formAssignCustomer.data.FEmpName}).then(d => {
                     if (d.data.success == true) {
                         this.business.list = d.data.data
                     }

commit 55649c1eeeb3c6d4c4b2d1f8b3c44f0ab7c7c86b
Author: yi_hai0804 <11179565@qq.com>
Date:   Mon Dec 2 08:52:14 2019 +0800

    含税单价未绑定数据

diff --git a/src/view/purchase/PurchaseForm.vue b/src/view/purchase/PurchaseForm.vue
index 87a6018..f123fba 100644
--- a/src/view/purchase/PurchaseForm.vue
+++ b/src/view/purchase/PurchaseForm.vue
@@ -193,7 +193,7 @@
           </template>
           <!-- 含税单价 -->
           <template slot-scope="{ row,index }" slot="FAuxTaxPrice">
-             <div v-if="itemtable.editIndex==index && (form.data.FStatus==0 || form.data.FStatus=='')"><InputNumber :active-change="false" style="width:100%"  @on-change="onFAuxTaxPriceChange"></InputNumber></div>
+             <div v-if="itemtable.editIndex==index && (form.data.FStatus==0 || form.data.FStatus=='')"><InputNumber :active-change="false" style="width:100%"  v-model="itemtable.editrow.FAuxTaxPrice"  @on-change="onFAuxTaxPriceChange" ></InputNumber></div>
              <div v-else>{{row.FAuxTaxPrice}}</div>
           </template>
           <!-- 折扣率 -->
@@ -203,7 +203,7 @@
           </template>
           <!-- 税率 -->
           <template slot-scope="{ row,index }" slot="FCess">
-             <div v-if="itemtable.editIndex==index && (form.data.FStatus==0 || form.data.FStatus=='')"> <InputNumber :active-change="false" style="width:100%" :min="0" v-model="itemtable.editrow.FCess" @on-change="onFCessChange"></InputNumber></div>
+             <div v-if="itemtable.editIndex==index && (form.data.FStatus==0 || form.data.FStatus=='')"> <InputNumber :active-change="false" style="width:100%" :min="0" v-model="itemtable.editrow.FCess" @on-change="onFCessChange"  ></InputNumber></div>
              <div v-else>{{row.FCess}}</div>
           </template>
           <!-- 客户 -->
@@ -318,6 +318,7 @@
     .ivu-auto-complete.ivu-select-dropdown {
     max-height: 300px;
 }
+
  /* .ivu-table .demo-table-info-row td{
       background-color: #c3ecff;
 
@@ -1258,6 +1259,8 @@ export default {
       that.size.windowHeight = window.innerHeight - 64 - 22
       that.ApplyDrawer.width = window.innerWidth
     }
+  
+
   }
 }
 </script>