Browse Source

修改筛选条件无法清空问题

jingbb 4 tháng trước cách đây
mục cha
commit
14a0a5654b

+ 1 - 1
src/views/publicComponents/SelectContractModal.vue

@@ -74,7 +74,7 @@
                         </a-col>
                         <a-col :md="6" :sm="8">
                             <a-form-item label="销售部门(sale department)" :label-col="labelCol1" :wrapper-col="wrapperCol1">
-                                <JDictSelectTag v-model:value="queryParams.saleDepartment" placeholder="请选择" dictCode="yes_or_no"/>
+                                <a-input placeholder="请输入" v-model:value="queryParams.saleDepartment"></a-input>
                             </a-form-item>
                         </a-col>
                     </template>

+ 2 - 2
src/views/purchase/purchaseInquiryForm/purchaseInquiryFormList.vue

@@ -24,7 +24,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="inquiryCustomer">
+              <a-form-item name="inquirySuppiler">
                 <template #label><span title="询价供应商(inquiry supplier)">询价供应商(inquiry supplier)</span></template>
                 <a-input placeholder="请输入" v-model:value="queryParam.inquirySuppiler" allow-clear ></a-input>
               </a-form-item>
@@ -54,7 +54,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="submit">
+              <a-form-item name="status">
                 <template #label><span title="状态(status)">状态(status)</span></template>
                 <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="purchase_inquiry_status	"/>
               </a-form-item>

+ 6 - 6
src/views/purchase/purchaseOrder/PurchaseOrderFormList.vue

@@ -18,13 +18,13 @@
           </a-col>          
           <template v-if="toggleSearchStatus">
             <a-col :lg="8">
-              <a-form-item name="inquiryProject">
+              <a-form-item name="project">
                 <template #label><span title="系统项目(project)">系统项目(project)</span></template>
                 <a-input v-model:value="queryParam.project" placeholder="请选择"/>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="inquiryCustomer">
+              <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
                 <a-input placeholder="请输入供应商(supplier)" v-model:value="queryParam.supplier" allow-clear ></a-input>
               </a-form-item>
@@ -56,17 +56,17 @@
             <a-col :lg="8">
               <a-form-item name="productCode" >
                 <template #label><span title="产品编码(product code)">产品编码(product code)</span></template>
-								<JSelectDept v-model:value="queryParam.productCode" :multiple="false" />
+                <a-input placeholder="请输入" v-model:value="queryParam.productCode" allow-clear ></a-input>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="salesman">
+              <a-form-item name="purchaseman">
                 <template #label><span title="采购员(purchaseman)">采购员(purchaseman)</span></template>
                 <JSelectUser v-model:value="queryParam.purchaseman" placeholder="请选择" :multiple="false"></JSelectUser>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="saleDepartment" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="purchaseDepartment" :label-col="labelCol1" :wrapper-col="wrapperCol1">
                 <template #label><span title="采购部门(purchase saleDepartment)">采购部门(purchase department)</span></template>
 								<JSelectDept v-model:value="queryParam.purchaseDepartment" :multiple="false" />
               </a-form-item>
@@ -84,7 +84,7 @@
               </a-form-item>
             </a-col> 
             <a-col :lg="8">
-              <a-form-item name="customerConfirm" :label-col="labelCol1" :wrapper-col="wrapperCol1">
+              <a-form-item name="status" :label-col="labelCol1" :wrapper-col="wrapperCol1">
                 <template #label><span title="供应商确认(supplier confirm)">供应商确认(supplier confirm)</span></template>
                 <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="yes_or_no"/>
               </a-form-item>

+ 6 - 0
src/views/purchase/purchaseQuotationFrm/PurchaseQuotationForm.data.ts

@@ -83,6 +83,12 @@ export const columns: BasicColumn[] = [
         return text;
       },
     },
+    {
+      title: '供应商id(quotationSuppiler)',
+      align:"center",
+      dataIndex: 'quotationSuppiler',
+      ifShow:false
+     },
 ];
 
 //子表表格配置

+ 2 - 2
src/views/purchase/purchaseQuotationFrm/purchaseQuotationFormList.vue

@@ -24,7 +24,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="quotationSuppiler ">
+              <a-form-item name="quotationSuppiler">
                 <template #label><span title="报价供应商(quotation supplier)">报价供应商(quotation supplier)</span></template>
                 <JSelectInput   v-model:value="queryParam.quotationSuppiler"  placeholder="请选择" :options="supplierOption" ></JSelectInput>
               </a-form-item>
@@ -60,7 +60,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="submit">
+              <a-form-item name="status">
                 <template #label><span title="状态(status)">状态(status)</span></template>
                 <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="purchase_quotation_status"/>
               </a-form-item>

+ 2 - 2
src/views/saleCode/quotation/quotation.vue

@@ -24,7 +24,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="inquiryCustomer">
+              <a-form-item name="quotationCustomer">
                 <template #label><span title="报价客户(quotation customer)">报价客户(quotation customer)</span></template>
                 <a-input placeholder="请输入报价客户(quotation customer)" v-model:value="queryParam.quotationCustomer" allow-clear ></a-input>
               </a-form-item>
@@ -78,7 +78,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="submit">
+              <a-form-item name="status">
                 <template #label><span title="状态(status)">状态(status)</span></template>
                 <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="quotation_status"/>
               </a-form-item>

+ 3 - 3
src/views/saleCode/saleInquiryForm/SaleInquiryFormList.vue

@@ -30,7 +30,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="ship">
+              <a-form-item name="shipID">
                 <template #label><span title="船(ship)">船(ship)</span></template>
                 <a-input placeholder="请输入船(ship)" v-model:value="queryParam.shipID" allow-clear ></a-input>
               </a-form-item>
@@ -67,7 +67,7 @@
             </a-col>
 
             <a-col :lg="8">
-              <a-form-item name="submit">
+              <a-form-item name="status">
                 <template #label><span title="状态(status)">状态(status)</span></template>
                 <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="inquiry_status"/>
               </a-form-item>
@@ -98,7 +98,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="submit">
+              <a-form-item name="otherStatus">
                 <template #label><span title="其他状态(other status)">其他状态(other statu)</span></template>
                 <a-input placeholder="其他状态(other status)" v-model:value="queryParam.otherStatus" allow-clear ></a-input>
               </a-form-item>

+ 3 - 3
src/views/saleCode/salesOrder/SaleOrderFormList.vue

@@ -18,13 +18,13 @@
           </a-col>          
           <template v-if="toggleSearchStatus">
             <a-col :lg="8">
-              <a-form-item name="inquiryProject">
+              <a-form-item name="project">
                 <template #label><span title="系统项目(project)">系统项目(project)</span></template>
                 <a-input v-model:value="queryParam.project" placeholder="请选择"/>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="inquiryCustomer">
+              <a-form-item name="customerName">
                 <template #label><span title="客户(customer)">客户(customer)</span></template>
                 <a-input placeholder="请输入询价客户(inquiry customer)" v-model:value="queryParam.customerName" allow-clear ></a-input>
               </a-form-item>
@@ -72,7 +72,7 @@
               </a-form-item>
             </a-col>
             <a-col :lg="8">
-              <a-form-item name="customerConfirm">
+              <a-form-item name="status">
                 <template #label><span title="客户确认(customer confirm)">客户确认(customer confirm)</span></template>
                 <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="customer_confirm"/>
               </a-form-item>