Merge branch 'master' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/taicangZongzhi-PC

src/views/netWorkYq/dtsx/index.vue

@@ -37,6 +37,7 @@
         size="mini"
         @click="handleAdd()"
         v-hasPermi="['zongzhi:sx:add']"
+        :disabled="isAdd"
         >新增</el-button
       >
       <el-button
@@ -239,6 +240,8 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      //新增按钮是否可用
+      isAdd:false,
     };
   },
   created() {
@@ -257,6 +260,9 @@ export default {
     getList() {
       this.loading = true;
       listSx(this.queryParams).then((response) => {
+        if(response.rows.length>0){
+          this.isAdd=true
+        }
         this.sxList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -339,6 +345,7 @@ export default {
           } else {
             addSx(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
+              this.isAdd = true
               this.open = false;
               this.getList();
             });
@@ -364,6 +371,7 @@ export default {
         .then(() => {
           this.getList();
           this.msgSuccess("删除成功");
+          this.isAdd = false
         })
         .catch(() => {});
     },

src/views/netWorkYq/index.vue

@@ -357,8 +357,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="是否转办" prop="isturn">
+            <el-form-item label="是否是转办单">
-              <el-select v-model="form.isturn" placeholder="请选择是否转办">
+              <el-select v-model="form.isturn" placeholder="请选择是否是转办单">
                 <el-option
                   v-for="dict in dict.type.tc_yes_no"
                   :key="dict.value"
@@ -369,6 +369,39 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="是否提示单">
+              <el-select
+                v-model="form.reminder"
+                placeholder="请选择是否是提示单"
+              >
+                <el-option
+                  v-for="dict in dict.type.tc_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="舆情报告类型">
+              <el-select
+                v-model="form.sentimentReportType"
+                placeholder="请选择舆情报告类型"
+              >
+                <el-option
+                  v-for="dict in dict.type.tc_yqbg_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="12">
             <el-form-item label="附件上传" prop="fileName">
@@ -483,6 +516,7 @@ export default {
     "tc_yes_no",
     "tc_event_type",
     "tc_yq_type",
+    "tc_yqbg_type",
   ],
   data() {
     return {
@@ -600,6 +634,7 @@ export default {
         updateTime: null,
 
         remark: null,
+        reminder: null,
       };
       this.fileList = [];
       this.resetForm("form");
@@ -689,7 +724,6 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             this.form.areaId = JSON.stringify(this.form.areaId);
-
             this.filterFile(1);
             updateSentiment(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
@@ -697,6 +731,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.areaId = JSON.stringify(this.form.areaId);
             addSentiment(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/netWorkYq/yqfl/index.vue

@@ -179,32 +179,43 @@
             clearable
           ></el-cascader>
         </el-form-item>
-        <el-form-item label="媒体类型" prop="mediaType">
+        <el-form-item label="分类类型" >
-          <el-select v-model="form.mediaType" placeholder="请选择媒体类型">
+          <el-radio-group v-model="radio" >
-            <el-option
+            <el-radio :label="1">媒体类型</el-radio>
-              v-for="dict in dict.type.tc_yq_media"
+            <el-radio :label="2">涉事数据</el-radio>
-              :key="dict.value"
+          </el-radio-group>
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="涉事类型" prop="eventType">
-          <el-select v-model="form.eventType" placeholder="请选择涉事类型">
-            <el-option
-              v-for="dict in dict.type.tc_ss_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="媒体数据" prop="mediaCount">
-          <el-input v-model="form.mediaCount" placeholder="请输入媒体数据" />
-        </el-form-item>
-        <el-form-item label="涉事数量" prop="eventCount">
-          <el-input v-model="form.eventCount" placeholder="请输入涉事数量" />
         </el-form-item>
+
+        <div v-if="radio == 1">
+          <el-form-item label="媒体类型" prop="mediaType">
+            <el-select v-model="form.mediaType" placeholder="请选择媒体类型">
+              <el-option
+                v-for="dict in dict.type.tc_yq_media"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="媒体数据" prop="mediaCount">
+            <el-input v-model="form.mediaCount" placeholder="请输入媒体数据" />
+          </el-form-item>
+        </div>
+        <div v-if="radio == 2">
+          <el-form-item label="涉事类型" prop="eventType">
+            <el-select v-model="form.eventType" placeholder="请选择涉事类型">
+              <el-option
+                v-for="dict in dict.type.tc_ss_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="涉事数量" prop="eventCount">
+            <el-input v-model="form.eventCount" placeholder="请输入涉事数量" />
+          </el-form-item>
+        </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -271,6 +282,7 @@ export default {
   dicts: ["tc_yq_media", "tc_ss_type"],
   data() {
     return {
+      radio: 1,
       tableHeigth: 0,
       //查看详情
       infoOpen: false,
@@ -476,3 +488,10 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+::v-deep .el-radio-group{
+  display: flex;
+  align-items: center;
+  height: 32px;
+}
+</style>