订单位置修改

packageA/orderForm/add/float/index.scss

@@ -1 +0,0 @@
-/* packageA/orderForm/add/float/index.wxss */

packageA/orderForm/add/float/index.wxml

@@ -1,2 +0,0 @@
-<Yl_FloatingButton bindtap="onSelect" />
-<van-action-sheet show="{{ actionShow }}" actions="{{ types }}" cancel-text="取消" bind:select='selectType' bind:cancel='onCancel' bind:click-overlay='onCancel' />

packageA/orderForm/detail.js

@@ -439,12 +439,6 @@ Page({
                         icon: "none"
                     });
                     setTimeout(() => {
-                        /*  let page = getCurrentPages().find(v => v.__route__ == 'packageA/orderForm/index');
-                         if (page) page.setData({
-                             list: page.data.list.filter(v => v.sa_orderid != that.data.sa_orderid),
-                             "content.total": page.data.content.total - 1,
-                             amount: (page.data.amount - that.data.detail.amount).toFixed(2)
-                         }); */
                         wx.navigateBack()
                     }, 500)
                 })
@@ -527,32 +521,11 @@ Page({
         })
     },
     onUnload() {
-        let page = getCurrentPages().find(v => v.__route__ == 'packageA/orderForm/index');
-        let content = JSON.parse(JSON.stringify(page.data.content));
-        content.pageNumber = 1;
-        content.pageSize = (page.data.content.pageNumber - 1) * page.data.content.pageSize;
-        _Http.basic({
-            "id": this.data.userrole == '业务员' ? 20221111145202 : 20221224180302,
-            content
-        }).then(res => {
-            console.log("订单列表", res)
-            if (res.msg != '成功') return;
-            /* 格式化价格 */
-            if (res.data.length != 0) res.data = res.data.map(v => {
-                v.defaultamount = currency(v.defaultamount, {
-                    symbol: "￥",
-                    precision: 2
-                }).format();
-                return v
-            })
-            page.setData({
-                list: res.data,
-                "content.total": res.total,
-                amount: currency(res.tips.amount, {
-                    symbol: "￥",
-                    precision: 2
-                }).format()
-            })
-        })
-    },
+        let page = getCurrentPages().find(v => v.__route__ == "pages/index/index")
+        if (page) {
+            let model = page.selectComponent("#OrderForm");
+            console.log(model)
+            model.updateList && model.updateList()
+        }
+    }
 })

packageA/orderForm/detail.json

@@ -1,7 +1,7 @@
 {
     "usingComponents": {
-        "Product": "./modules/product/index",
+        "Product": "/pages/index/orderForm/modules/product/index",
         "Yl_Attachment": "/components/Yl_Attachment/index",
-        "Progress": "./modules/progress/index"
+        "Progress": "/pages/index/orderForm/modules/progress/index"
     }
 }

packageA/orderForm/index.js

@@ -1,158 +0,0 @@
-const _Http = getApp().globalData.http;
-import currency from "../../utils/currency";
-
-Page({
-    data: {
-        loading: true,
-        active: 0,
-        amount: 0,
-        "content": {
-            nocache: true,
-            "isExport": 0,
-            "pageNumber": 1,
-            "pageTotal": 1,
-            "pageSize": 20,
-            total: 0,
-            "where": {
-                "condition": "",
-                "status": "",
-                "brandname": "",
-                "tradefield": ""
-            },
-            sort: []
-        },
-        filter: [{
-            label: "品牌",
-            index: null,
-            showName: "brandname", //显示字段
-            valueKey: "brandname", //返回Key
-            selectKey: "brandname", //传参 代表选着字段 不传参返回整个选择对象
-            value: "", //选中值
-            list: []
-        }, {
-            label: "领域",
-            index: null,
-            showName: "tradefield", //显示字段
-            valueKey: "tradefield", //返回Key
-            selectKey: "tradefield", //传参 代表选着字段 不传参返回整个选择对象
-            value: "", //选中值
-            list: []
-        }]
-    },
-    onLoad(options) {
-        this.setData({
-            userrole: wx.getStorageSync('userrole')
-        })
-        this.getList()
-        this.getBrand()
-        this.getDomain()
-    },
-    /* 处理筛选 */
-    handleFilter({
-        detail
-    }) {
-        console.log(detail)
-    },
-    /* 获取产品 */
-    getList(init = false) {
-        if (init.detail != undefined) init = init.detail;
-        let content = this.data.content;
-        if (init) content.pageNumber = 1;
-        if (content.pageNumber > content.pageTotal) return;
-        _Http.basic({
-            "id": this.data.userrole == '业务员' ? 20221111145202 : 20221224180302,
-            content
-        }).then(res => {
-            console.log("订单列表", res)
-            this.selectComponent('#ListBox').RefreshToComplete();
-            /* 格式化价格 */
-            if (res.data.length != 0) res.data = res.data.map(v => {
-                v.defaultamount = currency(v.defaultamount, {
-                    symbol: "￥",
-                    precision: 2
-                }).format();
-                return v
-            })
-            this.setData({
-                list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
-                "content.pageNumber": res.pageNumber + 1,
-                "content.pageTotal": res.pageTotal,
-                "content.sort": res.sort,
-                "content.total": res.total,
-                loading: false,
-                amount: currency(res.tips.amount, {
-                    symbol: "￥",
-                    precision: 2
-                }).format()
-            })
-        })
-    },
-    /* 搜索 */
-    onSearch({
-        detail
-    }) {
-        this.setData({
-            "content.where.condition": detail
-        });
-        this.getList(true)
-    },
-    /* 切换tabs */
-    tabsChange(e) {
-        let status = "";
-        switch (e.detail.title) {
-            case '全部':
-                status = "";
-                break;
-            case '待确认':
-                status = "交期待确认";
-                break;
-            default:
-                status = e.detail.title
-                break;
-        }
-        this.setData({
-            active: e.detail.index,
-            "content.where.status": status
-        });
-        this.getList(true);
-    },
-    onReady() {
-        this.setListHeight()
-    },
-    /* 设置页面高度 */
-    setListHeight() {
-        this.selectComponent("#ListBox").setHeight(".tips", this);
-    },
-    /* 获取品牌 */
-    getBrand() {
-        _Http.basic({
-            "id": 20220924163702,
-            "content": {
-                "pageSize": 9999,
-            }
-        }, false).then(res => {
-            console.log("查询品牌", res)
-            if (res.msg == '成功') this.setData({
-                "filter[0].list": res.data
-            });
-        })
-    },
-    /* 获取领域 */
-    getDomain() {
-        _Http.basic({
-            "id": 20221223141802,
-            "content": {
-                "pageNumber": 1,
-                "pageSize": 9999,
-                "where": {
-                    "condition": ""
-                }
-            }
-        }, false).then(res => {
-            console.log("获取领域", res)
-            if (res.msg == '成功') this.setData({
-                "filter[1].list": res.data
-            });
-        })
-    },
-})

packageA/orderForm/index.json

@@ -1,6 +0,0 @@
-{
-  "usingComponents": {
-    "List": "./modules/list/index",
-    "Float":"./add/float/index"
-  }
-}

packageA/orderForm/index.skeleton.wxml

@@ -1,205 +0,0 @@
-<!--
-此文件为开发者工具生成，生成时间: 2022/12/28上午9:52:47
-使用方法：
-在 E:\云链项目\e-wechat\packageA\orderForm\index.wxml 引入模板
-
-```
-<import src="index.skeleton.wxml"/>
-<template is="skeleton" wx:if="{{loading}}" />
-```
-
-在 E:\云链项目\e-wechat\packageA\orderForm\index.wxss 中引入样式
-```
-@import "./index.skeleton.wxss";
-```
-
-更多详细信息可以参考文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
--->
-<template name="skeleton">
-  <view class="sk-container">
-    <view is="components/Yl_HeadNav/index">
-      <view class="Yl_head_1 HeadNav-index--Yl_head_1">
-        <view class="search HeadNav-index--search">
-          <view class="iconfont HeadNav-index--iconfont icon-a-sousuolansousuo HeadNav-index--icon-a-sousuolansousuo sk-pseudo sk-pseudo-circle" style="padding-left:10px;margin-right: 5px;"></view>
-          <view class="input HeadNav-index--input sk-image" placeholder="搜索" style="flex: 1;" type="text" value="true"></view>
-        </view>
-        <navigator class="but HeadNav-index--but sk-transparent" data-id="sort">
-          <text class="iconfont HeadNav-index--iconfont icon-shengxu HeadNav-index--icon-shengxu sk-pseudo sk-pseudo-circle"></text>排序</navigator>
-        <navigator class="but HeadNav-index--but sk-transparent" data-id="filtrate">
-          <text class="iconfont HeadNav-index--iconfont icon-shaixuan HeadNav-index--icon-shaixuan sk-pseudo sk-pseudo-circle"></text>筛选</navigator>
-      </view>
-      <view is="miniprogram_npm/@vant/weapp/transition/index"></view>
-      <view is="miniprogram_npm/@vant/weapp/popup/index">
-        <view is="miniprogram_npm/@vant/weapp/overlay/index">
-          <view is="miniprogram_npm/@vant/weapp/transition/index"></view>
-        </view>
-      </view>
-    </view>
-    <view is="miniprogram_npm/@vant/weapp/tabs/index">
-      <view class=" van-tabs tabs-index--van-tabs van-tabs--line tabs-index--van-tabs--line">
-        <view is="miniprogram_npm/@vant/weapp/sticky/index">
-          <view class=" van-sticky sticky-index--van-sticky" style="z-index:1">
-            <view class="van-sticky-wrap sticky-index--van-sticky-wrap" style="z-index:1">
-              <view class="van-tabs__wrap tabs-index--van-tabs__wrap ">
-                <scroll-view class="van-tabs__scroll tabs-index--van-tabs__scroll van-tabs__scroll--line tabs-index--van-tabs__scroll--line" scroll-left="0" style="border-color: var(--assist)">
-                  <view class="van-tabs__nav tabs-index--van-tabs__nav van-tabs__nav--line tabs-index--van-tabs__nav--line " style="true">
-                    <view class="van-tabs__line tabs-index--van-tabs__line" style="width:40px;opacity:1;transform:translateX(17.5px);-webkit-transform:translateX(17.5px);background-color:var(--assist);transition-duration:0.3s;-webkit-transition-duration:0.3s"></view>
-                    <view class="  van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab van-tab--active tabs-index--van-tab--active" data-index="0" style="color:var(--assist)">
-                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-894 sk-text" style="background-position-x: 50%;">
-                        全部
-                      </view>
-                    </view>
-                    <view class=" van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab" data-index="1" style="true">
-                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-312 sk-text" style="background-position-x: 50%;">
-                        新建
-                      </view>
-                    </view>
-                    <view class=" van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab" data-index="2" style="true">
-                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-931 sk-text" style="background-position-x: 50%;">
-                        提交
-                      </view>
-                    </view>
-                    <view class=" van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab" data-index="3" style="true">
-                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-945 sk-text" style="background-position-x: 50%;">
-                        审核
-                      </view>
-                    </view>
-                    <view class=" van-ellipsis tabs-index--van-ellipsis van-tab tabs-index--van-tab" data-index="4" style="true">
-                      <view class="van-ellipsis tabs-index--van-ellipsis sk-transparent sk-text-34-0909-182 sk-text" style="background-position-x: 50%;">
-                        完成
-                      </view>
-                    </view>
-                  </view>
-                </scroll-view>
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class="van-tabs__content tabs-index--van-tabs__content">
-          <view class="van-tabs__track tabs-index--van-tabs__track van-tabs__track tabs-index--van-tabs__track" style="true">
-            <view is="miniprogram_npm/@vant/weapp/tab/index">
-              <view class=" van-tab__pane tab-index--van-tab__pane van-tab__pane--active tab-index--van-tab__pane--active" style="true"></view>
-            </view>
-            <view is="miniprogram_npm/@vant/weapp/tab/index"></view>
-            <view is="miniprogram_npm/@vant/weapp/tab/index"></view>
-            <view is="miniprogram_npm/@vant/weapp/tab/index"></view>
-            <view is="miniprogram_npm/@vant/weapp/tab/index"></view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view class="tips sk-transparent sk-text-28-1250-739 sk-text" style="background-position-x: 50%;">
-      共计7单，合计¥1170
-    </view>
-    <view is="components/Yl_ListBox/index" id="ListBox">
-      <scroll-view scroll-y="true" class="ListBox-index--scroll-view" refresher-enabled="true" style="height: 598px;">
-        <view is="packageA/orderForm/modules/list/index">
-          <navigator class="list-index--item">
-            <view class="list-index--top">
-              <view class="list-index--tags">
-                <text class="sk-transparent sk-text-25-0000-280 sk-text">标准订单</text>
-                <text class="sk-transparent sk-text-25-0000-544 sk-text">班尼戈</text>
-              </view>
-              <view class="list-index--statu sk-transparent sk-text-14-2857-683 sk-text" style="color: #999999;">
-                关闭
-              </view>
-            </view>
-            <view class="list-index--content">
-              <view class="list-index--num sk-transparent sk-text-15-0000-289 sk-text">
-                订单号：SO202211300012
-              </view>
-              <view class="list-index--exp sk-transparent sk-text-14-2857-518 sk-text">
-                区域经理：
-              </view>
-              <view class="list-index--exp sk-transparent sk-text-14-2857-715 sk-text">
-                单据日期：2022-11-30 16:38:01
-              </view>
-              <view class="list-index--exp sk-transparent sk-text-14-2857-222 sk-text">
-                共计120件商品
-              </view>
-              <view class="list-index--amount sk-transparent sk-text-14-2857-347 sk-text">
-                合计:￥0
-              </view>
-            </view>
-            <view class="list-index--bottom sk-transparent sk-text-33-3333-962 sk-text">
-              收货人信息
-            </view>
-          </navigator>
-          <navigator class="list-index--item">
-            <view class="list-index--top">
-              <view class="list-index--tags">
-                <text class="sk-transparent sk-text-25-0000-204 sk-text">标准订单</text>
-                <text class="sk-transparent sk-text-25-0000-847 sk-text">班尼戈</text>
-              </view>
-              <view class="list-index--statu sk-transparent sk-text-14-2857-503 sk-text" style="color: #999999;">
-                关闭
-              </view>
-            </view>
-            <view class="list-index--content">
-              <view class="list-index--num sk-transparent sk-text-15-0000-326 sk-text">
-                订单号：SO202211300013
-              </view>
-              <view class="list-index--exp sk-transparent sk-text-14-2857-349 sk-text">
-                区域经理：
-              </view>
-              <view class="list-index--exp sk-transparent sk-text-14-2857-832 sk-text">
-                单据日期：2022-11-30 21:56:19
-              </view>
-              <view class="list-index--exp sk-transparent sk-text-14-2857-703 sk-text">
-                共计30件商品
-              </view>
-              <view class="list-index--amount sk-transparent sk-text-14-2857-240 sk-text">
-                合计:￥300
-              </view>
-            </view>
-            <view class="list-index--bottom sk-transparent sk-text-33-3333-993 sk-text">
-              收货人信息
-            </view>
-          </navigator>
-          <navigator class="list-index--item">
-            <view class="list-index--top">
-              <view class="list-index--tags">
-                <text class="sk-transparent sk-text-25-0000-307 sk-text">标准订单</text>
-                <text class="sk-transparent sk-text-25-0000-15 sk-text">班尼戈</text>
-              </view>
-              <view class="list-index--statu sk-transparent sk-text-14-2857-117 sk-text" style="color: #999999;">
-                关闭
-              </view>
-            </view>
-            <view class="list-index--content">
-              <view class="list-index--num sk-transparent sk-text-15-0000-695 sk-text">
-                订单号：SO202211300014
-              </view>
-              <view class="list-index--exp sk-transparent sk-text-14-2857-219 sk-text">
-                区域经理：
-              </view>
-              <view class="list-index--exp sk-transparent sk-text-14-2857-833 sk-text">
-                单据日期：2022-11-30 22:16:06
-              </view>
-              <view class="list-index--exp sk-transparent sk-text-14-2857-51 sk-text">
-                共计100件商品
-              </view>
-              <view class="list-index--amount sk-transparent sk-text-14-2857-920 sk-text">
-                合计:￥360
-              </view>
-            </view>
-            <view class="list-index--bottom sk-transparent sk-text-33-3333-615 sk-text">
-              收货人信息
-            </view>
-          </navigator>
-          <navigator class="list-index--item">
-            <view class="list-index--top">
-              <view class="list-index--tags">
-                <text class="sk-transparent sk-text-25-0000-767 sk-text">标准订单</text>
-                <text class="sk-transparent sk-text-25-0000-348 sk-text">班尼戈</text>
-              </view>
-              <view class="list-index--statu sk-transparent sk-text-14-2857-287 sk-text" style="color: #333333;">
-                新建
-              </view>
-            </view>
-          </navigator>
-        </view>
-      </scroll-view>
-    </view>
-  </view>
-</template>

packageA/orderForm/index.skeleton.wxss

@@ -1,224 +0,0 @@
-/*
-此文件为开发者工具生成，生成时间: 2022/12/28上午9:52:48
-
-在 E:\云链项目\e-wechat\packageA\orderForm\index.wxss 中引入样式
-```
-@import "./index.skeleton.wxss";
-```
-
-更多详细信息可以参考文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
-*/
-.sk-transparent {
-    color: transparent !important;
-  }
-.sk-text-34-0909-894 {
-    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
-    background-size: 100% 88.0000rpx;
-    position: relative !important;
-  }
-.sk-text {
-    background-origin: content-box !important;
-    background-clip: content-box !important;
-    background-color: transparent !important;
-    color: transparent !important;
-    background-repeat: repeat-y !important;
-  }
-.sk-text-34-0909-312 {
-    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
-    background-size: 100% 88.0000rpx;
-    position: relative !important;
-  }
-.sk-text-34-0909-931 {
-    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
-    background-size: 100% 88.0000rpx;
-    position: relative !important;
-  }
-.sk-text-34-0909-945 {
-    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
-    background-size: 100% 88.0000rpx;
-    position: relative !important;
-  }
-.sk-text-34-0909-182 {
-    background-image: linear-gradient(transparent 34.0909%, #EEEEEE 0%, #EEEEEE 65.9091%, transparent 0%) !important;
-    background-size: 100% 88.0000rpx;
-    position: relative !important;
-  }
-.sk-text-28-1250-739 {
-    background-image: linear-gradient(transparent 28.1250%, #EEEEEE 0%, #EEEEEE 71.8750%, transparent 0%) !important;
-    background-size: 100% 64.0000rpx;
-    position: relative !important;
-  }
-.sk-text-25-0000-280 {
-    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-25-0000-544 {
-    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-683 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: relative !important;
-  }
-.sk-text-15-0000-289 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-518 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-715 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-222 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-347 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: absolute !important;
-  }
-.sk-text-33-3333-962 {
-    background-image: linear-gradient(transparent 33.3333%, #EEEEEE 0%, #EEEEEE 66.6667%, transparent 0%) !important;
-    background-size: 100% 72.0000rpx;
-    position: relative !important;
-  }
-.sk-text-25-0000-204 {
-    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-25-0000-847 {
-    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-503 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: relative !important;
-  }
-.sk-text-15-0000-326 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-349 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-832 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-703 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-240 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: absolute !important;
-  }
-.sk-text-33-3333-993 {
-    background-image: linear-gradient(transparent 33.3333%, #EEEEEE 0%, #EEEEEE 66.6667%, transparent 0%) !important;
-    background-size: 100% 72.0000rpx;
-    position: relative !important;
-  }
-.sk-text-25-0000-307 {
-    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-25-0000-15 {
-    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-117 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: relative !important;
-  }
-.sk-text-15-0000-695 {
-    background-image: linear-gradient(transparent 15.0000%, #EEEEEE 0%, #EEEEEE 85.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-219 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-833 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-51 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 33.6000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-920 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: absolute !important;
-  }
-.sk-text-33-3333-615 {
-    background-image: linear-gradient(transparent 33.3333%, #EEEEEE 0%, #EEEEEE 66.6667%, transparent 0%) !important;
-    background-size: 100% 72.0000rpx;
-    position: relative !important;
-  }
-.sk-text-25-0000-767 {
-    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-25-0000-348 {
-    background-image: linear-gradient(transparent 25.0000%, #EEEEEE 0%, #EEEEEE 75.0000%, transparent 0%) !important;
-    background-size: 100% 40.0000rpx;
-    position: relative !important;
-  }
-.sk-text-14-2857-287 {
-    background-image: linear-gradient(transparent 14.2857%, #EEEEEE 0%, #EEEEEE 85.7143%, transparent 0%) !important;
-    background-size: 100% 39.2000rpx;
-    position: relative !important;
-  }
-.sk-pseudo::before, .sk-pseudo::after {
-      background: #EFEFEF !important;
-      background-image: none !important;
-      color: transparent !important;
-      border-color: transparent !important;
-    }
-.sk-pseudo-rect::before, .sk-pseudo-rect::after {
-      border-radius: 0 !important;
-    }
-.sk-pseudo-circle::before, .sk-pseudo-circle::after {
-      border-radius: 50% !important;
-    }
-.sk-image {
-    background: #EFEFEF !important;
-  }
-.sk-container {
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    background-color: transparent;
-  }

packageA/orderForm/index.wxml

@@ -1,23 +0,0 @@
-<import src="index.skeleton.wxml" />
-<template is="skeleton" wx:if="{{loading}}" />
-<Yl_HeadNav styleType="1" sort='{{content.sort}}' placeholder='搜索' bindonSearch="onSearch" />
-<van-tabs active="{{ active }}" color='var(--assist)' title-active-color='var(--assist)' bind:change="tabsChange">
-    <van-tab title="全部" />
-    <van-tab title="新建" />
-    <van-tab title="提交" />
-    <van-tab title="待确认" />
-    <van-tab title="交期确认" />
-    <van-tab title="审核" />
-    <van-tab title="关闭" />
-</van-tabs>
-<view class="tips">
-    共计{{content.total}}单，合计{{amount}}元
-</view>
-<Yl_ListBox id='ListBox' bind:getlist='getList'>
-    <List list="{{list}}" userrole="{{userrole}}" />
-    <view style="height: 20px;" />
-</Yl_ListBox>
-<!-- 新建浮动按钮 -->
-<Float />
-<!-- 筛选条件 -->
-<Yl_Filtrate id='Filtrate' list="{{filter}}" bind:handle="handleFilter" dateRange='{{false}}' />

packageA/orderForm/modules/product/index.scss

@@ -1 +0,0 @@
-@import "../../../../static/common-head.scss";

packageA/orderForm/add/add.js → pages/index/orderForm/add/add.js

@@ -130,8 +130,6 @@ Page({
                 wx.redirectTo({
                     url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
                 });
-                let page = getCurrentPages().find(v => v.__route__ == 'packageA/orderForm/index');
-                if (page) page.getList(true);
             }, 500)
         })
     },

packageA/orderForm/add/float/index.js → pages/index/orderForm/add/float/index.js

@@ -16,6 +16,9 @@ Component({
     methods: {
         /* 挑选新增订单类型 */
         onSelect() {
+            return wx.navigateTo({
+                url: '/pages/index/orderForm/add/add?type=标准订单',
+            })
             this.setData({
                 actionShow: true
             })
@@ -27,7 +30,7 @@ Component({
             switch (detail.name) {
                 case '标准订单':
                     wx.navigateTo({
-                        url: '/packageA/orderForm/add/add?type=标准订单',
+                        url: '/pages/index/orderForm/add/add?type=标准订单',
                     })
                     break;
                 case '项目订单':
@@ -70,7 +73,7 @@ Component({
                     break;
                 case '工具订单':
                     wx.navigateTo({
-                        url: '/packageA/orderForm/add/add?type=工具订单',
+                        url: '/pages/index/orderForm/add/add?type=工具订单',
                     })
                     break;
             }
@@ -108,8 +111,6 @@ Component({
                             wx.redirectTo({
                                 url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
                             });
-                            let page = getCurrentPages().find(v => v.__route__ == 'packageA/orderForm/index');
-                            if (page) page.getList(true);
                         }, 500)
                     })
                 }
@@ -147,8 +148,6 @@ Component({
                             wx.redirectTo({
                                 url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
                             });
-                            let page = getCurrentPages().find(v => v.__route__ == 'packageA/orderForm/index');
-                            if (page) page.getList(true);
                         }, 500)
                     })
                 }

pages/index/orderForm/add/float/index.wxml

@@ -0,0 +1,2 @@
+<Yl_FloatingButton bindtap="onSelect" />
+<!-- <van-action-sheet show="{{ actionShow }}" actions="{{ types }}" cancel-text="取消" bind:select='selectType' bind:cancel='onCancel' bind:click-overlay='onCancel' /> -->

pages/index/orderForm/index.js

@@ -0,0 +1,188 @@
+const _Http = getApp().globalData.http;
+import currency from "../../../utils/currency";
+let content = {
+		nocache: true,
+		"isExport": 0,
+		"pageNumber": 1,
+		"pageTotal": 1,
+		pageSize: 20,
+		"where": {
+			"condition": "",
+			"status": "",
+			"brandname": "",
+			"tradefield": ""
+		}
+	},
+	downCount = null;
+Component({
+	data: {
+		CustomBar: getApp().globalData.CustomBar,
+		filtratelist: [{
+			label: "品牌",
+			index: null,
+			showName: "brandname", //显示字段
+			valueKey: "brandname", //返回Key
+			selectKey: "brandname", //传参 代表选着字段 不传参返回整个选择对象
+			value: "", //选中值
+			list: []
+		}, {
+			label: "领域",
+			index: null,
+			showName: "tradefield", //显示字段
+			valueKey: "tradefield", //返回Key
+			selectKey: "tradefield", //传参 代表选着字段 不传参返回整个选择对象
+			value: "", //选中值
+			list: []
+		}]
+	},
+	options: {
+		addGlobalClass: true
+	},
+	methods: {
+		init() {
+			this.getList()
+			this.getBrand()
+			this.getDomain()
+		},
+		/* 获取产品 */
+		getList(init = false) {
+			if (init.detail != undefined) init = init.detail;
+			if (init) content.pageNumber = 1;
+			if (content.pageNumber > content.pageTotal) return;
+			this.setListHeight();
+			_Http.basic({
+				"id": 20221224180302,
+				content
+			}).then(res => {
+				console.log("订单列表", res)
+				this.selectComponent('#ListBox').RefreshToComplete();
+				/* 格式化价格 */
+				if (res.data.length != 0) res.data = res.data.map(v => {
+					v.defaultamount = currency(v.defaultamount, {
+						symbol: "￥",
+						precision: 2
+					}).format();
+					return v
+				})
+				content.pageNumber = res.pageNumber + 1
+				content.pageTotal = res.pageTotal
+				this.setData({
+					list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
+					total: res.total,
+					amount: currency(res.tips.amount, {
+						symbol: "￥",
+						precision: 2
+					}).format()
+				})
+			})
+		},
+		/* 更新列表 */
+		updateList() {
+			let params = JSON.parse(JSON.stringify(content));
+			params.pageSize = (params.pageNumber - 1) * params.pageSize;
+			params.pageNumber = 1;
+			_Http.basic({
+				"id": 20221224180302,
+				content:params
+			}).then(res => {
+				console.log("订单列表", res)
+				if (res.msg != '成功') return;
+				/* 格式化价格 */
+				if (res.data.length != 0) res.data = res.data.map(v => {
+					v.defaultamount = currency(v.defaultamount, {
+						symbol: "￥",
+						precision: 2
+					}).format();
+					return v
+				})
+				this.setData({
+					list: res.data,
+					total: res.total,
+					amount: currency(res.tips.amount, {
+						symbol: "￥",
+						precision: 2
+					}).format()
+				})
+			})
+		},
+		/* 切换tabs */
+		tabsChange(e) {
+			let status = "";
+			switch (e.detail.title) {
+				case '全部':
+					status = "";
+					break;
+				case '待确认':
+					status = "交期待确认";
+					break;
+				default:
+					status = e.detail.title
+					break;
+			}
+			content.where.status = status;
+			this.getList(true);
+		},
+		/* 搜索 */
+		onSearch({
+			detail
+		}) {
+			content.where.condition = detail;
+			this.getList(true)
+		},
+		/* 获取品牌 */
+		getBrand() {
+			_Http.basic({
+				"id": 20220924163702,
+				"content": {
+					"pageSize": 9999,
+				}
+			}, false).then(res => {
+				console.log("查询品牌", res)
+				if (res.msg == '成功') this.setData({
+					"filtratelist[0].list": res.data
+				});
+			})
+		},
+		/* 获取领域 */
+		getDomain() {
+			_Http.basic({
+				"id": 20221223141802,
+				"content": {
+					"pageNumber": 1,
+					"pageSize": 9999,
+					"where": {
+						"condition": ""
+					}
+				}
+			}, false).then(res => {
+				console.log("获取领域", res)
+				if (res.msg == '成功') this.setData({
+					"filtratelist[1].list": res.data
+				});
+			})
+		},
+		/* 设置页面高度 */
+		setListHeight() {
+			this.selectComponent("#ListBox").setHeight(".tips", this);
+		},
+		showModal(e) {
+			this.setData({
+				modalName: e.currentTarget.dataset.target
+			})
+		},
+		hideModal(e) {
+			this.setData({
+				modalName: null
+			})
+		},
+		handleFiltrate({
+			detail
+		}) {
+			content.where.brandname = detail.brandname;
+			content.where.tradefield = detail.tradefield;
+			downCount = setTimeout(() => {
+				this.getList(true);
+			}, 300);
+		}
+	}
+})

pages/index/orderForm/index.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "Filtrate": "../market/modules/filtrate/index",
+    "List": "./modules/list/index",
+    "Float": "./add/float/index"
+  }
+}

packageA/orderForm/index.scss → pages/index/orderForm/index.scss

@@ -1,5 +1,4 @@
-@import "./index.skeleton.wxss";
-
+@import"../market/index.scss";
 .tips {
 	width: 750rpx;
 	text-align: center;

pages/index/orderForm/index.wxml

@@ -0,0 +1,35 @@
+<view class="DrawerPage {{modalName=='viewModal'?'show':''}}">
+    <van-search use-action-slot placeholder='请输入搜索关键词' shape='round' bind:search="onSearch" bind:clear="onSearch">
+        <view slot="action" class="cuIcon-filter search-right" bindtap="showModal" data-target="viewModal">
+            筛选
+        </view>
+    </van-search>
+    <van-tabs color='var(--assist)' title-active-color='var(--assist)' bind:change="tabsChange">
+        <van-tab title="全部" />
+        <van-tab title="新建" />
+        <van-tab title="提交" />
+        <van-tab title="待确认" />
+        <van-tab title="交期确认" />
+        <van-tab title="审核" />
+        <van-tab title="关闭" />
+    </van-tabs>
+    <view class="tips">
+        共计{{total}}单，合计{{amount}}元
+    </view>
+    <Yl_ListBox id='ListBox' bind:getlist='getList'>
+        <List list="{{list}}" />
+        <view style="height:150rpx;" />
+    </Yl_ListBox>
+    <Float />
+</view>
+
+<view class="DrawerClose {{modalName=='viewModal'?'show':''}}" bindtap="hideModal">
+    <text class="cuIcon-pullright"></text>
+</view>
+<scroll-view scroll-y class="DrawerWindow  {{modalName=='viewModal'?'show':''}}">
+    <view style="height:{{CustomBar}}px" />
+    <view class="cu-list menu card-menu margin-top-xl margin-bottom-xl shadow-lg bg-white">
+        <Filtrate list='{{filtratelist}}' bindhandle='handleFiltrate' />
+    </view>
+    <view style="height: 200rpx;" />
+</scroll-view>

packageA/orderForm/modules/product/index.js → pages/index/orderForm/modules/product/index.js

@@ -1,6 +1,6 @@
 const _Http = getApp().globalData.http,
-    file = require("../../../../utils/FormatTheAttachment"),
-    currency = require("../../../../utils/currency");
+    file = require("../../../../../utils/FormatTheAttachment"),
+    currency = require("../../../../../utils/currency");
 let queue = [],
     downCounter = null,
     sa_orderid = 0,

pages/index/orderForm/modules/product/index.scss

@@ -0,0 +1 @@
+@import "../../../../../static/common-head.scss";

packageA/orderForm/modules/setBrand/index.js → pages/index/orderForm/modules/setBrand/index.js

@@ -73,8 +73,6 @@ Page({
         wx.redirectTo({
           url: '/packageA/orderForm/detail?id=' + res.data.sa_orderid,
         });
-        let page = getCurrentPages().find(v => v.__route__ == 'packageA/orderForm/index');
-        if (page) page.getList(true);
       }, 500)
     })
   }