update

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

@@ -22,7 +22,7 @@ export default {
           v-model="model[prop]"
           :placeholder="$t('select')"
           :multiple="!!schema.multiple"
-          clearable
+          :clearable="!!schema.clearable"
           style="width:100%"
           :title="JSON.stringify(options)"
         >
@@ -56,7 +56,7 @@ export default {
       </template>
       <template v-else>
         <el-input
-          clearable
+          :clearable="!!schema.clearable"
           :disabled="getDisabled()"
           :placeholder="schema.title"
           v-model="model[prop]"
@@ -65,7 +65,7 @@ export default {
           v-if="schema.input==='password'"
         />
         <el-input
-          clearable
+          :clearable="!!schema.clearable"
           :disabled="getDisabled()"
           :placeholder="schema.title"
           v-model="model[prop]"

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

@@ -258,35 +258,47 @@ export default {
                 </el-form-item>
               </el-form>
             </template>
+
             <template v-else-if="editFormMode==='import'">
-              <el-form :model="importModel" style="height:100%;">
+              <app-form
-                <!-- <el-form-item :label="$t('导入模板')">
+                inline
+                mode="import"
+                label-position="left"
+                :schema="config.import.schema"
+                v-model="importModel"
+                :hideButton="true"
+                :isQueryForm="true"
+              >
+                <el-form :model="importModel" style="height:100%;">
+                  <!-- <el-form-item :label="$t('导入模板')">
                   <el-link type="primary" @click="getImportTemplate">{{$t('下载')}}</el-link>
                 </el-form-item> -->
-                <el-form-item label="选择工厂" label-width="80px">
+                  <!-- <el-form-item label="是否为备件" label-width="100px">
-                  <el-select v-model="importModel.version">
+                    <el-select v-model="importModel.version">
-                    <el-option v-for="item in versions" :value="item.value" :label="item.label" />
+                      <el-option v-for="item in versions" :value="item.value" :label="item.label" />
-                  </el-select>
+                    </el-select>
-                </el-form-item>
+                  </el-form-item> -->
-                <el-form-item label="选择期间" label-width="80px">
+                  <!-- <el-form-item label="选择期间" label-width="80px">
                   <el-select v-model="importModel.factory">
                     <el-option v-for="item in versions" :value="item.value" :label="item.label" />
                   </el-select>
-                </el-form-item>
+                </el-form-item> -->
-                <el-form-item :label="$t('文件')" label-width="80px">
+                  <el-form-item :label="$t('文件')" label-width="80px">
-                  <el-upload
+                    <el-upload
-                    ref="uploadRef"
+                      ref="uploadRef"
-                    class="upload"
+                      class="upload"
-                    drag
+                      drag
-                    accept=".xlsx"
+                      accept=".xlsx"
-                    :auto-upload="false"
+                      :auto-upload="false"
-                    :on-change="handleChange"
+                      :on-change="handleChange"
-                  >
+                    >
-                    <el-icon class="el-icon--upload"><ep-upload-filled /></el-icon>
+                      <el-icon class="el-icon--upload"><ep-upload-filled /></el-icon>
-                  </el-upload>
+                    </el-upload>
-                </el-form-item>
+                  </el-form-item>
-              </el-form>
+                </el-form>
+              </app-form>
             </template>
+
             <template v-else-if="editFormMode==='filter'">
               <el-form :model="filterList" inline class="filter">
                 <el-row v-for="(item,index) in filterList.filter(o=>!o.hidden)">
@@ -429,11 +441,9 @@ export default {
       enumBusinessType: route.meta.enumBusinessType,
     };
     const exportModel = ref(defaultExportModel);
-    const defaultImportModel = {
+    const defaultImportModel = config.import?.schema ? schemaToModel(config.import.schema) : {};
-      factory: "",
+    const importModel = ref(defaultImportModel);
-      version: "",
+
-    };
-    const importModel = ref(defaultExportModel);
     const factories = ref([]);
     const versions = ref([]);
     const fileList = ref([]);
@@ -688,8 +698,15 @@ export default {
         editFormloading.value = true;
         const url = config.edit.importUrl;
         const formData = new FormData();
-        formData.append("version", importModel.value.version);
+        // formData.append("version", importModel.value.version);
-        formData.append("factory", importModel.value.factory);
+        // // formData.append("factory", importModel.value.factory);
+        // Object.keys(importModel.value).forEach((q) => {if(importModel.value)
+        Object.keys(importModel.value).forEach((q) => {
+          if (importModel.value[q]) {
+            formData.append(q, importModel.value[q]);
+          }
+        });
+
         for (let i = 0; i < fileList.value.length; i++) {
           formData.append(`files`, fileList.value[i].raw);
         }
@@ -828,6 +845,20 @@ export default {
       }
       return postData;
     }
+    function buildImport() {
+      importModel.value.maxResultCount = pageModel.pageSize;
+      importModel.value.skipCount = (pageModel.pageIndex - 1) * pageModel.pageSize;
+      //
+      const postData = JSON.parse(JSON.stringify(importModel.value));
+      postData.filters = filterList.value.filter((o) => o.column && o.action && (o.value || o.value === false));
+      if (postData.items) {
+        delete postData["items"];
+      }
+      if (postData.import?.id) {
+        delete postData.import["id"];
+      }
+      return postData;
+    }
     function isNotJit() {
       return (
         route.meta.enumBusinessType !== "ZhiGongJian" ||

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/centralized-control.js

@@ -122,6 +122,7 @@ export default function () {
     table: {
       schema: schema,
     },
+
     edit: {
       detailsUrl,
       createUrl,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/material-relationship.js

@@ -82,6 +82,16 @@ export default function () {
     table: {
       schema: schema,
     },
+    import: {
+      schema: {
+        properties: {
+          isBj: {
+            title: "是否为备件",
+            type: "boolean",
+          },
+        },
+      },
+    },
     edit: {
       importUrl,
       exportUrl,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list-app-service-bj.js

@@ -86,6 +86,7 @@ export default function () {
     table: {
       schema: schema,
     },
+
     edit: {
       importUrl,
       exportUrl,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js

@@ -98,6 +98,7 @@ export default function () {
     table: {
       schema: schema,
     },
+
     edit: {
       importUrl,
       exportUrl,

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

@@ -78,6 +78,7 @@ export default function () {
     table: {
       schema: schema,
     },
+
     edit: {
       importUrl,
       exportUrl,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js

@@ -86,6 +86,7 @@ export default function () {
     table: {
       schema: schema,
     },
+
     edit: {
       importUrl,
       exportUrl,

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

@@ -5,4 +5,5 @@ export default {
   url: "settleaccount/centralized-control/get-all",
   value: "version",
   label: "version",
+  clearable: false,
 };