客户9.28

src/api/TaskKanban/task.js

@@ -0,0 +1,50 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-mocha-item/task/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/api/blade-mocha-item/task/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/api/blade-mocha-item/task/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/api/blade-mocha-item/task/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/api/blade-mocha-item/task/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/views/TaskKanban/index.vue

@@ -0,0 +1,364 @@
+<template>
+  <basic-container>
+    <avue-crud :option="option"
+               :table-loading="loading"
+               :data="data"
+               :page.sync="page"
+               :permission="permissionList"
+               :before-open="beforeOpen"
+               v-model="form"
+               ref="crud"
+               @row-update="rowUpdate"
+               @row-save="rowSave"
+               @row-del="rowDel"
+               @search-change="searchChange"
+               @search-reset="searchReset"
+               @selection-change="selectionChange"
+               @current-change="currentChange"
+               @size-change="sizeChange"
+               @refresh-change="refreshChange"
+               @on-load="onLoad">
+      <template slot="menuLeft">
+        <el-button type="danger"
+                   size="small"
+                   icon="el-icon-delete"
+                   plain
+                   v-if="permission.task_delete"
+                   @click="handleDelete">删 除
+        </el-button>
+      </template>
+    </avue-crud>
+  </basic-container>
+</template>
+
+<script>
+  import {getList, getDetail, add, update, remove} from "@/api/TaskKanban/task";
+  import {mapGetters} from "vuex";
+  import {getPostList} from "@/api/system/post";
+  import website from "@/config/website";
+
+  export default {
+    data() {
+      return {
+        form: {},
+        query: {},
+        loading: true,
+        page: {
+          pageSize: 10,
+          currentPage: 1,
+          total: 0
+        },
+        selectionList: [],
+        option: {
+          height:'auto',
+          calcHeight: 30,
+          tip: false,
+          searchShow: true,
+          searchMenuSpan: 6,
+          border: true,
+          index: true,
+          viewBtn: true,
+          selection: true,
+          dialogClickModal: false,
+          column: [
+            {
+              label: "负责人",
+              prop: "responsibleUserId",
+              search: true,
+              type:'select',
+              dicUrl: "/api/blade-user/userList",
+              props: {
+                 label: "realName",
+                 value: "id"
+              },
+                rules: [{
+                    required: true,
+                    message: "请选择负责人",
+                    trigger: "blur"
+                }]
+              // hide:true,
+            },
+            {
+              label: "岗位",
+              prop: "postId",
+              search: true,
+              type:'select',
+                dicData:[],
+                props: {
+                    label: "postName",
+                    value: "id"
+                },
+              rules: [{
+                required: true,
+                message: "请选择岗位",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "任务内容",
+              prop: "tsInfo",
+              search: true,
+              rules: [{
+                required: true,
+                message: "请输入任务信息",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "要求完成时间",
+              prop: "completionTime",
+                // type:'data',
+              rules: [{
+                required: true,
+                message: "请输入要求完成时间",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "是否紧急",
+              prop: "isUrgency",
+              rules: [{
+                required: true,
+                message: "请输入是否紧急",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "未完成原因",
+              prop: "unfinishedCause",
+              rules: [{
+                required: true,
+                message: "请输入未完成原因",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "附件",
+              prop: "accessory",
+              rules: [{
+                required: true,
+                message: "请输入附件",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "评价",
+              prop: "evaluate",
+              rules: [{
+                required: true,
+                message: "请输入评价",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "单据类型",
+              prop: "documentType",
+              rules: [{
+                required: true,
+                message: "请输入单据类型",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "备注",
+              prop: "remarks",
+              rules: [{
+                required: true,
+                message: "请输入备注",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "参考号",
+              prop: "refno",
+              rules: [{
+                required: true,
+                message: "请输入参考号",
+                trigger: "blur"
+              }]
+            },
+            {
+              label: "状态",
+              prop: "type",
+                display:false,
+            },
+            {
+              label: "创建人",
+              prop: "createUser",
+                display:false,
+            },
+            {
+              label: "下发时间",
+              prop: "createTime",
+              search: true,
+              type: "date",
+              format: "yyyy-MM-dd",
+              valueFormat: "yyyy-MM-dd",
+              unlinkPanels: true,
+              searchRange: true,
+                display:false,
+            },
+            {
+              label: "修改人",
+              prop: "updateUser",
+                display:false,
+            },
+            {
+              label: "修改时间",
+              prop: "updateTime",
+                display:false,
+            },
+            {
+              label: "是否已删除（0 否 1是）",
+              prop: "isDeleted",
+                display:false,
+            },
+          ]
+        },
+        data: []
+      };
+    },
+      created() {
+        this.getPostListfun(website.tenantId)
+      },
+      computed: {
+      ...mapGetters(["permission"]),
+      permissionList() {
+        return {
+          // addBtn: this.vaildData(this.permission.task_add, false),
+          viewBtn: this.vaildData(this.permission.task_view, false),
+          delBtn: this.vaildData(this.permission.task_delete, false),
+          editBtn: this.vaildData(this.permission.task_edit, false)
+        };
+      },
+      ids() {
+        let ids = [];
+        this.selectionList.forEach(ele => {
+          ids.push(ele.id);
+        });
+        return ids.join(",");
+      }
+    },
+    methods: {
+        getPostListfun(tenantId){
+            getPostList(tenantId).then(res => {
+                console.log(res,244)
+                const column = this.findObject(this.option.column, "postId");
+                column.dicData = res.data.data;
+            });
+        },
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          window.console.log(error);
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        update(row).then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          done();
+        }, error => {
+          loading();
+          console.log(error);
+        });
+      },
+      rowDel(row) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(row.id);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          });
+      },
+      handleDelete() {
+        if (this.selectionList.length === 0) {
+          this.$message.warning("请选择至少一条数据");
+          return;
+        }
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            return remove(this.ids);
+          })
+          .then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$refs.crud.toggleSelection();
+          });
+      },
+      beforeOpen(done, type) {
+        if (["edit", "view"].includes(type)) {
+          getDetail(this.form.id).then(res => {
+            this.form = res.data.data;
+          });
+        }
+        done();
+      },
+      searchReset() {
+        this.query = {};
+        this.onLoad(this.page);
+      },
+      searchChange(params, done) {
+        this.query = params;
+        this.page.currentPage = 1;
+        this.onLoad(this.page, params);
+        done();
+      },
+      selectionChange(list) {
+        this.selectionList = list;
+      },
+      selectionClear() {
+        this.selectionList = [];
+        this.$refs.crud.toggleSelection();
+      },
+      currentChange(currentPage){
+        this.page.currentPage = currentPage;
+      },
+      sizeChange(pageSize){
+        this.page.pageSize = pageSize;
+      },
+      refreshChange() {
+        this.onLoad(this.page, this.query);
+      },
+      onLoad(page, params = {}) {
+        this.loading = true;
+        getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+          const data = res.data.data;
+          this.page.total = data.total;
+          this.data = data.records;
+          this.loading = false;
+          this.selectionClear();
+        });
+      }
+    }
+  };
+</script>
+
+<style>
+</style>

src/views/tirePartsMall/basicData/customerInformation/index.vue

@@ -44,8 +44,8 @@
             </template>
             <template slot-scope="{type,size, row, index }" slot="menu">
               <!-- <el-button :size="size" :type="type" :disabled="!row.enableOrNot" @click="editOpen(row, 2)">编辑</el-button> -->
-                <el-button v-if="row.checkStatus == '提交'" :size="size" :type="type" :disabled="row.enableOrNot" @click.stop="passThrough(row,'通过')">通过</el-button>
-                <el-button v-if="row.checkStatus == '提交'" :size="size" :type="type" :disabled="row.enableOrNot" @click.stop="passThrough(row,'驳回')">驳回</el-button>
+                <el-button v-if="row.checkStatus == '提交'" :size="size" :type="type"  @click.stop="passThrough(row,'通过')">通过</el-button>
+                <el-button v-if="row.checkStatus == '提交'" :size="size" :type="type"  @click.stop="passThrough(row,'驳回')">驳回</el-button>
                 <el-button :size="size" :type="type" :disabled="row.enableOrNot" @click.stop="rowDel(row)">删除</el-button>
             </template>
             <!-- <template slot="deliveryWarehouseName">

src/views/tirePartsMall/statisticAnalysis/accountsReceivableStatistics/index.vue

@@ -96,11 +96,13 @@ export default {
           },
           dicUrl: '/api/blade-sales-part/corpsDesc/listAll?cname={{key}}&corpType=KH&enableOrNot=0',
 
-        }, {
-          label: '区域',
-          prop: "region",
-          overHidden: true,
-        }, {
+        },
+        //     {
+        //   label: '区域',
+        //   prop: "region",
+        //   overHidden: true,
+        // },
+            {
           label: '业务员',
           prop: "salerName",
           search: true,
@@ -130,15 +132,15 @@ export default {
           prop: "opening",
           overHidden: true,
         }, {
-          label: '新增',
+          label: '新增(本期)',
           prop: 'addAmount',
           overHidden: true,
         }, {
-          label: '实收',
+          label: '实收(本期)',
           prop: 'chargeAmount',
           overHidden: true,
         }, {
-          label: '未收',
+          label: '未收(本期)',
           prop: 'unpaidAmount',
           overHidden: true,
         }, {