技术监督计划调整，增加监督类型

src/views/pqs/supervise/electricalEnergy/index.vue

@@ -7,7 +7,7 @@
             <el-tab-pane label="用户投诉" name="2">
                 <complaints v-if="activeName == '2'" />
             </el-tab-pane>
-            <el-tab-pane label="普测问题" name="3">
+            <el-tab-pane label="计划问题" name="3">
                 <testQuestions v-if="activeName == '3'" />
             </el-tab-pane>
             <!-- <el-tabs v-model="activeName" type="border-card">

src/views/pqs/supervise/harmonicSurvey/components/planAdd.vue

@@ -1,12 +1,25 @@
 <template>
     <el-dialog draggable :title="title" v-model="planAddition" width="500px" :before-close="cancelFn">
         <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" scroll-to-error  :validate-on-rule-change="false" class="form-one">
-            <el-form-item for="-" label="普测负责单位:">
+            <el-form-item for="-" label="计划负责单位:">
                 <Area v-model="form.deptId" />
             </el-form-item>
             <el-form-item for="-" label="计划名称:" prop="planName">
                 <el-input v-model="form.planName" placeholder="请输入计划名称"></el-input>
             </el-form-item>
+            <el-form-item label="监督类型:" prop="supvType" >
+                <el-select v-model="form.supvType" placeholder="请选择监督类型" style="width: 100%">
+                    <el-option
+                        v-for="item in supvTypeOptionList"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                    ></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item for="-" label="监督对象名称:" prop="supvObjectName">
+                <el-input v-model="form.supvObjectName" placeholder="请输入监督对象名称"></el-input>
+            </el-form-item>
             <el-form-item for="-" label="计划开始时间:" prop="planStartTime">
                 <el-date-picker
                     v-model="form.planStartTime"
@@ -129,6 +142,7 @@ import { useDictData } from '@/stores/dictData'
 const emit = defineEmits(['onsubmit'])
 
 const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
 const title = ref('')
 const planAddition = ref(false)
 const defaultProps = ref({
@@ -161,7 +175,9 @@ const treeRef = ref()
 const rules = ref({
     planStartTime: [{ required: true, message: '选择计划开始时间', trigger: 'change' }],
     planEndTime: [{ required: true, message: '选择计划结束时间', trigger: 'change' }],
+    supvType: [{ required: true, message: '请选择监督类型', trigger: 'change' }],
     planComplateTime: [{ required: true, message: '选择实际完成时间	', trigger: 'change' }],
+    supvObjectName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
     planName: [{ required: true, message: '请输入计划名称', trigger: 'blur' }],
     leader: [{ required: true, message: '请输入测试负责人', trigger: 'blur' }],
     substation: [{ required: true, message: '请选择关联电站', trigger: 'change' }]
@@ -214,7 +230,7 @@ const audit = (filePath: any) => {
     if (form.value.customSubstationFlag == 0) {
         addForm.substation = addForm.substation.join(',')
     }
-    if(title.value == '普测计划新增'){
+    if(title.value == '计划新增'){
         addSurveyPlan(addForm).then(res => {
             cancelFn()
             emit('onsubmit')

src/views/pqs/supervise/harmonicSurvey/components/planManage.vue

@@ -1,27 +1,27 @@
 <template>
-    <TableHeader area datePicker ref="TableHeaderRef">
+  <TableHeader area datePicker ref='TableHeaderRef'>
     <template #select>
-            <el-form-item label="审核状态">
+      <el-form-item label='审核状态'>
-                <el-select v-model="tableStore.table.params.status" clearable placeholder="请选择审核状态">
+        <el-select v-model='tableStore.table.params.status' clearable placeholder='请选择审核状态'>
           <el-option
-                        v-for="item in statusSelect"
+              v-for='item in statusSelect'
-                        :key="item.id"
+              :key='item.id'
-                        :label="item.name"
+              :label='item.name'
-                        :value="item.id"
+              :value='item.id'
           ></el-option>
         </el-select>
       </el-form-item>
     </template>
     <template #operation>
-            <el-button icon="el-icon-Plus" type="primary" @click="add">新增计划</el-button>
+      <el-button icon='el-icon-Plus' type='primary' @click='add'>新增计划</el-button>
       <!-- <el-button icon="el-icon-Download" type="primary" @click="exportFn">导出</el-button> -->
     </template>
   </TableHeader>
-    <Table ref="tableRef" />
+  <Table ref='tableRef' />
   <!-- 新增 -->
-    <planAdd ref="planAddRef" @onsubmit="tableStore.index()" :openType="openType" />
+  <planAdd ref='planAddRef' @onsubmit='tableStore.index()' :openType='openType' />
 </template>
-<script setup lang="ts">
+<script setup lang='ts'>
 import { useAdminInfo } from '@/stores/adminInfo'
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
@@ -36,7 +36,9 @@ import { useRouter } from 'vue-router'
 import { queryPlan, removeSurvey } from '@/api/process-boot/generalTest'
 import { getUserByRoleType } from '@/api/user-boot/user'
 import { useDictData } from '@/stores/dictData'
+
 const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
 const statusSelect = dictData.statusSelect()
 const { push, options, currentRoute } = useRouter()
 const dialogVisible = ref(false)
@@ -59,27 +61,45 @@ const tableStore = new TableStore({
         return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
       }
     },
+    {
+      field: 'planName',
+      title: '计划名称',
+      minWidth: 130
+    },
+    {
+      field: 'supvType',
+      title: '监督类型',
+      minWidth: 130,
+      formatter: (row: any) => {
+        return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
+      }
+    },
+    {
+      field: 'supvObjectName',
+      minWidth: 130,
+      title: '监督对象名称'
+    },
     {
       field: 'deptName',
+      minWidth: 130,
       title: '负责单位'
     },
     {
       field: 'substation',
       title: '变电站',
+      minWidth: 110,
       formatter: (row: any) => {
         return row.cellValue
       }
     },
-        {
+
-            field: 'planName',
+    { field: 'planStartTime', minWidth: 130,title: '计划开始时间' },
-            title: '普测计划'
+    { field: 'planEndTime', minWidth: 130,title: '计划结束时间' },
-        },
-        { field: 'planStartTime', title: '计划开始时间' },
-        { field: 'planEndTime', title: '计划结束时间' },
     {
       field: 'status',
       title: '计划状态',
       render: 'tag',
+      minWidth: 80,
       custom: {
         1: 'primary',
         2: 'success',
@@ -103,7 +123,8 @@ const tableStore = new TableStore({
     },
     {
       title: '操作',
-            width: '180',
+      minWidth: '180',
+      fixed:'right',
       render: 'buttons',
       buttons: [
         {
@@ -158,7 +179,7 @@ provide('tableStore', tableStore)
 // 新增计划
 const add = () => {
   // title.value = '普测计划新增'
-    planAddRef.value.open('普测计划新增')
+  planAddRef.value.open('计划新增')
 }
 
 const exportFn = () => {
@@ -167,7 +188,7 @@ const exportFn = () => {
   form.pageSize = tableStore.table.total
   queryPlan(form).then(res => {
     tableRef.value.getRef().exportData({
-            filename: '普测计划', // 文件名字
+      filename: '计划', // 文件名字
       sheetName: 'Sheet1',
       type: 'xlsx', //导出文件类型 xlsx 和 csv
       useStyle: true,
@@ -237,4 +258,4 @@ watch(
 )
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang='scss'></style>

src/views/pqs/supervise/harmonicSurvey/components/planTest.vue

@@ -1,76 +1,82 @@
 <template>
-    <el-dialog draggable :title="title" v-model="planAddition" width="500px" :before-close="cancelFn">
+  <el-dialog draggable :title='title' v-model='planAddition' :before-close='cancelFn'>
-        <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" class="form-one" scroll-to-error>
+    <el-form :model='form' ref='formRef' :rules='rules' label-width='auto' class='form-two' scroll-to-error>
-            <el-form-item label="普测负责单位:">
+      <el-form-item label='计划负责单位:'>
-                <el-input v-model="form.deptName" disabled></el-input>
+        <el-input v-model='form.deptName' disabled></el-input>
       </el-form-item>
-            <el-form-item label="计划名称:" prop="planName">
+      <el-form-item label='计划名称:' prop='planName'>
-                <el-input v-model="form.planName" disabled></el-input>
+        <el-input v-model='form.planName' disabled></el-input>
       </el-form-item>
-            <el-form-item label="计划开始时间:" prop="planStartTime">
+      <el-form-item label='监督类型:'>
-                <el-input v-model="form.planStartTime" disabled></el-input>
+        <el-input v-model='form.supvType' disabled></el-input>
       </el-form-item>
-            <el-form-item label="计划结束时间:" prop="planEndTime">
+      <el-form-item label='监督对象名称:'>
-                <el-input v-model="form.planEndTime" disabled></el-input>
+        <el-input v-model='form.supvObjectName' disabled></el-input>
       </el-form-item>
-            <el-form-item for="-" label="测试变电站:" prop="subIds" style="display: flex; align-items: center">
+      <el-form-item label='计划开始时间:' prop='planStartTime'>
-                <el-input v-model="form.substationName" disabled />
+        <el-input v-model='form.planStartTime' disabled></el-input>
       </el-form-item>
-            <el-form-item label="实际完成时间:" prop="completeTime">
+      <el-form-item label='计划结束时间:' prop='planEndTime'>
+        <el-input v-model='form.planEndTime' disabled></el-input>
+      </el-form-item>
+      <el-form-item for='-' label='测试变电站:' prop='subIds' style='display: flex; align-items: center'>
+        <el-input v-model='form.substationName' disabled />
+      </el-form-item>
+      <el-form-item label='实际完成时间:' prop='completeTime'>
         <el-date-picker
-                    v-model="form.completeTime"
+            v-model='form.completeTime'
-                    type="date"
+            type='date'
-                    placeholder="选择实际完成时间"
+            placeholder='选择实际完成时间'
-                    value-format="YYYY-MM-DD"
+            value-format='YYYY-MM-DD'
         ></el-date-picker>
       </el-form-item>
-            <el-form-item for="-" label="测试负责人:" prop="leader">
+      <el-form-item for='-' label='测试负责人:' prop='leader'>
-                <el-input v-model="form.completeBy" placeholder="请输入测试负责人"></el-input>
+        <el-input v-model='form.completeBy' placeholder='请输入测试负责人'></el-input>
       </el-form-item>
-            <el-form-item for="-" class="uploadFile" label="普测报告:" prop="testReport">
+      <el-form-item for='-' class='uploadFile' label='计划测试报告:' prop='testReport'>
         <el-upload
-                    ref="uploadRef"
+            ref='uploadRef'
-                    v-model:file-list="form.testReport"
+            v-model:file-list='form.testReport'
-                    action=""
+            action=''
-                    :accept="acceptType"
+            :accept='acceptType'
-                    :limit="1"
+            :limit='1'
-                    :on-exceed="handleExceed"
+            :on-exceed='handleExceed'
-                    :on-change="choose"
+            :on-change='choose'
-                    :auto-upload="false"
+            :auto-upload='false'
             :on-progress="uploadFileName('testReport')"
         >
           <template #trigger>
-                        <el-button type="primary">上传文件</el-button>
+            <el-button type='primary'>上传文件</el-button>
           </template>
         </el-upload>
       </el-form-item>
-            <el-form-item for="-" label="测试是否有问题：" prop="problemFlag">
+      <el-form-item for='-' label='测试是否有问题：' prop='problemFlag'>
         <!-- 默认值 否 -->
-                <el-radio-group v-model="form.problemFlag">
+        <el-radio-group v-model='form.problemFlag'>
-                    <el-radio :value="1">是</el-radio>
+          <el-radio :value='1'>是</el-radio>
-                    <el-radio :value="0">否</el-radio>
+          <el-radio :value='0'>否</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item
-                style="width: 100%"
+          style='width: 100%'
-                for="-"
+          for='-'
-                label="问题描述:"
+          label='问题描述:'
-                prop="problemDetail"
+          prop='problemDetail'
           v-if="form.problemFlag == '1'"
       >
-                <el-input type="textarea" v-model="form.problemDetail" placeholder="请输入问题描述"></el-input>
+        <el-input type='textarea' v-model='form.problemDetail' placeholder='请输入问题描述'></el-input>
       </el-form-item>
       <!-- </el-form> -->
     </el-form>
     <template #footer>
-            <div class="dialog-footer">
+      <div class='dialog-footer'>
-                <el-button @click="cancelFn">取消</el-button>
+        <el-button @click='cancelFn'>取消</el-button>
-                <el-button type="primary" @click="submitFn">确定</el-button>
+        <el-button type='primary' @click='submitFn'>确定</el-button>
       </div>
     </template>
   </el-dialog>
 </template>
-<script setup lang="ts">
+<script setup lang='ts'>
 import { ref, inject, nextTick } from 'vue'
 import { addSurvey, auditSurvey } from '@/api/process-boot/generalTest'
 import TableStore from '@/utils/tableStore' // 若不是列表页面弹框可删除
@@ -78,6 +84,7 @@ import { ElMessage, genFileId, UploadProps, UploadRawFile, UploadUserFile } from
 import { uploadFile, getFileNameAndFilePath } from '@/api/system-boot/file'
 import { useDictData } from '@/stores/dictData'
 import { addSurveyTest, updateSurveyTest, getTestById } from '@/api/supervision-boot/survey/test'
+
 const acceptType = ref('')
 const tableStore = inject('tableStore') as TableStore
 let uploadName = ref('')
@@ -86,6 +93,7 @@ const uploadRef = ref()
 const fileList = ref<UploadUserFile[]>([])
 const emit = defineEmits(['onsubmit'])
 const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
 const addFlagRef = ref(true)
 const title = ref('')
 const planAddition = ref(false)
@@ -111,7 +119,6 @@ const open = async (text: string, id: string, addFlag: boolean) => {
   title.value = text
   formRef.value?.resetFields()
   addFlagRef.value = addFlag
-    console.log(addFlag, '8888888888')
   //根据测试id获取数据
   await getTestById(id).then(res => {
     //如果是新增，则只需将计划的一些信息回显即可
@@ -120,6 +127,10 @@ const open = async (text: string, id: string, addFlag: boolean) => {
     form.value.planStartTime = res.data.planStartTime
     form.value.planEndTime = res.data.planEndTime
     form.value.planName = res.data.planName
+    form.value.supvType = supvTypeOptionList.find(item => {
+      return item.id == res.data.supvType
+    })?.name
+    form.value.supvObjectName = res.data.supvObjectName
     form.value.substationName = res.data.substationName
     //部分清空
     // uploadRef.value?.clearFiles()
@@ -127,11 +138,10 @@ const open = async (text: string, id: string, addFlag: boolean) => {
     form.value.completeBy = ''
     form.value.testReport = []
     form.value.problemDetail = ''
-        form.value.problemFlag = '0'
+    form.value.problemFlag = 0
     fileList.value = []
     if (!addFlag) {
       //还需回显上次填报的测试数据 todo...,待重新发起的时候去做
-            console.log(res, '999999999')
       form.value = {
         ...form.value,
         completeTime: res.data.completeTime,
@@ -144,7 +154,7 @@ const open = async (text: string, id: string, addFlag: boolean) => {
         ],
         problemDetail: res.data.problemDetail
       }
-            testReport.value=res.data.testReport;
+      testReport.value = res.data.testReport
     }
   })
 
@@ -197,7 +207,7 @@ const submitFn = () => {
   })
 }
 const audit = (filePath: any) => {
-    if (title.value == '普测计划新增') {
+  if (title.value == '计划测试填报') {
     addSurvey({ ...form.value, filePath: filePath }).then((res: any) => {
       ElMessage.success('新增成功!')
       cancelFn()
@@ -233,7 +243,7 @@ const uploadFileName = val => {
   uploadName.value = val
 }
 </script>
-<style lang="scss" scoped>
+<style lang='scss' scoped>
 // :deep(.el-upload-list__item-info) {
 //     width: 250px;
 // }

src/views/pqs/supervise/harmonicSurvey/components/testManage.vue

@@ -40,6 +40,7 @@ const { push } = useRouter()
 const tableRef = ref()
 import { useDictData } from '@/stores/dictData'
 const dictData = useDictData()
+const supvTypeOptionList = dictData.getBasicData('supv_type')
 const statusSelect = dictData.statusSelect()
 
 const planTestRef = ref()
@@ -58,7 +59,20 @@ const tableStore = new TableStore({
                 return (tableStore.table.params.pageNum - 1) * tableStore.table.params.pageSize + row.rowIndex + 1
             }
         },
-        { field: 'planName', title: '普测计划', minWidth: 140 },
+        { field: 'planName', title: '计划名称', minWidth: 140 },
+      {
+        field: 'supvType',
+        title: '监督类型',
+        minWidth: 130,
+        formatter: (row: any) => {
+          return supvTypeOptionList.filter(item => item.id === row.cellValue)[0]?.name
+        }
+      },
+      {
+        field: 'supvObjectName',
+        minWidth: 130,
+        title: '监督对象名称'
+      },
         { field: 'substationName', title: '变电站', minWidth: 140 },
         { field: 'planStartTime', title: '计划开始时间', minWidth: 140 },
         { field: 'planEndTime', title: '计划结束时间', minWidth: 140 },
@@ -180,7 +194,7 @@ tableStore.table.params.status = ''
 provide('tableStore', tableStore)
 // 新增计划
 const add = (id: string) => {
-    planTestRef.value.open('普测计划测试填报',id,true)
+    planTestRef.value.open('计划测试填报',id,true)
 }
 
 
@@ -190,7 +204,7 @@ const exportFn = () => {
     form.pageSize = tableStore.table.total
     queryPlan(form).then(res => {
         tableRef.value.getRef().exportData({
-            filename: '普测计划', // 文件名字
+            filename: '计划', // 文件名字
             sheetName: 'Sheet1',
             type: 'xlsx', //导出文件类型 xlsx 和 csv
             useStyle: true,

src/views/pqs/supervise/harmonicSurvey/index.vue

@@ -1,10 +1,10 @@
 <template>
     <div class='default-main'>
         <el-tabs v-model='activeName' type='border-card'>
-            <el-tab-pane label='普测计划管理' name='1'>
+            <el-tab-pane label='技术监督计划管理' name='1'>
                 <plan-manage v-if="activeName == '1'" />
             </el-tab-pane>
-            <el-tab-pane label='普测测试管理' name='2'>
+            <el-tab-pane label='技术监督测试管理' name='2'>
                 <test-manage v-if="activeName == '2'" />
             </el-tab-pane>
         </el-tabs>

src/views/pqs/supervise/harmonicSurvey/plan/detail.vue

@@ -1,12 +1,23 @@
 <template>
   <div class='default-main'>
     <el-descriptions :column='2' border>
-            <el-descriptions-item label='普测计划名称'>
+      <el-descriptions-item label='技术监督计划名称'>
         {{ detailData?.planName }}
       </el-descriptions-item>
       <el-descriptions-item label='普测负责单位'>
         {{ detailData?.deptName }}
       </el-descriptions-item>
+      <el-descriptions-item label='监督类型'>
+        {{
+          supvTypeList.find(item => {
+            return item.id == detailData?.supvType
+          })?.name
+        }}
+      </el-descriptions-item>
+      <el-descriptions-item label='监督对象名称'>
+        {{ detailData?.supvObjectName }}
+      </el-descriptions-item>
+
       <el-descriptions-item label='计划开始时间'>
         {{ detailData?.planStartTime }}
       </el-descriptions-item>
@@ -50,7 +61,7 @@ const props = defineProps({
 const dictData = useDictData()
 const detailLoading = ref(false) // 表单的加载中
 const detailData: any = ref({}) // 详情数据
-const levelList = dictData.getBasicData('Dev_Voltage_Stand')
+const supvTypeList = dictData.getBasicData('supv_type')
 const queryId = query.id // 从 URL 传递过来的 id 编号
 
 /** 获得数据 */

src/views/pqs/supervise/harmonicSurvey/test/detail.vue

@@ -1,12 +1,22 @@
 <template>
   <div class='default-main'>
     <el-descriptions :column='2' border>
-      <el-descriptions-item label='普测计划名称'>
+      <el-descriptions-item label='技术监督计划名称'>
         {{ detailData?.planName }}
       </el-descriptions-item>
-      <el-descriptions-item label='普测负责单位'>
+      <el-descriptions-item label='计划负责单位'>
         {{ detailData?.deptName }}
       </el-descriptions-item>
+      <el-descriptions-item label='监督类型'>
+        {{
+          supvTypeList.find(item => {
+            return item.id == detailData?.supvType
+          })?.name
+        }}
+      </el-descriptions-item>
+      <el-descriptions-item label='监督对象名称'>
+        {{ detailData?.supvObjectName }}
+      </el-descriptions-item>
       <el-descriptions-item label='计划开始时间'>
         {{ detailData?.planStartTime }}
       </el-descriptions-item>
@@ -54,7 +64,9 @@
 </template>
 <script setup lang='ts'>
 import { onMounted, ref } from 'vue'
-
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const supvTypeList = dictData.getBasicData('supv_type')
 defineOptions({ name: 'QuitRunningDeviceDetail' })
 import { propTypes } from '@/utils/propTypes'
 import { defaultAttribute } from '@/components/table/defaultAttribute'