From 83b5df2ad8af9d3d4ef6ed60a762c9da5f593935 Mon Sep 17 00:00:00 2001
From: "DESKTOP-JT599KC\\Luan Shanshan" <xinyao.wang@le-it.com.cn>
Date: Tue, 28 Dec 2021 20:34:44 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=80=E7=BB=B4=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/system.js                     |   6 +
 src/server/api.js                        |   7 +
 src/views/system/oneimport/addOrEdit.vue | 304 +++++++++++++++++++++++
 src/views/system/oneimport/index.vue     | 201 +++++++++++++++
 src/views/system/oneimport/upload.vue    |  86 +++++++
 5 files changed, 604 insertions(+)
 create mode 100644 src/views/system/oneimport/addOrEdit.vue
 create mode 100644 src/views/system/oneimport/index.vue
 create mode 100644 src/views/system/oneimport/upload.vue

diff --git a/src/router/system.js b/src/router/system.js
index 22f1871..f54001b 100644
--- a/src/router/system.js
+++ b/src/router/system.js
@@ -40,6 +40,12 @@ const stystem = {
       title: "流水号定义",
       component: () => import("@/views/system/serialNumber"),
     },
+    {
+      icon: "el-icon-document",
+      path: "/system/oneimport",
+      title: "一维表导入",
+      component: () => import("@/views/system/oneimport"),
+    },
     {
       icon: "el-icon-document",
       path: "/system/printer",
diff --git a/src/server/api.js b/src/server/api.js
index cfbb013..a7765c4 100644
--- a/src/server/api.js
+++ b/src/server/api.js
@@ -62,6 +62,13 @@ export const uploadExcel = (param, customerId, versionId) =>
     headers: { "Content-Type": "multipart/form-data" },
     data: param,
   });
+export const readexcel = (param, script) =>
+  service.request({
+		url: "/admin/base/script/readexcel?script=" + script,
+    method: "post",
+    headers: { "Content-Type": "multipart/form-data" },
+    data: param,
+  });
 export const bulkimportfile = (data) =>
 	service.request({
 		url: "/admin/ap/custdemandverhead/bulkimportfile",
diff --git a/src/views/system/oneimport/addOrEdit.vue b/src/views/system/oneimport/addOrEdit.vue
new file mode 100644
index 0000000..a619dc3
--- /dev/null
+++ b/src/views/system/oneimport/addOrEdit.vue
@@ -0,0 +1,304 @@
+<template>
+  <el-dialog
+    :title="isAddOrEdit=='edit'?'修改':'新增'"
+    model-value
+    width="90%"
+    :close-on-click-modal="false"
+    :before-close="cancel"
+  >
+    <el-form
+      ref="formData"
+      :model="formData"
+      :rules="rules"
+      label-width="130px"
+      v-loading="loading"
+    >
+      <el-row>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-Script')" prop="Script-Script">
+            <el-input v-model="formData['Script-Script']" :disabled="isAddOrEdit==='edit'" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+       <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-Bez')" prop="Script-Bez">
+            <el-input v-model="formData['Script-Bez']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-ScriptTable')" prop="Script-ScriptTable">
+            <!-- <el-input v-model="formData['Script-ScriptTable']" placeholder="请输入" /> -->
+            <el-input v-model="formData['Script-ScriptTable']" clearable>
+							<template #append>
+								<el-button type="primary" size="small" @click="getColumnEvent">获取表字段</el-button>
+							</template>
+						</el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-ScriptType')">
+            <el-input v-model="formData['Script-ScriptType']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-FilePath')">
+            <el-input v-model="formData['Script-FilePath']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-UseHead')">
+            <el-input-number v-model="formData['Script-UseHead']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+         <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-ClearTable')">
+            <el-input-number v-model="formData['Script-ClearTable']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+         <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-StartRow')">
+            <el-input-number v-model="formData['Script-StartRow']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-StartCol')">
+            <el-input-number v-model="formData['Script-StartCol']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-AppendNewRecord')">
+            <el-input-number v-model="formData['Script-AppendNewRecord']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-UpdateRecord')">
+            <el-input-number v-model="formData['Script-UpdateRecord']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-AppendAndUpdateRecord')">
+            <el-input-number v-model="formData['Script-AppendAndUpdateRecord']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-CallSpecFunc')">
+            <el-input-number v-model="formData['Script-CallSpecFunc']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item :label="getColumnName('Script-CallFunction')">
+            <el-input v-model="formData['Script-CallFunction']" placeholder="请输入" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-table 
+          style="width: 100%;margin-bottom:10px;"
+            height="400px"
+            border
+						size="mini"
+          :data="formData['Script-ScriptItem']">
+						<el-table-column :label="getColumnName('ScriptItem-TabMapCol')">
+							<template #default="scope">
+								<el-input v-model="scope.row['ScriptItem-TabMapCol']" clearable placeholder="请输入" />
+							</template>
+						</el-table-column>
+						<el-table-column :label="getColumnName('ScriptItem-ColNo')">
+							<template #default="scope">
+								<el-input-number v-model="scope.row['ScriptItem-ColNo']" clearable placeholder="请输入" />
+							</template>
+						</el-table-column>
+            <el-table-column :label="getColumnName('ScriptItem-ColName')">
+							<template #default="scope">
+								<el-input v-model="scope.row['ScriptItem-ColName']" clearable placeholder="请输入" />
+							</template>
+						</el-table-column>
+            <el-table-column :label="getColumnName('ScriptItem-RowNo')">
+							<template #default="scope">
+								<el-input-number v-model="scope.row['ScriptItem-RowNo']" clearable placeholder="请输入" />
+							</template>
+						</el-table-column>
+            <el-table-column :label="getColumnName('ScriptItem-RowName')">
+							<template #default="scope">
+								<el-input v-model="scope.row['ScriptItem-RowName']" clearable placeholder="请输入" />
+							</template>
+						</el-table-column>
+            <el-table-column :label="getColumnName('ScriptItem-ColFieldType')">
+							<template #default="scope">
+								<el-input-number v-model="scope.row['ScriptItem-ColFieldType']" clearable placeholder="请输入" />
+							</template>
+						</el-table-column>
+            <el-table-column :label="getColumnName('ScriptItem-ColFormat')">
+							<template #default="scope">
+								<el-input v-model="scope.row['ScriptItem-ColFormat']" clearable placeholder="请输入" />
+							</template>
+						</el-table-column>
+            <el-table-column :label="getColumnName('ScriptItem-DefaultValue')">
+							<template #default="scope">
+								<el-input v-model="scope.row['ScriptItem-DefaultValue']" clearable placeholder="请输入" />
+							</template>
+						</el-table-column>
+					
+						
+						
+						<el-table-column align="center" width="100">
+              <template #header>
+                <el-button
+                  size="mini"
+									class="search-button-style"
+									style="margin-left:0 !important;width:70px;"
+                  @click="handleAddValst()"
+                >新增</el-button>
+              </template>
+              <template #default="scope">
+                 <el-button
+									class="table-delete-button"
+									type="danger"
+                  size="mini"
+                  @click="handleDeleteValst(scope.$index)"
+                >删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button
+          type="primary"
+          class="dialog-submit-button"
+          @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button class="dialog-cancel-button" @click="cancel"
+          >取 消</el-button
+        >
+      </div>
+    </template>
+  </el-dialog>
+</template>
+<script>
+import { get, post, put } from "@/server/api.js";
+export default {
+  name: "editField",
+  props: {
+    item: {
+      default: {},
+    },
+    isAddOrEdit: {
+      default: "add",
+    },
+  },
+  mounted() {
+    if (this.isAddOrEdit == "edit") {
+      get(`/admin/base/script/selectone/${this.item['Script-Script']}`).then(res => {
+				this.formData = res.data
+			})
+    }
+  },
+  created() {
+    
+  },
+  data() {
+    return {
+      loading: false,
+      // 表单参数
+      formData: {
+        'Script-ScriptItem': []
+      },
+      uomtypeArray: [], // 单位类型
+      // 表单校验
+      rules: {
+        "Script-Script": [
+          { required: true, message: "此项不能为空", trigger: "blur" },
+        ],
+        "Script-Bez": [
+          { required: true, message: "此项不能为空", trigger: "blur" },
+        ],
+        "Script-ScriptTable": [
+          { required: true, message: "此项不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  methods: {
+    // 获取表列名
+    getColumnEvent() {
+			let params = {
+				tablename: this.formData['Script-ScriptTable']
+			}
+			get('/admin/base/scriptitem/selecttableinfo', params).then((res) => {
+				if (res.code === 200) {
+					// let newDataArray = []
+					// res.data.forEach(el => {
+					// 	newDataArray.push({
+					// 		'DataTableLst-TargetField': el.fieldName,
+					// 		'DataTableLst-FieldType': el.fieldType
+					// 	})
+					// })
+					this.formData['Script-ScriptItem'] = res.data || []
+				}
+			})
+    },
+    /** 新增字段 */
+    handleAddValst() {
+      this.formData['Script-ScriptItem'].push({
+        'ScriptItem-TabMapCol': undefined,
+        'ScriptItem-ColNo': undefined,
+        'ScriptItem-ColName': undefined,
+        'ScriptItem-RowNo': undefined,
+        'ScriptItem-RowName': undefined,
+        'ScriptItem-ColFieldType': undefined,
+        'ScriptItem-ColFormat': undefined,
+        'ScriptItem-DefaultValue': undefined
+      })
+    },
+    /** 删除字段 */
+    handleDeleteValst(index) {
+      this.formData['Script-ScriptItem'].splice(index, 1)
+    },
+    // 取消
+    cancel() {
+      this.$emit("setIsAddOrEdit", "");
+    },
+    // 确认
+    submitForm() {
+      this.$refs["formData"].validate((valid) => {
+        if (valid) {
+          this.loading = true;
+          if (this.isAddOrEdit == "add") {
+            this.add();
+          } else {
+            this.edit();
+          }
+        }
+      });
+    },
+    // 新增
+    add() {
+      post('/admin/base/script/insertone',this.formData).then(({ code }) => {
+          this.loading = false;
+          if (code == 200) {
+            this.msgSuccess("新增成功");
+            this.$emit("setIsAddOrEdit", false);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    // 修改
+    edit() {
+      put('/admin/base/script/updateone',this.formData).then(({ code }) => {
+          this.loading = false;
+          if (code == 200) {
+            this.msgSuccess("修改成功");
+            this.$emit("setIsAddOrEdit", false);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+  },
+};
+</script>
diff --git a/src/views/system/oneimport/index.vue b/src/views/system/oneimport/index.vue
new file mode 100644
index 0000000..4676b8e
--- /dev/null
+++ b/src/views/system/oneimport/index.vue
@@ -0,0 +1,201 @@
+<template>
+  <div ref="tableRef" class="table-height-wrap">
+    <SearchTemplate>
+      <el-form :inline="true" class="clearfix search-content">
+        <el-form-item :label="getColumnName('Script-Script')">
+          <el-input
+            v-model.trim="queryParams.Script"
+            placeholder="请输入查询内容"
+            clearable
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            icon="el-icon-search"
+            size="mini"
+            class="search-button-style"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            class="reset-button-style"
+            @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+        <el-form-item class="fr">
+          <el-button
+            icon="el-icon-plus"
+            class="add-button-style"
+            @click="setIsAddOrEdit('add')"
+            >新增</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </SearchTemplate>
+    <ContentContainer>
+      <el-table
+        :data="tableData"
+        v-loading="loading"
+        size="mini"
+        style="width: 100%"
+        border
+        v-if="tableHeight"
+        :height="tableHeight"
+      >
+        <el-table-column
+          v-for="(item, index) in headers"
+          :key="index"
+          :label="getColumnName(item)"
+          :show-overflow-tooltip="true"
+          width="150"
+        >
+          <template #default="scope">
+            <span v-if="item === 'Script-PlantNr'">{{
+              getWorkshopName(scope.row["Script-PlantNr"])
+            }}</span>
+            <span v-else>{{ scope.row[item] }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="操作" width="260" fixed="right">
+          <template #default="scope">
+            <el-button
+              class="edit-button-style"
+              @click="handleUpdate(scope.row)"
+              icon="el-icon-edit"
+              size="small"
+              >修改</el-button
+            >
+            <el-button 
+            size="small"
+            class="edit-button-style"
+            @click="handleUpload(scope.row)">导入</el-button>
+            <el-button
+              class="edit-button-style"
+              @click="handleDelete(scope.row)"
+              icon="el-icon-delete"
+              size="small"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页 -->
+      <Pagination
+        v-show="pagination.total > 0"
+        v-model:pagination="pagination"
+        @change="getList"
+      />
+    </ContentContainer>
+    <AddOrEdit
+      v-if="isAddOrEdit"
+      :isAddOrEdit="isAddOrEdit"
+      :item="item"
+      @setIsAddOrEdit="setIsAddOrEdit"
+    />
+    <!-- 上传 -->
+			<uploadTemplate
+				v-if="isShowDialog === 'upload'"
+				:item="item"
+				v-model:isShowDialog="isShowDialog"
+				@editCallBack="completeCallBack" />
+  </div>
+</template>
+<script>
+import { ListMixin } from "@/mixins/ListMixin";
+import AddOrEdit from "./addOrEdit.vue";
+import uploadTemplate from "./upload.vue";
+export default {
+  components: {
+    AddOrEdit,
+    uploadTemplate
+  },
+  mixins: [ListMixin],
+  data() {
+    return {
+      queryTableDataUrl: "/admin/base/script/query",
+      isAddOrEdit: "", // 控制是否显示添加/编辑界面
+      item: {}, // 当前要操作的对象
+      headers: [
+					"Script-PlantNr",
+          "Script-Script",
+          "Script-Bez",
+          "Script-ScriptTable",
+          "Script-ScriptType",
+          "Script-FilePath",
+          "Script-Separator",
+          "Script-UseHead",
+          "Script-ClearTable",
+          "Script-StartRow",
+          "Script-StartCol",
+          "Script-AppendNewRecord",
+          "Script-UpdateRecord",
+          "Script-AppendAndUpdateRecord",
+          "Script-CallSpecFunc",
+          "Script-CallFunction",
+				], // 遍历表头
+      tableHeight: 0,
+      isShowDialog: '',
+    };
+  },
+  methods: {
+    // 上传
+		handleUpload(item) {
+      this.item = item;
+			this.isShowDialog = 'upload'
+		},
+		completeCallBack(data) {
+			this.isShowDialog = ''
+			if (data) {
+				this.handleUpdate(this.item.CustomerId, this.item.VersionId)
+			}
+		},
+    // 是否显示编辑/新增界面
+    setIsAddOrEdit(value) {
+      this.isAddOrEdit = value;
+      if (!value) {
+        this.getList();
+      }
+    },
+    // 修改
+    handleUpdate(item) {
+      this.item = item;
+      this.setIsAddOrEdit("edit");
+    },
+    // 搜索按钮操作
+    handleQuery() {
+      this.pagination.pageNumber = 1;
+      this.getList();
+    },
+    // 重置按钮操作
+    resetQuery() {
+      this.queryParams.Script = undefined;
+      this.handleQuery();
+    },
+    // 删除按钮操作
+    handleDelete(row) {
+      let keyName = row["Script-Script"];
+      let deteleUrl = `/admin/base/script/deleteone/${row["Script-Script"]}`;
+      // 参数1：删除数据的标志，参数2：删除的接口拼接参数
+      this.delHanle(keyName, deteleUrl);
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.tableHeight = this.calculationTableHeight(
+        this.$refs.tableRef,
+        120
+      );
+    })
+  }
+};
+</script>
+<style lang="less" scoped>
+.table-height-wrap {
+  height: 100%;
+  overflow: hidden;
+}
+</style>
diff --git a/src/views/system/oneimport/upload.vue b/src/views/system/oneimport/upload.vue
new file mode 100644
index 0000000..37a030f
--- /dev/null
+++ b/src/views/system/oneimport/upload.vue
@@ -0,0 +1,86 @@
+<template>
+	<el-dialog :title="title" model-value width="50%" :close-on-click-modal="false" :before-close="cancel">
+		<input
+			type="file"
+			accept="application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, xls, xlsx"
+			@change="previewUpload"
+		>
+		<el-button
+			type="primary"
+			:loading="uploadLoading"
+			icon="el-icon-upload"
+			size="mini"
+			@click="uploadEvent"
+		>上传</el-button>
+	</el-dialog>
+</template>
+<script>
+import { readexcel } from "@/server/api.js";
+export default {
+	name: 'editField',
+	props: {
+		item: {
+			default: null,
+		}
+	},
+	data() {
+		return {
+			title: '导入', // 弹框标题
+			uploadLoading: false,
+      excel: '',
+		}
+	},
+	methods: {
+		cancel() { // 取消按钮
+			this.$emit('update:isShowDialog','')
+		},
+		// 上传文件预览
+    previewUpload(file) {
+      this.excle = file.target.files[0]
+    },
+    // 上传文件
+    uploadEvent() {
+      this.uploadLoading = true
+      if (this.excle === null || this.excle === '' || this.excle === undefined) {
+        this.$message({
+          showClose: true,
+          duration: 2000,
+          message: '请选择文件',
+          type: 'error'
+        })
+        this.uploadLoading = false
+      } else {
+        const uploadData = new FormData()
+        uploadData.append('uploadfile', this.excle)
+        readexcel(uploadData, this.item['Script-Script']).then(res => {
+          this.uploadLoading = false
+          if (res.code === 200) {
+            this.$message({
+              showClose: true,
+              duration: 2000,
+              message: '导入成功',
+              type: 'success'
+            })
+						this.$emit('editCallBack', true)
+          } else {
+            this.$message({
+              showClose: true,
+              duration: 2000,
+              message: res.msg,
+              type: 'error'
+            })
+          }
+        }).catch((res) => {
+					this.uploadLoading = false
+					this.$message({
+              showClose: true,
+              duration: 2000,
+              message: res.msg,
+              type: 'error'
+            })
+				})
+      }
+    },
+	}
+}
+</script>
\ No newline at end of file

From 9c31bf82a239a4df24576c2035da9e7429c853da Mon Sep 17 00:00:00 2001
From: "DESKTOP-JT599KC\\Luan Shanshan" <xinyao.wang@le-it.com.cn>
Date: Tue, 28 Dec 2021 20:56:03 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=B8=80=E7=BB=B4=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/oneimport/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/system/oneimport/index.vue b/src/views/system/oneimport/index.vue
index 4676b8e..ea89334 100644
--- a/src/views/system/oneimport/index.vue
+++ b/src/views/system/oneimport/index.vue
@@ -60,7 +60,7 @@
             <span v-else>{{ scope.row[item] }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作" width="260" fixed="right">
+        <el-table-column label="操作" width="260" fixed="right">
           <template #default="scope">
             <el-button
               class="edit-button-style"
@@ -70,9 +70,10 @@
               >修改</el-button
             >
             <el-button 
-            size="small"
-            class="edit-button-style"
-            @click="handleUpload(scope.row)">导入</el-button>
+              icon="el-icon-upload"
+              size="small"
+              class="edit-button-style"
+              @click="handleUpload(scope.row)">导入</el-button>
             <el-button
               class="edit-button-style"
               @click="handleDelete(scope.row)"

From 17925cf1284c0d6665f6e5d8ca5e65b132eed32f Mon Sep 17 00:00:00 2001
From: "DESKTOP-JT599KC\\Luan Shanshan" <xinyao.wang@le-it.com.cn>
Date: Wed, 29 Dec 2021 09:18:44 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=A5=E4=B8=BA=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/oneimport/addOrEdit.vue | 26 ++++++++++++------------
 src/views/system/oneimport/index.vue     | 11 +++++-----
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/views/system/oneimport/addOrEdit.vue b/src/views/system/oneimport/addOrEdit.vue
index a619dc3..32d2d1f 100644
--- a/src/views/system/oneimport/addOrEdit.vue
+++ b/src/views/system/oneimport/addOrEdit.vue
@@ -34,16 +34,16 @@
 						</el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item :label="getColumnName('Script-ScriptType')">
             <el-input v-model="formData['Script-ScriptType']" placeholder="请输入" />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
+        </el-col> -->
+        <!-- <el-col :span="8">
           <el-form-item :label="getColumnName('Script-FilePath')">
             <el-input v-model="formData['Script-FilePath']" placeholder="请输入" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="8">
           <el-form-item :label="getColumnName('Script-UseHead')">
             <el-input-number v-model="formData['Script-UseHead']" placeholder="请输入" />
@@ -79,16 +79,16 @@
             <el-input-number v-model="formData['Script-AppendAndUpdateRecord']" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item :label="getColumnName('Script-CallSpecFunc')">
             <el-input-number v-model="formData['Script-CallSpecFunc']" placeholder="请输入" />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
+        </el-col> -->
+        <!-- <el-col :span="8">
           <el-form-item :label="getColumnName('Script-CallFunction')">
             <el-input v-model="formData['Script-CallFunction']" placeholder="请输入" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="24">
           <el-table 
           style="width: 100%;margin-bottom:10px;"
@@ -111,7 +111,7 @@
 								<el-input v-model="scope.row['ScriptItem-ColName']" clearable placeholder="请输入" />
 							</template>
 						</el-table-column>
-            <el-table-column :label="getColumnName('ScriptItem-RowNo')">
+            <!-- <el-table-column :label="getColumnName('ScriptItem-RowNo')">
 							<template #default="scope">
 								<el-input-number v-model="scope.row['ScriptItem-RowNo']" clearable placeholder="请输入" />
 							</template>
@@ -120,10 +120,10 @@
 							<template #default="scope">
 								<el-input v-model="scope.row['ScriptItem-RowName']" clearable placeholder="请输入" />
 							</template>
-						</el-table-column>
+						</el-table-column> -->
             <el-table-column :label="getColumnName('ScriptItem-ColFieldType')">
 							<template #default="scope">
-								<el-input-number v-model="scope.row['ScriptItem-ColFieldType']" clearable placeholder="请输入" />
+								<el-input v-model="scope.row['ScriptItem-ColFieldType']" clearable placeholder="请输入" />
 							</template>
 						</el-table-column>
             <el-table-column :label="getColumnName('ScriptItem-ColFormat')">
@@ -245,8 +245,8 @@ export default {
         'ScriptItem-TabMapCol': undefined,
         'ScriptItem-ColNo': undefined,
         'ScriptItem-ColName': undefined,
-        'ScriptItem-RowNo': undefined,
-        'ScriptItem-RowName': undefined,
+        // 'ScriptItem-RowNo': undefined,
+        // 'ScriptItem-RowName': undefined,
         'ScriptItem-ColFieldType': undefined,
         'ScriptItem-ColFormat': undefined,
         'ScriptItem-DefaultValue': undefined
diff --git a/src/views/system/oneimport/index.vue b/src/views/system/oneimport/index.vue
index ea89334..3b9b259 100644
--- a/src/views/system/oneimport/index.vue
+++ b/src/views/system/oneimport/index.vue
@@ -51,7 +51,6 @@
           :key="index"
           :label="getColumnName(item)"
           :show-overflow-tooltip="true"
-          width="150"
         >
           <template #default="scope">
             <span v-if="item === 'Script-PlantNr'">{{
@@ -60,7 +59,7 @@
             <span v-else>{{ scope.row[item] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" width="260" fixed="right">
+        <el-table-column label="操作" width="250">
           <template #default="scope">
             <el-button
               class="edit-button-style"
@@ -125,8 +124,8 @@ export default {
           "Script-Script",
           "Script-Bez",
           "Script-ScriptTable",
-          "Script-ScriptType",
-          "Script-FilePath",
+          // "Script-ScriptType",
+          // "Script-FilePath",
           "Script-Separator",
           "Script-UseHead",
           "Script-ClearTable",
@@ -135,8 +134,8 @@ export default {
           "Script-AppendNewRecord",
           "Script-UpdateRecord",
           "Script-AppendAndUpdateRecord",
-          "Script-CallSpecFunc",
-          "Script-CallFunction",
+          // "Script-CallSpecFunc",
+          // "Script-CallFunction",
 				], // 遍历表头
       tableHeight: 0,
       isShowDialog: '',

From 969c1af9598ef2a002e7cb00dc8911b786d1a9a4 Mon Sep 17 00:00:00 2001
From: "DESKTOP-JT599KC\\Luan Shanshan" <xinyao.wang@le-it.com.cn>
Date: Wed, 29 Dec 2021 10:56:37 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/look_error.png                | Bin 0 -> 1588 bytes
 src/components/queryComponent/index.vue      | 142 ++++++-------------
 src/components/queryComponent/lookError.vue  |  72 ++++++++++
 src/router/plan.js                           |   6 +
 src/views/plan/workbench/lookError/index.vue | 108 ++++++++++++++
 src/views/system/oneimport/addOrEdit.vue     |  67 ++-------
 src/views/system/oneimport/index.vue         |  10 +-
 7 files changed, 249 insertions(+), 156 deletions(-)
 create mode 100644 src/assets/img/look_error.png
 create mode 100644 src/components/queryComponent/lookError.vue
 create mode 100644 src/views/plan/workbench/lookError/index.vue

diff --git a/src/assets/img/look_error.png b/src/assets/img/look_error.png
new file mode 100644
index 0000000000000000000000000000000000000000..3bbc73679b4e7db14646e86fa09c5d17efaa83c4
GIT binary patch
literal 1588
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

literal 0
HcmV?d00001

diff --git a/src/components/queryComponent/index.vue b/src/components/queryComponent/index.vue
index 6ecb4f1..f9caf1b 100644
--- a/src/components/queryComponent/index.vue
+++ b/src/components/queryComponent/index.vue
@@ -1,6 +1,15 @@
 <template>
   <div v-if="isShowComponent" class="handle-right-fixed clearfix">
-    <img v-if="isShowAddButton && permissions()['bulkimport']" @click="handleUpload" src="../../assets/img/import.png" alt="" title="批量导入">
+		<!-- <img 
+			v-if="isShowAddButton"
+			@click="handleSeeError" 
+			src="../../assets/img/look_error.png" alt="" title="查看错误"> -->
+    <img 
+			v-if="isShowAddButton && permissions()['bulkimport']" 
+			@click="handleUpload" 
+			src="../../assets/img/import.png" 
+			alt="" 
+			title="批量导入">
 		<el-popover
 			placement="left"
 			:width="400"
@@ -11,33 +20,11 @@
 				<img :src="notalReadyPic" alt="" title="检索条件">
 			</template>
 			<div class="predict-search-container">
-				<!-- <el-select v-if="isShowAddButton"
-					v-model="valid"
-					style="width: 300px;margin-bottom:10px;"
-					placeholder="请选择是否有效" >
-					<el-option
-						v-for="item in validArrray"
-						:key="item['value']"
-						:label="item['label']"
-						:value="item['value']">
-					</el-option>
-				</el-select> -->
 				<div v-if="isShowAddButton" style="height: 40px;">
 					<span style="margin-right:10px;">是否有效：</span>
 					<el-radio v-model="valid" label="true">有效</el-radio>
 					<el-radio v-model="valid" label="false">无效</el-radio>
 				</div>
-				<!-- <el-select v-if="isShowAddButton"
-					v-model="status"
-					style="width: 300px;margin-bottom:10px;"
-					placeholder="请选择是否发布" >
-					<el-option
-						v-for="item in releaseArrray"
-						:key="item['value']"
-						:label="item['label']"
-						:value="item['value']">
-					</el-option>
-				</el-select> -->
 				<div v-if="isShowAddButton" style="height: 40px;">
 					<span style="margin-right:10px;">是否发布：</span>
 					<el-radio v-model="status" label="0">未发布</el-radio>
@@ -62,63 +49,34 @@
 				</div>
 			</div>
 		</el-popover>
-		<!-- <el-dropdown v-if="isDropdown" trigger="click" @visible-change="handleCommand">
-			<span class="el-dropdown-link">
-				<img :src="notalReadyPic" alt="" title="检索条件">
-			</span>
-			<template #dropdown>
-				<div class="predict-search-container">
-					<el-select v-if="isShowAddButton"
-						v-model="valid"
-						style="width: 150px;margin-right:10px;"
-						placeholder="请选择是否有效" >
-						<el-option
-							v-for="item in validArrray"
-							:key="item['value']"
-							:label="item['label']"
-							:value="item['value']">
-						</el-option>
-					</el-select>
-					<el-select v-if="isShowAddButton"
-						v-model="status"
-						style="width: 150px;margin-right:10px;"
-						placeholder="请选择是否发布" >
-						<el-option
-							v-for="item in releaseArrray"
-							:key="item['value']"
-							:label="item['label']"
-							:value="item['value']">
-						</el-option>
-					</el-select>
-					<el-input
-						v-if="isShowAddButton"
-						v-model="VersionID"
-						placeholder="检索条件：版本号"
-						clearable
-						style="width: 200px;margin-right:10px;"
-					/>
-					<el-input
-						v-model="SearchId"
-						:placeholder="isShowAddButton ? '检索条件：零件号' : '检索条件：零件号/版本号'"
-						clearable
-						style="width: 200px"
-					/>
-					<el-button icon="el-icon-search" size="mini" class="search-button-style" @click="handleQuery">搜索</el-button>
-					<el-button icon="el-icon-refresh" size="mini" class="reset-button-style" @click="resetQuery">重置</el-button>
-				</div>
-			</template>
-		</el-dropdown> -->
-		<img v-if="isShowAddButton && permissions()['add']" @click="handleNew" src="../../assets/img/add.png" alt="" title="新增">
-		<img v-if="isShowAddButton && permissions()['blukSave']" @click="batchHandle" src="../../assets/icon/batch.png" alt="" title="批量发布">
-		<img v-if="isShowAddButton && permissions()['issueglobal']" @click="releaseAllHandle" src="../../assets/icon/public.png" alt="" title="全局发布">
-		<img v-if="isShowAddButton && permissions()['removeIssue']" @click="contraryReleaseAll" src="../../assets/icon/unpublish.png" alt="" title="全局反发布">
+		<img 
+			v-if="isShowAddButton && permissions()['add']" 
+			@click="handleNew" 
+			src="../../assets/img/add.png" alt="" title="新增">
+		<img 
+			v-if="isShowAddButton && permissions()['blukSave']" 
+			@click="batchHandle" 
+			src="../../assets/icon/batch.png" alt="" title="批量发布">
+		<img 
+			v-if="isShowAddButton && permissions()['issueglobal']" 
+			@click="releaseAllHandle" 
+			src="../../assets/icon/public.png" alt="" title="全局发布">
+		<img 
+			v-if="isShowAddButton && permissions()['removeIssue']" 
+			@click="contraryReleaseAll" 
+			src="../../assets/icon/unpublish.png" alt="" title="全局反发布">
 		<img v-if="isDownload" @click="download" src="../../assets/img/download.png" alt="" title="下载">
 		<!-- 上传 -->
-			<uploadTemplate
-				v-if="isShowDialog === 'upload'"
-				:item="item"
-				v-model:isShowDialog="isShowDialog"
-				@editCallBack="completeCallBack" />
+		<uploadTemplate
+			v-if="isShowDialog === 'upload'"
+			:item="item"
+			v-model:isShowDialog="isShowDialog"
+			@editCallBack="completeCallBack" />
+		<lookError
+			v-if="isShowDialog === 'error'"
+			:item="item"
+			v-model:isShowDialog="isShowDialog"
+			@editCallBack="completeCallBack" />
 	</div>
 </template>
 
@@ -126,10 +84,12 @@
 import { put, post } from "@/server/api.js";
 // isShowAddButton: 是否显示新增按钮图标，也用来区分预测版本列表组件需要显示的功能
 import uploadTemplate from "./upload.vue";
+import lookError from "./lookError.vue";
 export default {
   name: "QueryComponent",
 	components: {
-		uploadTemplate
+		uploadTemplate,
+		lookError
 	},
 	props: ["isShowComponent", "isShowAddButton","customerId","CreateModel", 'isDownload', 'isDropdown',"batchImport"],
 	data() {
@@ -142,26 +102,6 @@ export default {
 			valid: undefined,
 			status: undefined,
 			isShowDialog: '',
-			validArrray: [
-				{
-					label: '有效',
-					value: true
-				},
-				{
-					label: '无效',
-					value: false
-				}
-			],
-			releaseArrray: [
-				{
-					label: '未发布',
-					value: '0'
-				},
-				{
-					label: '已发布',
-					value: '1'
-				}
-			],
 		}
 	},
   methods: {
@@ -235,6 +175,10 @@ export default {
 		download(){
 			this.$emit('download', '')
 		},
+		// 查看错误
+		handleSeeError() {
+			this.isShowDialog = 'error'
+		},
 		// 新增按钮操作
     handleNew() {
 			if (!this.customerId) {
diff --git a/src/components/queryComponent/lookError.vue b/src/components/queryComponent/lookError.vue
new file mode 100644
index 0000000..58383ee
--- /dev/null
+++ b/src/components/queryComponent/lookError.vue
@@ -0,0 +1,72 @@
+<template>
+	<el-dialog 
+    :title="title" 
+    custom-class="look-error-wrapper" 
+    model-value fullscreen 
+    :close-on-click-modal="false" 
+    :before-close="cancel">
+		<el-table
+      :data="tableData"
+      v-loading="loading"
+      size="mini"
+      style="width: 100%"
+      border
+      height="500px"
+    >
+      <el-table-column
+        v-for="(item, index) in headers"
+        :key="index"
+        :label="getColumnName(item)"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ scope.row[item] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-show="pagination.total > 0"
+      v-model:pagination="pagination"
+      @change="getList"
+    />
+	</el-dialog>
+</template>
+<script>
+import { ListMixin } from "@/mixins/ListMixin";
+export default {
+	name: 'editField',
+  mixins: [ListMixin],
+	props: {
+		item: {
+			default: null,
+		}
+	},
+	data() {
+		return {
+			title: '查看错误', // 弹框标题
+      queryTableDataUrl: "/admin/ap/errordatalst/query",
+      headers: [
+        "AP_ErrorDatalst-Id",
+        "AP_ErrorDatalst-ErrorInfo",
+        "AP_ErrorDatalst-ErrorType",
+        "AP_ErrorDatalst-ErrorStatus",
+        "AP_ErrorDatalst-TargetSource",
+        "AP_ErrorDatalst-LastModify",
+        "AP_ErrorDatalst-LastUser",
+        "AP_ErrorDatalst-CreateTime",
+      ], // 遍历表头
+		}
+	},
+	methods: {
+		cancel() { // 取消按钮
+			this.$emit('update:isShowDialog','')
+		},
+	}
+}
+</script>
+<style lang="less">
+.look-error-wrapper {
+  height: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/router/plan.js b/src/router/plan.js
index 9df31b3..2aaff75 100644
--- a/src/router/plan.js
+++ b/src/router/plan.js
@@ -48,6 +48,12 @@ const plant = {
 					title: "原材料需求差异分析",
 					component: () => import("@/views/plan/workbench/materialAnalysis"),
 				},
+				{
+					icon: "el-icon-document",
+					path: "/plan/workbench/lookError",
+					title: "错误查看",
+					component: () => import("@/views/plan/workbench/lookError"),
+				},
 			]
 		},
 	],
diff --git a/src/views/plan/workbench/lookError/index.vue b/src/views/plan/workbench/lookError/index.vue
new file mode 100644
index 0000000..c49938e
--- /dev/null
+++ b/src/views/plan/workbench/lookError/index.vue
@@ -0,0 +1,108 @@
+<template>
+  <div ref="tableRef" class="table-height-wrap">
+    <SearchTemplate>
+      <el-form :inline="true" class="clearfix search-content">
+        <el-form-item :label="getColumnName('AP_ErrorDatalst-Id')">
+          <el-input
+            v-model.trim="queryParams.Id"
+            placeholder="请输入查询内容"
+            clearable
+            style="width: 240px"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            icon="el-icon-search"
+            size="mini"
+            class="search-button-style"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button
+            icon="el-icon-refresh"
+            size="mini"
+            class="reset-button-style"
+            @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
+    </SearchTemplate>
+    <ContentContainer>
+     <el-table
+      :data="tableData"
+      v-loading="loading"
+      size="mini"
+      style="width: 100%"
+      border
+      v-if="tableHeight"
+      :height="tableHeight"
+    >
+      <el-table-column
+        v-for="(item, index) in headers"
+        :key="index"
+        :label="getColumnName(item)"
+        :show-overflow-tooltip="true"
+      >
+        <template #default="scope">
+          <span>{{ scope.row[item] }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-show="pagination.total > 0"
+      v-model:pagination="pagination"
+      @change="getList"
+    />
+    </ContentContainer>
+  </div>
+</template>
+<script>
+import { ListMixin } from "@/mixins/ListMixin";
+export default {
+  mixins: [ListMixin],
+  data() {
+    return {
+      queryTableDataUrl: "/admin/ap/errordatalst/query",
+      headers: [
+        "AP_ErrorDatalst-Id",
+        "AP_ErrorDatalst-ErrorInfo",
+        "AP_ErrorDatalst-ErrorType",
+        "AP_ErrorDatalst-ErrorStatus",
+        "AP_ErrorDatalst-TargetSource",
+        "AP_ErrorDatalst-LastModify",
+        "AP_ErrorDatalst-LastUser",
+        "AP_ErrorDatalst-CreateTime",
+      ], // 遍历表头
+      tableHeight: 0,
+    };
+  },
+  methods: {
+    // 搜索按钮操作
+    handleQuery() {
+      this.pagination.pageNumber = 1;
+      this.getList();
+    },
+    // 重置按钮操作
+    resetQuery() {
+      this.queryParams.Id = undefined;
+      this.handleQuery();
+    },
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.tableHeight = this.calculationTableHeight(
+        this.$refs.tableRef,
+        120
+      );
+    })
+  }
+};
+</script>
+<style lang="less" scoped>
+.table-height-wrap {
+  height: 100%;
+  overflow: hidden;
+}
+</style>
diff --git a/src/views/system/oneimport/addOrEdit.vue b/src/views/system/oneimport/addOrEdit.vue
index 32d2d1f..78999ee 100644
--- a/src/views/system/oneimport/addOrEdit.vue
+++ b/src/views/system/oneimport/addOrEdit.vue
@@ -34,25 +34,10 @@
 						</el-input>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="8">
-          <el-form-item :label="getColumnName('Script-ScriptType')">
-            <el-input v-model="formData['Script-ScriptType']" placeholder="请输入" />
-          </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="8">
-          <el-form-item :label="getColumnName('Script-FilePath')">
-            <el-input v-model="formData['Script-FilePath']" placeholder="请输入" />
-          </el-form-item>
-        </el-col> -->
         <el-col :span="8">
           <el-form-item :label="getColumnName('Script-UseHead')">
             <el-input-number v-model="formData['Script-UseHead']" placeholder="请输入" />
           </el-form-item>
-        </el-col>
-         <el-col :span="8">
-          <el-form-item :label="getColumnName('Script-ClearTable')">
-            <el-input-number v-model="formData['Script-ClearTable']" placeholder="请输入" />
-          </el-form-item>
         </el-col>
          <el-col :span="8">
           <el-form-item :label="getColumnName('Script-StartRow')">
@@ -64,31 +49,26 @@
             <el-input-number v-model="formData['Script-StartCol']" placeholder="请输入" />
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item :label="getColumnName('Script-AppendNewRecord')">
-            <el-input-number v-model="formData['Script-AppendNewRecord']" placeholder="请输入" />
+        <el-col :span="6">
+          <el-form-item>
+            <el-checkbox v-model="formData['Script-ClearTable']">{{getColumnName('Script-ClearTable')}}</el-checkbox>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item :label="getColumnName('Script-UpdateRecord')">
-            <el-input-number v-model="formData['Script-UpdateRecord']" placeholder="请输入" />
+        <el-col :span="6">
+          <el-form-item>
+            <el-checkbox v-model="formData['Script-AppendNewRecord']">{{getColumnName('Script-AppendNewRecord')}}</el-checkbox>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item :label="getColumnName('Script-AppendAndUpdateRecord')">
-            <el-input-number v-model="formData['Script-AppendAndUpdateRecord']" placeholder="请输入" />
+        <el-col :span="6">
+          <el-form-item>
+            <el-checkbox v-model="formData['Script-UpdateRecord']">{{getColumnName('Script-UpdateRecord')}}</el-checkbox>
           </el-form-item>
         </el-col>
-        <!-- <el-col :span="8">
-          <el-form-item :label="getColumnName('Script-CallSpecFunc')">
-            <el-input-number v-model="formData['Script-CallSpecFunc']" placeholder="请输入" />
+        <el-col :span="6">
+          <el-form-item>
+            <el-checkbox v-model="formData['Script-AppendAndUpdateRecord']">{{getColumnName('Script-AppendAndUpdateRecord')}}</el-checkbox>
           </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="8">
-          <el-form-item :label="getColumnName('Script-CallFunction')">
-            <el-input v-model="formData['Script-CallFunction']" placeholder="请输入" />
-          </el-form-item>
-        </el-col> -->
+        </el-col>
         <el-col :span="24">
           <el-table 
           style="width: 100%;margin-bottom:10px;"
@@ -111,16 +91,6 @@
 								<el-input v-model="scope.row['ScriptItem-ColName']" clearable placeholder="请输入" />
 							</template>
 						</el-table-column>
-            <!-- <el-table-column :label="getColumnName('ScriptItem-RowNo')">
-							<template #default="scope">
-								<el-input-number v-model="scope.row['ScriptItem-RowNo']" clearable placeholder="请输入" />
-							</template>
-						</el-table-column>
-            <el-table-column :label="getColumnName('ScriptItem-RowName')">
-							<template #default="scope">
-								<el-input v-model="scope.row['ScriptItem-RowName']" clearable placeholder="请输入" />
-							</template>
-						</el-table-column> -->
             <el-table-column :label="getColumnName('ScriptItem-ColFieldType')">
 							<template #default="scope">
 								<el-input v-model="scope.row['ScriptItem-ColFieldType']" clearable placeholder="请输入" />
@@ -136,9 +106,6 @@
 								<el-input v-model="scope.row['ScriptItem-DefaultValue']" clearable placeholder="请输入" />
 							</template>
 						</el-table-column>
-					
-						
-						
 						<el-table-column align="center" width="100">
               <template #header>
                 <el-button
@@ -166,12 +133,8 @@
         <el-button
           type="primary"
           class="dialog-submit-button"
-          @click="submitForm"
-          >确 定</el-button
-        >
-        <el-button class="dialog-cancel-button" @click="cancel"
-          >取 消</el-button
-        >
+          @click="submitForm">确 定</el-button>
+        <el-button class="dialog-cancel-button" @click="cancel">取 消</el-button>
       </div>
     </template>
   </el-dialog>
diff --git a/src/views/system/oneimport/index.vue b/src/views/system/oneimport/index.vue
index 3b9b259..ef0acef 100644
--- a/src/views/system/oneimport/index.vue
+++ b/src/views/system/oneimport/index.vue
@@ -97,11 +97,11 @@
       @setIsAddOrEdit="setIsAddOrEdit"
     />
     <!-- 上传 -->
-			<uploadTemplate
-				v-if="isShowDialog === 'upload'"
-				:item="item"
-				v-model:isShowDialog="isShowDialog"
-				@editCallBack="completeCallBack" />
+    <uploadTemplate
+      v-if="isShowDialog === 'upload'"
+      :item="item"
+      v-model:isShowDialog="isShowDialog"
+      @editCallBack="completeCallBack" />
   </div>
 </template>
 <script>

From e72d5734aa63b656ae367d0c70f0332c1411db27 Mon Sep 17 00:00:00 2001
From: "DESKTOP-JT599KC\\Luan Shanshan" <xinyao.wang@le-it.com.cn>
Date: Wed, 29 Dec 2021 11:00:49 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/workbench/materialAnalysis/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/plan/workbench/materialAnalysis/index.vue b/src/views/plan/workbench/materialAnalysis/index.vue
index b016bd8..c76097c 100644
--- a/src/views/plan/workbench/materialAnalysis/index.vue
+++ b/src/views/plan/workbench/materialAnalysis/index.vue
@@ -35,7 +35,7 @@ export default {
 		}
 	},
 	mounted () {
-		this.dragChangeSize();;
+		this.dragChangeSize();
 	},
 	methods: {
 		handleQueryparams(data) {
@@ -54,7 +54,7 @@ export default {
 	padding: 8px !important;
 	.material-top-wrap{
 		width: 100%;
-		height: calc(50% - 5px);
+		height: calc(50% - 12px);
 		margin-bottom: 10px;
 		.material-top-left-wrap {
 			width: 320px;
@@ -81,7 +81,7 @@ export default {
 	}
 	.material-bottom-wrap{
 		width: calc(100% - 4px);
-		height: calc(50% - 5px);
+		height: calc(50% - 10px);
 		background: linear-gradient(180deg, #EAEDED 0%, #FFFFFF 55%, #F1F1F1 100%);
 		border: 2px solid #919191;
 		.el-tabs {