已审批提交

longyvfengyun

2022-07-29 7bcb8323ea54dc13d366d6de732a15c8a4acc495

已审批提交

 src/pages/workplace/apis.js

@@ -70,11 +70,14 @@
 * 查看分页-已审批
 * @returns {AxiosPromise}
 */
export const approvedListPage = ()=>{
export const approvedListPage = (pageNum, pageSize)=>{
  return axios({
    method: "GET",
    url: "worksheetMain/approvedListPage",
    params: null
    params: {
      pageNum,
      pageSize
    }
  });
}


 src/pages/workplace/approvedList/ApprovedList.vue

@@ -1,16 +1,17 @@
<template>
  <page-toggle-transition v-if="isShow" :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
    <advance-table
        :data-source="dataSource"
        :columns="columns"
        :loading="loading"
        title="已审批"
        row-key="name"
        @search="onSearch"
        @refresh="onRefresh"
        @reset="onReset"
        :format-conditions="true"
        :pagination="{
    <div class="page-content">
      <advance-table
          :data-source="dataSource"
          :columns="columns"
          :loading="loading"
          title="已审批"
          row-key="beginTime"
          @search="onSearch"
          @refresh="onRefresh"
          @reset="onReset"
          :format-conditions="true"
          :pagination="{
        current: page,
        pageSize: pageSize,
        total: total,
@@ -21,24 +22,34 @@
        onChange: onPageChange,
        onShowSizeChange: onSizeChange,
      }">
      <template slot="action" slot-scope="scope">
        <a @click="scope.record">下载</a>
        <a-divider type="vertical"></a-divider>
        <a @click="scope.record">详情</a>
      </template>
    </advance-table>
        <template slot="action" slot-scope="scope">
          <a @click="show(scope)">详情</a>
        </template>
      </advance-table>
      <a-modal
          v-model="workDetailVisible"
          title="详情"
          centered
          :footer="false"
          :width="1300">
        <draw-upload :list="subList" text="审核结果" no-footer></draw-upload>
      </a-modal>
    </div>
  </page-toggle-transition>
</template>

<script>
import PageToggleTransition from "@/components/transition/PageToggleTransition";
import AdvanceTable from "@/components/table/advance/AdvanceTable";
import DrawUpload from "@/pages/components/drawUpload/DrawUpload";
import {mapState} from "vuex";
import {approvedListPage, linkInfo} from "@/pages/workplace/apis";
export default {
  name: "ApprovedList",
  name: "NotApproved",
  components: {
    PageToggleTransition,
    AdvanceTable,
    DrawUpload,
  },
  props: {
    isShow: {
@@ -49,34 +60,29 @@
  data() {
    return {
      loading: false,
      workDetailVisible: false,
      page: 1,
      pageSize: 10,
      total: 100,
      total: 0,
      conditions: {},
      columns: [
        {
          title: '图纸编码',
          dataIndex: 'name',
          key: 'name',
          align: "center",
          searchAble: true
          title: '工单标题',
          dataIndex: 'title',
          key: 'title',
          align: "center"
        },
        {
          title: '图纸类型',
          dataIndex: 'type',
          key: 'type',
          align: "center",
          searchAble: true,
          dataType: 'select',
          search: {
            selectOptions: []
          }
          title: '工单描述',
          dataIndex: 'description',
          key: 'description',
          align: "center"
        },
        {
          title: '上传日期',
          dataIndex: 'uploadDate',
          key: 'uploadDate',
          align: "center",
          title: '创建日期',
          dataIndex: 'beginTime',
          key: 'beginTime',
          align: "center"
        },
        {
          title: '操作',
@@ -84,19 +90,20 @@
          key: 'operation',
          align: "center",
          fixed: 'right',
          width: 100,
          scopedSlots: { customRender: 'action' }
        },
      ],
      dataSource: [],
      subList: [],
    }
  },
  methods: {
    show(scope) {
      console.log(scope);
      let record = scope.record;
      this.searchBomList(record.id);
    },
    onSearch(conditions, searchOptions) {
      console.log(conditions);
      console.log(searchOptions);
      this.page = 1
      this.conditions = conditions
      this.searchData();
@@ -120,15 +127,45 @@
      this.searchData()
    },
    searchData() {
      console.log("查询后台返回参数");
      approvedListPage(this.page, this.pageSize).then(res=>{
        let rs = res.data;
        let data = [];
        if(rs.code == 1) {
          data = rs.data.list.map(item=>{
            return item;
          });
        }
        this.total = rs.data.total;
        this.dataSource = data;
      });
    },
    searchBomList(id) {
      let loading = this.$layer.loading();
      linkInfo(id).then(res=>{
        this.$layer.close(loading);
        let rs = res.data;
        let rsData = rs.data;
        let data = [];
        if(rs.code == 1) {
          data = rsData.approvingBomList;
        }
        this.subList = data;
        this.workDetailVisible = true;
      }).catch(error=>{
        console.log(error);
        this.$layer.close(loading);
      });
    },
  },
  computed: {
    ...mapState('setting', ['animate']),
  },
  mounted() {
    this.searchData();
  }
}
</script>

<style scoped>

</style>
</style>

 src/pages/workplace/handledList/HandledList.vue

@@ -32,7 +32,7 @@
          centered
          :footer="false"
          :width="1300">
        <draw-upload v-if="isReload" :list="subList" text="审核结果" no-footer></draw-upload>
        <draw-upload :list="subList" text="审核结果" no-footer></draw-upload>
      </a-modal>
    </div>
  </page-toggle-transition>
@@ -186,9 +186,6 @@
    workDetailTitle() {
      return this.title;
    },
    isReload() {
      return this.workDetailVisible || this.auditFormVisible?true:false;
    }
  },
  mounted() {
    this.searchData();

 src/pages/workplace/myDraw/MyDraw.vue

@@ -121,6 +121,7 @@
      pageSize: 10,
      total: 5,
      conditions: {},
      title: "",
      columns: [
        {
          title: '图纸编码',

 src/pages/workplace/notApproved/NotApproved.vue

@@ -1,16 +1,17 @@
<template>
  <page-toggle-transition v-if="isShow" :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
    <advance-table
        :data-source="dataSource"
        :columns="columns"
        :loading="loading"
        title="审批中"
        row-key="beginTime"
        @search="onSearch"
        @refresh="onRefresh"
        @reset="onReset"
        :format-conditions="true"
        :pagination="{
    <div class="page-content">
      <advance-table
          :data-source="dataSource"
          :columns="columns"
          :loading="loading"
          title="审批中"
          row-key="beginTime"
          @search="onSearch"
          @refresh="onRefresh"
          @reset="onReset"
          :format-conditions="true"
          :pagination="{
        current: page,
        pageSize: pageSize,
        total: total,
@@ -21,23 +22,34 @@
        onChange: onPageChange,
        onShowSizeChange: onSizeChange,
      }">
      <template slot="action" slot-scope="scope">
        <a @click="scope.record">详情</a>
      </template>
    </advance-table>
        <template slot="action" slot-scope="scope">
          <a @click="show(scope)">详情</a>
        </template>
      </advance-table>
      <a-modal
          v-model="workDetailVisible"
          title="详情"
          centered
          :footer="false"
          :width="1300">
        <draw-upload :list="subList" text="审核结果" no-footer></draw-upload>
      </a-modal>
    </div>
  </page-toggle-transition>
</template>

<script>
import PageToggleTransition from "@/components/transition/PageToggleTransition";
import AdvanceTable from "@/components/table/advance/AdvanceTable";
import DrawUpload from "@/pages/components/drawUpload/DrawUpload";
import {mapState} from "vuex";
import {approvingListPage} from "@/pages/workplace/apis";
import {approvingListPage, linkInfo} from "@/pages/workplace/apis";
export default {
  name: "NotApproved",
  components: {
    PageToggleTransition,
    AdvanceTable,
    DrawUpload,
  },
  props: {
    isShow: {
@@ -48,6 +60,7 @@
  data() {
    return {
      loading: false,
      workDetailVisible: false,
      page: 1,
      pageSize: 10,
      total: 0,
@@ -88,15 +101,15 @@
        },
      ],
      dataSource: [],
      subList: [],
    }
  },
  methods: {
    show(scope) {
      console.log(scope);
      let record = scope.record;
      this.searchBomList(record.id);
    },
    onSearch(conditions, searchOptions) {
      console.log(conditions);
      console.log(searchOptions);
      this.page = 1
      this.conditions = conditions
      this.searchData();
@@ -122,6 +135,7 @@
    searchData() {
      approvingListPage(this.page, this.pageSize).then(res=>{
        let rs = res.data;
        console.log(rs);
        let data = [];
        if(rs.code == 1) {
          data = rs.data.list.map(item=>{
@@ -133,6 +147,23 @@
        this.dataSource = data;
      });
    },
    searchBomList(id) {
      let loading = this.$layer.loading();
      linkInfo(id).then(res=>{
        this.$layer.close(loading);
        let rs = res.data;
        let rsData = rs.data;
        let data = [];
        if(rs.code == 1) {
          data = rsData.approvingBomList;
        }
        this.subList = data;
        this.workDetailVisible = true;
      }).catch(error=>{
        console.log(error);
        this.$layer.close(loading);
      });
    },
  },
  computed: {
    ...mapState('setting', ['animate']),