Преглед на файлове

所有节点-分类id赋值问题

jingbb преди 4 месеца
родител
ревизия
37058eb40e
променени са 19 файла, в които са добавени 164 реда и са изтрити 41 реда
  1. 1 2
      src/views/inventiry/otherIn/components/otherInForm.vue
  2. 16 4
      src/views/inventiry/purchaseIn/components/purchaseInForm.vue
  3. 1 1
      src/views/inventiry/purchaseIn/puechaseInForm.data.ts
  4. 9 0
      src/views/inventiry/purchaseIn/purchaseInForm.api.ts
  5. 0 2
      src/views/inventiry/purchaseIn/purchaseInList.vue
  6. 2 2
      src/views/publicComponents/SelectQuotationModal.vue
  7. 8 0
      src/views/purchase/arrivedGoods/ArriveGoodsForm.api.ts
  8. 1 1
      src/views/purchase/arrivedGoods/ArriveGoodsForm.data.ts
  9. 15 3
      src/views/purchase/arrivedGoods/components/ArriveGoodsFormForm.vue
  10. 27 4
      src/views/purchase/purchaseInquiryForm/components/PurchaseInquiryFormForm.vue
  11. 1 1
      src/views/purchase/purchaseOrder/PurchaseOrderForm.data.ts
  12. 10 1
      src/views/purchase/purchaseOrder/PurchaseOrderyForm.api.ts
  13. 18 6
      src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue
  14. 8 1
      src/views/purchase/purchaseQuotationFrm/PurchaseQuotationForm.api.ts
  15. 18 6
      src/views/purchase/purchaseQuotationFrm/components/PurchaseQuotationFormForm.vue
  16. 1 1
      src/views/saleCode/quotation/components/quotationFormForm.vue
  17. 1 1
      src/views/saleCode/salesOrder/SaleOrderForm.data.ts
  18. 11 1
      src/views/saleCode/salesOrder/SaleOrderyForm.api.ts
  19. 16 4
      src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

+ 1 - 2
src/views/inventiry/otherIn/components/otherInForm.vue

@@ -16,7 +16,7 @@
 						</a-col>		
 						<a-col :span="12">
 							<a-form-item label="项目(project)" v-bind="validateInfos.projectName" id="SaleOrderForm-projectName" name="projectName">
-								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)" :disabled="notAllowEdit"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.projectName" placeholder="请输入项目(project)"   allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -333,7 +333,6 @@
         } 
       }
       function addProduct(data){
-        debugger
         data.map(item=>{
           item.productClass = item.classId_dictText
           item.productCode = item.code

+ 16 - 4
src/views/inventiry/purchaseIn/components/purchaseInForm.vue

@@ -31,7 +31,16 @@
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass"  id="SaleOrderForm-productionClass" name="productionClass">
-								<a-input v-model:value="formData.productionClass" placeholder="请输入"  allow-clear disabled ></a-input>
+								<ApiSelect
+                  :api="ClassList"
+                  showSearch
+                  v-model:value="formData.productionClass"
+                  optionFilterProp="label"
+                  resultField="records"
+                  labelField="name"
+                  valueField="id"
+                  disabled
+                />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -129,7 +138,7 @@
   import { defineComponent, ref, reactive, computed, toRaw} from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import { queryPurInFormShipFormShippTable, querystockInByMainId, queryDataById, saveOrUpdate} from '../purchaseInForm.api';
+  import { queryPurInFormShipFormShippTable, querystockInByMainId, queryDataById, saveOrUpdate,ClassList} from '../purchaseInForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import {purInShipColumns, stockInColumns} from '../puechaseInForm.data';
   import BaseShipArchiveAccessoriesModal from '../../../publicComponents/BaseShipArchiveAccessoriesModal.vue';
@@ -139,6 +148,7 @@
   import { JDictSelectTag} from '/@/components/Form';
   import { Form, message } from 'ant-design-vue';
   import { useGlobSetting } from '/@/hooks/setting';
+  import {  ApiSelect, } from '/@/components/Form/index';
   import moment from 'moment';
   const useForm = Form.useForm;
   export default defineComponent({
@@ -149,7 +159,8 @@
       JUpload,
       JDictSelectTag,
       BaseShipArchiveAccessoriesModal,
-      selectArrivalList
+      selectArrivalList,
+      ApiSelect
     },
     props:{
       formDisabled:{
@@ -379,7 +390,8 @@
         SelectArrivalListRef,
         selectArrivalList,
         addStockInList,
-        baseUrl
+        baseUrl,
+        ClassList
       }
     }
   });

+ 1 - 1
src/views/inventiry/purchaseIn/puechaseInForm.data.ts

@@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [
    {
     title: '产品分类(production class)',
     align:"center",
-    dataIndex: 'productionClass'
+    dataIndex: 'productionClass_dictText'
    },
    {
     title: '机型(model)',

+ 9 - 0
src/views/inventiry/purchaseIn/purchaseInForm.api.ts

@@ -16,6 +16,7 @@ enum Api {
   stockInFormProductList = '/storeCode/storePurchaseIn/queryStorePurchaseInDetailsByMainId',
   submitBatch='/storeCode/storePurchaseIn/submitBatch',
   cancelSubmitBatch='/storeCode/storePurchaseIn/returnSubmitBatch',
+  classList='baseCode/baseProductClass/list'
 }
 /**
  * 导出api
@@ -46,6 +47,14 @@ export const querystockInByMainId = (id) => defHttp.get({url: Api.stockInFormPro
 export const list = (params) =>
   defHttp.get({url: Api.list, params});
 
+/**
+ * 分类列表接口
+ * @param params
+ */
+export const ClassList = (params) =>
+  defHttp.get({url: Api.classList, params});
+
+
 /**
  * 删除单个
  */

+ 0 - 2
src/views/inventiry/purchaseIn/purchaseInList.vue

@@ -131,7 +131,6 @@
     import { message } from 'ant-design-vue';
     const formRef = ref();
     const queryParam = reactive<any>({
-        type:'1'
     });
     //注册model
     const [registerModal, {openModal}] = useModal();
@@ -331,7 +330,6 @@
     function searchReset() {
       formRef.value.resetFields();
       selectedRowKeys.value = [];
-      queryParam.type='1'
       //刷新数据
       reload();
     }

+ 2 - 2
src/views/publicComponents/SelectQuotationModal.vue

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

+ 8 - 0
src/views/purchase/arrivedGoods/ArriveGoodsForm.api.ts

@@ -19,6 +19,7 @@ enum Api {
   cancelSubmitBatch='/purCode/purDeliveryNote/returnSubmitBatch',
   closeBatch='/purCode/purDeliveryNote/submitClose',
   cancelBatchClose = '/purCode/purDeliveryNote/returnClose',
+  classList='baseCode/baseProductClass/list'
 }
 /**
  * 导出api
@@ -48,6 +49,13 @@ export const queryArriveGoodsDetailByMainId = (id) => defHttp.get({url: Api.Arri
  */
 export const list = (params) =>
   defHttp.get({url: Api.list, params});
+/**
+ * 分类列表接口
+ * @param params
+ */
+export const ClassList = (params) =>
+  defHttp.get({url: Api.classList, params});
+
 
 /**
  * 供应商列表接口

+ 1 - 1
src/views/purchase/arrivedGoods/ArriveGoodsForm.data.ts

@@ -39,7 +39,7 @@ export const columns: BasicColumn[] = [
    {
     title: '产品分类(production class)',
     align:"center",
-    dataIndex: 'productionClass'
+    dataIndex: 'productionClass_dictText'
    },
    {
     title: '机型(model)',

+ 15 - 3
src/views/purchase/arrivedGoods/components/ArriveGoodsFormForm.vue

@@ -31,7 +31,16 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-productionClass" name="productionClass">
-								<a-input v-model:value="formData.productionClass" placeholder="请输入"  allow-clear disabled ></a-input>
+								<ApiSelect
+                  :api="ClassList"
+                  showSearch
+                  v-model:value="formData.productionClass"
+                  optionFilterProp="label"
+                  resultField="records"
+                  labelField="name"
+                  valueField="id"
+                  disabled
+                />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -162,7 +171,7 @@
   import { defineComponent, ref, reactive, computed, toRaw} from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import { queryArriveGoodsShipTable, queryArriveGoodsDetailByMainId, queryDataById, saveOrUpdate,Supplierlist} from '../ArriveGoodsForm.api';
+  import { queryArriveGoodsShipTable, queryArriveGoodsDetailByMainId, queryDataById,ClassList, saveOrUpdate,Supplierlist} from '../ArriveGoodsForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import {ArriveGoodsFormShipColumns, ArriveGoodsDetailColumns} from '../ArriveGoodsForm.data';
   import SelectProjectModal from '../../../publicComponents/SelectProjectModal.vue';
@@ -172,6 +181,7 @@
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
   import { JDictSelectTag} from '/@/components/Form';
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+  import {  ApiSelect, } from '/@/components/Form/index';
   import { Form, message } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
   import moment from 'moment';
@@ -187,6 +197,7 @@
       SelectProjectModal,
       BaseShipArchiveAccessoriesModal,
       SelectPurchaseOrderModal,
+      ApiSelect
     },
     props:{
       formDisabled:{
@@ -486,7 +497,8 @@
         addAddiveGoods,
         Supplierlist,
         changeSupplier,
-        supplierOption
+        supplierOption,
+        ClassList
       }
     }
   });

+ 27 - 4
src/views/purchase/purchaseInquiryForm/components/PurchaseInquiryFormForm.vue

@@ -37,7 +37,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" id="PuechaseInquiryFormForm-productionClass" name="productionClass">
-								<a-input v-model:value="formData.productionClass" placeholder="请输入"  allow-clear disabled></a-input>
+                <JSelectInput   v-model:value="formData.productionClass"  placeholder="请选择" :options="classOption" ></JSelectInput>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -189,6 +189,7 @@
     },
     emits:['success'],
     setup(props, {emit}) {
+      var classOption = ref([]);
       const loading = ref(false);
       const formRef = ref();
       var SelectPrpductModalRef = ref()
@@ -276,6 +277,7 @@
         PuechaseInquiryFormProductTable.dataSource = [];
         activeKey.value = 'PuechaseInquiryFormShip'
         getSupplierOption()
+        getOptiom()
         inquiryPeriod.value = []
       }
 
@@ -288,6 +290,7 @@
         const PuechaseInquiryFormProductDataList = await queryPurcodeInquiryFormProductListByMainId(row['id']);
         PuechaseInquiryFormProductTable.dataSource = [...PuechaseInquiryFormProductDataList];
         getSupplierOption()
+        getOptiom()
         inquiryPeriod.value[0]=formData.inquiryPeriodBegin?moment(formData.inquiryPeriodBegin):''
         inquiryPeriod.value[1]=formData.inquiryPeriodEnd?moment(formData.inquiryPeriodEnd):''
         notAllowEdit.value=true
@@ -390,7 +393,7 @@
         
       }
       function addProduct(data){
-        data..map(item=>{
+        data.map(item=>{
           item.productClass = item.classId_dictText
           item.productCode = item.code
           item.productId = item.id
@@ -438,7 +441,7 @@
         formData.maker = data[0].maker
         formData.inquiryTeam =  data[0].inquiryTeam
         formData.inquiryTeamName = data[0].inquiryTeam_dictText
-        formData.productionClass =  data[0].productionClass_dictText
+        formData.productionClass =  data[0].productionClass
         formData.saleAttachs =data[0].attachs
         getShipList(data[0].headId)
       }
@@ -525,6 +528,24 @@
         }
         
       }
+      //  产品分类
+      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;
+          });
+      }
       return {
         PuechaseInquiryFormShipTableRef,
         PuechaseInquiryFormShipTable,
@@ -566,7 +587,9 @@
         addProductFromCustomer,
         changeFormDeliveryTime,
         changeSupplier,
-        notAllowEdit
+        notAllowEdit,
+        getOptiom,
+        classOption
       }
     }
   });

+ 1 - 1
src/views/purchase/purchaseOrder/PurchaseOrderForm.data.ts

@@ -39,7 +39,7 @@ export const columns: BasicColumn[] = [
    {
     title: '产品分类(production class)',
     align:"center",
-    dataIndex: 'productionClass'
+    dataIndex: 'productionClass_dictText'
    },
    {
     title: '机型(model)',

+ 10 - 1
src/views/purchase/purchaseOrder/PurchaseOrderyForm.api.ts

@@ -23,7 +23,8 @@ enum Api {
   closeBatch='/purCode/purOrder/submitClose',
   cancelBatchClose = '/purCode/purOrder/returnClose',
   confirmBatch='/purCode/purOrder/submitConfirm',
-  cancelBatchConfirm = '/purCode/purOrder/returnSubmitConfirm'
+  cancelBatchConfirm = '/purCode/purOrder/returnSubmitConfirm',
+  classList='baseCode/baseProductClass/list'
 }
 /**
  * 导出api
@@ -54,6 +55,14 @@ export const queryPurOrderFormProductListByMainId = (id) => defHttp.get({url: Ap
 export const list = (params) =>
   defHttp.get({url: Api.list, params});
 
+/**
+ * 分类列表接口
+ * @param params
+ */
+export const ClassList = (params) =>
+  defHttp.get({url: Api.classList, params});
+
+
 /**
  * 删除单个
  */

+ 18 - 6
src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -22,7 +22,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="供应商(supplier)" v-bind="validateInfos.supplier" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-supplier" name="supplier">
-                  <a-input   v-model:value="formData.supplierName"  placeholder="请选择" allow-clear  ></a-input>
+                <a-input   v-model:value="formData.supplierName"  placeholder="请选择" allow-clear  ></a-input>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -32,7 +32,16 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" :label-col="formItemLayout.labelCol1" :wrapper-col="formItemLayout.wrapperCol1" id="SaleOrderForm-productionClass" name="productionClass">
-								<a-input v-model:value="formData.productionClass" placeholder="请输入"  allow-clear disabled ></a-input>
+								<ApiSelect
+                  :api="ClassList"
+                  showSearch
+                  v-model:value="formData.productionClass"
+                  optionFilterProp="label"
+                  resultField="records"
+                  labelField="name"
+                  valueField="id"
+                  disabled
+                />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -182,7 +191,7 @@
   import { defineComponent, ref, reactive, computed, toRaw} from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import { queryPurOrderFormShipFormShippTable, queryPurOrderFormProductListByMainId, queryDataById, saveOrUpdate,queryVersonHistoryById,queryPurVersonFormShipListByMainId, queryPurVersonProductListByMainId} from '../PurchaseOrderyForm.api';
+  import { queryPurOrderFormShipFormShippTable, queryPurOrderFormProductListByMainId,ClassList, queryDataById, saveOrUpdate,queryVersonHistoryById,queryPurVersonFormShipListByMainId, queryPurVersonProductListByMainId} from '../PurchaseOrderyForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import {purchaseOrderShipColumns, purchaseOrderProductColumns} from '../PurchaseOrderForm.data';
   import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
@@ -196,6 +205,7 @@
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
   import { Form, message } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
+  import {  ApiSelect, } from '/@/components/Form/index';
   import moment from 'moment';
   const useForm = Form.useForm;
   export default defineComponent({
@@ -210,7 +220,8 @@
       SelectProjectModal,
       BaseShipArchiveAccessoriesModal,
       SelectSupplierQuotationModal,
-      SelectSaleOrderModal
+      SelectSaleOrderModal,
+      ApiSelect
     },
     props:{
       formDisabled:{
@@ -463,7 +474,6 @@
           })
       }
       function addFromQuotation(data){
-
         data.map(item=>{
           item.model = item.childModel
           item.sourceId = 'Quo'+item.childId
@@ -490,6 +500,7 @@
           item.model = item.childModel
           item.sourceId = 'Con'+item.childId
           item.sourceCode =data[0].billCode
+          // item.productClass =data[0].productClass
         })
         var arrProduct = data.concat(purOrderFormShipFormProductTable.dataSource)
         purOrderFormShipFormProductTable.dataSource=arrProduct  
@@ -604,7 +615,8 @@
         addFromQuotation,
         notAllowEdit,
         selectSaleOrderList,
-        addFormSaleOrder
+        addFormSaleOrder,
+        ClassList
       }
     }
   });

+ 8 - 1
src/views/purchase/purchaseQuotationFrm/PurchaseQuotationForm.api.ts

@@ -15,7 +15,8 @@ enum Api {
   purCodeQuotationFormShipList = '/purCode/purPurchaseQuotation/queryPurPurchaseQuotationShipByMainId',
   purCodeQuotationFormProductList = '/purCode/purPurchaseQuotation/queryPurPurchaseInquiryProductByMainId',
   submitBatch='/purCode/purPurchaseQuotation/submitBatch',
-  cancelSubmitBatch='/purCode/purPurchaseQuotation/returnSubmitBatch'
+  cancelSubmitBatch='/purCode/purPurchaseQuotation/returnSubmitBatch',
+  classList='baseCode/baseProductClass/list' 
 }
 /**
  * 导出api
@@ -45,6 +46,12 @@ export const queryPurcodeQuotationFormProductListByMainId = (id) => defHttp.get(
  */
 export const list = (params) =>
   defHttp.get({url: Api.list, params});
+/**
+ * 分类列表接口
+ * @param params
+ */
+export const ClassList = (params) =>
+  defHttp.get({url: Api.classList, params});
 
 /**
  * 删除单个

+ 18 - 6
src/views/purchase/purchaseQuotationFrm/components/PurchaseQuotationFormForm.vue

@@ -37,7 +37,16 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" id="PuechaseQuotationFormForm-productionClass" name="productionClass">
-								<a-input v-model:value="formData.productionClass" placeholder="请输入"  allow-clear disabled></a-input>
+								<ApiSelect
+                  :api="ClassList"
+                  showSearch
+                  v-model:value="formData.productionClass"
+                  optionFilterProp="label"
+                  resultField="records"
+                  labelField="name"
+                  valueField="id"
+                  disabled
+                />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -158,7 +167,7 @@
   import { defineComponent, ref, reactive, computed, toRaw} from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import { PuechaseQuotationFormShippTable, queryPurcodeQuotationFormProductListByMainId, queryDataById, saveOrUpdate } from '../PurchaseQuotationForm.api';
+  import { PuechaseQuotationFormShippTable, queryPurcodeQuotationFormProductListByMainId, queryDataById, saveOrUpdate,ClassList } from '../PurchaseQuotationForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import {PuechaseQuotationFormShipColumns, PuechaseQuotationFormProductColumns} from '../PurchaseQuotationForm.data';
   import BaseShipArchiveAccessoriesModal from '../../../publicComponents/BaseShipArchiveAccessoriesModal.vue';
@@ -169,6 +178,7 @@
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
   import { JDictSelectTag} from '/@/components/Form';
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+  import {  ApiSelect, } from '/@/components/Form/index';
   import { Form,message } from 'ant-design-vue';
   import moment from 'moment';
   const useForm = Form.useForm;
@@ -183,7 +193,8 @@
       SelectProjectModal,
       JDictSelectTag,
       JSelectInput,
-      SelectSupplierInquiryModal
+      SelectSupplierInquiryModal,
+      ApiSelect
     },
     props:{
       formDisabled:{
@@ -246,7 +257,6 @@
         saleAttachs:'',
         paymentTermsInfo:'',
         quotationInfomation:'',
-        
       });
 
       //表单验证
@@ -421,7 +431,7 @@
       }
       function addProductFromCustomer(data){
         data.map(item=>{
-          item.productClass = item.productionClass
+          item.productClass = item.productClass
           item.productCode = item.productCode
           item.unit = item.measurementUnit
           item.sourceId = item.childId
@@ -441,6 +451,7 @@
         formData.maker = data[0].maker
         // formData.inquiryTeam =  data[0].inquiryTeam
         formData.productionClass =  data[0].productionClass
+        formData.productionClass_dictText =  data[0].productionClass_dictText
         // formData.saleAttachs =data[0].attachs
         getShipList(data[0].headId)
       }
@@ -533,7 +544,8 @@
         addProductFromCustomer,
         changeFormDeliveryTime,
         changeSupplier,
-        notAllowEdit
+        notAllowEdit,
+        ClassList
       }
     }
   });

+ 1 - 1
src/views/saleCode/quotation/components/quotationFormForm.vue

@@ -572,7 +572,7 @@
       //新增行-产品明细-选择供应商报价单
       async function addProductFromSupplier(data){
         data.map(item=>{
-          item.productClass = item.productionClass
+          item.productClass = item.productClass
           item.productCode = item.productCode
           item.sourceId = item.childId
           item.model = item.childModel

+ 1 - 1
src/views/saleCode/salesOrder/SaleOrderForm.data.ts

@@ -39,7 +39,7 @@ export const columns: BasicColumn[] = [
    {
     title: '产品分类(production class)',
     align:"center",
-    dataIndex: 'productionClass'
+    dataIndex: 'productionClass_dictText'
    },
    {
     title: '机型(model)',

+ 11 - 1
src/views/saleCode/salesOrder/SaleOrderyForm.api.ts

@@ -23,7 +23,8 @@ enum Api {
   closeBatch='/saleCode/saleOrder/submitClose',
   cancelBatchClose = '/saleCode/saleOrder/returnClose',
   confirmBatch='/saleCode/saleOrder/submitConfirm',
-  cancelBatchConfirm = '/saleCode/saleOrder/returnSubmitConfirm'
+  cancelBatchConfirm = '/saleCode/saleOrder/returnSubmitConfirm',
+  classList='baseCode/baseProductClass/list'
 }
 /**
  * 导出api
@@ -54,6 +55,15 @@ export const querySaleOrderFormProductListByMainId = (id) => defHttp.get({url: A
 export const list = (params) =>
   defHttp.get({url: Api.list, params});
 
+/**
+ * 分类列表接口
+ * @param params
+ */
+export const ClassList = (params) =>
+  defHttp.get({url: Api.classList, params});
+
+
+
 /**
  * 删除单个
  */

+ 16 - 4
src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

@@ -37,7 +37,16 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="产品分类(production class)" v-bind="validateInfos.productionClass" id="SaleOrderForm-productionClass" name="productionClass" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
-								<a-input v-model:value="formData.productionClass" placeholder="请输入"  allow-clear disabled ></a-input>
+								<ApiSelect
+                  :api="ClassList"
+                  showSearch
+                  v-model:value="formData.productionClass"
+                  optionFilterProp="label"
+                  resultField="records"
+                  labelField="name"
+                  valueField="id"
+                  disabled
+                />
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -215,7 +224,7 @@
   import { defineComponent, ref, reactive, computed, toRaw} from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import { querySaleOrderFormShipFormShippTable, querySaleOrderFormProductListByMainId, queryDataById, saveOrUpdate,queryVersonHistoryById,querysaleVersonFormShipListByMainId, querySaleVersonProductListByMainId} from '../SaleOrderyForm.api';
+  import { querySaleOrderFormShipFormShippTable,ClassList, querySaleOrderFormProductListByMainId, queryDataById, saveOrUpdate,queryVersonHistoryById,querysaleVersonFormShipListByMainId, querySaleVersonProductListByMainId} from '../SaleOrderyForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import {saleOrderShipColumns, saleOrderProductColumns} from '../SaleOrderForm.data';
   import SelectPrpductModal from '../../../publicComponents/SelectPrpductModal.vue';
@@ -229,6 +238,7 @@
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
   import { Form, message } from 'ant-design-vue';
   import { useUserStore } from '/@/store/modules/user';
+  import {  ApiSelect, } from '/@/components/Form/index';
   import moment from 'moment';
   const useForm = Form.useForm;
   export default defineComponent({
@@ -243,7 +253,8 @@
       JSelectInput,
       SelectQuotationModal,
       SelectProjectModal,
-      BaseShipArchiveAccessoriesModal
+      BaseShipArchiveAccessoriesModal,
+      ApiSelect
     },
     props:{
       formDisabled:{
@@ -634,7 +645,8 @@
         BaseShipArchiveAccessoriesModalRef,
         viewAccessory,
         VersionDetail,
-        notAllowEdit
+        notAllowEdit,
+        ClassList
       }
     }
   });