@@ -618,12 +629,13 @@ export default {
weighPictures1: [],
weighPictures2: [],
weighPictures3: [],
- voucherStatus: undefined,
- documentType: undefined,
associatedDocumentNo: undefined,
voucherProductList: [],
voucherVehicleList: [],
version: 0,
+ voucherSource: '1',
+ voucherStatus: '1',
+ documentType: '2',
},
tableRequiredData: {},
dataRule:
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
index a5b4f00d..5861820e 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue
@@ -15,6 +15,13 @@
+
+
+
+
+
+
{\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"maxlength":null,"jnpfKey":"textarea","fullName":"备注","label":"备注","sortable":false,"align":"left","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098490403,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"prop":"remake","showWordLimit":true,"width":0,"__vModel__":"remake","fixed":"none","style":{"width":"100%"},"disabled":false,"id":"remake","placeholder":"请输入","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"-客户名称","label":"-客户名称","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":108,"relationTable":"jg_redelivery_originalorder_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField106","tipLabel":"","dragDisabled":false,"className":[],"label":"客户名称","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098535216,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"tableField106-customName","showWordLimit":false,"width":0,"__vModel__":"customName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"tableField106-customName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"-商品名称","label":"-商品名称","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":119,"relationTable":"jg_redelivery_product_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField118","tipLabel":"","dragDisabled":false,"className":[],"label":"商品名称","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098714979,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"tableField118-productName","showWordLimit":false,"width":0,"__vModel__":"productName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"tableField118-productName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}]
+export default columnList
\ No newline at end of file
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/form.vue
new file mode 100644
index 00000000..14c81dd8
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/form.vue
@@ -0,0 +1,740 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *单据编号
+
+
+
+
+
+
+
+
+ *客户名称
+
+
+
+
+
+
+
+
+ *发货仓库
+
+
+
+
+
+
+
+
+ *商品名称
+
+
+
+
+
+
+
+
+ *销售单位
+
+
+
+
+
+
+
+
+ *销售数量
+
+
+
+
+
+
+
+
+ *计划发货数量
+
+
+
+
+
+
+
+
+ *缺货数量
+
+
+
+
+
+
+
+
+
+ *订货时间
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *商品名称
+
+
+
+
+
+
+
+
+ *发货仓库
+
+
+
+
+
+
+
+
+ *客户名称
+
+
+
+
+
+
+
+
+ *规格
+
+
+
+
+
+
+
+
+ *库存单位
+
+
+
+
+
+
+
+
+ *销售单位
+
+
+
+
+
+
+
+
+ *原销售数量
+
+
+
+
+
+
+
+
+ *原期望送达时间开始
+
+
+
+
+
+
+
+
+ *新销售数量
+
+
+
+
+
+
+
+
+ *新期望送达时间开始
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue
new file mode 100644
index 00000000..e63e53a8
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/index.vue
@@ -0,0 +1,650 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+
+
+
+ 新增
+
+ 导出
+
+ 批量删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ {{ item.customName}}
+
+ |
+
+
+
+
+
+
+ |
+
+
+ {{ item.customName}}
+
+ |
+
+
+
+ 隐藏部分
+ 加载更多
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+ {{ item.productName}}
+
+ |
+
+
+
+
+
+
+ |
+
+
+ {{ item.productName}}
+
+ |
+
+
+
+ 隐藏部分
+ 加载更多
+
+
+
+
+
+
+
+
+ 等待审核
+ 审核通过
+ 审核驳回
+ 流程撤回
+ 审核终止
+ 等待提交
+
+
+
+
+ 编辑
+
+ 删除
+
+ 详情
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.fullName}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/superQueryJson.js b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/superQueryJson.js
new file mode 100644
index 00000000..bcdab854
--- /dev/null
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/redeliveryOrder/superQueryJson.js
@@ -0,0 +1,2 @@
+const superQueryJson = [{"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"redeliveryOrder","className":[],"label":"补送订单编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098311041,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"补送订单","tag":"JnpfInput","span":12},"readonly":true,"__vModel__":"redeliveryOrderCode","fullName":"补送订单编号","style":{"width":"100%"},"id":"redeliveryOrderCode","placeholder":"系统自动生成"},{"clearable":true,"format":"yyyy-MM-dd","fullName":"制单时间","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_redelivery_order","renderKey":1707098458436,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"制单时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":12},"readonly":false,"__vModel__":"preparationTime","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"preparationTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"maxlength":null,"fullName":"备注","type":"textarea","autoSize":{"minRows":4,"maxRows":4},"__config__":{"formId":104,"visibility":["pc","app"],"jnpfKey":"textarea","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"备注","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098490403,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-textarea","tag":"JnpfTextarea","regList":[],"span":24},"readonly":false,"showWordLimit":true,"__vModel__":"remake","style":{"width":"100%"},"disabled":false,"id":"remake","placeholder":"请输入","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-单据编号","addonAfter":"","__config__":{"formId":107,"relationTable":"jg_redelivery_originalorder_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField106","tipLabel":"","dragDisabled":false,"className":[],"label":"单据编号","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098528472,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"businessOrderCode","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField106-businessOrderCode","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-客户名称","addonAfter":"","__config__":{"formId":108,"relationTable":"jg_redelivery_originalorder_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField106","tipLabel":"","dragDisabled":false,"className":[],"label":"客户名称","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098535216,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"customName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField106-customName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-发货仓库","addonAfter":"","__config__":{"formId":109,"relationTable":"jg_redelivery_originalorder_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField106","tipLabel":"","dragDisabled":false,"className":[],"label":"发货仓库","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098544976,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"deliveryWarehouse","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField106-deliveryWarehouse","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-商品名称","addonAfter":"","__config__":{"formId":110,"relationTable":"jg_redelivery_originalorder_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField106","tipLabel":"","dragDisabled":false,"className":[],"label":"商品名称","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098548721,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"productName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField106-productName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-销售单位","addonAfter":"","__config__":{"formId":111,"relationTable":"jg_redelivery_originalorder_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField106","tipLabel":"","dragDisabled":false,"className":[],"label":"销售单位","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098551421,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"saleUnit","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField106-saleUnit","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-销售数量","addonAfter":"","__config__":{"formId":112,"relationTable":"jg_redelivery_originalorder_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField106","tipLabel":"","dragDisabled":false,"className":[],"label":"销售数量","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098556465,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"saleNum","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField106-saleNum","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-计划发货数量","addonAfter":"","__config__":{"formId":113,"relationTable":"jg_redelivery_originalorder_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField106","tipLabel":"","dragDisabled":false,"className":[],"label":"计划发货数量","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098561373,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"planDeliveryNum","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField106-planDeliveryNum","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-缺货数量","addonAfter":"","__config__":{"formId":114,"relationTable":"jg_redelivery_originalorder_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField106","tipLabel":"","dragDisabled":false,"className":[],"label":"缺货数量","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098567457,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"shortageNum","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField106-shortageNum","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"format":"yyyy-MM-dd","fullName":"-订货时间","type":"date","__config__":{"relationTable":"jg_redelivery_originalorder_relation","endRelationField":"","defaultValue":null,"parentVModel":"tableField106","dragDisabled":false,"className":[],"showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098645633,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"isSubTable":true,"tag":"JnpfDatePicker","formId":116,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"订货时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":24},"readonly":false,"__vModel__":"reserveTime","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"tableField106-reserveTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-商品名称","addonAfter":"","__config__":{"formId":119,"relationTable":"jg_redelivery_product_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField118","tipLabel":"","dragDisabled":false,"className":[],"label":"商品名称","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098714979,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"productName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField118-productName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-发货仓库","addonAfter":"","__config__":{"formId":120,"relationTable":"jg_redelivery_product_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField118","tipLabel":"","dragDisabled":false,"className":[],"label":"发货仓库","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098729877,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"deliveryWarehouse","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField118-deliveryWarehouse","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-客户名称","addonAfter":"","__config__":{"formId":121,"relationTable":"jg_redelivery_product_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField118","tipLabel":"","dragDisabled":false,"className":[],"label":"客户名称","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098736616,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"customName","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField118-customName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-规格","addonAfter":"","__config__":{"formId":122,"relationTable":"jg_redelivery_product_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField118","tipLabel":"","dragDisabled":false,"className":[],"label":"规格","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098745459,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"spec","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField118-spec","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-库存单位","addonAfter":"","__config__":{"formId":123,"relationTable":"jg_redelivery_product_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField118","tipLabel":"","dragDisabled":false,"className":[],"label":"库存单位","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098756868,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"inventoryUnit","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField118-inventoryUnit","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-销售单位","addonAfter":"","__config__":{"formId":124,"relationTable":"jg_redelivery_product_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField118","tipLabel":"","dragDisabled":false,"className":[],"label":"销售单位","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098757997,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"saleUnit","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField118-saleUnit","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-原销售数量","addonAfter":"","__config__":{"formId":125,"relationTable":"jg_redelivery_product_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField118","tipLabel":"","dragDisabled":false,"className":[],"label":"原销售数量","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098884447,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"oldSaleNum","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField118-oldSaleNum","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"-原期望送达时间开始","props":{"label":"fullName","value":"id"},"__config__":{"relationTable":"jg_redelivery_product_relation","defaultValue":"","parentVModel":"tableField118","dragDisabled":false,"className":[],"propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098896140,"tagIcon":"icon-ym icon-ym-generator-select","isSubTable":true,"tag":"JnpfSelect","formId":126,"visibility":["pc","app"],"jnpfKey":"select","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","label":"原期望送达时间开始","trigger":"change","layout":"colFormItem","propsName":"","regList":[],"span":24},"options":[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],"__vModel__":"oldExpectArriveTimeStart","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"tableField118-oldExpectArriveTimeStart","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"suffixIcon":"","fullName":"-新销售数量","addonAfter":"","__config__":{"formId":127,"relationTable":"jg_redelivery_product_relation","visibility":["pc","app"],"jnpfKey":"input","noShow":false,"parentVModel":"tableField118","tipLabel":"","dragDisabled":false,"className":[],"label":"新销售数量","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098913932,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"isSubTable":true,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"showWordLimit":false,"__vModel__":"newSaleNum","showPassword":false,"style":{"width":"100%"},"disabled":false,"id":"tableField118-newSaleNum","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"multiple":false,"fullName":"-新期望送达时间开始","props":{"label":"fullName","value":"id"},"__config__":{"relationTable":"jg_redelivery_product_relation","defaultValue":"","parentVModel":"tableField118","dragDisabled":false,"className":[],"propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_redelivery_order","renderKey":1707098921096,"tagIcon":"icon-ym icon-ym-generator-select","isSubTable":true,"tag":"JnpfSelect","formId":128,"visibility":["pc","app"],"jnpfKey":"select","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","label":"新期望送达时间开始","trigger":"change","layout":"colFormItem","propsName":"","regList":[],"span":24},"options":[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],"__vModel__":"newExpectArriveTimeStart","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"tableField118-newExpectArriveTimeStart","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}]
+export default superQueryJson
\ No newline at end of file
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/boundCheck.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/boundCheck.vue
index e6e7282b..80d885a6 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/boundCheck.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/boundCheck.vue
@@ -41,7 +41,7 @@
@@ -49,7 +49,7 @@
+ placeholder="请输入" readonly clearable :style='{"width":"100%"}'>
@@ -73,7 +73,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -84,7 +84,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -95,7 +95,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -108,7 +108,7 @@
@change="changeData('businessordervoucherrelational-cargoAreaId',scope.$index)"
placeholder="请选择" clearable :style='{"width":"100%"}'
:options="businessordervoucherrelationalcargoAreaIdOptions"
- :props="businessordervoucherrelationalcargoAreaIdProps">
+ :props="businessordervoucherrelationalcargoAreaIdProps" readonly>
@@ -122,7 +122,7 @@
@change="changeData('businessordervoucherrelational-creatorTime',scope.$index)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
- format="yyyy-MM-dd">
+ format="yyyy-MM-dd" readonly>
@@ -136,7 +136,7 @@
@change="changeData('businessordervoucherrelational-lastModifyTime',scope.$index)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
- format="yyyy-MM-dd">
+ format="yyyy-MM-dd" readonly>
@@ -150,7 +150,7 @@
@change="changeData('businessordervoucherrelational-deleteTime',scope.$index)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date"
- format="yyyy-MM-dd">
+ format="yyyy-MM-dd" readonly>
@@ -186,7 +186,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -197,7 +197,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -208,7 +208,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -219,7 +219,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -230,7 +230,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -241,7 +241,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -252,7 +252,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -263,7 +263,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -274,7 +274,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -285,7 +285,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -296,7 +296,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
@@ -307,7 +307,7 @@
+ placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/boundLock.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/boundLock.vue
index 4fcd4162..85542739 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/boundLock.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/boundLock.vue
@@ -516,7 +516,7 @@ export default {
goBack() {
debugger
this.visible = false
- this.$router.push({ path: '/scm/saleCenter/saleOrder' })
+ this.$router.go(-1)
// this.$emit('refreshDataList', true)
},
changeData(model, index) {
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
index 199d2589..558d74c7 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue
@@ -1,8 +1,4 @@
-
-
-
-
-
+
+ placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+ popupType="dialog" relationField='contract_name' field='contractId'
+ interfaceId="523139566396246597" :pageSize="20"
+ :columnOptions="contractIdcolumnOptions" clearable :style='{"width":"100%"}'>
@@ -554,11 +549,10 @@
@change="changeData('businessorderproductrelational-productId',scope.$index)"
:rowIndex="scope.$index" :formData="dataForm"
:templateJson="interfaceRes.businessorderproductrelationalproductId"
- placeholder="请选择"
- :disabled="judgeWrite('businessorderproductrelationalList')||judgeWrite('businessorderproductrelationalList-productId')"
- propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
- relationField='commodity_name' :field="'productId'+scope.$index"
- interfaceId="523160915206474309" :pageSize="20"
+ placeholder="请选择" propsValue="id" popupWidth="800px" popupTitle="选择数据"
+ popupType="dialog" relationField='commodity_name'
+ :field="'productId'+scope.$index" interfaceId="523160915206474309"
+ :pageSize="20"
:columnOptions="businessorderproductrelationalproductIdcolumnOptions"
clearable :style='{"width":"100%"}'>
diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/redeliveryOrder.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/redeliveryOrder.vue
index a4c9e028..660a7989 100644
--- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/redeliveryOrder.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/redeliveryOrder.vue
@@ -1,342 +1,415 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- *单据编号
-
-
-
-
-
-
-
-
- *客户名称
-
-
-
-
-
-
-
-
- *发货仓库
-
-
-
-
-
-
-
-
- *紧急程度
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- *订货时间
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *单据编号
+
+
+
+
+
+
+
+
+ *客户名称
+
+
+
+
+
+
+
+
+ *发货仓库
+
+
+
+
+
+
+
+
+ *商品名称
+
+
+
+
+
+
+
+
+ *销售单位
+
+
+
+
+
+
+
+
+ *销售数量
+
+
+
+
+
+
+
+
+ *计划发货数量
+
+
+
+
+
+
+
+
+ *缺货数量
+
+
+
+
+
+
-
-
- *期望发货时间
-
-
-
-
-
-
-
-
-
- *期望送达时间
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- *商品名称
-
-
-
-
-
-
-
-
- *仓库名称
-
-
-
-
-
-
-
-
- *规格
-
-
-
-
-
-
-
-
- *库存单位
-
-
-
-
-
-
-
-
- *销售单位
-
-
-
-
-
-
-
-
- *实物库存
-
-
-
-
-
-
-
-
- *可用库存
-
-
-
-
-
-
-
-
- *在途库存
-
-
-
-
-
-
-
-
- *其他仓库库存
-
-
-
-
-
-
-
-
- *销售单价
-
-
-
-
-
-
-
-
- *销售数量
-
-
-
-
-
-
-
-
- *检查结果
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ *订货时间
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+ 添加
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ *商品名称
+
+
+
+
+
+
+
+
+ *发货仓库
+
+
+
+
+
+
+
+
+ *客户名称
+
+
+
+
+
+
+
+
+ *规格
+
+
+
+
+
+
+
+
+ *库存单位
+
+
+
+
+
+
+
+
+ *销售单位
+
+
+
+
+
+
+
+
+ *原销售数量
+
+
+
+
+
+
+
+
+ *原期望送达时间开始
+
+
+
+
+
+
+
+
+ *新销售数量
+
+
+
+
+
+
+
+
+ *新期望送达时间开始
+
+
+
+
+
+
+
+
+ 删除
+
+
+
+
+ 添加
+
+
+
+
+
-
-
-
+
+
+
+
-