Merge remote-tracking branch 'origin/master'

86134

2023-11-11 4652431ce329b4dec6c4dcc0758d5c4ff97e0666

 src/views/product/workbench/index.vue

@@ -49,22 +49,22 @@
          <el-image src="/img/workbench/icon_bg.png"></el-image>
          <span class="item-name">报工</span>
        </div>
        <div
        <!-- <div
          v-show="isShowStepBusiness"
          :class="['wb-header-menu-item', stepShow ? 'item-show' : '']"
          @click="selectItem('step')"
        >
          <el-image src="/img/workbench/icon_gb.png"></el-image>
          <span class="item-name">工步</span>
        </div>
        <div
        </div> -->
        <!-- <div
          v-show="permissions.product_menu_split"
          :class="['wb-header-menu-item', splitTaskShow ? 'item-show' : '']"
          @click="selectItem('splitTask')"
        >
          <el-image src="/img/workbench/icon_sp.png"></el-image>
          <span class="item-name">分割</span>
        </div>
        </div> -->
        <div
          :class="['wb-header-menu-item', artificialShow ? 'item-show' : '']"
          @click="selectItem('artificial')"
@@ -314,11 +314,11 @@
                </div>
                <div style="float:right;width:10%;">
                  <div class="open-edit-duty-div">
                    <div>
                    <!-- <div>
                      <span class="duty-edit-span" @click="clearDutyRecord"
                        >清空</span
                      >
                    </div>
                    </div> -->
                    <div>
                      <span class="duty-edit-span" @click="openDutyEdit"
                        >编辑</span
@@ -378,15 +378,24 @@
              <el-tooltip
                class="item"
                effect="dark"
                content="批量提交"
                content="清空"
                placement="top"
              >
                <button
                <!-- <button
                  class="duty-circle-button"
                  @click="submitSaveDutyRecord"
                >
                  <i
                    class="el-icon-document-checked"
                    class="el-icon-delete"
                    style="color: #FFFFFF;"
                  ></i>
                </button> -->
                <button
                  class="duty-circle-button"
                  @click="clearDutyRecord"
                >
                  <i
                    class="el-icon-delete"
                    style="color: #FFFFFF;"
                  ></i>
                </button>
@@ -464,7 +473,7 @@
              :inline="true"
              style="margin-left: 10px"
            >
              <el-form-item prop="orderNumber" label="销售订单号">
              <!-- <el-form-item prop="orderNumber" label="销售订单号">
                <el-input
                  placeholder="请输入销售订单号"
                  v-model="operateTaskForm.orderNumber"
@@ -472,8 +481,8 @@
                  @keyup.enter.native="queryInfoForOrderNumber"
                  @clear="queryInfoForOrderNumber"
                ></el-input>
              </el-form-item>
              <el-form-item prop="spec" label="成品规格">
              </el-form-item> -->
              <!-- <el-form-item prop="spec" label="成品规格">
                <el-select
                  placeholder="请选择成品规格"
                  v-model="operateTaskForm.spec"
@@ -498,19 +507,19 @@
                  >
                  </el-option>
                </el-select>
              </el-form-item>
              <el-form-item prop="outBatchNo" label="SN">
              </el-form-item> -->
              <el-form-item prop="outBatchNo" label="车间订单">
                <el-input
                  placeholder="请输入投入半成品SN号"
                  placeholder="请输入车间订单号"
                  v-model="operateTaskForm.outBatchNo"
                  clearable
                  @keyup.enter.native="refreshOperateTasksByConditions"
                  @clear="refreshOperateTasksByConditions"
                ></el-input>
              </el-form-item>
              <el-form-item prop="mpsNo" label="计划号">
              <el-form-item prop="mpsNo" label="工单号">
                <el-input
                  placeholder="请输入计划号"
                  placeholder="请输入工单号"
                  v-model="operateTaskForm.mpsNo"
                  clearable
                  @keyup.enter.native="refreshOperateTasksByConditions"
@@ -1424,7 +1433,7 @@
.task-div-content {
  // height: calc(100% - 40px);
  flex: 1;
  padding: 0px 15px;
  padding: 10px 15px;
  box-sizing: border-box;
  overflow-y: auto;
  margin-bottom: 10px;
@@ -1491,7 +1500,7 @@
  getPartNamesByOrderNo,
  getProductSnByCustomerNoAndPartName
} from '@/api/product/personboard'
import { getObj as getSysParam } from '@/api/admin/sys-public-param'
import { getObj as getSysParam} from '@/api/admin/sys-public-param'
import { getAllCrewList } from '@/api/basic/crew'
import { getAllShiftList } from '@/api/basic/shift'
import { getAllWorkstationList, updateById } from '@/api/basic/workstation'
@@ -1661,7 +1670,7 @@
    ...mapGetters(['userInfo', 'tagWel', 'permissions'])
  },
  created() {
    document.title = '工作台——ZTTMES'
    document.title = '工作台——MES'
    if (!this.dutyForm.workstationId) {
      const k = localStorage.getItem(storage_key)
      if (k) {
@@ -1672,7 +1681,6 @@
    this.getSysParam(sysParam.SHOW_STEP_BUSINESS)
    this.getTrackingParam(sysParam.SHOW_TRACKING_TYPE)
    this.timer = setInterval(this.clockTimer, 1000)
    console.log(this.permissions, 'ASSS')
  },
  watch: {
    'dutyForm.workstationId'(val) {
@@ -2250,9 +2258,9 @@
      if (!this.dutyForm.endTime) {
        return { result: false, msg: '结束时间不能为空' }
      }
      if (!this.dutyForm.dutyTime) {
      /* if (!this.dutyForm.dutyTime) {
        return { result: false, msg: '班次时间不能为空' }
      }
      } */
      if (!this.dutyForm.shiftId) {
        return { result: false, msg: '班次不能为空' }
      }