修改提交

packageA/market/detail.js

@@ -21,10 +21,10 @@ Page({
     /* 获取详情 */
     getDetail() {
         _Http.basic({
-            "id": "20221223165503",
+            "id": "20220926142403",
             "content": {
                 "sa_itemgroupid": this.data.sa_itemgroupid,
-                itemno: this.data.itemno
+                // itemno: this.data.itemno
             }
         }).then(res => {
             console.log("商品详情", res)
@@ -32,10 +32,21 @@ Page({
                 title: res.msg,
                 icon: "none"
             })
-            this.handleFiles(res.data.item[0].attinfos)
+            if (res.data.length == 0) {
+                wx.showToast({
+                    title: '未查询到商品',
+                    icon: "none",
+                    mask: true
+                })
+                setTimeout(() => {
+                    wx.navigateBack();
+                }, 500)
+                return;
+            }
+            this.handleFiles(res.data[0].attinfos)
             this.setData({
-                detail: res.data.item[0],
-                rows: res.data.rows,
+                detail: res.data[0],
+                rows: res.data,
                 loading: false
             })
         })
@@ -93,10 +104,11 @@ Page({
             item
         } = e.currentTarget.dataset;
         if (item.itemno == this.data.itemno) return;
+        this.handleFiles(item.attinfos)
         this.setData({
+            detail: item,
             itemno: item.itemno
-        });
-        this.getDetail();
+        })
     },
     clickBut() {
         this.data.detail.tradefield.length >= 2 ? wx.showToast({
@@ -114,7 +126,7 @@ Page({
         _Http.basic({
             "id": 20220924095102,
             "content": {
-                "sa_brandid": detail.brand[0].sa_brandid, //品牌id
+                "sa_brandid": detail.brand, //品牌id
                 "itemid": detail.itemid, //货品id
                 "qty": 1, //数量
                 "itemno": this.data.itemno, //货品编号
@@ -122,7 +134,6 @@ Page({
             },
         }).then(res => {
             console.log("加入购物车", res)
-
             if (res.msg != '成功') return wx.showToast({
                 title: res.msg,
                 icon: "none"
@@ -133,7 +144,7 @@ Page({
             }, false).then(res => {
                 console.log("购物车数量", res)
                 getApp().globalData.num = res.data.num;
-                this.selectComponent("#Float").setNum(res.data.num)
+                if (this.data.userrole == '经销商') this.selectComponent("#Float").setNum(res.data.num)
                 setTimeout(() => {
                     wx.showToast({
                         title: '加入成功',
@@ -145,6 +156,6 @@ Page({
         })
     },
     onShow() {
-        this.selectComponent("#Float").setNum(getApp().globalData.num)
+        if (this.data.userrole == '经销商') this.selectComponent("#Float").setNum(getApp().globalData.num)
     },
 })

packageA/market/detail.wxml

@@ -37,7 +37,7 @@
 		选择商品
 	</view>
 	<view class="product-box">
-		<navigator url="#" class="product {{itemno===item.itemno?'active':''}}" wx:for="{{rows}}" wx:key="itemno" bindtap="changeItemno" data-item="{{item}}">{{item.spec}}</navigator>
+		<navigator url="#" class="product {{itemno===item.itemno?'active':''}}" wx:for="{{rows}}" wx:key="itemno" bindtap="changeItemno" data-item="{{item}}">{{item.model}}</navigator>
 	</view>
 </view>
 <van-tabs custom-class='tabs' title-active-color='var(--assist)' color='var(--assist)'>
@@ -62,7 +62,7 @@
 	</van-tab>
 </van-tabs>
 
-<block wx:if="{{userrole=='业务员'}}">
+<block wx:if="{{userrole!='业务员'}}">
 	<!-- 底部 -->
 	<view style="height: 150rpx;" />
 	<view class="footer">

packageA/shipment/index.js

@@ -12,7 +12,6 @@ Page({
 			total: 0,
 			"where": {
 				"condition": "",
-				status: "审核",
 			},
 			sort: []
 		},
@@ -49,7 +48,7 @@ Page({
 		if (init) content.pageNumber = 1;
 		if (content.pageNumber > content.pageTotal) return;
 		_Http.basic({
-			"id": 20230111141104,
+			"id": wx.getStorageSync('userrole') == '业务员' ? 20221122132804 : 20230111141104,
 			content
 		}).then(res => {
 			console.log("订单列表", res)

packageA/toolBill/update.js

@@ -6,81 +6,108 @@ Page({
         showAll: false,
         disabled: true,
         content: {
-          "sa_aftersalesmagid":0,
-          "sa_orderid":"",
-          "reason":"",
-          "isitemreturn":true,
-          "billdate":"",
-          "type":"借用归还单"
+            "sa_aftersalesmagid": 0,
+            "sa_orderid": "",
+            "reason": "",
+            "isitemreturn": true,
+            "billdate": "",
+            "type": "借用归还单"
         },
-        form: [{
-                label: "订单号",
-                error: false,
-                errMsg: "",
-                type: "route",
-                url: "/packageA/toolBill/modules/selectOrder/index",
-                params: {
-                    "id":20230105110003,
-                    "content": {
-                        "pageNumber": 1,
-                        "pageSize": 20,
-                        "where": {
-                            "condition": ""
-                        }
-                    }
-                  },
-                query: '&radio=true',
-                value: "",
-                
-                placeholder: "选择订单号",
-                valueName: "sa_orderid",
-                checking: "base",
-                required: true,
-                interrupt:true
-            },
-            {
-                label: "单据日期",
-                error: false,
-                errMsg: "",
-                type: "date",
-                value: getTime.formatTime(new Date(),'-').split(' ')[0],
-                placeholder: "请选择日期",
-                valueName: "billdate",
-                required: true,
-            },{
-                label: "返退原因",
-                error: false,
-                errMsg: "",
-                type: "texteara",
-                value: "",
-                placeholder: "请输入返退原因",
-                valueName: "reason",
-                required: false,
 
-            },{
-                label: "是否实物退回",
-                error: false,
-                errMsg: "",
-                type: "radio",
-                radioList:[
-                  {name:'是',id:1},
-                  {name:'否',id:0},
-                ],
-                value: 1,
-                valueName: "isitemreturn",
-                required: true,
-            },
-        ]
     },
     onLoad(options) {
+        let form = [{
+            label: "单据日期",
+            error: false,
+            errMsg: "",
+            type: "date",
+            value: getTime.formatTime(new Date(), '-').split(' ')[0],
+            placeholder: "请选择日期",
+            valueName: "billdate",
+            required: true,
+        }, {
+            label: "返退原因",
+            error: false,
+            errMsg: "",
+            type: "texteara",
+            value: "",
+            placeholder: "请输入返退原因",
+            valueName: "reason",
+            required: false,
+
+        }, {
+            label: "是否实物退回",
+            error: false,
+            errMsg: "",
+            type: "radio",
+            radioList: [{
+                    name: '是',
+                    id: 1
+                },
+                {
+                    name: '否',
+                    id: 0
+                },
+            ],
+            value: 1,
+            valueName: "isitemreturn",
+            required: true,
+        }];
+        form.unshift(wx.getStorageSync('userrole') == '业务员' ? {
+            label: "所属经销商",
+            error: false,
+            errMsg: "",
+            type: "route",
+            url: "/select/agent/index",
+            params: {
+                "id": 20220920083901,
+                "content": {
+                    nocache: true,
+                    "where": {
+                        "condition": "",
+                        "type": 9,
+                    }
+                }
+            },
+            query: '&radio=true&idname=sys_enterpriseid',
+            value: "",
+            placeholder: "选择经销商",
+            valueName: "sys_enterpriseid",
+            checking: "base",
+            required: true,
+            interrupt: true
+        } : {
+            label: "订单号",
+            error: false,
+            errMsg: "",
+            type: "route",
+            url: "/packageA/toolBill/modules/selectOrder/index",
+            params: {
+                "id": 20230105110003,
+                "content": {
+                    nocache: true,
+                    "pageNumber": 1,
+                    "pageSize": 20,
+                    "where": {
+                        "condition": ""
+                    }
+                }
+            },
+            query: '&radio=true',
+            value: "",
+            placeholder: "选择订单号",
+            valueName: "sa_orderid",
+            checking: "base",
+            required: true
+        })
+        this.setData({
+            form
+        })
         if (options.rowData) {
-            // wx.setNavigationBarTitle({
-            //   title: 'title',
-            // })
             let data = JSON.parse(options.rowData);
             console.log(data);
             this.setData({
-                form: this.data.form.map(v => {
+                form: form.map(v => {
                     if (v.valueName != 'region') {
                         if (v.valueName == 'enterprisename') {
                             v.value = [data[v.valueName]]
@@ -92,21 +119,51 @@ Page({
                     }
                     return v
                 }),
-                'form[0].value': [data.sonum,[data.sa_orderid]],
-                'content.sa_aftersalesmagid':data.sa_aftersalesmagid
+                'form[0].value': [data.sonum, [data.sa_orderid]],
+                'content.sa_aftersalesmagid': data.sa_aftersalesmagid
             })
             this.selectComponent('#Form').confirm()
         }
+
+
+
+
+
     },
     /* 打断处理form */
     interrupt({
         detail
     }) {
-        detail.form[detail.temporary.index].value = detail.data.value
+        console.log(detail)
+        detail.form[detail.temporary.index].value = detail.data.value;
+        detail.form.splice(1, detail.form.some(v => v.label == '订单号') ? 1 : 0, {
+            label: "订单号",
+            error: false,
+            errMsg: "",
+            type: "route",
+            url: "/packageA/toolBill/modules/selectOrder/index",
+            params: {
+                "id": 20230105110003,
+                "content": {
+                    nocache: true,
+                    "pageNumber": 1,
+                    "pageSize": 20,
+                    "where": {
+                        "condition": ""
+                    },
+                    sys_enterpriseid: detail.data.id[0]
+                }
+            },
+            query: '&radio=true',
+            value: "",
+            placeholder: "选择订单号",
+            valueName: "sa_orderid",
+            checking: "base",
+            required: true
+        })
         this.setData({
-          form:detail.form
+            form: detail.form
         })
-        this.selectComponent('#Form').confirm()
         wx.navigateBack()
     },
     async submit() {