1.工单关闭100%2.工序导入100%

loulijun2021

2023-09-25 e7a3742ab029bbdb30c6722ed7f5bfc8289776d0

 src/views/workOrder/workOrderList.vue

@@ -8,7 +8,7 @@
          <el-button v-waves type="success" icon="el-icon-connection" @click="send">派发</el-button>
        </div>

        <el-button v-waves icon="el-icon-switch-button" @click="orderClose">关闭工单</el-button>
        <!--        <el-button v-waves icon="el-icon-switch-button" @click="orderClose">关闭工单</el-button>-->
      </div>

      <div class="bodyTopFormGroup">
@@ -634,6 +634,7 @@
            placeholder="请选择相对应工序"
            @change="stepSelectedValueChange"
          >
            <!--            :disabled="!(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"-->
            <el-option
              v-for="item in stepSelectArr"
              :key="item.stepcode"
@@ -720,7 +721,7 @@
          <el-button v-waves @click="dialogVisibleCancel">取 消</el-button>
          <!--          <el-button v-waves v-if="operation==='add'" type="primary" @click="dialogVisibleConfirmPreview('add')">预览</el-button>-->
          <el-button
            v-if="operation!=='view'"
            v-if="operation!=='view'&&(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"
            v-waves
            type="primary"
            :loading="$store.state.app.buttonIsDisabled"
@@ -1216,11 +1217,12 @@
                <el-form-item label="工单数量:" class="formContent">
                  {{ formApprove.plan_qty }}
                </el-form-item>
                <el-form-item label="工艺路线:" class="formContent">
                  {{ formApprove.routename }}
                </el-form-item>
                <!--                <el-form-item label="工艺路线:" class="formContent">-->
                <!--                  {{ formApprove.routename }}-->
                <!--                </el-form-item>-->
                <el-form-item label="打印人员:" class="formContent">
                  {{ username }}
                  <!--                  {{ localStorage.getItem('username') }}-->
                  {{ formApprove.routename }}
                </el-form-item>
                <el-form-item label="打印时间:" class="formContent">
                  {{ formApprove.lm_date }}
@@ -1929,7 +1931,8 @@
import { PartSelect } from '@/api/ProductModel'
import { PrentOrganization, StepData } from '@/api/GeneralBasicData'
import Sortable from 'sortablejs'
import ElDragSelect from '@/components/DragSelect' // base on element-ui
import ElDragSelect from '@/components/DragSelect'
import { MesOrderPrintSearch } from '@/api/GridReport' // base on element-ui

export default {
  name: 'WorkOrderList',
@@ -1968,9 +1971,9 @@
        // { code: 'CREATED', name: '已关闭' }
        { code: 'ALLO', name: '已派发' },
        { code: 'START', name: '开工' },
        { code: 'CLOSED', name: '完工' },
        { code: 'NOSCHED', name: '待排程' },
        { code: 'SCHED', name: '已排程' }
        { code: 'CLOSED', name: '完工' }
        // { code: 'NOSCHED', name: '待排程' },
        // { code: 'SCHED', name: '已排程' }
      ],
      total: 10,
      tableData: [],
@@ -2364,12 +2367,7 @@
    },

    selected(row, index) {
    // && row.isstep === 'Y'  //后端这个字段还没放出来
      if (row.status === 'NEW') {
        return true
      } else {
        return false
      }
      return row.status === 'NEW' && row.isstep === 'Y'
    },
    // 派发
    send() {
@@ -2607,21 +2605,20 @@
      // console.log(number)

      const data2 = {
        username: getCookie('admin'),
        mesordercode: wo_code || this.dialogForm.mesordercode
      }
      MesOrderPrintSearch1(data2).then(res2 => {
      MesOrderPrintSearch(data2).then(res2 => {
        if (res2.code === '200') {
          const res3 = res2.data.recordset

          this.tableDataPrint = res3
          this.formApprove.mesordercode = res3[0].wo_code
          this.formApprove.m_po = res3[0].m_po
          this.formApprove.m_po = res3[0].m_po || '/'
          this.formApprove.partcode = res3[0].partcode
          this.formApprove.partname = res3[0].partname
          this.formApprove.partspec = res3[0].partspec
          this.formApprove.partspec = res3[0].partspec || '/'
          this.formApprove.plan_qty = res3[0].plan_qty
          this.formApprove.routename = res3[0].routename
          this.formApprove.routename = localStorage.getItem('username') // 打印人员
          this.formApprove.lm_date = res3[0].lm_date

          this.$nextTick(() => {