变量文件的查询和界面优化

src/views/order/convertOrder/index.vue

@@ -2,16 +2,30 @@
   <div class="h-full flex flex-col bg-white p-2">
     <p class="font-bold text-lg leading-10 border-b-2">转换订单记录</p>
     <el-form class="pt-2" :model="formState" inline>
-      <el-form-item label="客户名称">
-        <el-input v-model="formState.customerId_dictText">
+
+      <el-form-item label="订单文件ID">
+        <el-input v-model="formState.orderFileId" placeholder="" clearable />
+      </el-form-item>
+
+      <el-form-item label="模版文件ID">
+        <el-input v-model="formState.templateFileId" placeholder="" clearable />
+      </el-form-item>
+      <el-form-item label="客户">
+        <el-input v-model="formState.customerId_dictText" placeholder="" readonly>
           <template #append>
             <el-button :icon="MoreFilled" @click="visibleModal = true"></el-button>
           </template>
         </el-input>
       </el-form-item>
-      <el-form-item label="标注文件ID">
-        <el-input v-model="formState.orderFileId" placeholder="" clearable />
+
+      <el-form-item label="创建人">
+        <el-input v-model="formState.createby_dict" placeholder="">
+          <template #append>
+            <el-button :icon="MoreFilled" @click="visibleUserModal = true"></el-button>
+          </template>
+        </el-input>
       </el-form-item>
+
       <el-form-item>
         <el-button @click="resetForm">重置</el-button>
         <el-button @click="queryConvert" type="primary">查询</el-button>
@@ -33,26 +47,35 @@
       size="small"
     >
       <vxe-column type="checkbox" width="40"></vxe-column>
-      <vxe-column field="orderFileId" title="标注文件ID" width="180">
+      <vxe-column field="orderFileId" title="订单文件ID" width="180">
           <template #default="{ row }">
             <el-link target="_blank" :href="'/preview-excel?fileId=' + row.orderFileId">{{
               row.orderFileId
             }}</el-link>
           </template>
         </vxe-column>
+        <vxe-column field="templateFileId" title="模板文件ID" width="180">
+          <template #default="{ row }">
+            <el-link target="_blank" :href="'/preview-excel?fileId=' + row.templateFileId">{{
+              row.templateFileId
+            }}</el-link>
+          </template>
+        </vxe-column>
+        
       <vxe-column field="customerId_dictText" title="客户名称" width="200"></vxe-column>
-      <vxe-column field="filePath" title="订单文件">
+      <vxe-column field="filePath" title="订单文件"  width="380">
         <template #default="{ row }">
           <el-link target="_blank" :href="'/preview-excel?path=' + row.filePath">{{
             row.filePath
           }}</el-link>
         </template>
       </vxe-column>
-      <vxe-column field="status" title="是否下发" width="120">
+      <vxe-column field="status" title="是否下发" width="80">
         <template #default="{ row }">
           {{ row.status == 'Y' ? '是' : '否' }}
         </template>
       </vxe-column>
+      <vxe-column field="createBy_dictText" title="创建人" width="100"></vxe-column>
       <vxe-column field="createTime" title="创建时间" width="200"></vxe-column>
       <vxe-column field="action" title="操作" width="130" :show-overflow="false">
         <template #default="{ row }">
@@ -95,7 +118,10 @@
       </template>
     </vxe-modal>
 
+
+    
     <CustomerModal v-model:visible="visibleModal" @confirm="confirmCustomer" />
+    <UserModal v-model:visible="visibleUserModal" @confirm="confirmUser" />
   </div>
 </template>
 
@@ -109,6 +135,8 @@ import { ElMessage } from 'element-plus'
 import { MoreFilled } from '@element-plus/icons-vue'
 
 const visibleModal = ref(false)
+const visibleUserModal = ref(false)
+
 const loading = ref(false)
 const visible = ref(false)
 const xTable = ref<VxeTableInstance>()
@@ -117,6 +145,9 @@ const formState = reactive({
   customerId_dictText: '',
   customerId: '',
   orderFileId: '',
+  templateFileId:'',
+  createBy: '',
+  createby_dict: '',
   currentPage: 1,
   pageSize: 10,
   total: 0,
@@ -179,6 +210,9 @@ const resetForm = () => {
   Object.assign(formState, {
     customerId: '',
     customerId_dictText: '',
+    createBy: '',
+    createby_dict: '',
+    templateFileId:'',
     orderFileId: '',
   })
 }
@@ -190,6 +224,14 @@ const confirmCustomer = (list) => {
   formState.customerId_dictText = item.customerName
 }
 
+const confirmUser = (list: any) => {
+  const [user] = list
+  if (user) {
+    formState.createBy = user.userId
+    formState.createby_dict = user.nickName
+  }
+}
+
 const removeRows = async () => {
   const list = xTable.value?.getCheckboxRecords()
   if (list?.length) {

src/views/order/orderChange/OrderChange.vue

@@ -5,7 +5,7 @@
       <!-- <el-form-item label="文件名称">
         <el-input v-model="queryParams.excelOrderId" placeholder="" clearable />
       </el-form-item> -->
-      <el-form-item label="标注文件ID">
+      <el-form-item label="订单文件ID">
         <el-input v-model="queryParams.fileId" placeholder="" clearable />
       </el-form-item>
       <el-form-item label="模版文件ID">
@@ -14,7 +14,7 @@
       <el-form-item label="客户">
         <el-input v-model="queryParams.customerId_dict" placeholder="" readonly>
           <template #append>
-            <el-button :icon="MoreFilled" @click="visibleModal = true"></el-button>
+            <el-button :icon="MoreFilled" @click="visible = true"></el-button>
           </template>
         </el-input>
       </el-form-item>
@@ -66,9 +66,24 @@
         :data="tableData"
       >
         <vxe-column type="checkbox" width="50"></vxe-column>
-        <vxe-column field="fileId" title="订单文件ID" width="180"></vxe-column>
-        <vxe-column field="templateFileId" title="模板文件ID" width="180"></vxe-column>
-        <vxe-column field="fileId_dictText" title="文件名称" minWidth="300">
+
+        <vxe-column field="fileId" title="订单文件ID" width="180">
+          <template #default="{ row }">
+            <el-link target="_blank" :href="'/preview-excel?fileId=' + row.fileId">{{
+              row.fileId
+            }}</el-link>
+          </template>
+        </vxe-column>
+
+        <vxe-column field="templateFileId" title="模板文件ID" width="180">
+          <template #default="{ row }">
+            <el-link target="_blank" :href="'/preview-excel?fileId=' + row.templateFileId">{{
+              row.templateFileId
+            }}</el-link>
+          </template>
+        </vxe-column>
+
+        <vxe-column field="fileId_dictText" title="订单文件" minWidth="300">
           <template #default="{ row }">
             <el-link target="_blank" :href="'/preview-excel?fileId=' + row.fileId">{{
               row.fileId_dictText
@@ -285,7 +300,9 @@ const { copyInfo, isCopying, handleCopy } = useOrderChangeCopy()
 /**查询参数 */
 const queryParams = reactive({
   status: '',
+  fileId:'',
   createTime: '',
+  customerId_dict:'',
   createBy: '',
   createby_dict: '',
   currentPage: 1,
@@ -507,9 +524,8 @@ const handleRemove = () => {
 const confirmCustomer = (list: any) => {
   const [item] = list
   if (!item) return
-
-  importForm.customerId = item.customerId
-  importForm.customerName = item.customerName
+  queryParams.customerId = item.customerId
+  queryParams.customerId_dict = item.customerName
 }
 
 /**导出 */
@@ -581,7 +597,18 @@ const onPaste = () => {
 }
 
 const onReset = () => {
-  queryParams = {};
+
+
+  Object.assign(queryParams, {
+    status: '',
+    fileId:'',
+    templateFileId:'',
+    createTime: '',
+    createBy: '',
+    createby_dict: '',
+    customerId_dict:'',
+    customerId:''
+  })
 }
 const onQuery = async () => {
   loading.value = true

src/views/order/orderList/OrderList.vue

@@ -2,7 +2,7 @@
   <div class="w-full h-full bg-white p-4">
     <p class="font-bold text-lg leading-10 border-b-2">订单文件管理</p>
     <el-form class="pt-4" :inline="true" :model="formState">
-      <el-form-item label="标注文件ID">
+      <el-form-item label="订单文件ID">
         <el-input v-model="formState.orderFileId" placeholder="" clearable />
       </el-form-item>
       <el-form-item label="模版文件ID">
@@ -56,7 +56,7 @@
         :data="tableData"
       >
         <vxe-column type="checkbox" width="50"></vxe-column>
-        <vxe-column field="orderFileId" title="标注文件ID" width="180">
+        <vxe-column field="orderFileId" title="订单文件ID" width="180">
           <template #default="{ row }">
             <el-link target="_blank" :href="'/preview-excel?fileId=' + row.orderFileId">{{
               row.orderFileId
@@ -83,19 +83,13 @@
             >
           </template>
         </vxe-column>
-        <vxe-column title="标注文件地址" min-width="300">
-          <!-- <template #default="{ row }">
-            <el-link target="_blank" :href="'/preview-excel?fileId=' + row.orderFileId">{{
-              row.mergeFilePath
-            }}</el-link>
-          </template> -->
-        </vxe-column>
+
         <vxe-column title="模版文件地址" min-width="300">
-          <!-- <template #default="{ row }">
+          <template #default="{ row }">
             <el-link target="_blank" :href="'/comment-excel?fileId=' + row.templateFileId">{{
               row.templateFileId_dictText
             }}</el-link>
-          </template> -->
+          </template>
         </vxe-column>
         <vxe-column field="createBy_dictText" title="创建人" width="180"></vxe-column>
         <vxe-column field="createTime" title="创建时间" width="180"></vxe-column>

src/views/order/orderList/OrderTempList.vue

@@ -2,7 +2,7 @@
   <div class="w-full h-full bg-white p-4">
     <p class="font-bold text-lg leading-10 border-b-2">模版文件管理</p>
     <el-form class="pt-4" :inline="true" :model="formState">
-      <el-form-item label="标注文件ID">
+      <el-form-item label="订单文件ID">
         <el-input v-model="formState.orderFileId" placeholder="" clearable />
       </el-form-item>
       <el-form-item label="模版文件ID">
@@ -52,7 +52,7 @@
         :data="tableData"
       >
         <vxe-column type="checkbox" width="50"></vxe-column>
-        <vxe-column field="orderFileId" title="标注文件ID" width="180">
+        <vxe-column field="orderFileId" title="订单文件ID" width="180">
           <template #default="{ row }">
             <el-link target="_blank" :href="'/preview-excel?fileId=' + row.orderFileId">{{
               row.orderFileId
@@ -79,19 +79,13 @@
             >
           </template>
         </vxe-column>
-        <vxe-column title="标注文件地址" min-width="300">
-          <!-- <template #default="{ row }">
-            <el-link target="_blank" :href="'/preview-excel?fileId=' + row.orderFileId">{{
-              row.mergeFilePath
-            }}</el-link>
-          </template> -->
-        </vxe-column>
+
         <vxe-column title="模版文件地址" min-width="300">
-          <!-- <template #default="{ row }">
+          <template #default="{ row }">
             <el-link target="_blank" :href="'/comment-excel?fileId=' + row.templateFileId">{{
               row.mergeFilePath
             }}</el-link>
-          </template> -->
+          </template>
         </vxe-column>
         <vxe-column field="createBy_dictText" title="创建人" width="180"></vxe-column>
         <vxe-column field="createTime" title="创建时间" width="180"></vxe-column>