Merge remote-tracking branch 'origin/master'

src/option/business/contract-manage.js

@@ -269,7 +269,7 @@ export const option = createCrudOption([
     searchType: 'select',
     searchPlaceholder: '请选择',
     formslot: true,
-    order: 140,
+    order: 165,
     dicUrl:
       '/blade-transport/project-apply/list?current=1&size=9999&approvalStatuses=approved,change_approved',
     dicFormatter: listDicFormatter,
@@ -347,14 +347,9 @@ export const option = createCrudOption([
     label: '甲方',
     prop: 'partyA',
     type: 'select',
+    formslot: true,
+    disabled: true,
     order: 160,
-    dicUrl:
-      '/blade-transport/customer-archive/list?current=1&size=9999&customerType=客户&approvalStatus=approved&status=1',
-    dicFormatter: listDicFormatter,
-    props: {
-      label: 'fullName',
-      value: 'fullName',
-    },
     filterable: true,
     minWidth: 160,
     rules: selectRule('甲方'),
@@ -363,14 +358,9 @@ export const option = createCrudOption([
     label: '乙方',
     prop: 'partyB',
     type: 'select',
+    formslot: true,
+    disabled: true,
     order: 150,
-    dicUrl:
-      '/blade-transport/customer-archive/list?current=1&size=9999&customerType=承运商&approvalStatus=approved&status=1',
-    dicFormatter: listDicFormatter,
-    props: {
-      label: 'fullName',
-      value: 'fullName',
-    },
     filterable: true,
     minWidth: 160,
     rules: selectRule('乙方'),

src/option/business/shipping-template.js

@@ -40,6 +40,9 @@ export const config = {
   projectQueryParams: {
     approvalStatuses: 'approved,change_approved',
   },
+  contractQueryParams: {
+    contractCategory: '客户合同',
+  },
   excludeVoidedProjects: true,
   enableAttachmentTable: true,
   detailAttachmentDescriptionPlain: true,

src/option/business/transport-plan.js

@@ -167,6 +167,9 @@ export const config = {
   projectQueryParams: {
     approvalStatuses: 'approved,change_approved',
   },
+  contractQueryParams: {
+    contractCategory: '客户合同',
+  },
   templateCreateTarget: 'transport-plan',
   enableAttachmentTable: true,
   enableTransportPlanForm: true,

src/option/business/waybill-manage.js

@@ -329,6 +329,9 @@ export const config = {
   projectQueryParams: {
     approvalStatuses: 'approved,change_approved',
   },
+  contractQueryParams: {
+    contractCategory: '客户合同',
+  },
   templateCreateTarget: 'waybill-manage',
   enableContractSelect: true,
   enableShippingPlanSelect: true,