Merge branch 'intex' into intex_online_yejiaxing

src/components/BasicForm/src/BasicForm.vue

@@ -1189,6 +1189,13 @@ const onEnter = async (field, value, e) => {
         if (list.length != 0) {
          emit('onEnter', field, value, e)
         }
+        if (props.isShowFooterButtton && !props.footButttondata) {
+          Butttondata = [
+            defaultButtons.formSaveBtn(null), // 保存
+            defaultButtons.formCloseBtn(null) // 关闭
+          ]
+          count.value++
+        }
       }
     )
   } else {

src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts

@@ -115,6 +115,29 @@ export const CountadjustRequestMain = useCrudSchemas(<CrudSchema[]>([
       }
     }
   },
+
+    {
+    label: '调整金额合计',
+    field: 'allAdjustmentPrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 2
+    }
+  },
+
+
   {
     label: '申请时间',
     field: 'requestTime',
@@ -525,6 +548,47 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       min: 1,
       precision: 6
     }
+  },
+    {
+    label: '标准成本价格',
+    field: 'standardCostPrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+
+      {
+    label: '调整后金额',
+    field: 'adjustmentPrice',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 2
+      }
+    },
+    tableForm: {
+      type: 'InputNumber',
+      min: 1,
+      precision: 2
+    }
   },
   {
     label: '仓库代码',