Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-item.js

@@ -35,7 +35,7 @@ export default {
       if (props.schema.hidden) {
         return false;
       }
-      if (props.schema.readOnly && (props.mode === "create" || props.mode === "update")) {
+      if (props.schema.hidden && (props.mode === "create" || props.mode === "update")) {
         return false;
       }
       return true;

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/index.js

@@ -7,7 +7,7 @@ export default {
   },
   name: "AppForm",
   template: html`<div v-loading="loading">
-    <el-form ref="formRef" :model="model" label-width="auto" :inline="inline">
+    <el-form ref="formRef" :model="model" label-width="auto" :inline="inline" @keyup.enter.native="submit">
       <template v-if="schema && schema.properties">
         <template v-for="(value, prop) in getProperties(schema.properties)">
           <app-form-item :parentSchema="schema" :schema="value" v-model="model" :prop="prop" :mode="mode" :errors="errors" />

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/adjust.js

@@ -111,6 +111,13 @@ export default function () {
                 value: null,
                 readOnly: true,
               },
+              {
+                logic: "and",
+                column: "custPartCode",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
               {
                 logic: "and",
                 column: "vinCode",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/balance.js

@@ -80,6 +80,13 @@ export default function () {
                 value: null,
                 readOnly: true,
               },
+              {
+                logic: "and",
+                column: "custPartCode",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
               {
                 logic: "and",
                 column: "vinCode",

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/log.js

@@ -87,6 +87,13 @@ export default function () {
                 value: null,
                 readOnly: true,
               },
+              {
+                logic: "and",
+                column: "custPartCode",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
               {
                 logic: "and",
                 column: "vinCode",