From c7fe517535fb35d5e4104db1d166499570739e31 Mon Sep 17 00:00:00 2001
From: gaojs <757918719@qq.com>
Date: Sat, 6 Jul 2024 16:37:07 +0800
Subject: [PATCH] =?UTF-8?q?QMS=20=E2=80=94=E2=80=94>=20=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20bug=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/eam/equipmentAccounts/ablesForm.vue | 121 ++++++++++++++++++
 src/views/qms/inspectionJob/addForm.vue       |   5 +-
 2 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 src/views/eam/equipmentAccounts/ablesForm.vue

diff --git a/src/views/eam/equipmentAccounts/ablesForm.vue b/src/views/eam/equipmentAccounts/ablesForm.vue
new file mode 100644
index 000000000..4585930a9
--- /dev/null
+++ b/src/views/eam/equipmentAccounts/ablesForm.vue
@@ -0,0 +1,121 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle"  :close-on-click-modal="false">
+    <el-form ref="basicFormRef" v-loading="formLoading" :model="formData" :rules="formRules" label-width="100px">
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="变更原因" prop="verifyContent">
+            <el-input v-model="formData.changeReason" type="textarea" :input-style="{height:'100px'}" maxlength="300" placeholder="请输入变更原因" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm('success')">确 定</el-button>
+      <el-button @click="handleClose('close')">取 消</el-button>
+    </template>
+  </Dialog>
+
+
+</template>
+<script lang="ts" setup>
+import * as EquipmentAccountsApi from '@/api/eam/equipmentAccounts'
+import {ElInput} from "element-plus";
+
+defineOptions({ name: 'TeamForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型
+
+
+
+const formData = ref({
+  id:'',
+  code:'',
+  changeReason: '',
+  status:'',
+  available:''
+})
+const formRules = reactive({
+  changeReason: [
+    { required: true, message: '变更原因不能为空', trigger: 'blur' },
+    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+  ],
+})
+const basicFormRef = ref() // 表单 Ref
+
+
+/** 初始化弹窗 */
+const open = async (type: string, row?: object) => {
+  dialogVisible.value = true
+  if(type == 'disable'){
+      dialogTitle.value = '禁用'
+      formData.value.status = 'DISABLE'
+      formData.value.available = 'FALSE'
+  }else if(type == 'enable'){
+      dialogTitle.value = '启用'
+      formData.value.status = 'NORMAL'
+      formData.value.available = 'TRUE'
+  }else{
+      dialogTitle.value = t('action.' + type)
+  }
+  formType.value = type
+  //初始化数据
+  formData.value.id = row.id
+  formData.value.code = row.code
+}
+
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const submitForm = async (val) => {
+
+   // 校验表单
+   if (!basicFormRef) return
+   const valid = await basicFormRef.value.validate()
+   if (!valid) return
+
+   //发送数据
+   await EquipmentAccountsApi.ableEquipmentAccountsMain(formData.value)
+   //把success函数传递到父页面
+   emit('success',formData.value.id)
+   dialogVisible.value = false
+}
+
+const handleClose=(val)=>{
+  dialogVisible.value = false
+  emit('close',val)
+}
+
+// 传递给父类
+const emit = defineEmits(['close','success'])
+
+</script>
+
+<style scoped>
+.tag-container {
+  margin-top: 10px; /* 可根据需要调整标签容器与表单项之间的间距 */
+  border: 1px solid #ccc; /* 添加边框样式 */
+  padding: 10px; /* 可根据需要调整容器内边距 */
+  width: 950px; /* 设置固定宽度为 950px */
+  overflow-y: auto; /* 当内容溢出容器高度时显示滚动条 */
+  word-wrap: break-word; /* 使用 word-wrap 属性实现超出范围换行 */
+  overflow-wrap: break-word; /* 兼容性更好的写法 */
+  flex-wrap: wrap;
+}
+.input-with-button {
+  display: flex;
+  align-items: center;
+  width: 100%;
+}
+
+.input-with-button > .el-input {
+  flex: 1;
+  /*margin-right: 10px;*/
+}
+
+</style>
diff --git a/src/views/qms/inspectionJob/addForm.vue b/src/views/qms/inspectionJob/addForm.vue
index cc24ae084..5242a93c4 100644
--- a/src/views/qms/inspectionJob/addForm.vue
+++ b/src/views/qms/inspectionJob/addForm.vue
@@ -175,7 +175,7 @@
                 </el-col>
                 <!-- 手动评估的时候显示 -->
                 <el-col :span="12" v-if="item.samplingProcessRespVO.evaluationMode == 1">
-                  <el-form-item label="评估代码" required>
+                  <el-form-item label="评估代码" required prop="inspectionJobCharacteristicsUpdateReqVO.estimateCode">
                     <el-select v-model="item.inspectionJobCharacteristicsUpdateReqVO.estimateCode" placeholder="请选择评估代码"
                       @change="changeFeatureType">
                       <el-option v-for="dict in getStrDictOptions(DICT_TYPE.EVALUATION_CODE)" :key="dict.value"
@@ -473,6 +473,9 @@
           rules.value['inspectionJobCharacteristicsUpdateReqVO.estimateCode'][0].required = false
         }
       })
+      list.forEach(item => {
+        item.inspectionJobCharacteristicsUpdateReqVO.inspectionStartTime = new Date()
+      })
       data.value.subList = list
       /**
         设置采样数量，默认第一个包装采样数量<总数量，显示数量字段，第二个包装和剩下的总数量对比，以此类推，