瀏覽代碼

修复bug

xiaohaizhao 1 年之前
父節點
當前提交
6fbfd9dab3

+ 1 - 1
packageA/project/index.js

@@ -54,7 +54,7 @@ Page({
             }),
             'navList[0].label': wx.getStorageSync('templetList')[0].templetname,
             "content.type": wx.getStorageSync('templetList')[0].templetid,
-            insert: wx.getStorageSync('auth').wproject.options.some(v => v == 'insert'), //查询新增权限
+            insert: wx.getStorageSync('userMsg').siteid != 'HY' && wx.getStorageSync('auth').wproject.options.some(v => v == 'insert'), //查询新增权限
         });
         this.getList();
         let filtratelist = [{

+ 5 - 30
packageA/project/modules/contacts/add/index.js

@@ -80,7 +80,7 @@ Page({
                 value: "",
                 query: "&radio=true",
                 placeholder: "选择关联企业",
-                valueName: "sys_enterpriseid",
+                valueName: "contactsid",
                 required: false,
                 checking: "base",
             }, {
@@ -176,7 +176,6 @@ Page({
             groupname: "项目联系人",
             sys_phonebookid: 0,
             sa_project_contactsid: 0,
-            "contactsid": 0, //地址id
             "sa_projectid": 0, //绑定数据
             "isleader": 0, //默认0
             "workaddress": 0,
@@ -189,10 +188,8 @@ Page({
         if (options.data) {
             let item = JSON.parse(options.data),
                 arr = item.phonenumber.split("-");
-            if (item.sys_enterpriseid == 0) this.data.form = this.data.form.filter(v => v.valueName != 'sys_enterpriseid');
-            item.sys_enterpriseid = item.enterprisename ? [item.enterprisename, [item.sys_enterpriseid]] : '';
+            item.contactsid = item.enterprisename ? [item.enterprisename, [item.contactsid]] : '';
             item.isTelephone = arr.length == 2 ? "1" : "0";
-            this.data.content.contactsid = item.contactsid;
             if (item.sa_projectid) this.data.content.sa_projectid = item.sa_projectid;
             this.data.content.sys_phonebookid = item.sys_phonebookid || 0;
             this.data.content.sa_project_contactsid = item.sa_project_contactsid || 0;
@@ -221,9 +218,8 @@ Page({
                             checking: "phone"
                         }
                     } else {
-                        // v.value = Object.hasOwn(item, v.valueName) ? item[v.valueName] : v.value;
                         v.value = item[v.valueName] || v.value || '';
-                        if (v.valueName == 'sys_enterpriseid') {
+                        if (v.valueName == 'contactsid') {
                             v.query = v.query + ('&sys_phonebookid=' + (options.sys_phonebookid ? options.sys_phonebookid : item.sys_phonebookid || 0))
                             console.log(v)
                         }
@@ -305,13 +301,8 @@ Page({
     submit() {
         let data = this.selectComponent("#Form").submit();
         if (!data || this.data.disabled) return;
-        if (data.sys_enterpriseid) {
-            data.enterprisename = data.sys_enterpriseid[0] ? data.sys_enterpriseid[0] : "";
-            data.sys_enterpriseid = data.sys_enterpriseid[1] ? data.sys_enterpriseid[1][0] : 0;
-        } else {
-            data.sys_enterpriseid = 0;
-            data.enterprisename = '';
-        }
+        data.enterprisename = data.contactsid[0] ? data.contactsid[0] : "";
+        data.contactsid = data.contactsid[1] ? data.contactsid[1][0] : 0;
         const content = {
             ...this.data.content,
             ...data
@@ -322,23 +313,7 @@ Page({
             content.phonenumber = content.telephone.join("-");
             delete(content.telephone)
         }
-        // content.oldcontactsid = content.contactsid;
         this.handleSubmit(content);
-
-        /* if (this.data.sys_phonebookid == null) {} else {
-            let that = this;
-            wx.showModal({
-                title: '提示',
-                content: '是否删除原通讯录联系人信息',
-                complete({
-                    confirm
-                }) {
-                    content.sys_phonebookid = confirm ? content.sys_phonebookid : 0;
-                    // content.contactsid = 0;
-                    that.handleSubmit(content);
-                }
-            })
-        } */
     },
     handleSubmit(content) {
         console.log("提交", content)

+ 5 - 4
packageA/project/modules/contacts/select/index.js

@@ -15,6 +15,7 @@ Page({
         }
     },
     onLoad(options) {
+        console.log(options)
         if (options.sys_phonebookid) this.data.content.sys_phonebookid = options.sys_phonebookid;
         this.data.content.sa_projectid = getCurrentPages().find(v => v.__route__ == 'packageA/project/detail').data.sa_projectid
         /* 从表单组件进入进入 */
@@ -85,13 +86,13 @@ Page({
         let result = this.data.result,
             obj = this.data.radio ? {
                 id: result,
-                item: this.data.list.find(value => value.sys_enterpriseid == result),
-                value: [this.data.list.find(value => value.sys_enterpriseid == result).enterprisename, result]
+                item: this.data.list.find(value => value.contactsid == result),
+                value: [this.data.list.find(value => value.contactsid == result).enterprisename, result]
             } : {
                 result,
-                list: result.map(v => this.data.list.find(value => value.sys_enterpriseid == v)),
+                list: result.map(v => this.data.list.find(value => value.contactsid == v)),
                 value: [result.map(v => {
-                    let data = this.data.list.find(value => value.sys_enterpriseid == v);
+                    let data = this.data.list.find(value => value.contactsid == v);
                     return data ? data.enterprisename : ""
                 }), result]
             }

+ 2 - 2
packageA/project/modules/contacts/select/index.wxml

@@ -1,7 +1,7 @@
 <van-search class="search" value="{{ content.where.condition }}" shape="round" placeholder="请输入搜索关键词" bind:search='startSearch' bind:clear='onClear' />
 <Yl_ListBox id='ListBox' bind:getlist='getList'>
     <view class="total">共{{content.total}}个</view>
-    <navigator class="setclient-list-item" url="#" wx:for="{{list}}" wx:key="sys_enterpriseid" data-id="{{item.sys_enterpriseid}}" bindtap="changeResult">
+    <navigator class="setclient-list-item" url="#" wx:for="{{list}}" wx:key="contactsid" data-id="{{item.contactsid}}" bindtap="changeResult">
         <view class="con">
             <view class="portrait {{item.enterprisename <=2?'min-portrait':''}}">
                 {{handle.getName(item.enterprisename)}}
@@ -18,7 +18,7 @@
                 </view>
             </view>
             <view class="checkbox" wx:if="{{!radio}}">
-                <van-checkbox value='{{handle.isCheck(item.sys_enterpriseid,result)}}' />
+                <van-checkbox value='{{handle.isCheck(item.contactsid,result)}}' />
             </view>
         </view>
     </navigator>

+ 1 - 1
packageA/publicClue/addClue.js

@@ -346,7 +346,7 @@ Page({
                 })
             }
         })
-
+        this.selectComponent("#Form").confirm();
     },
     /* 打断 */
     interrupt({