修改bug

2024-04-18 16:03:53 +08:00
parent 5345dbd84b
commit 997e8a9252
7 changed files with 165 additions and 142 deletions
--- a/src/views/pqs/supervise/retire/components/equipment.vue
+++ b/src/views/pqs/supervise/retire/components/equipment.vue
@@ -1,45 +1,36 @@
 <template>
-    <el-dialog draggable :title="title" v-model="userAdd" width="500px" :before-close="cancel">
-        <el-divider content-position="left" style="font-weight: bolder; font-size: 18px">基本信息</el-divider>
-        <el-form :inline="true" ref="formRef" :model="addData" label-width="auto" class="form-one" :rules="rules">
-            <el-form-item label="区域:">
-                <Area ref="areaRef" v-model="addData.orgNo" />
-            </el-form-item>
-            <el-form-item label="设备编号:" prop="assetNumber">
-                <el-input v-model="addData.assetNumber" clearable placeholder="请输入关键字"></el-input>
-            </el-form-item>
+    <el-form :inline="true" ref="formRef" :model="addData" label-width="auto" class="form-one" :rules="rules">
+        <el-form-item label="区域:">
+            <Area ref="areaRef" v-model="addData.orgNo" />
+        </el-form-item>
+        <el-form-item label="设备编号:" prop="assetNumber">
+            <el-input v-model="addData.assetNumber" clearable placeholder="请输入关键字"></el-input>
+        </el-form-item>

-            <el-form-item label="资产编号:" prop="devNumber">
-                <el-input v-model="addData.devNumber" clearable placeholder="请输入关键字"></el-input>
-            </el-form-item>
-            <el-form-item class="item" label="报告:" style="margin-top: 10px" prop="fileList">
-                <el-upload
-                    v-model:file-list="addData.fileList"
-                    ref="upload"
-                    action=""
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :auto-upload="false"
-                >
-                    <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
-                    </template>
-                </el-upload>
-                
-            </el-form-item>
+        <el-form-item label="资产编号:" prop="devNumber">
+            <el-input v-model="addData.devNumber" clearable placeholder="请输入关键字"></el-input>
+        </el-form-item>
+        <el-form-item class="item" label="报告:" style="margin-top: 10px" prop="fileList">
+            <el-upload
+                v-model:file-list="addData.fileList"
+                ref="upload"
+                action=""
+                :limit="1"
+                :on-exceed="handleExceed"
+                :auto-upload="false"
+            >
+                <template #trigger>
+                    <el-button type="primary">上传文件</el-button>
+                </template>
+            </el-upload>
+        </el-form-item>

-            <el-form-item label="选择审核人:" prop="checker">
-                <el-select v-model="addData.checker" clearable placeholder="请选择审核人">
-                    <el-option v-for="item in auditList" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
-        </el-form>
-        <div style="display: flex; justify-content: center; margin-top: 30px">
-            <el-button type="primary" class="ml20" @click="config(1)">保存</el-button>
-            <!-- <el-button type="primary" class="ml20" @click="config(2)">审核</el-button> -->
-            <el-button class="ml20" @click="cancel">取消</el-button>
-        </div>
-    </el-dialog>
+        <el-form-item label="选择审核人:" prop="checker">
+            <el-select v-model="addData.checker" clearable placeholder="请选择审核人">
+                <el-option v-for="item in auditList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+        </el-form-item>
+    </el-form>
 </template>
 <script setup lang="ts">
 import { ref, reactive, onMounted } from 'vue'
@@ -50,7 +41,7 @@ import { getUserByRoleType } from '@/api/user-boot/user'
 import { UploadProps, UploadRawFile, genFileId, ElMessage } from 'element-plus'

 const dictData = useDictData()
-const userAdd = ref(false)
+
 const interferenceType = dictData.getBasicData('Interference_Source')
 const emit = defineEmits(['onSubmit'])
 const rules = reactive({
@@ -60,8 +51,9 @@ const rules = reactive({
    checker: [{ required: true, message: '请选择审核人', trigger: 'change' }],
    fileList: [{ required: true, message: '请选择文件', trigger: 'change' }]
 })
-const auditList: any = ref([])
 const title: any = ref('')
+const auditList: any = ref([])
+
 const addData: any = ref({
    orgNo: dictData.state.area[0].id,
    assetNumber: '',
@@ -73,7 +65,7 @@ const addData: any = ref({
 })
 const formRef = ref()
 // 新增
-const config = (num?: number) => {
+const config = () => {
    formRef.value.validate(async (valid: any) => {
        if (valid) {
            if (title.value == '新增设备退役申请单') {
@@ -87,7 +79,7 @@ const config = (num?: number) => {
                    assetNumber: addData.value.assetNumber,
                    devNumber: addData.value.devNumber
                })
-                addData.value.operate = num
+                addData.value.operate = 1
                addData.value.checkerName = auditList.value.find((item: any) => item.id == addData.value.checker).name
                addFlow(addData.value).then((res: any) => {
                    ElMessage.success('新增成功!')
@@ -107,7 +99,7 @@ const config = (num?: number) => {
                    assetNumber: addData.value.assetNumber,
                    devNumber: addData.value.devNumber
                })
-                addData.value.operate = num
+                addData.value.operate = 1
                addData.value.checkerName = auditList.value.find((item: any) => item.id == addData.value.checker).name
                update(addData.value).then((res: any) => {
                    ElMessage.success('修改成功!')
@@ -118,11 +110,12 @@ const config = (num?: number) => {
        }
    })
 }
+// 审核
+const audit = () => {}
 // 重置
 const cancel = () => {
    formRef.value.resetFields()
    emit('onSubmit')
-    userAdd.value = false
 }
 const open = (text: string, row?: any) => {
    if (row) {
@@ -130,9 +123,19 @@ const open = (text: string, row?: any) => {
        addData.value.assetNumber = row.applyForm.assetNumber
        addData.value.devNumber = row.applyForm.devNumber
        addData.value.fileList = [{ name: row.fileName, url: row.filePath }]
+    } else {
+        addData.value = {
+            orgNo: dictData.state.area[0].id,
+            assetNumber: '',
+            devNumber: '',
+            fileList: [],
+            checker: '',
+            applyType: 4,
+            type: 5
+        }
    }
+    formRef.value.resetFields()
    title.value = text
-    userAdd.value = true
 }

 // 取消
@@ -151,7 +154,7 @@ const handleExceed: UploadProps['onExceed'] = files => {
    upload.value!.handleStart(file)
 }

-defineExpose({ open })
+defineExpose({ open, config, audit })
 </script>
 <style lang="scss" scoped>
 :deep(.el-upload-list__item) {
--- a/src/views/pqs/supervise/retire/components/retire.vue
+++ b/src/views/pqs/supervise/retire/components/retire.vue
@@ -8,7 +8,14 @@
        <Table ref="tableRef" />
    </div>
    <!-- 新增编辑 -->
-    <Equipment ref="EquipmentRef" @onSubmit="tableStore.index()" />
+    <el-dialog draggable :title="title" v-model="userAdd" width="500px">
+        <Equipment ref="EquipmentRef" @onSubmit="onSubmit" />
+        <div style="display: flex; justify-content: center; margin-top: 30px">
+            <el-button type="primary" class="ml20" @click="EquipmentRef.config()">保存</el-button>
+
+            <el-button class="ml20" @click="userAdd = false">取消</el-button>
+        </div>
+    </el-dialog>
 </template>
 <script setup lang="ts">
 import { ref, onMounted, provide, nextTick } from 'vue'
@@ -21,10 +28,10 @@ import { deleteIssues } from '@/api/process-boot/electricitymanagement'
 import { createCheckflow, getFileUrl } from '@/api/process-boot/retire'

 import { useDictData } from '@/stores/dictData'
-const dictData = useDictData()
+const userAdd = ref(false)
 const TableHeaderRef = ref()
 const EquipmentRef = ref()
-const problemData = dictData.getBasicData('Problem_Sources')
+const title: any = ref('')

 defineOptions({
    name: '/Processsupervision/retire'
@@ -98,7 +105,11 @@ const tableStore: any = new TableStore({
                    icon: 'el-icon-Plus',
                    render: 'basicButton',
                    click: async row => {
-                        EquipmentRef.value.open('编辑设备退役申请单', row)
+                        userAdd.value = true
+                        title.value = '编辑设备退役申请单'
+                        nextTick(() => {
+                            EquipmentRef.value.open('编辑设备退役申请单', row)
+                        })
                    }
                },

@@ -190,6 +201,15 @@ onMounted(() => {
 })
 // 新增
 const add = () => {
-    EquipmentRef.value.open('新增设备退役申请单')
+    userAdd.value = true
+    title.value = '新增设备退役申请单'
+    nextTick(() => {
+        EquipmentRef.value.open('新增设备退役申请单')
+    })
+}
+// 关闭
+const onSubmit = () => {
+    tableStore.index()
+    userAdd.value = false
 }
 </script>