feat(front):前端审核代码提交;

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleCleanOrderEntity.java

@@ -49,6 +49,8 @@ public class RecycleCleanOrderEntity  {
     private String cleanUserId;
     @TableField(value = "PHONE" , updateStrategy = FieldStrategy.IGNORED)
     private String phone;
+    @TableField(value = "ADJUST_SET" , updateStrategy = FieldStrategy.IGNORED)
+    private Integer adjustSet;
     @TableField(value = "ENTRY_STATUS" , updateStrategy = FieldStrategy.IGNORED)
     private Integer entryStatus;
     @TableField(value = "BAG_NO" , updateStrategy = FieldStrategy.IGNORED)

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/RecycleDeliveryOrderEntity.java

@@ -33,7 +33,7 @@ public class RecycleDeliveryOrderEntity  {
     @TableField(value = "DOOR_NUM" , updateStrategy = FieldStrategy.IGNORED)
     private Integer doorNum;
     @TableField(value = "BAG_NO" , updateStrategy = FieldStrategy.IGNORED)
-    private Integer bagNo;
+    private String bagNo;
     @TableField(value = "ORIGINAL_WEIGHT" , updateStrategy = FieldStrategy.IGNORED)
     private BigDecimal originalWeight;
     @TableField(value = "REPORT_WEIGHT" , updateStrategy = FieldStrategy.IGNORED)

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclecleanorder/RecycleCleanOrderForm.java

@@ -1,5 +1,7 @@
 package jnpf.model.recyclecleanorder;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import java.util.List;
 import java.math.BigDecimal;
@@ -71,10 +73,12 @@ public class RecycleCleanOrderForm  {
     /** 上报时间 **/
     @JsonProperty("reportTime")
     private String reportTime;
+    /** 审核设置 **/
+    @JsonProperty("adjustSet")
+    private Integer adjustSet;
     /** 审核状态 **/
     @JsonProperty("adjustStatus")
     private String adjustStatus;
-    /** 入库状态 **/
     @JsonProperty("entryStatus")
     private String entryStatus;
     /** 审核说明 **/

jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/deliveryOrder.vue

@@ -348,126 +348,7 @@ export default {
             activeripxar: ["1", "2"],
             dataRule:
             {
-                phone: [
-                    {
-                        required: true,
-                        message: '投递员手机',
-                        trigger: 'blur'
-                    },
-                ],
-                doorNum: [
-                    {
-                        required: true,
-                        message: '请选择',
-                        trigger: 'change'
-                    },
-                ],
-                productCode: [
-                    {
-                        required: true,
-                        message: '请至少选择一个',
-                        trigger: 'change'
-                    },
-                ],
-                reportWeight: [
-                    {
-                        required: true,
-                        message: '请输入',
-                        trigger: 'blur'
-                    },
-                ],
-                price: [
-                    {
-                        required: true,
-                        message: '请输入',
-                        trigger: 'blur'
-                    },
-                    {
-                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
-                        message: '请输入正确的金额',
-                        trigger: 'blur'
-                    },
-                ],
-                totalPrice: [
-                    {
-                        required: true,
-                        message: '审核后本单总价',
-                        trigger: 'blur'
-                    },
-                    {
-                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
-                        message: '请输入正确的重量',
-                        trigger: 'blur'
-                    },
-                ],
-                originalWeight: [
-                    {
-                        required: true,
-                        message: '投递前桶内重量',
-                        trigger: 'blur'
-                    },
-                ],
-                adjustWeight: [
-                    {
-                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
-                        message: '请输入正确的重量',
-                        trigger: 'blur'
-                    },
-                ],
-                adjustPrice: [
-                    {
-                        required: true,
-                        message: '审核后本单总价',
-                        trigger: 'blur'
-                    },
-                    {
-                        pattern: /^([1-9][\d]*|0)(\.[\d]+)?$/,
-                        message: '请输入正确的重量',
-                        trigger: 'blur'
-                    },
-                ],
-                adjustStatus: [
-                    {
-                        required: true,
-                        message: '不能为空',
-                        trigger: 'change'
-                    },
-                ],
-                bucketCode: [
-                    {
-                        required: true,
-                        message: '请至少选择一个',
-                        trigger: 'change'
-                    },
-                ],
-                bagNo: [
-                    {
-                        required: true,
-                        message: '请输入',
-                        trigger: 'blur'
-                    },
-                ],
-                deviceOrderNo: [
-                    {
-                        required: true,
-                        message: '请输入',
-                        trigger: 'blur'
-                    },
-                ],
-                cleanerPhone: [
-                    {
-                        pattern: /^1[3456789]\d{9}$/,
-                        message: '请输入正确的手机号码',
-                        trigger: 'blur'
-                    },
-                ],
-                cleanStatus: [
-                    {
-                        required: true,
-                        message: '不能为空',
-                        trigger: 'change'
-                    },
-                ],
+                
             },
             deviceCodeOptions: [],
             deviceCodeProps: { "label": "device_name", "value": "device_code" },

jnpf-java-boot/jnpf-web/src/views/recycledeliveryorder/index.vue

@@ -180,7 +180,7 @@
             </div>
         </div>
         <JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
-        <delivery-Order-Audit v-if="auditVisible" ref="deliveryOrderAudit" @refresh="refresh" />
+        <Audit v-if="auditVisible" ref="Audit" @refresh="refresh" />
         <ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
         <ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
         <Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible = false" />
@@ -199,7 +199,7 @@ import { mapGetters } from "vuex";
 import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
 import JNPFForm from './form'
 import Detail from './Detail'
-import deliveryOrderAudit from './deliveryOrder'
+import Audit from './deliveryOrder'
 import ExportBox from '@/components/ExportBox'
 import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
 import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
@@ -216,7 +216,7 @@ export default {
     components: {
         JNPFForm,
         Detail,
-        deliveryOrderAudit,
+        Audit,
         DialogComponent,
         ExportBox, ToFormDetail, SuperQuery
     },
@@ -570,7 +570,7 @@ export default {
             let id = row ? row.id : ""
             this.auditVisible = true
             this.$nextTick(() => {
-                this.$refs.deliveryOrderAudit.init(id, isDetail, this.list)
+                this.$refs.Audit.init(id, isDetail, this.list)
             })
         },
 
@@ -602,6 +602,7 @@ export default {
         },
         refresh(isrRefresh) {
             this.formVisible = false
+            this.auditVisible = false
             if (isrRefresh) this.reset()
         },
         reset() {