供应商

api/pages/mst/org.js

@@ -20,7 +20,7 @@ module.exports = {
             // add: {key: 'add', url: '/pages/index/index2'},
           // 客户跟进
           chooseOrg: { key: 'chooseOrg', url: '/package-basic-data/pages/org/choose-org/choose-org'  },
- 
+          staffAdd: {key: 'add', url: '../staff/add/add'},
         }
     }
 };

app.json

@@ -19,9 +19,7 @@
                 "pages/register/company-setting/company-setting",
                 "pages/register/company-param-setting/company-param-setting",
                 "pages/test/add/add",
-                "pages/org/org",
-                "pages/org/add/add",
-                "pages/org/detail/detail",
+                "pages/org/org", 
                 "pages/staff/staff",
                 "pages/staff/add/add",
                 "pages/staff/detail/detail",

components/dkbase/dk-save-bottom/dk-save-bottom.js

@@ -133,14 +133,7 @@ Component({
     submit() {
       this.triggerEvent('submit')
     },
-    onCheckboxChange(event) {
-      this.setData({
-        checked: event.detail
-      });
-      this.triggerEvent('onCheckboxChange', {
-        checked: event.detail
-      })
-    },
+    
     /**
      * 批量清理
      */

i18n/zh-CN.js

@@ -156,6 +156,8 @@ const supplier = {
   supplierEdit:"编辑供应商",
   procurementSupplier:"采购供应商",
   serviceProvider:"服务供应商", 
+  meet:"应付",
+  save:'保存',
 }
 module.exports  = {
   items:Object.assign({},home,basicData,columns,saleOrder,button,messages,others,accountsManage,org,supplier)

package-basic-data/pages/org/add/add.js

@@ -1,68 +0,0 @@
-Page({
-    data: {
-        treeList: [{
-            id: '1',
-            pid: '0',
-            name: '祖先节点',
-            nodes: [{
-                    id: '1-1',
-                    pid: '1',
-                    name: '父节点1',
-                    nodes: [{
-                        id: '1-1-1',
-                        pid: '1-1',
-                        name: '子节点1',
-                        nodes: [{
-                                id: '1-1-1-1',
-                                pid: '1',
-                                name: '父节点1',
-                                nodes: [{
-                                    id: '1-1-1-1-1',
-                                    pid: '1-1',
-                                    name: '子节点1',
-                                    nodes: []
-                                }]
-                            },
-                            {
-                                id: '1-1-2',
-                                pid: '1',
-                                name: '父节点2',
-                                nodes: [{
-                                    id: '1-1-2',
-                                    pid: '1-1',
-                                    name: '子节点2',
-                                    nodes: []
-                                }]
-                            }
-                        ]
-                    }]
-                },
-                {
-                    id: '1-2',
-                    pid: '1',
-                    name: '父节点2',
-                    nodes: [{
-                        id: '1-1-2',
-                        pid: '1-1',
-                        name: '子节点2',
-                        nodes: []
-                    }]
-                }
-            ]
-        }]
-    },
-
-    treeClick(e) {
-        console.log(e)
-        const t = this.selectAllComponents('#treeSelect');
-        t.forEach(item => {
-            item.click(e);
-            console.log(e.detail)
-        })
-        const {
-            id,
-            value
-        } = e.detail;
-        console.log(e.detail)
-    }
-})

package-basic-data/pages/org/add/add.json

@@ -1,3 +0,0 @@
-{
-    "usingComponents": {}
-}

package-basic-data/pages/org/add/add.wxml

@@ -1 +0,0 @@
-<dk-tree treeList="{{treeList}}" idKey="id" nameKey="name" parentIdKey="pid" itemListKey="nodes" id="treeSelect" bind:onclick="treeClick"></dk-tree>

package-basic-data/pages/org/detail/detail.js

@@ -1,66 +0,0 @@
-// package-basic-data/pages/org/detail/detail.js
-Page({
-
-    /**
-     * 页面的初始数据
-     */
-    data: {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面加载
-     */
-    onLoad(options) {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面显示
-     */
-    onShow() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面隐藏
-     */
-    onHide() {
-
-    },
-
-    /**
-     * 生命周期函数--监听页面卸载
-     */
-    onUnload() {
-
-    },
-
-    /**
-     * 页面相关事件处理函数--监听用户下拉动作
-     */
-    onPullDownRefresh() {
-
-    },
-
-    /**
-     * 页面上拉触底事件的处理函数
-     */
-    onReachBottom() {
-
-    },
-
-    /**
-     * 用户点击右上角分享
-     */
-    onShareAppMessage() {
-
-    }
-})

package-basic-data/pages/org/detail/detail.json

@@ -1,3 +0,0 @@
-{
-    "usingComponents": {}
-}

package-basic-data/pages/org/detail/detail.wxml

@@ -1,2 +0,0 @@
-<!--package-basic-data/pages/org/detail/detail.wxml-->
-<text>package-basic-data/pages/org/detail/detail.wxml</text>

package-basic-data/pages/org/detail/detail.wxss

@@ -1 +0,0 @@
-/* package-basic-data/pages/org/detail/detail.wxss */

package-basic-data/pages/org/org.js

@@ -17,6 +17,8 @@ Page({
    * 页面的初始数据
    */
   data: {
+       // 查询条件
+   searchContent: [],
     form: null,    //新建的数据form
     // 路由
     routeObjName: 'org',  // 路由
@@ -120,13 +122,33 @@ Page({
       },
       success: function (res) {
         res.eventChannel.emit('params-org', {
-          url: '/package-basic-data/pages/org/org'
+          url: ''
         })
       }
     })
   },
 
-
+  /**
+  * @desc : 跳转员工新建
+  * @date : 2024/2/1 15:49
+  * @author : 王英杰
+  */
+ toAddStaff() {
+  let _this = this
+  wx.navigateTo({
+    url: this.data.route.staffAdd.url,
+    events: {
+      // 回调后，在这里给页面赋值
+      bandData: function (e) {
+        _this.getData()
+      }
+    },
+    success: function (res) {
+      // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+      res.eventChannel.emit('params', {})
+    }
+  })
+},
   /**
    * @desc : 查询
    * @date : 2024/2/1 15:49

package-basic-data/pages/org/org.wxml

@@ -29,7 +29,7 @@
 <view class="bottom-class-org">
     <view style="padding:10rpx 34rpx 61rpx 43rpx; display: flex;">
         <view style="width: 50%;padding: 4vw;">
-            <van-button round plain size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="submit"  type="info">
+            <van-button round plain size="large" color="#1B365D" custom-style="height:88rpx;" bind:click="toAddStaff"  type="info">
               {{$t['newStaff']}}
             </van-button>
         </view>

package-purchase/pages/supplier-list/add/add.wxml

@@ -1,8 +1,7 @@
 <!-- 前台导入wxmlUtil.wxs -->
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 
-<loading wx:if="{{loading}}" loadingName="加载中" backgroundColor="#f2f2f2;" opacity="0.8"></loading>
-
+<loading wx:if="{{loading}}" ></loading>
  
 <!-- <dk-form id="{{formName}}"   routeObjName="{{routeObjName}}" objCol="customerId"
  objLabel="客户名称" objType="customer" dateCol="accountDate" dateLabel="收款日期" 
@@ -17,6 +16,6 @@ model:value="{{formData}}" bind:chooseData="chooseData" model:value="{{formData}
 <view style="height: 16vw;"></view>
 <!--  保存 -->
 <view class="bottom-class">
-  <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="save" type="default">保存
+  <van-button custom-class="save-button-class" disabled="{{loading}}" loading="{{loading}}" bind:click="save" type="default">{{$t['save']}}
   </van-button>
 </view>

package-purchase/pages/supplier-list/supplier-list.js

@@ -16,6 +16,9 @@ Page({
    * 页面的初始数据 
    */
   data: {
+       // 查询条件
+   searchContent: [],
+    checked:true, //启用标识
     tagList: [{
       title: mixins.$t("all") //全部
     }, {
@@ -24,10 +27,10 @@ Page({
       title: mixins.$t("serviceProvider") // 服务供应商
     }], // 假数据
 
- 
+
 
     contentObj: {
-     [mixins.$t("procurementSupplier")]: [{
+      [mixins.$t("procurementSupplier")]: [{
         name: 'contactName',
         title: mixins.$t("contactName") //联系人
       }, {
@@ -35,17 +38,17 @@ Page({
         title: mixins.$t("contactPhone") //联系电话
       }, {
         name: 'brandName',
-        title:  mixins.$t("brandId")  //供货品牌
+        title: mixins.$t("brandId") //供货品牌
       }],
       [mixins.$t("serviceProvider")]: [{
         name: 'contactName',
-        title:  mixins.$t("contactName") //联系人
+        title: mixins.$t("contactName") //联系人
       }, {
         name: 'contactPhone',
         title: mixins.$t("contactPhone") //联系电话
       }, {
         name: 'serviceCategories',
-        title:   mixins.$t("serviceCategories") //服务类别
+        title: mixins.$t("serviceCategories") //服务类别
       }]
     },
 
@@ -56,7 +59,7 @@ Page({
     // 路由
     routeObjName: 'supplier',
   },
- 
+
   /**
    * @desc : 切换  全部 采购供应商  服务供应商
    * @date : 2024/2/1 15:49
@@ -69,20 +72,20 @@ Page({
     })
     this.searchData()
   },
-  
+
   /**
    * @desc : 左滑 停用回调
    * @date : 2024/2/1 15:49
    * @author : 王英杰
    */
-  swipe(e) { 
+  swipe(e) {
     let param = {
-      supId:e.detail.item.supId
+      supId: e.detail.item.supId
     }
     api.request(Constants.BASIC_SUPLIER_API + 'deactivate_data', 'POST', param).then(res => {
 
       if (res.data.code === 200) {
-         this.searchData() 
+        this.searchData()
       }
     })
 
@@ -98,10 +101,15 @@ Page({
       params.supType = ""
     }
     if (active == 1) { //采购供应商
-      params.supType =  mixins.$t("procurementSupplier") //采购供应商
+      params.supType = mixins.$t("procurementSupplier") //采购供应商
     }
     if (active == 2) { //服务供应商
-      params.supType =  mixins.$t("serviceProvider") //采购供应商
+      params.supType = mixins.$t("serviceProvider") //采购供应商
+    }
+    if(this.data.checked){ //启用标识开启  
+      params.flgValid = true
+    }else{
+      params.flgValid = false
     }
     return params
   },
@@ -121,7 +129,7 @@ Page({
   handleSearchData(data) {
     data.forEach(element => {
       element.collectStatus = element.flgValid ? 'enable' : "disable"
-      element.collectName = "应付"
+      element.collectName = mixins.$t("meet") //应付
       element.collectCol = "0"
     });
     this.setData({
@@ -142,25 +150,40 @@ Page({
       }
     })
   },
-    /**
-  * @desc : 详细页面 （编辑）
-  * @date : 2024/2/1 15:49
-  * @author : 王英杰
-  */
- toDetail(e) {
-  let supId = e.detail.item.supId
-  wx.navigateTo({
-    url: this.data.route.add.url,
-    events: {
-      // 回调后，在这里给页面赋值
-      bandData: function (e) {
-        console.log("toDetail", e);
+  /**
+   * @desc : 详细页面 （编辑）
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  toDetail(e) {
+    let supId = e.detail.item.supId
+    wx.navigateTo({
+      url: this.data.route.add.url,
+      events: {
+        // 回调后，在这里给页面赋值
+        bandData: function (e) {
+          console.log("toDetail", e);
+        }
+      },
+      success: function (res) {
+        // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
+        res.eventChannel.emit('params', {
+          id: supId,
+          formMode: Constants.formMode.edit
+        })
       }
-    },
-    success: function (res) {
-      // 通过eventChannel向被打开页面传送数据 TODO 测试例子url是写死的，实际中，需要从route中读取
-      res.eventChannel.emit('params', { id: supId, formMode: Constants.formMode.edit })
-    }
-  })
-},
+    })
+  },
+  /**
+   * @desc : 底部 新建按钮旁 启用回调事件
+   * @date : 2024/2/1 15:49
+   * @author : 王英杰
+   */
+  onCheckboxChange(e) {
+    console.log("tt", e);
+    this.setData({
+      checked:e.detail.checked
+    })
+    this.searchData()
+  },
 })

package-purchase/pages/supplier-list/supplier-list.wxml

@@ -2,15 +2,14 @@
 <wxs src='/utils/wxmlUtil.wxs' module="wxmlUtil"></wxs>
 <loading wx:if="{{loading}}" ></loading>
 <van-sticky scroll-top="0">
-  <!-- 查询条件 -->
-  <dk-dropdown-menu model:searchForm="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['customerName','orderNo','telephone','adddress','contractNumber'])}}">
+  <!-- 查询条件 --> 
+  <dk-dropdown-menu model:value="{{searchForm}}" menuList="{{searchContent}}" pullMenuList="{{pullMenuList}}" bind:search="searchData" searchTextPlaceholder="{{wxmlUtil.setSearchPlaceholder($t,['supplierName','contactName','contactPhone'])}}">
   </dk-dropdown-menu>
- 
   <dk-tabs active="{{active}}" list="{{tagList}}" bind:onChange="onChangeTabs">    </dk-tabs>
 </van-sticky>
 
 <!-- 暂无数据 -->
-<van-empty wx:if="{{dataList.length<=0}}" description="{{$t['nodata']}}"  />
+<van-empty wx:if="{{tableData.length<=0}}" description="{{$t['nodata']}}"  />
 
 <!-- 列表区 -->
 <dk-list bind:swipe="swipe" bind:toDetail="toDetail" swipeDisabled="{{false}}" list="{{tableData}}" flgPoint = "{{false}}" title="supName"  status="supType"  contentCol="supType" contentObj="{{contentObj}}"    ></dk-list>
@@ -19,6 +18,6 @@
 <view style="height: 135rpx;"></view>
 
 <!-- 新建按钮 -->
-<dk-save-bottom flagTypeName="supplier-list"     bind:allClean="toAdd" />
+<dk-save-bottom flagTypeName="supplier-list"  bind:onCheckboxChange="onCheckboxChange"    bind:allClean="toAdd" />