Merge remote-tracking branch 'origin/dev' into dev

src/api/basicData/container.js

@@ -1,6 +1,6 @@
 import request from '@/router/axios';
 
-//港口类型
+//集装箱类型
 export const getTypeList = (param) => {
   return request({
     url: '/api/blade-client/container/type/list',
@@ -30,13 +30,13 @@ export const typeAdd = (row) => {
 export const typeUpdate = (row) => {
   return request({
     url: '/api/blade-client/container/type/edit',
-    method: 'post',
+    method: 'put',
     data: row
   })
 }
 
-//港口列表
-export const getList = (current, size, params) => {
+//集装箱列表
+export const getList = (current, size, params,typeId) => {
   return request({
     url: '/api/blade-client/container/list',
     method: 'get',
@@ -44,6 +44,7 @@ export const getList = (current, size, params) => {
       ...params,
       current,
       size,
+      typeId
     }
   })
 }
@@ -76,7 +77,7 @@ export const remove = (id) => {
 
 export const getPortTypeTree = (pid) => {
   return request({
-    url: '/api/blade-client/port/getPortTypeList',
+    url: '/api/blade-client/container/getContainerTypeList',
     method: 'get',
     params: {
       pid
@@ -84,4 +85,12 @@ export const getPortTypeTree = (pid) => {
   })
 }
 
+export const getTypeTree = () => {
+  return request({
+    url: '/api/blade-client/container/type/tree',
+    method: 'get',
+  })
+}
+
+
 

src/api/basicData/portinformation.js

@@ -30,13 +30,13 @@ export const typeAdd = (row) => {
 export const typeUpdate = (row) => {
   return request({
     url: '/api/blade-client/port/type/edit',
-    method: 'post',
+    method: 'put',
     data: row
   })
 }
 
 //港口列表
-export const getList = (current, size, params) => {
+export const getList = (current, size, params,typeId) => {
   return request({
     url: '/api/blade-client/port/list',
     method: 'get',
@@ -44,6 +44,7 @@ export const getList = (current, size, params) => {
       ...params,
       current,
       size,
+      typeId
     }
   })
 }
@@ -68,7 +69,7 @@ export const remove = (id) => {
   return request({
     url: '/api/blade-client/port/delete',
     method: 'delete',
-    data: {
+    params: {
       id:id
     }
   })
@@ -84,4 +85,11 @@ export const getPortTypeTree = (pid) => {
   })
 }
 
+export const getTypeTree = () => {
+  return request({
+    url: '/api/blade-client/port/type/tree',
+    method: 'get',
+  })
+}
+
 

src/views/basicData/container/configuration/mainList.json

@@ -18,16 +18,9 @@
   "column": [
     {
       "label": "编号",
-      "prop": "fNo",
+      "prop": "code",
       "search": true,
-      "index": 1,
-      "width": 120
-    },
-    {
-      "label": "箱种类",
-      "prop": "fType",
-      "index": 2,
-      "width": 150,
+      "width": 120,
       "rules": [
         {
           "required": true,
@@ -38,9 +31,8 @@
     },
     {
       "label": "名称",
-      "prop": "fName",
+      "prop": "name",
       "search": true,
-      "index": 3,
       "width": 150,
       "rules": [
         {
@@ -52,43 +44,50 @@
     },
     {
       "label": "英文名",
-      "prop": "fEname",
-      "index": 4,
+      "prop": "enName",
       "width": 150
     },
     {
-      "label": "航线",
-      "prop": "portName",
-      "index": 5,
-      "width": 120
+      "label": "集装箱类型",
+      "prop": "typeId",
+      "dicData": [],
+      "type": "tree",
+      "hide": true,
+      "multiple": false,
+      "checkStrictly": true,
+      "props": {
+        "label": "title",
+        "value": "id"
+      },
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "click"
+      }]
     },
     {
       "label": "UNCODE",
-      "prop": "fUncode",
-      "index": 6,
+      "prop": "unCode",
       "width": 120
     },
     {
       "label": "TEU",
-      "prop": "fTeu",
-      "index": 7,
+      "prop": "teu",
       "width": 80
     },
     {
       "label": "容积（立方）",
-      "prop": "fCbm",
-      "index": 8,
-      "width": 80
+      "prop": "volume",
+      "width": 150
     },
     {
       "label": "毛重（T）",
-      "prop": "fWeight",
-      "index": 9,
+      "prop": "gorssweight",
       "width": 80
     },
     {
       "label": "状态",
-      "prop": "fStatus",
+      "prop": "status",
       "type": "select",
       "dicData": [{
         "label": "正常",
@@ -98,21 +97,18 @@
         "value": 1
       }],
       "search": true,
-      "index": 10,
       "width": 120
     },
     {
       "label": "备注",
-      "prop": "remark",
-      "index": 11,
+      "prop": "remarks",
       "width": 150
     },
     {
       "label": "录入人",
-      "prop": "createBy",
+      "prop": "createUserName",
       "addDisplay": false,
       "editDisplay":false,
-      "index": 12,
       "width": 120
     },
     {
@@ -120,15 +116,13 @@
       "prop": "createTime",
       "addDisplay": false,
       "editDisplay":false,
-      "index": 13,
       "width": 150
     },
     {
       "label": "最新修改人",
-      "prop": "updateBy",
+      "prop": "updateUserName",
       "addDisplay":false,
       "editDisplay":false,
-      "index": 14,
       "width": 120
     },
     {
@@ -136,7 +130,6 @@
       "prop": "updateTime",
       "addDisplay": false,
       "editDisplay":false,
-      "index": 15,
       "width": 150
     }
   ]

src/views/basicData/container/index.vue

@@ -1,118 +1,233 @@
 <template>
-  <basic-container>
-    <avue-crud :option="option"
-               :data="dataList"
-               ref="crud"
-               v-model="form"
-               :page.sync="page"
-               @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
-          icon="el-icon-printer"
-          size="small"
-          type="primary"
-          @click.stop=""
-        >报 表
-        </el-button>
-      </template>
-    </avue-crud>
-  </basic-container>
+  <el-row>
+    <el-col :span="4">
+      <div class="box">
+        <el-scrollbar>
+          <basic-container>
+            <avue-tree
+              :option="treeOption"
+              :data="treeData"
+              @node-click="nodeClick"
+            />
+          </basic-container>
+        </el-scrollbar>
+      </div>
+    </el-col>
+    <el-col :span="20">
+      <basic-container>
+        <avue-crud
+          ref="crud"
+          :data="data"
+          :option="tableOption"
+          :page.sync="page"
+          :table-loading="loading"
+          v-model='form'
+          :search.sync="search"
+          :before-open="beforeOpen"
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          @search-change="searchChange"
+          @refresh-change="refreshChange"
+          @row-save="rowSave"
+          @row-del="rowDel"
+          @row-update="rowUpdate"
+          @cell-dblclick="cellDblclick"
+          @on-load="getList"
+          @saveColumn="saveColumn"
+          @tree-load="treeLoad"
+        >
+          <template slot="menuLeft">
+            <el-button
+              icon="el-icon-printer"
+              size="small"
+              type="primary"
+              @click.stop="openReport()"
+            >报 表
+            </el-button>
+          </template>
+          <report-dialog
+            :switchDialog="switchDialog"
+            @onClose="onClose()"
+          ></report-dialog>
+        </avue-crud>
+      </basic-container>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
   import option from "./configuration/mainList.json";
+  import reportDialog from "@/components/report-dialog/main";
+  import {getList , add ,update ,remove ,getPortTypeTree,getTypeTree} from "@/api/basicData/container"
 
   export default {
-    name: "customerInformation",
     data() {
       return {
-        form: {},
-        option: option,
-        parentId:0,
-        dataList: [],
+        switchDialog:false,//报表
+        loading: true,
+        data: [],
+        tableOption: option,
+        form:{},
+        search:{},
+        treeDeptId:"",
+        height: window.innerHeight - 350,
         page: {
-          pageSize: 10,
-          pagerCount: 5,
+          currentPage: 1,
           total: 0,
+          pageSize: 10
         },
-        query:{}
-      }
+        treeOption: {
+          nodeKey: "id",
+          lazy: true,
+          treeLoad: function(node, resolve) {
+            const parentId = node.level === 0 ? 0 : node.data.id;
+            getPortTypeTree(parentId).then(res => {
+              resolve(
+                res.data.map(item => {
+                  return {
+                    ...item,
+                    leaf: !item.hasChildren
+                  };
+                })
+              );
+            });
+          },
+          addBtn: false,
+          menu: false,
+          size: "small",
+          props: {
+            labelText: "标题",
+            label: "name",
+            value: "id",
+            children: "children"
+          }
+        }
+      };
     },
     created() {
 
     },
+    components: {
+      reportDialog
+    },
     mounted() {
-      option.height = window.innerHeight - 280 ;
+      option.height = window.innerHeight - 350 ;
+      //查询服务类别字典项
+      getTypeTree().then(res => {
+        this.findObject(this.tableOption.column, "typeId").dicData = res.data.data;
+      });
     },
     methods: {
-      //删除列表后面的删除按钮触发触发(row, index, done)
-      rowDel(row, index, done) {
+      //打印
+      openReport() {
+        this.switchDialog =! this.switchDialog;
+      },
+      //关闭打印
+      onClose(val) {
+        this.switchDialog = val;
+      },
+      getList(page, params = {}) {
+        this.loading = true
+        getList(page.currentPage, page.pageSize, params, this.treeDeptId).then(res => {
+          this.data = res.data.data.records
+          this.page.total = res.data.data.total
+          this.loading = false
+        })
+      },
+      //点击新增打开的窗口 取消时触发
+      // beforeClose(){
+
+      // },
+      //点击新增或修改时
+      beforeOpen(done, type){
+        if (["add"].includes(type)) {
+          this.tableOption.column.forEach(e=>{
+            if(e.prop=='typeId'){
+              this.$set(this.tableOption.column,3,{...e,value:this.treeDeptId})
+            }
+          })
+        }
+        done();
+      },
+      searchChange(params, done) {
+        this.getList(this.page, params);
+        done();
+      },
+      sizeChange(val) {
+        this.page.pageSize = val;
+        this.getList();
+      },
+      currentChange(val) {
+        this.page.currentPage = val;
+        this.getList();
+      },
+      refreshChange() {
+        this.getList(this.page,this.search);
+      },
+      rowSave(row, done, loading) {
+        add(row).then(() => {
+          this.page.currentPage = 1;
+          this.getList(this.page);
+          this.$message.success("保存成功");
+          done()
+        }, error => {
+          window.console.log(error);
+          loading();
+        });
+      },
+      rowUpdate(row, index, done, loading) {
+        row.createTime = '';
+        update(row).then(() => {
+          this.getList(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          // 数据回调进行刷新
+          done(row);
+        }, error => {
+          window.console.log(error);
+          loading();
+        });
+      },
+      rowDel(row, index,done) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
+          return remove(row.id);
+        }).then(() => {
           this.$message({
             type: "success",
             message: "操作成功!"
           });
-          // 数据回调进行刷新
+          this.getList(this.page);
           done(row);
         });
       },
-      //点击搜索按钮触发
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        params.parentId = 0
-        this.onLoad(this.page, params);
-        done()
-      },
-      searchReset() {
-        console.log('1')
-      },
-      selectionChange() {
-        console.log('1')
-      },
-      currentChange() {
-        console.log('1')
+      cellDblclick(row, column, cell, event) {
+        this.$refs.crud.rowEdit(row);
       },
-      sizeChange() {
-        console.log('1')
+      saveColumn(row, column) {
+        console.log(row, column);
       },
-      refreshChange() {
-        console.log('1')
+      //展开主页左边类型
+      nodeClick(data) {
+        this.treeDeptId = data.id;
+        this.page.currentPage = 1;
+        this.getList(this.page);
       },
-      onLoad(page, params = {}) {
-        this.dataList = [{
-          fNo:"DD",
-          fType:"箱种类",
-          fName:"丹东",
-          fEname:"dandong",
-          portName:"威海-丹东",
-          fUncode:"CEWEI",
-          fTeu:"1",
-          fCbm:"2",
-          fWeight:"3",
-          fStatus:"正常使用",
-          remark:"123",
-          createBy:"admin",
-          createTime:"2021-04-16",
-          updateBy:"admin",
-          updateTime:"2021-04-16",
-        }];
+      //列表内展开树节点
+      treeLoad(tree, treeNode, resolve) {
+        const parentId = tree.id;
+        getList({parentId:parentId}).then(res => {
+          resolve(res.data.data.records);
+        });
       },
     }
-  }
+  };
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
 </style>

src/views/basicData/portinformation/configuration/mainList.json

@@ -6,7 +6,8 @@
   "lazy": true,
   "tip": false,
   "searchShow": true,
-  "searchMenuSpan": 6,
+  "searchMenuPosition": "right",
+  "searchMenuSpan": 12,
   "tree": true,
   "selection": true,
   "addBtn": true,
@@ -19,6 +20,7 @@
       "label": "港口编号",
       "prop": "code",
       "width": 150,
+      "index": 1,
       "rules": [
         {
           "required": true,
@@ -47,9 +49,21 @@
     },
     {
       "label": "港口类型",
-      "prop": "typeName",
-      "search": true,
-      "width": 120
+      "prop": "typeId",
+      "dicData": [],
+      "type": "tree",
+      "hide": true,
+      "multiple": false,
+      "checkStrictly": true,
+      "props": {
+        "label": "title",
+        "value": "id"
+      },
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "click"
+      }]
     },
     {
       "label": "航线",
@@ -97,7 +111,7 @@
     },
     {
       "label": "录入人",
-      "prop": "createBy",
+      "prop": "createUserName",
       "addDisplay": false,
       "editDisplay":false,
       "width": 120
@@ -111,7 +125,7 @@
     },
     {
       "label": "最新修改人",
-      "prop": "updateBy",
+      "prop": "updateUserName",
       "addDisplay":false,
       "editDisplay":false,
       "width": 120

src/views/basicData/portinformation/index.vue

@@ -58,7 +58,7 @@
 <script>
   import option from "./configuration/mainList.json";
   import reportDialog from "@/components/report-dialog/main";
-  import {getList , add ,update ,remove ,getPortTypeTree} from "@/api/basicData/portinformation"
+  import {getList , add ,update ,remove ,getPortTypeTree , getTypeTree} from "@/api/basicData/portinformation"
 
   export default {
     data() {
@@ -114,9 +114,9 @@
     mounted() {
       option.height = window.innerHeight - 350 ;
       //查询服务类别字典项
-      // getDeptTree().then(res => {
-      //   this.findObject(this.tableOption.column, "goodsTypeId").dicData = res.data.data;
-      // });
+      getTypeTree().then(res => {
+        this.findObject(this.tableOption.column, "typeId").dicData = res.data.data;
+      });
     },
     methods: {
       //打印
@@ -143,8 +143,8 @@
       beforeOpen(done, type){
         if (["add"].includes(type)) {
           this.tableOption.column.forEach(e=>{
-            if(e.prop=='typeName'){
-              this.$set(this.tableOption.column,4,{...e,value:this.treeDeptId})
+            if(e.prop=='typeId'){
+              this.$set(this.tableOption.column,3,{...e,value:this.treeDeptId})
             }
           })
         }

src/views/basicData/portinformation/type.vue

@@ -62,6 +62,7 @@
         this.loading = true;
         let param = {
           ...params,
+          portName:params.name,
           current:this.page.currentPage,
           size:this.page.pageSize,
           parentId:0

src/views/purchase/contract/config/mainList.json

@@ -19,6 +19,13 @@
     "expand": true,
     "rowKey": "id",
     "column":[
+      {
+        "label": "合同号",
+        "prop": "orderNo",
+        "search": true,
+        "index": 2,
+        "width":100
+      },
         {
             "label": "合同日期",
             "prop": "businesDate",
@@ -27,16 +34,11 @@
             "width":100
         },
         {
-            "label": "合同号",
-            "prop": "orderNo",
-            "search": true,
-            "index": 2,
-            "width":100
-        },{
             "label": "供应商",
             "prop": "corpId",
             "search": true,
             "index": 3,
+
             "width":100
         },{
             "label": "采购商",

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

@@ -39,7 +39,7 @@
       "label": "任务部门",
       "prop": "deptid",
       "type":"tree",
-      "dicUrl": "/api/blade-system/dept/tree?tenantId=096359",
+      "dicUrl": "/api/blade-system/dept/tree?tenantId=000000",
       "props": {
         "label": "title",
         "value": "value"

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

@@ -33,7 +33,7 @@
                   <template   slot="append">元</template>
                 </el-input>
                 <el-input type="age" v-else v-model="form[item.prop]"  :disabled="item.disabled?true:false" size="small" value="0" autocomplete="off" placeholder="请输入">
-                  <template v-if="item.prop === 'debitAmount'|| item.prop === 'advanceAmount'||item.prop === 'settlmentAmount'||item.prop === 'balanceAmount'"  slot="append">元</template>
+                  <template v-if="item.prop === 'advanceAmount'||item.prop === 'settlmentAmount'||item.prop === 'balanceAmount'"  slot="append">元</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -276,15 +276,15 @@
               prop: 'debitAmount',
               rules: [
                 {
-                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                  required: true,
                   message: ' ',
                   trigger: 'blur'
                 },
                 {
-                  required: true,
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                   message: ' ',
                   trigger: 'blur'
-                }
+                },
               ]
             },
             {
@@ -493,25 +493,16 @@
         if(this.id){
           projectDetail(this.id,"0,1,2,3,4,5").then(res =>{
             this.form = res.data.data;
-            this.configuration.dicData = res.data.data.corpName;
+            if(res.data.data.corpName){
+              this.configuration.dicData = res.data.data.corpName; //给客户名称赋值
+            }
             if(res.data.data.filesList){
               this.upLoadData = res.data.data.filesList
             }
             if(res.data.data.itemList){
-              this.data = res.data.data.itemList;
-              let status = [];
-              this.data.forEach(item =>{
-                item.status == 0 ? status.push(true) : status.push(false)
-              })
-              //如果 明细列表存在 请核之后的状态 禁止编辑一些输入框
-              if(status.findIndex(item => item == false) == 0){
-                this.basicData.column.forEach(item =>{
-                  if(item.prop == "code" || item.prop == "cname" || item.prop == "corpId" || item.prop == "debitAmount"){
-                    item.disabled = true
-                    this.configuration.disabled = true
-                  }
-                })
-              }
+              this.loading = true;
+              this.operationDetailList(res.data.data.itemList);
+              this.loading = false;
               if(pleaseCheck === 10086){
                 this.pleaseCheck();
               }
@@ -523,7 +514,7 @@
           getSysNo().then(res =>{
             this.$set(this.form,"sysNo", res.data.data)
             let date = new Date();
-            let strDate = date.getFullYear() + "-" + date.getMonth() + 1 + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+            let strDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
             this.$set(this.form,"createTime",strDate)
           });
           getUserInfo().then(res =>{
@@ -531,6 +522,22 @@
           })
         }
       },
+      operationDetailList(itemList){
+        this.data = itemList;
+        let status = [];
+        this.data.forEach(item =>{
+          item.status == 0 ? status.push(true) : status.push(false)
+        })
+        //如果 明细列表存在 请核之后的状态 禁止编辑一些输入框
+        if(status.findIndex(item => item == false) == 0){
+          this.basicData.column.forEach(item =>{
+            if(item.prop == "code" || item.prop == "cname" || item.prop == "corpId" || item.prop == "debitAmount"){
+              item.disabled = true
+              this.configuration.disabled = true
+            }
+          })
+        }
+      },
       //删除列表后面的删除按钮触发触发(row, index, done)
       rowDel(row, index, done) {
         this.$confirm("确定将此明细删除?", {
@@ -551,36 +558,6 @@
           }
         }
       },
-      //点击修改或保存时触发
-      rowCellTwo(row,index){
-        this.$refs.crud.rowCell(row, index);
-      },
-      //选择时
-      selectionChange(row){
-        this.crudSelection = row;
-      },
-      //新增修改时保存触发
-      rowSave(row, done, loading) {
-        done()
-      },
-      rowUpdate(row, index, done, loading) {
-        done(row)
-      },
-      searchChange(params, done) {
-        this.getList(this.page, params);
-        done();
-      },
-      sizeChange(val) {
-        this.page.pageSize = val;
-        this.getList();
-      },
-      currentChange(val) {
-        this.page.currentPage = val;
-        this.getList();
-      },
-      saveColumn(row, column) {
-        console.log(row, column);
-      },
       //新单
       addMainProject(){
         this.$confirm("需先将此单据保存", {
@@ -591,7 +568,7 @@
           this.editMainProject(10010);
         })
       },
-      //请核
+      //请核之前
       beforePleaseCheck(){
         if(this.crudSelection.length!=0){
           let resultUserName = [];
@@ -618,8 +595,7 @@
               cancelButtonText: "取消",
               type: "warning"
             }).then(() => {
-              this.editMainProject();
-              return
+              this.editMainProject(10086);
             })
           }
         }else{
@@ -629,28 +605,6 @@
           });
         }
       },
-      pleaseCheck(){
-        this.crudSelection.forEach(item =>{
-          updateItemStatus(this.data[item.$index].id,1).then(res =>{
-            if(res.data.success){
-              this.$message({
-                type: "success",
-                message: "请核成功!"
-              });
-              //刷新列表
-              this.loading = true;
-              projectDetail(this.id,"0,1,2,3,4,5").then(res =>{
-                if(res.data.data.itemList){
-                  this.data = res.data.data.itemList;
-                }else{
-                  this.data = [];
-                }
-                this.loading = false;
-              })
-            }
-          })
-        })
-      },
       //新增 修改
       editMainProject(pleaseCheck){
         this.$refs["form"].validate((valid) => {
@@ -674,28 +628,45 @@
               filesList:this.upLoadData
             }
             editMianProject(params).then(res =>{
-              if(pleaseCheck !== 10086 && pleaseCheck !== 10010){
-                this.$message({
-                  type: "success",
-                  message: "操作成功!"
-                });
-                this.getProjectDetail()
-              }else if(pleaseCheck === 10010){  //新单
+              if(pleaseCheck === 10086){  //请核
+                this.id =  res.data.data;
+                this.getProjectDetail(pleaseCheck)
+              }else if(pleaseCheck === 10010){  //复制新单新单
                 this.$router.push({
                   path: "/mainItems_detailsPage",
                   query: {id: ''},
                 });
+                //清空关键信息
                 this.form = {}
                 this.data = []
                 this.upLoadData = []
                 this.id = ''
-              }else if(pleaseCheck === 10086){
-                this.getProjectDetail(pleaseCheck)
+              }else{
+                this.$message({
+                  type: "success",
+                  message: "操作成功!"
+                });
+                this.getProjectDetail()
               }
             })
           }
         })
       },
+      //请核
+      pleaseCheck(){
+        this.crudSelection.forEach(item =>{
+          updateItemStatus(this.data[item.$index].id,1).then(res =>{
+            if(res.data.success){
+              this.$message({
+                type: "success",
+                message: "请核成功!"
+              });
+              //刷新列表
+              this.getProjectDetail();
+            }
+          })
+        })
+      },
       //返回主营项目列表
       backToList(){
         this.$router.$avueRouter.closeTag();
@@ -704,6 +675,36 @@
           query: {}
         });
       },
+      //点击修改或保存时触发
+      rowCellTwo(row,index){
+        this.$refs.crud.rowCell(row, index);
+      },
+      //选择时
+      selectionChange(row){
+        this.crudSelection = row;
+      },
+      //新增修改时保存触发
+      rowSave(row, done, loading) {
+        done()
+      },
+      rowUpdate(row, index, done, loading) {
+        done(row)
+      },
+      searchChange(params, done) {
+        this.getList(this.page, params);
+        done();
+      },
+      sizeChange(val) {
+        this.page.pageSize = val;
+        this.getList();
+      },
+      currentChange(val) {
+        this.page.currentPage = val;
+        this.getList();
+      },
+      saveColumn(row, column) {
+        console.log(row, column);
+      },
       //上传文件保存
       upLoadSave(row, done, loading){
         this.upLoadData.push(row)

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

@@ -9,8 +9,6 @@
       @row-del="rowDel"
       @row-update="rowUpdate"
       @row-save="rowSave"
-      @size-change="sizeChange"
-      @current-change="currentChange"
       @search-change="searchChange"
       @refresh-change="refreshChange"
       @on-load="getList"
@@ -124,8 +122,9 @@ export default {
       this.getList(this.page, params);
       done();
     },
-    refreshChange(page,params) {
-      this.getList(page,params);
+    refreshChange(params,done) {
+      this.getList(this.page,params);
+      done();
     },
     //删除列表后面的删除按钮触发触发(row, index, done)
     rowDel(row, index, done) {
@@ -143,7 +142,6 @@ export default {
           })
           // 数据回调进行刷新
           this.getList(this.page);
-          done(row);
         });
       }else{
         this.$message({