소스 검색

安全检查记录添加查看按钮

xy 3 일 전
부모
커밋
f3d823705a

+ 12 - 2
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/SavetyCheckRecordList.vue

@@ -149,7 +149,12 @@ const props = defineProps({
   taskOrderItemId: {
     type: String,
     default: ''
-  }
+  },
+  editType: {
+    // 修改/查看
+    type: String,
+    default: ''
+  },
 })
 
 const userStore = useUserStore()
@@ -164,6 +169,7 @@ const recordSource = ref('')
 
 const showSpreadDesigner = ref(false)
 const curCheckId = ref(props.checkId || '')
+const curEditType = ref(props.editType || '')
 // 获取安全检查记录的模板信息
 const templateParams = ref<Recordable>({})
 const defaultNewTemplateParams = ref<Recordable>({}) // 记录获取的最新的模板数据
@@ -446,7 +452,11 @@ const editPreview=()=>{
 
   editData.value.templateId = templateParams.value.templateId;
   editData.value.refId = curCheckId.value;
-  editData.value.opType = 0;
+  if (curEditType.value === 'edit'){
+    editData.value.opType = 0;
+  }else{
+    editData.value.opType = 1;
+  }
 
   setTimeout(()=>{
     editSpreadRecordRef.value?.reloadView();

+ 9 - 2
yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/TaskOrderDetailDialog.vue

@@ -829,6 +829,7 @@
     v-model:visible="savetyCheckRecordListVsible"
     :checkId="savetyCheck.checkId"
     :orderId="savetyCheck.orderId"
+    :editType="savetyCheck.editType"
     @success="handleUpdateSavetyCheckRecordList" />
 
   <CustomDialog
@@ -1574,6 +1575,7 @@ const savetyCheckRecordListVsible = ref(false)
 const savetyCheck = reactive({
   checkId: '',
   orderId: '',
+  editType: '',
 })
 
 const handleAddSafetyRecord = async () => {
@@ -1590,12 +1592,15 @@ const handleAddSafetyRecord = async () => {
 
   savetyCheckRecordListVsible.value = true
   savetyCheck.orderId = taskOrderDetail.value.id
+  savetyCheck.editType = 'edit'
+
 }
 
 watch(() => savetyCheckRecordListVsible.value, (savetyCheckRecordListVsible) => {
   if(savetyCheckRecordListVsible) return
   savetyCheck.checkId = ''
   savetyCheck.orderId = ''
+  savetyCheck.editType = ''
 })
 
 // 安全检查记录列表弹窗
@@ -1628,7 +1633,8 @@ const savetyRecordColumns = ref([
     prop: '',
     render: (row) => {
       return <div>
-        <el-button link type="primary" onClick={() => handleModifySavetyRecord(row)}>修改</el-button>
+        <el-button link type="primary" onClick={() => handleModifySavetyRecord(row,'view')}>查看</el-button>
+        <el-button link type="primary" onClick={() => handleModifySavetyRecord(row,'edit')}>修改</el-button>
         <el-button link type="danger" onClick={() => handleDeleteSavetyRecord(row)}>删除</el-button>
       </div>
     }
@@ -1647,11 +1653,12 @@ const fetchSafetyCheckRecordPage = async () => {
   }
 }
 
-const handleModifySavetyRecord = (row) => {
+const handleModifySavetyRecord = (row,editType) => {
   // 修改安全检查记录
   savetyCheckRecordListVsible.value = true
   savetyCheck.orderId = taskOrderDetail.value.id
   savetyCheck.checkId = row.id
+  savetyCheck.editType = editType
 }
 
 const handleDeleteSavetyRecord = (row) => {

+ 15 - 3
yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/SavetyCheckRecordList.vue

@@ -8,7 +8,9 @@
   >
     <div class="designer-inner">
 <!--      <SpreadViewer :initData="initData" ref="spreadRef" />-->
-      <SpreadViewer :initData="editData" ref="editSpreadRecordRef" isFullscreen @saveSuccess="saveSuccessRecord"/>
+      <SpreadViewer :initData="editData" ref="editSpreadRecordRef"
+                    isFullscreen @saveSuccess="saveSuccessRecord" />
+<!--      <SpreadViewer v-else :initData="initData" ref="spreadRef" />-->
     </div>
     <div class="operation-inner">
       <div class="btn-list">
@@ -149,7 +151,12 @@ const props = defineProps({
   taskOrderItemId: {
     type: String,
     default: ''
-  }
+  },
+  editType: {
+    // 修改/查看
+    type: String,
+    default: ''
+  },
 })
 
 const userStore = useUserStore()
@@ -162,6 +169,7 @@ const pageLoading = ref(false)
 
 const showSpreadDesigner = ref(false)
 const curCheckId = ref(props.checkId || '')
+const curEditType = ref(props.editType || '')
 // 获取安全检查记录的模板信息
 const templateParams = ref<Recordable>({})
 const defaultNewTemplateParams = ref<Recordable>({}) // 记录获取的最新的模板数据
@@ -437,7 +445,11 @@ const editPreview=()=>{
 
   editData.value.templateId = templateParams.value.templateId;
   editData.value.refId = curCheckId.value;
-  editData.value.opType = 0;
+  if (curEditType.value === 'edit'){
+    editData.value.opType = 0;
+  }else{
+    editData.value.opType = 1;
+  }
 
   setTimeout(()=>{
     editSpreadRecordRef.value?.reloadView();

+ 9 - 2
yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/TaskOrderDetailDialog.vue

@@ -825,6 +825,7 @@
     v-model:visible="savetyCheckRecordListVsible"
     :checkId="savetyCheck.checkId"
     :orderId="savetyCheck.orderId"
+    :editType="savetyCheck.editType"
     @success="handleUpdateSavetyCheckRecordList" />
 
   <CustomDialog
@@ -1685,6 +1686,7 @@ const savetyCheckRecordListVsible = ref(false)
 const savetyCheck = reactive({
   checkId: '',
   orderId: '',
+  editType: '',
 })
 
 const handleAddSafetyRecord = async () => {
@@ -1701,12 +1703,15 @@ const handleAddSafetyRecord = async () => {
 
   savetyCheckRecordListVsible.value = true
   savetyCheck.orderId = taskOrderDetail.value.id
+  savetyCheck.editType = 'edit'
+
 }
 
 watch(() => savetyCheckRecordListVsible.value, (savetyCheckRecordListVsible) => {
   if(savetyCheckRecordListVsible) return
   savetyCheck.checkId = ''
   savetyCheck.orderId = ''
+  savetyCheck.editType = ''
 })
 
 // 安全检查记录列表弹窗
@@ -1739,7 +1744,8 @@ const savetyRecordColumns = ref([
     prop: '',
     render: (row) => {
       return <div>
-        <el-button link type="primary" onClick={() => handleModifySavetyRecord(row)}>修改</el-button>
+        <el-button link type="primary" onClick={() => handleModifySavetyRecord(row,'view')}>查看</el-button>
+        <el-button link type="primary" onClick={() => handleModifySavetyRecord(row,'edit')}>修改</el-button>
         <el-button link type="danger" onClick={() => handleDeleteSavetyRecord(row)}>删除</el-button>
       </div>
     }
@@ -1758,11 +1764,12 @@ const fetchSafetyCheckRecordPage = async () => {
   }
 }
 
-const handleModifySavetyRecord = (row) => {
+const handleModifySavetyRecord = (row,editType) => {
   // 修改安全检查记录
   savetyCheckRecordListVsible.value = true
   savetyCheck.orderId = taskOrderDetail.value.id
   savetyCheck.checkId = row.id
+  savetyCheck.editType = editType
 }
 
 const handleDeleteSavetyRecord = (row) => {