添加查询条件，修改bug

src/views/order/convertOrder/index.vue

@@ -9,6 +9,9 @@
           </template>
         </el-input>
       </el-form-item>
+      <el-form-item label="标注文件ID">
+        <el-input v-model="formState.orderFileId" placeholder="" clearable />
+      </el-form-item>
       <el-form-item>
         <el-button @click="resetForm">重置</el-button>
         <el-button @click="queryConvert" type="primary">查询</el-button>
@@ -30,6 +33,13 @@
       size="small"
     >
       <vxe-column type="checkbox" width="40"></vxe-column>
+      <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="customerId_dictText" title="客户名称" width="200"></vxe-column>
       <vxe-column field="filePath" title="订单文件">
         <template #default="{ row }">
@@ -106,6 +116,7 @@ const tableData = ref([])
 const formState = reactive({
   customerId_dictText: '',
   customerId: '',
+  orderFileId: '',
   currentPage: 1,
   pageSize: 10,
   total: 0,
@@ -167,7 +178,8 @@ const queryConvert = async () => {
 const resetForm = () => {
   Object.assign(formState, {
     customerId: '',
-    customerId_dictText: ''
+    customerId_dictText: '',
+    orderFileId: '',
   })
 }
 

src/views/order/orderList/OrderList.vue

@@ -8,6 +8,13 @@
       <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_dict" placeholder="" readonly>
+          <template #append>
+            <el-button :icon="MoreFilled" @click="visibleModal = true"></el-button>
+          </template>
+        </el-input>
+      </el-form-item>
       <el-form-item label="创建人">
         <el-input v-model="formState.createby_dict" placeholder="">
           <template #append>
@@ -16,7 +23,13 @@
         </el-input>
       </el-form-item>
       <el-form-item label="创建时间">
-        <el-date-picker unlink-panels v-model="formState.createTime" type='daterange' value-format="YYYY-MM-DD" placeholder=""></el-date-picker>
+        <el-date-picker
+          unlink-panels
+          v-model="formState.createTime"
+          type="daterange"
+          value-format="YYYY-MM-DD"
+          placeholder=""
+        ></el-date-picker>
       </el-form-item>
 
       <el-form-item>
@@ -110,6 +123,7 @@
       </vxe-pager>
     </div>
 
+    <CustomerModal v-model:visible="visibleModal" @confirm="confirmCustomer" />
     <UserModal v-model:visible="visibleUserModal" @confirm="confirmUser" />
   </div>
 </template>
@@ -123,11 +137,14 @@ import { useRouter } from 'vue-router'
 import { queryParamsFilter } from '@/utils/query'
 import { MoreFilled } from '@element-plus/icons-vue'
 import UserModal from '@/components/UserModal/UserModal.vue'
+import CustomerModal from '@/components/CustomerModal/CustomerModal.vue'
 
 const router = useRouter()
 const loading = ref(false)
 const formState = reactive({
   orderFileId: '',
+  customerId_dict: '',
+  customerId: '',
   templateFileId: '',
   createBy: '',
   createby_dict: '',
@@ -138,6 +155,7 @@ const formState = reactive({
   column: 'createTime',
   order: 'desc'
 })
+const visibleModal = ref(false)
 const visibleUserModal = ref(false)
 
 const xTable = ref<VxeTableInstance>()
@@ -161,12 +179,20 @@ const confirmUser = (list: any) => {
     formState.createby_dict = user.nickName
   }
 }
+const confirmCustomer = (list: any) => {
+  const [item] = list
+  if (!item) return
+  formState.customerId = item.customerId
+  formState.customerId_dict = item.customerName
+}
 
 const onReset = () => {
   Object.assign(formState, {
     orderFileId: '',
     templateFileId: '',
     createBy: '',
+    customerId: '',
+    customerId_dict: '',
     createby_dict: '',
     createTime: null
   })

src/views/order/orderList/OrderTempList.vue

@@ -8,6 +8,13 @@
       <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_dict" placeholder="" readonly>
+          <template #append>
+            <el-button :icon="MoreFilled" @click="visibleModal = true"></el-button>
+          </template>
+        </el-input>
+      </el-form-item>
       <el-form-item label="创建人">
         <el-input v-model="formState.createby_dict" placeholder="">
           <template #append>
@@ -112,6 +119,7 @@
       </vxe-pager>
     </div>
 
+    <CustomerModal v-model:visible="visibleModal" @confirm="confirmCustomer" />
     <UserModal v-model:visible="visibleUserModal" @confirm="confirmUser" />
   </div>
 </template>
@@ -125,6 +133,7 @@ import { useRouter } from 'vue-router'
 import { queryParamsFilter } from '@/utils/query'
 import { MoreFilled } from '@element-plus/icons-vue'
 import UserModal from '@/components/UserModal/UserModal.vue'
+import CustomerModal from '@/components/CustomerModal/CustomerModal.vue'
 
 const router = useRouter()
 const loading = ref(false)
@@ -132,6 +141,8 @@ const formState = reactive({
   orderFileId: '',
   templateFileId: '',
   createBy: '',
+  customerId_dict: '',
+  customerId: '',
   createby_dict: '',
   createTime: null,
   currentPage: 1,
@@ -141,6 +152,7 @@ const formState = reactive({
   order: 'desc'
 })
 
+const visibleModal = ref(false)
 const visibleUserModal = ref(false)
 
 const xTable = ref<VxeTableInstance>()
@@ -164,12 +176,20 @@ const confirmUser = (list: any) => {
     formState.createby_dict = user.nickName
   }
 }
+const confirmCustomer = (list: any) => {
+  const [item] = list
+  if (!item) return
+  formState.customerId = item.customerId
+  formState.customerId_dict = item.customerName
+}
 
 const onReset = () => {
   Object.assign(formState, {
     orderFileId: '',
     templateFileId: '',
     createBy: '',
+    customerId: '',
+    customerId_dict: '',
     createby_dict: '',
     createTime: null
   })

src/views/var/varChange/VarChange.vue

@@ -2,9 +2,23 @@
   <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="queryParams">
-      <!-- <el-form-item label="文件名称">
-          <el-input v-model="queryParams.excelOrderId" placeholder="" clearable />
-        </el-form-item> -->
+      <el-form-item label="模版文件ID">
+        <el-input v-model="queryParams.templateFileId" placeholder="" clearable />
+      </el-form-item>
+      <el-form-item label="客户">
+        <el-input v-model="queryParams.customerId_dict" placeholder="" readonly>
+          <template #append>
+            <el-button :icon="MoreFilled" @click="visibleModal = true"></el-button>
+          </template>
+        </el-input>
+      </el-form-item>
+      <!-- <el-form-item label="产品">
+        <el-input v-model="queryParams.productId_dict" readonly placeholder="产品名称" clearable>
+          <template #append>
+            <el-button :icon="MoreFilled" @click="" />
+          </template>
+        </el-input>
+      </el-form-item> -->
       <el-form-item label="订单状态">
         <el-select v-model="queryParams.status" placeholder="" clearable>
           <template v-for="item in statusOptions">
@@ -30,6 +44,13 @@
         :data="tableData"
       >
         <vxe-column type="checkbox" width="50"></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="300"></vxe-column>
         <vxe-column field="productCode_dictText" title="产品" width="300"></vxe-column>
         <vxe-column field="status_dictText" title="订单状态" width="120"></vxe-column>
@@ -153,6 +174,8 @@
       <el-button @click="saveOrderField" type="primary">保存</el-button>
     </template>
   </vxe-modal>
+
+  <CustomerModal v-model:visible="visibleModal" @confirm="confirmCustomer" />
   <TemplateVariable v-model:visible="tempVisible" v-bind="details" />
 </template>
 
@@ -179,6 +202,8 @@ import { useVariableExcelChangeStore } from '@/stores/excel'
 import { storeToRefs } from 'pinia'
 import TemplateVariable from './components/TemplateVariable.vue'
 import { useOrderChangeCopy } from '@/hooks/useOrderChangeCopy'
+import CustomerModal from '@/components/CustomerModal/CustomerModal.vue'
+
 
 const visible = ref(false)
 const loading = ref(false)
@@ -190,6 +215,11 @@ const { copyInfo, isCopying, handleCopy } = useOrderChangeCopy()
 /**查询参数 */
 const queryParams = reactive({
   status: '',
+  templateFileId: '',
+  productId: '',
+  productId_dict: '',
+  customerId: '',
+  customerId_dict: '',
   currentPage: 1,
   pageSize: 10,
   total: 0,
@@ -205,6 +235,7 @@ const currentColConf = reactive({
 })
 const currentConfigTitle = ref('')
 
+const visibleModal = ref(false)
 const xTable = ref<VxeTableInstance>()
 const tableData = ref([])
 /**当前选择行 */
@@ -290,6 +321,13 @@ const confirmConfig = (configList: any) => {
   popoverVisible.value = false
 }
 
+const confirmCustomer = (list: any) => {
+  const [item] = list
+  if (!item) return
+  queryParams.customerId = item.customerId
+  queryParams.customerId_dict = item.customerName
+}
+
 const detailHide = () => {
   // detailVisible.value = false;
   detailTable.value = []
@@ -403,6 +441,9 @@ const onPaste = () => {
 
 const onReset = () => {
   queryParams.status = ''
+  queryParams.customerId = ''
+  queryParams.customerId_dict = ''
+  queryParams.templateFileId = ''
 }
 const onQuery = async () => {
   loading.value = true

src/views/var/variables/Variables.vue

@@ -167,6 +167,9 @@ const currentRow = ref()
 const handleShowVarRun = async (row: any) => {
   currentRow.value = row
   const { data } = await apiOrderVarGetOrderNewVars(row.orderItemId)
+  if (data?.code === 500) {
+    return ElMessage.error(data.message || '操作失败！')
+  }
   const { res, titles } = filterVarData(data.result.varOrders || [])
 
   detailVariable.value.titles = titles as any