1.工序报工100%

loulijun2021

2023-10-07 729bb3b1bac72bd760638e6329ba77cf1a8fb43f

 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">
@@ -269,6 +269,13 @@
              <div v-else>/</div>
            </template>
          </el-table-column>
          <el-table-column
            prop="data_sources"
            show-tooltip-when-overflow
            label="数据来源"
            sortable="custom"
            width="120"
          />

          <el-table-column
            prop="lm_user"
@@ -295,12 +302,12 @@
                  <i
                    class="el-icon-edit-outline"
                    :style="{color:$store.state.settings.theme}"
                    @click="edit('edit',row)"
                    @click.stop="edit('edit',row)"
                  />
                </el-tooltip>

                <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                  <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click="del(row)" />
                  <i class="el-icon-delete" :style="{color:$store.state.settings.theme}" @click.stop="del(row)" />
                </el-tooltip>

                <el-tooltip class="item" effect="dark" content="打印工单" placement="top">
@@ -313,7 +320,7 @@
                    :style="{color:$store.state.settings.theme}"
                    class="el-icon-printer"
                    style="cursor: pointer;margin-right: 15px"
                    @click="handlePrint(row.wo_code)"
                    @click.stop="handlePrint(row.wo_code)"
                  />
                </el-tooltip>

@@ -322,7 +329,7 @@
                    class="el-icon-view"
                    style="cursor: pointer;"
                    :style="{color:$store.state.settings.theme}"
                    @click="edit('view',row)"
                    @click.stop="edit('view',row)"
                  />
                </el-tooltip>

@@ -395,6 +402,11 @@
            show-tooltip-when-overflow
            prop="stepname"
            width="150"
          />
          <el-table-column
            label="工序单价"
            show-tooltip-when-overflow
            prop="stepprice"
          />
          <el-table-column
            label="已生产数量"
@@ -627,6 +639,7 @@
            placeholder="请选择相对应工序"
            @change="stepSelectedValueChange"
          >
            <!--            :disabled="!(dialogForm.mesorderstus==='NEW'||dialogForm.mesorderstus==='ALLO')"-->
            <el-option
              v-for="item in stepSelectArr"
              :key="item.stepcode"
@@ -713,7 +726,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"
@@ -1209,11 +1222,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 }}
@@ -1922,7 +1936,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',
@@ -1961,9 +1976,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: [],
@@ -1984,7 +1999,9 @@
        wkshopname: '', // 生产车间名称

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

        mesmaxqty: 0// 工单的最大值
      },
      ordertypeArr: [// 工单类型
        { code: 'PO', name: '标准工单' },
@@ -2355,12 +2372,7 @@
    },

    selected(row, index) {
    // && row.isstep === 'Y'
      if (row.status === 'NEW') {
        return true
      } else {
        return false
      }
      return row.status === 'NEW' && row.isstep === 'Y'
    },
    // 派发
    send() {
@@ -2427,6 +2439,7 @@
      this.dialogForm.partspec = row.partspec
      this.dialogForm.wkshopcode = row.wkshp_code
      this.dialogForm.deliverydate = row.saleOrderDeliveryDate.substring(0, 11)
      this.dialogForm.mesqty = row.plan_qty

      const data = {
        sourceid: this.dialogForm.sourceorderid,
@@ -2435,7 +2448,8 @@
        data_sources: this.dialogForm.data_sources
      }
      const { data: res } = await UpdateMesOrderStepSearch(data)
      this.dialogForm.mesqty = res.canupdate_qty
      this.dialogForm.mesmaxqty = res.canupdate_qty

      res.stepdata.forEach(i => {
        this.stepTableData.push(
          {
@@ -2494,6 +2508,10 @@
        if (valid) {
          if (this.dialogForm.ordertype === 'FO' && this.dialogForm.sourceorder.toString().trim().length <= 0) {
            return this.$message.info('源单单号不能为空！')
          }

          if (this.dialogForm.data_sources === 'ERP' && this.dialogForm.mesmaxqty < this.dialogForm.mesqty) {
            return this.$message.info('此工单的最大修改数值为：' + this.dialogForm.mesmaxqty)
          }

          const workListSub = []
@@ -2592,21 +2610,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(() => {