查询条件优化

src/views/var/file/FileList.vue

@@ -5,6 +5,19 @@
       <el-form-item label="变量文件ID">
         <el-input v-model="formState.varFileId" placeholder="" clearable />
       </el-form-item>
+
+      <el-form-item label="产品编码">
+        <el-input v-model="formState.productCode" placeholder="产品编码"></el-input>
+      </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>
@@ -28,9 +41,6 @@
     </el-form>
 
     <div class="">
-      <p class="text-red-600 text-sm mb-2">
-        tip：必须通过产品编码进行过滤.如果没有，则需要手动添加一列编码;否则不会进行数据过滤
-      </p>
       <vxe-table
         ref="xTable"
         size="small"
@@ -96,6 +106,8 @@
       >
       </vxe-pager>
     </div>
+
+    <CustomerModal v-model:visible="visibleModal" @confirm="confirmCustomer" />
     <UserModal v-model:visible="visibleUserModal" @confirm="confirmUser" />
   </div>
 </template>
@@ -109,11 +121,15 @@ 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({
   varFileId: '',
+  customerId: '',
+  customerId_dict: '',
+  productCode:'',
   createBy: '',
   createby_dict: '',
   createTime: null,
@@ -125,18 +141,28 @@ const formState = reactive({
 })
 
 const visibleUserModal = ref(false)
+const visibleModal = ref(false)
 const xTable = ref<VxeTableInstance>()
 
 const tableData = ref([])
 
 const onReset = () => {
   Object.assign(formState, {
+    productCode:'',
+    customerId: '',
+    customerId_dict: '',
     varFileId: '',
     createBy: '',
     createby_dict: '',
     createTime: null
   })
 }
+const confirmCustomer = (list: any) => {
+  const [item] = list
+  if (!item) return
+  formState.customerId = item.customerId
+  formState.customerId_dict = item.customerName
+}
 
 const confirmUser = (list: any) => {
   const [user] = list

src/views/var/varChange/VarChange.vue

@@ -12,6 +12,10 @@
           </template>
         </el-input>
       </el-form-item>
+
+      <el-form-item label="产品编码">
+        <el-input v-model="queryParams.productCode" placeholder="产品编码"></el-input>
+      </el-form-item>
       <!-- <el-form-item label="产品">
         <el-input v-model="queryParams.productId_dict" readonly placeholder="产品名称" clearable>
           <template #append>
@@ -52,7 +56,7 @@
           </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="productCode" title="产品编码" width="300"></vxe-column>
         <vxe-column field="status_dictText" title="订单状态" width="120"></vxe-column>
         <vxe-column field="createTime" title="创建时间" width="160"></vxe-column>
         <vxe-column field="action" title="操作" width="200">
@@ -214,6 +218,7 @@ const { copyInfo, isCopying, handleCopy } = useOrderChangeCopy()
 const queryParams = reactive({
   status: '',
   templateFileId: '',
+  productCode: '',
   productId: '',
   productId_dict: '',
   customerId: '',
@@ -451,6 +456,7 @@ const onPaste = () => {
 }
 
 const onReset = () => {
+  queryParams.productCode = ''
   queryParams.status = ''
   queryParams.customerId = ''
   queryParams.customerId_dict = ''