Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

 src/views/product/workbench/workReportCard.vue

@@ -170,10 +170,10 @@
        </el-table-column>
        <el-table-column label="零件名称" prop="partName" align="center" :show-overflow-tooltip="true">
        </el-table-column>
        <el-table-column label="序列号" prop="outBatchNo" align="center" width="120" :show-overflow-tooltip="true">
        <el-table-column label="批次号" prop="outBatchNo" align="center" width="120" :show-overflow-tooltip="true">
          <template slot-scope="scope">
            <el-input :id="'idReport_' + +scope.$index" :ref="'reference_' + scope.$index" v-if="scope.row.isEdit"
              v-model="scope.row.outBatchNo" placeholder="序列号"></el-input>
              v-model="scope.row.outBatchNo" placeholder="批次号"></el-input>
            <template v-if="!scope.row.isEdit">{{
              scope.row.outBatchNo
            }}</template>
@@ -443,7 +443,7 @@
      <shiftProductoutFormDialog :currshowlist.sync="showShiftProductForm" :productList="productList"
        :parentInfo="parentInfo" :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList"
        @refreshProductOutputList="refreshProductOutputList" />
      <workReportFeed v-if="searchFeed" ref="searchFeed" @refreshFeedsForDel="refreshFeedsForDel"></workReportFeed>
      <workReportFeed v-if="searchFeed" ref="searchFeed" @refreshTable="getBatchReport(5)" @refreshFeedsForDel="refreshFeedsForDel"></workReportFeed>

      <productOutFormDialog :currshowlist.sync="showProductForm" :productList="productList" :parentInfo="parentInfo"
        :currentDutyRecord="currentDutyRecord" :personBoardList="personBoardList"
@@ -456,8 +456,8 @@
    <div>
      <iframe id="frame" style="width:2480px;overflow:hidden;margin-top: 200px;" :src="jimusrc"></iframe>
    </div>
    <el-dialog title="产出合格库位" :visible.sync="dialogVisible" width="30%">
      <span>合格库位：</span>
    <el-dialog title="产出放入线边仓库位" :visible.sync="dialogVisible" width="30%">
      <span>移入线边仓库位：</span>
      <el-select v-model="locationIdValue" placeholder="请选择">
        <el-option v-for="item in options" :key="item.index" :label="`${item.locNo}+${item.locName}`" :value="item.id">
        </el-option>
@@ -3266,7 +3266,10 @@
          this.$message.error('最多只能选择1条记录进行提交！')
          return false
        } else {
          qualifiedLocation(this.multipleSelection[0].workstationId).then(res => {
          qualifiedLocation({
              workstationId: this.multipleSelection[0].workstationId,
              operationTaskId: this.currOperateTask.id
          }).then(res => {
            this.options = res.data.data
            if (this.options.length > 1) {
              this.dialogVisible = true