Browse Source

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

fenghy 3 years ago
parent
commit
6887902a37

+ 8 - 0
src/api/basicData/commodityType.js

@@ -138,3 +138,11 @@ export const getDeptTree = (tenantId) => {
         }
     })
 }
+//服务项目树
+export function getServerTree(data) {
+  return request({
+    url: '/api/blade-client/corpstype/page',
+    method: 'get',
+    params: data
+  })
+}

+ 46 - 148
src/views/workManagement/service-items/configuration/mainList.json

@@ -11,30 +11,29 @@
   "tree": true,
   "selection": true,
   "viewBtn": false,
-  "editBtn": false,
-  "delBtn": false,
-  "menuWidth": 280,
+  "editBtn": true,
+  "delBtn": true,
+  "menuWidth": 150,
   "column": [
     {
-      "label": "项目代码",
-      "prop": "aname",
-      "search": true,
+      "label": "项目编码",
+      "prop": "code",
       "index": 1,
-      "width": 100,
+      "width": 150,
       "rules": [
         {
           "required": true,
-          "message": "请输入项目码",
+          "message": "请输入项目码",
           "trigger": "blur"
         }
       ]
     },
     {
       "label": "项目名称",
-      "prop": "bname",
+      "prop": "cname",
       "search": true,
-      "index": 2,
-      "width": 100,
+      "index": 1,
+      "width": 150,
       "rules": [
         {
           "required": true,
@@ -44,163 +43,62 @@
       ]
     },
     {
-      "label": "客户名称",
-      "prop": "cname",
-      "search": true,
-      "index": 3,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入客户名称",
-          "trigger": "blur"
-        }
-      ]
+      "label": "收费建议",
+      "prop": "remarks",
+      "index": 2,
+      "width": 150
     },
     {
-      "label": "服务项目",
-      "prop": "dname",
-      "search": true,
-      "index": 4,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入服务项目",
-          "trigger": "blur"
-        }
-      ]
+      "label": "计价单位",
+      "prop": "unit",
+      "index": 3,
+      "width": 120
     },
     {
-      "label": "下单时间",
-      "prop": "ename",
+      "label": "频率",
+      "prop": "rate",
       "index": 5,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入下单时间",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
-      "label": "开始日期",
-      "prop": "fname",
+      "label": "质保期",
+      "type":"date",
+      "prop": "warrantyPeriod",
+      "format": "yyyy-MM-dd",
+      "valueFormat": "timestamp",
       "index": 6,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入开始日期",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150
     },
     {
-      "label": "需求完成日期",
-      "prop": "gname",
+      "label": "标准工时",
+      "type": "number",
+      "prop": "workingHours",
       "index": 7,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入需求完成日期",
-          "trigger": "blur"
-        }
-      ]
+      "width": 80
     },
     {
-      "label": "部门",
-      "prop": "hname",
+      "label": "创建人",
+      "prop": "createUser",
+      "addDisplay": false,
+      "editDisplay": false,
       "index": 8,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入部门",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150
     },
     {
-      "label": "备注",
-      "prop": "iname",
+      "label": "创建时间",
+      "prop": "createTime",
+      "editDisplay": false,
+      "addDisplay": false,
       "index": 9,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入备注",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "应收金额",
-      "prop": "jname",
-      "index": 10,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入应收金额",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "任务责任人",
-      "prop": "kname",
-      "index": 11,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入任务责任人",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "系统编号",
-      "prop": "cname",
-      "index": 12,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入系统编号",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150
     },
     {
       "label": "状态",
-      "prop": "cname",
-      "index": 13,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入状态",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "备注",
-      "prop": "cname",
-      "search": true,
-      "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入备注",
-          "trigger": "blur"
-        }
-      ]
+      "prop": "status",
+      "hide": true,
+      "editDisplay": false,
+      "addDisplay": false,
+      "search": true
     }
   ]
 }

+ 58 - 127
src/views/workManagement/service-items/project.vue

@@ -30,6 +30,7 @@
           @row-update="rowUpdate"
           @cell-dblclick="cellDblclick"
           @on-load="getList"
+          @tree-load="treeLoad"
           @saveColumn="saveColumn">
           <template slot="menuLeft">
             <el-button type="primary"
@@ -46,104 +47,22 @@
 </template>
 
 <script>
-import { getDeptLazyTree, getDeptTree } from "@/api/basicData/basicFeesDesc";
+  import option from "./configuration/mainList.json";
+  import {
+    getList,
+    remove,
+    update,
+    add,
+    getServerTree
+  } from "@/api/basicData/commodityType";
 
 export default {
   data() {
     return {
       loading: false,
       data: [],
-      tableOption: {
-        align: "center",
-        menuAlign: "center",
-        height: window.innerHeight - 345,
-        searchMenuSpan: 12,
-        menuWidth: "140",
-        column: [
-          {
-            label: "项目名称",
-            prop: "name",
-            search: true,
-            rules: [
-              {
-                required: true,
-                message: "请输入类别名称",
-                trigger: "blur"
-              }
-            ],
-            overHidden: true
-          },
-          {
-            label: "收费建议",
-            prop: "sort",
-            rules: [
-              {
-                required: true,
-                message: "请输入排序",
-                trigger: "blur"
-              }
-            ],
-            overHidden: true
-          },
-          {
-            label: "收费金额",
-            prop: "status",
-            search: true,
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          },
-          {
-            label: "计价单位",
-            prop: "user",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          },
-          {
-            label: "备注",
-            prop: "date",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          },
-          {
-            label: "频率",
-            prop: "date",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          },
-          {
-            label: "保质期",
-            prop: "date",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          },
-          {
-            label: "标准工时",
-            prop: "date",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          },
-          {
-            label: "创建人",
-            prop: "user",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          },
-          {
-            label: "创建时间",
-            prop: "date",
-            addDisplay: false,
-            editDisplay: false,
-            overHidden: true
-          }
-        ]
-      },
+      tableOption: option,
+      treeDeptId:"",
       page: {
         currentPage: 1,
         total: 0,
@@ -154,9 +73,9 @@ export default {
         lazy: true,
         treeLoad: function(node, resolve) {
           const parentId = node.level === 0 ? 0 : node.data.id;
-          getDeptLazyTree(parentId).then(res => {
+          getServerTree(parentId).then(res => {
             resolve(
-              res.data.data.map(item => {
+              res.data.data.records.map(item => {
                 return {
                   ...item,
                   leaf: !item.hasChildren
@@ -170,29 +89,19 @@ export default {
         size: "small",
         props: {
           labelText: "标题",
-          label: "title",
-          value: "value",
+          label: "cname",
+          value: "id",
           children: "children"
         }
       }
     };
   },
   methods: {
-    getList() {
-      this.loading = true;
-      setTimeout(() => {
-        this.loading = false;
-        this.data = [
-          {
-            name: "公司设立",
-            sort: "2300",
-            status: "2300",
-            user: "次",
-            date: "2021-07-08"
-          }
-        ];
-        this.page.total = 1;
-      }, 1000);
+    getList(page, params = {}) {
+      getList(page.currentPage, page.pageSize, params, this.treeDeptId).then(res => {
+        this.data = res.data.data.records
+        this.page.total = res.data.data.total
+      })
     },
     searchChange(params, done) {
       this.getList(this.page, params);
@@ -211,21 +120,45 @@ export default {
       this.getList();
     },
     rowSave(row, done, loading) {
-      setTimeout(() => {
+      row.sort = 1;
+      add(row).then(res => {
+        this.page.currentPage = 1;
+        this.getList(this.page);
         this.$message.success("保存成功");
+        done()
+      }, error => {
+        window.console.log(error);
         loading();
-        done();
-      }, 1000);
+      });
     },
     rowUpdate(row, index, done, loading) {
-      setTimeout(() => {
-        this.$message.success("修改成功");
+      update(row).then(() => {
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        // 数据回调进行刷新
+        done(row);
+      }, error => {
+        window.console.log(error);
         loading();
-        done();
-      }, 1000);
+      });
     },
-    rowDel(row, index) {
-      this.$message.success("删除成功");
+    rowDel(row, index,done) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        return remove(row.id);
+      }).then(() => {
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        // 数据回调进行刷新
+        done(row);
+      });
     },
     cellDblclick(row, column, cell, event) {
       console.log(row, column, cell, event);
@@ -240,14 +173,12 @@ export default {
       this.page.currentPage = 1;
       this.getList(this.page);
     },
-    //查询全部
-    initData() {
-      getDeptTree().then(res => {
-        console.log(this.form);
-        const column = this.findObject(this.option.column, "feesTypeId");
-        column.dicData = res.data.data;
+    treeLoad(tree, treeNode, resolve) {
+      const parentId = tree.id;
+      getList({parentId:parentId}).then(res => {
+        resolve(res.data.data.records);
       });
-    }
+    },
   }
 };
 </script>

+ 57 - 57
src/views/workManagement/service-items/type.vue

@@ -27,63 +27,63 @@ export default {
     return {
       loading: false,
       data: [],
-      optionTable: option,
-      //   {
-      //   align: "center",
-      //   menuAlign: "center",
-      //   height: window.innerHeight - 345,
-      //   searchMenuSpan: 12,
-      //   menuWidth:'140',
-      //   column: [
-      //     {
-      //       label: "类别名称",
-      //       prop: "name",
-      //       search: true,
-      //       rules: [
-      //         {
-      //           required: true,
-      //           message: "请输入类别名称",
-      //           trigger: "blur"
-      //         }
-      //       ],
-      //       overHidden: true
-      //     },
-      //     {
-      //       label: "排序",
-      //       prop: "sort",
-      //       rules: [
-      //         {
-      //           required: true,
-      //           message: "请输入排序",
-      //           trigger: "blur"
-      //         }
-      //       ],
-      //       overHidden: true
-      //     },
-      //     {
-      //       label: "状态",
-      //       prop: "status",
-      //       search: true,
-      //       addDisplay: false,
-      //       editDisplay: false,
-      //       overHidden: true
-      //     },
-      //     {
-      //       label: "创建人",
-      //       prop: "user",
-      //       addDisplay: false,
-      //       editDisplay: false,
-      //       overHidden: true
-      //     },
-      //     {
-      //       label: "创建时间",
-      //       prop: "date",
-      //       addDisplay: false,
-      //       editDisplay: false,
-      //       overHidden: true
-      //     }
-      //   ]
-      // },
+      optionTable:
+        {
+        align: "center",
+        menuAlign: "center",
+        height: window.innerHeight - 345,
+        searchMenuSpan: 12,
+        menuWidth:'140',
+        column: [
+          {
+            label: "类别名称",
+            prop: "name",
+            search: true,
+            rules: [
+              {
+                required: true,
+                message: "请输入类别名称",
+                trigger: "blur"
+              }
+            ],
+            overHidden: true
+          },
+          {
+            label: "排序",
+            prop: "sort",
+            rules: [
+              {
+                required: true,
+                message: "请输入排序",
+                trigger: "blur"
+              }
+            ],
+            overHidden: true
+          },
+          {
+            label: "状态",
+            prop: "status",
+            search: true,
+            addDisplay: false,
+            editDisplay: false,
+            overHidden: true
+          },
+          {
+            label: "创建人",
+            prop: "user",
+            addDisplay: false,
+            editDisplay: false,
+            overHidden: true
+          },
+          {
+            label: "创建时间",
+            prop: "date",
+            addDisplay: false,
+            editDisplay: false,
+            overHidden: true
+          }
+        ]
+      },
       page: {
         currentPage: 1,
         total: 0,