gaoluyang
2025-03-06 889114a6c8362ca54586781f5bf284afa83dffaf
检验任务提交流程修改
已修改3个文件
33 ■■■■ 文件已修改
src/views/business/inspectionTask/components/viewManHourDia.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/inspection.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/business/inspectionTask/components/viewManHourDia.vue
@@ -18,7 +18,11 @@
      </div>
      <lims-table :tableData="tableData0" :column="column0"
                  :page="page0" :tableLoading="tableLoading"
                  height="560" @pagination="pagination0"></lims-table>
                  height="500" @pagination="pagination0"></lims-table>
      <span slot="footer" class="dialog-footer" v-if="insState == 99">
        <el-button @click="editInspectionDia = false">取 消</el-button>
        <el-button type="primary" @click="handleSubmit">确 定</el-button>
      </span>
    </el-dialog>
    <el-dialog :visible.sync="editAskDia" title="修改" width="50%">
      <el-form ref="form" :model="editForm" label-width="100px">
@@ -74,6 +78,7 @@
        orderId: 0,
        inspectionItem: ''
      },
      insState: 0,
      tableData0: [],
      tableLoading: false,
      column0: [
@@ -102,6 +107,9 @@
              clickFun: (row) => {
                this.editIns(row);
              },
              disabled: (row) => {
                return this.insState == 3 || this.insState == 5 || this.insState == 99
              },
            },
          ],
        },
@@ -128,7 +136,8 @@
  },
  // 方法集合
  methods: {
    showDialog(id) {
    showDialog(id, insState) {
      this.insState = insState
      this.editInspectionDia = true;
      this.entity.orderId = id;
      this.getList0();
@@ -167,6 +176,11 @@
          this.handleEditLoading = false;
        });
    },
    // 确认工时
    handleSubmit () {
      this.editInspectionDia = false;
      this.$emit("submit");
    },
    pagination0({ page, limit }) {
      this.page0.current = page;
      this.page0.size = limit;
src/views/business/inspectionTask/index.vue
@@ -646,7 +646,7 @@
    },
    // 查看工时
    viewManHour(row) {
      this.$refs.viewManHourDia.showDialog(row.id);
      this.$refs.viewManHourDia.showDialog(row.id, row.insState);
    },
    // 数据查看
    handleDataLook(row) {
src/views/business/inspectionTask/inspection.vue
@@ -23,7 +23,7 @@
          @click="openUnPassDialog('add')">不合格处理</el-button>
        <el-button size="small" type="primary" @click="sampleVisible = true; uploadSample();">样品切换</el-button>
        <!--        <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">任务切换</el-button>-->
        <el-button v-if="state == 1" size="small" type="primary" @click="addVerifyDia = true">提交</el-button>
        <el-button v-if="state == 1" size="small" type="primary" @click="viewManHour">提交</el-button>
        <!-- 复核 -->
        <el-button v-if="state == 2" size="medium" type="primary" @click="openAddCheck">通过</el-button>
        <el-button v-if="state == 2" size="medium" @click="upInsReview(0)">不通过</el-button>
@@ -509,6 +509,8 @@
      :unPassCheck="unPassCheck" @closeUnPassCheckDialog="closeUnPassCheckDialog" @refreshView="refreshView" />
    <purchase-verification v-if="purchaseDialog" ref="purchaseDialog" :orderId="orderId"
      :purchaseDialog="purchaseDialog" @resetPurchaseDialog="resetPurchaseDialog"></purchase-verification>
    <!--查看工时弹框-->
    <viewManHourDia ref="viewManHourDia" @submit="openAddVerifyDia"></viewManHourDia>
  </div>
</template>
@@ -542,9 +544,11 @@
import DataWorker from '../../../DataWorker.worker';
import html2canvas from "html2canvas";
import { mapGetters } from "vuex";
import viewManHourDia from "@/views/business/inspectionTask/components/viewManHourDia.vue";
export default {
  name: 'Inspection',
  components: {
    viewManHourDia,
    PurchaseVerification,
    AddUnPass,
    limsTable,
@@ -2582,6 +2586,13 @@
        this.$message.error("未输入不通过原因");
      }
    },
    // 查看工时
    viewManHour() {
      this.$refs.viewManHourDia.showDialog(this.id, 99);
    },
    openAddVerifyDia () {
      this.addVerifyDia = true;
    },
    submit() {
      if (this.verifyUser === null || this.verifyUser === "") {
        this.$message.error("请指定复核人员");