Browse Source

销售报价单-增加‘选择供应商报价’按钮及其功能

jingbb 5 months ago
parent
commit
db847f37ff

+ 14 - 3
src/views/saleCode/quotation/components/SelectProjectModal.vue

@@ -58,19 +58,30 @@
     visible.value = false;
     selectedRowKeys.value = []
   }
-    function handleOk() {
+  async function getCustom(quotationProject){
+    let params = {
+      id:quotationProject
+    }
+    var cc =[]
+    await list(params).then((res)=>{
+       cc =  res.records
+    })
+    return cc
+  }
+  function handleOk() {
         if(selectedRowKeys.value.length!==1){
           message.warning('请选择一条数据数据')
         }else{
             emit('selectProject',rowSelection.selectedRows)
             handleCancel()
         }  
-    }
+  }
    function getTable(){
     visible.value = true
    }
    defineExpose({
-    getTable
+    getTable,
+    getCustom
   });
 
 

+ 386 - 0
src/views/saleCode/quotation/components/SelectSupplierQuotation.vue

@@ -0,0 +1,386 @@
+<template>
+    <a-modal
+      title="选择供应商报价单(select supplier quotation)"
+      width="95%"
+      :visible="visible"
+      :maskClosable="false"
+      switchFullscreen
+      @ok = "handleOk"
+      @cancel="handleCancel">
+        <div>
+          <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
+            <div class="table-page-search-wrapper">
+                <a-form :model="queryParams" :label-col="labelCol" :wrapper-col="wrapperCol" @keyup.enter.native="searchQuery">
+                    <a-row :gutter="24">
+                    <a-col :md="6" :sm="8">
+                        <a-form-item label="报价编码(quotation code)">
+                            <a-input placeholder="请输入" v-model:value="queryParams.billCode"></a-input>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :md="6"  :sm="8">
+                        <a-form-item label="单据日期(bill date)">
+                            <a-range-picker value-format="YYYY-MM-DD"  v-model:value="queryParams.billDate" class="query-group-cust"/>
+                        </a-form-item>
+                    </a-col> 
+                    <template v-if="toggleSearchStatus">
+                        <a-col :md="6"  :sm="8">
+                            <a-form-item label="报价项目(quotation project)">
+                                <a-input placeholder="请输入询价项目(inquiry project)" v-model:value="queryParams.projectName" :disabled="fatherProjectName!==''" allow-clear ></a-input>
+                            </a-form-item>
+                        </a-col>
+                           <a-col :md="6"  :sm="8">
+                            <a-form-item  label="报价供应商(quotation supplier)">
+                                <ApiSelect
+                                    :api="supplierOptionsApi"
+                                    showSearch
+                                    v-model:value="queryParams.quotationSuppiler"
+                                    optionFilterProp="label"
+                                    resultField="list"
+                                    labelField="name"
+                                    valueField="id"
+                                />
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6"  :sm="8">
+                            <a-form-item label="优先级(priority)">
+                                <JDictSelectTag v-model:value="queryParams.priority" placeholder="请选择" dictCode="priority"/>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6"  :sm="8">
+                            <a-form-item label="产品分类(production class" >
+                                <JSelectInput   v-model:value="queryParams.productionClass"  placeholder="请选择" :options="classOption" ></JSelectInput>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6"  :sm="8">
+                            <a-form-item label="机型(model)">
+                                <JDictSelectTag v-model:value="queryParams.model" placeholder="请选择" dictCode="model_typer"/>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6"  :sm="8">
+                            <a-form-item label="厂家(maker)">
+                                <a-input placeholder="请输入厂家(maker)" v-model:value="queryParams.maker" allow-clear ></a-input>
+                            </a-form-item>
+                        </a-col>
+                        <a-col :md="6"  :sm="8">
+                            <a-form-item label="产品编号(production code)">
+                                <a-input placeholder="请输入" v-model:value="queryParams.productionCode" allow-clear ></a-input>
+                            </a-form-item>
+                        </a-col>
+                    </template>
+                    <a-col :md="6"  :sm="8">
+                        <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+                            <a-button type="primary" @click="searchQuery" >查询(search)</a-button>
+                            <a-button type="primary" @click="searchReset"  style="margin-left: 8px">重置(reset)</a-button>
+                            <a @click="handleToggleSearch" style="margin-left: 8px">
+                            {{ toggleSearchStatus ? '收起' : '展开' }}
+                            <a-icon :type="toggleSearchStatus ? 'up' : 'down'" />
+                            </a>
+                        </span>
+                    </a-col>
+                </a-row>
+            </a-form>
+           </div>
+        </a-card>
+
+        <a-card  :body-style="{ padding: '10px' }" :bordered="false" style="margin: 10px;">
+            <a-alert type="info" show-icon class="alert" style="margin-bottom: 8px">
+            <template #message>
+                <template v-if="selectedRowKeys.length > 0">
+                <span>已选中 {{ selectedRowKeys.length }} 条记录</span>
+                <a-divider type="vertical" />
+                <a @click="selectedRowKeys = []">清空</a>
+                </template>
+                <template v-else>
+                <span>未选中任何数据</span>
+                </template>
+            </template>
+            </a-alert>
+            <a-table
+                :columns="columns"
+                :row-key="record => record.childId"
+                :data-source="dataSource"
+                bordered
+                size="small"
+                @change="handleTableChange"
+                :pagination="pagination"
+                :scroll="{ x: 2500, y: 300 }"
+                :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+            >
+            </a-table>
+        </a-card>
+      </div>
+    </a-modal>
+</template>
+<script lang="ts" setup>
+    import {ref, reactive } from 'vue';
+    import { defHttp } from '/@/utils/http/axios';
+    import { message } from 'ant-design-vue';
+    import { filterObj } from '/@/utils/common/compUtils';
+    import {  ApiSelect, } from '/@/components/Form/index';
+    import { JDictSelectTag} from '/@/components/Form';
+    import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
+    const emit = defineEmits([ 'selectProduct']); //定义emit
+    let classOption = ref([])
+    var supplierOptionsApi = ref('/cuspCode/cuspSupplierProfile/list')
+    var visible = ref(false)
+    var fatherProjectName = ref('')
+    var fatherSourceCode = ref('')
+    const columns = [
+        {
+            title: '报价单号(bill code)',
+            align:"center",
+            dataIndex: 'billCode'
+        },   
+        {
+            title: '单据日期(bill date)',
+            align:"center",
+            dataIndex: 'billDate',
+            customRender:({text}) =>{
+            text = !text ? "" : (text.length > 10 ? text.substr(0,10) : text);
+            return text;
+            },
+        },
+        
+        {
+            title: '报价项目(quotation project)',
+            align:"center",
+            dataIndex: 'projectName'
+        },
+        {
+            title: '询价供应商(quotation supplier)',
+            align:"center",
+            dataIndex: 'suppilerName'
+        },
+        {
+            title: '报价有效期(quotation period)',
+            align:"center",
+            dataIndex: 'time',
+            width:250,
+            customRender:({text,record}) =>{
+            if(record.inquiryPeriodBegin&&record.inquiryPeriodEnd){
+                text = record.inquiryPeriodBegin+'~'+record.inquiryPeriodEnd
+            }else if(!record.inquiryPeriodBegin){
+                text = record.inquiryPeriodEnd
+            }else if(!record.inquiryPeriodEnd){
+                text = record.inquiryPeriodBegin
+            }else{
+                text=''
+            }
+            return text;
+            },
+        },
+        {
+            title: '优先级(priority)',
+            align:"center",
+            dataIndex: 'priority'
+        },
+        {
+            title: '产品分类(production class)',
+            align:"center",
+            dataIndex: 'productionClass'
+        },
+        {
+            title: '机型(model)',
+            align:"center",
+            dataIndex: 'model'
+        },
+        {
+            title: '产品编码(product code)',
+            align:"center",
+            dataIndex: 'productCode'
+        },
+        {
+            title: '产品英文名(english name)',
+            align:"center",
+            dataIndex: 'englishName'
+        },
+        {
+            title: '厂家(maker)',
+            align:"center",
+            dataIndex: 'maker'
+        },
+        {
+            title: '质量等级(quality grade)',
+            align:"center",
+            dataIndex: 'qualityGrade'
+        },
+        {
+            title: '数量(quantity)',
+            align:"center",
+            dataIndex: 'quantity'
+        },
+        {
+            title: '含税单价(tax price)',
+            align:"center",
+            dataIndex: 'taxPrice'
+        },
+        {
+            title: '含税金额(Tax amount)',
+            align:"center",
+            dataIndex: 'taxAmount'
+        },
+    ];
+    const labelCol = ref({
+    xs: { span: 24 },
+    sm: { span: 9 },
+    });
+    const wrapperCol = ref({
+        xs: { span: 24 },
+        sm: { span: 15 },
+    });
+    const dataSource =ref([]);
+    let selectedRowKeys = ref([]);
+    let selectedRows = ref([]);
+    const toggleSearchStatus = ref(false);
+    const queryParams = ref({
+        billCode:'',
+        billDate:'',
+        quotationSuppiler:'',
+        priority:'',
+        productionClass:'',
+        model:'',
+        maker:'',
+        productionCode:'',
+        quotationProject:'',
+        projectName:''
+    });
+    let pagination = ref({
+      current: 1,
+      pageSize: 10,
+      total: '', // 假设总共有100条数据
+      showSizeChanger: true,
+      showQuickJumper: true,
+      showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 共" + total + "条"
+      },
+      size:'small'
+    });
+    function loadData(){
+        let params = getQueryParams();
+        defHttp
+        .get({ url: '/purCode/purPurchaseQuotation/supplierQuotationDetails2',params}, { isTransformResponse: false })
+        .then((res) => {
+            if (res.success) {
+                dataSource.value = res.result.records;
+                pagination.value.total = res.result.total;
+                pagination.value.current = res.result.current;
+                pagination.value.pageSize = res.result.size;                
+            } else {
+                message.error(res.message);
+            }
+        })
+        .finally(() => {
+            // loading.value = false;
+        });
+    }
+    function getQueryParams(){
+        let params = Object.assign(queryParams.value);
+        params.pageNo = pagination.value.current;
+        params.pageSize = pagination.value.pageSize;
+        if(fatherProjectName.value&&fatherProjectName.value!==''){
+            queryParams.value.projectName = fatherProjectName.value
+        }else{
+            queryParams.value.projectName = ''
+        }
+        return filterObj(params);
+    }
+    function handleTableChange(paginations, filters, sorter){
+        pagination.value.total = paginations.total;
+        pagination.value.current = paginations.current;
+        pagination.value.pageSize = paginations.pageSize;
+        loadData()
+    };
+    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 searchQuery(){
+        loadData();
+    }
+    function searchReset(){
+        queryParams.value = {
+            billCode:'',
+            billDate:'',
+            quotationSuppiler:'',
+            priority:'',
+            productionClass:'',
+            model:'',
+            maker:'',
+            productionCode:'',
+            quotationProject:'',
+            projectName:''
+        }
+        pagination.value.current =1;
+        pagination.value.pageSize = 10; 
+        loadData();
+    }
+    function handleToggleSearch(){
+        toggleSearchStatus.value = !toggleSearchStatus.value;
+    }
+    function onSelectChange(keys,rows){
+        selectedRowKeys.value = keys
+        selectedRows.value = rows
+    }
+    function handleOk(){
+      var arr = []
+      selectedRows.value.map(item=>arr.push(item.billCode))
+      if(fatherSourceCode.value&&fatherSourceCode.value!==''){
+        arr.push(fatherSourceCode.value)
+      }
+      if(selectedRowKeys.value.length==0){
+        message.error('请勾选数据');
+      }else if(new Set(arr).size!==1){
+        message.error('请勾选询价单号相同的数据');
+      }else{
+        emit('selectProduct', selectedRows.value)
+        handleCancel()
+      }
+    }
+    function handleCancel(){
+      visible.value = false
+      selectedRowKeys.value = []
+      selectedRows.value=[]
+    }
+    function getTable(formData){
+        visible.value = true
+        if(formData.projectName&&formData.projectName!==''){
+            fatherProjectName.value = formData.projectName
+        }else{
+            fatherProjectName.value = ''
+        }
+        if(formData.sourceCode&&formData.sourceCode!==''){
+            fatherSourceCode.value = formData.sourceCode
+        }else{
+            fatherSourceCode.value = ''
+        }
+        loadData()
+        getOptiom()
+    }
+    defineExpose({
+      getTable
+    });
+</script>
+<style scoped lang="less">
+/deep/.ant-form-item{
+    margin-bottom: 8px !important;
+}
+// /deep/.ant-table-wrapper .ant-table-thead > tr > th, .ant-table-wrapper .ant-table-thead > tr > td{
+//     padding: 8px !important;
+// }
+
+</style>

+ 59 - 17
src/views/saleCode/quotation/components/quotationFormForm.vue

@@ -16,7 +16,7 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="报价项目(quotation project)" v-bind="validateInfos.quotationProjectName" id="quotationFormForm-quotationProjectName" name="quotationProjectName">
-								<a-input-search v-model:value="formData.quotationProjectName" placeholder="请输入报价项目(inquiry project)"  allow-clear enter-button="Search" @search="onSearchProject"></a-input-search>
+								<a-input-search v-model:value="formData.quotationProjectName" placeholder="请输入报价项目(inquiry project)"  allow-clear enter-button="Search" :disabled="saleQuotationFormProductTable.dataSource.length!==0" @search="onSearchProject"></a-input-search>
 							</a-form-item>
 						</a-col>
 						<a-col :span="12">
@@ -29,11 +29,6 @@
                 <a-range-picker v-model:value="quotationPeriod" :format="['YYYY-MM-DD','YYYY-MM-DD']"  @change="onChangequotationPeriod" style="width: 100%" />
 							</a-form-item>
 						</a-col>
-            <a-col :span="12">
-							<a-form-item label="业务类型(busyness type)" v-bind="validateInfos.busynessType" id="quotationFormForm-busynessType" name="busynessType" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
-                <JDictSelectTag v-model:value="formData.busynessType" placeholder="请选择" dictCode="busyness_type"/>
-							</a-form-item>
-						</a-col>
 						<a-col :span="12">
 							<a-form-item label="优先级(priority)" v-bind="validateInfos.priority" id="quotationFormForm-priority" name="priority">
                 <JDictSelectTag v-model:value="formData.priority" placeholder="请选择" dictCode="priority"/>
@@ -147,7 +142,7 @@
       </a-tab-pane>
       <a-tab-pane tab="销售报价单 - 产品明细(product details)" key="saleQuotationFormProduct" :forceRender="true">
         <a-button type="primary" @click="selectProducts" style="margin-right: 1%;margin-bottom: 1%;"> 选择产品(select product)</a-button>
-        <!-- <a-button type="primary" @click="chooseSupplier"> 选择供应商报价(selete supplier quotation)</a-button> -->
+        <a-button type="primary" @click="chooseSupplier"> 选择供应商报价(selete supplier quotation)</a-button>
         <j-vxe-table
           :keep-source="true"
           resizable
@@ -177,6 +172,7 @@
     <SelectPrpductModal ref="SelectPrpductModalRef" @selectProduct="addProduct"></SelectPrpductModal>
     <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal>
     <ViewHistoryQuotationModal ref="ViewHistoryQuotationModalRef" ></ViewHistoryQuotationModal>
+    <SelectSupplierQuotation ref="SelectSupplierQuotationRef" @selectProduct="addProductFromSupplier"></SelectSupplierQuotation>
   </a-spin>
 </template>
 
@@ -191,6 +187,7 @@
   import BaseShipArchiveAccessoriesList from './BaseShipArchiveAccessoriesModal.vue';
   import SelectPrpductModal from './SelectPrpductModal.vue';
   import SelectProjectModal from './SelectProjectModal.vue';
+  import SelectSupplierQuotation from './SelectSupplierQuotation.vue';
   import ViewHistoryQuotationModal from './ViewHistoryQuotationModal.vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
@@ -213,6 +210,7 @@
       SelectPrpductModal,
       JUpload,
       SelectProjectModal,
+      SelectSupplierQuotation,
       ViewHistoryQuotationModal,
       JDictSelectTag,
       JSelectInput,
@@ -234,6 +232,7 @@
       var SelectPrpductModalRef = ref()
       var SelectProjectModalRef = ref()
       var ViewHistoryQuotationModalRef = ref()
+      var SelectSupplierQuotationRef = ref()
       var quotationPeriod = ref([])
       const saleQuotationFormShipTableRef = ref();
       const saleQuotationFormShipTable = reactive<Record<string, any>>({
@@ -310,7 +309,7 @@
       });
 
       
-
+      //新增方法
       function add() {
         resetFields();
         saleQuotationFormShipTable.dataSource = [];
@@ -322,7 +321,7 @@
         formData.salesman=userStore.getUserInfo.username;
         formData.saleDepartment = userStore.getUserInfo.orgCode
       }
-
+      //编辑方法
       async function edit(row) {
         //主表数据
         await queryMainData(row.id);
@@ -337,6 +336,7 @@
         quotationPeriod.value[1]=formData.quotationPeriodEnd?moment(formData.quotationPeriodEnd):''
         
       }
+      //获取主表
       async function queryMainData(id) {
         const row = await queryDataById(id);
         resetFields();
@@ -354,7 +354,7 @@
         'saleQuotationShip': saleQuotationFormShipTableRef,
         'saleQuotationProduct': saleQuotationFormProductTableRef,
       });
-
+      //获取表单信息
       async function getFormData() {
         try {
           // 触发表单验证
@@ -370,7 +370,7 @@
         }
         return transformData(toRaw(formData))
       }
-
+      //保存
       async function submitForm() {
         const mainData = await getFormData();
         const subData = await getSubFormAndTableData();
@@ -399,34 +399,40 @@
       function handleFormChange(key, value) {
         formData[key] = value;
       }
+      //传明细-删除行
       async function handleDelete(prop) {
         var newArray = [...saleQuotationFormShipTable.dataSource]
         newArray.splice(prop.rowIndex, 1)
         saleQuotationFormShipTable.dataSource = newArray 
       }
+      //产品明细-删除行
       async function handleDelete1(prop) {
         var newArray = [...saleQuotationFormProductTable.dataSource]
         newArray.splice(prop.rowIndex, 1)
         saleQuotationFormProductTable.dataSource = newArray  
       }
+      //查询船
       function selectShip(){
         SelectShipSModalRef.value.getTable()
       }
+      //增行-船明细
       function addShip(data){
         var arr = data.concat(saleQuotationFormShipTable.dataSource)
         arr.map(item=>item.shipowner = item.relateCustomer)
         saleQuotationFormShipTable.dataSource=arr             
       }
+      //增行-产品明细
       function addProduct(data){
         var arrProduct = data.concat(saleQuotationFormProductTable.dataSource)
         arrProduct.map(item=>{
           item.productClass = item.classId_dictText
           item.productCode = item.code
-          item.unit = item.measurementUnit
+          // item.unit = item.measurementUnit
           item.deliveryTime = formData.deliveryTime
         })
         saleQuotationFormProductTable.dataSource=arrProduct      
       }
+      //选择项目
       function addProject(data) {
         formData.quotationProject = data[0].id
         formData.quotationProjectName = data[0].name
@@ -438,6 +444,7 @@
           }
         })
       }
+      //获取客户列表
       function getCustomerOptions(){
           let params = {pageSize:'-1',status:1}
           defHttp.get({url:'/cuspCode/cuspCustomerProfile/list',params}, { isTransformResponse: false }).then(res=>{
@@ -453,15 +460,23 @@
             }
           })
       }
+      //查看配件信息
       function viewAccessory(prop){
         BaseShipArchiveAccessoriesListRef.value.getTable(prop.row)
       }
+      //选择产品
       function selectProducts(){
         SelectPrpductModalRef.value.getTable()
       }
+      //选择供应商报价单
+      function chooseSupplier(){
+        SelectSupplierQuotationRef.value.getTable(formData)
+      }
+      //选择项目  
       function onSearchProject(){
         SelectProjectModalRef.value.getTable()
       }
+      //获取产品分类下拉框
       function getOptiom(){
         defHttp
             .get({ url: 'baseCode/baseProductClass/list'}, { isTransformResponse: false })
@@ -481,14 +496,13 @@
                 // loading.value = false;
             });
       }
+      //修改报价有效期
       function onChangequotationPeriod(data){
         quotationPeriod.value = data
         formData.quotationPeriodBegin = data[0].format('YYYY-MM-DD')
         formData.quotationPeriodEnd = data[1].format('YYYY-MM-DD')
       }
-      function chooseSupplier(){
-
-      }
+      //修改主表交期
       function changeDelivertTime(prop){
          if(saleQuotationFormProductTable.dataSource.length>0){
             var newArr = [...saleQuotationFormProductTable.dataSource]
@@ -498,12 +512,14 @@
             saleQuotationFormProductTable.dataSource = newArr
          }
       }
+      //查看上次报价
       function viewHistory(){
         ViewHistoryQuotationModalRef.value.getTable()
       }
+      //查看版本详情
       async function VersionDetail(record){
          //主表数据
-         await queryVersonHistoryData(record.id);
+        await queryVersonHistoryData(record.id);
          //子表数据
         const saleQuotationFormShipDataList = await querysaleVersonFormShipListByMainId(record.id);
         saleQuotationFormShipTable.dataSource = [...saleQuotationFormShipDataList];
@@ -526,6 +542,30 @@
         //赋值
         Object.assign(formData,tmpData);
       }
+      //新增行-产品明细-选择供应商报价单
+      async function addProductFromSupplier(data){
+        var arrProduct = data.concat(saleQuotationFormProductTable.dataSource)
+        arrProduct.map(item=>{
+          item.productClass = item.productionClass
+          item.productCode = item.productCode
+          item.sourceId = item.childId
+          item.model = item.childModel
+          item.deliveryTime = formData.deliveryTime
+          item.supplierCurrency = item.currency
+        })
+        saleQuotationFormProductTable.dataSource=arrProduct     
+        formData.quotationProject = data[0].quotationProject
+        formData.quotationProjectName = data[0].projectName
+        formData.sourceCode = data[0].billCode
+        formData.priority = data[0].priority
+        formData.model = data[0].headModel
+        formData.maker = data[0].maker
+        formData.productionClass =  data[0].productionClass
+        //查询客户名称
+        var obj = await SelectProjectModalRef.value.getCustom(formData.quotationProject)
+        formData.quotationCustomer =obj[0].customerId
+        formData.quotationCustomerName =obj[0].customerId_dictText
+      }
       return {
         saleQuotationFormShipTableRef,
         saleQuotationFormShipTable,
@@ -557,6 +597,7 @@
         SelectPrpductModalRef,
         SelectProjectModalRef,
         ViewHistoryQuotationModalRef,
+        SelectSupplierQuotationRef,
         onSearchProject,
         addProject,
         getOptiom,
@@ -570,7 +611,8 @@
         viewHistory,
         baseUrl,
         VersionDetail,
-        queryVersonHistoryData
+        queryVersonHistoryData,
+        addProductFromSupplier
       }
     }
   });

+ 8 - 14
src/views/saleCode/quotation/quotationForm.data.ts

@@ -71,12 +71,6 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'maker'
    },
-   {
-    title: '业务类型(busyness type)',
-    align:"center",
-    dataIndex: 'busynessType;'
-   },
-
    {
     title: '状态(status)',
     align:"center",
@@ -188,14 +182,14 @@ export const saleQuotationFormProductColumns: JVxeColumn[] = [
       width:"200px",
       defaultValue:'',
     },
-    {
-      title: '规格(specifications)',
-      key: 'specifications',
-      type: JVxeTypes.normal,
-      placeholder: '请输入${title}',
-      width:"200px",
-      defaultValue:'',
-    },
+    // {
+    //   title: '规格(specifications)',
+    //   key: 'specifications',
+    //   type: JVxeTypes.normal,
+    //   placeholder: '请输入${title}',
+    //   width:"200px",
+    //   defaultValue:'',
+    // },
     {
       title: '型号(model)',
       key: 'model',

+ 1 - 1
src/views/saleCode/saleInquiryForm/components/SaleInquiryFormForm.vue

@@ -154,7 +154,7 @@
 </template>
 
 <script lang="ts">
-  import { defineComponent, ref, reactive, computed, toRaw, onMounted } from 'vue';
+  import { defineComponent, ref, reactive, computed, toRaw} from 'vue';
   import { defHttp } from '/@/utils/http/axios';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
   import { querySaleInquiryFormShipListByMainId, querySaleInquiryFormProductListByMainId, queryDataById, saveOrUpdate } from '../SaleInquiryForm.api';