molilang 3 лет назад
Родитель
Сommit
7fdf8f039a

+ 13 - 7
src/pages/main/gridDivision/approvalExamination.vue

@@ -60,12 +60,13 @@
         :loading="table_loading_track"
       ></simple-table>
       <template v-slot:footer>
-        <div>
+        <!-- <div>
           <el-button @click="handleVisible('track')" type="default"
             >退回修改</el-button
           >
           <el-button @click="handleConsent" type="primary">同意</el-button>
-        </div>
+        </div> -->
+          <el-button @click="handleConsent" type="primary">确定</el-button>
       </template>
     </simple-dialog>
   </div>
@@ -147,7 +148,7 @@ export default {
       table_config: [
         {
           label: "序号",
-          props: "id",
+          props: "No",
         },
         {
           label: "公司名称",
@@ -193,11 +194,11 @@ export default {
       table_config_track: [
         {
           label: "编号",
-          props: "number",
+          props: "No",
         },
         {
           label: "流程环节",
-          props: "procName",
+          props: "taskName",
         },
         {
           label: "处理人",
@@ -245,8 +246,9 @@ export default {
       }).then(({ data: { count, data } }) => {
         this.table_loading = false;
         this.total = count;
-        this.table_list = data.map((element) => ({
+        this.table_list = data.map((element,index) => ({
           ...element,
+          No: index + 1,
         }));
         data.forEach((item) => {
           this.adoptIds.push(item.id.toString());
@@ -261,6 +263,7 @@ export default {
       this.page = 1;
       this.handleInit();
     },
+    // 翻页
     handleChange(page) {
       this.page = page;
       this.handleInit();
@@ -301,7 +304,10 @@ export default {
         let body = data.body;
         console.log(body, "body");
         // this.ids = [body.id.toString()];
-        this.table_list_track = body.bpmTaskList;
+        this.table_list_track = body.bpmTaskList.map((item, index) => ({
+          ...item,
+          No: index + 1,
+        }));
       });
       this.handleVisible("track");
     },

+ 1 - 16
src/pages/main/gridDivision/workersList.vue

@@ -214,22 +214,7 @@ export default {
         },
       ],
       // 列表数据
-      table_list: [
-        // {
-        //   id: 1,
-        //   companyName: "xq",
-        //   proposer: "mll",
-        //   createTime: 1654563154824,
-        //   status: 0,
-        // },
-        // {
-        //   id: 2,
-        //   companyName: "xq",
-        //   proposer: "mll",
-        //   createTime: 1654963568455,
-        //   status: 1,
-        // },
-      ],
+      table_list: [],
       table_loading: false,
       //   表格里的操作按钮
       table_handle_row: [