From dfc1da68ecd0ce95e63ae085ff33e084b8f50a5f Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期五, 04 七月 2025 14:00:09 +0800
Subject: [PATCH] 修改

---
 src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue            |    3 +
 src/views/build/conpanyFunctionConsult/qualityManage/rangeManage/range/index.vue                             |   80 ++++++++++++++++++++++------------------
 src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue                |    3 +
 src/views/build/conpanyFunctionConsult/qualityManage/rangeManage/range/components/dataDialog.vue             |   16 ++++----
 src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue             |    3 +
 src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/components/stationCompanyDialog.vue |    3 +
 src/components/Tinymce/Tinymce.vue                                                                           |    6 ++
 7 files changed, 69 insertions(+), 45 deletions(-)

diff --git a/src/components/Tinymce/Tinymce.vue b/src/components/Tinymce/Tinymce.vue
index 830a531..66e88fe 100644
--- a/src/components/Tinymce/Tinymce.vue
+++ b/src/components/Tinymce/Tinymce.vue
@@ -36,6 +36,10 @@
             type: String,
             default: ""
         },
+      height: {
+        type: Number,
+        default: 500
+      },
         disabled: {
             type: Boolean,
             default: false
@@ -58,7 +62,7 @@
                 language: "zh_CN",
                 skin_url: "/tinymce/skins/ui/oxide", // skin路径
                 content_css: '/tinymce/skins/content/default/content.css',
-                height: 500, // 编辑器高度
+                height: this.height? this.height : 500, // 编辑器高度
                 branding: false, // 是否禁用“Powered by TinyMCE”
                 menubar: true, // 顶部菜单栏显示
                 plugins: this.plugins,
diff --git a/src/views/build/conpanyFunctionConsult/qualityManage/rangeManage/range/components/dataDialog.vue b/src/views/build/conpanyFunctionConsult/qualityManage/rangeManage/range/components/dataDialog.vue
index 3cb634c..0a794ce 100644
--- a/src/views/build/conpanyFunctionConsult/qualityManage/rangeManage/range/components/dataDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityManage/rangeManage/range/components/dataDialog.vue
@@ -12,14 +12,14 @@
         <el-form-item label="材料名称:" prop="name">
           <el-input v-model.trim="state.form.name" :disabled="state.title =='查看'" placeholder="材料名称"></el-input>
         </el-form-item>
-        <el-form-item label="材料模板:" prop="filePath">
-          <el-upload accept=".doc,.docx" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.fileLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >
-            <el-button type="primary">点击上传</el-button>
-            <template #tip>
-              <div class="el-upload__tip">支持上传.doc、.docx格式文档,尺寸小于5M,最多可上传1张</div>
-            </template>
-          </el-upload>
-        </el-form-item>
+<!--        <el-form-item label="材料模板:" prop="filePath">-->
+<!--          <el-upload accept=".doc,.docx" :action="state.uploadUrl" :headers="state.header" method="post" :on-success="(res, uploadFile)=>handleAvatarSuccess(res, uploadFile)" :on-exceed="showTip" :limit='state.fileLimit' v-model:file-list="state.fileList" :before-upload="picSize" :on-remove="(file, uploadFiles)=>handleRemove(file, uploadFiles)" >-->
+<!--            <el-button type="primary">点击上传</el-button>-->
+<!--            <template #tip>-->
+<!--              <div class="el-upload__tip">支持上传.doc、.docx格式文档,尺寸小于5M,最多可上传1张</div>-->
+<!--            </template>-->
+<!--          </el-upload>-->
+<!--        </el-form-item>-->
       </el-form>
       <template #footer v-if="state.title !='查看'">
         <span class="dialog-footer">
diff --git a/src/views/build/conpanyFunctionConsult/qualityManage/rangeManage/range/index.vue b/src/views/build/conpanyFunctionConsult/qualityManage/rangeManage/range/index.vue
index 1c8a67a..1d0e077 100644
--- a/src/views/build/conpanyFunctionConsult/qualityManage/rangeManage/range/index.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityManage/rangeManage/range/index.vue
@@ -46,10 +46,13 @@
       <div class="right">
         <el-form :model="state.form" size="default" ref="noticeRef" :rules="data.formRules" label-position="left" label-width="125px" >
           <el-form-item label="具体内容" prop="content" >
-            <el-input v-model="state.form.content" :rows="4" type="textarea" />
+
+            <t-editor style="width: 100%;" :height="300" ref="myEditor1" :value="state.form.content" ></t-editor>
+<!--            <el-input v-model="state.form.content" :rows="4" type="textarea" />-->
           </el-form-item>
           <el-form-item label="标准分析" prop="analysis" >
-            <el-input v-model="state.form.analysis" :rows="4" type="textarea" />
+            <t-editor style="width: 100%;" :height="300" ref="myEditor2" :value="state.form.analysis" ></t-editor>
+<!--            <el-input v-model="state.form.analysis" :rows="4" type="textarea" />-->
           </el-form-item>
           <el-form-item label="应准备材料" prop="dataList">
             <el-button type="primary" @click="openDataDialog('add',{})">新增</el-button>
@@ -57,11 +60,11 @@
           <el-table style="margin:15px 0;width: 100%" :data="state.form.dataList" :border="true" >
             <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
             <el-table-column label="材料名称" prop="name" align="center"  />
-            <el-table-column label="材料模板" prop="fileName" align="center" >
-              <template #default="scope">
-                <el-link v-if="scope.row.fileName" style="" type="primary" @click="downloadFile(scope.row)">{{scope.row.fileName}}</el-link>
-              </template>
-            </el-table-column>
+<!--            <el-table-column label="材料模板" prop="fileName" align="center" >-->
+<!--              <template #default="scope">-->
+<!--                <el-link v-if="scope.row.fileName" style="" type="primary" @click="downloadFile(scope.row)">{{scope.row.fileName}}</el-link>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
               <template #default="scope">
                 <el-button link type="primary"  @click="openDataDialog('edit',scope.row)" >编辑</el-button>
@@ -69,24 +72,24 @@
               </template>
             </el-table-column>
           </el-table>
-          <el-form-item label="记录上传" prop="recordList">
-            <el-button type="primary" @click="openRecordDialog('add',{})">新增</el-button>
-          </el-form-item>
-          <el-table style="margin-top: 15px;width: 100%" :data="state.form.recordList" :border="true" >
-            <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
-            <el-table-column label="记录名称" prop="name" align="center"  />
-            <el-table-column label="材料模板" prop="fileName" align="center">
-              <template #default="scope">
-                <el-link v-if="scope.row.fileName" style="" type="primary" @click="downloadFile(scope.row)">{{scope.row.fileName}}</el-link>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
-              <template #default="scope">
-                <el-button link type="primary"  @click="openRecordDialog('edit',scope.row)" >编辑</el-button>
-                <el-button link type="danger"  @click="handleRecordDelete(scope.row)" >删除</el-button>
-              </template>
-            </el-table-column>
-          </el-table>
+<!--          <el-form-item label="记录上传" prop="recordList">-->
+<!--            <el-button type="primary" @click="openRecordDialog('add',{})">新增</el-button>-->
+<!--          </el-form-item>-->
+<!--          <el-table style="margin-top: 15px;width: 100%" :data="state.form.recordList" :border="true" >-->
+<!--            <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>-->
+<!--            <el-table-column label="记录名称" prop="name" align="center"  />-->
+<!--            <el-table-column label="材料模板" prop="fileName" align="center">-->
+<!--              <template #default="scope">-->
+<!--                <el-link v-if="scope.row.fileName" style="" type="primary" @click="downloadFile(scope.row)">{{scope.row.fileName}}</el-link>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >-->
+<!--              <template #default="scope">-->
+<!--                <el-button link type="primary"  @click="openRecordDialog('edit',scope.row)" >编辑</el-button>-->
+<!--                <el-button link type="danger"  @click="handleRecordDelete(scope.row)" >删除</el-button>-->
+<!--              </template>-->
+<!--            </el-table-column>-->
+<!--          </el-table>-->
         </el-form>
         <div style="display: flex;align-items: center;justify-content: right;margin-top: 10px">
           <el-button v-if="state.form.id" type="danger"  @click="deleteData">删除</el-button>
@@ -96,7 +99,7 @@
       </div>
     </div>
     <dataDialog ref="dialogRef" @getList="getFileList"></dataDialog>
-    <record-dialog ref="dialogRecordRef" @getList="getFileList"></record-dialog>
+<!--    <record-dialog ref="dialogRecordRef" @getList="getFileList"></record-dialog>-->
   </div>
 </template>
 <script setup>
@@ -119,11 +122,14 @@
   getFile
 } from "@/api/qualityManage/range";
 import axios from "axios";
+import TEditor from "@/components/Tinymce/Tinymce.vue";
 
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const noticeRef = ref();
 const dialogRef = ref();
+const myEditor1 = ref();
+const myEditor2 = ref();
 const dialogRecordRef = ref();
 const loadingCompany = ref(false)
 const data = reactive({
@@ -135,8 +141,8 @@
   formRules: {
     content: [{ required: true, message: '请输入具体内容', trigger: 'blur' }],
     analysis: [{ required: true, message: '请输入标准分析', trigger: 'blur' }],
-    dataList: [{ required: true, message: '', trigger: 'blur' }],
-    recordList: [{ required: true, message: '', trigger: 'blur' }]
+    // dataList: [{ required: true, message: '', trigger: 'blur' }],
+    // recordList: [{ required: true, message: '', trigger: 'blur' }]
   },
   companyList: [],
   isAdmin: false,
@@ -293,18 +299,20 @@
 }
 
 const addData = async () => {
+  state.form.content = myEditor1.value.myValue
+  state.form.analysis = myEditor2.value.myValue
   if(!state.form.catalogueId){
     ElMessage.warning('请先选择左侧目录!')
     return
   }
-  if(state.form.dataList && state.form.dataList.length==0){
-    ElMessage.warning('请上传应准备材料!')
-    return
-  }
-  if(state.form.recordList && state.form.recordList.length==0){
-    ElMessage.warning('请上传记录!')
-    return
-  }
+  // if(state.form.dataList && state.form.dataList.length==0){
+  //   ElMessage.warning('请上传应准备材料!')
+  //   return
+  // }
+  // if(state.form.recordList && state.form.recordList.length==0){
+  //   ElMessage.warning('请上传记录!')
+  //   return
+  // }
   const valid = await noticeRef.value.validate();
   if(valid){
 
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue
index 3ef2641..03b2682 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/objective/components/objectiveDialog.vue
@@ -414,6 +414,9 @@
 }
 
 const getPeopleList = async ()=> {
+  if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
+    return
+  }
      const queryParams = {
        pageNum: 1,
        pageSize: 9999,
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/components/stationCompanyDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/components/stationCompanyDialog.vue
index 65de73a..b7839d9 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/components/stationCompanyDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/reportsituation/components/stationCompanyDialog.vue
@@ -309,6 +309,9 @@
   state.qualityList = []
 }
 const getPeopleList = async ()=> {
+  if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
+    return
+  }
   const queryParams = {
     pageNum: 1,
     pageSize: 9999,
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue
index 3c21c55..c97975d 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableCompanyDialog.vue
@@ -360,6 +360,9 @@
   state.qualityList = []
 }
 const getPeopleList = async ()=> {
+  if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
+    return
+  }
   const queryParams = {
     pageNum: 1,
     pageSize: 9999,
diff --git a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue
index 8a8cb23..cf2e9ca 100644
--- a/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/qualityObjectives/table/components/tableDeptDialog.vue
@@ -346,6 +346,9 @@
   state.companyList = []
 }
 const getPeopleList = async ()=> {
+  if(state.isAdmin && (state.form.companyId == 0 || state.form.companyId == null)){
+    return
+  }
   const queryParams = {
     pageNum: 1,
     pageSize: 9999,

--
Gitblit v1.9.2