Merge remote-tracking branch 'origin/dev_7004' into dev_7004

spring

10 天以前 0c445ac6d2a20153e5eac390555ba88f950d76b0

 src/views/qualityManagement/processInspection/index.vue

@@ -40,6 +40,23 @@
    <InspectionFormDia ref="inspectionFormDia" @close="handleQuery"></InspectionFormDia>
    <FormDia ref="formDia" @close="handleQuery"></FormDia>
    <files-dia ref="filesDia" @close="handleQuery"></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">
            <el-form-item label="检验员：" prop="checkName">
               <el-select v-model="form.checkName" placeholder="请选择" clearable>
                  <el-option v-for="item in userList" :key="item.nickName" :label="item.nickName"
                                  :value="item.nickName"/>
               </el-select>
            </el-form-item>
         </el-form>
         <template #footer>
            <div class="dialog-footer">
               <el-button type="primary" @click="submitForm">确认</el-button>
               <el-button @click="closeDia">取消</el-button>
            </div>
         </template>
      </el-dialog>
  </div>
</template>

@@ -49,9 +66,15 @@
import InspectionFormDia from "@/views/qualityManagement/processInspection/components/inspectionFormDia.vue";
import FormDia from "@/views/qualityManagement/processInspection/components/formDia.vue";
import {ElMessageBox} from "element-plus";
import {qualityInspectDel, qualityInspectListPage} from "@/api/qualityManagement/rawMaterialInspection.js";
import {
   downloadQualityInspect,
   qualityInspectDel,
   qualityInspectListPage, qualityInspectUpdate,
   submitQualityInspect
} from "@/api/qualityManagement/rawMaterialInspection.js";
import FilesDia from "@/views/qualityManagement/processInspection/components/filesDia.vue";
import dayjs from "dayjs";
import {userListNoPage} from "@/api/system/user.js";

const data = reactive({
  searchForm: {
@@ -63,6 +86,9 @@
    entryDateStart: dayjs().format("YYYY-MM-DD"),
    entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"),
  },
   rules: {
      checkName: [{required: true, message: "请选择", trigger: "change"}],
   },
});
const { searchForm } = toRefs(data);
const tableColumn = ref([
@@ -116,12 +142,23 @@
      }
    },
  },
   {
      label: "提交状态",
      prop: "inspectState",
      formatData: (params) => {
         if (params) {
            return "已提交";
         } else {
            return "未提交";
         }
      },
   },
  {
    dataType: "action",
    label: "操作",
    align: "center",
    fixed: "right",
    width: 190,
    width: 280,
    operation: [
      {
        name: "编辑",
@@ -129,13 +166,9 @@
        clickFun: (row) => {
          openForm("edit", row);
        },
      },
      {
        name: "新增检验记录",
        type: "text",
        clickFun: (row) => {
          openInspectionForm("edit", row);
        },
            disabled: (row) => {
               return row.inspectState == 1;
            }
      },
      {
        name: "附件",
@@ -144,12 +177,49 @@
          openFilesFormDia(row);
        },
      },
         {
            name: "提交",
            type: "text",
            clickFun: (row) => {
               submit(row.id);
            },
            disabled: (row) => {
               return row.inspectState == 1;
            }
         },
         {
            name: "分配检验员",
            type: "text",
            clickFun: (row) => {
               if (!row.checkName) {
                  open(row)
               } else {
                  proxy.$modal.msgError("检验员已存在");
               }
            },
            disabled: (row) => {
               return row.inspectState == 1 || row.checkName;
            }
         },
         {
            name: "下载",
            type: "text",
            clickFun: (row) => {
               downLoadFile(row);
            },
         },
    ],
  },
]);
const userList = ref([]);
const currentRow = ref(null)
const tableData = ref([]);
const selectedRows = ref([]);
const tableLoading = ref(false);
const dialogFormVisible = ref(false);
const form = ref({
   checkName: ""
});
const page = reactive({
  current: 1,
  size: 100,
@@ -214,6 +284,38 @@
    filesDia.value?.openDialog(type, row)
  })
};
// 提价
const submit = async (id) => {
   const res = await submitQualityInspect({id: id})
   if (res.code === 200) {
      proxy.$modal.msgSuccess("提交成功");
      getList();
   }
}
const open = async (row) => {
   let userLists = await userListNoPage();
   userList.value = userLists.data;
   currentRow.value = row
   dialogFormVisible.value = true
}
// 关闭弹框
const closeDia = () => {
   proxy.resetForm("formRef");
   dialogFormVisible.value = false;
};
const submitForm = () => {
   if (currentRow.value) {
      const data = {
         ...form.value,
         id: currentRow.value.id
      }
      qualityInspectUpdate(data).then(res => {
         proxy.$modal.msgSuccess("提交成功");
         closeDia();
         getList();
      })
   }
};

// 删除
const handleDelete = () => {
@@ -239,6 +341,23 @@
        proxy.$modal.msg("已取消");
      });
};
const downLoadFile = (row) => {
   downloadQualityInspect({ id: row.id }).then((blobData) => {
      const blob = new Blob([blobData], {
         type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
      })
      const downloadUrl = window.URL.createObjectURL(blob)
		
      const link = document.createElement('a')
      link.href = downloadUrl
      link.download = '过程检验报告.docx'
      document.body.appendChild(link)
      link.click()
		
      document.body.removeChild(link)
      window.URL.revokeObjectURL(downloadUrl)
   })
};
// 导出
const handleOut = () => {
  ElMessageBox.confirm("选中的内容将被导出，是否确认导出？", "导出", {