1.新增 订单开启、工单开启功能 2.新增顶级物料字段

小小儁爺

2025-10-30 b01acc5451b09593762522e9baff2615120696ec

1.新增 订单开启、工单开启功能  2.新增顶级物料字段

 src/api/WorkOrder.js

@@ -43,6 +43,15 @@
  })
}

// ERP订单反关闭
export function ReverseClosedErpOrder(data) {
  return request({
    url: 'WorkOrder/ReverseClosedErpOrder',
    method: 'post',
    params: data
  })
}

// ERP订单删除
export function DeleteErpOrder(data) {
  return request({
@@ -61,6 +70,16 @@
  })
}

// MES工单启动提交
export function MesOrderBitchReverseClosedSeave(data) {
  return request({
    url: 'WorkOrder/MesOrderBitchReverseClosedSeave',
    method: 'post',
    data
  })
}


// MES报废补单工单查询
export function MesBadOrderSearch(data) {
  return request({

 src/styles/global.css

@@ -179,22 +179,22 @@
定义滚动条高宽及背景
高宽分别对应横竖滚动条的尺寸
*/
::-webkit-scrollbar {
  width: 7px;
  height: 7px;
  /*background-color: white;*/
  background-color: #f8f8fa;
}
/*::-webkit-scrollbar {*/
/*  width: 7px;*/
/*  height: 7px;*/
/*  !*background-color: white;*!*/
/*  background-color: #f8f8fa;*/
/*}*/

::-webkit-scrollbar-thumb {
  /*box-shadow: inset 0 0 0px white;*/
  box-shadow: inset 0 0 0px #f8f8fa;
  /*-webkit-box-shadow: inset 0 0 0px white;*/
  -webkit-box-shadow: inset 0 0 0px #f8f8fa;
  background-color: rgb(193, 193, 193);
  /*滚动条的背景颜色*/
  border-radius: 20px;
}
/*::-webkit-scrollbar-thumb {*/
/*  !*box-shadow: inset 0 0 0px white;*!*/
/*  box-shadow: inset 0 0 0px #f8f8fa;*/
/*  !*-webkit-box-shadow: inset 0 0 0px white;*!*/
/*  -webkit-box-shadow: inset 0 0 0px #f8f8fa;*/
/*  background-color: rgb(193, 193, 193);*/
/*  !*滚动条的背景颜色*!*/
/*  border-radius: 20px;*/
/*}*/

/*解决表格固定列时的压样式问题*/
.el-table__fixed {

 src/views/basicSettings/powerDivider.vue

@@ -513,6 +513,10 @@
        this.$notify.success(rolename + '的角色权限提交成功！')
        await this.getRolePermissionSearchRoleMenuButton(rolecode)
        this.$store.state.app.buttonIsDisabled = false

        setTimeout(() => {
          location.reload()
        }, 2000)
      }
    },
    // 获取页面高度

 src/views/kanbanManager/cj.vue

@@ -6,7 +6,7 @@

      <div class="kb_header">
        <div class="kb_headTime" style="top: 35px;left:  20px">
          <span>浙江寅寅科技有限公司</span>
          <span>浙江阿鲁克健身器材有限公司</span>
        </div>

        <div class="kb_headTime kb_header_text" style="top: 35px;left:  828px">

 src/views/kanbanManager/ckgl.vue

@@ -5,7 +5,7 @@
      <div class="kb_backgroundCustom" />
      <div class="kb_header">
        <div class="kb_headTime" style="top: 35px;left:  20px">
          <span>浙江寅寅科技有限公司</span>
          <span>浙江阿鲁克健身器材有限公司</span>
        </div>

        <div class="kb_headTime kb_header_text" style="top: 35px;left:  800px">

 src/views/kanbanManager/zhkb.vue

@@ -6,7 +6,7 @@

      <div class="kb_header">
        <div class="kb_headTime" style="top: 35px;left:  20px">
          <span>浙江寅寅科技有限公司</span>
          <span>浙江阿鲁克健身器材有限公司</span>
        </div>

        <div class="kb_headTime kb_header_text" style="top: 35px;left:  800px">

 src/views/workOrder/produceOrderList.vue

@@ -7,10 +7,17 @@
      >
        <div style="font-weight: bolder;">订单状态</div>
        <div class="statusItem" :class="{statusItemLight:form.erporderstus===''}" @click="statusChange('')">全部</div>
        <div class="statusItem" :class="{statusItemLight:form.erporderstus==='NEW'}" @click="statusChange('NEW')">新订单</div>
        <div class="statusItem" :class="{statusItemLight:form.erporderstus==='CREATING'}" @click="statusChange('CREATING')">部分下达</div>
        <div class="statusItem" :class="{statusItemLight:form.erporderstus==='CREATED'}" @click="statusChange('CREATED')">全部下达</div>
        <div class="statusItem" :class="{statusItemLight:form.erporderstus==='CLOSED'}" @click="statusChange('CLOSED')">已关闭</div>
        <div class="statusItem" :class="{statusItemLight:form.erporderstus==='NEW'}" @click="statusChange('NEW')">新订单
        </div>
        <div class="statusItem" :class="{statusItemLight:form.erporderstus==='CREATING'}"
             @click="statusChange('CREATING')">部分下达
        </div>
        <div class="statusItem" :class="{statusItemLight:form.erporderstus==='CREATED'}"
             @click="statusChange('CREATED')">全部下达
        </div>
        <div class="statusItem" :class="{statusItemLight:form.erporderstus==='CLOSED'}" @click="statusChange('CLOSED')">
          已关闭
        </div>
      </div>

      <div class="bodyTopButtonGroup" style="justify-content: space-between;margin-top: 5px;">
@@ -237,7 +244,7 @@
          <el-table-column
            show-tooltip-when-overflow
            prop="saleOrderCode"
            label="销售订单"
            label="销售订单/预测单"
            sortable="custom"
            width="150"
          >
@@ -269,6 +276,30 @@
          >
            <template slot-scope="{row}">
              <div v-if="row.partspec">{{ row.partspec }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="TopInventoryCode"
            label="顶级物料编码"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="130"
          >
            <template slot-scope="{row}">
              <div v-if="row.TopInventoryCode">{{ row.TopInventoryCode }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="TopInventoryName"
            label="顶级物料名称"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="130"
          >
            <template slot-scope="{row}">
              <div v-if="row.TopInventoryName">{{ row.TopInventoryName }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
@@ -473,12 +504,21 @@
                    @click="edit('edit',row)"
                  />
                </el-tooltip>
                <el-tooltip v-del-tab-index class="item" effect="dark" content="订单关闭" placement="top">
                <el-tooltip v-del-tab-index class="item" effect="dark" :content="row.status!=='CLOSED'?'订单关闭':'订单启动'" placement="top">
                  <i
                    v-if="row.status!=='CLOSED'"
                    class="el-icon-switch-button"
                    :style="{color:'red'}"
                    style="cursor: pointer;margin-left: 15px"
                    @click="orderClose(row)"
                  />

                  <i
                    v-if="row.status==='CLOSED'"
                    class="el-icon-thumb"
                    :style="{color:$store.state.settings.theme}"
                    style="cursor: pointer;margin-left: 15px"
                    @click="orderClose(row.id)"
                    @click="orderOpen(row)"
                  />
                </el-tooltip>

@@ -531,6 +571,15 @@
        <el-form-item label="产品规格" prop="partspec">
          <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
        </el-form-item>

        <el-form-item label="顶级物料编码" prop="TopInventoryCode">
          <el-input v-model="dialogForm.TopInventoryCode" disabled style="width: 200px"/>
        </el-form-item>

        <el-form-item label="顶级物料名称" prop="TopInventoryName">
          <el-input v-model="dialogForm.TopInventoryName" disabled style="width: 200px"/>
        </el-form-item>

        <el-form-item label="生产车间" prop="wkshopname">
          <el-input v-model="dialogForm.wkshopname" disabled style="width: 200px" />
        </el-form-item>
@@ -644,7 +693,7 @@
  DeleteErpOrder,
  ErpOrderSearch,
  MarkBatchSaveErpOrder,
  MarkSaveErpOrder
  MarkSaveErpOrder, ReverseClosedErpOrder
} from '@/api/WorkOrder'
import { SeaveSearchErpOrder } from '@/api/ErpSyncMes'
import { PrentOrganizationNoCompany } from '@/api/GeneralBasicData'
@@ -728,6 +777,10 @@
        markqty: '', // 下单数量
        ordernum: '', // 下单单数
        relse_qty: '', // 已下单数量

        idTopInventory: '', // 顶级物料id
        TopInventoryCode: '', // 顶级物料编码
        TopInventoryName: '', // 顶级物料名称

        clerkuser: '', // 销售业务员

@@ -953,10 +1006,8 @@
      })
    },
    // 订单关闭
    async orderClose(id) {
      this.tableData.forEach(item => {
        if (item.id === id) {
          if (item.status !== 'NEW') {
    async orderClose(row) {
      if (row.status !== 'NEW') {
            return this.$message.info('此订单非新订单，无法关闭！')
          } else {
            this.$confirm('是否确认关闭订单?', '提示', {
@@ -964,7 +1015,7 @@
              cancelButtonText: '取消',
              type: 'warning'
            }).then(() => {
              ClosedErpOrder({ erpordercode: item.wo, erporderid: id }).then(res => {
          ClosedErpOrder({erpordercode: row.wo, erporderid: row.id}).then(res => {
                if (res.code === '200') {
                  this.$message.success('订单关闭成功!')
                  this.getErpOrderSearch()
@@ -974,7 +1025,22 @@
              this.$message.info('已取消关闭！')
            })
          }
    },
    // 订单开启
    async orderOpen(row) {
      this.$confirm('是否确认启动订单，该订单下的所有工单将会开启！', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        ReverseClosedErpOrder({erpordercode: row.wo, erporderid: row.id}).then(res => {
          if (res.code === '200') {
            this.$message.success('订单启动成功!')
            this.getErpOrderSearch()
        }
        })
      }).catch(() => {
        this.$message.info('已取消关闭！')
      })
    },
    batchHandle() {
@@ -1065,6 +1131,11 @@
        this.dialogForm.markqty = parseFloat(row.qty) - parseFloat(row.relse_qty)
        this.dialogForm.ordernum = 1
        this.dialogForm.relse_qty = row.relse_qty

        this.dialogForm.idTopInventory = row.idTopInventory
        this.dialogForm.TopInventoryCode = row.TopInventoryCode
        this.dialogForm.TopInventoryName = row.TopInventoryName

        this.dialogForm.clerkuser = row.clerkuser

        this.dialogForm.paystartdate = row.planstartdate
@@ -1093,6 +1164,10 @@
        markqty: '', // 下单数量
        ordernum: '', // 下单单数
        relse_qty: '', // 已下单数量

        idTopInventory: '', // 顶级物料id
        TopInventoryCode: '', // 顶级物料编码
        TopInventoryName: '', // 顶级物料名称

        payenddate: '', // 预计完工日期
        paystartdate: '', // 预计开工日期
@@ -1130,6 +1205,11 @@
            'partcode': this.dialogForm.partcode,
            'wkshopcode': this.dialogForm.wkshopcode,
            'warehousecode': this.dialogForm.warehousecode,

            'idTopInventory': this.dialogForm.idTopInventory,
            'TopInventoryCode': this.dialogForm.TopInventoryCode,
            'TopInventoryName': this.dialogForm.TopInventoryName,

            'clerkuser': this.dialogForm.clerkuser,
            'erpqty': this.dialogForm.erpqty,
            'markqty': this.dialogForm.markqty,
@@ -1368,6 +1448,7 @@
  cursor: pointer;
  color: #a7a7a7;
}

.statusItemLight{
  font-weight: bolder;
  color: #42b983;

 src/views/workOrder/workOrderClose.vue

@@ -3,7 +3,8 @@
    <div class="body" :style="{height:mainHeight+'px'}">

      <div class="bodyTopButtonGroup">
        <el-button v-waves icon="el-icon-switch-button" type="success" @click="orderClose()">工单关闭</el-button>
        <el-button v-waves icon="el-icon-switch-button" type="danger" @click="orderClose()">工单关闭</el-button>
        <el-button v-waves icon="el-icon-thumb" type="success" @click="orderOpen()">工单启动</el-button>
      </div>

      <div class="bodyTopFormGroup">
@@ -154,8 +155,8 @@
          <el-table-column
            type="selection"
            width="50"
            :selectable="selected"
          />
<!--          :selectable="selected"-->
          <el-table-column
            prop="rowNum"
            width="50"
@@ -202,7 +203,7 @@
          </el-table-column>
          <el-table-column
            prop="saleOrderCode"
            label="销售订单"
            label="销售订单/预测单"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="160"
@@ -405,12 +406,20 @@
                  />
                </el-tooltip>

                <el-tooltip class="item" effect="dark" content="工单关闭" placement="top">
                <el-tooltip class="item" effect="dark" :content="row.status!=='CLOSED'?'工单关闭':'工单启动'" placement="top">
                  <i
                    v-if="row.status!=='CLOSED'"
                    class="el-icon-switch-button"
                    style="cursor: pointer;margin-left: 15px"
                    :style="{color:$store.state.settings.theme}"
                    :style="{color:'red'}"
                    @click.stop="orderClose(row)"
                  />
                  <i
                    v-if="row.status==='CLOSED'"
                    class="el-icon-thumb"
                    style="cursor: pointer;margin-left: 15px"
                    :style="{color:$store.state.settings.theme}"
                    @click.stop="orderOpen(row)"
                  />
                </el-tooltip>

@@ -2036,7 +2045,7 @@
  AddUpdateMesOrder, DeleteMesOrder,
  MesBadOrderSearch, MesOrderDistribution,
  MesOrderClosedSearch,
  UpdateMesOrderStepSearch, MesOrderBitchClosedSeave
  UpdateMesOrderStepSearch, MesOrderBitchClosedSeave, MesOrderBitchReverseClosedSeave
} from '@/api/WorkOrder'
import { PartSelect } from '@/api/ProductModel'
import { PrentOrganization, PrentOrganizationNoCompany, StepData } from '@/api/GeneralBasicData'
@@ -2488,7 +2497,8 @@
      this.dialogVisibleTask = false
    },
    handleSelectionChange(val) {
      this.multipleSelection = val.map(i => i.wo_code)
      // this.multipleSelection = val.map(i => i.wo_code)
      this.multipleSelection = val
    },

    selected(row, index) {
@@ -2585,15 +2595,18 @@
    },
    // 工单关闭事件
    async orderClose(row) {
      this.$confirm('是否确认删除?', '提示', {
      this.$confirm('是否确认关闭?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        if (row) { // 行关闭工单
          this.multipleSelection = [row.wo_code]
        let data = null
        if (row) { // 行启动工单
          data = [row.wo_code]
        } else {
          data = this.multipleSelection.filter(i => i.status === 'CLOSED').map(i => i.wo_code)
        }
        MesOrderBitchClosedSeave(this.multipleSelection).then(res => {
        MesOrderBitchClosedSeave(data).then(res => {
          if (res.code === '200') {
            this.$notify.success('关闭成功!')
            // if (this.form.page > 1 && this.tableData.length === 1) {
@@ -2606,6 +2619,33 @@
        this.$notify.info('已取消删除！')
      })
    },
    // 工单启动事件
    async orderOpen(row) {
      this.$confirm('是否确认启动?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        let data = null
        if (row) { // 行启动工单
          data = [row.wo_code]
        } else {
          data = this.multipleSelection.filter(i => i.status === 'CLOSED').map(i => i.wo_code)
        }

        MesOrderBitchReverseClosedSeave(data).then(res => {
          if (res.code === '200') {
            this.$notify.success('启动成功!')
            // if (this.form.page > 1 && this.tableData.length === 1) {
            //   this.form.page--
            // }
            this.getMesOrderClosedSearch()
          }
        })
      }).catch(() => {
        this.$notify.info('已取消删除！')
      })
    },
    // 对话框产品信息值改变
    partcodeChangeDialog(val) {
      console.log(val)

 src/views/workOrder/workOrderList.vue

@@ -225,7 +225,7 @@
          </el-table-column>
          <el-table-column
            prop="saleOrderCode"
            label="销售订单"
            label="销售订单/预测单"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="160"
@@ -288,7 +288,30 @@
              <div v-else>/</div>
            </template>
          </el-table-column>

          <el-table-column
            prop="TopInventoryCode"
            label="顶级物料编码"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="130"
          >
            <template slot-scope="{row}">
              <div v-if="row.TopInventoryCode">{{ row.TopInventoryCode }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="TopInventoryName"
            label="顶级物料名称"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="130"
          >
            <template slot-scope="{row}">
              <div v-if="row.TopInventoryName">{{ row.TopInventoryName }}</div>
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="plan_qty"
            label="工单数"
@@ -782,6 +805,14 @@
        <!--        </el-form-item>-->
        <el-form-item label="产品规格" prop="partspec">
          <el-input v-model="dialogForm.partspec" disabled style="width: 200px" />
        </el-form-item>

        <el-form-item v-if="operation!=='add'" label="顶级物料编码" prop="TopInventoryCode">
          <el-input v-model="dialogForm.TopInventoryCode" disabled style="width: 200px" />
        </el-form-item>

        <el-form-item v-if="operation!=='add'" label="顶级物料名称" prop="TopInventoryName">
          <el-input v-model="dialogForm.TopInventoryName" disabled style="width: 200px" />
        </el-form-item>
        <!--        :disabled="dialogForm.partcode===''"-->

@@ -1502,6 +1533,9 @@
                  <el-form-item label="产品规格:" class="formContent">
                    {{ formApprove.partspec }}
                  </el-form-item>
                  <el-form-item label="顶级物料:" class="formContent">
                    {{ formApprove.TopInventoryName }}
                  </el-form-item>
                  <el-form-item label="工单数量:" class="formContent">
                    {{ formApprove.plan_qty }}
                  </el-form-item>
@@ -1599,22 +1633,29 @@
            <el-table-column
              id="column4"
              prop="good_qty"
              width="100"
              width="60"
              align="center"
              label="合格数量"
              label="合格"
            />
            <el-table-column
              id="column5"
              width="100"
              width="60"
              prop="ng_qty"
              align="center"
              label="不良数量"
              label="不良"
            />
            <el-table-column
              id="column6"
              prop="desc"
              align="center"
              width="120"
              width="100"
              label="检验员"
            />
            <el-table-column
              id="column6"
              prop="desc"
              align="center"
              width="100"
              label="备注"
            />
          </el-table>
@@ -2770,7 +2811,9 @@

        deliverydate: '', // 交付时间
        data_sources: '', // 数据来源

        idTopInventory: '', // 顶级物料id
        TopInventoryCode: '', // 顶级物料编码
        TopInventoryName: '', // 顶级物料名称
        routecode: '', // 工艺路线

        mesmaxqty: 0, // 工单的最大值
@@ -2863,6 +2906,7 @@
        partname: '',
        partspec: '',
        plan_qty: '',
        TopInventoryName: '',
        routename: '',
        lm_date: '',
        priuserdefnvc1: '',
@@ -3660,6 +3704,9 @@
      this.dialogForm.routecode = row.route_code
      this.dialogForm.deliverydate = row.saleOrderDeliveryDate.substring(0, 11)
      this.dialogForm.mesqty = row.plan_qty
      this.dialogForm.TopInventoryCode = row.TopInventoryCode
      this.dialogForm.TopInventoryName = row.TopInventoryName
      this.dialogForm.idTopInventory = row.idTopInventory

      this.dialogForm.mesqtyinit = row.plan_qty

@@ -3872,7 +3919,9 @@
        mesqty: '', // 工单数量
        wkshopcode: '', // 生产车间编码
        wkshopname: '', // 生产车间名称

        idTopInventory: '', // 顶级物料id
        TopInventoryCode: '', // 顶级物料编码
        TopInventoryName: '', // 顶级物料名称
        deliverydate: '', // 交付时间
        data_sources: '' // 数据来源
      }
@@ -4028,6 +4077,8 @@
      this.formApprove.priuserdefnvc5 = row.priuserdefnvc5 ? row.priuserdefnvc5 : '/'
      this.formApprove.priuserdefnvc6 = row.priuserdefnvc6 ? row.priuserdefnvc6 : '/'

      this.formApprove.TopInventoryName = row.TopInventoryName || '/'

      this.formApprove.saleOrderCode = this.formApprove.saleOrderCode !== '' ? this.formApprove.saleOrderCode : saleOrderCode
      const data2 = {
        mesordercode: wo_code || this.dialogForm.mesordercode
@@ -4138,7 +4189,7 @@
      this.formApprove.plan_qty = ''
      this.formApprove.routename = ''
      this.formApprove.lm_date = ''

      this.formApprove.TopInventoryName = ''
      this.formApprove.priuserdefnvc1 = ''
      this.formApprove.priuserdefnvc2 = ''
      this.formApprove.priuserdefnvc3 = ''

 src/views/workOrder/workOrderSend.vue

@@ -209,7 +209,7 @@
          </el-table-column>
          <el-table-column
            prop="saleOrderCode"
            label="销售订单"
            label="销售订单/预测单"
            sortable="custom"
            show-tooltip-when-overflow
            min-width="160"

 vue.config.js

@@ -52,7 +52,7 @@
    },
    proxy: {
      [process.env.VUE_APP_BASE_API]: {
        target: 'http://121.196.36.24:8042', // 本地
        target: 'http://121.196.36.24:8048', // 本地
        // target: 'http://192.168.1.21:9000', // 阿鲁克（新）
        changeOrigin: true, // 请求跨域时，需 配置此项
        pathRewrite: { // 路径重写,替换target中的请求地址