Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

Fixiaobai

2023-12-13 bb1c8946b01fdb35089559aca7436b30542786d4

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/const/crud/customerOrder/customerOrderForm.js

@@ -17,6 +17,7 @@
export const tableOption = {
  border: true,
  index: true,
  indexFixed: false,
  height: '292px',
  indexLabel: '序号',
  menuAlign: 'center',

 src/views/plan/manfacturingorderstatement/index.vue

@@ -1,107 +1,66 @@
<template>
  <div class="mod-config">
    <basic-container>
      <div class="avue-crud">
        <el-row>
          <el-col :span="1">
            <div>
              <el-divider direction="vertical"></el-divider>
              <div
                style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
              >
                <span>销售订单</span>
              </div>
            </div>
          </el-col>
          <el-col :span="3">
            <div>
              <el-input
                clearable
                @keyup.enter.native="getDataList"
                v-model="paramObject.customerOrderNo"
                placeholder="销售订单"
                @clear="getDataList"
                style="width: 100%"
              >
              </el-input>
            </div>
          </el-col>
          <el-col :span="1" offset="1">
            <div>
              <el-divider direction="vertical"></el-divider>
              <div
                style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
              >
                <span>主计划号</span>
              </div>
            </div>
          </el-col>
          <el-col :span="3">
            <div>
              <el-input
                clearable
                @keyup.enter.native="getDataList"
                v-model="paramObject.mpsNo"
                placeholder="主计划号"
                @clear="getDataList"
                style="width: 100%"
              >
              </el-input>
            </div>
          </el-col>
          <el-col :span="1" offset="1">
            <div>
              <el-divider direction="vertical"></el-divider>
              <div
                style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
              >
                <span>车间订单</span>
              </div>
            </div>
          </el-col>
          <el-col :span="3">
            <div>
              <el-input
                clearable
                @keyup.enter.native="getDataList"
                v-model="paramObject.moNo"
                placeholder="车间订单"
                @clear="getDataList"
                style="width: 100%"
              >
              </el-input>
            </div>
          </el-col>
          <el-col :span="1" offset="1">
            <div>
              <el-divider direction="vertical"></el-divider>
              <div
                style="float: left;height: 18px;font-size: 13px;line-height: 18px;font-weight: bold"
              >
                <span>需求日期</span>
              </div>
            </div>
          </el-col>
          <el-col :span="3">
            <div>
              <el-date-picker
                clearable
                v-model="paramObject.requiredDate"
                type="datetimerange"
                start-placeholder="开始"
                end-placeholder="结束"
                value-format="yyyy-MM-dd HH:mm:ss"
                @change="feedDateChange($event)"
                size="mini"
                style="width:100px"
              >
              </el-date-picker>
            </div>
          </el-col>
          <el-col :span="2" offset="1">
            <el-button type="primary" @click="getDataList()">搜索</el-button>
          </el-col>
        </el-row>
      <div class="avue-crud" style="margin: 0px 10px">
        <el-form :model="paramObject" label-width="100px" label-position="right">
          <el-row>
            <el-col :span="5">
              <el-form-item label="销售订单">
                <el-input
                  clearable
                  @keyup.enter.native="getDataList"
                  v-model="paramObject.customerOrderNo"
                  placeholder="销售订单"
                  @clear="getDataList"
                  style="width: 100%"
                > </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="5">
              <el-form-item label="主计划号">
                <el-input
                  clearable
                  @keyup.enter.native="getDataList"
                  v-model="paramObject.mpsNo"
                  placeholder="主计划号"
                  @clear="getDataList"
                  style="width: 100%"
                > </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="5">
              <el-form-item label="车间订单">
                <el-input
                  clearable
                  @keyup.enter.native="getDataList"
                  v-model="paramObject.moNo"
                  placeholder="车间订单"
                  @clear="getDataList"
                  style="width: 100%"
                > </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="5">
              <el-form-item label="需求日期">
                <el-date-picker
                  style="width:100%"
                  clearable
                  v-model="paramObject.requiredDate"
                  type="datetimerange"
                  start-placeholder="开始"
                  end-placeholder="结束"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  @change="feedDateChange($event)"
                  size="mini"
                > </el-date-picker>
              </el-form-item>
            </el-col>
            <el-col :span="3" :offset="1">
              <el-button type="primary" @click="getDataList()">搜索</el-button>
            </el-col>
          </el-row>
        </el-form>

        <el-table
          :data="dataList"
          border
@@ -110,12 +69,14 @@
          class="l-mes-table"
          :height="screenHeight"
        >
          <el-table-column type="index" label="序号" width="50">
          <el-table-column type="index" label="序号" align="center" width="50">
          </el-table-column>
          <el-table-column
            prop="customerName"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="客户名称"
          >
          </el-table-column>
@@ -123,6 +84,8 @@
            prop="customerOrderNo"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="销售订单号"
          >
          </el-table-column>
@@ -130,6 +93,8 @@
            prop="mpsNo"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="主计划号"
          >
          </el-table-column>
@@ -137,6 +102,8 @@
            prop="partNo"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="零件号"
          >
          </el-table-column>
@@ -144,6 +111,8 @@
            prop="partName"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="零件名称"
          >
          </el-table-column>
@@ -151,6 +120,8 @@
            prop="qtyRequired"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="车间订单需求数量"
          >
          </el-table-column>
@@ -158,6 +129,8 @@
            prop="unit"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="单位"
          >
          </el-table-column>
@@ -165,6 +138,8 @@
            prop="requiredDate"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="需求日期"
          >
          </el-table-column>
@@ -172,6 +147,8 @@
            prop="moNo"
            header-align="center"
            align="center"
            min-width="120"
            show-overflow-tooltip
            label="车间订单号"
          >
          </el-table-column>
@@ -180,6 +157,8 @@
              prop="name"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工序名称"
            >
            </el-table-column>
@@ -187,6 +166,8 @@
              prop="operationPartNo"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工序零件号"
            >
            </el-table-column>
@@ -194,6 +175,8 @@
              prop="operationPartName"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工序零件名称"
            >
            </el-table-column>
@@ -201,6 +184,8 @@
              prop="pda"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工序需求数量"
            >
            </el-table-column>
@@ -208,6 +193,8 @@
              prop="plannedQuantity"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工单的计划数量"
            >
            </el-table-column>
@@ -215,6 +202,8 @@
              prop="completedQuantity"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="工单的完成数量"
            >
            </el-table-column>
@@ -222,6 +211,8 @@
              prop="units"
              header-align="center"
              align="center"
              min-width="100"
              show-overflow-tooltip
              label="单位"
            >
            </el-table-column>
@@ -230,6 +221,8 @@
            prop="count"
            header-align="center"
            align="center"
            min-width="100"
            show-overflow-tooltip
            label="工序完成进度"
          >
          </el-table-column>

 src/views/plan/productionschedul/index.vue

@@ -140,7 +140,6 @@
  deleteSchedul,
  updateSchedul
} from '@/api//plan/productionschedul'
import TableForm from './template-form'
import ttable from '@/views/common/ztt-table.vue'
import { mapGetters } from 'vuex'
export default {
@@ -298,7 +297,6 @@
  },
  components: {
    ttable,
    TableForm,
  },
  computed: {
    ...mapGetters(['permissions']),
@@ -481,7 +479,6 @@
        size: this.page.pageSize,
        current: this.page.currentPage,
      }
      console.log(this.page);
      fetchScheduleList(param).then((res) => {
        this.tableData = res.data.data.records
        this.page.total = res.data.data.total
@@ -576,6 +573,9 @@
}
</script>
<style>
.el-tag--small{
  display: none;
}
.basic-template-table .el-table__body .el-table__row td:first-child .cell {
  padding-left: 0px;
  padding-right: 0px;

 src/views/plan/productionschedul/template-form.vue

ÎļþÒÑɾ³ý