Merge pull request 'fix : 修复列表左侧选择框,及正确json格式' (#355) from dj into master

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/355

src/views/expense-management/ledger/index.vue

@@ -34,7 +34,8 @@ const searchConfig = reactive([
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
     },
     colProps: {}
-  }, {
+  },
+  {
     label: '项目费用',
     prop: 'projectCost',
     component: shallowRef(fvSelect),
@@ -44,7 +45,8 @@ const searchConfig = reactive([
       filterable: true,
       cacheKey: 'project_cost',
     }
-  }, {
+  },
+  {
     label: '项目阶段',
     prop: 'researchStage',
     component: shallowRef(fvSelect),

src/views/expense-management/share/index.vue

@@ -53,7 +53,8 @@ const searchConfig = reactive([
       filterable: true,
       checkStrictly: true
     }
-  }, {
+  },
+  {
     label: '分摊月份',
     prop: 'apportionmentMonth',
     component: 'el-date-picker',

src/views/project-demand/requirement/index.vue

@@ -61,10 +61,10 @@ const auths = {
 }
 const tableConfig = reactive({
   columns: [
-    {
+    // {
-      type: 'selection',
+    //   type: 'selection',
-      prop: 'selection'
+    //   prop: 'selection'
-    },
+    // },
     {
       prop: 'requirementName',
       label: '征集名称',

src/views/project-demand/summary/index.vue

@@ -78,10 +78,10 @@ const auths = {
 }
 const tableConfig = reactive({
   columns: [
-    {
+    // {
-      type: 'selection',
+    //   type: 'selection',
-      prop: 'selection'
+    //   prop: 'selection'
-    },
+    // },
     {
       prop: 'requirementName',
       label: '征集名称',

src/views/project-management/implementation/index.vue

@@ -136,10 +136,10 @@ const searchConfig = reactive([
 const tableIns = ref()
 const tableConfig = reactive({
   columns: [
-    {
+    // {
-      type: 'selection',
+    //   type: 'selection',
-      prop: 'selection'
+    //   prop: 'selection'
-    },
+    // },
     {
       prop: 'projectName',
       label: '项目名称',

src/views/special-fund/index.vue

@@ -42,7 +42,8 @@ const searchConfig = reactive([
       clearable: true,
       placeholder: '请输入资金金额查询'
     }
-  }, {
+  },
+  {
     label: '剩余金额(元)',
     prop: 'residualAmount',
     component: 'el-input',
@@ -50,7 +51,8 @@ const searchConfig = reactive([
       clearable: true,
       placeholder: '请输入剩余金额查询'
     }
-  }, {
+  },
+  {
     label: '项目数量',
     prop: 'projectNumber',
     component: 'el-input',

src/views/workflow/process/ProcessEdit.vue

@@ -157,22 +157,26 @@ const loadInitFrom = () => {
         type: "END",
       }
     ],
-    processFromPerms: [{
+    processFromPerms: [
+      {
         id: "projectName",
         title: "项目名称",
         required: true,
         perm: "R"
-    }, {
+      },
+      {
         id: "projectType",
         title: "项目类型",
         required: true,
         perm: "R"
-    }, {
+      },
+      {
         id: "projectDesc",
         title: "项目描述",
         required: true,
         perm: "R"
-    }, {
+      },
+      {
         id: "projectManager",
         title: "项目经理",
         required: true,

src/views/workflow/process/ProcessTree.vue

@@ -402,7 +402,8 @@ const insertConditionsNode = (node) => {
         props: deepCopy(DefaultProps.CONDITION_PROPS),
         name: "条件1",
         children: {}
-      }, {
+      },
+      {
         id: getRandomId(),
         parentId: node.id,
         type: "CONDITION",
@@ -437,7 +438,8 @@ const insertConcurrentsNode = (node) => {
         props: deepCopy(DefaultProps.CONDITION_PROPS),
         name: "分支1",
         children: {}
-      }, {
+      },
+      {
         id: getRandomId(),
         parentId: node.id,
         type: "CONCURRENT",