采购报价单选定-bug修改

src/views/purchase/selectionQuotationForm/components/BaseProjectArchive.api.ts

@@ -1,14 +0,0 @@
-import {defHttp} from '/@/utils/http/axios';
-import { useMessage } from "/@/hooks/web/useMessage";
-
-const { createConfirm } = useMessage();
-
-enum Api {
-  list = '/baseCode/baseProjectArchive/list'
-}
-/**
- * 列表接口
- * @param params
- */
-export const list = (params) =>
-  defHttp.get({url: Api.list, params});

src/views/purchase/selectionQuotationForm/components/BaseProjectArchive.data.ts

@@ -1,84 +0,0 @@
-import {BasicColumn} from '/@/components/Table';
-import {FormSchema} from '/@/components/Table';
-import { rules} from '/@/utils/helper/validator';
-import { render } from '/@/utils/common/renderUtils';
-import { getWeekMonthQuarterYear } from '/@/utils';
-//列表数据
-export const columns: BasicColumn[] = [
-  {
-    title: '编码(code)',
-    align:"center",
-    dataIndex: 'code'
-   },
-   {
-    title: '名称(name)',
-    align:"center",
-    dataIndex: 'name'
-   },
-  
-   {
-    title: '客户(customer)',
-    align:"center",
-    dataIndex: 'customerId_dictText'
-   },
-   {
-    title: '备注(notes)',
-    align:"center",
-    dataIndex: 'notes'
-   },
-   {
-    title: '创建时间(create time)',
-    align:"center",
-    dataIndex: 'createTime'
-   },
-   {
-    title: '创建人(create by)',
-    align:"center",
-    dataIndex: 'createBy'
-   },
-];
-//查询数据
-export const searchFormSchema: FormSchema[] = [
-	  {
-      label: "编码(code)",
-      field: 'code',
-      component: 'Input',
-      componentProps:{
-      },
-      //colProps: {span: 6},
- 	  },
-   {
-      label: "名称(name)",
-      field: 'name',
-      component: 'Input',
-        //colProps: {span: 6},
-    },
-    {
-      label: "客户(customer)",
-      field: 'customerId',
-      component: 'JDictSelectTag',
-      componentProps:{
-          dictCode: 'customer',
-      },
-      //colProps: {span: 6},
- 	  },
-     {
-      label: "创建时间(create time)",
-      field: "createTime",
-      component: 'RangePicker',
-      labelWidth: 150,
-      componentProps: {
-          valueType: 'Date',
-          showTime:true
-      },
-      //colProps: {span: 6},
-	},
-	{
-    label: "创建人(create by)",
-    field: 'createBy',
-    component: 'Input',
-    labelWidth: 120,
-    //colProps: {span: 6},
-   },
-	
-];

src/views/purchase/selectionQuotationForm/components/BaseShipArchiveAccessoriesModal.vue

@@ -1,107 +0,0 @@
-<template>
-  <div ref="accessoriesDetailsRef">
-      <a-modal
-            title="配件明细(accessories details)"
-            width="70%"
-            :visible="visible"
-            :maskClosable="false"
-            :getContainer ='()=>$refs.accessoriesDetailsRef'
-            switchFullscreen
-            @cancel="handleCancel">
-              <div>
-                <a-table
-                      :columns="columns"
-                      :row-key="record => record.id"
-                      :data-source="dataSource"
-                      bordered
-                      size="small"
-                      height="500"
-                      :pagination="false"
-                      :scroll="{ x: 1000, y: 500 }"
-                  > 
-                      <template #attachs="{ text, record,index }">
-                          <a :href="baseUrl+record.attachs">{{record.attachs}}</a>
-                      </template>
-                  </a-table>
-              </div>
-        </a-modal>
-  </div>
-</template>
-
-<script lang="ts" setup>
-    import {ref, computed, unref,reactive} from 'vue';
-    import { useGlobSetting } from '/@/hooks/setting';
-    import {defHttp} from '/@/utils/http/axios';
-    const { domainUrl } = useGlobSetting();
-    var visible = ref(false);
-    var columns = ref([
-          {
-          title: '配件类型(accessory type)',
-          align:"center",
-          dataIndex: 'accessoryType',
-          key: 'accessoryType'
-        },
-        {
-          title: '规格(specifications)',
-          align:"center",
-          dataIndex: 'specifications',
-          key: 'specifications'
-        },
-        {
-          title: '型号(model)',
-          align:"center",
-          dataIndex: 'model',
-          key: 'model'
-        },
-        {
-          title: '序列号(serial number)',
-          align:"center",
-          dataIndex: 'serialNumber',
-          key: 'serialNumber'
-        },
-        {
-          title: '备注(notes)',
-          align:"center",
-          dataIndex: 'notes',
-          key: 'notes'
-        },
-        {
-          title: '附件(attachs)',
-          align:"center",
-          dataIndex: 'attachs',
-          key: 'attachs',
-          slots: { customRender: 'attachs' },
-        },
-    ])
-    var dataSource=ref([])
-    const baseUrl = domainUrl + '/sys/common/static/';
-    function getTable(record){
-        visible.value = true
-        let params={headId:record.id}
-        defHttp.get({url:"/baseCode/baseShipArchiveAccessories/list",params}).then(res=>{
-        if(res){
-          dataSource.value = res.records
-        }
-    })
-    }
-    function handleCancel(){
-      visible.value = false;
-    }
-    defineExpose({
-      getTable
-    });
-  </script>
-
-<style lang="less" scoped>
-	/** 时间和数字输入框样式 */
-  :deep(.ant-input-number) {
-    width: 100%;
-  }
-
-  :deep(.ant-calendar-picker) {
-    width: 100%;
-  }
-  /deep/.ant-modal-body{
-    padding: 14px !important;
-  }
-</style>

src/views/purchase/selectionQuotationForm/components/SelectProjectModal.vue

@@ -1,84 +0,0 @@
-<template>
-    <a-modal
-      title="选择项目(select project)"
-      width="95%"
-      :visible="visible"
-      :maskClosable="false"
-      switchFullscreen
-      @ok = "handleOk"
-      @cancel="handleCancel">
-      <div>
-            <!--引用表格-->
-        <BasicTable @register="registerTable" :rowSelection="rowSelection"></BasicTable>
-        </div>
-      </a-modal>
-</template>
-<script lang="ts" name="baseCode-baseShipArchive" setup>
-  import {ref, reactive } from 'vue';
-  import {BasicTable, useTable, TableAction} from '/@/components/Table';
-  import { useListPage } from '/@/hooks/system/useListPage'
-  import {columns, searchFormSchema} from './BaseProjectArchive.data';
-  import {list} from './BaseProjectArchive.api';
-  import { message } from 'ant-design-vue';
-
-  const queryParam = reactive<any>({});
-  var visible = ref(false);
-  const emit = defineEmits([ 'selectProject']); //定义emit
-  //注册table数据
-  const { tableContext} = useListPage({
-      tableProps:{
-           api:list,
-           columns,
-           canResize:false,
-           formConfig: {
-              schemas: searchFormSchema,
-              autoSubmitOnEnter:true,
-              showAdvancedButton:true,
-              fieldMapToNumber: [
-              ],
-              fieldMapToTime: [
-                 ['shipDate', ['shipDate_begin', 'shipDate_end'], 'YYYY-MM-DD HH:mm:ss'],
-              ],
-            },
-           showTableSetting:false,
-           showActionColumn:false,
-           actionColumn: {
-               width: 200,
-               fixed:'right'
-            },
-            beforeFetch: (params) => {
-              return Object.assign(params, queryParam);
-            },
-      }
-  })
-
-  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
-  
-  function handleCancel() {
-    visible.value = false;
-    selectedRowKeys.value = []
-    emit('selectProject',rowSelection.selectedRows)
-  }
-  function handleOk() {
-    if(selectedRowKeys.value.length!==1){
-      message.warning('请选择一条数据数据')
-    }else{
-        emit('selectProject',rowSelection.selectedRows)
-        handleCancel()
-     }  
-    }
-   function getTable(){
-    visible.value = true
-   }
-   defineExpose({
-    getTable
-  });
-
-
-</script>
-
-<style lang="less" scoped>
-  :deep(.ant-picker),:deep(.ant-input-number){
-    width: 100%;
-  }
-</style>

src/views/purchase/selectionQuotationForm/components/SelectQuotationFormForm.vue

@@ -135,7 +135,7 @@
           </j-vxe-table>
       </a-tab-pane>
     </a-tabs>
-    <BaseShipArchiveAccessoriesList ref="BaseShipArchiveAccessoriesListRef"></BaseShipArchiveAccessoriesList>
+    <BaseShipArchiveAccessoriesModal ref="BaseShipArchiveAccessoriesListRef"></BaseShipArchiveAccessoriesModal>
     <SelectProjectModal ref="SelectProjectModalRef" @selectProject="addProject"></SelectProjectModal>
   </a-spin>
 </template>
@@ -147,8 +147,8 @@
   import { SelectQuotationFormShippTable, SelectQuotationFormProductListByMainId, queryDataById, saveOrUpdate } from '../SelectionQuotationForm.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import {SelectQuotationFormShipTableCloumn, SelectQuotationFormProductColumns,SupplierQuotationColumns,SupplierSummaryAmountColumns} from '../SelectionQuotationForm.data';
-  import BaseShipArchiveAccessoriesList from './BaseShipArchiveAccessoriesModal.vue';
-  import SelectProjectModal from './SelectProjectModal.vue';
+  import BaseShipArchiveAccessoriesModal from '../../../publicComponents/BaseShipArchiveAccessoriesModal.vue';
+  import SelectProjectModal from '../../../publicComponents/SelectProjectModal.vue';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
   import JUpload from '/@/components/Form/src/jeecg/components/JUpload/JUpload.vue';
   import { JDictSelectTag} from '/@/components/Form';
@@ -161,7 +161,7 @@
     components:{
       JVxeTable,
 			JFormContainer,
-      BaseShipArchiveAccessoriesList,
+      BaseShipArchiveAccessoriesModal,
       JUpload,
       SelectProjectModal,
       JDictSelectTag,