完善功能

src/router/routes/modules/dashboard.ts

@@ -7,8 +7,8 @@ const dashboard: AppRouteModule = {
   path: '/dashboard',
   name: 'Dashboard',
   component: LAYOUT,
-  // redirect: '/dashboard/analysis',
-  redirect: '/dashboard/workbench',
+  redirect: '/dashboard/analysis',
+  // redirect: '/dashboard/workbench',
   meta: {
     orderNo: 10,
     icon: 'ion:grid-outline',

src/views/cuspCode/CustomerProfile/CuspCustomerProfile.data.ts

@@ -118,6 +118,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'paymentTerms_dictText',
   },
+  {
+    title: '隶属部门(Subordinate)',
+    align: 'center',
+    dataIndex: 'subordinateDepart_dictText',
+  },
   {
     title: '状态(status)',
     key: 'status',
@@ -574,6 +579,39 @@ export const formSchema: FormSchema[] = [
       AutoComplete: 'off',
     },
   },
+  
+  {
+    label: '隶属部门(subordinate)',
+    field: 'subordinateDepart',
+    component: 'JSelectDept',colProps: { span: 12 },
+    labelWidth: 200,
+    componentProps: ({ formActionType, formModel }) => {
+      return {
+        // sync: false,
+        // checkStrictly: true,
+        defaultExpandLevel: 2,
+
+        // onSelect: (options, values) => {
+        //   const { updateSchema } = formActionType;
+        //   //所属部门修改后更新负责部门下拉框数据
+        //   updateSchema([
+        //     {
+        //       field: 'departIds',
+        //       componentProps: { options },
+        //     },
+        //   ]);
+        //   //update-begin---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
+        //   if(!values){
+        //     formModel.departIds = [];
+        //     return;
+        //   }
+        //   //update-end---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
+        //   //所属部门修改后更新负责部门数据
+        //   formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
+        // },
+      };
+    },
+  },
   {
     label: '营业执照(business license)',
     field: 'files',

src/views/cuspCode/SupplierProfile/CuspSupplierProfile.data.ts

@@ -72,6 +72,11 @@ export const columns: BasicColumn[] = [
     dataIndex: 'originalFactory_dictText',
     width: 180,
   },
+  {
+    title: '隶属部门(Subordinate)',
+    align: 'center',
+    dataIndex: 'subordinateDepart_dictText',
+  },
   {
     title: '状态(status)',
     align: 'center',
@@ -514,6 +519,38 @@ export const formSchema: FormSchema[] = [
     labelWidth: 200,
     component: 'JUpload',
   },
+  {
+    label: '隶属部门(subordinate)',
+    field: 'subordinateDepart',
+    component: 'JSelectDept',colProps: { span: 12 },
+    labelWidth: 200,
+    componentProps: ({ formActionType, formModel }) => {
+      return {
+        // sync: false,
+        // checkStrictly: true,
+        defaultExpandLevel: 2,
+
+        // onSelect: (options, values) => {
+        //   const { updateSchema } = formActionType;
+        //   //所属部门修改后更新负责部门下拉框数据
+        //   updateSchema([
+        //     {
+        //       field: 'departIds',
+        //       componentProps: { options },
+        //     },
+        //   ]);
+        //   //update-begin---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
+        //   if(!values){
+        //     formModel.departIds = [];
+        //     return;
+        //   }
+        //   //update-end---author:wangshuai---date:2024-05-11---for:【issues/1222】用户编辑界面“所属部门”与“负责部门”联动出错整---
+        //   //所属部门修改后更新负责部门数据
+        //   formModel.departIds && (formModel.departIds = formModel.departIds.filter((item) => values.value.indexOf(item) > -1));
+        // },
+      };
+    },
+  },
   {
     label: '备注(notes)',
     field: 'notes',

src/views/inventiry/purchaseIn/purchaseInList.vue

@@ -21,7 +21,7 @@
                   resultField="records"
                   labelField="code"
                   valueField="id"
-                  :params="{ pageSize: -1,status:1 }"
+                  :params="{ pageSize: -1}"
                   optionFilterProp="label"
                />
             </a-form-item>
@@ -110,8 +110,8 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection" size="small">
       <!--插槽:table标题-->
       <template #tableTitle>
-        
-        <a-button type="error" v-auth="'storeCode:store_purchase_in:B2BAction'" @click="B2BAction">运维功能，请勿点击</a-button>
+   <!--     
+        <a-button type="error" v-auth="'storeCode:store_purchase_in:B2BAction'" @click="B2BAction">运维功能，请勿点击</a-button> -->
         <a-button type="primary" v-auth="'storeCode:store_purchase_in:add'" @click="handleAdd" preIcon="ant-design:plus-outlined">
           新增(add)</a-button
         >

src/views/saleCode/deliveryNotice/deliveryNoticeList.vue

@@ -127,6 +127,9 @@
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls" v-auth="'saleCode:sale_delivery:exportXls'">
           导出(export)</a-button
         >
+       <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls2" v-auth="'saleCode:sale_delivery:exportXls'">
+          导出明细(export)</a-button
+        >
         <a-button type="primary" @click="submit"> 提交(submit)</a-button>
         <a-button type="primary" @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
         <a-button type="primary" v-auth="'saleCode:sale_delivery:close'" @click="close"> 关闭(close)</a-button>
@@ -234,6 +237,36 @@
     },
   });
 
+
+  //注册table数据
+  const { onExportXls: onExportXls2 } = useListPage({
+    tableProps: {
+      title: '发货通知单明细',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 300,
+        fixed: 'right',
+      },
+      scroll: {
+        x: '4000px',
+        y:'calc(100vh - 400px)',
+      },
+      beforeFetch: async (params) => {
+        let rangerQuery = await setRangeQuery();
+        return Object.assign(params, rangerQuery);
+      },
+    },
+    exportConfig: {
+      name: '发货通知单明细',
+      url: '/saleCode/saleDelivery/exportXlsDetail',
+      params: queryParam,
+    }
+  });
+
+
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
 
   /**

src/views/saleCode/quotation/components/quotationFormForm.vue

@@ -267,24 +267,7 @@
                 <a-input v-model:value="formData.quotationNotes" placeholder="请输入报价备注(quotation notes)" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
-            <a-col :span="12">
-              <a-form-item
-                label="协议条款(agreement terms)"
-                v-bind="validateInfos.agreementTerms"
-                id="SaleOrderForm-agreementTerms"
-                name="agreementTerms"
-                :labelCol="formItemLayout.labelCol1"
-                :wrapperCol="formItemLayout.wrapperCol1"
-              >
-                <JSelectMultiple
-                  v-model:value="formData.agreementTerms"
-                  placeholder=""
-                  dictCode="base_agreement_terms,name,name"
-                  page="false"
-                  showSearch
-                />
-              </a-form-item>
-            </a-col>
+            
             <a-col :span="12">
               <a-form-item
                 label="供应商技术资料(supplier quotation attachs)"
@@ -304,6 +287,28 @@
               </a-form-item>
             </a-col>
           </a-row>
+		   <a-row :gutter="24">
+		  <a-col :lg="12" :span="24" :col="14">
+		    <a-form-item
+		      label="表尾备注"
+		      v-bind="validateInfos.agreementTerms"
+		      id="SaleOrderForm-agreementTerms"
+		      name="agreementTerms"
+		      :labelCol="formItemLayout.labelCol1"
+		      :wrapperCol="formItemLayout.wrapperCol1"
+		    >
+			<a-textarea v-model:value="formData.agreementTerms" placeholder="" allow-clear AutoComplete="off" />
+			
+		      <!-- <JSelectMultiple
+		        v-model:value="formData.agreementTerms"
+		        placeholder=""
+		        dictCode="base_agreement_terms,name,name"
+		        page="false"
+		        showSearch
+		      /> -->
+		    </a-form-item>
+		  </a-col>
+		  </a-row>
         </a-form>
       </template>
     </JFormContainer>

src/views/saleCode/quotation/quotation.vue

@@ -21,7 +21,7 @@
                   resultField="records"
                   labelField="code"
                   valueField="id"
-                  :params="{ pageSize: -1,status:1 }"
+                  :params="{ pageSize: -1 }"
                   optionFilterProp="label"
                 />
               </a-form-item>
@@ -37,7 +37,7 @@
             <a-col :lg="16">
               <a-form-item name="quotationCustomer" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="报价客户(quotation customer)">报价客户(quotation customer)</span></template>
-                <JSelect   v-model:value="queryParam.quotationCustomer" :get-option-url="CustomerOption" :showField="showField" :param="{status:1}"></JSelect>
+                <JSelect   v-model:value="queryParam.quotationCustomer" :get-option-url="CustomerOption" :showField="showField" :param="{status:null}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -50,7 +50,7 @@
             <a-col :lg="16">
               <a-form-item name="quotationCustomer" :label-col="{ style: 'width: 200px' }">
                 <template #label><span title="客户简称(abbreviation)">客户简称(abbreviation)</span></template>
-                <JSelect   v-model:value="queryParam.quotationCustomer" :get-option-url="CustomerOption" :showField="showField2" :param="{status:1}"></JSelect>
+                <JSelect   v-model:value="queryParam.quotationCustomer" :get-option-url="CustomerOption" :showField="showField2" :param="{status:null}"></JSelect>
               </a-form-item>
             </a-col>
             <a-col :lg="8">
@@ -143,6 +143,9 @@
         <a-button type="primary" v-auth="'saleCode:sale_quotation:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
         <a-button type="primary" v-auth="'saleCode:sale_quotation:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">
           导出(export)</a-button
+        >   
+		 <a-button type="primary" v-auth="'saleCode:sale_quotation:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls2">
+          导出明细(export)</a-button
         >
         <a-button type="primary" @click="submit"> 提交(submit)</a-button>
         <a-button type="primary" @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
@@ -242,6 +245,35 @@
     },
   });
 
+  
+  //注册table数据
+  const { onExportXls: onExportXls2 } = useListPage({
+    tableProps: {
+      title: '销售报价单明细',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 300,
+        fixed: 'right',
+      },
+      scroll: {
+        x: '4000px',
+        y:'calc(100vh - 400px)',
+      },
+      beforeFetch: async (params) => {
+        let rangerQuery = await setRangeQuery();
+        return Object.assign(params, rangerQuery);
+      },
+    },
+    exportConfig: {
+      name: '销售报价单明细',
+      url: '/saleCode/saleQuotation/exportXlsDetail',
+      params: queryParam,
+    }
+  });
+
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
 
   // 高级查询配置

src/views/saleCode/salesOrder/SaleOrderFormList.vue

@@ -201,6 +201,9 @@
         <a-button type="primary" v-auth="'saleCode:sale_order:add'" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增(add)</a-button>
         <a-button type="primary" v-auth="'saleCode:sale_order:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls">
           导出(export)</a-button
+        >
+		<a-button type="primary" v-auth="'saleCode:sale_order:exportXls'" preIcon="ant-design:export-outlined" @click="onExportXls2">
+          导出明细(export)</a-button
         >
         <a-button type="primary" @click="submit"> 提交(submit)</a-button>
         <a-button type="primary" @click="cancelSubmit"> 取消提交(cancelSubmit)</a-button>
@@ -325,6 +328,35 @@
       success: handleSuccess,
     },
   });
+  
+  
+  //注册table数据
+  const { onExportXls: onExportXls2 } = useListPage({
+    tableProps: {
+      title: '销售订单明细',
+      api: list,
+      columns,
+      canResize: false,
+      useSearchForm: false,
+      actionColumn: {
+        width: 300,
+        fixed: 'right',
+      },
+      scroll: {
+        x: '4000px',
+        y:'calc(100vh - 400px)',
+      },
+      beforeFetch: async (params) => {
+        let rangerQuery = await setRangeQuery();
+        return Object.assign(params, rangerQuery);
+      },
+    },
+    exportConfig: {
+      name: '销售订单明细',
+      url: '/saleCode/saleOrder/exportXlsDetail',
+      params: queryParam,
+    }
+  });
 
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;