销售合同-页面

src/views/saleCode/salesOrder/SaleOrderFormList.vue

@@ -105,7 +105,6 @@
       <template #tableTitle>
           <a-button type="primary" v-auth="'saleCode:sale_inquiry_form:add'"  @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
           <a-button  type="primary" v-auth="'saleCode:sale_inquiry_form:exportXls'"  preIcon="ant-design:export-outlined" @click="onExportXls"> 导出(export)</a-button>
-          <a-button  type="primary"  @click="setStatus"> 设置其他状态(set other status)</a-button>
           <a-button  type="primary"  @click="submit" v-auth="'saleCode:sale_inquiry_form:submitBatch'"> 提交(submit)</a-button>
           <a-button  type="primary"  @click="cancelSubmit" v-auth="'saleCode:sale_inquiry_form:returnSubmitBatch'"> 取消提交(cancelSubmit)</a-button>
           <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -132,7 +131,6 @@
     </BasicTable>
     <!-- 表单区域 -->
     <SaleInquiryFormModal @register="registerModal" @success="handleSuccess"></SaleInquiryFormModal>
-    <SetOtherStatus ref="SetOtherStatusRef" @success="handleSuccess"></SetOtherStatus>
   </div>
 </template>
 
@@ -141,8 +139,8 @@
   import {BasicTable, useTable, TableAction} from '/@/components/Table';
   import { useListPage } from '/@/hooks/system/useListPage'
   import {useModal} from '/@/components/Modal';
-  import SaleInquiryFormModal from './components/SaleInquiryFormModal.vue'
-  import {columns, superQuerySchema} from './SaleOrderForm.data.ts';
+  import SaleInquiryFormModal from './components/SaleOrderFormModal.vue'
+  import {columns, superQuerySchema} from './SaleOrderForm.data';
   import {list, deleteOne, batchDelete, getImportUrl,getExportUrl,batchSubmit,cancelBatchSubmit} from './SaleOrderyForm.api';
   import { cloneDeep } from "lodash-es";
   import { defHttp } from '/@/utils/http/axios';
@@ -150,14 +148,12 @@
   import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
   import JSelectUser from '/@/components/Form/src/jeecg/components/JSelectUser.vue';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
-  import SetOtherStatus from './components/SetOtherStatus.vue';
   import { message } from 'ant-design-vue';
   const formRef = ref();
   const queryParam = reactive<any>({});
   //注册model
   const [registerModal, {openModal}] = useModal();
   var classOption = ref([]);
-  var SetOtherStatusRef = ref()
    //注册table数据
   const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       tableProps:{
@@ -306,14 +302,6 @@
          }
        ]
    }
-   function setStatus(){
-    if(selectedRowKeys.value.length==0){
-      message.warning('请选择数据')
-    }else{
-    var ids=selectedRowKeys.value.join(',')
-     SetOtherStatusRef.value.getTable(ids)
-    }
-  }
   function submit(){
     if(selectedRowKeys.value.length==0){
       message.warning('请选择数据')

src/views/saleCode/salesOrder/SaleOrderyForm.api.ts

@@ -32,12 +32,12 @@ export const getImportUrl = Api.importExcel;
  * 查询子表数据
  * @param params
  */
-export const querySaleInquiryFormShipListByMainId = (id) => defHttp.get({url: Api.saleInquiryFormShipList, params:{ id }});
+export const querySaleOrderFormShipFormShippTable = (id) => defHttp.get({url: Api.saleInquiryFormShipList, params:{ id }});
 /**
  * 查询子表数据
  * @param params
  */
-export const querySaleInquiryFormProductListByMainId = (id) => defHttp.get({url: Api.saleInquiryFormProductList, params:{ id }});
+export const querySaleOrderFormProductListByMainId = (id) => defHttp.get({url: Api.saleInquiryFormProductList, params:{ id }});
 
 /**
  * 列表接口

src/views/saleCode/salesOrder/components/SaleOrderFormModal.vue

@@ -1,7 +1,9 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="95%" @ok="handleSubmit">
-    <SlaeOrderFormForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></SlaeOrderFormForm>
-  </BasicModal>
+  <div ref="SaleOrderDetailsRef">
+    <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="95%" height="10%" @ok="handleSubmit" :getContainer ='()=>$refs.SaleOrderDetailsRef'>
+      <SlaeOrderFormForm ref="formComponent" :formDisabled="formDisabled" :formBpm="false" @success="submitSuccess"></SlaeOrderFormForm>
+    </BasicModal>
+  </div>
 </template>
 
 <script lang="ts">
@@ -21,7 +23,7 @@
       const isUpdate = ref(true);
       const formDisabled = ref(false);
       const title = ref('')
-
+      var SaleOrderDetailsRef = ref()
       //表单赋值
       const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
         setModalProps({confirmLoading: false,showCancelBtn:data?.showFooter,showOkBtn:data?.showFooter});
@@ -50,7 +52,8 @@
         formComponent,
         formDisabled,
         handleSubmit,
-        submitSuccess
+        submitSuccess,
+        SaleOrderDetailsRef
       }
     }
   }
@@ -64,4 +67,10 @@
   :deep(.ant-calendar-picker) {
     width: 100%;
   }
+  /deep/.ant-modal {
+    width: 520px;
+    padding-bottom: 0;
+    margin-top: -92px;
+    height: 100%;
+}
 </style>

src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

@@ -52,12 +52,12 @@
 						</a-col>
 						<a-col :span="12">
 							<a-form-item label="交货条款(delivery term)" v-bind="validateInfos.deliveryTerm" id="SaleOrderForm-deliveryTerm" name="deliveryTerm">
-                <JDictSelectTag v-model:value="formData.deliveryTerm" placeholder="请选择" dictCode="delivery_terms" style="width: 49%;margin-right: 1%;"/>
+                <JDictSelectTag v-model:value="formData.deliveryTerm" placeholder="请选择" dictCode="delivery_terms"/>
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="付款条件(payment terms)" v-bind="validateInfos.paymentTerms" id="SaleOrderForm-paymentTerms" name="paymentTerms" :labelCol="formItemLayout.labelCol1" :wrapperCol="formItemLayout.wrapperCol1">
-                <JDictSelectTag v-model:value="formData.paymentTerms" placeholder="请选择" dictCode="payment_terms"/>
+                <JDictSelectTag v-model:value="formData.paymentTerms" placeholder="请选择" dictCode="payment_terms" />
 							</a-form-item>
 						</a-col>
             
@@ -83,7 +83,7 @@
 						</a-col>
             <a-col :span="12">
 							<a-form-item label="质保期(warranty period)" v-bind="validateInfos.warrantyPeriod" id="SaleOrderForm-warrantyPeriod" name="warrantyPeriod">
-                <a-input v-model:value="formData.warrantyPeriod" placeholder="请输入" style="width: 95%;margin-right: 1%;"/>月(month)
+                <a-input v-model:value="formData.warrantyPeriod" placeholder="请输入" style="width: 85%;margin-right: 1%;"/>月(month)
 							</a-form-item>
 						</a-col>
             <a-col :span="12">
@@ -149,7 +149,7 @@
 
 		<!-- 子表单区域 -->
     <a-tabs v-model:activeKey="activeKey" animated  style=" padding: 24px;padding-top: 0px;">
-      <a-tab-pane tab="采购报价单 - 船明细(ship details)" key="SaleOrderFormShipFormShip" :forceRender="true">
+      <a-tab-pane tab="销售订单 - 船明细(ship details)" key="SaleOrderFormShipFormShip" :forceRender="true">
         <j-vxe-table
           :keep-source="true"
           resizable
@@ -167,7 +167,7 @@
             </template>
           </j-vxe-table>
       </a-tab-pane>
-      <a-tab-pane tab="采购报价单 - 产品明细(product details)" key="SaleOrderFormShipFormProduct" :forceRender="true">
+      <a-tab-pane tab="销售订单 - 产品明细(product details)" key="SaleOrderFormShipFormProduct" :forceRender="true">
         <a-button type="primary" style="margin-right: 1%;margin-bottom: 1%;"> 选择产品(select product)</a-button>
         <a-button type="primary"  style="margin-right: 1%;margin-bottom: 1%;"> 选择合同(select contract)</a-button>
         <a-button type="primary"  style="margin-right: 1%;margin-bottom: 1%;"> 选择报价单(select quotation)</a-button>
@@ -203,7 +203,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 '../SaleOrderForm.api';
+  import { querySaleOrderFormShipFormShippTable, querySaleOrderFormProductListByMainId, queryDataById, saveOrUpdate } from '../SaleOrderyForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import {saleOrderShipColumns, saleOrderProductColumns} from '../SaleOrderForm.data';
   // import BaseShipArchiveAccessoriesList from './BaseShipArchiveAccessoriesModal.vue';
@@ -323,9 +323,9 @@
         //主表数据
         await queryMainData(row.id);
         //子表数据
-        const SaleOrderFormShipFormShipDataList = await SaleOrderFormShipFormShippTable(row['id']);
+        const SaleOrderFormShipFormShipDataList = await querySaleOrderFormShipFormShippTable(row['id']);
         SaleOrderFormShipFormShipTable.dataSource = [...SaleOrderFormShipFormShipDataList];
-        const SaleOrderFormShipFormProductDataList = await queryPurcodeQuotationFormProductListByMainId(row['id']);
+        const SaleOrderFormShipFormProductDataList = await querySaleOrderFormProductListByMainId(row['id']);
         SaleOrderFormShipFormProductTable.dataSource = [...SaleOrderFormShipFormProductDataList];
       }