优化

monkeyhouyi
1 parent 7e62c38f
Showing 10 changed files with 136 additions and 56 deletions
src/views/DisposalSuggestions/Form.vue
src/views/DisposalSuggestions/HandleForm.vue
src/views/DisposalSuggestions/index.vue
src/views/baseCaseHandling/Form.vue
src/views/baseCaseHandling/index.vue
src/views/baseInspectionReport/Form.vue
src/views/baseListHazardousSamples/index.vue
src/views/basePrincipalResponsibility/index.vue
src/views/overView/Overview.vue
src/views/overView/msgForm.vue
@@ -119,6 +119,12 @@
               <div class="label w-120">处置建议：</div>
               <div class="text">{{ v.judgmentOpinion }}</div>
             </div>
+            <div class="form-item" v-if="v.judgmentFileUrl">
+              <div class="label w-120">处置附件：</div>
+              <div class="text" style="width: calc(100% - 120px);">
+                <NCC-UploadFz v-model="v.judgmentFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
+              </div>
+            </div>
           </el-col>
           <el-col :span="24" v-for="(v, index) in dataForm.disposalSuggestions" :key="index + 'disposalSuggestions'" style="border: #f6f6f6 solid 1px; border-radius: 10px; padding: 8px; margin-bottom: 5px;">
             <div class="title">处置信息{{ index + 1 }}</div>
@@ -126,10 +132,10 @@
               <div class="label w-120">处置结果：</div>
               <div class="text">{{ v.disposalSuggestion }}</div>
             </div>
-            <div class="form-item" v-if="v.fileUrl">
+            <div class="form-item" v-if="v.disposalResultFileUrl">
               <div class="label w-120">处置附件：</div>
               <div class="text" style="width: calc(100% - 120px);">
-                <NCC-UploadFz v-model="v.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
+                <NCC-UploadFz v-model="v.disposalResultFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
               </div>
             </div>
           </el-col>
@@ -242,7 +248,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="24" v-if="showSuggsetion">
+            <el-col :span="24">
               <el-form-item label="处置建议" prop="judgmentOpinions">
                 <el-input
                   v-model="suggestionForm.judgmentOpinions"
@@ -256,6 +262,11 @@
                 </el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="上传附件" prop="judgmentFileUrl">
+						      <NCC-UploadFz v-model="suggestionForm.judgmentFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" />
+                </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </el-col>
@@ -300,6 +311,7 @@ export default {
         obtainEvidence: [],
         annex: [],
         externalAssistanceId: undefined,
+        judgmentFileUrl: [],
       },
       sourceOptions: [],
       platformTypeOptions: [],
@@ -120,6 +120,12 @@
                   <div class="label w-120">处置建议：</div>
                   <div class="text">{{ v.judgmentOpinion }}</div>
                 </div>
+                <div class="form-item" v-if="v.judgmentFileUrl">
+                  <div class="label w-120">处置附件：</div>
+                  <div class="text" style="width: calc(100% - 120px);">
+                    <NCC-UploadFz v-model="v.judgmentFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
+                  </div>
+                </div>
               </el-col>
               <el-col :span="24" v-for="(v, i) in dataForm.disposalSuggestions" :key="i" style="border: #f6f6f6 solid 1px; border-radius: 10px; padding: 8px; margin-bottom: 5px;">
                 <div class="title">处置信息{{ i + 1 }}</div>
@@ -127,10 +133,10 @@
                   <div class="label w-120">处置结果：</div>
                   <div class="text">{{ v.disposalSuggestion }}</div>
                 </div>
-                <div class="form-item" v-if="v.fileUrl">
+                <div class="form-item" v-if="v.disposalResultFileUrl">
                   <div class="label w-120">处置附件：</div>
                   <div class="text" style="width: calc(100% - 120px);">
-                    <NCC-UploadFz v-model="v.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
+                    <NCC-UploadFz v-model="v.disposalResultFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
                   </div>
                 </div>
               </el-col>
@@ -283,6 +289,7 @@
     },
     watch: {},
     created() {
+      this.initAreaTypeList();
       this.getSourceOptions();
       // this.getplatformTypeOptions();
       // this.getquestionTypeOptions();
@@ -331,6 +338,7 @@
             this.loading = false;
             this.sourceOptions.length && this.dataForm.reportSource && (this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName);
             this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions);
+            console.log(this.dataForm.areaName);
             this.suggestionForm.area = res.data.areaId
             if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = [];
             if (!this.dataForm.annex) this.dataForm.annex = [];
@@ -32,12 +32,15 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item label="">
-                  <el-input v-model="query.questionType" placeholder="请选择问题类型" clearable/>
+                  <el-select v-model="query.questionType" placeholder="请选择问题类型" clearable>
+                    <el-option v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" :value="item.id" />
+                  </el-select>
+                  <!-- <el-input v-model="query.questionType" placeholder="请选择问题类型" clearable/> -->
                 </el-form-item>
               </el-col>
               <el-col :span="3">
                 <el-form-item label="">
-                  <el-select v-model="query.state" placeholder="请选择类型" clearable>
+                  <el-select v-model="query.state" placeholder="请选择状态" clearable>
                     <el-option v-for="item in stateOptions" :key="item" :label="item" :value="item"/>
                   </el-select>
                 </el-form-item>
@@ -110,9 +113,9 @@
                    </el-table-column> -->
               <el-table-column label="操作" fixed="right" width="200">
                 <template slot-scope="scope">
-                  <template v-if="userId == scope.row.creatorUserId">
-                    <el-button type="text" @click="addForm(scope.row.id)" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">编辑</el-button>
-                    <el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">删除</el-button>
+                  <template v-if="userId == scope.row.creatorUserId && (scope.row.stage == '577006621985604869' ||  scope.row.stage =='577006641364189019')">
+                    <el-button type="text" @click="addForm(scope.row.id)">编辑</el-button>
+                    <el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn">删除</el-button>
                   </template>
                   <el-button type="text" @click="addOrUpdateHandle(scope.row.id, false, 'edit')" v-if="isSHILevel && scope.row.stage == '577006666214540549'" >建议修改</el-button>
                   <!-- 未研判 ‘577006621985604869’/未下发 ‘577006641364189019’ / 已处置 ‘577006696312866053’ 可以研判 -->
@@ -192,7 +195,14 @@ export default {
         { fullName: "自主巡查发现", id: "自主巡查发现" },
       ],
       systemTypeOptions: [],
-      questionTypeOptions: [],
+      questionTypeOptions: [
+        { fullName: "存在有害信息", id: "577006944540165381" },
+        { fullName: "内容审核不到位", id: "577006978564359429" },
+        { fullName: "错误表述", id: "584886326260663557" },
+        { fullName: "删除链接", id: "591435954770674949" },
+        { fullName: "样本查删", id: "591436151911351557" },
+        { fullName: "其他", id: "0" },
+      ],
       questionClassOptions: [
         { fullName: "选项一", id: "1" },
         { fullName: "选项二", id: "2" },
@@ -26,7 +26,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="来源登记" prop="sourceRegistration">
-            <el-input v-model="dataForm.sourceRegistration" placeholder="请输入来源登记" clearable :disabled="formType != 0"/>
+            <el-input v-model="dataForm.sourceRegistration" placeholder="请输入来源登记" clearable />
           </el-form-item>
         </el-col>
         <!-- <el-col :span="24">
@@ -92,7 +92,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="备案号" prop="recordNumber">
-            <el-input v-model="dataForm.recordNumber" placeholder="请输入备案号" clearable :disabled="formType == 2"/>
+            <el-input v-model="dataForm.recordNumber" placeholder="请输入备案号" clearable />
           </el-form-item>
         </el-col>
         <el-col :span="24" v-if="isSHILevel">
@@ -111,20 +111,20 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="违法原因" prop="illegalReasons">
-            <el-input type="textarea" v-model="dataForm.illegalReasons" placeholder="请输入违法原因" clearable maxlength="200" :disabled="formType == 2"/>
+            <el-input type="textarea" v-model="dataForm.illegalReasons" placeholder="请输入违法原因" clearable maxlength="200" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="处罚要求" prop="punishmentRequirements">
-            <el-input type="textarea" v-model="dataForm.punishmentRequirements" placeholder="请输入处罚要求" clearable maxlength="200" :disabled="formType == 2"/>
+            <el-input type="textarea" v-model="dataForm.punishmentRequirements" placeholder="请输入处罚要求" clearable maxlength="200" />
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="处罚内容" prop="punishmentContent">
-            <el-input type="textarea" v-model="dataForm.punishmentContent" placeholder="请输入处罚内容" clearable maxlength="200" :disabled="formType == 2"/>
+            <el-input type="textarea" v-model="dataForm.punishmentContent" placeholder="请输入处罚内容" clearable maxlength="200" />
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="isSHILevel">
+        <el-col :span="24" >
           <el-form-item label="执法方式" prop="enforceType">
             <el-radio-group v-model="dataForm.enforceType">
               <el-radio label="柔性执法">柔性执法</el-radio>
@@ -132,13 +132,13 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="!isSHILevel && formType == 2">
+        <el-col :span="24" >
           <el-form-item label="执法说明" prop="enforcecontent">
             <el-input type="textarea" v-model="dataForm.enforcecontent" placeholder="请输入执法说明" clearable maxlength="200"/>
           </el-form-item>
         </el-col>
         <!-- 立案审批、调查（询问）笔录、案件处理意见、执法约谈、行政处罚意见告知、行政处罚决定、行政处罚结案报告、其他（每个流程都为填空+上传附件，非必填） -->
-        <template v-if="formType == 2">
+        <template>
           <el-col :span="24">
             <el-form-item label="立案审批" prop="registerApproval">
               <el-input type="textarea" v-model="dataForm.registerApproval" placeholder="请输入立案审批" clearable maxlength="200"/>
@@ -426,12 +426,12 @@ export default {
         districtCounty: [
           { required: true, message: "请选择所属区域", trigger: "change" }
         ],
-        enforceType: [
-          { required: true, message: "请选择执法方式", trigger: "bulr" }
-        ],
-        enforcecontent: [
-          { required: true, message: "请填写执法说明", trigger: "bulr" }
-        ],
+        // enforceType: [
+        //   { required: true, message: "请选择执法方式", trigger: "bulr" }
+        // ],
+        // enforcecontent: [
+        //   { required: true, message: "请填写执法说明", trigger: "bulr" }
+        // ],
       },
       systemOption: [],
       system_loading: false,
@@ -586,7 +586,7 @@ export default {
       this.$emit("refresh");
     },
     init(id, isDetail, type) {
-      // type 0 上报/下派 1 处理
+      // type 0 新增 1 编辑 2 处理
       this.formType = type || '0';
       this.dataForm.id = id || undefined;
       this.isDetail = isDetail || false;
@@ -87,7 +87,7 @@
               <el-table-column prop="illegalReasons" label="违法原因" align="left" show-overflow-tooltip/>
               <el-table-column prop="punishmentRequirements" label="处罚要求" align="left" show-overflow-tooltip/>
               <el-table-column prop="punishmentContent" label="处罚内容"  align="left" show-overflow-tooltip/>
-              <el-table-column label="状态" prop="state" align="left" >
+              <el-table-column label="状态" prop="state" align="left" width="100">
                 <template slot-scope="scope">
                   <el-tag :type="ncc.getStateTagType(scope.row.state, stateOptions)">{{ scope.row.state | dynamicTextUP(stateOptions) }}</el-tag>
                 </template>
@@ -100,7 +100,7 @@
               <el-table-column label="操作" fixed="right" width="180">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" @click="addOrUpdateHandle(scope.row.id, true) " >详情</el-button>
-                  <el-button type="text" v-if="scope.row.state == '592592903172261125' && scope.row.creatorUserId != $store.state.user.id" @click="addOrUpdateHandle(scope.row.id, false, '2')" >处理</el-button>
+                  <el-button type="text" v-if="(scope.row.state == '592592903172261125' && !isSHILevel) || (scope.row.state == '594684878927787126' && isSHILevel)" @click="addOrUpdateHandle(scope.row.id, false, '2')" >处理</el-button>
                   <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="addOrUpdateHandle(scope.row.id, false, '1')" >编辑</el-button>
                   <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="toReportCase(scope.row.id)" >{{isSHILevel ? '下发' : '上报'}}</el-button>
                   <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
@@ -170,6 +170,15 @@ export default {
         { fullName: "选项一", id: "选项一" },
         { fullName: "", id: "选项二" },
       ],
+      stateList: [
+        { fullName: "未上报", id: "592592614457345285" },
+        { fullName: "未下发", id: "592592756363232517" },
+        { fullName: "待处理", id: "592592903172261125" },
+        { fullName: "下发待处理", id: "592592903172261125" },
+        { fullName: "上报待处理", id: "594684878927787126" },
+        { fullName: "已处理", id: "592592999649641733" },
+        { fullName: "仅保存", id: "593238431962760453" },
+      ],
       stateOptions: [],
       areaOptions: [],
       systemOptions: [],
@@ -268,6 +268,12 @@
           <div class="label w-120">处置建议：</div>
           <div class="text">{{ v.judgmentOpinion }}</div>
         </div>
+        <div class="form-item" v-if="v.judgmentFileUrl">
+          <div class="label w-120">处置附件：</div>
+          <div class="text" style="width: calc(100% - 120px);">
+            <NCC-UploadFz v-model="v.judgmentFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
+          </div>
+        </div>
       </el-col>
       <el-col v-for="(v, i) in dataForm.disposalSuggestions" :key="i" style="border: #f6f6f6 solid 1px; border-radius: 10px; padding: 8px; margin-bottom: 5px;">
         <div class="title">处置信息{{ i + 1 }}</div>
@@ -275,10 +281,10 @@
           <div class="label w-120">处置结果：</div>
           <div class="text">{{ v.disposalSuggestion }}</div>
         </div>
-        <div class="form-item" v-if="v.fileUrl">
+        <div class="form-item" v-if="v.disposalResultFileUrl">
           <div class="label w-120">处置附件：</div>
           <div class="text" style="width: calc(100% - 120px);">
-            <NCC-UploadFz v-model="v.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
+            <NCC-UploadFz v-model="v.disposalResultFileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
           </div>
         </div>
       </el-col>
@@ -585,7 +591,6 @@ export default {
     dataFormSubmit() {
       this.$refs["elForm"].validate(async (valid) => {
         if (valid) {
-          console.log(this.dataForm, 'this.dataForm');
           let obj = {
             ...this.dataForm,
             questionType: this.dataForm.questionType == '0' ? this.dataForm.otherQuestionType : this.dataForm.questionType,
@@ -60,7 +60,10 @@
               </el-col>
               <el-col :span="5">
                 <el-form-item label="">
-                  <el-input v-model="query.questionType" clearable placeholder="请输入问题类型" />
+                  <el-select v-model="query.questionType" placeholder="请选择问题类型" clearable>
+                    <el-option v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" :value="item.id" />
+                  </el-select>
+                  <!-- <el-input v-model="query.questionType" clearable placeholder="请输入问题类型" /> -->
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -128,6 +131,14 @@ export default {
         company: undefined,
         questionType: undefined,
       },
+      questionTypeOptions: [
+        { fullName: "存在有害信息", id: "577006944540165381" },
+        { fullName: "内容审核不到位", id: "577006978564359429" },
+        { fullName: "错误表述", id: "584886326260663557" },
+        { fullName: "删除链接", id: "591435954770674949" },
+        { fullName: "样本查删", id: "591436151911351557" },
+        { fullName: "其他", id: "0" },
+      ],
       list: [],
       listLoading: false,
       multipleSelection: [],
@@ -13,7 +13,10 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="">
-                  <el-input v-model="query.fileType" placeholder="请输入文件类型" clearable/>
+                  <el-select v-model="query.fileType" placeholder="请选择文件类型" clearable>
+                    <el-option v-for="(item, index) in fileTypeOptions" :key="index" :label="item.fullName" :value="item.id" />
+                  </el-select>
+                  <!-- <el-input v-model="query.fileType" placeholder="请输入文件类型" clearable/> -->
                 </el-form-item>
               </el-col>
               <el-col :span="4">
@@ -113,10 +116,9 @@ export default {
     this.getfileTypeOptions();
   },
   methods: {
-    getfileTypeOptions() {
-      getDictionaryDataSelector("577087166203561221").then((res) => {
-        this.fileTypeOptions = res.data.list;
-      });
+    async getfileTypeOptions() {
+      let res = await getDictionaryDataSelector('577087166203561221');
+			this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }];
     },
     initData() {
       this.listLoading = true;
@@ -258,27 +258,45 @@ export default {
       val && this.getAllMsgList();
     },
     checkDetail(row, isDetail) {
-      this.MsgFormVisible = true;
-      this.$nextTick(() => {
-        this.$refs.MsgForm.init(row.id, isDetail);
-      })
+      let type1 = row.communicationAreaList.some((v) => v.IsRead)
+      let type2 = row.communicationOutList.some((v) => v.IsRead)
+      if(!isDetail && (type1 || type2)) {
+        this.$message({
+          message: '该消息已有区县/外协阅读无法编辑！',
+          type: 'warning'
+        });
+      } else {
+        this.MsgFormVisible = true;
+        this.$nextTick(() => {
+          this.$refs.MsgForm.init(row.id, isDetail);
+        })
+      }
     },
     delNew(row) {
-      this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(async () => {
-        let res = await request({
-          url: `/SubDev/ZyOaArticle/${row.id}`,
-          method: "DELETE",
-        });
+      let type1 = row.communicationAreaList.some((v) => v.IsRead)
+      let type2 = row.communicationOutList.some((v) => v.IsRead)
+      if(type1 || type2) {
         this.$message({
-          message: res.msg,
-          type: 'success'
+          message: '该消息已有区县阅读无法编辑！',
+          type: 'warning'
         });
-        this.getAllMsgList();
-      });
+      } else {
+        this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          let res = await request({
+            url: `/SubDev/ZyOaArticle/${row.id}`,
+            method: "DELETE",
+          });
+          this.$message({
+            message: res.msg,
+            type: 'success'
+          });
+          this.getAllMsgList();
+        });
+      }
     },
     // 发布消息通知
@@ -365,7 +383,7 @@ export default {
         let openObject = this.getDialog(type);
         this[openObject.visible] = true;
         this.$nextTick(() => {
-          this.$refs[`${openObject.node}`].init(row.taskCorrelationId, openObject.isDetail, 1);
+          this.$refs[`${openObject.node}`].init(row.taskCorrelationId, openObject.isDetail, openObject.type);
         })
       }
     },
@@ -410,7 +428,7 @@ export default {
           break;
         case '案件处理':
         case '网信执法':
-          return { visible: 'HandFormVisible', node: 'HandForm', isDetail: false, type: 1}
+          return { visible: 'HandFormVisible', node: 'HandForm', isDetail: false, type: 2}
           break;
         case '研判':
           return { visible: 'DisposalFormVisible', node: 'DisposalForm', isDetail: false}
@@ -90,6 +90,11 @@
       <div class="msg-title">{{ dataForm.title }}</div>
       <div class="content" v-html="dataForm.bodyContent"></div>
       <div class="files" v-if="isSHILevel">
+        <h4>附件</h4>
+        <div style="margin-bottom: 10px;">
+          <NCC-UploadFz v-if="dataForm.imgUrl && dataForm.imgUrl.length" v-model="dataForm.imgUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
+          <div style="margin-top: 10px;" v-else>无附件</div>
+        </div>
         <h4>查看情况</h4>
         <div style="font-size: 12px; margin: 8px;">
           注：<el-tag type="success" size="mini">区县</el-tag>表示 【已查看】 的区县， <el-tag type="danger" size="mini">区县</el-tag>表示 【未查看】 的区县