zhaoxiaohai преди 2 години
родител
ревизия
3717340ea3

+ 136 - 127
packageA/setclient/modules/financing/add/index.js

@@ -1,130 +1,139 @@
-const _Http = getApp().globalData.http;
+const _Http = getApp().globalData.http,
+  pages = getCurrentPages();
+
 Page({
-    data: {
-        form: [{
-            label: "名称",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "企业名称",
-            valueName: "enterprisename",
-            required: true,
-            checking: "base"
-        }, {
-            label: "纳税人识别号",
-            error: false,
-            errMsg: "",
-            type: "number",
-            value: "",
-            placeholder: "纳税人识别号",
-            valueName: "taxno",
-            required: true,
-            checking: "base"
-        }, {
-            label: "账号",
-            error: false,
-            errMsg: "",
-            type: "number",
-            value: [],
-            placeholder: "银行账户",
-            valueName: "bankcardno",
-            required: true
-        }, {
-            label: "开户行",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: [],
-            placeholder: "开户行",
-            valueName: "bank",
-            required: true
-        }, {
-            label: "详细地址",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "例: 浙江省嘉兴市南湖区中山路...",
-            valueName: "address",
-            required: true,
-            checking: "base"
-        }, {
-            label: "联系人号码",
-            error: false,
-            errMsg: "",
-            type: "phone",
-            value: "",
-            placeholder: "联系人手机号码",
-            valueName: "phonenumber",
-            required: true,
-            checking: "phone"
-        }],
-        disabled: true,
-        "content": {
-            "sys_enterprise_financeid": 0,
-            "remarks": "",
-            "isdefault": 0
-        },
+  data: {
+    form: [{
+      label: "名称",
+      error: false,
+      errMsg: "",
+      type: "textarea",
+      value: "",
+      placeholder: "企业名称",
+      valueName: "enterprisename",
+      required: true,
+      checking: "base"
+    }, {
+      label: "纳税人识别号",
+      error: false,
+      errMsg: "",
+      type: "number",
+      value: "",
+      placeholder: "纳税人识别号",
+      valueName: "taxno",
+      required: true,
+      checking: "base"
+    }, {
+      label: "账号",
+      error: false,
+      errMsg: "",
+      type: "number",
+      value: [],
+      placeholder: "银行账户",
+      valueName: "bankcardno",
+      required: true
+    }, {
+      label: "开户行",
+      error: false,
+      errMsg: "",
+      type: "textarea",
+      value: [],
+      placeholder: "开户行",
+      valueName: "bank",
+      required: true
+    }, {
+      label: "详细地址",
+      error: false,
+      errMsg: "",
+      type: "textarea",
+      value: "",
+      placeholder: "例: 浙江省嘉兴市南湖区中山路...",
+      valueName: "address",
+      required: true,
+      checking: "base"
+    }, {
+      label: "联系人号码",
+      error: false,
+      errMsg: "",
+      type: "phone",
+      value: "",
+      placeholder: "联系人手机号码",
+      valueName: "phonenumber",
+      required: true,
+      checking: "phone"
+    }],
+    disabled: true,
+    "content": {
+      "sys_enterprise_financeid": 0,
+      "remarks": "",
+      "isdefault": 0
     },
-    onLoad(options) {
-        if (options.data) {
-            let item = JSON.parse(options.data)
-            this.setData({
-                form: this.data.form.map(v => {
-                    v.value = item[v.valueName]
-                    return v
-                }),
-                "content.sys_enterprise_financeid": item.sys_enterprise_financeid,
-                "content.remarks": item.remarks,
-                "content.isdefault": item.isdefault,
-                disabled: false
-            })
-        }
-    },
-    /* 提交数据 */
-    submit() {
-        let data = this.selectComponent("#Form").submit();
-        if (!data || this.data.disabled) return;
-        let pages = getCurrentPages(),
-            content = {
-                ...this.data.content,
-                ...data
-            };
-        content.sys_enterpriseid = pages[pages.length - 2].data.detail.sys_enterpriseid;
-        _Http.basic({
-            "id": "20221013160402",
-            content
-        }).then(res => {
-            console.log("添加财务信息", res)
-            if (res.msg != '成功') return wx.showToast({
-                title: res.data,
-                icon: "none"
-            });
-            wx.showToast({
-                title: '保存成功',
-                icon: "none"
-            });
-            setTimeout(() => {
-                let pages = getCurrentPages();
-                pages[pages.length - 2].partialRenewal(true);
-                wx.navigateBack();
-            }, 500)
-        })
-    },
-    /* 设置默认 */
-    checkboxChange() {
-        this.setData({
-            "content.isdefault": this.data.content.isdefault == 1 ? 0 : 1
-        })
-    },
-    /* 表单是否填写完成 */
-    onConfirm({
-        detail
-    }) {
-        this.setData({
-            disabled: detail
-        })
-    },
-    onShareAppMessage() {}
+  },
+  onLoad(options) {
+    if (options.data) {
+      let item = JSON.parse(options.data)
+      this.setData({
+        form: this.data.form.map(v => {
+          v.value = item[v.valueName]
+          return v
+        }),
+        "content.sys_enterprise_financeid": item.sys_enterprise_financeid,
+        "content.remarks": item.remarks,
+        "content.isdefault": item.isdefault,
+        disabled: false
+      })
+    }
+  },
+  /* 提交数据 */
+  submit() {
+    let data = this.selectComponent("#Form").submit();
+    if (!data || this.data.disabled) return;
+    let content = {
+      ...this.data.content,
+      ...data
+    };
+    let fast = getCurrentPages().find(v => v.__route__ == 'packageA/setclient/detail');
+    console.log("123123", fast.data.detail.sys_enterpriseid)
+    content.sys_enterpriseid = fast.data.detail.sys_enterpriseid;
+
+    _Http.basic({
+      "id": "20221013160402",
+      content
+    }).then(res => {
+      console.log("添加财务信息", res)
+      if (res.msg != '成功') return wx.showToast({
+        title: res.data,
+        icon: "none"
+      });
+      wx.showToast({
+        title: '保存成功',
+        icon: "none"
+      });
+      setTimeout(() => {
+        let fast = pages.find(v => v.__route__ == 'packageA/setclient/detail');
+        if (fast) fast.partialRenewal(true);
+
+        let detail = pages.find(v => v.__route__ == 'packageA/setclient/modules/financing/detail/index');
+        if (detail) detail.initList(content)
+        console.log(content)
+
+        wx.navigateBack();
+      }, 500)
+    })
+  },
+  /* 设置默认 */
+  checkboxChange() {
+    this.setData({
+      "content.isdefault": this.data.content.isdefault == 1 ? 0 : 1
+    })
+  },
+  /* 表单是否填写完成 */
+  onConfirm({
+    detail
+  }) {
+    this.setData({
+      disabled: detail
+    })
+  },
+  onShareAppMessage() {}
 })

+ 86 - 0
packageA/setclient/modules/financing/detail/index.js

@@ -0,0 +1,86 @@
+Page({
+  data: {
+    item: {},
+
+    tabbarList: [{
+      icon: "icon-bodadianhua",
+      label: "呼叫",
+      alias: "call"
+    }, {
+      icon: "icon-a-yingxiaowuliaofuzhi",
+      label: "复制",
+      alias: "copy"
+    }, {
+      icon: "icon-bianji",
+      label: "编辑",
+      alias: "edit"
+    }, {
+      icon: "icon-shanchu",
+      label: "删除",
+      alias: "delete"
+    }]
+  },
+  onLoad(options) {
+    console.log(options)
+    if (options.data) {
+      let item = JSON.parse(options.data);
+      this.initList(item)
+      this.setData({
+        item
+      })
+    }
+  },
+  /* 初始化列表 */
+  initList(item) {
+    this.setData({
+      list: [{
+        label: "名称",
+        value: item.enterprisename
+      }, {
+        label: "纳税人识别号",
+        value: item.taxno
+      }, {
+        label: "地址",
+        value: item.address
+      }, {
+        label: "开户行",
+        value: item.bank
+      }, {
+        label: "账号",
+        value: item.bankcardno
+      }, {
+        label: "联系人号码",
+        value: item.phonenumber
+      }],
+    })
+  },
+  //详情按钮回调
+  tabbarOnClick({
+    detail
+  }) {
+    let pages = getCurrentPages();
+    pages[pages.length - 2].selectComponent('#Financing').selectComponent('#List').handleItem({
+      target: {
+        dataset: {
+          name: detail.alias,
+          item: this.data.item
+        }
+      }
+    });
+  },
+  //详情单元格单击复制
+  clickItem({
+    detail
+  }) {
+    wx.setClipboardData({
+      data: detail.value,
+      success: () => {
+        wx.hideToast();
+        wx.showToast({
+          title: `已复制${detail.label}`,
+          icon: "none"
+        })
+      }
+    })
+  },
+})

+ 4 - 0
packageA/setclient/modules/financing/detail/index.json

@@ -0,0 +1,4 @@
+{
+    "usingComponents": {},
+    "navigationBarTitleText": "财务信息"
+}

+ 1 - 0
packageA/setclient/modules/financing/detail/index.scss

@@ -0,0 +1 @@
+/* packageA/setclient/modules/financing/detail/index.wxss */

+ 2 - 0
packageA/setclient/modules/financing/detail/index.wxml

@@ -0,0 +1,2 @@
+<Yl_ReportForms showAll='{{false}}' list='{{list}}' bindclickItem='clickItem' />
+<Yl_Tabbar list='{{tabbarList}}' bind:callback="tabbarOnClick" />

+ 0 - 1
packageA/setclient/modules/financing/index.js

@@ -50,7 +50,6 @@ Component({
                     "content.total": res.total,
                     sys_enterpriseid: id
                 })
-
                 setTimeout(() => {
                     this.selectComponent("#List").queryDefault()
                 }, 300)

+ 19 - 87
packageA/setclient/modules/financing/list/index.js

@@ -9,82 +9,19 @@ Component({
   },
   data: {
     radio: 0,
-    detail: {
-      item: {},
-      list: [],
-      show: false
-    },
-    tabbarList: [{
-      icon: "icon-bodadianhua",
-      label: "呼叫",
-      alias: "call"
-    }, {
-      icon: "icon-a-yingxiaowuliaofuzhi",
-      label: "复制",
-      alias: "copy"
-    }, {
-      icon: "icon-bianji",
-      label: "编辑",
-      alias: "edit"
-    }, {
-      icon: "icon-shanchu",
-      label: "删除",
-      alias: "delete"
-    }]
+    detailItem: {},
   },
   methods: {
-    //详情单元格单击复制
-    clickItem({
-      detail
-    }) {
-      wx.setClipboardData({
-        data: detail.value,
-        success: () => {
-          wx.hideToast();
-          wx.showToast({
-            title: `已复制${detail.label}`,
-            icon: "none"
-          })
-        }
-      })
-    },
     //打开详情
     onClick(e) {
       const {
         item
       } = e.currentTarget.dataset;
       this.setData({
-        "detail.show": true,
-        "detail.list": [{
-          label: "名称",
-          value: item.enterprisename
-        }, {
-          label: "纳税人识别号",
-          value: item.taxno
-        }, {
-          label: "地址",
-          value: item.address
-        }, {
-          label: "开户行",
-          value: item.bank
-        }, {
-          label: "账号",
-          value: item.bankcardno
-        }, {
-          label: "联系人号码",
-          value: item.phonenumber
-        }],
-        "detail.item": item
+        "detailItem": item
       })
-    },
-    //关闭详情弹窗
-    onClose() {
-      this.setData({
-        detail: {
-          item: {},
-          list: [],
-          show: false
-        }
+      wx.navigateTo({
+        url: '/packageA/setclient/modules/financing/detail/index?data=' + JSON.stringify(item),
       })
     },
     /* 处理快捷小按钮 */
@@ -126,12 +63,16 @@ Component({
                     list: that.data.list.filter(v => v.sys_enterprise_financeid != item.sys_enterprise_financeid)
                   });
                   that.triggerEvent("changeTotal");
-                  that.onClose();
-                  wx.showToast({
-                    title: '删除成功',
-                    icon: "none"
-                  });
-                })
+                  that.setData({
+                    detailItem: {}
+                  })
+                  let pages = getCurrentPages();
+                  if (pages[pages.length - 1].__route__ == 'packageA/setclient/modules/financing/detail/index') wx.navigateBack()
+                    wx.showToast({
+                      title: '删除成功',
+                      icon: "none"
+                    });
+                });
               }
             }
           })
@@ -140,13 +81,16 @@ Component({
           wx.navigateTo({
             url: '/packageA/setclient/modules/financing/add/index?data=' + JSON.stringify(item),
           });
-          that.onClose();
+          that.setData({
+            detailItem: {}
+          })
           break;
       }
     },
     /* 查询默认项目 */
     queryDefault() {
       const item = this.data.list.find(v => v.isdefault == 1);
+      if (!item) return;
       this.setData({
         radio: item.sys_enterprise_financeid
       })
@@ -174,18 +118,6 @@ Component({
         })
       })
     },
-    //详情按钮回调
-    tabbarOnClick({
-      detail
-    }) {
-      this.handleItem({
-        target: {
-          dataset: {
-            name: detail.alias,
-            item: this.data.detail.item
-          }
-        }
-      })
-    }
+
   }
 })

+ 1 - 2
packageA/setclient/modules/financing/list/index.wxml

@@ -30,6 +30,5 @@
 
 <van-popup show="{{  detail.show }}" position="bottom" custom-style="height: 100%" round closeable safe-area-inset-bottom='{{false}}' bind:close='onClose' bind:cancel='onClose'>
   <view class="pop-title">财务信息</view>
-  <Yl_ReportForms showAll='{{false}}' list='{{detail.list}}' bindclickItem='clickItem' />
-  <Yl_Tabbar list='{{tabbarList}}' bind:callback="tabbarOnClick" />
+
 </van-popup>