Browse Source

单据-列表增加来源字段和筛选条件

jingbb 3 months ago
parent
commit
5c41ebc35a
26 changed files with 181 additions and 5 deletions
  1. 5 0
      src/views/inventiry/purchaseIn/puechaseInForm.data.ts
  2. 6 0
      src/views/inventiry/purchaseIn/purchaseInList.vue
  3. 5 0
      src/views/inventiry/salesOutbound/salesOutboundForm.data.ts
  4. 6 0
      src/views/inventiry/salesOutbound/salesOutboundList.vue
  5. 5 0
      src/views/purchase/arrivedGoods/ArriveGoodsForm.data.ts
  6. 6 0
      src/views/purchase/arrivedGoods/ArriveGoodsList.vue
  7. 6 0
      src/views/purchase/commissionPayRequest/commissionPayRequestList.data.ts
  8. 6 0
      src/views/purchase/commissionPayRequest/commissionPayRequestList.vue
  9. 6 0
      src/views/purchase/purPaymentRequest/purPaymentRequest.data.ts
  10. 6 0
      src/views/purchase/purPaymentRequest/purPaymentRequesttList.vue
  11. 5 0
      src/views/purchase/purchaseInquiryForm/PurchaseInquiryForm.data.ts
  12. 6 0
      src/views/purchase/purchaseInquiryForm/purchaseInquiryFormList.vue
  13. 10 0
      src/views/purchase/purchaseOrder/PurchaseOrderForm.data.ts
  14. 12 0
      src/views/purchase/purchaseOrder/PurchaseOrderFormList.vue
  15. 5 0
      src/views/purchase/purchaseQuotationFrm/PurchaseQuotationForm.data.ts
  16. 6 0
      src/views/purchase/purchaseQuotationFrm/purchaseQuotationFormList.vue
  17. 5 0
      src/views/saleCode/deliveryNotice/delivertNoticeForm.data.ts
  18. 6 0
      src/views/saleCode/deliveryNotice/deliveryNoticeList.vue
  19. 7 1
      src/views/saleCode/quotation/quotation.vue
  20. 5 0
      src/views/saleCode/quotation/quotationForm.data.ts
  21. 14 2
      src/views/saleCode/saleContract/SaleContract.data.ts
  22. 7 0
      src/views/saleCode/salesInvoice/salesInvoiceForm.data.ts
  23. 6 0
      src/views/saleCode/salesInvoice/salesInvoiceList.vue
  24. 10 0
      src/views/saleCode/salesOrder/SaleOrderForm.data.ts
  25. 18 0
      src/views/saleCode/salesOrder/SaleOrderFormList.vue
  26. 2 2
      src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

+ 5 - 0
src/views/inventiry/purchaseIn/puechaseInForm.data.ts

@@ -51,6 +51,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'warehouse'
    },
+   {
+    title: '来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode'
+   },
    {
     title: '货位(goods allocation)',
     align:"center",

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

@@ -66,6 +66,12 @@
                 <JDictSelectTag v-model:value="queryParam.maker" placeholder="请选择" dictCode="factory" />
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode">
+                <template #label><span title="来源(sourceCode)">来源(sourceCode)</span></template>
+                <JInput placeholder="请输入来源(sourceCode)" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="warehouse">
                 <template #label><span title="仓库(warehouse)">仓库(warehouse)</span></template>

+ 5 - 0
src/views/inventiry/salesOutbound/salesOutboundForm.data.ts

@@ -46,6 +46,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'maker'
    },
+   {
+    title: '来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode'
+   },
    {
     title: '仓库(warehouse)',
     align:"center",

+ 6 - 0
src/views/inventiry/salesOutbound/salesOutboundList.vue

@@ -73,6 +73,12 @@
                 <JInput placeholder="请输入产品编码(product code)" v-model:value="queryParam.productCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode">
+                <template #label><span title="来源(sourceCode)">来源(sourceCode)</span></template>
+                <JInput placeholder="来源(sourceCode)" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="warehouse">
                 <template #label><span title="仓库(warehouse)">仓库(warehouse)</span></template>

+ 5 - 0
src/views/purchase/arrivedGoods/ArriveGoodsForm.data.ts

@@ -61,6 +61,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'purchasemanName'
    },
+   {
+    title: '来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode'
+   },
    {
       title: '提交(submit)',
       align:"center",

+ 6 - 0
src/views/purchase/arrivedGoods/ArriveGoodsList.vue

@@ -96,6 +96,12 @@
                 <JInput placeholder="请输入采购员(purchaseman)" v-model:value="queryParam.purchaseman" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode">
+                <template #label><span title="来源(sourceCode)">来源(sourceCode)</span></template>
+                <JInput placeholder="请输入来源(sourceCode)" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="submit">
                 <template #label><span title="提交(submit)">提交(submit)</span></template>

+ 6 - 0
src/views/purchase/commissionPayRequest/commissionPayRequestList.data.ts

@@ -48,6 +48,12 @@ export const columns: BasicColumn[] = [
     ellipsis:true,
     dataIndex: 'currency'
    },
+   {
+    title: '来源(sourceCode)',
+    align:"center",
+    ellipsis:true,
+    dataIndex: 'sourceCode'
+   },
    {
     title: '提交(submit)',
     align:"center",

+ 6 - 0
src/views/purchase/commissionPayRequest/commissionPayRequestList.vue

@@ -39,6 +39,12 @@
                 />
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode">
+                <template #label><span title="来源(sourceCode)">来源(sourceCode)</span></template>
+                <JInput placeholder="请输入来源(sourceCode)" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="submit">
                 <template #label><span title="提交(submit)">提交(submit)</span></template>

+ 6 - 0
src/views/purchase/purPaymentRequest/purPaymentRequest.data.ts

@@ -42,6 +42,12 @@ export const columns: BasicColumn[] = [
     ellipsis:true,
     dataIndex: 'currency'
    },
+   {
+    title: '来源(sourceCode)',
+    align:"center",
+    ellipsis:true,
+    dataIndex: 'sourceCode'
+   },
    {
     title: '提交(submit)',
     align:"center",

+ 6 - 0
src/views/purchase/purPaymentRequest/purPaymentRequesttList.vue

@@ -29,6 +29,12 @@
                 <JSelect   v-model:value="queryParam.supplier" :get-option-url="supplierOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode">
+                <template #label><span title="来源(sourceCode)">来源(sourceCode)</span></template>
+                <JInput placeholder="请输入来源(sourceCode)" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="approve">
                 <template #label><span title="审批(approve)">审批(approve)</span></template>

+ 5 - 0
src/views/purchase/purchaseInquiryForm/PurchaseInquiryForm.data.ts

@@ -64,6 +64,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'maker'
    },
+   {
+    title: '来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode'
+   },
    {
     title: '状态(status)',
     align:"center",

+ 6 - 0
src/views/purchase/purchaseInquiryForm/purchaseInquiryFormList.vue

@@ -101,6 +101,12 @@
                 <JDictSelectTag v-model:value="queryParam.maker" placeholder="请选择" dictCode="factory" />
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+            <a-form-item name="sourceCode">
+              <template #label><span title="来源(sourceCode)">来源(sourceCode)</span></template>
+              <JInput placeholder="请输入来源(sourceCode)" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+            </a-form-item>
+          </a-col>
             <a-col :lg="8">
               <a-form-item name="status">
                 <template #label><span title="状态(status)">状态(status)</span></template>

+ 10 - 0
src/views/purchase/purchaseOrder/PurchaseOrderForm.data.ts

@@ -51,6 +51,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'maker'
    },
+   {
+    title: '销售订单来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode2'
+   },
+   {
+    title: '报价选定来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode'
+   },
    {
     title: '采购部门(purchase department)',
     align:"center",

+ 12 - 0
src/views/purchase/purchaseOrder/PurchaseOrderFormList.vue

@@ -76,6 +76,18 @@
                 <JInput placeholder="请输入" v-model:value="queryParam.productCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode2" >
+                <template #label><span title="销售订单来源(sourceCode)">销售订单来源(sourceCode)</span></template>
+                <JInput placeholder="请输入销售订单来源(sourceCode)" v-model:value="queryParam.sourceCode2" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode" >
+                <template #label><span title="报价选定来源(sourceCode)">报价选定来源(sourceCode)</span></template>
+                <JInput placeholder="请输入报价选定来源(sourceCode)" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="purchaseman">
                 <template #label><span title="采购员(purchaseman)">采购员(purchaseman)</span></template>

+ 5 - 0
src/views/purchase/purchaseQuotationFrm/PurchaseQuotationForm.data.ts

@@ -57,6 +57,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'maker'
    },
+   {
+    title: '来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode'
+   },
    {
     title: '状态(status)',
     align:"center",

+ 6 - 0
src/views/purchase/purchaseQuotationFrm/purchaseQuotationFormList.vue

@@ -80,6 +80,12 @@
                 <JInput placeholder="请输入" v-model:value="queryParam.productionCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode">
+                <template #label><span title="来源(sourceCode)">来源(sourceCode)</span></template>
+                <JInput placeholder="请输入" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="status">
                 <template #label><span title="状态(status)">状态(status)</span></template>

+ 5 - 0
src/views/saleCode/deliveryNotice/delivertNoticeForm.data.ts

@@ -63,6 +63,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'salesman'
    },
+   {
+    title: '来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode'
+   },
    {
     title: '清关资料(customs clearance documents)',
     align:"center",

+ 6 - 0
src/views/saleCode/deliveryNotice/deliveryNoticeList.vue

@@ -85,6 +85,12 @@
                 <JInput placeholder="请输入业务员(salesman)" v-model:value="queryParam.salesman" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode">
+                <template #label><span title="来源(sourceCode)">来源(sourceCode)</span></template>
+                <JInput placeholder="请输入来源(sourceCode)" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="submit">
                 <template #label><span title="提交(submit)">提交(submit)</span></template>

+ 7 - 1
src/views/saleCode/quotation/quotation.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :lg="8">
             <a-form-item name="billCode" :label-col="{ style: 'width: 200px' }">
-              <template #label><span title="价单号(bill code)">报价单号(bill code)</span></template>
+              <template #label><span title="价单号(bill code)">报价单号(bill code)</span></template>
               <JInput placeholder="请输入询价单号(bill code)" v-model:value="queryParam.billCode" allow-clear AutoComplete="off" />
             </a-form-item>
           </a-col>
@@ -82,6 +82,12 @@
                 <JInput placeholder="请输入产品编码(product code)" v-model:value="queryParam.productCode" allow-clear AutoComplete="off" />
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode" :label-col="{ style: 'width: 200px' }">
+                <template #label><span title="来源(sourceCode)">来源(sourceCode)</span></template>
+                <JInput placeholder="请输入来源(sourceCode)" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="model">
                 <template #label><span title="型号(model">型号(model)</span></template>

+ 5 - 0
src/views/saleCode/quotation/quotationForm.data.ts

@@ -71,6 +71,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'maker'
    },
+   {
+    title: '来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode'
+   },
    {
     title: '状态(status)',
     align:"center",

+ 14 - 2
src/views/saleCode/saleContract/SaleContract.data.ts

@@ -66,6 +66,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'saleDepartmentName',
   },
+  {
+    title: '来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode'
+   },
   {
     title: '关闭(close)',
     align: 'center',
@@ -107,7 +112,7 @@ export const searchFormSchema: FormSchema[] = [
   {
     label: '项目(Project)',
     field: 'quotationProject',
-    labelWidth: 150,
+    labelWidth: 180,
     component: 'ApiSelect',
     componentProps: {
       // mode: 'multiple',//multiple: 多选;不填写为单选
@@ -200,10 +205,17 @@ export const searchFormSchema: FormSchema[] = [
     },
     //colProps: {span: 6},
   },
+  {
+    label: '来源(sourceCode)',
+    field: 'sourceCode',
+    labelWidth: 180,
+    component: 'JInput',
+    //colProps: {span: 6},
+  },
   {
     label: '提交(submit)',
     field: 'status',
-    labelWidth: 150,
+    labelWidth: 180,
     component: 'JDictSelectTag',
     componentProps: {
       dictCode: 'yes_or_no',

+ 7 - 0
src/views/saleCode/salesInvoice/salesInvoiceForm.data.ts

@@ -46,6 +46,13 @@ export const columns: BasicColumn[] = [
     width:250,
     ellipsis:true,
    },
+   {
+    title: '来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode',
+    width:200,
+    ellipsis:true,
+   },
    {
     title: '销售订单(sale order)',
     align:"center",

+ 6 - 0
src/views/saleCode/salesInvoice/salesInvoiceList.vue

@@ -40,6 +40,12 @@
                 <JSelect   v-model:value="queryParam.customer" :get-option-url="CustomerOption" :showField="showField"></JSelect>
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode" >
+                <template #label><span title="来源(sourceCode)">来源(sourceCode)</span></template>
+                <JInput placeholder="请输入" v-model:value="queryParam.sourceCode" allow-clear AutoComplete="off" />
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="orderNumber" >
                 <template #label><span title="客户订单号(customer order number)">客户订单号(customer order number)</span></template>

+ 10 - 0
src/views/saleCode/salesOrder/SaleOrderForm.data.ts

@@ -73,6 +73,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'salesman',
    },
+   {
+    title: '合同来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode2',
+   },
+   {
+    title: '报价单来源(sourceCode)',
+    align:"center",
+    dataIndex: 'sourceCode',
+   },
    {
     title: '提交(submit)',
     align:"center",

+ 18 - 0
src/views/saleCode/salesOrder/SaleOrderFormList.vue

@@ -85,6 +85,24 @@
                 <JInput placeholder="请输入船IMO(imo)" v-model:value="queryParam.imo" allow-clear ></JInput>
               </a-form-item>
             </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode2" >
+                <template #label><span title="合同来源(sourceCode)">合同来源(sourceCode)</span></template>
+                <JInput placeholder="请输入合同来源(sourceCode)" v-model:value="queryParam.sourceCode2" allow-clear ></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="sourceCode" >
+                <template #label><span title="报价单来源(sourceCode)">报价单来源(sourceCode)</span></template>
+                <JInput placeholder="请输入报价单来源(sourceCode)" v-model:value="queryParam.sourceCode" allow-clear ></JInput>
+              </a-form-item>
+            </a-col>
+            <a-col :lg="8">
+              <a-form-item name="imo" >
+                <template #label><span title="船IMO(imo)">船IMO(imo)</span></template>
+                <JInput placeholder="请输入船IMO(imo)" v-model:value="queryParam.imo" allow-clear ></JInput>
+              </a-form-item>
+            </a-col>
             <a-col :lg="8">
               <a-form-item name="saleDepartment">
                 <template #label><span title="销售部门(sale saleDepartment)">销售部门(sale department)</span></template>

+ 2 - 2
src/views/saleCode/salesOrder/components/SlaeOrderFormForm.vue

@@ -339,8 +339,8 @@
     <a-tabs v-model:activeKey="activeKey" animated style="padding: 24px; padding-top: 0px">
       <a-tab-pane tab="销售订单 - 产品明细(product details)" key="SaleOrderFormShipFormProduct" :forceRender="true">
         <a-button type="primary" style="margin-right: 1%; margin-bottom: 1%" @click="selectProductList"> 选择产品(select product)</a-button>
-        <a-button type="primary" style="margin-right: 1%; margin-bottom: 1%" @click="selectContractList"> 选择合同(select contract)</a-button>
-        <a-button type="primary" style="margin-right: 1%; margin-bottom: 1%" @click="selectQuotationList"> 选择报价单(select quotation)</a-button>
+        <a-button type="primary" style="margin-right: 1%; margin-bottom: 1%" @click="selectContractList" :disabled="formData.sourceCode !== ''"> 选择合同(select contract)</a-button>
+        <a-button type="primary" style="margin-right: 1%; margin-bottom: 1%" @click="selectQuotationList" :disabled="formData.sourceCode2 !== ''"> 选择报价单(select quotation)</a-button>
         <j-vxe-table
           :keep-source="true"
           resizable