事务联调

src/api/workManagement/mainProject.js

@@ -1,6 +1,6 @@
 import request from '@/router/axios';
 
-//主营项目列表
+//主营项目列表&结算列表
 export function getList(current,size,params) {
   return request({
     url: '/api/trade-project/project/list',
@@ -12,21 +12,22 @@ export function getList(current,size,params) {
     }
   })
 }
-//
-export function typeSave(data) {
+//新增及修改
+export function editMianProject(data) {
   return request({
-    url: '/api/blade-client/affairstype/submit',
-    method: 'post',
+    url: '/api/trade-project/project/modify',
+    method: 'put',
     data: data
   })
 }
 //根据id主营以及明细
-export function projectDetail(id) {
+export function projectDetail(id,itemStatus) {
   return request({
     url: '/api/trade-project/project/findById',
     method: 'get',
     params:{
-      id : id
+      id : id,
+      itemStatus:itemStatus
     }
   })
 }
@@ -40,3 +41,26 @@ export function deleteMain(id) {
     }
   })
 }
+//核算/完工/结算
+export function updateItemStatus(id,status) {
+  return request({
+    url: '/api/trade-project/project/updateItemStatus',
+    method: 'POST',
+    params:{
+      id : id,
+      status:status,
+    }
+  })
+}
+//任务列表
+export function getFlowList(current,size,params) {
+  return request({
+    url: '/api/trade-project/project/item/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

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

@@ -7,16 +7,17 @@
   "tip": false,
   "searchShow": false,
   "searchMenuSpan": 6,
-  "selection": false,
   "addBtn": false,
   "viewBtn": false,
   "editBtn": false,
   "delBtn": true,
+  "selection": true,
+  "refreshBtn": false,
   "menuWidth": 220,
   "column": [
     {
       "label": "服务项目",
-      "prop": "cname",
+      "prop": "pname",
       "index": 1,
       "width": 120
     },
@@ -28,7 +29,7 @@
     },
     {
       "label": "单价",
-      "prop": "quantity",
+      "prop": "price",
       "index": 3,
       "width": 120
     },
@@ -43,14 +44,7 @@
       "prop": "quantity",
       "index": 5,
       "width": 120,
-      "cell": true,
-      "rules": [
-        {
-          "pattern": "/^(([1-9][0-9]*)|(([0]\\.\\d{1,2}|[1-9][0-9]*\\.\\d{1,2})))$/",
-          "message":"请输入数字或小数，且小数位不超过两位",
-          "trigger": "blur"
-        }
-      ]
+      "cell": true
     },
     {
       "label": "合计金额",
@@ -69,6 +63,7 @@
     {
       "label": "提醒日",
       "prop": "reminderDay",
+      "valueFormat": "timestamp",
       "type": "date",
       "index": 9,
       "width": 150,
@@ -76,8 +71,13 @@
     },
     {
       "label": "任务部门",
-      "prop": "deptId",
+      "prop": "deptid",
       "type":"tree",
+      "dicUrl": "/api/blade-system/dept/tree?tenantId=",
+      "props": {
+        "label": "title",
+        "value": "value"
+      },
       "cell": true,
       "slot": true,
       "index": 11,
@@ -85,7 +85,7 @@
     },
     {
       "label": "承做人",
-      "prop": "userId",
+      "prop": "userid",
       "slot": true,
       "index": 12,
       "width": 180
@@ -93,6 +93,7 @@
     {
       "label": "需求开始日期",
       "prop": "beginTime",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "type": "date",
       "index": 13,
       "width": 150,
@@ -101,27 +102,23 @@
     {
       "label": "需求完成日期",
       "prop": "endTime",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
       "type": "date",
       "index": 14,
       "width": 150,
       "cell": true
     },
     {
-      "label": "备注",
-      "prop": "feeRemarks",
-      "index": 10,
-      "width": 150,
-      "cell": true
-    },
-    {
       "label": "制单人",
       "prop": "createUser",
+      "disabled": true,
       "index": 14,
       "width": 120
     },
     {
       "label": "制单日期",
       "prop": "createUser",
+      "disabled": true,
       "index": 14,
       "width": 150
     },

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

@@ -5,8 +5,14 @@
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
+        <el-button type="primary"
+                   class="el-button--small-yh add-customer-btn-two"
+                   icon="el-icon-plus"
+                   @click.stop="addMainProject">新 单
+        </el-button>
         <el-button class="el-button--small-yh add-customer-btn" type="primary"
-        >保存
+                   @click.stop="editMainProject"
+        >{{this.id?"确认修改" :"确认保存"}}
         </el-button>
       </div>
     </div>
@@ -17,17 +23,20 @@
           <el-row>
             <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:6" :key="index">
               <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+                <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" :disabled="item.disabled?true:false" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
                 <el-date-picker v-else-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]" size="small" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
-                <el-select v-else-if="item.type === 'select'" style="width: 100%" size="small" placeholder="请选择" clearable filterable></el-select>
+                <el-select v-else-if="item.prop === 'paymentType'" style="width: 100%" size="small" placeholder="请选择" clearable filterable>
+                  <el-option v-for="(item,index) in paymentTerm" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
                 <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
+                <el-input type="age" v-else v-model="form[item.prop]" :disabled="item.disabled?true:false" size="small" autocomplete="off" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </basic-container>
       <containerTitle title="明细列表"></containerTitle>
+      {{data}}
       <basic-container>
         <avue-crud
           ref="crud"
@@ -38,11 +47,11 @@
           v-model="optionFrom"
           @row-del="rowDel"
           @row-save="rowSave"
+          @row-update="rowUpdate"
           @size-change="sizeChange"
           @current-change="currentChange"
+          @selection-change="selectionChange"
           @search-change="searchChange"
-          @refresh-change="refreshChange"
-          @on-load="getList"
           @saveColumn="saveColumn"
         >
           <template slot="menuLeft">
@@ -51,14 +60,9 @@
                        icon="el-icon-plus"
                        @click="serviceDialog = true">新增明细
             </el-button>
-            <el-button type="primary"
-                       size="small"
-                       icon="el-icon-plus"
-                       @click="">新 单
-            </el-button>
             <el-button type="info"
                        size="small"
-                       @click="">请 核
+                       @click.stop="berforPleaseCheck">请 核
             </el-button>
           </template>
           <template slot="menuRight">
@@ -77,8 +81,8 @@
               @click="rowCellTwo(row,index)"
             >{{row.$cellEdit?'保存':'修改'}}</el-button>
           </template>
-          <template slot="userId" slot-scope="{row,index}">
-            <span style="float: left;padding-top: 2px">{{ row.userId }}</span>
+          <template slot="userid" slot-scope="{row,index}">
+            <span style="float: left;padding-top: 2px">{{ row.userName }}</span>
             <el-button type="text" size="mini" style="float: right" @click="selectUser(row)">选择</el-button>
           </template>
         </avue-crud>
@@ -179,31 +183,29 @@
 
 <script>
   import option from "./configuration/detailsPage.json";
-  import { projectDetail } from "@/api/workManagement/mainProject";
+  import { projectDetail,editMianProject,updateItemStatus } from "@/api/workManagement/mainProject";
   //上传文件json
   import upLoadOption from "../../exportTrade/purchaseContract/config/uploadList.json"
   //服务列表接口
   import {getServiceProjectList,getServiceTypeTree,} from "@/api/workManagement/serviceProject";
   import serviceOption from "./configuration/serviceDialogList.json";
-  //任务部门树接口
-  import {getLazyList} from "@/api/system/dept";
+  //业务字典
+  import { getDictionary } from "@/api/system/dictbiz";
   //用户组件
   import userOption from "./configuration/userList.json";
   import { getList } from "@/api/system/user";
   import { getDeptLazyTree} from "@/api/system/dept";
+  import type from "../service-items/type";
 
   export default {
     data() {
       return {
+        id:'',
         loading: false,
         form:{},
         optionFrom:{},
-        data: [
-          {
-            deptId:'',
-            userId:''
-          }
-        ],
+        data: [],
+        crudSelection:[],
         deptDicData:[],//任务部门数据
         serviceDialog:false,//服务导入窗口
         userDialog:false,//用户导入窗口
@@ -222,6 +224,7 @@
           pageSize: 10
         },
         detailsSelect: {},
+        paymentTerm:[],
         //顶部from数据
         basicData: {
           column: [
@@ -294,7 +297,6 @@
             {
               label: '已收金额',
               prop: 'settlmentAmount',
-              disabled:true,
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
@@ -312,11 +314,13 @@
             },
             {
               label: '制单人',
-              prop: 'createUser',
+              prop: 'createUserName',
+              disabled: true
             }, {
               label: '制单日期',
               prop: 'createTime',
-              type: 'datetime'
+              type: 'datetime',
+              disabled: true
             },
             {
               label: '电话',
@@ -328,7 +332,7 @@
               type:'select',
               dataType: "number",
               width: 120,
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=affair_payment_term",
               props: {
                 label: "dictValue",
                 value: "dictKey"
@@ -434,24 +438,42 @@
       };
     },
     created() {
-      if(this.$route.query.id){
-        projectDetail(this.$route.query.id).then(res =>{
-          this.form = res.data.data;
-          // this.data = res.data.data.itemList;
-        })
+      this.id = BigInt(this.$route.query.id);
+      this.getProjectDetail();
+      const params = {
+        code : "affair_payment_term"
       }
+      getDictionary(params).then(res =>{
+        this.paymentTerm = res.data.data;
+      })
     },
     mounted() {
 
     },
     methods: {
+      getProjectDetail(pleaseCheck){
+        if(this.id){
+          projectDetail(this.id,0).then(res =>{
+            this.form = res.data.data;
+            if(res.data.data.itemList){
+              this.dataList = res.data.data.itemList;
+              if(pleaseCheck === 10086){
+                this.pleaseCheck();
+              }
+            }else{
+              this.data = [];
+            }
+          })
+        }
+      },
       //删除列表后面的删除按钮触发触发(row, index, done)
       rowDel(row, index, done) {
-        this.$confirm("确定将选择数据删除?", {
+        this.$confirm("确定将此明细删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
+          this.data.splice(index,0)
           this.$message({
             type: "success",
             message: "操作成功!"
@@ -462,24 +484,18 @@
       },
       //点击修改或保存时触发
       rowCellTwo(row,index){
-        if(row.$cellEdit){
-          setTimeout(() => {
-            this.$message.success("保存成功");
-          }, 1000);
-        }else{
-          this.$refs.crud.rowCell(row, index);
-        }
+        this.$refs.crud.rowCell(row, index);
+      },
+      //选择时
+      selectionChange(row){
+        this.crudSelection = row;
       },
       //新增修改时保存触发
       rowSave(row, done, loading) {
-
+        done()
       },
-      getList() {
-        this.loading = true;
-        setTimeout(() => {
-          this.loading = false;
-          this.page.total = 1;
-        }, 1000);
+      rowUpdate(row, index, done, loading) {
+        done(row)
       },
       searchChange(params, done) {
         this.getList(this.page, params);
@@ -493,13 +509,83 @@
         this.page.currentPage = val;
         this.getList();
       },
-      refreshChange() {
-        this.page.currentPage = 1;
-        this.getList();
-      },
       saveColumn(row, column) {
         console.log(row, column);
       },
+      //新单
+      addMainProject(){
+        this.$confirm("需先将此单据保存", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(()=>{
+            this.$refs["form"].validate((valid) => {
+              if(valid){
+                this.$router.push({
+                  path: "/mainItems_detailsPage",
+                  query: {id: ''},
+                });
+                this.form = {}
+                this.data = []
+                this.id = ''
+              }
+            });
+        })
+      },
+      //请核
+      berforPleaseCheck(){
+        if(this.crudSelection.length!=0){
+           this.editMainProject(10086);
+        }else{
+          this.$message({
+            type: "error",
+            message: "请先选择一条数据!"
+          });
+        }
+      },
+      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).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) => {
+          if(valid){
+            const params = {
+              ...this.form,
+              itemList:this.data,
+            }
+            editMianProject(params).then(res =>{
+              if(pleaseCheck !== 10086){
+                this.$message({
+                  type: "success",
+                  message: "操作成功!"
+                });
+              }else{
+                this.getProjectDetail(pleaseCheck);
+              }
+            })
+          }
+        })
+      },
       //返回主营项目列表
       backToList(){
         this.$router.$avueRouter.closeTag();
@@ -567,16 +653,22 @@
       serviceConfirm(){
         if(this.serviceSelectList.length != 0){
           this.serviceSelectList.forEach((item)=>{
-            item.prop1 = item.code;
-            item.prop2 = item.name;
-            item.prop4 = item.unit;
-            item.prop3 = item.remarks;
-            this.$refs.crud.rowCellAdd(item);
+            const params = {
+              pname:item.cname,
+              remarks:item.remarks,
+              price:item.price,
+              unit:item.unit,
+            }
+            this.$refs.crud.rowCellAdd(params);
             this.$refs.crud.rowCell(item, this.optionFrom.length-1)
           })
         }
         this.serviceSelectList = []
         this.serviceDialog = false
+        this.$message({
+          type: "success",
+          message: "导入成功!"
+        });
       },
       //用户窗口事件
       selectUser(row){
@@ -611,7 +703,8 @@
       //确定
       userConfirm(){
          if(this.userSelection){
-           this.data[this.detailsSelect].userId = this.userSelection[0].realName;
+           this.data[this.detailsSelect].userid = this.userSelection[0].id;
+           this.data[this.detailsSelect].userName = this.userSelection[0].realName;
            this.userDialog = !this.userDialog
          }
       }
@@ -641,6 +734,11 @@
     overflow: hidden;
     max-height: 660px;
   }
+  .add-customer-btn-two {
+    position: fixed;
+    right: 150px;
+    top: 115px;
+  }
   .add-customer-btn {
     position: fixed;
     right: 36px;

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

@@ -6,7 +6,6 @@
       :option="optionTable"
       :page.sync="page"
       :table-loading="loading"
-      :before-open="beforeOpen"
       @row-del="rowDel"
       @row-update="rowUpdate"
       @row-save="rowSave"
@@ -38,13 +37,13 @@
           @click.stop="editOpen(scope.row, scope.index)"
         >编辑
         </el-button>
-        <el-button
-          icon="el-icon-check"
-          size="small"
-          type="text"
-          @click.stop="beforeOpenPage(scope.row, scope.index)"
-        >详 情
-        </el-button>
+<!--        <el-button-->
+<!--          icon="el-icon-check"-->
+<!--          size="small"-->
+<!--          type="text"-->
+<!--          @click.stop="beforeOpenPage(scope.row, scope.index)"-->
+<!--        >详 情-->
+<!--        </el-button>-->
         <el-button
           type="text"
           icon="el-icon-delete"
@@ -106,7 +105,8 @@ export default {
     onClose(val) {
       this.switchDialog = val;
     },
-    getList(page,params={}) {
+    //flag:0 判断是主营项目还是结算
+    getList(page,params={flag:0}) {
       this.loading = true;
       getList(page.currentPage, page.pageSize,params).then(res =>{
         this.data = res.data.data.records
@@ -123,9 +123,10 @@ export default {
     },
     //编辑打开
     editOpen(row, index){
+      console.log(row)
       this.$router.push({
         path: "/mainItems_detailsPage",
-        query: {id: JSON.stringify(row.id)},
+        query: {id:row.id},
       });
     },
     searchChange(params, done) {

src/views/workManagement/receipt/configuration/settleAccounts.json

@@ -10,99 +10,99 @@
   "searchMenuSpan": 6,
   "tree": true,
   "selection": true,
-  "editBtn": true,
+  "editBtn": false,
   "viewBtn": false,
-  "delBtn": true,
+  "delBtn": false,
   "menuWidth": 220,
   "column": [
     {
-      "label": "项目编码",
-      "prop": "prop1",
-      "search": true,
+      "label": "系统编号",
+      "prop": "sysNo",
       "index": 1,
-      "width": 100
+      "width": 120
     },
     {
-      "label": "项目名称",
-      "prop": "prop2",
+      "label": "项目编码",
+      "prop": "code",
       "search": true,
       "index": 2,
-      "width": 100
+      "width": 120
     },
     {
-      "label": "客户名称",
-      "prop": "prop3",
+      "label": "项目名称",
+      "prop": "cname",
       "search": true,
       "index": 3,
-      "width": 100
+      "width": 120
     },
     {
-      "label": "应收金额",
-      "prop": "prop4",
+      "label": "客户名称",
+      "prop": "corpId",
+      "search": true,
       "index": 4,
-      "width": 100
+      "width": 120
     },
     {
-      "label": "实收金额",
-      "prop": "prop5",
+      "label": "应收金额",
+      "prop": "debitAmount",
       "index": 5,
-      "width": 100
+      "width": 120
     },
     {
-      "label": "责任人",
-      "prop": "prop6",
-      "search": true,
+      "label": "实收金额",
+      "prop": "settlmentAmount",
       "index": 6,
-      "width": 100
+      "width": 120
     },
     {
-      "label": "系统编号",
-      "prop": "prop7",
+      "label": "责任人",
+      "prop": "corpAttn",
+      "search": true,
       "index": 7,
-      "width": 100
+      "width": 120
     },
     {
       "label": "电话",
-      "prop": "prop8",
+      "prop": "corpTel",
       "index": 8,
-      "width": 100
+      "width": 150
     },
     {
       "label": "状态",
-      "prop": "prop9",
+      "prop": "status",
       "index": 9,
-      "width": 100
+      "width": 120
     },
     {
       "label": "备注",
-      "prop": "prop10",
+      "prop": "remark",
       "search": true,
       "index": 10,
-      "width": 100
+      "width": 150
     },
     {
-      "label": "录入人",
-      "prop": "prop11",
+      "label": "制单人",
+      "prop": "createUser",
       "index": 11,
-      "width": 100
+      "width": 120
     },
     {
-      "label": "录入时间",
-      "prop": "prop12",
+      "label": "制单日期",
+      "prop": "createTime",
       "index": 12,
-      "width": 100
+      "width": 150
     },
     {
       "label": "最新修改人",
-      "prop": "prop13",
+      "prop": "updateUser",
       "index": 13,
-      "width": 100
+      "width": 120
     },
     {
       "label": "最新修改时间",
-      "prop": "prop14",
+      "prop": "updateTime",
       "index": 14,
-      "width": 100
+      "width": 150
     }
   ]
 }

src/views/workManagement/receipt/configuration/settleAccountsDetailsPage.json

@@ -17,89 +17,45 @@
   "column": [
     {
       "label": "服务项目",
-      "prop": "fwxm",
+      "prop": "pName",
       "index": 1,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入服务项目",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
       "label": "收费建议",
-      "prop": "sfjy",
+      "prop": "remarks",
       "index": 2,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入收费建议",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150
     },
     {
-      "label": "计价单位",
-      "prop": "jjdw",
+      "label": "单价",
+      "prop": "price",
       "index": 3,
-      "width": 100,
-      "cell": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入计价单位",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
-      "label": "数量",
-      "prop": "sl",
+      "label": "计价单位",
+      "prop": "unit",
       "index": 4,
-      "width": 100,
-      "cell": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入数量",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
-      "label": "报价",
-      "prop": "bj",
+      "label": "数量",
+      "prop": "quantity",
       "index": 5,
-      "width": 100,
-      "cell": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入报价",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120,
+      "cell": true
     },
     {
       "label": "合计金额",
-      "prop": "hejijin",
+      "prop": "amount",
       "index": 6,
-      "width": 100,
-      "cell": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入合计金额",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120,
+      "cell": true
     },
     {
       "label": "确认收费",
-      "prop": "querenshou",
+      "prop": "receipt",
       "index": 7,
       "width": 100,
       "rules": [
@@ -112,147 +68,91 @@
     },
     {
       "label": "频率",
-      "prop": "pinlv",
-      "index": 8,
-      "width": 100,
-      "cell": true,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入频率",
-          "trigger": "blur"
-        }
-      ]
+      "prop": "frequency",
+      "index": 7,
+      "width": 120,
+      "cell": true
     },
     {
       "label": "提醒日",
-      "prop": "tixingri",
+      "prop": "reminderDay",
+      "valueFormat": "timestamp",
+      "type": "date",
       "index": 9,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入提醒日",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "备注",
-      "prop": "beizhu",
-      "index": 10,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入备注",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150,
+      "cell": true
     },
     {
       "label": "任务部门",
-      "prop": "renwubu",
+      "prop": "deptId",
+      "type":"tree",
+      "dicUrl": "/api/blade-system/dept/tree?tenantId=",
+      "props": {
+        "label": "title",
+        "value": "value"
+      },
+      "cell": true,
+      "slot": true,
       "index": 11,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入任务部门",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150
     },
     {
       "label": "承做人",
-      "prop": "cnegzuoren",
+      "prop": "userId",
+      "slot": true,
       "index": 12,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入承做人",
-          "trigger": "blur"
-        }
-      ]
+      "width": 180
     },
     {
-      "label": "开始日期",
-      "prop": "cname",
+      "label": "需求开始日期",
+      "prop": "beginTime",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "type": "date",
       "index": 13,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入开始日期",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150,
+      "cell": true
     },
     {
-      "label": "要求完成日期",
-      "prop": "cname",
+      "label": "需求完成日期",
+      "prop": "endTime",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "type": "date",
       "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入要求完成日期",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150,
+      "cell": true
     },
     {
-      "label": "录入人",
-      "prop": "cname",
+      "label": "备注",
+      "prop": "feeRemarks",
+      "index": 10,
+      "width": 150,
+      "cell": true
+    },
+    {
+      "label": "制单人",
+      "prop": "createUser",
+      "disabled": true,
       "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入录入人",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
-      "label": "录入时间",
-      "prop": "cname",
+      "label": "制单日期",
+      "prop": "createUser",
+      "disabled": true,
       "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入录入时间",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150
     },
     {
       "label": "最新修改人",
-      "prop": "cname",
+      "prop": "updateUser",
       "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入最新修改人",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
       "label": "最新修改时间",
-      "prop": "cname",
+      "prop": "updateTime",
       "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入最新修改时间",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150
     }
   ]
 }

src/views/workManagement/receipt/settleAccounts.vue

@@ -17,15 +17,22 @@
       @saveColumn="saveColumn"
     >
       <template slot-scope="{row,index}" slot="menuLeft">
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-arrow-right"
-                   plain
-                   @click="">导 出
+        <el-button
+          icon="el-icon-printer"
+          size="small"
+          type="primary"
+          @click.stop="openReport()"
+        >报 表
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
-        <el-button icon="el-icon-check"  size="small" type="text" @click.stop="beforeOpenPage(scope.row,scope.index)">详 情</el-button>
+        <el-button
+          type="text"
+          icon="el-icon-check"
+          size="small"
+          @click.stop="settleAccounts(scope.row, scope.index)"
+        >结 算
+        </el-button>
       </template>
     </avue-crud>
   </basic-container>
@@ -33,6 +40,7 @@
 
 <script>
   import option from "./configuration/settleAccounts.json";
+  import { getList } from "@/api/workManagement/mainProject";
 
   export default {
     data() {
@@ -51,50 +59,19 @@
       option.height = window.innerHeight - 340 ;
     },
     methods: {
-      getList() {
+      getList(page,params={flag:1}) {
         this.loading = true;
-        setTimeout(() => {
-          this.loading = false;
-          this.data = [
-            {
-              prop1: "TUBAO",
-              prop2: "途宝注册",
-              prop3: "途宝",
-              prop4: "2100",
-              prop5: "1500",
-              prop6: "李俊平",
-              prop7: "XM0001",
-              prop8: "暂存",
-              prop9: "效率高",
-              prop10: "LOLO",
-              prop11: "2021-1-1",
-              prop12: "LOLO",
-              prop13: "2021-1-1",
-              prop14: "15199999999"
-            }
-          ];
-          this.page.total = 1;
-        }, 1000);
-      },
-      //新单打开
-      addSettleAccounts(){
-        this.$router.push({
-          path: "/settleAccounts_detailsPage",
-          query: {id: ""},
-        });
-      },
-      //新增和修改时打开
-      beforeOpen(row, index){
-        this.$router.push({
-          path: "/settleAccounts_detailsPage",
-          query: {id: JSON.stringify(row.prop1)},
-        });
+        getList(page.currentPage, page.pageSize,params).then(res =>{
+          this.data = res.data.data.records
+          this.page.total = res.data.data.total
+          this.loading = false
+        })
       },
-      //打开详情页
-      beforeOpenPage(row,index){
+      //结算
+      settleAccounts(row){
         this.$router.push({
           path: "/settleAccounts_detailsPage",
-          query: {id: JSON.stringify(row.prop1)},
+          query: {id: row.id},
         });
       },
       searchChange(params, done) {

src/views/workManagement/receipt/settleAccountsDetailsPage.vue

@@ -29,47 +29,24 @@
                    ref="crud"
                    v-model="form"
                    :page.sync="page"
-                   @row-del="rowDel"
-                   @row-save="rowSave"
-                   @search-change="searchChange"
+                   :table-loading="loading"
                    @search-reset="searchReset"
                    @selection-change="selectionChange"
                    @current-change="currentChange"
                    @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @on-load="onLoad">
+                   @refresh-change="refreshChange">
           <template slot="menuLeft">
-            <el-button type="primary"
-                       size="small"
-                       icon="el-icon-arrow-right"
-                       plain
-                       @click="">导 出
-            </el-button>
-            <el-button type="primary"
-                       size="small"
-                       plain
-                       @click="">打 印
-            </el-button>
-          </template>
-          <template slot-scope="{row}" slot="querenshou">
-            <el-button type="primary"  size="small" @click="">结 算</el-button>
-          </template>
-          <template slot-scope="scope" slot="menu">
-            <el-button
-              type="text"
-              icon="el-icon-edit"
-              size="small"
-              @click.stop="editOpen(scope.row,scope.index)"
-            >{{scope.row.$cellEdit?'保存':'修改'}}
-            </el-button>
             <el-button
-              type="text"
-              icon="el-icon-edit"
+              icon="el-icon-printer"
               size="small"
-              @click.stop="rowDel(scope.row,scope.index)"
-            >移除
+              type="primary"
+              @click.stop="openReport()"
+            >报表
             </el-button>
           </template>
+          <template slot-scope="scope" slot="receipt">
+            <el-button type="primary"  size="small" @click="closeAccount(scope.row,scope.index)">结 算</el-button>
+          </template>
         </avue-crud>
       </basic-container>
       <containerTitle title="附件上传"></containerTitle>
@@ -90,11 +67,13 @@
 <script>
   import option from "./configuration/settleAccountsDetailsPage.json";
   import upLoadOption from "../../exportTrade/purchaseContract/config/uploadList.json";
+  import { projectDetail,updateItemStatus } from "@/api/workManagement/mainProject";
 
   export default {
     name: "customerInformation",
     data() {
       return {
+        loading:false,
         form: {},
         option: option,
         parentId:0,
@@ -113,7 +92,7 @@
               rules: [
                 {
                   required: true,
-                  message: '请输入系统编号',
+                  message: ' ',
                   trigger: 'blur'
                 }
               ]
@@ -123,7 +102,7 @@
               rules: [
                 {
                   required: true,
-                  message: '请输入项目编码',
+                  message: ' ',
                   trigger: 'blur'
                 }
               ]
@@ -133,7 +112,7 @@
               rules: [
                 {
                   required: true,
-                  message: '请输入项目名称',
+                  message: ' ',
                   trigger: 'blur'
                 }
               ]
@@ -146,7 +125,7 @@
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
-                  message: '请输入数字或小数，且小数位不超过两位',
+                  message: ' ',
                   trigger: 'blur'
                 }
               ]
@@ -157,7 +136,7 @@
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
-                  message: '请输入数字或小数，且小数位不超过两位',
+                  message: ' ',
                   trigger: 'blur'
                 }
               ]
@@ -168,7 +147,7 @@
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
-                  message: '请输入数字或小数，且小数位不超过两位',
+                  message: ' ',
                   trigger: 'blur'
                 }
               ]
@@ -176,11 +155,10 @@
             {
               label: '已收金额',
               prop: 'settlmentAmount',
-              disabled:true,
               rules: [
                 {
                   pattern: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
-                  message: '请输入数字或小数，且小数位不超过两位',
+                  message: ' ',
                   trigger: 'blur'
                 }
               ]
@@ -194,11 +172,13 @@
             },
             {
               label: '制单人',
-              prop: 'createUser',
+              prop: 'createUserName',
+              disabled: true
             }, {
               label: '制单日期',
               prop: 'createTime',
-              type: 'datetime'
+              type: 'datetime',
+              disabled: true
             },
             {
               label: '电话',
@@ -210,7 +190,7 @@
               type:'select',
               dataType: "number",
               width: 120,
-              dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=affair_payment_term",
               props: {
                 label: "dictValue",
                 value: "dictKey"
@@ -234,40 +214,7 @@
           ],
         },
         //列表假数据
-        dataList : [
-          {
-            fwxm: "食品许可",
-            sfjy: "5000",
-            jjdw: "次",
-            sl:"12",
-            bj: "3000",
-            hjje: "6000",
-            qesf: "8000",
-            hejijin:"1500",
-            querenshou:"300",
-            pinlv:"年",
-            tixingri:"2022-11-30",
-            beizhu:"132",
-            renwubu:"商务部",
-            cnegzuoren:"小明",
-          },
-          {
-            fwxm: "食品许可",
-            sfjy: "5000",
-            jjdw: "次",
-            sl:"12",
-            bj: "3000",
-            hjje: "6000",
-            qesf: "8000",
-            hejijin:"1500",
-            querenshou:"300",
-            pinlv:"年",
-            tixingri:"2022-11-30",
-            beizhu:"132",
-            renwubu:"商务部",
-            cnegzuoren:"小明",
-          }
-        ],
+        dataList : [],
         //上传文件
         upLoadOption: upLoadOption,
         upLoadData:[],
@@ -275,53 +222,56 @@
       }
     },
     created() {
-
+      this.id = BigInt(this.$route.query.id);
+      this.getProjectDetail();
+      const params = {
+        code : "affair_payment_term"
+      }
+      getDictionary(params).then(res =>{
+        // this.paymentTerm = res.data.data;
+      })
     },
     mounted() {
 
     },
     methods: {
-      backToList(){
-        this.$router.$avueRouter.closeTag();
-        this.$router.push({
-          path: '/workManagement/receipt/settleAccounts',
-          query: {}
-        });
-      },
-      //修改
-      editOpen(row,index){
-        this.$refs.crud.rowCell(row, index)
-      },
-      //修改时保存触发
-      rowSave(row, done, loading) {
-        setTimeout(() => {
-          this.$message.success("保存成功");
-          loading();
-          done();
-        }, 1000);
+      getProjectDetail(){
+        if(this.id){
+          projectDetail(this.id,2).then(res =>{
+            this.form = res.data.data;
+            if(res.data.data.itemList){
+              this.loading = true;
+              this.dataList = res.data.data.itemList;
+              this.loading = false;
+            }
+          })
+        }
       },
-      //删除列表后面的删除按钮触发触发(row, index, done)
-      rowDel(row, index, done) {
-        this.$confirm("确定将选择数据删除?", {
+      //结算
+      closeAccount(row,index){
+        this.$confirm("确认结算次明细?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          // 数据回调进行刷新
-          done(row);
+          updateItemStatus(row.id,3).then(res =>{
+            if(res.data.success){
+              this.$message({
+                type: "success",
+                message: "操作成功!"
+              });
+              this.getProjectDetail();
+            }
+          })
         });
       },
-      //点击搜索按钮触发
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        params.parentId = 0
-        this.onLoad(this.page, params);
-        done()
+      //返回列表
+      backToList(){
+        this.$router.$avueRouter.closeTag();
+        this.$router.push({
+          path: '/workManagement/receipt/settleAccounts',
+          query: {}
+        });
       },
       searchReset() {
         console.log('1')
@@ -338,29 +288,6 @@
       refreshChange() {
         console.log('1')
       },
-      onLoad(page, params = {}) {
-        const {createTimeA} = this.query;
-        let values = {
-          ...params,
-          size:this.page.pageSize,
-          current:this.page.currentPage
-        };
-        if (createTimeA) {
-          values = {
-            ...params,
-            createTime: createTimeA[0] + ' 00:00:00',
-            endTime: createTimeA[1] + ' 23:59:59',
-            ...this.query,
-            size:this.page.pageSize,
-            current:this.page.currentPage
-          };
-          values.createTimeA = null;
-        }
-        values.parentId = 0
-        // customerList(values).then(res => {
-        //   this.page.total = 1;
-        // })
-      },
       //上传文件保存
       upLoadSave(row, done, loading){
         this.upLoadData.push(row)
@@ -416,4 +343,7 @@
     color: #323233;
     font-weight: 400;
   }
+  ::v-deep .el-form-item {
+    margin-bottom: 0;
+  }
 </style>

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

@@ -67,14 +67,7 @@
       "label": "单价",
       "prop": "price",
       "index": 3,
-      "width": 120,
-      "rules": [
-        {
-          "pattern": "/^(([1-9][0-9]*)|(([0]\\.\\d{1,2}|[1-9][0-9]*\\.\\d{1,2})))$/",
-          "message":"请输入数字或小数，且小数位不超过两位",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
       "label": "计价单位",

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

@@ -68,7 +68,6 @@
       "type": "tree",
       "hide": true,
       "overHidden": true,
-      "addDisabled": false,
       "props": {
         "label": "cname",
         "value": "id"
@@ -84,7 +83,7 @@
       "prop": "createUser",
       "index": 4,
       "overHidden": true,
-      "addDisabled": false,
+      "addDisplay": false,
       "editDisplay":false
     },
     {
@@ -95,7 +94,7 @@
       "valueFormat": "yyyy-MM-dd",
       "overHidden": true,
       "searchRange":true,
-      "addDisabled": false,
+      "addDisplay": false,
       "editDisplay":false,
       "index": 5
     }

src/views/workManagement/task/configuration/mainList.json

@@ -16,191 +16,125 @@
   "menuWidth": 150,
   "column": [
     {
-      "label": "项目代码",
-      "prop": "aname",
+      "label": "服务项目",
+      "prop": "pname",
       "search": true,
       "index": 1,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入项目代码",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
-      "label": "项目名称",
-      "prop": "bname",
-      "search": true,
+      "label": "收费建议",
+      "prop": "remarks",
       "index": 2,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入项目名称",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150
     },
     {
-      "label": "客户名称",
-      "prop": "cname",
-      "search": true,
+      "label": "单价",
+      "prop": "price",
       "index": 3,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入客户名称",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
-      "label": "服务项目",
-      "prop": "dname",
-      "search": true,
+      "label": "计价单位",
+      "prop": "unit",
       "index": 4,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入服务项目",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120
     },
     {
-      "label": "下单时间",
-      "prop": "ename",
+      "label": "数量",
+      "prop": "quantity",
       "index": 5,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入下单时间",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120,
+      "cell": true
     },
     {
-      "label": "开始日期",
-      "prop": "fname",
+      "label": "合计金额",
+      "prop": "amount",
       "index": 6,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入开始日期",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120,
+      "cell": true
     },
     {
-      "label": "需求完成日期",
-      "prop": "gname",
+      "label": "频率",
+      "prop": "frequency",
       "index": 7,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入需求完成日期",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120,
+      "cell": true
     },
     {
-      "label": "部门",
-      "prop": "hname",
-      "index": 8,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入部门",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "备注",
-      "prop": "iname",
+      "label": "提醒日",
+      "prop": "reminderDay",
+      "search": true,
+      "valueFormat": "timestamp",
+      "type": "date",
       "index": 9,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入备注",
-          "trigger": "blur"
-        }
-      ]
-    },
-    {
-      "label": "应收金额",
-      "prop": "jname",
-      "index": 10,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入应收金额",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150,
+      "cell": true
     },
     {
-      "label": "任务责任人",
-      "prop": "kname",
+      "label": "任务部门",
+      "prop": "deptid",
+      "type":"tree",
+      "dicUrl": "/api/blade-system/dept/tree?tenantId=",
+      "props": {
+        "label": "title",
+        "value": "value"
+      },
+      "cell": true,
+      "slot": true,
       "index": 11,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入任务责任人",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150
     },
     {
-      "label": "系统编号",
-      "prop": "cname",
+      "label": "承做人",
+      "prop": "userid",
+      "slot": true,
       "index": 12,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入系统编号",
-          "trigger": "blur"
-        }
-      ]
+      "width": 180
     },
     {
-      "label": "状态",
-      "prop": "cname",
+      "label": "需求开始日期",
+      "prop": "beginTime",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "type": "date",
       "index": 13,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入状态",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150,
+      "cell": true
     },
     {
-      "label": "备注",
-      "prop": "cname",
-      "search": true,
+      "label": "需求完成日期",
+      "prop": "endTime",
+      "valueFormat": "yyyy-MM-dd HH:mm:ss",
+      "type": "date",
+      "index": 14,
+      "width": 150,
+      "cell": true
+    },
+    {
+      "label": "制单人",
+      "prop": "createUser",
+      "disabled": true,
+      "index": 14,
+      "width": 120
+    },
+    {
+      "label": "制单日期",
+      "prop": "createUser",
+      "disabled": true,
+      "index": 14,
+      "width": 150
+    },
+    {
+      "label": "最新修改人",
+      "prop": "updateUser",
+      "index": 14,
+      "width": 120
+    },
+    {
+      "label": "最新修改时间",
+      "prop": "updateTime",
       "index": 14,
-      "width": 100,
-      "rules": [
-        {
-          "required": true,
-          "message": "请输入备注",
-          "trigger": "blur"
-        }
-      ]
+      "width": 150
     }
   ]
 }

src/views/workManagement/task/index.vue

@@ -5,8 +5,7 @@
                ref="crud"
                v-model="form"
                :page.sync="page"
-               :before-open="beforeOpen"
-               @row-del="rowDel"
+               :table-loading="loading"
                @search-change="searchChange"
                @search-reset="searchReset"
                @selection-change="selectionChange"
@@ -15,11 +14,12 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="primary"
-                   size="small"
-                   icon="el-icon-upload2"
-                   plain
-                   @click="">导 出
+        <el-button
+          icon="el-icon-printer"
+          size="small"
+          type="primary"
+          @click.stop="openReport()"
+        >报 表
         </el-button>
       </template>
       <template slot-scope="scope" slot="menu">
@@ -34,7 +34,7 @@
           type="text"
           icon="el-icon-edit"
           size="small"
-          @click.stop=""
+          @click.stop="completion(scope.row)"
         >完工
         </el-button>
       </template>
@@ -44,11 +44,13 @@
 
 <script>
   import option from "./configuration/mainList.json";
-
+  import { getFlowList } from "@/api/workManagement/mainProject";
+  import { updateItemStatus } from "@/api/workManagement/mainProject";
   export default {
     name: "customerInformation",
     data() {
       return {
+        loading : false,
         form: {},
         option: option,
         parentId:0,
@@ -71,19 +73,22 @@
       option.height = window.innerHeight - 350 ;
     },
     methods: {
-      //删除列表后面的删除按钮触发触发(row, index, done)
-      rowDel(row, index, done) {
-        this.$confirm("确定将选择数据删除?", {
+      //完工
+      completion(row){
+        this.$confirm("确认将此任务完工?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          // 数据回调进行刷新
-          done(row);
+          updateItemStatus(row.id,2).then(res =>{
+            if(res.data.success){
+              this.$message({
+                type: "success",
+                message: "操作成功!"
+              });
+              this.onLoad(this.page);
+            }
+          })
         });
       },
       //点击搜索按钮触发
@@ -109,38 +114,13 @@
       refreshChange() {
         console.log('1')
       },
-      onLoad(page, params = {}) {
-        const {createTimeA} = this.query;
-        let values = {
-          ...params,
-          size:this.page.pageSize,
-          current:this.page.currentPage
-        };
-        if (createTimeA) {
-          values = {
-            ...params,
-            createTime: createTimeA[0] + ' 00:00:00',
-            endTime: createTimeA[1] + ' 23:59:59',
-            ...this.query,
-            size:this.page.pageSize,
-            current:this.page.currentPage
-          };
-          values.createTimeA = null;
-        }
-        values.parentId = 0
-        this.dataList = [{
-          aname:"tuobao",
-          bname:"途宝注册",
-          cname:"途宝",
-          dname:"ABC",
-          ename:"2020-10-10",
-          fname:"2020-10-10",
-          gname:"2020-10-10",
-          hname:"技术部",
-          iname:"123",
-          jname:"2100",
-          kname:"李",
-        }];
+      onLoad(page, params = {status:1}) {
+        this.loading = true
+        getFlowList(page.currentPage, page.pageSize,params).then(res =>{
+          this.dataList = res.data.data.records
+          this.page.total = res.data.data.total
+          this.loading = false
+        })
       },
     }
   }