From 5af478b9c78e76af3c028154c4ee2d6da558bdca Mon Sep 17 00:00:00 2001
From: yuanwei <362142050@qq.com>
Date: Sun, 14 Jan 2024 22:32:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/anno/anncmntManu.js                   |  32 +
 src/api/anno/anncmntManuCert.js               |  32 +
 src/api/anno/anncmntProduct.js                |  32 +
 src/api/anno/anncmntProductBatch.js           |  32 +
 src/api/anno/anncmntYlqxzcr.js                |  32 +
 src/api/anno/anncmntYlqxzczh.js               |  32 +
 .../{anncmntDev/index.vue => anncmnt/dev.vue} |   2 +-
 .../indexDialog.vue => anncmnt/devDialog.vue} |   0
 src/views/anno/anncmnt/manu.vue               | 588 ++++++++++++++++++
 src/views/anno/anncmnt/manuCertDialog.vue     | 228 +++++++
 src/views/anno/anncmnt/manuDialog.vue         | 228 +++++++
 src/views/anno/anncmnt/product.vue            | 588 ++++++++++++++++++
 src/views/anno/anncmnt/productCertDialog.vue  | 228 +++++++
 src/views/anno/anncmnt/productDialog.vue      | 228 +++++++
 src/views/anno/anncmnt/ylqxzcr.vue            | 366 +++++++++++
 src/views/anno/anncmnt/ylqxzcrDialog.vue      | 216 +++++++
 src/views/anno/anncmnt/ylqxzczh.vue           | 366 +++++++++++
 src/views/anno/anncmnt/ylqxzczhDialog.vue     | 228 +++++++
 18 files changed, 3457 insertions(+), 1 deletion(-)
 create mode 100644 src/api/anno/anncmntManu.js
 create mode 100644 src/api/anno/anncmntManuCert.js
 create mode 100644 src/api/anno/anncmntProduct.js
 create mode 100644 src/api/anno/anncmntProductBatch.js
 create mode 100644 src/api/anno/anncmntYlqxzcr.js
 create mode 100644 src/api/anno/anncmntYlqxzczh.js
 rename src/views/anno/{anncmntDev/index.vue => anncmnt/dev.vue} (99%)
 rename src/views/anno/{anncmntDev/indexDialog.vue => anncmnt/devDialog.vue} (100%)
 create mode 100644 src/views/anno/anncmnt/manu.vue
 create mode 100644 src/views/anno/anncmnt/manuCertDialog.vue
 create mode 100644 src/views/anno/anncmnt/manuDialog.vue
 create mode 100644 src/views/anno/anncmnt/product.vue
 create mode 100644 src/views/anno/anncmnt/productCertDialog.vue
 create mode 100644 src/views/anno/anncmnt/productDialog.vue
 create mode 100644 src/views/anno/anncmnt/ylqxzcr.vue
 create mode 100644 src/views/anno/anncmnt/ylqxzcrDialog.vue
 create mode 100644 src/views/anno/anncmnt/ylqxzczh.vue
 create mode 100644 src/views/anno/anncmnt/ylqxzczhDialog.vue

diff --git a/src/api/anno/anncmntManu.js b/src/api/anno/anncmntManu.js
new file mode 100644
index 0000000..d2878dd
--- /dev/null
+++ b/src/api/anno/anncmntManu.js
@@ -0,0 +1,32 @@
+import axios from "@/utils/request";
+
+export function list(query) {
+  return axios({
+    url: "/anno/anncmnt/manu/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function savegg(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/anno/anncmnt/manu/save"
+      : "/anno/anncmnt/manu/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deletegg(data) {
+  return axios({
+    url: "/anno/anncmnt/manu/delete",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/anno/anncmntManuCert.js b/src/api/anno/anncmntManuCert.js
new file mode 100644
index 0000000..cc8e7bd
--- /dev/null
+++ b/src/api/anno/anncmntManuCert.js
@@ -0,0 +1,32 @@
+import axios from "@/utils/request";
+
+export function listCert(query) {
+  return axios({
+    url: "/anno/anncmnt/manu/cert/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function saveCert(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/anno/anncmnt/manu/cert/save"
+      : "/anno/anncmnt/manu/cert/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deleteCert(data) {
+  return axios({
+    url: "/anno/anncmnt/manu/cert/delete",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/anno/anncmntProduct.js b/src/api/anno/anncmntProduct.js
new file mode 100644
index 0000000..997f7ef
--- /dev/null
+++ b/src/api/anno/anncmntProduct.js
@@ -0,0 +1,32 @@
+import axios from "@/utils/request";
+
+export function list(query) {
+  return axios({
+    url: "/anno/anncmnt/product/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function savegg(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/anno/anncmnt/product/save"
+      : "/anno/anncmnt/product/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deletegg(data) {
+  return axios({
+    url: "/anno/anncmnt/product/delete",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/anno/anncmntProductBatch.js b/src/api/anno/anncmntProductBatch.js
new file mode 100644
index 0000000..2cbe379
--- /dev/null
+++ b/src/api/anno/anncmntProductBatch.js
@@ -0,0 +1,32 @@
+import axios from "@/utils/request";
+
+export function listCert(query) {
+  return axios({
+    url: "/anno/anncmnt/product/batch/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function saveCert(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/anno/anncmnt/product/batch/save"
+      : "/anno/anncmnt/product/batch/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deleteCert(data) {
+  return axios({
+    url: "/anno/anncmnt/product/batch/delete",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/anno/anncmntYlqxzcr.js b/src/api/anno/anncmntYlqxzcr.js
new file mode 100644
index 0000000..3709b81
--- /dev/null
+++ b/src/api/anno/anncmntYlqxzcr.js
@@ -0,0 +1,32 @@
+import axios from "@/utils/request";
+
+export function list(query) {
+  return axios({
+    url: "/anno/anncmnt/ylqxzcr/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function savegg(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/anno/anncmnt/ylqxzcr/save"
+      : "/anno/anncmnt/ylqxzcr/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deletegg(data) {
+  return axios({
+    url: "/anno/anncmnt/ylqxzcr/delete",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/anno/anncmntYlqxzczh.js b/src/api/anno/anncmntYlqxzczh.js
new file mode 100644
index 0000000..b6ff310
--- /dev/null
+++ b/src/api/anno/anncmntYlqxzczh.js
@@ -0,0 +1,32 @@
+import axios from "@/utils/request";
+
+export function list(query) {
+  return axios({
+    url: "/anno/anncmnt/ylqxzczh/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function savegg(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/anno/anncmnt/ylqxzczh/save"
+      : "/anno/anncmnt/ylqxzczh/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deletegg(data) {
+  return axios({
+    url: "/anno/anncmnt/ylqxzczh/delete",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/views/anno/anncmntDev/index.vue b/src/views/anno/anncmnt/dev.vue
similarity index 99%
rename from src/views/anno/anncmntDev/index.vue
rename to src/views/anno/anncmnt/dev.vue
index 6c27f96..20d89a5 100644
--- a/src/views/anno/anncmntDev/index.vue
+++ b/src/views/anno/anncmnt/dev.vue
@@ -208,7 +208,7 @@
 
 
 <script>
-import indexDialog from "@/views/anno/anncmntDev/indexDialog";
+import indexDialog from "@/views/anno/anncmnt/devDialog";
 import {deletegg, list} from "@/api/anno/anncmntDev";
 import {
   getHead,executeFuc
diff --git a/src/views/anno/anncmntDev/indexDialog.vue b/src/views/anno/anncmnt/devDialog.vue
similarity index 100%
rename from src/views/anno/anncmntDev/indexDialog.vue
rename to src/views/anno/anncmnt/devDialog.vue
diff --git a/src/views/anno/anncmnt/manu.vue b/src/views/anno/anncmnt/manu.vue
new file mode 100644
index 0000000..94d6caa
--- /dev/null
+++ b/src/views/anno/anncmnt/manu.vue
@@ -0,0 +1,588 @@
+<template>
+  <div>
+    <el-card>
+      <el-form v-if="queryList && queryList.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 queryList" >
+            <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="(event) => addOrderMuti()">新增</el-button>
+        </el-button-group>
+      </div>
+      <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row
+                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)">
+      >
+        <template v-for="(item, index) in tableHeader">
+          <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"
+          >
+            <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-card class="el-card">
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button type="primary" icon="el-icon-refresh" @click="addCertMuti">新增注册/备案证</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loadCertLoading" :data="manuCertList" style="width: 100%" ref="table"
+                highlight-current-row border >
+        <template v-for="(item, index) in tableHeader2">
+          <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"
+          >
+            <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="manuCertTotal>0"
+        :total="manuCertTotal"
+        :page.sync="filterCertQuery.page"
+        :limit.sync="filterCertQuery.limit"
+        @pagination="handleCertChange"
+
+      ></pagination>
+
+
+    </el-card>
+
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="orderMutiSetVisible"
+      :before-close="close"
+      width="60%"
+      v-if="orderMutiSetVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <indexDialog
+        :closeDialog="closeDialog"
+        :inputQuery="inputQuery"
+        :formName="formName"
+      ></indexDialog>
+    </el-dialog>
+
+
+    <el-dialog
+      :title="formCertMap[formCertName]"
+      :visible.sync="manuCertDialogVisible"
+      :before-close="close"
+      width="60%"
+      v-if="manuCertDialogVisible"
+      @close='closeCertDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <manuCertDialog
+        :closeDialog="closeCertDialog"
+        :inputQuery="inputCertQuery"
+        :formName="formCertName"
+      ></manuCertDialog>
+    </el-dialog>
+
+  </div>
+</template>
+
+
+
+<script>
+import indexDialog from "@/views/anno/anncmnt/manuDialog";
+import manuCertDialog from "@/views/anno/anncmnt/manuCertDialog";
+import {deletegg, list} from "@/api/anno/anncmntManu";
+import {deletCert, listCert} from "@/api/anno/anncmntManuCert";
+import {executeFuc, getHead} from "@/utils/customConfig";
+
+export default {
+  name: "anncmntDev",
+  data() {
+    return {
+        showSearch: true,
+      filterQuery: {
+        page: 1,
+        limit: 10,
+      },
+      total: 0,
+      loading: false,
+      list: [],
+      formName: 1,
+      formMap: {
+        1: "新增生产企业",
+        2: "编辑生产企业",
+      },
+      inputQuery:{},
+      orderMutiSetVisible: false,
+
+      formCertName: 1,
+      formCertMap: {
+        1: "新增生产企业明细",
+        2: "编辑生产企业明细",
+      },
+      inputCertQuery:{},
+      manuCertDialogVisible: false,
+      manuCertList: [],
+      loadCertLoading: false,
+      manuCertTotal: 0,
+      filterCertQuery: {
+        page: 1,
+        limit: 10,
+      },
+      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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    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.getList();
+    },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    onCertReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterCertQuery = {
+        page: 1,
+        limit: 10,
+      };
+      this.getCertList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleCertChange(val) {
+      this.filterCertQuery.page = val.page;
+      this.getManufacturerList();
+    },
+    closeDialog(){
+      this.orderMutiSetVisible = false;
+      this.getList();
+    },
+    addOrderMuti(){
+      this.inputQuery={
+
+      }
+      this.formName=1;
+      this.orderMutiSetVisible = true;
+    },
+    editDialog(_this,row){
+      _this.formName=2;
+      _this.inputQuery=row;
+      _this.orderMutiSetVisible = true;
+    },
+    closeCertDialog(){
+      this.manuCertDialogVisible = false;
+      this.getCertList();
+    },
+    addCertMuti(){
+      this.inputCertQuery={
+
+      }
+      this.formCertName=1;
+      this.manuCertDialogVisible = true;
+    },
+    editCertDialog(_this,row){
+      _this.formCertName=2;
+      _this.inputCertQuery=row;
+      _this.manuCertDialogVisible = true;
+    },
+    supCertClick(_this,row) {
+      _this.onCertReset();
+    },
+    getList() {
+      this.loading = true;
+      list(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+    deleteDialog(_this,row) {
+      deletegg(row)
+        .then((response) => {
+          if(response.code == 20000){
+            _this.getList()
+          }else{
+            _this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          _this.$message.error(response.message);
+        });
+    },
+
+    getCertList() {
+      this.loadCertLoading = true;
+      listCert(this.filterCertQuery)
+        .then((response) => {
+          this.loadCertLoading = false;
+          this.manuCertList = response.data.list || [];
+          this.manuCertTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.filterCertQuery = false;
+          this.manuCertList = [];
+          this.manuCertTotal = 0;
+        });
+    },
+
+    deleteCertDialog(_this,row) {
+      deletCert(row)
+        .then((response) => {
+          if(response.code == 20000){
+            _this.getCertList()
+          }else{
+            _this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          _this.$message.error(response.message);
+        });
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  components: {indexDialog,manuCertDialog},
+  created() {
+     getHead("manu-1","1").then((re) => {
+       // 处理返回的数据
+       this.tableObj = re.data;
+       this.tableHeader = re.data.tableList;
+       this.queryList = re.data.queryList;
+       this.fromList = re.data.fromList;
+       this.getList()
+     });
+
+
+    getHead("manu-2","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/anno/anncmnt/manuCertDialog.vue b/src/views/anno/anncmnt/manuCertDialog.vue
new file mode 100644
index 0000000..5c5eb61
--- /dev/null
+++ b/src/views/anno/anncmnt/manuCertDialog.vue
@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+        <template v-for="(itemRow, indexRow) in fromList">
+          <el-row :gutter="20" class="el-row" type="flex">
+            <template v-for="(item, index) in itemRow.list">
+              <el-col :span="item.width" class="el-col" type="flex">
+                <div class="text item">
+                  <el-form-item v-if="item.columnType =='input'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-input
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      :size="item.size"
+                      :type="item.inputType"
+                      :placeholder="item.columnDesc"
+                      :disabled="item.disabled"
+                      @input="executeFuc($event,'5',item.clickFuc)"
+                    ></el-input>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='radio'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-radio-group :style="item.style" v-model="inputQuery[item.columnName]">
+                      <el-radio
+                        v-for="dict in item.lableRuleObj"
+                        :key="parseInt(dict.value)"
+                        :label="parseInt(dict.value)"
+                        :disabled="item.disabled"
+                      >{{dict.label}}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='select'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select v-model="inputQuery[item.columnName]" :style="item.style">
+                      <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'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select
+                      v-model="inputQuery[item.columnName]"
+                      :placeholder="item.columnDesc"
+                      @change="executeFuc($event,'5',item.clickFuc)"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
+                      filterable
+                      remote
+                      :remote-method="(query) => executeFuc(query,'5',item.dataFuc)"
+                      clearable>
+                      <el-option
+                        v-for="item in options[item.dataFuc]"
+                        :key="item.code"
+                        :label="item.label"
+                        :value="item.code"
+                      >
+                        <span style="float: left">{{ item.label }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{
+                            item.code
+                          }}</span>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='date'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd"
+                      type="date"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='datetime'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <treeselect
+                      v-model="inputQuery[item.columnName]"
+                      :options="menuOptions"
+                      :normalizer="normalizer"
+                      :show-count="true"
+                      :placeholder="item.columnName"
+                    />
+                  </el-form-item>
+                </div>
+              </el-col>
+            </template>
+          </el-row>
+        </template>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button  @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="submitInv">提交</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {saveCert} from "@/api/anno/anncmntManuCert";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "ylqxzcrDialog",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableObj:[],
+      invList:[],
+      options: {
+
+      }
+    }
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        saveCert(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        saveCert(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    change(_this) {
+      var pinyin = require("pinyin");
+      var py = pinyin(_this.inputQuery.name, {
+        style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+        heteronym: true,
+      });
+      var str = "";
+      py.forEach((item) => {
+        str = str + item[0];
+      });
+      _this.inputQuery.spell = str;
+    },
+  },
+  components: {},
+  created() {
+    getHead("manu-2","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/anno/anncmnt/manuDialog.vue b/src/views/anno/anncmnt/manuDialog.vue
new file mode 100644
index 0000000..31d8af0
--- /dev/null
+++ b/src/views/anno/anncmnt/manuDialog.vue
@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+        <template v-for="(itemRow, indexRow) in fromList">
+          <el-row :gutter="20" class="el-row" type="flex">
+            <template v-for="(item, index) in itemRow.list">
+              <el-col :span="item.width" class="el-col" type="flex">
+                <div class="text item">
+                  <el-form-item v-if="item.columnType =='input'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-input
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      :size="item.size"
+                      :type="item.inputType"
+                      :placeholder="item.columnDesc"
+                      :disabled="item.disabled"
+                      @input="executeFuc($event,'5',item.clickFuc)"
+                    ></el-input>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='radio'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-radio-group :style="item.style" v-model="inputQuery[item.columnName]">
+                      <el-radio
+                        v-for="dict in item.lableRuleObj"
+                        :key="parseInt(dict.value)"
+                        :label="parseInt(dict.value)"
+                        :disabled="item.disabled"
+                      >{{dict.label}}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='select'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select v-model="inputQuery[item.columnName]" :style="item.style">
+                      <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'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select
+                      v-model="inputQuery[item.columnName]"
+                      :placeholder="item.columnDesc"
+                      @change="executeFuc($event,'5',item.clickFuc)"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
+                      filterable
+                      remote
+                      :remote-method="(query) => executeFuc(query,'5',item.dataFuc)"
+                      clearable>
+                      <el-option
+                        v-for="item in options[item.dataFuc]"
+                        :key="item.code"
+                        :label="item.label"
+                        :value="item.code"
+                      >
+                        <span style="float: left">{{ item.label }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{
+                            item.code
+                          }}</span>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='date'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd"
+                      type="date"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='datetime'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <treeselect
+                      v-model="inputQuery[item.columnName]"
+                      :options="menuOptions"
+                      :normalizer="normalizer"
+                      :show-count="true"
+                      :placeholder="item.columnName"
+                    />
+                  </el-form-item>
+                </div>
+              </el-col>
+            </template>
+          </el-row>
+        </template>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button  @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="submitInv">提交</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {savegg} from "@/api/anno/anncmntManu";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "ylqxzcrDialog",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableObj:[],
+      invList:[],
+      options: {
+
+      }
+    }
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        savegg(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        savegg(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    change(_this) {
+      var pinyin = require("pinyin");
+      var py = pinyin(_this.inputQuery.name, {
+        style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+        heteronym: true,
+      });
+      var str = "";
+      py.forEach((item) => {
+        str = str + item[0];
+      });
+      _this.inputQuery.spell = str;
+    },
+  },
+  components: {},
+  created() {
+    getHead("manu-1","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/anno/anncmnt/product.vue b/src/views/anno/anncmnt/product.vue
new file mode 100644
index 0000000..8bf4076
--- /dev/null
+++ b/src/views/anno/anncmnt/product.vue
@@ -0,0 +1,588 @@
+<template>
+  <div>
+    <el-card>
+      <el-form v-if="queryList && queryList.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 queryList" >
+            <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="(event) => addOrderMuti()">新增</el-button>
+        </el-button-group>
+      </div>
+      <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row
+                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)">
+      >
+        <template v-for="(item, index) in tableHeader">
+          <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"
+          >
+            <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-card class="el-card">
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <el-button type="primary" icon="el-icon-refresh" @click="addCertMuti">新增注册/备案证</el-button>
+        </el-button-group>
+      </div>
+
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loadCertLoading" :data="manuCertList" style="width: 100%" ref="table"
+                highlight-current-row border >
+        <template v-for="(item, index) in tableHeader2">
+          <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"
+          >
+            <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="manuCertTotal>0"
+        :total="manuCertTotal"
+        :page.sync="filterCertQuery.page"
+        :limit.sync="filterCertQuery.limit"
+        @pagination="handleCertChange"
+
+      ></pagination>
+
+
+    </el-card>
+
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="orderMutiSetVisible"
+      :before-close="close"
+      width="60%"
+      v-if="orderMutiSetVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <indexDialog
+        :closeDialog="closeDialog"
+        :inputQuery="inputQuery"
+        :formName="formName"
+      ></indexDialog>
+    </el-dialog>
+
+
+    <el-dialog
+      :title="formCertMap[formCertName]"
+      :visible.sync="manuCertDialogVisible"
+      :before-close="close"
+      width="60%"
+      v-if="manuCertDialogVisible"
+      @close='closeCertDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <manuCertDialog
+        :closeDialog="closeCertDialog"
+        :inputQuery="inputCertQuery"
+        :formName="formCertName"
+      ></manuCertDialog>
+    </el-dialog>
+
+  </div>
+</template>
+
+
+
+<script>
+import indexDialog from "@/views/anno/anncmnt/productDialog";
+import manuCertDialog from "@/views/anno/anncmnt/productCertDialog";
+import {deletegg, list} from "@/api/anno/anncmntProduct";
+import {deletCert, listCert} from "@/api/anno/anncmntProductBatch";
+import {executeFuc, getHead} from "@/utils/customConfig";
+
+export default {
+  name: "anncmntDev",
+  data() {
+    return {
+        showSearch: true,
+      filterQuery: {
+        page: 1,
+        limit: 10,
+      },
+      total: 0,
+      loading: false,
+      list: [],
+      formName: 1,
+      formMap: {
+        1: "新增产品信息",
+        2: "编辑产品信息",
+      },
+      inputQuery:{},
+      orderMutiSetVisible: false,
+
+      formCertName: 1,
+      formCertMap: {
+        1: "新增产品信息明细",
+        2: "编辑产品信息明细",
+      },
+      inputCertQuery:{},
+      manuCertDialogVisible: false,
+      manuCertList: [],
+      loadCertLoading: false,
+      manuCertTotal: 0,
+      filterCertQuery: {
+        page: 1,
+        limit: 10,
+      },
+      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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    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.getList();
+    },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    onCertReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterCertQuery = {
+        page: 1,
+        limit: 10,
+      };
+      this.getCertList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleCertChange(val) {
+      this.filterCertQuery.page = val.page;
+      this.getManufacturerList();
+    },
+    closeDialog(){
+      this.orderMutiSetVisible = false;
+      this.getList();
+    },
+    addOrderMuti(){
+      this.inputQuery={
+
+      }
+      this.formName=1;
+      this.orderMutiSetVisible = true;
+    },
+    editDialog(_this,row){
+      _this.formName=2;
+      _this.inputQuery=row;
+      _this.orderMutiSetVisible = true;
+    },
+    closeCertDialog(){
+      this.manuCertDialogVisible = false;
+      this.getCertList();
+    },
+    addCertMuti(){
+      this.inputCertQuery={
+
+      }
+      this.formCertName=1;
+      this.manuCertDialogVisible = true;
+    },
+    editCertDialog(_this,row){
+      _this.formCertName=2;
+      _this.inputCertQuery=row;
+      _this.manuCertDialogVisible = true;
+    },
+    supCertClick(_this,row) {
+      _this.onCertReset();
+    },
+    getList() {
+      this.loading = true;
+      list(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+    deleteDialog(_this,row) {
+      deletegg(row)
+        .then((response) => {
+          if(response.code == 20000){
+            _this.getList()
+          }else{
+            _this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          _this.$message.error(response.message);
+        });
+    },
+
+    getCertList() {
+      this.loadCertLoading = true;
+      listCert(this.filterCertQuery)
+        .then((response) => {
+          this.loadCertLoading = false;
+          this.manuCertList = response.data.list || [];
+          this.manuCertTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.filterCertQuery = false;
+          this.manuCertList = [];
+          this.manuCertTotal = 0;
+        });
+    },
+
+    deleteCertDialog(_this,row) {
+      deletCert(row)
+        .then((response) => {
+          if(response.code == 20000){
+            _this.getCertList()
+          }else{
+            _this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          _this.$message.error(response.message);
+        });
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  components: {indexDialog,manuCertDialog},
+  created() {
+     getHead("product-1","1").then((re) => {
+       // 处理返回的数据
+       this.tableObj = re.data;
+       this.tableHeader = re.data.tableList;
+       this.queryList = re.data.queryList;
+       this.fromList = re.data.fromList;
+       this.getList()
+     });
+
+
+    getHead("product-2","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/anno/anncmnt/productCertDialog.vue b/src/views/anno/anncmnt/productCertDialog.vue
new file mode 100644
index 0000000..03300c7
--- /dev/null
+++ b/src/views/anno/anncmnt/productCertDialog.vue
@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+        <template v-for="(itemRow, indexRow) in fromList">
+          <el-row :gutter="20" class="el-row" type="flex">
+            <template v-for="(item, index) in itemRow.list">
+              <el-col :span="item.width" class="el-col" type="flex">
+                <div class="text item">
+                  <el-form-item v-if="item.columnType =='input'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-input
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      :size="item.size"
+                      :type="item.inputType"
+                      :placeholder="item.columnDesc"
+                      :disabled="item.disabled"
+                      @input="executeFuc($event,'5',item.clickFuc)"
+                    ></el-input>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='radio'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-radio-group :style="item.style" v-model="inputQuery[item.columnName]">
+                      <el-radio
+                        v-for="dict in item.lableRuleObj"
+                        :key="parseInt(dict.value)"
+                        :label="parseInt(dict.value)"
+                        :disabled="item.disabled"
+                      >{{dict.label}}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='select'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select v-model="inputQuery[item.columnName]" :style="item.style">
+                      <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'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select
+                      v-model="inputQuery[item.columnName]"
+                      :placeholder="item.columnDesc"
+                      @change="executeFuc($event,'5',item.clickFuc)"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
+                      filterable
+                      remote
+                      :remote-method="(query) => executeFuc(query,'5',item.dataFuc)"
+                      clearable>
+                      <el-option
+                        v-for="item in options[item.dataFuc]"
+                        :key="item.code"
+                        :label="item.label"
+                        :value="item.code"
+                      >
+                        <span style="float: left">{{ item.label }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{
+                            item.code
+                          }}</span>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='date'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd"
+                      type="date"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='datetime'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <treeselect
+                      v-model="inputQuery[item.columnName]"
+                      :options="menuOptions"
+                      :normalizer="normalizer"
+                      :show-count="true"
+                      :placeholder="item.columnName"
+                    />
+                  </el-form-item>
+                </div>
+              </el-col>
+            </template>
+          </el-row>
+        </template>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button  @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="submitInv">提交</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {saveCert} from "@/api/anno/anncmntProductBatch";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "ylqxzcrDialog",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableObj:[],
+      invList:[],
+      options: {
+
+      }
+    }
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        saveCert(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        saveCert(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    change(_this) {
+      var pinyin = require("pinyin");
+      var py = pinyin(_this.inputQuery.name, {
+        style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+        heteronym: true,
+      });
+      var str = "";
+      py.forEach((item) => {
+        str = str + item[0];
+      });
+      _this.inputQuery.spell = str;
+    },
+  },
+  components: {},
+  created() {
+    getHead("product-2","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/anno/anncmnt/productDialog.vue b/src/views/anno/anncmnt/productDialog.vue
new file mode 100644
index 0000000..ed78046
--- /dev/null
+++ b/src/views/anno/anncmnt/productDialog.vue
@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+        <template v-for="(itemRow, indexRow) in fromList">
+          <el-row :gutter="20" class="el-row" type="flex">
+            <template v-for="(item, index) in itemRow.list">
+              <el-col :span="item.width" class="el-col" type="flex">
+                <div class="text item">
+                  <el-form-item v-if="item.columnType =='input'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-input
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      :size="item.size"
+                      :type="item.inputType"
+                      :placeholder="item.columnDesc"
+                      :disabled="item.disabled"
+                      @input="executeFuc($event,'5',item.clickFuc)"
+                    ></el-input>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='radio'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-radio-group :style="item.style" v-model="inputQuery[item.columnName]">
+                      <el-radio
+                        v-for="dict in item.lableRuleObj"
+                        :key="parseInt(dict.value)"
+                        :label="parseInt(dict.value)"
+                        :disabled="item.disabled"
+                      >{{dict.label}}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='select'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select v-model="inputQuery[item.columnName]" :style="item.style">
+                      <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'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select
+                      v-model="inputQuery[item.columnName]"
+                      :placeholder="item.columnDesc"
+                      @change="executeFuc($event,'5',item.clickFuc)"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
+                      filterable
+                      remote
+                      :remote-method="(query) => executeFuc(query,'5',item.dataFuc)"
+                      clearable>
+                      <el-option
+                        v-for="item in options[item.dataFuc]"
+                        :key="item.code"
+                        :label="item.label"
+                        :value="item.code"
+                      >
+                        <span style="float: left">{{ item.label }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{
+                            item.code
+                          }}</span>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='date'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd"
+                      type="date"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='datetime'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <treeselect
+                      v-model="inputQuery[item.columnName]"
+                      :options="menuOptions"
+                      :normalizer="normalizer"
+                      :show-count="true"
+                      :placeholder="item.columnName"
+                    />
+                  </el-form-item>
+                </div>
+              </el-col>
+            </template>
+          </el-row>
+        </template>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button  @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="submitInv">提交</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {savegg} from "@/api/anno/anncmntProduct";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "ylqxzcrDialog",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableObj:[],
+      invList:[],
+      options: {
+
+      }
+    }
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        savegg(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        savegg(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    change(_this) {
+      var pinyin = require("pinyin");
+      var py = pinyin(_this.inputQuery.name, {
+        style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+        heteronym: true,
+      });
+      var str = "";
+      py.forEach((item) => {
+        str = str + item[0];
+      });
+      _this.inputQuery.spell = str;
+    },
+  },
+  components: {},
+  created() {
+    getHead("product-1","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/anno/anncmnt/ylqxzcr.vue b/src/views/anno/anncmnt/ylqxzcr.vue
new file mode 100644
index 0000000..ca308ed
--- /dev/null
+++ b/src/views/anno/anncmnt/ylqxzcr.vue
@@ -0,0 +1,366 @@
+<template>
+  <div>
+    <el-card>
+      <el-form v-if="queryList && queryList.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 queryList" >
+            <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="(event) => addOrderMuti()">新增</el-button>
+        </el-button-group>
+      </div>
+      <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row>
+        <template v-for="(item, index) in tableHeader">
+          <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"
+          >
+            <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
+      :title="formMap[formName]"
+      :visible.sync="orderMutiSetVisible"
+      :before-close="close"
+      width="60%"
+      v-if="orderMutiSetVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <indexDialog
+        :closeDialog="closeDialog"
+        :inputQuery="inputQuery"
+        :formName="formName"
+      ></indexDialog>
+    </el-dialog>
+
+  </div>
+</template>
+
+
+
+<script>
+import indexDialog from "@/views/anno/anncmnt/ylqxzcrDialog";
+import {deletegg, list} from "@/api/anno/anncmntYlqxzcr";
+import {executeFuc, getHead} from "@/utils/customConfig";
+
+export default {
+  name: "anncmntDev",
+  data() {
+    return {
+        showSearch: true,
+      filterQuery: {
+        page: 1,
+        limit: 10,
+      },
+      total: 0,
+      loading: false,
+      list: [],
+      formName: 1,
+      formMap: {
+        1: "新增医疗器械注册人",
+        2: "编辑医疗器械注册人",
+      },
+      inputQuery:{},
+      orderMutiSetVisible: 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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    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.getList();
+    },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    closeDialog(){
+      this.orderMutiSetVisible = false;
+      this.getList();
+    },
+    addOrderMuti(){
+      this.inputQuery={
+
+      }
+      this.formName=1;
+      this.orderMutiSetVisible = true;
+    },
+    editDialog(_this,row){
+      _this.formName=2;
+      _this.inputQuery=row;
+      _this.orderMutiSetVisible = true;
+    },
+    getList() {
+      this.loading = true;
+      list(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteDialog(_this,row) {
+      deletegg(row)
+        .then((response) => {
+          if(response.code == 20000){
+            _this.getList()
+          }else{
+            _this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          _this.$message.error(response.message);
+        });
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  components: {indexDialog},
+  created() {
+     getHead("ylqxzcr","1").then((re) => {
+       // 处理返回的数据
+       this.tableObj = re.data;
+       this.tableHeader = re.data.tableList;
+       this.queryList = re.data.queryList;
+       this.fromList = re.data.fromList;
+       this.getList()
+     });
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/anno/anncmnt/ylqxzcrDialog.vue b/src/views/anno/anncmnt/ylqxzcrDialog.vue
new file mode 100644
index 0000000..38a6add
--- /dev/null
+++ b/src/views/anno/anncmnt/ylqxzcrDialog.vue
@@ -0,0 +1,216 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+        <template v-for="(itemRow, indexRow) in fromList">
+          <el-row :gutter="20" class="el-row" type="flex">
+            <template v-for="(item, index) in itemRow.list">
+              <el-col :span="item.width" class="el-col" type="flex">
+                <div class="text item">
+                  <el-form-item v-if="item.columnType =='input'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-input
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      :size="item.size"
+                      :type="item.inputType"
+                      :placeholder="item.columnDesc"
+                      :disabled="item.disabled"
+                      @input="executeFuc($event,'5',item.clickFuc)"
+                    ></el-input>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='radio'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-radio-group :style="item.style" v-model="inputQuery[item.columnName]">
+                      <el-radio
+                        v-for="dict in item.lableRuleObj"
+                        :key="parseInt(dict.value)"
+                        :label="parseInt(dict.value)"
+                        :disabled="item.disabled"
+                      >{{dict.label}}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='select'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select v-model="inputQuery[item.columnName]" :style="item.style">
+                      <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'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select
+                      v-model="inputQuery[item.columnName]"
+                      :placeholder="item.columnDesc"
+                      @change="executeFuc($event,'5',item.clickFuc)"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
+                      filterable
+                      remote
+                      :remote-method="(query) => executeFuc(query,'5',item.dataFuc)"
+                      clearable>
+                      <el-option
+                        v-for="item in options[item.dataFuc]"
+                        :key="item.code"
+                        :label="item.label"
+                        :value="item.code"
+                      >
+                        <span style="float: left">{{ item.label }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{
+                            item.code
+                          }}</span>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='date'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <treeselect
+                      v-model="inputQuery[item.columnName]"
+                      :options="menuOptions"
+                      :normalizer="normalizer"
+                      :show-count="true"
+                      :placeholder="item.columnName"
+                    />
+                  </el-form-item>
+                </div>
+              </el-col>
+            </template>
+          </el-row>
+        </template>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button  @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="submitInv">提交</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {savegg} from "@/api/anno/anncmntYlqxzcr";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "ylqxzcrDialog",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableObj:[],
+      invList:[],
+      options: {
+
+      }
+    }
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        savegg(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        savegg(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    change(_this) {
+      var pinyin = require("pinyin");
+      var py = pinyin(_this.inputQuery.name, {
+        style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+        heteronym: true,
+      });
+      var str = "";
+      py.forEach((item) => {
+        str = str + item[0];
+      });
+      _this.inputQuery.spell = str;
+    },
+  },
+  components: {},
+  created() {
+    getHead("ylqxzcr","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/anno/anncmnt/ylqxzczh.vue b/src/views/anno/anncmnt/ylqxzczh.vue
new file mode 100644
index 0000000..ae312d2
--- /dev/null
+++ b/src/views/anno/anncmnt/ylqxzczh.vue
@@ -0,0 +1,366 @@
+<template>
+  <div>
+    <el-card>
+      <el-form v-if="queryList && queryList.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 queryList" >
+            <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="(event) => addOrderMuti()">新增</el-button>
+        </el-button-group>
+      </div>
+      <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row>
+        <template v-for="(item, index) in tableHeader">
+          <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"
+          >
+            <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
+      :title="formMap[formName]"
+      :visible.sync="orderMutiSetVisible"
+      :before-close="close"
+      width="60%"
+      v-if="orderMutiSetVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <indexDialog
+        :closeDialog="closeDialog"
+        :inputQuery="inputQuery"
+        :formName="formName"
+      ></indexDialog>
+    </el-dialog>
+
+  </div>
+</template>
+
+
+
+<script>
+import indexDialog from "@/views/anno/anncmnt/ylqxzczhDialog";
+import {deletegg, list} from "@/api/anno/anncmntYlqxzczh";
+import {executeFuc, getHead} from "@/utils/customConfig";
+
+export default {
+  name: "anncmntDev",
+  data() {
+    return {
+        showSearch: true,
+      filterQuery: {
+        page: 1,
+        limit: 10,
+      },
+      total: 0,
+      loading: false,
+      list: [],
+      formName: 1,
+      formMap: {
+        1: "新增注册备案证",
+        2: "编辑注册备案证",
+      },
+      inputQuery:{},
+      orderMutiSetVisible: 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]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    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.getList();
+    },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    closeDialog(){
+      this.orderMutiSetVisible = false;
+      this.getList();
+    },
+    addOrderMuti(){
+      this.inputQuery={
+
+      }
+      this.formName=1;
+      this.orderMutiSetVisible = true;
+    },
+    editDialog(_this,row){
+      _this.formName=2;
+      _this.inputQuery=row;
+      _this.orderMutiSetVisible = true;
+    },
+    getList() {
+      this.loading = true;
+      list(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteDialog(_this,row) {
+      deletegg(row)
+        .then((response) => {
+          if(response.code == 20000){
+            _this.getList()
+          }else{
+            _this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          _this.$message.error(response.message);
+        });
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  components: {indexDialog},
+  created() {
+     getHead("ylqxzczh","1").then((re) => {
+       // 处理返回的数据
+       this.tableObj = re.data;
+       this.tableHeader = re.data.tableList;
+       this.queryList = re.data.queryList;
+       this.fromList = re.data.fromList;
+       this.getList()
+     });
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/anno/anncmnt/ylqxzczhDialog.vue b/src/views/anno/anncmnt/ylqxzczhDialog.vue
new file mode 100644
index 0000000..b1471dc
--- /dev/null
+++ b/src/views/anno/anncmnt/ylqxzczhDialog.vue
@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+        <template v-for="(itemRow, indexRow) in fromList">
+          <el-row :gutter="20" class="el-row" type="flex">
+            <template v-for="(item, index) in itemRow.list">
+              <el-col :span="item.width" class="el-col" type="flex">
+                <div class="text item">
+                  <el-form-item v-if="item.columnType =='input'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-input
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      :size="item.size"
+                      :type="item.inputType"
+                      :placeholder="item.columnDesc"
+                      :disabled="item.disabled"
+                      @input="executeFuc($event,'5',item.clickFuc)"
+                    ></el-input>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='radio'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-radio-group :style="item.style" v-model="inputQuery[item.columnName]">
+                      <el-radio
+                        v-for="dict in item.lableRuleObj"
+                        :key="parseInt(dict.value)"
+                        :label="parseInt(dict.value)"
+                        :disabled="item.disabled"
+                      >{{dict.label}}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='select'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select v-model="inputQuery[item.columnName]" :style="item.style">
+                      <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'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select
+                      v-model="inputQuery[item.columnName]"
+                      :placeholder="item.columnDesc"
+                      @change="executeFuc($event,'5',item.clickFuc)"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
+                      filterable
+                      remote
+                      :remote-method="(query) => executeFuc(query,'5',item.dataFuc)"
+                      clearable>
+                      <el-option
+                        v-for="item in options[item.dataFuc]"
+                        :key="item.code"
+                        :label="item.label"
+                        :value="item.code"
+                      >
+                        <span style="float: left">{{ item.label }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{
+                            item.code
+                          }}</span>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='date'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd"
+                      type="date"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='datetime'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <treeselect
+                      v-model="inputQuery[item.columnName]"
+                      :options="menuOptions"
+                      :normalizer="normalizer"
+                      :show-count="true"
+                      :placeholder="item.columnName"
+                    />
+                  </el-form-item>
+                </div>
+              </el-col>
+            </template>
+          </el-row>
+        </template>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button  @click="closeDialog">取消</el-button>
+          <el-button type="primary" @click="submitInv">提交</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {savegg} from "@/api/anno/anncmntYlqxzczh";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "ylqxzcrDialog",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableObj:[],
+      invList:[],
+      options: {
+
+      }
+    }
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        savegg(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        savegg(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    change(_this) {
+      var pinyin = require("pinyin");
+      var py = pinyin(_this.inputQuery.name, {
+        style: pinyin.STYLE_FIRST_LETTER, // 设置拼音风格
+        heteronym: true,
+      });
+      var str = "";
+      py.forEach((item) => {
+        str = str + item[0];
+      });
+      _this.inputQuery.spell = str;
+    },
+  },
+  components: {},
+  created() {
+    getHead("ylqxzczh","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

From a1cf1e5b031b2c85c6af756dbfa56794abfc83cf Mon Sep 17 00:00:00 2001
From: yuanwei <yls06@foxmail.com>
Date: Mon, 15 Jan 2024 13:37:44 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8D=E8=89=AF?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/anno/anncmntManu.js               |  9 ++++
 src/api/anno/anncmntYlqxzcr.js            |  9 ++++
 src/api/anno/anncmntYlqxzczh.js           |  9 ++++
 src/views/anno/anncmnt/manu.vue           | 20 ++++++--
 src/views/anno/anncmnt/manuCertDialog.vue | 32 +++++++++---
 src/views/anno/anncmnt/manuDialog.vue     | 12 -----
 src/views/anno/anncmnt/product.vue        | 32 +++++++++---
 src/views/anno/anncmnt/productDialog.vue  | 61 ++++++++++++++++-------
 src/views/anno/anncmnt/ylqxzcrDialog.vue  |  4 +-
 src/views/anno/anncmnt/ylqxzczhDialog.vue | 37 ++++++++------
 10 files changed, 159 insertions(+), 66 deletions(-)

diff --git a/src/api/anno/anncmntManu.js b/src/api/anno/anncmntManu.js
index d2878dd..c9fc227 100644
--- a/src/api/anno/anncmntManu.js
+++ b/src/api/anno/anncmntManu.js
@@ -30,3 +30,12 @@ export function deletegg(data) {
     data: data
   });
 }
+
+
+export function getManuList(query) {
+  return axios({
+    url: "/anno/anncmnt/manu/getList",
+    method: "get",
+    params: query
+  });
+}
diff --git a/src/api/anno/anncmntYlqxzcr.js b/src/api/anno/anncmntYlqxzcr.js
index 3709b81..2f5f655 100644
--- a/src/api/anno/anncmntYlqxzcr.js
+++ b/src/api/anno/anncmntYlqxzcr.js
@@ -30,3 +30,12 @@ export function deletegg(data) {
     data: data
   });
 }
+
+
+export function getYlqxzcrList(query) {
+  return axios({
+    url: "/anno/anncmnt/ylqxzcr/getList",
+    method: "get",
+    params: query
+  });
+}
diff --git a/src/api/anno/anncmntYlqxzczh.js b/src/api/anno/anncmntYlqxzczh.js
index b6ff310..4d1b58c 100644
--- a/src/api/anno/anncmntYlqxzczh.js
+++ b/src/api/anno/anncmntYlqxzczh.js
@@ -30,3 +30,12 @@ export function deletegg(data) {
     data: data
   });
 }
+
+
+export function getYlqxzczhList(query) {
+  return axios({
+    url: "/anno/anncmnt/ylqxzczh/getList",
+    method: "get",
+    params: query
+  });
+}
\ No newline at end of file
diff --git a/src/views/anno/anncmnt/manu.vue b/src/views/anno/anncmnt/manu.vue
index 94d6caa..08e3edf 100644
--- a/src/views/anno/anncmnt/manu.vue
+++ b/src/views/anno/anncmnt/manu.vue
@@ -344,7 +344,7 @@
 import indexDialog from "@/views/anno/anncmnt/manuDialog";
 import manuCertDialog from "@/views/anno/anncmnt/manuCertDialog";
 import {deletegg, list} from "@/api/anno/anncmntManu";
-import {deletCert, listCert} from "@/api/anno/anncmntManuCert";
+import {deleteCert, listCert} from "@/api/anno/anncmntManuCert";
 import {executeFuc, getHead} from "@/utils/customConfig";
 
 export default {
@@ -381,6 +381,7 @@ export default {
         page: 1,
         limit: 10,
       },
+      changeCode:"",
       actDateRange: [],
       pickerOptions: {
         shortcuts: [
@@ -426,6 +427,9 @@ export default {
       }
       this.filterQuery.page = 1;
       this.getList();
+      this.changeCode = "";
+      this.manuCertList = [],
+      this.manuCertTotal = 0
     },
     onReset() {
       this.$router.push({
@@ -436,12 +440,16 @@ export default {
         limit: 10,
       };
       this.getList();
+      this.changeCode = "";
+      this.manuCertList = [],
+      this.manuCertTotal = 0
     },
     onCertReset() {
       this.$router.push({
         path: "",
       });
       this.filterCertQuery = {
+        manuCreditCode:this.changeCode,
         page: 1,
         limit: 10,
       };
@@ -479,8 +487,13 @@ export default {
       this.getCertList();
     },
     addCertMuti(){
+      var changeCode =  this.changeCode;
+      if(!changeCode){
+        this.$message.error("请先选择企业");
+        return;
+      }
       this.inputCertQuery={
-
+          manuCreditCode:changeCode
       }
       this.formCertName=1;
       this.manuCertDialogVisible = true;
@@ -491,6 +504,7 @@ export default {
       _this.manuCertDialogVisible = true;
     },
     supCertClick(_this,row) {
+      _this.changeCode= row.creditCode
       _this.onCertReset();
     },
     getList() {
@@ -538,7 +552,7 @@ export default {
     },
 
     deleteCertDialog(_this,row) {
-      deletCert(row)
+      deleteCert(row)
         .then((response) => {
           if(response.code == 20000){
             _this.getCertList()
diff --git a/src/views/anno/anncmnt/manuCertDialog.vue b/src/views/anno/anncmnt/manuCertDialog.vue
index 5c5eb61..54bb4c3 100644
--- a/src/views/anno/anncmnt/manuCertDialog.vue
+++ b/src/views/anno/anncmnt/manuCertDialog.vue
@@ -65,13 +65,10 @@
                       <el-option
                         v-for="item in options[item.dataFuc]"
                         :key="item.code"
-                        :label="item.label"
+                        :label="item.code"
                         :value="item.code"
                       >
-                        <span style="float: left">{{ item.label }}</span>
-                        <span style="float: right; color: #8492a6; font-size: 13px">{{
-                            item.code
-                          }}</span>
+                        <span style="float: left">{{ item.code }}</span>
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -127,6 +124,8 @@
 
 <script>
 import {saveCert} from "@/api/anno/anncmntManuCert";
+import {getManuList} from "@/api/anno/anncmntManu";
+import {getYlqxzczhList} from "@/api/anno/anncmntYlqxzczh";
 import {
   getHead,executeFuc
 } from "@/utils/customConfig";
@@ -155,7 +154,7 @@ export default {
       tableObj:[],
       invList:[],
       options: {
-
+        getYlqxzczh:[]
       }
     }
   },
@@ -196,6 +195,25 @@ export default {
       }
       return defaultRet;
     },
+     getYlqxzczh(_this,query) {
+       getYlqxzczhList()
+         .then((response) => {
+           _this.options.getYlqxzczh = response.data || []
+         })
+         .catch(() => {
+           _this.options.getYlqxzczh = []
+         });
+     },
+      changeYlqxzczh(_this,val) {
+        let obj = {};
+         obj = _this.options.getYlqxzczh.find((item)=>{ // 这里的userList就是上面遍历的数据源
+             return item.code === val; // 筛选出匹配数据
+         });
+         _this.inputQuery.zczbhhzbapzbh = obj.code;
+         _this.inputQuery.ylqxzcrbarmc = obj.regCompanyName;
+         _this.inputQuery.regCreditCode = obj.regCreditCode;
+          _this.inputQuery.productName = obj.productName;
+      },
     change(_this) {
       var pinyin = require("pinyin");
       var py = pinyin(_this.inputQuery.name, {
@@ -218,7 +236,7 @@ export default {
       this.queryList = re.data.queryList;
       this.fromList = re.data.fromList;
     });
-
+    this.getYlqxzczh(this);
   },
 }
 </script>
diff --git a/src/views/anno/anncmnt/manuDialog.vue b/src/views/anno/anncmnt/manuDialog.vue
index 31d8af0..ee58a4b 100644
--- a/src/views/anno/anncmnt/manuDialog.vue
+++ b/src/views/anno/anncmnt/manuDialog.vue
@@ -87,18 +87,6 @@
                       :placeholder="item.columnDesc"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item v-if="item.columnType =='datetime'"  :rules="item.checkRulesObj" :prop="item.columnName">
-                        <span slot="label">
-                          {{item.columnDesc}}
-                        </span>
-                    <el-date-picker
-                      v-model="inputQuery[item.columnName]"
-                      :style="item.style"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      type="datetime"
-                      :placeholder="item.columnDesc"
-                    ></el-date-picker>
-                  </el-form-item>
                   <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
                         <span slot="label">
                           {{item.columnDesc}}
diff --git a/src/views/anno/anncmnt/product.vue b/src/views/anno/anncmnt/product.vue
index 8bf4076..f3d1359 100644
--- a/src/views/anno/anncmnt/product.vue
+++ b/src/views/anno/anncmnt/product.vue
@@ -191,7 +191,7 @@
     <el-card class="el-card">
       <div class="top-right-btn">
         <el-button-group style="display:flex;">
-          <el-button type="primary" icon="el-icon-refresh" @click="addCertMuti">新增注册/备案证</el-button>
+          <el-button type="primary" icon="el-icon-refresh" @click="addCertMuti">新增产品批次</el-button>
         </el-button-group>
       </div>
 
@@ -344,7 +344,7 @@
 import indexDialog from "@/views/anno/anncmnt/productDialog";
 import manuCertDialog from "@/views/anno/anncmnt/productCertDialog";
 import {deletegg, list} from "@/api/anno/anncmntProduct";
-import {deletCert, listCert} from "@/api/anno/anncmntProductBatch";
+import {deleteCert, listCert} from "@/api/anno/anncmntProductBatch";
 import {executeFuc, getHead} from "@/utils/customConfig";
 
 export default {
@@ -369,8 +369,8 @@ export default {
 
       formCertName: 1,
       formCertMap: {
-        1: "新增产品信息明细",
-        2: "编辑产品信息明细",
+        1: "新增产品批次",
+        2: "编辑产品批次",
       },
       inputCertQuery:{},
       manuCertDialogVisible: false,
@@ -381,6 +381,7 @@ export default {
         page: 1,
         limit: 10,
       },
+       changeCode:"",
       actDateRange: [],
       pickerOptions: {
         shortcuts: [
@@ -426,6 +427,9 @@ export default {
       }
       this.filterQuery.page = 1;
       this.getList();
+      this.changeCode = "";
+      this.manuCertList = [],
+      this.manuCertTotal = 0
     },
     onReset() {
       this.$router.push({
@@ -436,12 +440,16 @@ export default {
         limit: 10,
       };
       this.getList();
+      this.changeCode = "";
+      this.manuCertList = [],
+      this.manuCertTotal = 0
     },
     onCertReset() {
       this.$router.push({
         path: "",
       });
       this.filterCertQuery = {
+        productIdFk:this.changeCode,
         page: 1,
         limit: 10,
       };
@@ -479,9 +487,15 @@ export default {
       this.getCertList();
     },
     addCertMuti(){
-      this.inputCertQuery={
-
-      }
+     var changeCode =  this.changeCode;
+     if(!changeCode){
+       this.$message.error("请先选择产品");
+       return;
+     }
+     this.inputCertQuery={
+         productIdFk:changeCode,
+         productName:this.changeName
+     }
       this.formCertName=1;
       this.manuCertDialogVisible = true;
     },
@@ -491,6 +505,8 @@ export default {
       _this.manuCertDialogVisible = true;
     },
     supCertClick(_this,row) {
+      _this.changeCode= row.id
+      _this.changeName= row.productName
       _this.onCertReset();
     },
     getList() {
@@ -538,7 +554,7 @@ export default {
     },
 
     deleteCertDialog(_this,row) {
-      deletCert(row)
+      deleteCert(row)
         .then((response) => {
           if(response.code == 20000){
             _this.getCertList()
diff --git a/src/views/anno/anncmnt/productDialog.vue b/src/views/anno/anncmnt/productDialog.vue
index ed78046..6ab7abc 100644
--- a/src/views/anno/anncmnt/productDialog.vue
+++ b/src/views/anno/anncmnt/productDialog.vue
@@ -65,13 +65,10 @@
                       <el-option
                         v-for="item in options[item.dataFuc]"
                         :key="item.code"
-                        :label="item.label"
+                        :label="item.code"
                         :value="item.code"
                       >
-                        <span style="float: left">{{ item.label }}</span>
-                        <span style="float: right; color: #8492a6; font-size: 13px">{{
-                            item.code
-                          }}</span>
+                        <span style="float: left">{{ item.code }}</span>
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -87,18 +84,6 @@
                       :placeholder="item.columnDesc"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item v-if="item.columnType =='datetime'"  :rules="item.checkRulesObj" :prop="item.columnName">
-                        <span slot="label">
-                          {{item.columnDesc}}
-                        </span>
-                    <el-date-picker
-                      v-model="inputQuery[item.columnName]"
-                      :style="item.style"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      type="datetime"
-                      :placeholder="item.columnDesc"
-                    ></el-date-picker>
-                  </el-form-item>
                   <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
                         <span slot="label">
                           {{item.columnDesc}}
@@ -127,6 +112,8 @@
 
 <script>
 import {savegg} from "@/api/anno/anncmntProduct";
+import {getManuList} from "@/api/anno/anncmntManu";
+import {getYlqxzczhList} from "@/api/anno/anncmntYlqxzczh";
 import {
   getHead,executeFuc
 } from "@/utils/customConfig";
@@ -155,7 +142,8 @@ export default {
       tableObj:[],
       invList:[],
       options: {
-
+        getYlqxzczh:[],
+        getManu:[],
       }
     }
   },
@@ -187,6 +175,40 @@ export default {
           });
       }
     },
+    getYlqxzczh(_this,query) {
+      getYlqxzczhList()
+        .then((response) => {
+          _this.options.getYlqxzczh = response.data || []
+        })
+        .catch(() => {
+          _this.options.getYlqxzczh = []
+        });
+    },
+     changeYlqxzczh(_this,val) {
+       let obj = {};
+        obj = _this.options.getYlqxzczh.find((item)=>{ // 这里的userList就是上面遍历的数据源
+            return item.code === val; // 筛选出匹配数据
+        });
+        _this.inputQuery.ylqxzcrbarmc = obj.regCompanyName;
+        _this.inputQuery.regCreditCode = obj.code;
+     },
+     getManu(_this,query) {
+       getManuList()
+         .then((response) => {
+           _this.options.getManu = response.data || []
+         })
+         .catch(() => {
+           _this.options.getManu = []
+         });
+     },
+      changeManu(_this,val) {
+        let obj = {};
+         obj = _this.options.getManu.find((item)=>{ // 这里的userList就是上面遍历的数据源
+             return item.code === val; // 筛选出匹配数据
+         });
+         _this.inputQuery.manuCreditCode = obj.code;
+         _this.inputQuery.manuName = obj.label;
+      },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
     },
@@ -218,7 +240,8 @@ export default {
       this.queryList = re.data.queryList;
       this.fromList = re.data.fromList;
     });
-
+    this.getYlqxzczh(this);
+     this.getManu(this);
   },
 }
 </script>
diff --git a/src/views/anno/anncmnt/ylqxzcrDialog.vue b/src/views/anno/anncmnt/ylqxzcrDialog.vue
index 38a6add..a51a0eb 100644
--- a/src/views/anno/anncmnt/ylqxzcrDialog.vue
+++ b/src/views/anno/anncmnt/ylqxzcrDialog.vue
@@ -82,8 +82,8 @@
                     <el-date-picker
                       v-model="inputQuery[item.columnName]"
                       :style="item.style"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      type="datetime"
+                      value-format="yyyy-MM-dd"
+                      type="date"
                       :placeholder="item.columnDesc"
                     ></el-date-picker>
                   </el-form-item>
diff --git a/src/views/anno/anncmnt/ylqxzczhDialog.vue b/src/views/anno/anncmnt/ylqxzczhDialog.vue
index b1471dc..12b050e 100644
--- a/src/views/anno/anncmnt/ylqxzczhDialog.vue
+++ b/src/views/anno/anncmnt/ylqxzczhDialog.vue
@@ -65,7 +65,7 @@
                       <el-option
                         v-for="item in options[item.dataFuc]"
                         :key="item.code"
-                        :label="item.label"
+                        :label="item.code"
                         :value="item.code"
                       >
                         <span style="float: left">{{ item.label }}</span>
@@ -87,18 +87,6 @@
                       :placeholder="item.columnDesc"
                     ></el-date-picker>
                   </el-form-item>
-                  <el-form-item v-if="item.columnType =='datetime'"  :rules="item.checkRulesObj" :prop="item.columnName">
-                        <span slot="label">
-                          {{item.columnDesc}}
-                        </span>
-                    <el-date-picker
-                      v-model="inputQuery[item.columnName]"
-                      :style="item.style"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      type="datetime"
-                      :placeholder="item.columnDesc"
-                    ></el-date-picker>
-                  </el-form-item>
                   <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
                         <span slot="label">
                           {{item.columnDesc}}
@@ -127,6 +115,7 @@
 
 <script>
 import {savegg} from "@/api/anno/anncmntYlqxzczh";
+import {getYlqxzcrList} from "@/api/anno/anncmntYlqxzcr";
 import {
   getHead,executeFuc
 } from "@/utils/customConfig";
@@ -155,7 +144,7 @@ export default {
       tableObj:[],
       invList:[],
       options: {
-
+          getYlqxzcr:[],
       }
     }
   },
@@ -196,6 +185,24 @@ export default {
       }
       return defaultRet;
     },
+    getYlqxzcr(_this,query) {
+      getYlqxzcrList()
+        .then((response) => {
+          _this.options.getYlqxzcr = response.data || []
+        })
+        .catch(() => {
+          _this.options.getYlqxzcr = []
+        });
+    },
+     changeYlqxzcr(_this,val) {
+       let obj = {};
+        obj = _this.options.getYlqxzcr.find((item)=>{ // 这里的userList就是上面遍历的数据源
+            return item.code === val; // 筛选出匹配数据
+        });
+        _this.inputQuery.regCompanyName = obj.label;
+        _this.inputQuery.regCreditCode = obj.code;
+        console.log(_this.inputQuery)
+     },
     change(_this) {
       var pinyin = require("pinyin");
       var py = pinyin(_this.inputQuery.name, {
@@ -218,7 +225,7 @@ export default {
       this.queryList = re.data.queryList;
       this.fromList = re.data.fromList;
     });
-
+    this.getYlqxzcr(this);
   },
 }
 </script>

From 1b70723e245fb09253a59ed3b36b1fa44a79b921 Mon Sep 17 00:00:00 2001
From: yuanwei <yls06@foxmail.com>
Date: Mon, 15 Jan 2024 17:06:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/anno/anncmnt/dev.vue               |  5 ++++
 src/views/anno/anncmnt/manu.vue              | 10 ++++++++
 src/views/anno/anncmnt/manuCertDialog.vue    |  4 +++
 src/views/anno/anncmnt/manuDialog.vue        |  1 +
 src/views/anno/anncmnt/product.vue           | 10 ++++++++
 src/views/anno/anncmnt/productCertDialog.vue |  1 +
 src/views/anno/anncmnt/productDialog.vue     |  1 +
 src/views/anno/anncmnt/ylqxzcr.vue           |  5 ++++
 src/views/anno/anncmnt/ylqxzcrDialog.vue     |  3 ++-
 src/views/anno/anncmnt/ylqxzczh.vue          | 27 ++++++++++++--------
 src/views/anno/anncmnt/ylqxzczhDialog.vue    |  1 +
 11 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/views/anno/anncmnt/dev.vue b/src/views/anno/anncmnt/dev.vue
index 20d89a5..723778c 100644
--- a/src/views/anno/anncmnt/dev.vue
+++ b/src/views/anno/anncmnt/dev.vue
@@ -327,6 +327,10 @@ export default {
         });
     },
     deleteDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deletegg(row)
         .then((response) => {
           if(response.code == 20000){
@@ -338,6 +342,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+         });
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/anno/anncmnt/manu.vue b/src/views/anno/anncmnt/manu.vue
index 08e3edf..5e60d4d 100644
--- a/src/views/anno/anncmnt/manu.vue
+++ b/src/views/anno/anncmnt/manu.vue
@@ -523,6 +523,10 @@ export default {
     },
 
     deleteDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deletegg(row)
         .then((response) => {
           if(response.code == 20000){
@@ -534,6 +538,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+          });
     },
 
     getCertList() {
@@ -552,6 +557,10 @@ export default {
     },
 
     deleteCertDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deleteCert(row)
         .then((response) => {
           if(response.code == 20000){
@@ -563,6 +572,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+          });
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/anno/anncmnt/manuCertDialog.vue b/src/views/anno/anncmnt/manuCertDialog.vue
index 54bb4c3..e46af7a 100644
--- a/src/views/anno/anncmnt/manuCertDialog.vue
+++ b/src/views/anno/anncmnt/manuCertDialog.vue
@@ -56,6 +56,7 @@
                     <el-select
                       v-model="inputQuery[item.columnName]"
                       :placeholder="item.columnDesc"
+                       :style="item.style"
                       @change="executeFuc($event,'5',item.clickFuc)"
                       :disabled="executeEval(null,item.disabledFuc,false)"
                       filterable
@@ -69,6 +70,9 @@
                         :value="item.code"
                       >
                         <span style="float: left">{{ item.code }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px;width:200px">{{
+                            item.productName
+                          }}</span>
                       </el-option>
                     </el-select>
                   </el-form-item>
diff --git a/src/views/anno/anncmnt/manuDialog.vue b/src/views/anno/anncmnt/manuDialog.vue
index ee58a4b..feb4d3f 100644
--- a/src/views/anno/anncmnt/manuDialog.vue
+++ b/src/views/anno/anncmnt/manuDialog.vue
@@ -56,6 +56,7 @@
                     <el-select
                       v-model="inputQuery[item.columnName]"
                       :placeholder="item.columnDesc"
+                       :style="item.style"
                       @change="executeFuc($event,'5',item.clickFuc)"
                       :disabled="executeEval(null,item.disabledFuc,false)"
                       filterable
diff --git a/src/views/anno/anncmnt/product.vue b/src/views/anno/anncmnt/product.vue
index f3d1359..50806d9 100644
--- a/src/views/anno/anncmnt/product.vue
+++ b/src/views/anno/anncmnt/product.vue
@@ -525,6 +525,10 @@ export default {
     },
 
     deleteDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deletegg(row)
         .then((response) => {
           if(response.code == 20000){
@@ -536,6 +540,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+         });
     },
 
     getCertList() {
@@ -554,6 +559,10 @@ export default {
     },
 
     deleteCertDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deleteCert(row)
         .then((response) => {
           if(response.code == 20000){
@@ -565,6 +574,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+         });
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/anno/anncmnt/productCertDialog.vue b/src/views/anno/anncmnt/productCertDialog.vue
index 03300c7..0fae613 100644
--- a/src/views/anno/anncmnt/productCertDialog.vue
+++ b/src/views/anno/anncmnt/productCertDialog.vue
@@ -56,6 +56,7 @@
                     <el-select
                       v-model="inputQuery[item.columnName]"
                       :placeholder="item.columnDesc"
+                       :style="item.style"
                       @change="executeFuc($event,'5',item.clickFuc)"
                       :disabled="executeEval(null,item.disabledFuc,false)"
                       filterable
diff --git a/src/views/anno/anncmnt/productDialog.vue b/src/views/anno/anncmnt/productDialog.vue
index 6ab7abc..33a5128 100644
--- a/src/views/anno/anncmnt/productDialog.vue
+++ b/src/views/anno/anncmnt/productDialog.vue
@@ -56,6 +56,7 @@
                     <el-select
                       v-model="inputQuery[item.columnName]"
                       :placeholder="item.columnDesc"
+                       :style="item.style"
                       @change="executeFuc($event,'5',item.clickFuc)"
                       :disabled="executeEval(null,item.disabledFuc,false)"
                       filterable
diff --git a/src/views/anno/anncmnt/ylqxzcr.vue b/src/views/anno/anncmnt/ylqxzcr.vue
index ca308ed..e4d15c9 100644
--- a/src/views/anno/anncmnt/ylqxzcr.vue
+++ b/src/views/anno/anncmnt/ylqxzcr.vue
@@ -325,6 +325,10 @@ export default {
         });
     },
     deleteDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
       deletegg(row)
         .then((response) => {
           if(response.code == 20000){
@@ -336,6 +340,7 @@ export default {
         .catch(() => {
           _this.$message.error(response.message);
         });
+        });
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/anno/anncmnt/ylqxzcrDialog.vue b/src/views/anno/anncmnt/ylqxzcrDialog.vue
index a51a0eb..83b407b 100644
--- a/src/views/anno/anncmnt/ylqxzcrDialog.vue
+++ b/src/views/anno/anncmnt/ylqxzcrDialog.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <el-form  :model="inputQuery"  label-width="120px" >
+      <el-form  :model="inputQuery"  label-width="150px" >
         <template v-for="(itemRow, indexRow) in fromList">
           <el-row :gutter="20" class="el-row" type="flex">
             <template v-for="(item, index) in itemRow.list">
@@ -54,6 +54,7 @@
                           {{item.columnDesc}}
                         </span>
                     <el-select
+                     :style="item.style"
                       v-model="inputQuery[item.columnName]"
                       :placeholder="item.columnDesc"
                       @change="executeFuc($event,'5',item.clickFuc)"
diff --git a/src/views/anno/anncmnt/ylqxzczh.vue b/src/views/anno/anncmnt/ylqxzczh.vue
index ae312d2..e5bec57 100644
--- a/src/views/anno/anncmnt/ylqxzczh.vue
+++ b/src/views/anno/anncmnt/ylqxzczh.vue
@@ -325,17 +325,22 @@ export default {
         });
     },
     deleteDialog(_this,row) {
-      deletegg(row)
-        .then((response) => {
-          if(response.code == 20000){
-            _this.getList()
-          }else{
-            _this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          _this.$message.error(response.message);
-        });
+     _this.$confirm("确认删除吗?", "提示", {
+         type: "warning",
+       })
+       .then(() => {
+          deletegg(row)
+            .then((response) => {
+              if(response.code == 20000){
+                _this.getList()
+              }else{
+                _this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              _this.$message.error(response.message);
+            });
+         })
     },
     executeFuc(row,type,clickFuc,value){
       return executeFuc(this,row,type,clickFuc,value);
diff --git a/src/views/anno/anncmnt/ylqxzczhDialog.vue b/src/views/anno/anncmnt/ylqxzczhDialog.vue
index 12b050e..75806a8 100644
--- a/src/views/anno/anncmnt/ylqxzczhDialog.vue
+++ b/src/views/anno/anncmnt/ylqxzczhDialog.vue
@@ -55,6 +55,7 @@
                         </span>
                     <el-select
                       v-model="inputQuery[item.columnName]"
+                      :style="item.style"
                       :placeholder="item.columnDesc"
                       @change="executeFuc($event,'5',item.clickFuc)"
                       :disabled="executeEval(null,item.disabledFuc,false)"