From 88515882652739d54da09c2803a97e7f2dfa3b34 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 25 Apr 2024 12:02:54 +0800
Subject: [PATCH] =?UTF-8?q?4/25=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=201?=
 =?UTF-8?q?.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/anno/anncmnt/announcementDialog.vue | 379 +++++++++++++++++
 src/views/anno/anncmnt/manu.vue               |   1 +
 src/views/anno/anncmnt/manuCertDialog.vue     |   1 +
 src/views/anno/anncmnt/manuDialog.vue         | 345 ++--------------
 src/views/anno/anncmnt/product.vue            |   1 +
 src/views/anno/anncmnt/productCertDialog.vue  |   3 +-
 src/views/anno/anncmnt/productDialog.vue      | 357 ++--------------
 src/views/anno/anncmnt/ylqxzcrDialog.vue      | 386 ++----------------
 src/views/anno/anncmnt/ylqxzczh.vue           |   2 +-
 src/views/anno/anncmnt/ylqxzczhDialog.vue     | 358 ++--------------
 10 files changed, 512 insertions(+), 1321 deletions(-)
 create mode 100644 src/views/anno/anncmnt/announcementDialog.vue

diff --git a/src/views/anno/anncmnt/announcementDialog.vue b/src/views/anno/anncmnt/announcementDialog.vue
new file mode 100644
index 0000000..8a7ed79
--- /dev/null
+++ b/src/views/anno/anncmnt/announcementDialog.vue
@@ -0,0 +1,379 @@
+<template>
+<div>
+      <el-card>
+        <el-form v-if="queryList1 && queryList1.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch" :inline="true">
+          <el-row style=" display:flex;  flex-wrap: wrap; ">
+            <template v-for="(item, index) in queryList1" >
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+                <el-input
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                  clearable
+                ></el-input>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-select v-model="filterQuery[item.columnName]"
+                           :placeholder="item.columnDesc"
+                           :disabled="executeEval(null,item.disabledFuc,false)"
+                           clearable>
+                  <el-option
+                    v-for="dict in item.lableRuleObj"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-select
+                  v-model="filterQuery[item.columnName]"
+                  :placeholder="item.columnDesc"
+                  @change="executeFuc($event,'5',item.checkRules)"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  filterable
+                  remote
+                  :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                  clearable>
+                  <el-option
+                    v-for="item in options[item.clickFuc]"
+                    :key="item.code"
+                    :label="item.label"
+                    :value="item.code"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  :picker-options="pickerOptions"
+                  v-model="actDateRange"
+                  type="daterange"
+                  format="yyyy 年 MM 月 dd 日"
+                  value-format="yyyy-MM-dd"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-date-picker
+                  v-model="filterQuery[item.columnName]"
+                  :style="`width:${item.width+'px'}`"
+                  value-format="yyyy-MM-dd"
+                  :disabled="executeEval(null,item.disabledFuc,false)"
+                  type="date"
+                  :placeholder="item.columnDesc"
+                ></el-date-picker>
+              </el-form-item>
+            </template>
+          </el-row>
+        </el-form>
+        <div class="top-right-btn">
+          <el-button-group>
+            <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-refresh"
+              @click="onReset"
+            >重置
+            </el-button>
+            <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+            >查询
+            </el-button
+            >
+            <el-button type="primary" icon="el-icon-plus" @click="confrim">选入</el-button>
+          </el-button-group>
+        </div>
+        <el-table
+          :data="list"
+          style="width: 100%"
+          border
+          highlight-current-row="true"
+          :row-class-name="tableRowClassName"
+          @current-change="handleErpChange"
+          @selection-change="handleSelectionUdiChange"
+          ref="multipleTable"
+        >
+          <el-table-column width="55">
+            <template slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck" :disabled="scope.row.check"><span></span></el-radio>
+            </template>
+          </el-table-column>
+
+          <template v-for="(item, index) in tableHeader1">
+            <el-table-column
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+              type="index" :label="item.columnDesc"></el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'selection'"
+              type="selection"
+              :width="item.width"
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+            ></el-table-column>
+
+            <el-table-column
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template  slot-scope="scope">
+                <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template   slot-scope="scope">
+                <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+                </el-tag>
+              </template>
+            </el-table-column>
+            <!--<el-table-column-->
+            <!--  v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
+            <!--  :prop="item.columnName"-->
+            <!--  :label="item.columnDesc"-->
+            <!--  :width="item.width"-->
+            <!--  :key="item.columnName"-->
+            <!--  fixed="right"-->
+            <!--&gt;-->
+            <!--  <template slot-scope="scope">-->
+            <!--    <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
+            <!--               :type="buttonItem.type"-->
+            <!--               :size="buttonItem.size"-->
+            <!--               :style="buttonItem.style"-->
+            <!--               :key="buttonItem"-->
+            <!--               v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
+            <!--               :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
+            <!--               @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
+            <!--    >{{ buttonItem.name }}-->
+            <!--    </el-button>-->
+            <!--  </template>-->
+            <!--</el-table-column>-->
+            <el-table-column
+              v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="filterQuery.page"
+          :limit.sync="filterQuery.limit"
+          @pagination="handleCurrentChange"
+        ></pagination>
+      </el-card>
+</div>
+</template>
+
+<script>
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+import {list} from "@/api/anno/anncmntDev";
+export default {
+  name: "announcementDialog",
+  props:{
+    closeAnnoDialog: {
+      type: Function,
+      required: true,
+    },
+  },
+  data ()
+  {
+    return {
+      childValue: '我是子组件的数据',
+      //新增
+      dialogTableVisible:false,
+      textarea:'',
+      body:{},
+      tableObj1 : [],
+      tableHeader1 : [],
+      queryList1 : [],
+      fromList1 : [],
+      filterQuery: {
+        page: 1,
+        limit: 10,
+        // status:1,
+      },
+      radioCheck: null,
+      devSelection:[],
+      currentRow: null,
+      loading: false,
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      showSearch: true,
+      list:[],
+    }
+  },
+  methods: {
+    // childClick () {
+    //   // childByValue是在父组件on监听的方法
+    //   // 第二个参数this.childValue是需要传的值
+    //   this.$emit('childByValue', this.childValue)
+    // },
+    checkSelectable(row) {
+      return !row.check;
+    },
+    //新增
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    getDevList(){
+      // this.dialogTableVisible = true
+      this.loading = true;
+      list(this.filterQuery).then(res => {
+        if (res.code == 20000){
+          this.loading = false;
+          this.tableData = res.data
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+          console.log("success",this.tableData)
+        }
+      }).catch(res => {
+        this.loading = false;
+        this.list = [];
+        this.total = 0;
+      })
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    onReset() {
+      this.actDateRange = null;
+      this.filterQuery = {
+        page: 1,
+        limit: 10,
+        // status:1,
+      }
+      this.getDevList();
+    },
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getDevList();
+    },
+    confrim(){
+      // this.closeDialog();
+      // console.log("wozaici dayin yicia zhege ", this.devSelection)
+      const val = this.devSelection;
+      this.textarea = val[0].annContent
+      this.$emit('childByValue', this.textarea)
+      this.closeAnnoDialog();
+    },
+    tableRowClassName({row, rowIndex}) {
+      if (row.check) return "warning-row";
+      return "";
+    },
+    handleErpChange(val) {
+      // console.log("dianjij handleErpChange",val)
+      if (!val.check) {
+        this.radioCheck = val.id;
+        // this.cpmctymc1 = val.cpmctymc;
+        this.currentRow = val;
+        this.$refs.multipleTable.clearSelection();
+        this.$refs.multipleTable.toggleRowSelection(val);
+      }
+    },
+    handleSelectionUdiChange(val) {
+      // console.log("dayin dayin handleSelectionUdiChange ",val)
+      this.devSelection = val;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getDevList();
+    },
+  },
+  created() {
+    getHead("anncmntDev","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj1 = re.data;
+      this.tableHeader1 = re.data.tableList;
+      this.queryList1 = re.data.queryList;
+      this.fromList1 = re.data.fromList;
+      this.getDevList();
+    });
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/anno/anncmnt/manu.vue b/src/views/anno/anncmnt/manu.vue
index 5e60d4d..0e8e215 100644
--- a/src/views/anno/anncmnt/manu.vue
+++ b/src/views/anno/anncmnt/manu.vue
@@ -11,6 +11,7 @@
                 :disabled="executeEval(null,item.disabledFuc,false)"
                 @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                 clearable
+                :autosize="{ minRows: 4, maxRows: 9}"
               ></el-input>
             </el-form-item>
             <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
diff --git a/src/views/anno/anncmnt/manuCertDialog.vue b/src/views/anno/anncmnt/manuCertDialog.vue
index 6bfa674..43b3fcf 100644
--- a/src/views/anno/anncmnt/manuCertDialog.vue
+++ b/src/views/anno/anncmnt/manuCertDialog.vue
@@ -19,6 +19,7 @@
                       :placeholder="item.columnDesc"
                       :disabled="item.disabled"
                       @input="executeFuc($event,'5',item.clickFuc)"
+                      :autosize="{ minRows: 4, maxRows: 9}"
                     ></el-input>
                   </el-form-item>
 
diff --git a/src/views/anno/anncmnt/manuDialog.vue b/src/views/anno/anncmnt/manuDialog.vue
index c610248..2f1262e 100644
--- a/src/views/anno/anncmnt/manuDialog.vue
+++ b/src/views/anno/anncmnt/manuDialog.vue
@@ -1,8 +1,22 @@
 <template>
   <div>
+    <el-dialog
+      :title="formAnnoName"
+      :visible.sync="anno"
+      :before-close="close"
+      width="60%"
+      v-if="anno"
+      @close='closeAnnoDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body >
+      <announcementDialog
+        :closeAnnoDialog="closeAnnoDialog"
+        v-on:childByValue="childByValue"/>
+    </el-dialog>
     <el-card>
       <div style="font-size: 15px;font-weight: bold;">公告标题
-        <el-button style="margin-left: 678px" type="primary" icon="el-icon-plus" @click="dialogTableVisible = true"
+        <el-button style="margin-left: 670px" type="primary" icon="el-icon-plus" @click="openAnno"
         >选入公告</el-button>
       </div>
       <el-form>
@@ -16,209 +30,6 @@
           </el-input>
         </el-form-item>
       </el-form>
-
-
-
-      <el-dialog title="选入公告" :visible.sync="dialogTableVisible"  append-to-body width="60%">
-        <el-card>
-          <el-form v-if="queryList1 && queryList1.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch" :inline="true">
-            <el-row style=" display:flex;  flex-wrap: wrap; ">
-              <template v-for="(item, index) in queryList1" >
-                <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
-                  <el-input
-                    v-model="filterQuery[item.columnName]"
-                    :placeholder="item.columnDesc"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-select v-model="filterQuery[item.columnName]"
-                             :placeholder="item.columnDesc"
-                             :disabled="executeEval(null,item.disabledFuc,false)"
-                             clearable>
-                    <el-option
-                      v-for="dict in item.lableRuleObj"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-select
-                    v-model="filterQuery[item.columnName]"
-                    :placeholder="item.columnDesc"
-                    @change="executeFuc($event,'5',item.checkRules)"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    filterable
-                    remote
-                    :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
-                    clearable>
-                    <el-option
-                      v-for="item in options[item.clickFuc]"
-                      :key="item.code"
-                      :label="item.label"
-                      :value="item.code"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-date-picker
-                    :picker-options="pickerOptions"
-                    v-model="actDateRange"
-                    type="daterange"
-                    format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                  ></el-date-picker>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-date-picker
-                    v-model="filterQuery[item.columnName]"
-                    :style="`width:${item.width+'px'}`"
-                    value-format="yyyy-MM-dd"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    type="date"
-                    :placeholder="item.columnDesc"
-                  ></el-date-picker>
-                </el-form-item>
-              </template>
-            </el-row>
-          </el-form>
-          <div class="top-right-btn">
-            <el-button-group>
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onReset"
-              >重置
-              </el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onSubmit"
-              >查询
-              </el-button
-              >
-              <el-button type="primary" icon="el-icon-plus" @click="confrim">选入</el-button>
-            </el-button-group>
-          </div>
-          <el-table
-            :data="list"
-            style="width: 100%"
-            border
-            highlight-current-row="true"
-            :row-class-name="tableRowClassName"
-            @current-change="handleErpChange"
-            @selection-change="handleSelectionUdiChange"
-            ref="multipleTable"
-          >
-            <el-table-column width="55">
-              <template slot-scope="scope">
-                <el-radio :label="scope.row.id" v-model="radioCheck" :disabled="scope.row.check"><span></span></el-radio>
-              </template>
-            </el-table-column>
-
-            <template v-for="(item, index) in tableHeader1">
-              <el-table-column
-                v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
-                type="index" :label="item.columnDesc"></el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'selection'"
-                type="selection"
-                :width="item.width"
-                :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
-              ></el-table-column>
-
-              <el-table-column
-                v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template  slot-scope="scope">
-                  <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template   slot-scope="scope">
-                  <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template   slot-scope="scope">
-                  <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                    <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
-                  </el-tag>
-                </template>
-              </el-table-column>
-              <!--<el-table-column-->
-              <!--  v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
-              <!--  :prop="item.columnName"-->
-              <!--  :label="item.columnDesc"-->
-              <!--  :width="item.width"-->
-              <!--  :key="item.columnName"-->
-              <!--  fixed="right"-->
-              <!--&gt;-->
-              <!--  <template slot-scope="scope">-->
-              <!--    <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
-              <!--               :type="buttonItem.type"-->
-              <!--               :size="buttonItem.size"-->
-              <!--               :style="buttonItem.style"-->
-              <!--               :key="buttonItem"-->
-              <!--               v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
-              <!--               :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
-              <!--               @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
-              <!--    >{{ buttonItem.name }}-->
-              <!--    </el-button>-->
-              <!--  </template>-->
-              <!--</el-table-column>-->
-              <el-table-column
-                v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template slot-scope="scope">
-                  <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
-                </template>
-              </el-table-column>
-            </template>
-          </el-table>
-
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="handleCurrentChange"
-          ></pagination>
-        </el-card>
-      </el-dialog>
     </el-card>
 
     <el-card>
@@ -240,6 +51,7 @@
                       :placeholder="item.columnDesc"
                       :disabled="item.disabled"
                       @input="executeFuc($event,'5',item.clickFuc)"
+                      :autosize="{ minRows: 4, maxRows: 9}"
                     ></el-input>
                   </el-form-item>
 
@@ -340,7 +152,7 @@ import {savegg} from "@/api/anno/anncmntManu";
 import {
   getHead,executeFuc
 } from "@/utils/customConfig";
-import {list} from "@/api/anno/anncmntDev";
+import announcementDialog from "@/views/anno/anncmnt/announcementDialog";
 
 export default {
   name: "ylqxzcrDialog",
@@ -371,53 +183,8 @@ export default {
       dialogTableVisible:false,
       textarea:'',
       body:{},
-      tableObj1 : [],
-      tableHeader1 : [],
-      queryList1 : [],
-      fromList1 : [],
-      filterQuery: {
-        page: 1,
-        limit: 10,
-        // status:1,
-      },
-      radioCheck: null,
-      devSelection:[],
-      currentRow: null,
-      loading: false,
-      actDateRange: [],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
-      showSearch: true,
-      list:[],
+      formAnnoName:'选入公告内容',
+      anno:false,
     }
   },
   methods: {
@@ -469,75 +236,19 @@ export default {
       });
       _this.inputQuery.spell = str;
     },
-    getDevList(){
-      this.loading = true;
-      list(this.filterQuery).then(res => {
-        if (res.code == 20000){
-          this.loading = false;
-          this.tableData = res.data
-          this.list = res.data.list || [];
-          this.total = res.data.total || 0;
-          console.log("success",this.tableData)
-        }
-      }).catch(res => {
-        this.loading = false;
-        this.list = [];
-        this.total = 0;
-      })
-    },
-    hideSearch() {
-      this.showSearch = !this.showSearch;
+    closeAnnoDialog(){
+      this.anno = false;
     },
-    onReset() {
-      this.actDateRange = null;
-      this.filterQuery = {
-        page: 1,
-        limit: 10,
-        // status:1,
-      }
-      this.getDevList();
-    },
-    onSubmit() {
-      if (this.actDateRange !== null) {
-        this.filterQuery.startTime = this.actDateRange[0];
-        this.filterQuery.endTime = this.actDateRange[1];
-      } else {
-        this.filterQuery.startTime = null;
-        this.filterQuery.endTime = null;
-      }
-      this.filterQuery.page = 1;
-      this.getDevList();
-    },
-    confrim(){
-      // console.log("wozaici dayin yicia zhege ", this.devSelection)
-      const val = this.devSelection;
-      this.textarea = val[0].annContent
-      this.dialogTableVisible = false
+    childByValue(val){
+      this.textarea = val;
+      console.log("hahhahachaunzhi ",this.textarea)
     },
-    tableRowClassName({row, rowIndex}) {
-      if (row.check) return "warning-row";
-      return "";
-    },
-    handleErpChange(val) {
-      // console.log("dianjij handleErpChange",val)
-      if (!val.check) {
-        this.radioCheck = val.id;
-        // this.cpmctymc1 = val.cpmctymc;
-        this.currentRow = val;
-        this.$refs.multipleTable.clearSelection();
-        this.$refs.multipleTable.toggleRowSelection(val);
-      }
-    },
-    handleSelectionUdiChange(val) {
-      // console.log("dayin dayin handleSelectionUdiChange ",val)
-      this.devSelection = val;
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val.page;
-      this.getDevList();
+    openAnno(){
+      this.anno = true;
     },
+
   },
-  components: {},
+  components: {announcementDialog},
   created() {
     getHead("manu-1","1").then((re) => {
       // 处理返回的数据
diff --git a/src/views/anno/anncmnt/product.vue b/src/views/anno/anncmnt/product.vue
index 7252ca5..6d66bfa 100644
--- a/src/views/anno/anncmnt/product.vue
+++ b/src/views/anno/anncmnt/product.vue
@@ -11,6 +11,7 @@
                 :disabled="executeEval(null,item.disabledFuc,false)"
                 @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
                 clearable
+                :autosize="{ minRows: 4, maxRows: 9}"
               ></el-input>
             </el-form-item>
             <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
diff --git a/src/views/anno/anncmnt/productCertDialog.vue b/src/views/anno/anncmnt/productCertDialog.vue
index 0854a4d..c20cb84 100644
--- a/src/views/anno/anncmnt/productCertDialog.vue
+++ b/src/views/anno/anncmnt/productCertDialog.vue
@@ -19,6 +19,7 @@
                       :placeholder="item.columnDesc"
                       :disabled="item.disabled"
                       @input="executeFuc($event,'5',item.clickFuc)"
+                      :autosize="{ minRows: 4, maxRows: 9}"
                     ></el-input>
                   </el-form-item>
 
@@ -157,7 +158,7 @@ export default {
       invList:[],
       options: {
 
-      }
+      },
     }
   },
   methods: {
diff --git a/src/views/anno/anncmnt/productDialog.vue b/src/views/anno/anncmnt/productDialog.vue
index 406b7f1..9a1e008 100644
--- a/src/views/anno/anncmnt/productDialog.vue
+++ b/src/views/anno/anncmnt/productDialog.vue
@@ -1,8 +1,9 @@
 <template>
   <div>
+
     <el-card>
       <div style="font-size: 15px;font-weight: bold;">公告标题
-        <el-button style="margin-left: 678px" type="primary" icon="el-icon-plus" @click="dialogTableVisible = true"
+        <el-button style="margin-left: 670px" type="primary" icon="el-icon-plus" @click="openAnno"
         >选入公告</el-button>
       </div>
       <el-form>
@@ -16,209 +17,6 @@
           </el-input>
         </el-form-item>
       </el-form>
-
-
-
-      <el-dialog title="选入公告" :visible.sync="dialogTableVisible"  append-to-body width="60%">
-        <el-card>
-          <el-form v-if="queryList1 && queryList1.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch" :inline="true">
-            <el-row style=" display:flex;  flex-wrap: wrap; ">
-              <template v-for="(item, index) in queryList1" >
-                <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
-                  <el-input
-                    v-model="filterQuery[item.columnName]"
-                    :placeholder="item.columnDesc"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-select v-model="filterQuery[item.columnName]"
-                             :placeholder="item.columnDesc"
-                             :disabled="executeEval(null,item.disabledFuc,false)"
-                             clearable>
-                    <el-option
-                      v-for="dict in item.lableRuleObj"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-select
-                    v-model="filterQuery[item.columnName]"
-                    :placeholder="item.columnDesc"
-                    @change="executeFuc($event,'5',item.checkRules)"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    filterable
-                    remote
-                    :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
-                    clearable>
-                    <el-option
-                      v-for="item in options[item.clickFuc]"
-                      :key="item.code"
-                      :label="item.label"
-                      :value="item.code"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-date-picker
-                    :picker-options="pickerOptions"
-                    v-model="actDateRange"
-                    type="daterange"
-                    format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                  ></el-date-picker>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-date-picker
-                    v-model="filterQuery[item.columnName]"
-                    :style="`width:${item.width+'px'}`"
-                    value-format="yyyy-MM-dd"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    type="date"
-                    :placeholder="item.columnDesc"
-                  ></el-date-picker>
-                </el-form-item>
-              </template>
-            </el-row>
-          </el-form>
-          <div class="top-right-btn">
-            <el-button-group>
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onReset"
-              >重置
-              </el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onSubmit"
-              >查询
-              </el-button
-              >
-              <el-button type="primary" icon="el-icon-plus" @click="confrim">选入</el-button>
-            </el-button-group>
-          </div>
-          <el-table
-            :data="list"
-            style="width: 100%"
-            border
-            highlight-current-row="true"
-            :row-class-name="tableRowClassName"
-            @current-change="handleErpChange"
-            @selection-change="handleSelectionUdiChange"
-            ref="multipleTable"
-          >
-            <el-table-column width="55">
-              <template slot-scope="scope">
-                <el-radio :label="scope.row.id" v-model="radioCheck" :disabled="scope.row.check"><span></span></el-radio>
-              </template>
-            </el-table-column>
-
-            <template v-for="(item, index) in tableHeader1">
-              <el-table-column
-                v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
-                type="index" :label="item.columnDesc"></el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'selection'"
-                type="selection"
-                :width="item.width"
-                :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
-              ></el-table-column>
-
-              <el-table-column
-                v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template  slot-scope="scope">
-                  <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template   slot-scope="scope">
-                  <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template   slot-scope="scope">
-                  <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                    <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
-                  </el-tag>
-                </template>
-              </el-table-column>
-              <!--<el-table-column-->
-              <!--  v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
-              <!--  :prop="item.columnName"-->
-              <!--  :label="item.columnDesc"-->
-              <!--  :width="item.width"-->
-              <!--  :key="item.columnName"-->
-              <!--  fixed="right"-->
-              <!--&gt;-->
-              <!--  <template slot-scope="scope">-->
-              <!--    <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
-              <!--               :type="buttonItem.type"-->
-              <!--               :size="buttonItem.size"-->
-              <!--               :style="buttonItem.style"-->
-              <!--               :key="buttonItem"-->
-              <!--               v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
-              <!--               :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
-              <!--               @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
-              <!--    >{{ buttonItem.name }}-->
-              <!--    </el-button>-->
-              <!--  </template>-->
-              <!--</el-table-column>-->
-              <el-table-column
-                v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template slot-scope="scope">
-                  <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
-                </template>
-              </el-table-column>
-            </template>
-          </el-table>
-
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="handleCurrentChange"
-          ></pagination>
-        </el-card>
-      </el-dialog>
     </el-card>
 
     <el-card>
@@ -240,6 +38,7 @@
                       :placeholder="item.columnDesc"
                       :disabled="item.disabled"
                       @input="executeFuc($event,'5',item.clickFuc)"
+                      :autosize="{ minRows: 4, maxRows: 9}"
                     ></el-input>
                   </el-form-item>
 
@@ -329,6 +128,22 @@
         </div>
       </el-form>
     </el-card>
+
+
+    <el-dialog
+      :title="formAnnoName"
+      :visible.sync="anno"
+      :before-close="close"
+      width="60%"
+      v-if="anno"
+      @close='closeAnnoDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body >
+      <announcementDialog
+        :closeAnnoDialog="closeAnnoDialog"
+        v-on:childByValue="childByValue"/>
+    </el-dialog>
   </div>
 </template>
 
@@ -339,7 +154,7 @@ import {getYlqxzczhList} from "@/api/anno/anncmntYlqxzczh";
 import {
   getHead,executeFuc
 } from "@/utils/customConfig";
-import {list} from "@/api/anno/anncmntDev";
+import announcementDialog from "@/views/anno/anncmnt/announcementDialog";
 
 export default {
   name: "ylqxzcrDialog",
@@ -369,56 +184,11 @@ export default {
         getManu:[],
       },
       //新增
-      dialogTableVisible:false,
       textarea:'',
       body:{},
-      tableObj1 : [],
-      tableHeader1 : [],
-      queryList1 : [],
-      fromList1 : [],
-      filterQuery: {
-        page: 1,
-        limit: 10,
-        // status:1,
-      },
-      radioCheck: null,
-      devSelection:[],
-      currentRow: null,
-      loading: false,
-      actDateRange: [],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
-      showSearch: true,
-      list:[],
+      formAnnoName:'选入公告内容',
+      anno:false,
+
     }
   },
   methods: {
@@ -504,75 +274,18 @@ export default {
       });
       _this.inputQuery.spell = str;
     },
-    getDevList(){
-      this.loading = true;
-      list(this.filterQuery).then(res => {
-        if (res.code == 20000){
-          this.loading = false;
-          this.tableData = res.data
-          this.list = res.data.list || [];
-          this.total = res.data.total || 0;
-          console.log("success",this.tableData)
-        }
-      }).catch(res => {
-        this.loading = false;
-        this.list = [];
-        this.total = 0;
-      })
-    },
-    hideSearch() {
-      this.showSearch = !this.showSearch;
+    closeAnnoDialog(){
+      this.anno = false;
     },
-    onReset() {
-      this.actDateRange = null;
-      this.filterQuery = {
-        page: 1,
-        limit: 10,
-        // status:1,
-      }
-      this.getDevList();
+    childByValue(val){
+      this.textarea = val;
     },
-    onSubmit() {
-      if (this.actDateRange !== null) {
-        this.filterQuery.startTime = this.actDateRange[0];
-        this.filterQuery.endTime = this.actDateRange[1];
-      } else {
-        this.filterQuery.startTime = null;
-        this.filterQuery.endTime = null;
-      }
-      this.filterQuery.page = 1;
-      this.getDevList();
-    },
-    confrim(){
-      // console.log("wozaici dayin yicia zhege ", this.devSelection)
-      const val = this.devSelection;
-      this.textarea = val[0].annContent
-      this.dialogTableVisible = false
-    },
-    tableRowClassName({row, rowIndex}) {
-      if (row.check) return "warning-row";
-      return "";
-    },
-    handleErpChange(val) {
-      // console.log("dianjij handleErpChange",val)
-      if (!val.check) {
-        this.radioCheck = val.id;
-        // this.cpmctymc1 = val.cpmctymc;
-        this.currentRow = val;
-        this.$refs.multipleTable.clearSelection();
-        this.$refs.multipleTable.toggleRowSelection(val);
-      }
-    },
-    handleSelectionUdiChange(val) {
-      // console.log("dayin dayin handleSelectionUdiChange ",val)
-      this.devSelection = val;
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val.page;
-      this.getDevList();
+    openAnno(){
+      this.anno = true;
     },
+
   },
-  components: {},
+  components: {announcementDialog},
   created() {
     getHead("product-1","1").then((re) => {
       // 处理返回的数据
@@ -583,14 +296,6 @@ export default {
     });
     this.getYlqxzczh(this);
      this.getManu(this);
-    getHead("anncmntDev","1").then((re) => {
-      // 处理返回的数据
-      this.tableObj1 = re.data;
-      this.tableHeader1 = re.data.tableList;
-      this.queryList1 = re.data.queryList;
-      this.fromList1 = re.data.fromList;
-      this.getDevList();
-    });
   },
 }
 </script>
diff --git a/src/views/anno/anncmnt/ylqxzcrDialog.vue b/src/views/anno/anncmnt/ylqxzcrDialog.vue
index cbf07c1..35b9bc3 100644
--- a/src/views/anno/anncmnt/ylqxzcrDialog.vue
+++ b/src/views/anno/anncmnt/ylqxzcrDialog.vue
@@ -2,226 +2,21 @@
   <div>
     <el-card>
       <div style="font-size: 15px;font-weight: bold;">公告标题
-        <el-button style="margin-left: 678px" type="primary" icon="el-icon-plus" @click="dialogTableVisible = true"
+        <el-button style="margin-left: 670px" type="primary" icon="el-icon-plus" @click="openAnno"
         >选入公告</el-button>
       </div>
       <el-form>
-      <el-form-item label="公告内容:" class="query-form-item" :model="body" >
-        <el-input
-          type="textarea"
-          :autosize="{ minRows: 6, maxRows: 10}"
-          placeholder="公告内容"
-          v-model="textarea">
-          style="width: 80%"
-        </el-input>
-      </el-form-item>
+        <el-form-item label="公告内容:" class="query-form-item" :model="body" >
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 6, maxRows: 10}"
+            placeholder="公告内容"
+            v-model="textarea">
+            style="width: 80%"
+          </el-input>
+        </el-form-item>
       </el-form>
-
-
-
-      <el-dialog title="选入公告" :visible.sync="dialogTableVisible"  append-to-body width="60%">
-        <el-card>
-          <el-form v-if="queryList1 && queryList1.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch" :inline="true">
-            <el-row style=" display:flex;  flex-wrap: wrap; ">
-              <template v-for="(item, index) in queryList1" >
-                <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
-                  <el-input
-                    v-model="filterQuery[item.columnName]"
-                    :placeholder="item.columnDesc"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-select v-model="filterQuery[item.columnName]"
-                             :placeholder="item.columnDesc"
-                             :disabled="executeEval(null,item.disabledFuc,false)"
-                             clearable>
-                    <el-option
-                      v-for="dict in item.lableRuleObj"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-select
-                    v-model="filterQuery[item.columnName]"
-                    :placeholder="item.columnDesc"
-                    @change="executeFuc($event,'5',item.checkRules)"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    filterable
-                    remote
-                    :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
-                    clearable>
-                    <el-option
-                      v-for="item in options[item.clickFuc]"
-                      :key="item.code"
-                      :label="item.label"
-                      :value="item.code"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-date-picker
-                    :picker-options="pickerOptions"
-                    v-model="actDateRange"
-                    type="daterange"
-                    format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                  ></el-date-picker>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-date-picker
-                    v-model="filterQuery[item.columnName]"
-                    :style="`width:${item.width+'px'}`"
-                    value-format="yyyy-MM-dd"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    type="date"
-                    :placeholder="item.columnDesc"
-                  ></el-date-picker>
-                </el-form-item>
-              </template>
-            </el-row>
-          </el-form>
-          <div class="top-right-btn">
-            <el-button-group>
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onReset"
-              >重置
-              </el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onSubmit"
-              >查询
-              </el-button
-              >
-              <el-button type="primary" icon="el-icon-plus" @click="confrim">选入</el-button>
-            </el-button-group>
-          </div>
-          <el-table
-              :data="list"
-              style="width: 100%"
-              border
-              highlight-current-row="true"
-              :row-class-name="tableRowClassName"
-              @current-change="handleErpChange"
-              @selection-change="handleSelectionUdiChange"
-              ref="multipleTable"
-          >
-            <el-table-column width="55">
-                    <template slot-scope="scope">
-                      <el-radio :label="scope.row.id" v-model="radioCheck" :disabled="scope.row.check"><span></span></el-radio>
-                    </template>
-             </el-table-column>
-
-            <template v-for="(item, index) in tableHeader1">
-              <el-table-column
-                v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
-                type="index" :label="item.columnDesc"></el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'selection'"
-                type="selection"
-                :width="item.width"
-                :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
-              ></el-table-column>
-
-              <el-table-column
-                v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template  slot-scope="scope">
-                  <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template   slot-scope="scope">
-                  <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template   slot-scope="scope">
-                  <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                    <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
-                  </el-tag>
-                </template>
-              </el-table-column>
-              <!--<el-table-column-->
-              <!--  v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
-              <!--  :prop="item.columnName"-->
-              <!--  :label="item.columnDesc"-->
-              <!--  :width="item.width"-->
-              <!--  :key="item.columnName"-->
-              <!--  fixed="right"-->
-              <!--&gt;-->
-              <!--  <template slot-scope="scope">-->
-              <!--    <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
-              <!--               :type="buttonItem.type"-->
-              <!--               :size="buttonItem.size"-->
-              <!--               :style="buttonItem.style"-->
-              <!--               :key="buttonItem"-->
-              <!--               v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
-              <!--               :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
-              <!--               @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
-              <!--    >{{ buttonItem.name }}-->
-              <!--    </el-button>-->
-              <!--  </template>-->
-              <!--</el-table-column>-->
-              <el-table-column
-                v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template slot-scope="scope">
-                  <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
-                </template>
-              </el-table-column>
-            </template>
-          </el-table>
-
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="handleCurrentChange"
-          ></pagination>
-        </el-card>
-      </el-dialog>
     </el-card>
-
-
     <!-- 第二部分啦 -->
     <el-card>
       <el-form  :model="inputQuery"  label-width="150px" >
@@ -335,16 +130,29 @@
       </el-form>
     </el-card>
 
-
+    <el-dialog
+      :title="formAnnoName"
+      :visible.sync="anno"
+      :before-close="close"
+      width="60%"
+      v-if="anno"
+      @close='closeAnnoDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body >
+      <announcementDialog
+        :closeAnnoDialog="closeAnnoDialog"
+        v-on:childByValue="childByValue"/>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {savegg} from "@/api/anno/anncmntYlqxzcr";
-import {list} from "@/api/anno/anncmntDev";
 import {
   getHead,executeFuc
 } from "@/utils/customConfig";
+import announcementDialog from "@/views/anno/anncmnt/announcementDialog";
 
 export default {
   name: "ylqxzcrDialog",
@@ -364,66 +172,19 @@ export default {
   },
   data() {
     return {
-      total: 0,
-      showSearch: true,
-      dialogTableVisible: false,
       tableData:[],
       list:[],
       tableHeader:[],
       queryList:[],
       fromList:[],
       tableObj:[],
-      tableObj1 : [],
-      tableHeader1 : [],
-      queryList1 : [],
-      fromList1 : [],
       invList:[],
-      filterQuery: {
-        page: 1,
-        limit: 10,
-        // status:1,
-      },
-      radioCheck: null,
-      devSelection:[],
-      currentRow: null,
       textarea:'',
-      body:{},
-      loading: false,
-      actDateRange: [],
       options: {
 
       },
-     pickerOptions: {
-       shortcuts: [
-         {
-           text: "最近一周",
-           onClick(picker) {
-             const end = new Date();
-             const start = new Date();
-             start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-             picker.$emit("pick", [start, end]);
-           },
-         },
-         {
-           text: "最近一个月",
-           onClick(picker) {
-             const end = new Date();
-             const start = new Date();
-             start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-             picker.$emit("pick", [start, end]);
-           },
-         },
-         {
-           text: "最近三个月",
-           onClick(picker) {
-             const end = new Date();
-             const start = new Date();
-             start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-             picker.$emit("pick", [start, end]);
-           },
-         },
-       ],
-     },
+      formAnnoName:'选入公告内容',
+      anno:false,
     }
   },
   methods: {
@@ -454,60 +215,6 @@ export default {
           });
       }
     },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val.page;
-      this.getDevList();
-    },
-    hideSearch() {
-      this.showSearch = !this.showSearch;
-    },
-    onReset() {
-      this.actDateRange = null;
-      this.filterQuery = {
-          page: 1,
-          limit: 10,
-          // status:1,
-      }
-      this.getDevList();
-    },
-    onSubmit() {
-      if (this.actDateRange !== null) {
-        this.filterQuery.startTime = this.actDateRange[0];
-        this.filterQuery.endTime = this.actDateRange[1];
-      } else {
-        this.filterQuery.startTime = null;
-        this.filterQuery.endTime = null;
-      }
-      this.filterQuery.page = 1;
-      this.getDevList();
-    },
-    checkSelectable(row) {
-      return !row.check;
-    },
-    confrim(){
-      // console.log("wozaici dayin yicia zhege ", this.devSelection)
-      const val = this.devSelection;
-      this.textarea = val[0].annContent
-      this.dialogTableVisible = false
-    },
-    tableRowClassName({row, rowIndex}) {
-      if (row.check) return "warning-row";
-      return "";
-    },
-    handleErpChange(val) {
-      // console.log("dianjij handleErpChange",val)
-      if (!val.check) {
-        this.radioCheck = val.id;
-        // this.cpmctymc1 = val.cpmctymc;
-        this.currentRow = val;
-        this.$refs.multipleTable.clearSelection();
-        this.$refs.multipleTable.toggleRowSelection(val);
-      }
-    },
-    handleSelectionUdiChange(val) {
-      // console.log("dayin dayin handleSelectionUdiChange ",val)
-      this.devSelection = val;
-    },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
     },
@@ -529,24 +236,19 @@ export default {
       });
       _this.inputQuery.spell = str;
     },
-    getDevList(){
-      this.loading = true;
-      list(this.filterQuery).then(res => {
-        if (res.code == 20000){
-          this.loading = false;
-          this.tableData = res.data
-          this.list = res.data.list || [];
-          this.total = res.data.total || 0;
-          console.log("success",this.tableData)
-        }
-      }).catch(res => {
-        this.loading = false;
-        this.list = [];
-        this.total = 0;
-      })
-    }
+    closeAnnoDialog(){
+      this.anno = false;
+    },
+    childByValue(val){
+      this.textarea = val;
+      console.log("hahhahachaunzhi ",this.textarea)
+    },
+    openAnno(){
+      this.anno = true;
+    },
+
   },
-  components: {},
+  components: {announcementDialog},
   created() {
     getHead("ylqxzcr","1").then((re) => {
       // 处理返回的数据
@@ -555,16 +257,6 @@ export default {
       this.queryList = re.data.queryList;
       this.fromList = re.data.fromList;
     });
-    getHead("anncmntDev","1").then((re) => {
-      // 处理返回的数据
-      this.tableObj1 = re.data;
-      this.tableHeader1 = re.data.tableList;
-      this.queryList1 = re.data.queryList;
-      this.fromList1 = re.data.fromList;
-      this.getDevList();
-    });
-
-
   },
 }
 </script>
diff --git a/src/views/anno/anncmnt/ylqxzczh.vue b/src/views/anno/anncmnt/ylqxzczh.vue
index e5bec57..186c67d 100644
--- a/src/views/anno/anncmnt/ylqxzczh.vue
+++ b/src/views/anno/anncmnt/ylqxzczh.vue
@@ -169,7 +169,7 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName]}}</span>
             </template>
           </el-table-column>
         </template>
diff --git a/src/views/anno/anncmnt/ylqxzczhDialog.vue b/src/views/anno/anncmnt/ylqxzczhDialog.vue
index 5dc68af..d8df755 100644
--- a/src/views/anno/anncmnt/ylqxzczhDialog.vue
+++ b/src/views/anno/anncmnt/ylqxzczhDialog.vue
@@ -3,7 +3,7 @@
 
     <el-card>
       <div style="font-size: 15px;font-weight: bold;">公告标题
-        <el-button style="margin-left: 678px" type="primary" icon="el-icon-plus" @click="dialogTableVisible = true"
+        <el-button style="margin-left: 670px" type="primary" icon="el-icon-plus" @click="openAnno"
         >选入公告</el-button>
       </div>
       <el-form>
@@ -17,209 +17,6 @@
           </el-input>
         </el-form-item>
       </el-form>
-
-
-
-      <el-dialog title="选入公告" :visible.sync="dialogTableVisible"  append-to-body width="60%">
-        <el-card>
-          <el-form v-if="queryList1 && queryList1.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch" :inline="true">
-            <el-row style=" display:flex;  flex-wrap: wrap; ">
-              <template v-for="(item, index) in queryList1" >
-                <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
-                  <el-input
-                    v-model="filterQuery[item.columnName]"
-                    :placeholder="item.columnDesc"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
-                    clearable
-                  ></el-input>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-select v-model="filterQuery[item.columnName]"
-                             :placeholder="item.columnDesc"
-                             :disabled="executeEval(null,item.disabledFuc,false)"
-                             clearable>
-                    <el-option
-                      v-for="dict in item.lableRuleObj"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-select
-                    v-model="filterQuery[item.columnName]"
-                    :placeholder="item.columnDesc"
-                    @change="executeFuc($event,'5',item.checkRules)"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    filterable
-                    remote
-                    :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
-                    clearable>
-                    <el-option
-                      v-for="item in options[item.clickFuc]"
-                      :key="item.code"
-                      :label="item.label"
-                      :value="item.code"
-                    />
-                  </el-select>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-date-picker
-                    :picker-options="pickerOptions"
-                    v-model="actDateRange"
-                    type="daterange"
-                    format="yyyy 年 MM 月 dd 日"
-                    value-format="yyyy-MM-dd"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                  ></el-date-picker>
-                </el-form-item>
-                <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
-                  <el-date-picker
-                    v-model="filterQuery[item.columnName]"
-                    :style="`width:${item.width+'px'}`"
-                    value-format="yyyy-MM-dd"
-                    :disabled="executeEval(null,item.disabledFuc,false)"
-                    type="date"
-                    :placeholder="item.columnDesc"
-                  ></el-date-picker>
-                </el-form-item>
-              </template>
-            </el-row>
-          </el-form>
-          <div class="top-right-btn">
-            <el-button-group>
-              <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-refresh"
-                @click="onReset"
-              >重置
-              </el-button>
-              <el-button type="primary" icon="el-icon-search" @click="onSubmit"
-              >查询
-              </el-button
-              >
-              <el-button type="primary" icon="el-icon-plus" @click="confrim">选入</el-button>
-            </el-button-group>
-          </div>
-          <el-table
-            :data="list"
-            style="width: 100%"
-            border
-            highlight-current-row="true"
-            :row-class-name="tableRowClassName"
-            @current-change="handleErpChange"
-            @selection-change="handleSelectionUdiChange"
-            ref="multipleTable"
-          >
-            <el-table-column width="55">
-              <template slot-scope="scope">
-                <el-radio :label="scope.row.id" v-model="radioCheck" :disabled="scope.row.check"><span></span></el-radio>
-              </template>
-            </el-table-column>
-
-            <template v-for="(item, index) in tableHeader1">
-              <el-table-column
-                v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
-                type="index" :label="item.columnDesc"></el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'selection'"
-                type="selection"
-                :width="item.width"
-                :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
-              ></el-table-column>
-
-              <el-table-column
-                v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template  slot-scope="scope">
-                  <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template   slot-scope="scope">
-                  <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column
-                v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template   slot-scope="scope">
-                  <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                    <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
-                  </el-tag>
-                </template>
-              </el-table-column>
-              <!--<el-table-column-->
-              <!--  v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"-->
-              <!--  :prop="item.columnName"-->
-              <!--  :label="item.columnDesc"-->
-              <!--  :width="item.width"-->
-              <!--  :key="item.columnName"-->
-              <!--  fixed="right"-->
-              <!--&gt;-->
-              <!--  <template slot-scope="scope">-->
-              <!--    <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"-->
-              <!--               :type="buttonItem.type"-->
-              <!--               :size="buttonItem.size"-->
-              <!--               :style="buttonItem.style"-->
-              <!--               :key="buttonItem"-->
-              <!--               v-if="executeEval(scope.row,buttonItem.hasPermi,true)"-->
-              <!--               :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"-->
-              <!--               @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"-->
-              <!--    >{{ buttonItem.name }}-->
-              <!--    </el-button>-->
-              <!--  </template>-->
-              <!--</el-table-column>-->
-              <el-table-column
-                v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
-                :prop="item.columnName"
-                :label="item.columnDesc"
-                :sortable="item.sort"
-                :width="item.width"
-                :show-overflow-tooltip="item.tooltip"
-                :key="item.columnName"
-              >
-                <template slot-scope="scope">
-                  <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
-                </template>
-              </el-table-column>
-            </template>
-          </el-table>
-
-          <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="filterQuery.page"
-            :limit.sync="filterQuery.limit"
-            @pagination="handleCurrentChange"
-          ></pagination>
-        </el-card>
-      </el-dialog>
     </el-card>
 
     <el-card>
@@ -241,6 +38,7 @@
                       :placeholder="item.columnDesc"
                       :disabled="item.disabled"
                       @input="executeFuc($event,'5',item.clickFuc)"
+                      :autosize="{ minRows: 4, maxRows: 9}"
                     ></el-input>
                   </el-form-item>
 
@@ -333,6 +131,21 @@
         </div>
       </el-form>
     </el-card>
+
+    <el-dialog
+      :title="formAnnoName"
+      :visible.sync="anno"
+      :before-close="close"
+      width="60%"
+      v-if="anno"
+      @close='closeAnnoDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      append-to-body >
+      <announcementDialog
+        :closeAnnoDialog="closeAnnoDialog"
+        v-on:childByValue="childByValue"/>
+    </el-dialog>
   </div>
 </template>
 
@@ -343,6 +156,7 @@ import {
   getHead,executeFuc
 } from "@/utils/customConfig";
 import {list} from "@/api/anno/anncmntDev";
+import announcementDialog from "@/views/anno/anncmnt/announcementDialog";
 
 export default {
   name: "ylqxzcrDialog",
@@ -368,60 +182,13 @@ export default {
       tableObj:[],
       invList:[],
       options: {
-          getYlqxzcr:[],
+        getYlqxzcr:[],
       },
       //新增
-      dialogTableVisible:false,
       textarea:'',
       body:{},
-      tableObj1 : [],
-      tableHeader1 : [],
-      queryList1 : [],
-      fromList1 : [],
-      filterQuery: {
-        page: 1,
-        limit: 10,
-        // status:1,
-      },
-      radioCheck: null,
-      devSelection:[],
-      currentRow: null,
-      loading: false,
-      actDateRange: [],
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
-      showSearch: true,
-      list:[],
-
+      formAnnoName:'选入公告内容',
+      anno:false,
     }
   },
   methods: {
@@ -491,77 +258,18 @@ export default {
       });
       _this.inputQuery.spell = str;
     },
-    //新增
-    getDevList(){
-      this.loading = true;
-      list(this.filterQuery).then(res => {
-        if (res.code == 20000){
-          this.loading = false;
-          this.tableData = res.data
-          this.list = res.data.list || [];
-          this.total = res.data.total || 0;
-          console.log("success",this.tableData)
-        }
-      }).catch(res => {
-        this.loading = false;
-        this.list = [];
-        this.total = 0;
-      })
+    closeAnnoDialog(){
+      this.anno = false;
     },
-    hideSearch() {
-      this.showSearch = !this.showSearch;
+    childByValue(val){
+      this.textarea = val;
+      console.log("hahhahachaunzhi ",this.textarea)
     },
-    onReset() {
-      this.actDateRange = null;
-      this.filterQuery = {
-        page: 1,
-        limit: 10,
-        // status:1,
-      }
-      this.getDevList();
-    },
-    onSubmit() {
-      if (this.actDateRange !== null) {
-        this.filterQuery.startTime = this.actDateRange[0];
-        this.filterQuery.endTime = this.actDateRange[1];
-      } else {
-        this.filterQuery.startTime = null;
-        this.filterQuery.endTime = null;
-      }
-      this.filterQuery.page = 1;
-      this.getDevList();
-    },
-    confrim(){
-      // console.log("wozaici dayin yicia zhege ", this.devSelection)
-      const val = this.devSelection;
-      this.textarea = val[0].annContent
-      this.dialogTableVisible = false
-    },
-    tableRowClassName({row, rowIndex}) {
-      if (row.check) return "warning-row";
-      return "";
-    },
-    handleErpChange(val) {
-      // console.log("dianjij handleErpChange",val)
-      if (!val.check) {
-        this.radioCheck = val.id;
-        // this.cpmctymc1 = val.cpmctymc;
-        this.currentRow = val;
-        this.$refs.multipleTable.clearSelection();
-        this.$refs.multipleTable.toggleRowSelection(val);
-      }
-    },
-    handleSelectionUdiChange(val) {
-      // console.log("dayin dayin handleSelectionUdiChange ",val)
-      this.devSelection = val;
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val.page;
-      this.getDevList();
+    openAnno(){
+      this.anno = true;announcementDialog
     },
-
   },
-  components: {},
+  components: {announcementDialog},
   created() {
     getHead("ylqxzczh","1").then((re) => {
       // 处理返回的数据
@@ -571,14 +279,6 @@ export default {
       this.fromList = re.data.fromList;
     });
     this.getYlqxzcr(this);
-    getHead("anncmntDev","1").then((re) => {
-      // 处理返回的数据
-      this.tableObj1 = re.data;
-      this.tableHeader1 = re.data.tableList;
-      this.queryList1 = re.data.queryList;
-      this.fromList1 = re.data.fromList;
-      this.getDevList();
-    });
   },
 }
 </script>