Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/process-config.vue

src/option/business/contract-manage.js

@@ -386,6 +386,7 @@ export const option = createCrudOption([
   {
     label: '合同格式',
     prop: 'contractFormat',
+    labelWidth: '72px',
     type: 'select',
     dicData: [
       { label: '电子合同', value: '电子合同' },
@@ -399,6 +400,7 @@ export const option = createCrudOption([
   {
     label: '是否需要加盖法人章',
     prop: 'legalSealFlag',
+    labelWidth: '72px',
     type: 'select',
     dicData: [
       { label: '否', value: 0 },
@@ -413,6 +415,7 @@ export const option = createCrudOption([
   {
     label: '一式',
     prop: 'copyCount',
+    labelWidth: '72px',
     formslot: true,
     hide: true,
     order: 60,

src/option/business/process-config.js

@@ -177,6 +177,10 @@ export const option = {
   ]),
   saveBtn: false,
   updateBtn: false,
+  addBtn: false,
+  viewBtn: false,
+  editBtn: false,
+  delBtn: false,
   dialogTop: '10px',
   dialogWidth: '96%',
   menuWidth: 220,

src/option/business/temporary-credit-limit.js

@@ -113,7 +113,7 @@ export const option = {
         value: 'projectName',
       },
       filterable: true,
-      span: 12,
+      span: 8,
       minWidth: 180,
       rules: textRule('项目名称', 100, true),
     },
@@ -128,7 +128,7 @@ export const option = {
       prop: 'projectCode',
       hide: true,
       disabled: true,
-      span: 12,
+      span: 8,
       minWidth: 150,
       rules: textRule('项目编号', 50),
     },
@@ -137,7 +137,7 @@ export const option = {
       prop: 'undertakeDeptName',
       hide: true,
       disabled: true,
-      span: 12,
+      span: 8,
       minWidth: 150,
       rules: textRule('承办部门', 50, true),
     },
@@ -146,7 +146,7 @@ export const option = {
       prop: 'projectFundLimit',
       hide: true,
       disabled: true,
-      span: 12,
+      span: 8,
       minWidth: 200,
       rules: [nonNegativeRule('项目资金使用额度')],
     },
@@ -155,7 +155,7 @@ export const option = {
       prop: 'usedFundLimit',
       hide: true,
       disabled: true,
-      span: 12,
+      span: 8,
       minWidth: 220,
       value: 0,
       rules: [nonNegativeRule('已使用项目资金额度')],
@@ -165,7 +165,7 @@ export const option = {
       prop: 'remainingFundLimit',
       hide: true,
       disabled: true,
-      span: 12,
+      span: 8,
       minWidth: 230,
       value: 0,
       rules: [nonNegativeRule('剩余项目资金使用额度')],
@@ -174,7 +174,7 @@ export const option = {
       label: '申请临时额度（万元）',
       prop: 'applyLimit',
       formslot: true,
-      span: 12,
+      span: 8,
       minWidth: 180,
       rules: [
         { required: true, message: '请输入申请临时额度', trigger: 'blur' },
@@ -187,7 +187,7 @@ export const option = {
       type: 'date',
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
-      span: 12,
+      span: 8,
       minWidth: 140,
       rules: [{ required: true, message: '请选择申请有效期至', trigger: 'change' }],
     },

src/option/transportCapacity/transport-ship.js

@@ -5,7 +5,7 @@ export const option = {
   searchShow: true,
   searchMenuSpan: 24,
   searchIcon: true,
-  searchIndex: 6,
+  searchIndex: 4,
   searchMenuPosition: 'right',
   border: true,
   index: true,

src/option/transportCapacity/transport-vehicle.js

@@ -5,7 +5,7 @@ export const option = {
   searchShow: true,
   searchMenuSpan: 24,
   searchIcon: true,
-  searchIndex: 6,
+  searchIndex: 4,
   searchMenuPosition: 'right',
   border: true,
   index: true,