Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业

yaowanxin

13 小时以前 17bff385d517ada8dd3ac8fc4b81c4c163a17aa2

 src/views/productionManagement/processRoute/index.vue

@@ -1,45 +1,45 @@
<template>
   <div class="app-container">
      <div class="search_form">
         <el-form :model="searchForm" :inline="true">
            <el-form-item label="规格名称:">
               <el-input v-model="searchForm.model" placeholder="请输入" clearable prefix-icon="Search"
                              style="width: 200px;"
                              @change="handleQuery" />
            </el-form-item>
            <el-form-item>
               <el-button type="primary" @click="handleQuery">搜索</el-button>
            </el-form-item>
         </el-form>
      </div>
      <div class="table_list">
         <div style="text-align: right" class="mb10">
            <el-button type="primary" @click="showNewModal">新增工艺路线</el-button>
            <el-button type="danger" @click="handleDelete" :disabled="selectedRows.length === 0" plain>删除工艺路线</el-button>
         </div>
         <PIMTable
            rowKey="id"
            :column="tableColumn"
            :tableData="tableData"
            :page="page"
            :isSelection="true"
            @selection-change="handleSelectionChange"
            :tableLoading="tableLoading"
            @pagination="pagination"
            :total="page.total"
         />
      </div>
      <new-process
      v-if="isShowNewModal"
      v-model:visible="isShowNewModal"
      @completed="getList"
  <div class="app-container">
    <div class="search_form">
      <el-form :model="searchForm" :inline="true">
        <el-form-item label="规格名称:">
          <el-input v-model="searchForm.model" placeholder="请输入" clearable prefix-icon="Search"
                    style="width: 200px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item>
          <el-button type="primary" @click="handleQuery">搜索</el-button>
        </el-form-item>
      </el-form>
    </div>
    <div class="table_list">
      <div style="text-align: right" class="mb10">
        <el-button type="primary" @click="showNewModal">新增工艺路线</el-button>
        <el-button type="danger" @click="handleDelete" :disabled="selectedRows.length === 0" plain>删除工艺路线</el-button>
      </div>
      <PIMTable
          rowKey="id"
          :column="tableColumn"
          :tableData="tableData"
          :page="page"
          :isSelection="true"
          @selection-change="handleSelectionChange"
          :tableLoading="tableLoading"
          @pagination="pagination"
          :total="page.total"
      />
    </div>
    <new-process
        v-if="isShowNewModal"
        v-model:visible="isShowNewModal"
        @completed="getList"
    />

    <edit-process
      v-if="isShowEditModal"
      v-model:visible="isShowEditModal"
      :record="record"
      @completed="getList"
        v-if="isShowEditModal"
        v-model:visible="isShowEditModal"
        :record="record"
        @completed="getList"
    />

    <route-item-form
@@ -48,7 +48,7 @@
        :record="record"
        @completed="getList"
    />
   </div>
  </div>
</template>

<script setup>
@@ -57,11 +57,13 @@
import EditProcess from "@/views/productionManagement/processRoute/Edit.vue";
import RouteItemForm from "@/views/productionManagement/processRoute/ItemsForm.vue";
import {listPage, del} from "@/api/productionManagement/processRoute.js";
import { useRouter } from 'vue-router'

const router = useRouter()
const data = reactive({
   searchForm: {
  searchForm: {
    model: "",
   },
  },
});
const { searchForm } = toRefs(data);
const tableColumn = ref([
@@ -73,14 +75,14 @@
    label: "产品名称",
    prop: "productName",
  },
   {
      label: "规格名称",
      prop: "model",
   },
   {
      label: "描述",
      prop: "description",
   },
  {
    label: "规格名称",
    prop: "model",
  },
  {
    label: "描述",
    prop: "description",
  },
  {
    dataType: "action",
    label: "操作",
@@ -113,41 +115,41 @@
const isShowItemModal = ref(false);
const record = ref({});
const page = reactive({
   current: 1,
   size: 100,
   total: 0,
  current: 1,
  size: 100,
  total: 0,
});
const { proxy } = getCurrentInstance()

// 查询列表
/** 搜索按钮操作 */
const handleQuery = () => {
   page.current = 1;
   getList();
  page.current = 1;
  getList();
};

const pagination = (obj) => {
   page.current = obj.page;
   page.size = obj.limit;
   getList();
  page.current = obj.page;
  page.size = obj.limit;
  getList();
};
const getList = () => {
   tableLoading.value = true;
   const params = { ...searchForm.value, ...page };
   params.entryDate = undefined
  tableLoading.value = true;
  const params = { ...searchForm.value, ...page };
  params.entryDate = undefined
  listPage(params).then(res => {
      tableLoading.value = false;
      tableData.value = res.data.records.map(item => ({
         ...item,
      }));
      page.total = res.data.total;
   }).catch(err => {
      tableLoading.value = false;
   })
    tableLoading.value = false;
    tableData.value = res.data.records.map(item => ({
      ...item,
    }));
    page.total = res.data.total;
  }).catch(err => {
    tableLoading.value = false;
  })
};
// 表格选择数据
const handleSelectionChange = (selection) => {
   selectedRows.value = selection;
  selectedRows.value = selection;
};

// 打开新增弹框
@@ -161,8 +163,12 @@
};

const showItemModal = (row) => {
  isShowItemModal.value = true
  record.value = row
  router.push({
    path: '/productionManagement/processRouteItem',
    query: {
      id: row.id
    }
  })
};

// 删除
@@ -181,7 +187,7 @@
}

onMounted(() => {
   getList();
  getList();
});
</script>