选择弹窗-分类字段展示子表分类名称

src/views/publicComponents/SelectPurchaseOrderModal.vue

@@ -176,8 +176,8 @@
         },
         {
             title: '产品分类(production class)',
-            dataIndex: 'productionClass_dictText',
-            key: 'productionClass_dictText',
+            dataIndex: 'productClass',
+            key: 'productClass',
             align:"center",
             width:250,
         },

src/views/publicComponents/SelectSaleOrderModal.vue

@@ -200,8 +200,8 @@
         },
         {
             title: '产品分类(production class)',
-            dataIndex: 'productionClass_dictText',
-            key: 'productionClass_dictText',
+            dataIndex: 'productClass',
+            key: 'productClass',
             align:"center",
             width:250,
         },

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

@@ -186,8 +186,8 @@
         },
         {
             title: '产品分类(production class)',
-            dataIndex: 'productionClass_dictText',
-            key: 'productionClass_dictText',
+            dataIndex: 'productClass',
+            key: 'productClass',
             align:"center",
             width:250,
             ellipsis: true,

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

@@ -414,7 +414,7 @@
       }
       function addProductFromCustomer(data){
         data.map(item=>{
-          item.productClass = item.productionClass_dictText
+          item.productClass = item.productClass
           item.productCode = item.productCode
           item.unit = item.unit
           item.sourceId = item.childId

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

@@ -186,7 +186,7 @@
         {
             title: '产品分类(production class)',
             align:"center",
-            dataIndex: 'productionClass_dictText'
+            dataIndex: 'productClass'
         },
         {
             title: '机型(headModel)',

src/views/saleCode/saleInquiryForm/components/SaleInquiryFormForm.vue

@@ -52,7 +52,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" id="SaleInquiryFormForm-productionClass" name="productionClass">
-                <JSelectInput   v-model:value="formData.productionClass"  placeholder="请选择" :options="classOption" ></JSelectInput>
+                <JDictSelectTag v-model:value="formData.productionClass" placeholder=""    dictCode="base_product_class,name,id,del_flag=0 and parent_id is null"/>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -219,7 +219,6 @@
       var SelectShipSModalRef = ref();
       var BaseShipArchiveAccessoriesListRef = ref();
       const activeKey = ref('saleInquiryFormProduct');
-      var classOption = ref([]);
       var customerOption =ref([]);
       const formData = reactive<Record<string, any>>({
         id: '',
@@ -248,7 +247,7 @@
         deliveryTime: '',   
         attachs: '',   
         inquiryNotes: '',  
-        inquiryTime:'' 
+        inquiryTime:moment(new Date()).format('YYYY-MM-DD') 
       });
 
       //表单验证
@@ -280,7 +279,6 @@
         saleInquiryFormShipTable.dataSource = [];
         saleInquiryFormProductTable.dataSource = [];
         activeKey.value = 'saleInquiryFormProduct'
-        getOptiom()
         getCustomerOptions()
         inquiryPeriod.value = []
         formData.salesman=userStore.getUserInfo.username;
@@ -297,10 +295,9 @@
         saleInquiryFormShipTable.dataSource = [...saleInquiryFormShipDataList];
         const saleInquiryFormProductDataList = await querySaleInquiryFormProductListByMainId(row['id']);
         saleInquiryFormProductTable.dataSource = [...saleInquiryFormProductDataList];
-        getOptiom()
         getCustomerOptions()
-          inquiryPeriod.value[0]=formData.inquiryPeriodBegin?moment(formData.inquiryPeriodBegin):''
-          inquiryPeriod.value[1]=formData.inquiryPeriodEnd?moment(formData.inquiryPeriodEnd):''
+        inquiryPeriod.value[0]=formData.inquiryPeriodBegin?moment(formData.inquiryPeriodBegin):''
+        inquiryPeriod.value[1]=formData.inquiryPeriodEnd?moment(formData.inquiryPeriodEnd):''
       }
 
       async function queryMainData(id) {
@@ -461,25 +458,6 @@
       function onSearchProject(){
         SelectProjectModalRef.value.getTable('allowAdd')
       }
-      function getOptiom(){
-        defHttp
-            .get({ url: 'baseCode/baseProductClass/list'}, { isTransformResponse: false })
-            .then((res) => {
-                if (res.success) {
-                  classOption.value = []
-                  res.result.records.forEach(element => {
-                      var obj = {
-                        label: element.name?element.name:'无名称请维护',
-                        value: element.id?element.id:''
-                      };
-                      classOption.value.push( obj)
-                  });    
-                }
-            })
-            .finally(() => {
-                // loading.value = false;
-            });
-      }
       function onChangeInquiryPeriod(data){
         inquiryPeriod.value = data
         formData.inquiryPeriodBegin = data[0].format('YYYY-MM-DD')
@@ -519,8 +497,6 @@
         SelectProjectModalRef,
         onSearchProject,
         addProject,
-        getOptiom,
-        classOption,
         getCustomerOptions,
         customerOption,
         inquiryPeriod,

src/views/saleCode/salesInvoice/components/SelectDeliveryNoticeModal.vue

@@ -179,8 +179,8 @@
         },
         {
             title: '产品分类(production class)',
-            dataIndex: 'productionClass_dictText',
-            key: 'productionClass_dictText',
+            dataIndex: 'productClass',
+            key: 'productClass',
             align:"center",
             width:250,
             ellipsis: true,