Merge branch 'dev_pro_河南鹤壁' of http://114.132.189.42:9002/r/product-invento...

gongchunyi

6 小时以前 0c69401278c9f4c71b22878bd1b2a2f24410a165

Merge branch 'dev_pro_河南鹤壁' of http://114.132.189.42:9002/r/product-inventory-management into dev_pro_河南鹤壁

 multiple/assets/favicon/XSWHfavicon.ico

 multiple/assets/logo/XSWHLogo.png

 src/views/qualityManagement/finalInspection/index.vue

@@ -40,7 +40,7 @@
    </div>
    <InspectionFormDia ref="inspectionFormDia" @close="handleQuery"></InspectionFormDia>
    <FormDia ref="formDia" @close="handleQuery"></FormDia>
    <files-dia ref="filesDia" @close="handleQuery"></files-dia>
    <files-dia ref="filesDia" ></files-dia>
    <el-dialog v-model="dialogFormVisible" title="编辑检验员" width="30%"
               @close="closeDia">
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
@@ -226,6 +226,7 @@
        clickFun: (row) => {
          submit(row.id);
        },
        loading: (row) => submitLoadingId.value === row.id,
        disabled: (row) => {
          // 已提交则禁用
          if (row.inspectState == 1) return true;
@@ -263,6 +264,7 @@
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
const submitLoadingId = ref(null);
const currentRow = ref(null)
const page = reactive({
  current: 1,
@@ -375,12 +377,20 @@
      });
};

// 提价
// 提交
const submit = async (id) => {
  const res = await submitQualityInspect({id: id})
  if (res.code === 200) {
    proxy.$modal.msgSuccess("提交成功");
    getList();
  submitLoadingId.value = id;
  try {
    const res = await submitQualityInspect({ id });
    if (res.code === 200) {
      proxy.$modal.msgSuccess("提交成功");
      const row = tableData.value.find(item => item.id === id);
      if (row) {
        row.inspectState = 1;
      }
    }
  } finally {
    submitLoadingId.value = null;
  }
}


 src/views/qualityManagement/processInspection/index.vue

@@ -39,7 +39,7 @@
    </div>
    <InspectionFormDia ref="inspectionFormDia" @close="handleQuery"></InspectionFormDia>
    <FormDia ref="formDia" @close="handleQuery"></FormDia>
    <files-dia ref="filesDia" @close="handleQuery"></files-dia>
    <files-dia ref="filesDia"></files-dia>
        <el-dialog v-model="dialogFormVisible" title="编辑检验员" width="30%"
                             @close="closeDia">
            <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
@@ -225,6 +225,7 @@
                clickFun: (row) => {
                    submit(row.id);
                },
                loading: (row) => submitLoadingId.value === row.id,
                disabled: (row) => {
                    // 已提交则禁用
                    if (row.inspectState == 1) return true;
@@ -264,6 +265,7 @@
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
const submitLoadingId = ref(null);
const dialogFormVisible = ref(false);
const form = ref({
    checkName: ""
@@ -333,12 +335,20 @@
    filesDia.value?.openDialog(type, row)
  })
};
// 提价
// 提交
const submit = async (id) => {
    const res = await submitQualityInspect({id: id})
    if (res.code === 200) {
        proxy.$modal.msgSuccess("提交成功");
        getList();
    submitLoadingId.value = id;
    try {
        const res = await submitQualityInspect({ id });
        if (res.code === 200) {
            proxy.$modal.msgSuccess("提交成功");
            const row = tableData.value.find(item => item.id === id);
            if (row) {
                row.inspectState = 1;
            }
        }
    } finally {
        submitLoadingId.value = null;
    }
}
const open = async (row) => {

 src/views/qualityManagement/rawMaterialInspection/index.vue

@@ -40,7 +40,7 @@
    </div>
    <InspectionFormDia ref="inspectionFormDia" @close="handleQuery"></InspectionFormDia>
    <FormDia ref="formDia" @close="handleQuery"></FormDia>
    <files-dia ref="filesDia" @close="handleQuery"></files-dia>
    <files-dia ref="filesDia"></files-dia>
    <el-dialog v-model="dialogFormVisible" title="编辑检验员" width="30%"
               @close="closeDia">
      <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
@@ -380,7 +380,10 @@
    const res = await submitQualityInspect({ id });
    if (res.code === 200) {
      proxy.$modal.msgSuccess("提交成功");
      getList();
      const row = tableData.value.find(item => item.id === id);
      if (row) {
        row.inspectState = 1;
      }
    }
  } finally {
    submitLoadingId.value = null;