fit：1、督察任务发布任务（禁酒督察修改为六项规定督察）2、六项规定督察、重点人员管控补充督察要求

src/views/mobileSupervise/Inspection.vue

@@ -207,13 +207,6 @@
                     }"
         >
           <div style="width: 800px">
-<!--            <el-date-picker-->
-<!--                v-model="form.times"-->
-<!--                type="datetimerange"-->
-<!--                range-separator="-"-->
-<!--                start-placeholder="开始时间"-->
-<!--                end-placeholder="结束时间"-->
-<!--            />-->
             <el-date-picker
                 @change="changEndDateTime"
                 v-model="form.times"
@@ -228,10 +221,9 @@
 
         <!--专项督察展示-->
         <div class="content-main" v-if="form.supervisionType !== '日常督察'">
-          <div id="jjdc" v-if="form.specialType === '禁酒督察'">
+          <div id="jjdc" v-if="form.specialType === '六项规定督察'">
             <hr style="color: #abaaaa;opacity: 0.2"/>
-            <el-form-item
+            <el-form-item label="督察人员"
-                label="督察人员"
                 :rules="{
                         required: true,
                         message: '请选择',
@@ -240,6 +232,23 @@
             >
               <police-picker v-model="form.persons"/>
             </el-form-item>
+            <el-form-item label="督察要求" :rules="{
+                        required: true,
+                        message: '请选择',
+                    }"
+                   prop="superviseRequire">
+              <div style="width: 100%">
+                <quill-editor
+                    ref="quillRef"
+                    v-model="form.superviseRequire"
+                    style="
+                                  min-height: 100px;
+                                  max-height: 200px;
+                                  overflow: auto;
+                              "
+                />
+              </div>
+            </el-form-item>
             <el-form-item label="抽检对象">
               <el-radio-group v-model="form.samplingTarget">
                 <el-radio value="Excel导入人员" label="Excel导入人员"></el-radio>
@@ -376,7 +385,7 @@
           <div id="sdzc" v-if="form.specialType === '所队自查'">
             <hr style="color: #abaaaa;opacity: 0.2"/>
             <el-form-item label="自选单位">
-              <el-tree-select v-model="form.selfOrgs" multiple show-checkbox size="small" :data="dictData"
+              <el-tree-select  v-model="form.selfOrgs" multiple show-checkbox :data="dictData"
                               :props="{label: 'shortName', value: 'id'}" node-key="id"
                               :default-expanded-keys="['12630']" clearable filterable check-strictly/>
 
@@ -434,6 +443,23 @@
             </div>
           </div>
           <div id="zdrygk" v-if="form.specialType === '重点人员管控'">
+            <el-form-item label="督察要求" :rules="{
+                        required: true,
+                        message: '请选择',
+                    }"
+                          prop="superviseRequire">
+              <div style="width: 100%">
+                <quill-editor
+                    ref="quillRef"
+                    v-model="form.superviseRequire"
+                    style="
+                                  min-height: 100px;
+                                  max-height: 200px;
+                                  overflow: auto;
+                              "
+                />
+              </div>
+            </el-form-item>
             <el-form-item label="管控对象导入">
               <div>
                 <a
@@ -626,21 +652,12 @@
       >
         <el-form-item
             label="任务名称"
-            :rules="{
+
-                        required: true,
-                        message: '请输入任务名称',
-                        trigger: ['blur'],
-                    }"
-            prop="taskName"
         >
           {{ activeRow.taskName }}
         </el-form-item>
         <el-form-item label="督察类型"
-                      :rules="{
+
-                        required: true,
-                        message: '请选择',
-                    }"
-                      prop="supervisionType"
         >
           {{
             getDictLable(
@@ -651,21 +668,13 @@
         </el-form-item>
 
         <el-form-item v-if="activeRow.supervisionType === '专项督察'" label="专项督察"
-                      :rules="{
+
-                        required: true,
-                        message: '请选择',
-                    }"
-                      prop="specialType"
         >
           {{ activeRow.specialType }}
 
         </el-form-item>
 
-        <el-form-item label="督察时间" prop="times"
+        <el-form-item label="督察时间"
-                      :rules="{
-                        required: true,
-                        message: '请选择',
-                    }"
         >
           <div style="width: 800px" v-if="activeRow.times">
             {{ `${timeFormat(activeRow.times[0])} - ${timeFormat(activeRow.times[1])}` }}
@@ -676,21 +685,19 @@
 
         <!--专项督察展示-->
         <div class="content-main" v-if="activeRow.supervisionType !== '日常督察'">
-          <div id="jjdc" v-if="activeRow.specialType === '禁酒督察'">
+          <div id="jjdc" v-if="activeRow.specialType === '六项规定督察'">
             <hr style="color: #abaaaa;opacity: 0.2"/>
-            <el-form-item
+            <el-form-item label="督察人员"
-                label="督察人员"
-                :rules="{
-                        required: true,
-                        message: '请选择',
-                    }"
-                prop="persons"
             >
               <!--              <police-picker v-model="activeRow.persons" />-->
               <div class="flex gap wrap pepole-container mt-20">
                 <el-tag v-for="item in activeRow.persons" :key="item">{{ item.name }}-{{ item.empNo }}</el-tag>
               </div>
             </el-form-item>
+            <el-form-item label="督察要求">
+              <div style="width: 100%" v-html="activeRow.superviseRequire">
+              </div>
+            </el-form-item>
             <el-form-item label="抽检对象">
               {{ activeRow.samplingTarget }}
             </el-form-item>
@@ -752,11 +759,6 @@
             </div>
             <!--                    任务要求-->
             <el-form-item
-                prop="taskContentHtml"
-                :rules="{
-                                required: true,
-                                message: '请输入任务要求'
-                            }"
                 label-position="top"
             >
               <div style="width: 100%">
@@ -788,6 +790,11 @@
             </div>
           </div>
           <div id="zdrygk" v-if="activeRow.specialType === '重点人员管控'">
+            <el-form-item label="督察要求"
+                          prop="superviseRequire">
+              <div style="width: 100%" v-html="activeRow.superviseRequire">
+              </div>
+            </el-form-item>
             <el-form-item label="管控对象">
               <div style="width: 100%">
                 <el-row style="width: 100%" :gutter="20">
@@ -1284,7 +1291,7 @@
       </div>
     </div>
   </el-dialog>
-  <!--  禁酒督察详情-->
+  <!--  六项规定督察详情-->
   <el-dialog v-model="testingDetailShow" title="检测情况" width="60vw"
              top="2vh"
              style="margin-bottom: 0"
@@ -1412,7 +1419,7 @@
       </el-pagination>
     </div>
   </el-dialog>
-  <!--禁酒督察 - 人员检测情况-->
+  <!--六项规定督察 - 人员检测情况-->
   <el-dialog title="人员检测情况" v-model="peopleDetailShow" width="40vw">
     <div style="width: 600px; margin: auto">
       <el-row>
@@ -1893,7 +1900,7 @@ const supervisionDict = ref([
   },
   {
     dictValue: 'testing_alcohol',
-    dictLabel: '禁酒督察'
+    dictLabel: '六项规定督察'
   },
   {
     dictValue: 'selfexamination',
@@ -1913,8 +1920,8 @@ const total = ref(0);
 
 const specialType = ref([
   {
-    dictLabel: '禁酒督察',
+    dictLabel: '六项规定督察',
-    dictValue: '禁酒督察'
+    dictValue: '六项规定督察'
   },
   {
     dictLabel: '所队自查',
@@ -1998,7 +2005,7 @@ const getTaskType = (val) => {
   if (val === 'inspection') {
     return "日常督察";
   } else if (val === 'testing_alcohol') {
-    return "禁酒督察";
+    return "六项规定督察";
   } else if (val === 'selfexamination') {
     return "所队自查";
   } else {
@@ -2219,7 +2226,7 @@ const delriskData = (row) => {
   })
 }
 
-//检测情况（禁酒督察）---------
+//检测情况（六项规定督察）---------
 const testingDetailShow = ref(false);
 const testingLoading = ref(false);
 const peopleQuery = ref({
@@ -2248,7 +2255,7 @@ const handleExport = async () => {
   window.open(`${BASE_PATH}/sampling/export/samplingPoling?` + new URLSearchParams(data).toString())
 }
 
-// 获取禁酒督察详情
+// 获取六项规定督察详情
 async function handleTestingDetailShow(row) {
   testingDetailShow.value = true;
   activeRow.value = await TestingAlcoholDetail(row.id)
@@ -2451,7 +2458,7 @@ const editDepartShow =ref(false)
 const issueForm = ref({})
 const issueLoading = ref(false)
 const formRefs =ref();
-//禁酒督察下发问题
+//六项规定督察下发问题
 const issueMatterFun =(row,key)=>{
   console.log('row',row)
   issueForm.value.problemVo = row
@@ -2546,7 +2553,7 @@ watch(departs, () => {
 
 
 watch(() => form.value.specialType, (newVal) => {
-  if (newVal === '禁酒督察') {
+  if (newVal === '六项规定督察') {
     form.value.samplingTarget = '1'
   }
 }, {immediate: true})