所有单据-供应商下拉框增加筛选条件

src/views/cuspCode/SupplierEvaluation/CuspSupplierEvaluation.data.ts

@@ -1,7 +1,9 @@
+import { stat } from 'fs';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { JVxeTypes, JVxeColumn } from '/@/components/jeecg/JVxeTable/types';
 import { defHttp } from '/@/utils/http/axios';
+import { status } from 'nprogress';
 //列表数据
 export const columns: BasicColumn[] = [
   {
@@ -83,7 +85,7 @@ export const searchFormSchema: FormSchema[] = [
     labelWidth: 150,
     component: 'JSelect',
     componentProps: {
-      getOptionUrl: () => defHttp.get({ url: '/cuspCode/cuspCustomerProfile/list?pageSize=-1'}),
+      getOptionUrl: () => defHttp.get({ url: '/cuspCode/cuspSupplierProfile/list?pageSize=-1&status=1'}),
       showField:"currency_dictText+name"
     },
     colProps: {span: 12},
@@ -138,7 +140,7 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       // mode: 'multiple',//multiple: 多选；不填写为单选
       //请求api,返回结果{ result: { records: [{'id':'1',name:'scott'},{'id':'2',name:'小张'}] }}
-      api: () => defHttp.get({ url: '/cuspCode/cuspSupplierProfile/list',params:{pageSize: -1}}),
+      api: () => defHttp.get({ url: '/cuspCode/cuspSupplierProfile/list',params:{pageSize: -1,status:1}}),
       //数值转成String
       numberToString: false,
       //标题字段

src/views/cuspCode/SupplierEvaluation/components/CuspSupplierEvaluationModal.vue

@@ -227,7 +227,7 @@
     model.value.serviceScore = model.value.serviceScore?model.value.serviceScore:'0'
   }
   function supplierOption(){
-      var params = {pageSize:-1}
+      var params = {pageSize:-1,status:'1'}
       return defHttp.get({ url: '/cuspCode/cuspSupplierProfile/list',params})
   }
   defineExpose({

src/views/inventiry/defectiveProducts/defectiveProductsList.vue

@@ -36,7 +36,7 @@
             <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
           </template>

src/views/inventiry/existingQuantity/existingQuantityList.vue

@@ -36,7 +36,7 @@
             <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
             <!-- <a-col :lg="8">

src/views/inventiry/otherIn/components/otherInForm.vue

@@ -21,7 +21,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier"  id="SaleOrderForm-supplier" name="supplier">
-                <JSelect   v-model:value="formData.supplier" :get-option-url="supplierOption" :showField="showField" @change="changeSupplier"></JSelect>
+                <JSelect   v-model:value="formData.supplier" :get-option-url="supplierOption" :showField="showField" @change="changeSupplier" :param="{status:1}"></JSelect>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">

src/views/inventiry/otherIn/othernList.vue

@@ -36,7 +36,7 @@
             <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">

src/views/inventiry/purInAbnormal/purInAbnormalList.vue

@@ -35,7 +35,7 @@
             <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">

src/views/inventiry/purchaseIn/purchaseInList.vue

@@ -36,7 +36,7 @@
             <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">

src/views/inventiry/salesOutbound/components/SelectStaningStockModal.vue

@@ -44,12 +44,12 @@
                         </a-col>
                         <a-col :md="12" :sm="16">
                             <a-form-item label="供应商(supplier)">
-                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="12" :sm="16">
                             <a-form-item label="客户(customer)">
-                                <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
+                                <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField" :param="{status:1}"></JSelect>
                             </a-form-item>
                         </a-col>
                         

src/views/publicComponents/SelectPurchaseOrderMainModal.vue

@@ -54,7 +54,7 @@
                         </a-col>
                         <a-col :md="12" :sm="16">
                             <a-form-item label="供应商(supplier)">
-                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField" :formDisabled="haveSupplier!==''"></JSelect>
+                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}" :formDisabled="haveSupplier!==''"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">

src/views/publicComponents/SelectPurchaseOrderModal.vue

@@ -54,7 +54,7 @@
                         </a-col>
                         <a-col :md="12" :sm="16">
                             <a-form-item label="供应商(supplier)">
-                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">

src/views/publicComponents/SelectSaleOrderModal.vue

@@ -60,7 +60,7 @@
                         </a-col>
                         <a-col :md="12" :sm="16" v-if="showCustomer=='no'">
                             <a-form-item label="供应商(supplier)" >
-                                <JSelect   v-model:value="queryParams.supplierId" :get-option-url="supplierOption" :showField="showField"  :disabled="fatherSupplier!==''"></JSelect>
+                                <JSelect   v-model:value="queryParams.supplierId" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"  :disabled="fatherSupplier!==''"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="12" :sm="16" v-if="showCustomer=='yes'">

src/views/publicComponents/SelectStaningStockModal.vue

@@ -54,7 +54,7 @@
                         </a-col>
                         <a-col :md="12" :sm="16">
                             <a-form-item label="供应商(supplier)">
-                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="12" :sm="16">

src/views/publicComponents/selectArrivalList.vue

@@ -54,7 +54,7 @@
                         </a-col>
                         <a-col :md="12" :sm="16">
                             <a-form-item label="供应商(supplier)">
-                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                                <JSelect   v-model:value="queryParams.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">

src/views/purchase/arrivedGoods/ArriveGoodsList.vue

@@ -36,7 +36,7 @@
             <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplierName)</span></template>
-                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">

src/views/purchase/arrivedGoods/components/ArriveGoodsFormForm.vue

@@ -50,7 +50,7 @@
                 id="ArriveGoodsForm-supplier"
                 name="supplierName"
               >
-              <JSelect   v-model:value="formData.supplier" :get-option-url="supplierOption" :showField="showField"  @change="changeSupplier"></JSelect>
+              <JSelect   v-model:value="formData.supplier" :get-option-url="supplierOption" :showField="showField"  @change="changeSupplier" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :span="12">

src/views/purchase/freightPurchaseOrder/FreightPurchaseOrderList.vue

@@ -26,7 +26,7 @@
             <a-col :lg="16">
               <a-form-item name="supplierName">
                 <template #label><span title="供应商(supplierName)">供应商(supplierName)</span></template>
-                <JSelect   v-model:value="queryParam.supplier" :get-option-url="Supplierlist" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="Supplierlist" :showField="showField" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
           </template>

src/views/purchase/freightPurchaseOrder/components/FreightPurOrderForm.vue

@@ -21,7 +21,7 @@
 						</a-col>	
 						<a-col :span="12">
 							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier"  id="SaleOrderForm-supplierName" name="supplierName">
-                <JSelect   v-model:value="formData.supplier" :get-option-url="Supplierlist" :showField="showField"   @change="changeSupplier"></JSelect>
+                <JSelect   v-model:value="formData.supplier" :get-option-url="Supplierlist" :showField="showField"   @change="changeSupplier" :param="{status:1}"></JSelect>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">

src/views/purchase/freightPurchaseOrder/components/SelectDeliveryNoticeModal.vue

@@ -45,7 +45,7 @@
                         <a-col :md="12" :sm="16">
                             <a-form-item name="customer">
                             <template #label><span title="客户(customer)">客户(customer)</span></template>
-                            <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
+                            <JSelect   v-model:value="queryParams.customer" :get-option-url="CustomerOption" :showField="showField" :param="{status:1}"></JSelect>
                             </a-form-item>
                         </a-col>
                         

src/views/purchase/payment/paymentList.vue

@@ -26,7 +26,7 @@
             <a-col :lg="8">
               <a-form-item name="sellerId">
                 <template #label><span title="销方(seller)">销方(seller)</span></template>
-                <JSelect   v-model:value="queryParam.sellerId" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.sellerId" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"> </JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">

src/views/purchase/purPaymentRequest/components/purPaymentRequestForm.vue

@@ -16,7 +16,7 @@
 						</a-col>
             <a-col :span="12">
               <a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" id="purPaymnetRequest-supplier" name="supplier">
-                <JSelect   v-model:value="formData.supplier" :get-option-url="supplierOption" :showField="showField"  @change="changeSupplier"></JSelect>
+                <JSelect   v-model:value="formData.supplier" :get-option-url="supplierOption" :showField="showField"  @change="changeSupplier" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
 						<a-col :span="12">

src/views/purchase/purPaymentRequest/purPaymentRequesttList.vue

@@ -26,7 +26,7 @@
             <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">

src/views/purchase/purchaseInquiryForm/components/PurchaseInquiryFormForm.vue

@@ -56,7 +56,7 @@
                 :label-col="formItemLayout.labelCol1"
                 :wrapper-col="formItemLayout.wrapperCol1"
               >
-              <JSelect   v-model:value="formData.inquirySuppiler" :get-option-url="supplierOption" :showField="showField" @change="changeSupplier"></JSelect>
+              <JSelect   v-model:value="formData.inquirySuppiler" :get-option-url="supplierOption" :showField="showField" @change="changeSupplier" :param="{status:1}"></JSelect>
                 <!-- <ApiSelect
                   :api="supplierOption"
                   showSearch

src/views/purchase/purchaseInquiryForm/purchaseInquiryFormList.vue

@@ -43,7 +43,7 @@
             <a-col :lg="16">
               <a-form-item name="inquirySuppiler">
                 <template #label><span title="询价供应商(inquiry supplier)">询价供应商(inquiry supplier)</span></template>
-                <JSelect   v-model:value="queryParam.inquirySuppiler" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.inquirySuppiler" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
                 <!-- <ApiSelect
                   :api="supplierOption"
                   showSearch

src/views/purchase/purchaseOrder/PurchaseOrderFormList.vue

@@ -37,7 +37,7 @@
             <a-col :lg="16">
               <a-form-item name="supplier">
                 <template #label><span title="供应商(supplier)">供应商(supplier)</span></template>
-                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">

src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -54,7 +54,7 @@
                   labelField="name"
                   valueField="id"
                   disabled
-                  :params="{ pageSize: -1 }"
+                  :params="{ pageSize: -1,status:1}"
                 />
               </a-form-item>
             </a-col>

src/views/purchase/purchaseQuotationFrm/components/PurchaseQuotationFormForm.vue

@@ -46,7 +46,7 @@
                 id="PuechaseQuotationFormForm-quotationSuppiler"
                 name="quotationSuppiler"
               >
-              <JSelect   v-model:value="formData.quotationSuppiler" :get-option-url="supplierOption" :showField="showField" @change="changeSupplier"></JSelect>
+              <JSelect   v-model:value="formData.quotationSuppiler" :get-option-url="supplierOption" :showField="showField" @change="changeSupplier" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :span="12">

src/views/purchase/purchaseQuotationFrm/components/SelectSupplierInquiryModal.vue

@@ -45,7 +45,7 @@
                         </a-col>
                         <a-col :md="12" :sm="16">
                             <a-form-item label="询价供应商(inquiry supplier)"  >
-                                <JSelect   v-model:value="queryParams.inquirySuppiler" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                                <JSelect   v-model:value="queryParams.inquirySuppiler" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
                             </a-form-item>
                         </a-col>
                         <a-col :md="6" :sm="8">

src/views/purchase/purchaseQuotationFrm/purchaseQuotationFormList.vue

@@ -37,7 +37,7 @@
             <a-col :lg="16">
               <a-form-item name="quotationSuppiler">
                 <template #label><span title="报价供应商(quotation supplier)">报价供应商(quotation supplier)</span></template>
-                <JSelect   v-model:value="queryParam.quotationSuppiler" :get-option-url="supplierOption" :showField="showField"></JSelect>
+                <JSelect   v-model:value="queryParam.quotationSuppiler" :get-option-url="supplierOption" :showField="showField" :param="{status:1}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">

src/views/saleCode/receiptOrder/components/SelectInvoiceModal.vue

@@ -290,7 +290,7 @@
         return defHttp.get({url:'/baseCode/baseProjectArchive/list',params});
     }
     function customerListList(){
-        let params = {pageSize:-1}
+        let params = {pageSize:-1,status:1}
         return defHttp.get({url:'/cuspCode/cuspCustomerProfile/list',params});
     }
     defineExpose({

src/views/saleCode/saleInquiryForm/SaleInquiryForm.data.ts

@@ -203,14 +203,7 @@ export const saleInquiryFormProductColumns: JVxeColumn[] = [
     //   width:"200px",
     //   defaultValue:'',
     // },
-    // {
-    //   title: '产品编码(product code)',
-    //   key: 'productCode',
-    //   type: JVxeTypes.normal,
-    //   placeholder: '请输入${title}',
-    //   width:"200px",
-    //   defaultValue:'',
-    // },
+    
     {
       title: '产品英文名(english name)',
       key: 'englishName',
@@ -238,6 +231,14 @@ export const saleInquiryFormProductColumns: JVxeColumn[] = [
       width:"200px",
       defaultValue:'',
     },
+    {
+      title: '产品编码(product code)',
+      key: 'productCode',
+      type: JVxeTypes.normal,
+      placeholder: '请输入${title}',
+      width:"200px",
+      defaultValue:'',
+    },
     {
       title: '订货号(orderno)',
       key: 'orderno',