小小儁爺
2024-10-11 00c703b89dfa507f55de3677a24fb8006092a043
1.工单列表排序2.工单列表导出
已修改5个文件
240 ■■■■■ 文件已修改
src/api/WorkOrder.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workOrder/produceOrderList.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workOrder/workOrderClose.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workOrder/workOrderList.vue 229 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/workOrder/workOrderSend.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/WorkOrder.js
@@ -96,6 +96,14 @@
    params: data
  })
}
// MES工单导出
export function MesOrderExcelSearch(data) {
  return request({
    url: 'WorkOrder/MesOrderExcelSearch',
    method: 'get',
    params: data
  })
}
// 工单派发
export function MesOrderDistribution(data) {
src/views/workOrder/produceOrderList.vue
@@ -778,6 +778,7 @@
      this.form.payenddate = ''
      this.form.creatuser = ''
      this.form.erpordercode = ''
      this.form.saleordercode = ''
      this.form.createdate = ''
      this.getErpOrderSearch()
    },
src/views/workOrder/workOrderClose.vue
@@ -2421,6 +2421,7 @@
      this.form.sourceorder = ''
      this.form.ordertype = ''
      this.form.createdate = ''
      this.form.saleordercode = ''
      this.getMesOrderClosedSearch()
    },
    // 新增按钮
src/views/workOrder/workOrderList.vue
@@ -8,6 +8,8 @@
          <el-button v-waves type="success" icon="el-icon-connection" @click="send">派发</el-button>
        </div>
        <el-button v-waves type="primary" icon="el-icon-download" @click="download">导出</el-button>
        <!--        <el-button v-waves icon="el-icon-switch-button" @click="orderClose">关闭工单</el-button>-->
      </div>
@@ -168,6 +170,92 @@
            fixed
          />
          <el-table-column
            prop="injectnumber"
            label="注塑机号"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="customername"
            label="客户名称"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="partcode"
            label="产品编码"
            show-tooltip-when-overflow
            sortable="custom"
            min-width="120"
          />
          <el-table-column
            prop="partname"
            min-width="150"
            label="产品名称"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="partspec"
            label="产品规格"
            sortable="custom"
            width="110"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.partspec">{{ row.partspec }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="colour"
            label="颜色"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="plan_qty"
            label="工单数"
            sortable="custom"
            show-tooltip-when-overflow
            width="100"
          />
          <el-table-column
            prop="saleOrderCode"
            label="销售订单"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="160"
          >
            <template slot-scope="{row}">
              <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="clerkuser"
            label="销售业务员"
            sortable="custom"
            show-tooltip-when-overflow
            width="150"
          >
            <template slot-scope="{row}">
              <div v-if="row.clerkuser">{{ row.clerkuser }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="status"
            label="工单状态"
            sortable="custom"
@@ -185,6 +273,21 @@
              <div v-if="row.status==='SCHED'">已排程</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wotype"
            label="单据类型"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="120"
          >
            <template slot-scope="{row}">
              <div v-if="row.wotype==='PO'">标准工单</div>
              <div v-else-if="row.wotype==='FO'">报废补单</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wo_code"
            label="工单编号"
@@ -204,103 +307,7 @@
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="saleOrderCode"
            label="销售订单"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="160"
          >
            <template slot-scope="{row}">
              <div v-if="row.saleOrderCode">{{ row.saleOrderCode }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wotype"
            label="单据类型"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="120"
          >
            <template slot-scope="{row}">
              <div v-if="row.wotype==='PO'">标准工单</div>
              <div v-else-if="row.wotype==='FO'">报废补单</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="partcode"
            label="产品编码"
            show-tooltip-when-overflow
            sortable="custom"
            min-width="120"
          />
          <el-table-column
            prop="partname"
            min-width="150"
            label="产品名称"
            show-tooltip-when-overflow
            sortable="custom"
          />
          <el-table-column
            prop="partspec"
            label="产品规格"
            sortable="custom"
            width="110"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <div v-if="row.partspec">{{ row.partspec }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="plan_qty"
            label="工单数"
            sortable="custom"
            show-tooltip-when-overflow
            width="100"
          />
          <el-table-column
            prop="injectnumber"
            label="注塑机号"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.injectnumber?row.injectnumber:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="customername"
            label="客户名称"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.customername?row.customername:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="colour"
            label="颜色"
            show-tooltip-when-overflow
            width="110"
            sortable="custom"
          >
            <template slot-scope="{row}">{{ row.colour?row.colour:'/' }}</template>
          </el-table-column>
          <el-table-column
            prop="clerkuser"
            label="销售业务员"
            sortable="custom"
            show-tooltip-when-overflow
            width="150"
          >
            <template slot-scope="{row}">
              <div v-if="row.clerkuser">{{ row.clerkuser }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="wkshp_name"
            label="生产车间"
@@ -2041,7 +2048,7 @@
import {
  AddMesOrderCodeSearch,
  AddUpdateMesOrder, DeleteMesOrder,
  MesBadOrderSearch, MesOrderDistribution, MesOrderNewStepContent,
  MesBadOrderSearch, MesOrderDistribution, MesOrderExcelSearch, MesOrderNewStepContent,
  MesOrderSearch,
  UpdateMesOrderStepSearch
} from '@/api/WorkOrder'
@@ -2049,7 +2056,8 @@
import { CustomerPermissions, PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
import Sortable from 'sortablejs'
import ElDragSelect from '@/components/DragSelect'
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui
import { MesOrderPrintSearch } from '@/api/GridReport'
import { GroupSalaryReportExcelSearch } from '@/api/ReportManager' // base on element-ui
export default {
  name: 'WorkOrderList',
@@ -2351,6 +2359,28 @@
    // })
  },
  methods: {
    async download() {
      // let tempDate = this.form.operdate
      // if (tempDate.length > 0) {
      //   tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      // }
      const data = {
        wkshopcode: this.form.wkshopcode, // 车间编码
        mesorderstus: this.form.mesorderstus, // 工单状态码
        mesordercode: this.form.mesordercode, // 工单编号
        partcode: this.form.partcode, // 产品编码
        ordertype: this.form.ordertype, // ordertype
        sourceorder: this.form.sourceorder, // 源单单号
        saleordercode: this.form.saleordercode, // 销售订单
        partname: this.form.partname, // 产品名称
        partspec: this.form.partspec, // 产品规格
        creatuser: this.form.creatuser, // 创建人员
        createdate: this.form.createdate ? handleDatetime(this.form.createdate) : '' // 创建时间
      }
      const { data: res } = await MesOrderExcelSearch(data)
      window.location.href = res
    },
    async getCustomerPermissions() {
      const { data: res } = await CustomerPermissions()
      this.customerArr = res
@@ -2481,6 +2511,7 @@
      this.form.sourceorder = ''
      this.form.ordertype = ''
      this.form.createdate = ''
      this.form.saleordercode = ''
      this.getMesOrderSearch()
    },
    // 新增按钮
src/views/workOrder/workOrderSend.vue
@@ -2416,6 +2416,7 @@
      this.form.sourceorder = ''
      this.form.ordertype = ''
      this.form.createdate = ''
      this.form.saleordercode = ''
      this.getMesOrderSearch()
    },
    // 新增按钮