Merge branch 'master' of http://124.70.211.186:3000/zxh/prsx-crm

components/Yl_field/index.js

@@ -54,7 +54,7 @@ Component({
 
     },
     route(e) {
-      console.log('11111')
+
       const {
         item
       } = e.currentTarget.dataset;
@@ -192,7 +192,6 @@ Component({
         index
       } = e.target.dataset,
         value = e.detail.value;
-      console.log(value, '22222////')
       this.setData({
         [`form[${index}].value`]: item.range[value[0]][value[1]].subarea[0][item.selectKey || item.rangeKey],
         [`form[${index}].rangeIndex`]: value,
@@ -297,20 +296,15 @@ Component({
     },
     /* 单选 选择器改变 */
     radioChange(e) {
-      console.log(e,'e数据输出111')
-      // console.log(this.data.form[index].value == e.detail,'判断')
-      console.log()
       let item = e.currentTarget.dataset.item,
         index = this.data.form.findIndex(v => v.valueName == item.valueName);
         
-        console.log(this.data.form[index].value)
-        console.log(e.detail)
       if (this.data.form[index].value == e.detail) return;
       this.setData({
         [`form[${index}].value`]: e.detail,
         [`form[${index}].error`]: false,
       });
-      console.log(item.interrupt,this.data.form[index],this.data.form,item)
+      
       if (item.interrupt) this.triggerEvent("interrupt", {
         data: this.data.form[index],
         form: this.data.form,

prsx/dealer/insert.js

@@ -101,7 +101,7 @@ Page({
       placeholder: "详细地址",
       valueName: "address",
       checking: "base",
-      required: false
+      required: true
     }, {
       label: "企业规模",
       error: false,
@@ -174,7 +174,8 @@ Page({
       placeholder: "营销区域",
       valueName: "sa_saleareaid",
       required: true, //必填
-      disabled: true
+      disabled: true,
+      interrupt: true,
   },{
       label: "备注",
       error: false,
@@ -192,7 +193,7 @@ Page({
         isEdit:true
       })
       let data = JSON.parse(options.data);
-      console.log("data", data)
+      
       data.parentid = data.parentid?[data.parent_enterprisename, [data.parentid]]:''
       form = form.map(v => {
         if (v.valueName != 'region') {
@@ -251,15 +252,19 @@ Page({
           },
       }).then(res => {
           if (res.code != 1) return;
-          console.log('2222,',res.data)
+          
           let obj = form.find(v => v.label == '营销区域')
           obj.range = res.data.salearea;
-          if (obj.range.length == 1) obj.value = obj.range[0].areaname;
-          obj.disabled = true;
+          if (obj.range.length == 1) {
+            obj.value = obj.range[0].areaname;
+            obj.disabled = true;
+          }else {
+            obj.disabled = false;
+          }
           this.setData({
               form,
               hrid,
-              sa_saleareaid:res.data.salearea[0].sa_saleareaid
+              sa_saleareaid:obj.range[0].sa_saleareaid
           })
       })
   }
@@ -281,7 +286,6 @@ Page({
           }
       }
     }).then(res => {
-      console.log(res,'输出res')
       let obj = this.data.form.find(v => v.label == '营销区域')
       obj.value = res.data[0].areaname
       let obj2 = this.data.form.find(v => v.label == '业务员')
@@ -291,7 +295,6 @@ Page({
         hrid:res.data[0].hrid,
         sa_saleareaid:res.data[0].sa_saleareaid
       })
-      console.log(this.data.form,'form333')
     })
   },
   interrupt(e) {
@@ -300,19 +303,34 @@ Page({
       form,
       temporary
     } = e.detail;
-    console.log(data, form, temporary)
+    console.log(data)
     if (temporary.item.label == '业务员'){
       form.find(v => v.label == '业务员').value = [data.item.name, [data.item.hrid]];
       let obj = form.find(v => v.label == '营销区域')
-      obj.value = data.item.areaname
+      obj.range = data.item.sa_saleareas;
+      obj.value = data.area[0];
+      obj.disabled = true;
+      this.setData({
+        sa_saleareaid:data.area[1],
+        hrid:data.item.hrid,
+      })
       wx.navigateBack()
+    }else if (temporary.item.label == '营销区域') {
+      form.find(v => v.label == '营销区域').value = data.value;
+      let obj 
+      data.range.forEach(item =>{
+        if (item.areaname == data.value) {
+          obj = item
+        }
+      })
+      this.setData({
+        sa_saleareaid:obj.sa_saleareaid
+      })
     }
+    this.selectComponent("#Form").confirm();
     this.setData({
-      hrid:data.item.hrid,
-      sa_saleareaid:data.item.sa_saleareaid,
       form
     })
-    console.log(this.data.sa_saleareaid,'999')
   },
   /* 表单必填项是否完成 */
   onConfirm({
@@ -408,6 +426,7 @@ Page({
     })
   },
   authorized(data){
+   
     _Http.basic({
       "id": 20221223141602,
       "content": {
@@ -462,7 +481,7 @@ Page({
   /* 工商查询 */
   queryClient() {
     let data = this.selectComponent("#Form").query();
-    console.log("234243", data)
+    
     if (data.enterprisename == '') {
       getApp().globalData.Language.showToast('您还未填写企业名称')
     } else {

prsx/hospital/insert.js

@@ -217,8 +217,8 @@ Page({
             form.find(v => v.label == '负责人').value = data.value;
             let obj = form.find(v => v.label == '营销区域')
             obj.range = data.item.sa_saleareas;
-            obj.value = obj.range[0].areaname;
-            obj.disabled = false;
+            obj.value = data.area[0];
+            obj.disabled = true;
             wx.navigateBack()
         }
         this.selectComponent("#Form").confirm();

prsx/select/saler/index.js

@@ -7,11 +7,10 @@ Page({
         radio: false, //是否为单选
         idname: "userid", //idkey
         showName: "name", //表单用 显示名称
+        area:''
     },
     onLoad(options) {
-      console.log(options.params,'options')
         if (options.params && options.params != '{}') {
-          console.log('执行了这个？')
             this.setData({
                 params: JSON.parse(options.params)
             })
@@ -39,7 +38,7 @@ Page({
                             },
                         }
                     });
-                    console.log(this.data.params,'params11111')
+        
                     this.getList()
                 }
             })
@@ -54,7 +53,6 @@ Page({
         //init 用于初始化分页
         if (init.detail != undefined) init = init.detail;
         let params = this.data.params;
-        console.log(this.data.params,'params')
         if (init) params.content.pageNumber = 1;
         if (params.content.pageNumber > params.content.pageTotal) return;
         //init 用于初始化分页
@@ -75,6 +73,11 @@ Page({
     },
     /* 选中 */
     changeResult(e) {
+      console.log(e)
+      let area = e.currentTarget.dataset.area
+      this.setData({
+        area
+      })
         let {
             id
         } = e.currentTarget.dataset, result = this.data.result;
@@ -90,14 +93,11 @@ Page({
     },
     /* 提交 */
     submit() {
-      console.log(this.data.radio,'radio11')
-      // console.log(this.data.list.find(value => value[this.data.idname] == result)[this.data.showName])
-      console.log(this.data.list,'list2222')
-      console.log(this.data.idname)
         let result = this.data.result,
             obj = this.data.radio ? {
                 id: result,
                 item: this.data.list.find(value => value[this.data.idname] == result),
+                area:this.data.area,
                 value: [this.data.list.find(value => value[this.data.idname] == result)[this.data.showName], result]
             } : {
                 result,

prsx/select/saler/index.wxml

@@ -2,7 +2,7 @@
 </van-search>
 <view class="global-total">总共{{params.content.total}}个</view>
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
-	<view class="global-card" wx:for='{{list}}' hover-class="navigator-hover" wx:key="userid" data-id="{{item.userid}}" bind:tap="changeResult">
+	<view class="global-card" wx:for='{{list}}' hover-class="navigator-hover" wx:key="userid" data-id="{{item.userid}}" bind:tap="changeResult" data-area="{{[item.areaname,item.sa_saleareaid]}}">
 		<view class="title">{{item.name || ' --'}}</view>
 		<view class="row">编号：{{item.accountno || ' --'}}</view>
 		<view class="row">手机号：{{item.phonenumber || ' --'}}</view>