添加loading

packageA/invoice/update.js

@@ -1,235 +1,245 @@
 const _Http = getApp().globalData.http;
 
 Page({
-    data: {
-        showAll: false,
-        disabled: true,
-        form: [{
-            label: "发票种类",
-            error: false,
-            errMsg: "",
-            type: "radio",
-            radioList: [{
-                    name: 's/专用发票',
-                    id: 's'
-                },
-                {
-                    name: 'p/普通发票(电票)',
-                    id: 'p'
-                },
-            ],
-            value: "s",
-            valueName: "invoiceline",
-            required: false,
-        }, {
-            label: "发票限额",
-            error: false,
-            errMsg: "",
-            type: "number",//digit
-            value: "",
-            placeholder: "发票限额",
-            valueName: "quota",
-            required: false
-        }, {
-            label: "发票复核人",
-            error: false,
-            errMsg: "",
-            type: "text",
-            value: "王蒋霞",
-            placeholder: "发票复核人",
-            valueName: "invoicechecker",
-            required: false
-        }, {
-            label: "发票收款人",
-            error: false,
-            errMsg: "",
-            type: "text",
-            value: "孙惠吉",
-            placeholder: "发票收款人",
-            valueName: "invoicepayee",
-            required: false
-        }, {
-            label: "发票开票员",
-            error: false,
-            errMsg: "",
-            type: "text",
-            value: "冯云霞",
-            placeholder: "发票开票员",
-            valueName: "invoiceclerk",
-            required: false
-        }, {
-            label: "备注",
-            error: false,
-            errMsg: "",
-            type: "textarea",
-            value: "",
-            placeholder: "备注",
-            valueName: "remarks",
-            required: false
-        }, ],
-        content: {
-            sa_invoiceapplyid: 0,
-            byhand: false,
-            enterprisename: "", //抬头
-            taxno: "", //税号
-            bank: "", //开户行
-            phonenumber: "", //手机号
-            bankcardno: "", //开户账号
-            address: "", //开票地址
-            quota: 0,
-        }
-    },
-    onLoad(options) {
-        console.log(wx.getStorageSync('userrole'))
-        if (wx.getStorageSync('userrole') == '业务员') {
-            this.data.form.unshift({
-                label: "开票经销商",
-                error: false,
-                errMsg: "",
-                type: "route",
-                url: "/select/agent/index",
-                params: {
-                    "id": "20221216145803",
-                    "version": 1,
-                    "content": {
-                        nocache: true,
-                        "where": {
-                            "condition": ""
-                        }
-                    }
-                },
-                interrupt: true,
-                query: '&radio=true',
-                value: "",
-                placeholder: "选择开票经销商",
-                valueName: "sys_enterpriseid",
-                required: true
-            })
-        } else {
-            this.data.form.unshift({
-                label: "开票抬头",
-                error: false,
-                errMsg: "",
-                type: "route",
-                url: "/select/finance/index",
-                params: {
-                    "id": 20221013160602,
-                    "content": {
-                        nocache: true,
-                        "pageSize": 20,
-                        "where": {
-                            "condition": "",
-                        },
-                    },
-                },
-                interrupt: true,
-                query: '&radio=true',
-                value: "",
-                placeholder: "选择开票抬头信息",
-                valueName: "principal",
-                checking: "base",
-                required: true
-            })
-        }
-        this.setData({
-            form: this.data.form
-        })
-    },
-    /* 打断处理form */
-    interrupt({
-        detail
-    }) {
-        console.log("打断", detail)
-        if (detail.temporary.item.label == "开票抬头") {
-            let item = detail.data.item;
-            detail.data.value[0] = `抬头:${item.enterprisename}\n税号:${item.taxno}\n地址:${item.address}`;
-            detail.form[detail.temporary.index].value = detail.data.value;
-            this.setData({
-                "content.enterprisename": item.enterprisename,
-                "content.taxno": item.taxno,
-                "content.bank": item.bank,
-                "content.phonenumber": item.phonenumber,
-                "content.bankcardno": item.bankcardno,
-                "content.address": item.address,
-            })
-        } else if (detail.temporary.item.label == "开票经销商") {
-            detail.form[0].value = detail.data.value;
-            detail.form.splice(1, detail.form[1].label == '发票种类' ? 0 : 1, {
-                label: "开票抬头",
-                error: false,
-                errMsg: "",
-                type: "route",
-                url: "/select/finance/index",
-                params: {
-                    "id": 20221013160602,
-                    "content": {
-                        nocache: true,
-                        sys_enterpriseid: detail.data.id[0],
-                        "pageSize": 20,
-                        "where": {
-                            "condition": "",
-                        },
-                    },
-                },
-                interrupt: true,
-                query: '&radio=true',
-                value: "",
-                placeholder: "选择开票抬头信息",
-                valueName: "principal",
-                checking: "base",
-                required: true
-            })
-        }
-        this.setData({
-            form: detail.form,
-        })
-        this.selectComponent("#Form").confirm();
-        wx.navigateBack()
-    },
-    submit() {
-        let data = this.selectComponent("#Form").submit();
-        let content = Object.assign(this.data.content, data);
-        content.sys_enterpriseid && (content.sys_enterpriseid = data.sys_enterpriseid[1][0]);
-        delete(content.principal)
-        wx.showModal({
-            title: '提示',
-            content: '是否确定创建开票申请单?',
-            complete: ({
-                confirm
-            }) => {
-                if (confirm) _Http.basic({
-                    "id": "20221216142903",
-                    "version": 1,
-                    content
-                }).then(res => {
-                    console.log("创建开票申请单", res)
-                    wx.showToast({
-                        title: res.msg == '成功' ? '创建成功' : res.msg,
-                        icon: "none",
-                        mask: true
-                    });
-                    if (res.msg == '成功') setTimeout(() => wx.redirectTo({
-                        url: '/packageA/invoice/detail?id=' + res.data.sa_invoiceapplyid,
-                    }), 500)
-                })
-            }
-        })
+	data: {
+		loading: true,
+		showAll: false,
+		disabled: true,
+		form: [{
+			label: "发票种类",
+			error: false,
+			errMsg: "",
+			type: "radio",
+			radioList: [{
+					name: 's/专用发票',
+					id: 's'
+				},
+				{
+					name: 'p/普通发票(电票)',
+					id: 'p'
+				},
+			],
+			value: "s",
+			valueName: "invoiceline",
+			required: false,
+		}, {
+			label: "发票限额",
+			error: false,
+			errMsg: "",
+			type: "number", //digit
+			value: "",
+			placeholder: "发票限额",
+			valueName: "quota",
+			required: false
+		}, {
+			label: "发票复核人",
+			error: false,
+			errMsg: "",
+			type: "text",
+			value: "王蒋霞",
+			placeholder: "发票复核人",
+			valueName: "invoicechecker",
+			required: false
+		}, {
+			label: "发票收款人",
+			error: false,
+			errMsg: "",
+			type: "text",
+			value: "孙惠吉",
+			placeholder: "发票收款人",
+			valueName: "invoicepayee",
+			required: false
+		}, {
+			label: "发票开票员",
+			error: false,
+			errMsg: "",
+			type: "text",
+			value: "冯云霞",
+			placeholder: "发票开票员",
+			valueName: "invoiceclerk",
+			required: false
+		}, {
+			label: "备注",
+			error: false,
+			errMsg: "",
+			type: "textarea",
+			value: "",
+			placeholder: "备注",
+			valueName: "remarks",
+			required: false
+		}, ],
+		content: {
+			sa_invoiceapplyid: 0,
+			byhand: false,
+			enterprisename: "", //抬头
+			taxno: "", //税号
+			bank: "", //开户行
+			phonenumber: "", //手机号
+			bankcardno: "", //开户账号
+			address: "", //开票地址
+			quota: 0,
+		}
+	},
+	onLoad(options) {
+		console.log(wx.getStorageSync('userrole'))
+		if (wx.getStorageSync('userrole') == '业务员') {
+			this.data.form.unshift({
+				label: "开票经销商",
+				error: false,
+				errMsg: "",
+				type: "route",
+				url: "/select/agent/index",
+				params: {
+					"id": "20221216145803",
+					"version": 1,
+					"content": {
+						nocache: true,
+						"where": {
+							"condition": ""
+						}
+					}
+				},
+				interrupt: true,
+				query: '&radio=true',
+				value: "",
+				placeholder: "选择开票经销商",
+				valueName: "sys_enterpriseid",
+				required: true
+			})
+		} else {
+			this.data.form.unshift({
+				label: "开票抬头",
+				error: false,
+				errMsg: "",
+				type: "route",
+				url: "/select/finance/index",
+				params: {
+					"id": 20221013160602,
+					"content": {
+						nocache: true,
+						"pageSize": 20,
+						"where": {
+							"condition": "",
+						},
+					},
+				},
+				interrupt: true,
+				query: '&radio=true',
+				value: "",
+				placeholder: "选择开票抬头信息",
+				valueName: "principal",
+				checking: "base",
+				required: true
+			})
+		}
+		this.setData({
+			form: this.data.form
+		})
+	},
+	/* 打断处理form */
+	interrupt({
+		detail
+	}) {
+		console.log("打断", detail)
+		if (detail.temporary.item.label == "开票抬头") {
+			let item = detail.data.item;
+			detail.data.value[0] = `抬头:${item.enterprisename}\n税号:${item.taxno}\n地址:${item.address}`;
+			detail.form[detail.temporary.index].value = detail.data.value;
+			this.setData({
+				"content.enterprisename": item.enterprisename,
+				"content.taxno": item.taxno,
+				"content.bank": item.bank,
+				"content.phonenumber": item.phonenumber,
+				"content.bankcardno": item.bankcardno,
+				"content.address": item.address,
+			})
+		} else if (detail.temporary.item.label == "开票经销商") {
+			detail.form[0].value = detail.data.value;
+			detail.form.splice(1, detail.form[1].label == '发票种类' ? 0 : 1, {
+				label: "开票抬头",
+				error: false,
+				errMsg: "",
+				type: "route",
+				url: "/select/finance/index",
+				params: {
+					"id": 20221013160602,
+					"content": {
+						nocache: true,
+						sys_enterpriseid: detail.data.id[0],
+						"pageSize": 20,
+						"where": {
+							"condition": "",
+						},
+					},
+				},
+				interrupt: true,
+				query: '&radio=true',
+				value: "",
+				placeholder: "选择开票抬头信息",
+				valueName: "principal",
+				checking: "base",
+				required: true
+			})
+		}
+		this.setData({
+			form: detail.form,
+		})
+		this.selectComponent("#Form").confirm();
+		wx.navigateBack()
+	},
+	submit() {
+		let that = this;
+		let data = this.selectComponent("#Form").submit();
+		let content = Object.assign(this.data.content, data);
+		content.sys_enterpriseid && (content.sys_enterpriseid = data.sys_enterpriseid[1][0]);
+		delete(content.principal)
+		wx.showModal({
+			title: '提示',
+			content: '是否确定创建开票申请单?',
+			complete: ({
+				confirm
+			}) => {
+				if (confirm) {
+					that.setData({
+						loading: true
+					})
+					_Http.basic({
+						"id": "20221216142903",
+						"version": 1,
+						content
+					}).then(res => {
+						that.setData({
+							loading: false
+						})
+						console.log("创建开票申请单", res)
+						wx.showToast({
+							title: res.msg == '成功' ? '创建成功' : res.msg,
+							icon: "none",
+							mask: true
+						});
+						if (res.msg == '成功') setTimeout(() => wx.redirectTo({
+							url: '/packageA/invoice/detail?id=' + res.data.sa_invoiceapplyid,
+						}), 500)
+					})
+				}
+			}
+		})
 
-    },
-    // 是否显示全部
-    onChange({
-        detail
-    }) {
-        this.setData({
-            showAll: detail
-        })
-    },
-    /* 表单必填项是否完成 */
-    onConfirm({
-        detail
-    }) {
-        this.setData({
-            disabled: detail
-        })
-    }
+	},
+	// 是否显示全部
+	onChange({
+		detail
+	}) {
+		this.setData({
+			showAll: detail
+		})
+	},
+	/* 表单必填项是否完成 */
+	onConfirm({
+		detail
+	}) {
+		this.setData({
+			disabled: detail
+		})
+	}
 })

packageA/invoice/update.wxml

@@ -3,5 +3,5 @@
 	<view slot='discountrate' style="margin-right: 36rpx;">%</view>
 </Yl_Field>
 <view class="footer">
-	<van-button custom-class='but' disabled="{{disabled}}" bind:click="submit">创建开票申请单</van-button>
+	<van-button custom-class='but' disabled="{{disabled}}" loading='{{loading}}' bind:click="submit">创建开票申请单</van-button>
 </view>

packageA/returnOne/update.js

@@ -1,194 +1,201 @@
 const _Http = getApp().globalData.http,
-  getTime = require("../../utils/getTime");
+	getTime = require("../../utils/getTime");
 
 Page({
-  data: {
-    showAll: false,
-    disabled: true,
-    content: {
-      "sa_aftersalesmagid": 0,
-      "sa_orderid": "",
-      "reason": "",
-      "billdate": "",
-      "type": "退货单"
-    },
+	data: {
+		loading: false,
+		showAll: false,
+		disabled: true,
+		content: {
+			"sa_aftersalesmagid": 0,
+			"sa_orderid": "",
+			"reason": "",
+			"billdate": "",
+			"type": "退货单"
+		},
 
-  },
-  onLoad(options) {
-    let form = [{
-      label: "返退原因",
-      error: false,
-      errMsg: "",
-      type: "texteara",
-      value: "",
-      placeholder: "请输入返退原因",
-      valueName: "reason",
-      required: false,
+	},
+	onLoad(options) {
+		let form = [{
+			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) {
-      let data = JSON.parse(options.rowData);
-      console.log(data);
-      this.setData({
-        form: form.map(v => {
-          if (v.valueName != 'region') {
-            if (v.valueName == 'enterprisename') {
-              v.value = [data[v.valueName]]
-            } else {
-              v.value = data[v.valueName];
-            }
-          } else {
-            v.value = data.province ? [data.province, data.city, data.county] : []
-          }
-          return v
-        }),
-        '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;
-    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
-    })
-    wx.navigateBack()
-  },
-  async submit() {
-    let content = {
-      ...this.data.content,
-      ...this.selectComponent("#Form").submit()
-    }
-    content.sa_orderid = content.sa_orderid[1][0] || '';
-    content.sys_enterpriseid = content.sys_enterpriseid[1][0] || '';
-    
-    let res = await _Http.basic({
-      "id": "20230104160503",
-      content
-    })
-    console.log(res)
-    wx.showToast({
-      title: res.msg == '成功' ? '创建成功' : res.msg,
-      icon: "none",
-      mask: true
-    })
+		}, {
+			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) {
+			let data = JSON.parse(options.rowData);
+			console.log(data);
+			this.setData({
+				form: form.map(v => {
+					if (v.valueName != 'region') {
+						if (v.valueName == 'enterprisename') {
+							v.value = [data[v.valueName]]
+						} else {
+							v.value = data[v.valueName];
+						}
+					} else {
+						v.value = data.province ? [data.province, data.city, data.county] : []
+					}
+					return v
+				}),
+				'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;
+		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
+		})
+		wx.navigateBack()
+	},
+	async submit() {
+		let content = {
+			...this.data.content,
+			...this.selectComponent("#Form").submit()
+		}
+		content.sa_orderid = content.sa_orderid[1][0] || '';
+		content.sys_enterpriseid = content.sys_enterpriseid[1][0] || '';
 
-    setTimeout(() => {
-      wx.redirectTo({
-        url: '/packageA/returnOne/detail?id=' + res.data.sa_aftersalesmagid,
-      })
-    }, 500)
-  },
-  // 是否显示全部
-  onChange({
-    detail
-  }) {
-    this.setData({
-      showAll: detail
-    })
-  },
-  /* 表单必填项是否完成 */
-  onConfirm({
-    detail
-  }) {
-    this.setData({
-      disabled: detail
-    })
-  }
+		this.setData({
+			loading: true
+		})
+		let res = await _Http.basic({
+			"id": "20230104160503",
+			content
+		})
+		this.setData({
+			loading: false
+		})
+		console.log(res)
+		wx.showToast({
+			title: res.msg == '成功' ? '创建成功' : res.msg,
+			icon: "none",
+			mask: true
+		})
+
+		setTimeout(() => {
+			wx.redirectTo({
+				url: '/packageA/returnOne/detail?id=' + res.data.sa_aftersalesmagid,
+			})
+		}, 500)
+	},
+	// 是否显示全部
+	onChange({
+		detail
+	}) {
+		this.setData({
+			showAll: detail
+		})
+	},
+	/* 表单必填项是否完成 */
+	onConfirm({
+		detail
+	}) {
+		this.setData({
+			disabled: detail
+		})
+	}
 })

packageA/returnOne/update.wxml

@@ -3,5 +3,5 @@
 	<view slot='discountrate' style="margin-right: 36rpx;">%</view>
 </Yl_Field>
 <view class="footer">
-	<van-button custom-class='but' disabled="{{disabled}}" bind:click="submit">提交</van-button>
+	<van-button custom-class='but' disabled="{{disabled}}" loading='{{loading}}' bind:click="submit">提交</van-button>
 </view>

packageA/toolBill/update.js

@@ -1,207 +1,214 @@
 const _Http = getApp().globalData.http,
-    getTime = require("../../utils/getTime");
+	getTime = require("../../utils/getTime");
 
 Page({
-    data: {
-        showAll: false,
-        disabled: true,
-        content: {
-            "sa_aftersalesmagid": 0,
-            "sa_orderid": "",
-            "reason": "",
-            "isitemreturn": true,
-            "billdate": "",
-            "type": "借用归还单"
-        },
+	data: {
+		loading: false,
+		showAll: false,
+		disabled: true,
+		content: {
+			"sa_aftersalesmagid": 0,
+			"sa_orderid": "",
+			"reason": "",
+			"isitemreturn": true,
+			"billdate": "",
+			"type": "借用归还单"
+		},
 
-    },
-    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,
+	},
+	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) {
-            let data = JSON.parse(options.rowData);
-            console.log(data);
-            this.setData({
-                form: form.map(v => {
-                    if (v.valueName != 'region') {
-                        if (v.valueName == 'enterprisename') {
-                            v.value = [data[v.valueName]]
-                        } else {
-                            v.value = data[v.valueName];
-                        }
-                    } else {
-                        v.value = data.province ? [data.province, data.city, data.county] : []
-                    }
-                    return v
-                }),
-                'form[0].value': [data.sonum, [data.sa_orderid]],
-                'content.sa_aftersalesmagid': data.sa_aftersalesmagid
-            })
-            this.selectComponent('#Form').confirm()
-        }
+		}, {
+			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) {
+			let data = JSON.parse(options.rowData);
+			console.log(data);
+			this.setData({
+				form: form.map(v => {
+					if (v.valueName != 'region') {
+						if (v.valueName == 'enterprisename') {
+							v.value = [data[v.valueName]]
+						} else {
+							v.value = data[v.valueName];
+						}
+					} else {
+						v.value = data.province ? [data.province, data.city, data.county] : []
+					}
+					return v
+				}),
+				'form[0].value': [data.sonum, [data.sa_orderid]],
+				'content.sa_aftersalesmagid': data.sa_aftersalesmagid
+			})
+			this.selectComponent('#Form').confirm()
+		}
 
 
 
 
 
-    },
-    /* 打断处理form */
-    interrupt({
-        detail
-    }) {
-        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
-        })
-        wx.navigateBack()
-    },
-    async submit() {
-        let content = {
-            ...this.data.content,
-            ...this.selectComponent("#Form").submit()
-        }
-        content.sa_orderid = content.sa_orderid[1][0] || ''
-        let res = await _Http.basic({
-            "id": "20230104160503",
-            content
-        })
-        console.log(res);
-        if (res.msg == '成功') {
-            wx.navigateBack()
-            getCurrentPages().forEach(item => {
-                if (item.__route__ == 'packageA/toolBill/index') {
-                    item.getList(true)
-                } else if (item.__route__ == 'packageA/toolBill/detail') {
-                    item.getDetail(true)
-                }
-            })
-        }
-    },
-    // 是否显示全部
-    onChange({
-        detail
-    }) {
-        this.setData({
-            showAll: detail
-        })
-    },
-    /* 表单必填项是否完成 */
-    onConfirm({
-        detail
-    }) {
-        this.setData({
-            disabled: detail
-        })
-    }
+	},
+	/* 打断处理form */
+	interrupt({
+		detail
+	}) {
+		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
+		})
+		wx.navigateBack()
+	},
+	async submit() {
+		this.setData({
+			loading: true
+		})
+		let content = {
+			...this.data.content,
+			...this.selectComponent("#Form").submit()
+		}
+		content.sa_orderid = content.sa_orderid[1][0] || ''
+		let res = await _Http.basic({
+			"id": "20230104160503",
+			content
+		})
+		this.setData({
+			loading: false
+		})
+		console.log(res);
+		if (res.msg == '成功') {
+			wx.navigateBack()
+			getCurrentPages().forEach(item => {
+				if (item.__route__ == 'packageA/toolBill/index') {
+					item.getList(true)
+				} else if (item.__route__ == 'packageA/toolBill/detail') {
+					item.getDetail(true)
+				}
+			})
+		}
+	},
+	// 是否显示全部
+	onChange({
+		detail
+	}) {
+		this.setData({
+			showAll: detail
+		})
+	},
+	/* 表单必填项是否完成 */
+	onConfirm({
+		detail
+	}) {
+		this.setData({
+			disabled: detail
+		})
+	}
 })

packageA/toolBill/update.wxml

@@ -3,5 +3,5 @@
 	<view slot='discountrate' style="margin-right: 36rpx;">%</view>
 </Yl_Field>
 <view class="footer">
-	<van-button custom-class='but' disabled="{{disabled}}" bind:click="submit">提交</van-button>
+	<van-button custom-class='but' disabled="{{disabled}}" loading='{{loading}}' bind:click="submit">提交</van-button>
 </view>

project.private.config.json

@@ -5,7 +5,7 @@
     "compileHotReLoad": true,
     "urlCheck": false
   },
-  "libVersion": "2.31.1",
+  "libVersion": "2.29.2",
   "condition": {
     "miniprogram": {
       "list": [