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

gaoluyang

6 天以前 3e975fa4617edb90fbcc4f1be04c05ca676fcc0d

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

 src/views/productionManagement/productionOrder/index.vue

@@ -19,14 +19,6 @@
                    style="width: 200px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item label="项目名称:">
          <el-input v-model="searchForm.projectName"
                    placeholder="请输入"
                    clearable
                    prefix-icon="Search"
                    style="width: 200px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item label="产品名称:">
          <el-input v-model="searchForm.productCategory"
                    placeholder="请输入"
@@ -79,32 +71,22 @@
    {
      label: "生产订单号",
      prop: "npsNo",
      width: 120,
    },
    {
      label: "销售合同号",
      prop: "salesContractNo",
      width: 220,
    },
    {
      label: "项目名称",
      prop: "projectName",
      width: 300,
    },
    {
      label: "客户名称",
      prop: "customerName",
      width: 250,
    },
    {
      label: "产品名称",
      prop: "productCategory",
      width: 250,
    },
    {
      label: "规格",
      prop: "specificationModel",
      width: 250,
    },
    {
      dataType: "action",

 src/views/productionManagement/productionProcess/index.vue

@@ -1,29 +1,41 @@
<template>
    <div class="app-container">
        <div class="search_form">
            <el-form :model="searchForm" :inline="true">
      <el-form :model="searchForm"
               :inline="true">
                <el-form-item label="工序名称:">
                    <el-input v-model="searchForm.name" placeholder="请输入" clearable prefix-icon="Search"
          <el-input v-model="searchForm.name"
                    placeholder="请输入"
                    clearable
                    prefix-icon="Search"
                                        style="width: 200px;"
                                        @change="handleQuery" />
                </el-form-item>
                <el-form-item label="工序编号:">
                    <el-input v-model="searchForm.no" placeholder="请输入" clearable prefix-icon="Search"
          <el-input v-model="searchForm.no"
                    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-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 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"
      <PIMTable rowKey="id"
                :column="tableColumn"
                :tableData="tableData"
                :page="page"
@@ -31,21 +43,15 @@
                @selection-change="handleSelectionChange"
                :tableLoading="tableLoading"
                @pagination="pagination"
                :total="page.total"
            ></PIMTable>
                :total="page.total"></PIMTable>
        </div>
        <new-process
      v-if="isShowNewModal"
    <new-process v-if="isShowNewModal"
      v-model:visible="isShowNewModal"
      @completed="getList"
    />

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

@@ -89,12 +95,12 @@
      {
        name: "编辑",
        type: "text",
        clickFun: (row) => {
          clickFun: row => {
          showEditModal(row);
        }
      }
    ]
  }
          },
        },
      ],
    },
]);
const tableData = ref([]);
const selectedRows = ref([]);
@@ -107,7 +113,7 @@
    size: 100,
    total: 0,
});
const { proxy } = getCurrentInstance()
  const { proxy } = getCurrentInstance();

// 查询列表
/** 搜索按钮操作 */
@@ -116,7 +122,7 @@
    getList();
};

const pagination = (obj) => {
  const pagination = obj => {
    page.current = obj.page;
    page.size = obj.limit;
    getList();
@@ -124,36 +130,58 @@
const getList = () => {
    tableLoading.value = true;
    const params = { ...searchForm.value, ...page };
    params.entryDate = undefined
  listPage(params).then(res => {
    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;
    })
      .catch(err => {
        tableLoading.value = false;
      });
};
// 表格选择数据
const handleSelectionChange = (selection) => {
  const handleSelectionChange = selection => {
    selectedRows.value = selection;
};

// 打开新增弹框
const showNewModal = () => {
  isShowNewModal.value = true
    isShowNewModal.value = true;
};

const showEditModal = (row) => {
  isShowEditModal.value = true
  record.value = row
  const showEditModal = row => {
    isShowEditModal.value = true;
    record.value = row;
};

// 删除
function handleDelete() {
  const no = selectedRows.value.map((item) => item.no);
  const ids = selectedRows.value.map((item) => item.id);
    const no = selectedRows.value.map(item => item.no);
    const ids = selectedRows.value.map(item => item.id);
    if (no.length > 2) {
      proxy.$modal
        .confirm(
          '是否确认删除工序编号为"' +
            no[0] +
            "、" +
            no[1] +
            '"等' +
            no.length +
            "条数据项？"
        )
        .then(function () {
          return del(ids);
        })
        .then(() => {
          getList();
          proxy.$modal.msgSuccess("删除成功");
        })
        .catch(() => {});
    } else {
  proxy.$modal
      .confirm('是否确认删除工序编号为"' + no + '"的数据项？')
      .then(function () {
@@ -165,6 +193,7 @@
      })
      .catch(() => {});
}
  }

// 导出
// const handleOut = () => {