Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/views/workManagement/main-items/configuration/detailsPage.json

@@ -15,242 +15,123 @@
   "menuWidth": 220,
   "column": [
     {
-      "label": "行号",
-      "prop": "prop1",
+      "label": "服务项目",
+      "prop": "cname",
       "index": 1,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入行号",
-          "trigger": "blur"
-        }
-      ]
+      "width": 100
     },
     {
-      "label": "服务项目",
-      "prop": "prop2",
+      "label": "收费建议",
+      "prop": "remarks",
       "index": 2,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入服务项目",
-          "trigger": "blur"
-        }
-      ]
+      "width": 100
     },
     {
-      "label": "收费建议",
-      "prop": "prop3",
+      "label": "单价",
+      "prop": "quantity",
       "index": 3,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入收费建议",
-          "trigger": "blur"
-        }
-      ]
+      "width": 100
     },
     {
       "label": "计价单位",
-      "prop": "prop4",
+      "prop": "unit",
       "index": 4,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入计价单位",
-          "trigger": "blur"
-        }
-      ]
+      "width": 100
     },
     {
       "label": "数量",
-      "prop": "prop5",
+      "prop": "quantity",
       "index": 5,
       "width": 100,
       "cell": true,
       "rules": [
         {
-          "required": true,
-          "message": "请输入数量",
+          "pattern": "/^(([1-9][0-9]*)|(([0]\\.\\d{1,2}|[1-9][0-9]*\\.\\d{1,2})))$/",
+          "message":"请输入数字或小数，且小数位不超过两位",
           "trigger": "blur"
         }
       ]
     },
     {
-      "label": "报价",
-      "prop": "prop6",
+      "label": "合计金额",
+      "prop": "amount",
       "index": 6,
       "width": 100,
-      "cell": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入报价",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "合计金额",
-      "prop": "prop7",
-      "index": 7,
-      "width": 100,
-      "cell": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入合计金额",
-          "trigger": "blur"
-        }
-      ]
+      "cell": true
     },
     {
       "label": "频率",
-      "prop": "prop8",
-      "index": 8,
+      "prop": "frequency",
+      "index": 7,
       "width": 100,
-      "cell": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入频率",
-          "trigger": "blur"
-        }
-      ]
+      "cell": true
     },
     {
       "label": "提醒日",
-      "prop": "prop9",
+      "prop": "reminderDay",
+      "type": "datetime",
       "index": 9,
       "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入提醒日",
-          "trigger": "blur"
-        }
-      ]
+      "cell": true
     },
     {
       "label": "备注",
-      "prop": "prop10",
+      "prop": "feeRemarks",
       "index": 10,
       "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入备注",
-          "trigger": "blur"
-        }
-      ]
+      "cell": true
     },
     {
       "label": "任务部门",
-      "prop": "prop11",
+      "prop": "deptId",
       "index": 11,
       "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入任务部门",
-          "trigger": "blur"
-        }
-      ]
+      "cell": true
     },
     {
       "label": "承做人",
-      "prop": "prop12",
+      "prop": "userId",
       "index": 12,
       "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入承做人",
-          "trigger": "blur"
-        }
-      ]
+      "cell": true
     },
     {
       "label": "需求开始日期",
-      "prop": "prop13",
+      "prop": "beginTime",
       "index": 13,
       "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入需求开始日期",
-          "trigger": "blur"
-        }
-      ]
+      "cell": true
     },
     {
       "label": "需求完成日期",
-      "prop": "prop14",
+      "prop": "endTime",
       "index": 14,
       "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入需求完成日期",
-          "trigger": "blur"
-        }
-      ]
+      "cell": true
     },
     {
-      "label": "录入人",
-      "prop": "prop15",
+      "label": "制单人",
+      "prop": "createUser",
       "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入录入人",
-          "trigger": "blur"
-        }
-      ]
+      "width": 80
     },
     {
-      "label": "录入时间",
-      "prop": "prop16",
+      "label": "制单日期",
+      "prop": "createUser",
       "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入录入时间",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
       "label": "最新修改人",
-      "prop": "prop17",
+      "prop": "updateUser",
       "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入最新修改人",
-          "trigger": "blur"
-        }
-      ]
+      "width": 80
     },
     {
       "label": "最新修改时间",
-      "prop": "prop17",
+      "prop": "updateTime",
       "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入最新修改时间",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     }
   ]
 }

src/views/workManagement/main-items/configuration/mainList.json

@@ -0,0 +1,108 @@
+{
+  "addBtn": false,
+  "headerAlign": "center",
+  "align": "center",
+  "border": true,
+  "index": true,
+  "lazy": true,
+  "tip": false,
+  "searchShow": true,
+  "searchMenuSpan": 6,
+  "tree": true,
+  "selection": true,
+  "editBtn": true,
+  "viewBtn": false,
+  "delBtn": true,
+  "menuWidth": 220,
+  "column": [
+    {
+      "label": "系统编号",
+      "prop": "sysNo",
+      "index": 1,
+      "width": 100
+    },
+    {
+      "label": "项目编码",
+      "prop": "code",
+      "search": true,
+      "index": 2,
+      "width": 100
+    },
+    {
+      "label": "项目名称",
+      "prop": "cname",
+      "search": true,
+      "index": 3,
+      "width": 100
+    },
+    {
+      "label": "客户名称",
+      "prop": "corpId",
+      "search": true,
+      "index": 4,
+      "width": 100
+    },
+    {
+      "label": "应收金额",
+      "prop": "debitAmount",
+      "index": 5,
+      "width": 100
+    },
+    {
+      "label": "实收金额",
+      "prop": "settlmentAmount",
+      "index": 6,
+      "width": 100
+    },
+    {
+      "label": "责任人",
+      "prop": "corpAttn",
+      "search": true,
+      "index": 7,
+      "width": 100
+    },
+    {
+      "label": "电话",
+      "prop": "corpTel",
+      "index": 8,
+      "width": 100
+    },
+    {
+      "label": "状态",
+      "prop": "status",
+      "index": 9,
+      "width": 100
+    },
+    {
+      "label": "备注",
+      "prop": "remark",
+      "search": true,
+      "index": 10,
+      "width": 100
+    },
+    {
+      "label": "制单人",
+      "prop": "createUser",
+      "index": 11,
+      "width": 100
+    },
+    {
+      "label": "制单日期",
+      "prop": "createTime",
+      "index": 12,
+      "width": 100
+    },
+    {
+      "label": "最新修改人",
+      "prop": "updateUser",
+      "index": 13,
+      "width": 100
+    },
+    {
+      "label": "最新修改时间",
+      "prop": "updateTime",
+      "index": 14,
+      "width": 100
+    }
+  ]
+}

src/views/workManagement/main-items/detailsPage.vue

@@ -197,63 +197,51 @@
           column: [
             {
               label: '系统编号',
-              prop: 'prop1',
+              prop: 'sysNo',
               rules: [
                 {
                   required: true,
-                  message: ' ',
+                  message: '请输入系统编号',
                   trigger: 'blur'
                 }
               ]
             }, {
-              label: '项目代码',
-              prop: 'prop3',
-              data: [],
+              label: '项目编码',
+              prop: 'code',
               rules: [
                 {
                   required: true,
-                  message: ' ',
+                  message: '请输入项目编码',
                   trigger: 'blur'
                 }
               ]
             }, {
               label: '项目名称',
-              prop: 'prop4',
+              prop: 'cname',
               rules: [
                 {
                   required: true,
-                  message: ' ',
+                  message: '请输入项目名称',
                   trigger: 'blur'
                 }
               ]
             }, {
               label: '客户名称',
-              prop: 'prop5',
+              prop: 'corpId'
+            },{
+              label: '合同金额',
+              prop: 'debitAmount',
               rules: [
                 {
-                  required: true,
-                  message: ' ',
+                  pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
+                  message: '请输入数字或小数，且小数位不超过两位',
                   trigger: 'blur'
                 }
               ]
-            },{
-              label: '制单人',
-              prop: 'prop3',
-              data: []
-            }, {
-              label: '制单日期',
-              prop: 'prop2'
-            }, {
-              label: '责任人',
-              prop: 'prop6',
-              data: []
-            }, {
-              label: '承揽人',
-              prop: 'prop8',
-              data: []
-            }, {
-              label: '合同金额',
-              prop: 'prop8',
+            },
+            {
+              label: '首付金额',
+              prop: 'advanceAmount',
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
@@ -263,8 +251,8 @@
               ]
             },
             {
-              label: '应收金额',
-              prop: 'prop9',
+              label: '未收金额',
+              prop: 'balanceAmount',
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
@@ -274,8 +262,9 @@
               ]
             },
             {
-              label: '未收金额',
-              prop: 'prop10',
+              label: '已收金额',
+              prop: 'settlmentAmount',
+              disabled:true,
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
@@ -285,8 +274,27 @@
               ]
             },
             {
+              label: '责任人',
+              prop: 'corpAttn',
+            }, {
+              label: '承揽人',
+              prop: 'salesName',
+            },
+            {
+              label: '制单人',
+              prop: 'createUser',
+            }, {
+              label: '制单日期',
+              prop: 'createTime',
+              type: 'datetime'
+            },
+            {
+              label: '电话',
+              prop: 'corpTel',
+            },
+            {
               label: '收款方式',
-              prop: 'prop13',
+              prop: 'paymentType',
               type:'select',
               dataType: "number",
               width: 120,
@@ -295,32 +303,20 @@
                 label: "dictValue",
                 value: "dictKey"
               },
-              rules: [
-                {
-                  required: true,
-                  message: '请选择收款方式',
-                  trigger: 'blur'
-                }
-              ],
             },
             {
               label: '开始日期',
-              prop: 'prop11',
-              type:'date',
+              prop: 'beginTime',
+              type:'datetime',
             },
             {
               label: '结束日期',
-              prop: 'prop12',
-              type:'date',
-            },
-            {
-              label: '电话',
-              prop: 'prop7',
-              data: [],
+              prop: 'endTime',
+              type:'datetime',
             },
             {
               label: '备注',
-              prop: 'prop8'
+              prop: 'remark'
             }
           ],
         },

src/views/workManagement/main-items/list.vue

@@ -40,139 +40,14 @@
 </template>
 
 <script>
+  import option from "./configuration/mainList.json";
+
 export default {
   data() {
     return {
       loading: false,
       data: [],
-      optionTable: {
-        addBtn:false,
-        align: "center",
-        menuAlign: "center",
-        height: window.innerHeight - 345,
-        searchMenuSpan: 12,
-        menuWidth: "220",
-        index: true,
-        column: [
-          {
-            label: "项目编码",
-            prop: "prop1",
-            search: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入代码",
-                trigger: "blur"
-              }
-            ],
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "项目名称",
-            prop: "prop2",
-            search: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入排序",
-                trigger: "blur"
-              }
-            ],
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "客户名称",
-            prop: "prop3",
-            search: true,
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "应收金额",
-            prop: "prop4",
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "实收金额",
-            prop: "prop5",
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "责任人",
-            prop: "prop6",
-            search: true,
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "系统编号",
-            prop: "prop7",
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "电话",
-            prop: "prop14",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "状态",
-            prop: "prop8",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "备注",
-            prop: "prop9",
-            search: true,
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "录入人",
-            prop: "prop10",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "录入时间",
-            prop: "prop11",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "最新修改人",
-            prop: "prop12",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true,
-            minWidth:'80'
-          },
-          {
-            label: "最新修改时间",
-            prop: "prop13",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true,
-            minWidth:'100'
-          }
-        ]
-      },
+      optionTable: option,
       page: {
         currentPage: 1,
         total: 0,

src/views/workManagement/service-items/configuration/projectOption.json

@@ -64,6 +64,12 @@
       "width": 150
     },
     {
+      "label": "单价",
+      "prop": "Price",
+      "index": 3,
+      "width": 120
+    },
+    {
       "label": "计价单位",
       "prop": "unit",
       "index": 3,