diff --git a/src/api/stat/statMonth.js b/src/api/stat/statMonth.js
new file mode 100644
index 0000000..5f9e5b4
--- /dev/null
+++ b/src/api/stat/statMonth.js
@@ -0,0 +1,33 @@
+import axios from "@/utils/request";
+
+export function listMonth(query) {
+  return axios({
+    url: "/stat/month/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function saveMonth(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/stat/month/save"
+      : "/stat/month/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deleteMonth(data) {
+  return axios({
+    url: "/stat/month/delete",
+    method: "post",
+    data: data
+  });
+}
+
diff --git a/src/api/stat/statOrder.js b/src/api/stat/statOrder.js
new file mode 100644
index 0000000..3dd3503
--- /dev/null
+++ b/src/api/stat/statOrder.js
@@ -0,0 +1,32 @@
+import axios from "@/utils/request";
+
+export function listOrder(query) {
+  return axios({
+    url: "/stat/order/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function saveOrder(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/stat/order/save"
+      : "/stat/order/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deleteOrder(data) {
+  return axios({
+    url: "/stat/order/delete",
+    method: "post",
+    data: data
+  });
+}
diff --git a/src/api/stat/statSet.js b/src/api/stat/statSet.js
new file mode 100644
index 0000000..76aca25
--- /dev/null
+++ b/src/api/stat/statSet.js
@@ -0,0 +1,34 @@
+import axios from "@/utils/request";
+
+export function listSet(query) {
+  return axios({
+    url: "/stat/set/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function saveSet(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/stat/set/save"
+      : "/stat/set/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deleteSet(data) {
+  return axios({
+    url: "/stat/set/delete",
+    method: "post",
+    data: data
+  });
+}
+
+
diff --git a/src/api/stat/statSetDetail.js b/src/api/stat/statSetDetail.js
new file mode 100644
index 0000000..6a5af8a
--- /dev/null
+++ b/src/api/stat/statSetDetail.js
@@ -0,0 +1,41 @@
+import axios from "@/utils/request";
+
+export function listSetDetail(query) {
+  return axios({
+    url: "/stat/setDetail/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function saveSetDetail(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/stat/setDetail/save"
+      : "/stat/setDetail/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deleteSetDetail(data) {
+  return axios({
+    url: "/stat/setDetail/delete",
+    method: "post",
+    data: data
+  });
+}
+
+
+export function getUdiProduct(query) {
+  return axios({
+    url: "/stat/setDetail/getUdiProduct",
+    method: "get",
+    params: query
+  });
+}
diff --git a/src/views/anno/anncmnt/dev.vue b/src/views/anno/anncmnt/dev.vue
index 723778c..ec943f9 100644
--- a/src/views/anno/anncmnt/dev.vue
+++ b/src/views/anno/anncmnt/dev.vue
@@ -331,18 +331,18 @@ export default {
           type: "warning",
         })
         .then(() => {
-      deletegg(row)
-        .then((response) => {
-          if(response.code == 20000){
-            _this.getList()
-          }else{
+        deletegg(row)
+          .then((response) => {
+            if(response.code == 20000){
+              _this.getList()
+            }else{
+              _this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
             _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/stat/order.vue b/src/views/stat/order.vue
new file mode 100644
index 0000000..917fef2
--- /dev/null
+++ b/src/views/stat/order.vue
@@ -0,0 +1,607 @@
+<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">
+
+      <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"
+    >
+      <orderDialog
+        :closeDialog="closeDialog"
+        :inputQuery="inputQuery"
+        :formName="formName"
+      ></orderDialog>
+    </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"
+    >
+      <orderDetailDialog
+        :closeDialog="closeCertDialog"
+        :inputQuery="inputCertQuery"
+        :formName="formCertName"
+      ></orderDetailDialog>
+    </el-dialog>
+
+  </div>
+</template>
+
+
+
+<script>
+import orderDialog from "@/views/stat/orderDialog";
+import orderDetailDialog from "@/views/stat/orderDetailDialog";
+import {deleteMonth, listMonth} from "@/api/stat/statMonth";
+import {deleteOrder, listOrder} from "@/api/stat/statOrder";
+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,
+      },
+      changeCode:"",
+      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();
+      this.changeCode = "";
+      this.manuCertList = [],
+      this.manuCertTotal = 0
+    },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        page: 1,
+        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,
+      };
+      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(){
+      var changeCode =  this.changeCode;
+      if(!changeCode){
+        this.$message.error("请先选择企业");
+        return;
+      }
+      this.inputCertQuery={
+          manuCreditCode:changeCode
+      }
+      this.formCertName=1;
+      this.manuCertDialogVisible = true;
+    },
+    editCertDialog(_this,row){
+      _this.formCertName=2;
+      _this.inputCertQuery=row;
+      _this.manuCertDialogVisible = true;
+    },
+    supCertClick(_this,row) {
+      _this.changeCode= row.creditCode
+      _this.onCertReset();
+    },
+    getList() {
+      this.loading = true;
+      listOrder(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) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
+      deleteOrder(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;
+      listMonth(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) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
+      deleteMonth(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: {orderDialog,orderDetailDialog},
+  created() {
+     getHead("stat-order-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("stat-order-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/stat/orderDetailDialog.vue b/src/views/stat/orderDetailDialog.vue
new file mode 100644
index 0000000..f549088
--- /dev/null
+++ b/src/views/stat/orderDetailDialog.vue
@@ -0,0 +1,217 @@
+<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"
+                       :style="item.style"
+                      @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.code"
+                        :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>
+                  <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 {saveMonth} from "@/api/stat/statMonth";
+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: {
+        getYlqxzczh:[]
+      }
+    }
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        saveMonth(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        saveMonth(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;
+    },
+  },
+  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;
+    });
+    this.getYlqxzczh(this);
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/stat/orderDialog.vue b/src/views/stat/orderDialog.vue
new file mode 100644
index 0000000..697c7ae
--- /dev/null
+++ b/src/views/stat/orderDialog.vue
@@ -0,0 +1,205 @@
+<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"
+                       :style="item.style"
+                      @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 =='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 {saveOrder} from "@/api/stat/statOrder";
+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){
+        saveOrder(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        saveOrder(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;
+    },
+  },
+  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/stat/set.vue b/src/views/stat/set.vue
new file mode 100644
index 0000000..369c5bc
--- /dev/null
+++ b/src/views/stat/set.vue
@@ -0,0 +1,610 @@
+<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) => addDialog()">新增</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">
+      <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="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"
+    >
+      <setDetailDialog
+        :closeDialog="closeCertDialog"
+        :inputQuery="inputCertQuery"
+        :formName="formCertName"
+      ></setDetailDialog>
+    </el-dialog>
+
+
+ <el-dialog
+      :title="新增配置"
+      :visible.sync="addDialogVisible"
+      :before-close="close"
+      width="60%"
+      v-if="addDialogVisible"
+      @close='closeAddDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <setAddDialog
+        :closeDialog="closeAddDialog"
+        :inputQuery="inputAddQuery"
+        :formName="formAddName"
+      ></setAddDialog>
+    </el-dialog>
+  </div>
+</template>
+
+
+
+<script>
+import setAddDialog from "@/views/stat/setAddDialog";
+import setDetailDialog from "@/views/stat/setDetailDialog";
+import {deleteSetDetail, listSetDetail} from "@/api/stat/statSetDetail";
+import {deleteSet, listSet} from "@/api/stat/statSet";
+import {executeFuc, getHead} from "@/utils/customConfig";
+
+export default {
+  name: "anncmntDev",
+  data() {
+    return {
+        showSearch: true,
+        inputAddQuery:{},
+        addDialogVisible: false,
+        formAddName:1,
+      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,
+      },
+      changeCode:"",
+      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();
+      this.changeCode = "";
+      this.manuCertList = [],
+      this.manuCertTotal = 0
+    },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        page: 1,
+        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,
+      };
+      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();
+    },
+    closeAddDialog(){
+      this.addDialogVisible = false;
+      this.getList();
+    },
+    addDialog(){
+      this.inputAddQuery={
+
+      }
+      this.formAddName=1;
+      this.addDialogVisible = true;
+    },
+
+    editDialog(_this,row){
+      _this.formName=2;
+      _this.inputAddQuery=row;
+      _this.addDialogVisible = true;
+    },
+    closeCertDialog(){
+      this.manuCertDialogVisible = false;
+      this.getCertList();
+    },
+    addCertMuti(){
+      var changeCode =  this.changeCode;
+      if(!changeCode){
+        this.$message.error("请先选择企业");
+        return;
+      }
+      this.inputCertQuery={
+          manuCreditCode:changeCode
+      }
+      this.formCertName=1;
+      this.manuCertDialogVisible = true;
+    },
+    editCertDialog(_this,row){
+      _this.formCertName=2;
+      _this.inputCertQuery=row;
+      _this.manuCertDialogVisible = true;
+    },
+    supCertClick(_this,row) {
+      _this.changeCode= row.creditCode
+      _this.onCertReset();
+    },
+    getList() {
+      this.loading = true;
+      listSet(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) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
+      deleteSet(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;
+      listSetDetail(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) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
+      deleteSetDetail(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: {setDetailDialog,setAddDialog},
+  created() {
+     getHead("stat-set-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("stat-set-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/stat/setAddDialog.vue b/src/views/stat/setAddDialog.vue
new file mode 100644
index 0000000..be6fa34
--- /dev/null
+++ b/src/views/stat/setAddDialog.vue
@@ -0,0 +1,429 @@
+<template>
+  <div>
+     <el-form  :model="inputQuery"  label-width="120px" >
+    <el-card>
+      <el-row>
+        <div style="margin: 0px 60px 10px auto; height: 35px;  float: right;">
+          <el-button-group>
+            <el-button
+              type="primary"
+              ref="mainTable"
+              @click.native.stop="addSet()"
+              :loading="loading"
+            >保存
+            </el-button
+            >
+          </el-button-group>
+        </div>
+
+      </el-row>
+          <el-row :gutter="20" class="el-row" type="flex">
+                 <el-col  span="10" class="el-col" type="flex">
+                   <el-form-item prop="title"  label="标题:" class="query-form-item">
+                     <el-input
+                       style="width: 80%"
+                       size="small"
+                       placeholder="请输入标题"
+                       v-model="inputQuery.title"
+                     ></el-input>
+                   </el-form-item>
+              </el-col>
+              <el-col span="10" class="el-col" type="flex">
+                   <el-form-item prop="frequency"   label="周期:" class="query-form-item">
+                     <el-input
+                       style="width: 80%"
+                       size="small"
+                       type="number"
+                       placeholder="请输入周期"
+                       v-model="inputQuery.frequency"
+                     ></el-input>（天）
+                   </el-form-item>
+              </el-col>
+         </el-row>
+         <el-row :gutter="20" class="el-row" type="flex">
+                 <el-col class="el-col" span="20"  type="flex">
+                   <el-form-item label="时间范围:" class="query-form-item">
+                    <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-col>
+
+         </el-row>
+         <el-row :gutter="20" class="el-row" type="flex">
+                 <el-col class="el-col" span="20" type="flex">
+                   <el-form-item prop="remark" label="备注:" class="query-form-item">
+                     <el-input
+                        style="width: 100%"
+                       size="small"
+                       placeholder="请输入备注"
+                       v-model="inputQuery.remark"
+                     ></el-input>
+                   </el-form-item>
+              </el-col>
+         </el-row>
+    </el-card>
+    <el-card>
+      <el-row>
+        <div style="margin: 0px 60px 10px auto; height: 35px;  float: right;">
+          <el-button-group>
+            <el-button
+              type="primary"
+              ref="mainTable"
+              @click.native.stop="selectProductFunction()"
+              :loading="loading"
+            >产品录入
+            </el-button
+            >
+          </el-button-group>
+        </div>
+
+      </el-row>
+        <el-table v-loading="loading" :data="detailList" style="width: 100%;"
+                  :row-class-name="tableRowClassName"
+                  border
+                  :row-style="rowStyle"
+                  max-height="350" height="350" ref="multipleTable">
+          <el-table-column label="序号" type="index" width="50"></el-table-column>
+          <el-table-column width="150"
+                           label="产品品种"
+                           prop="cpmctymc"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="150"
+                           label="规格型号"
+                           prop="ggxh"
+                           show-overflow-tooltip
+          ></el-table-column>
+          <el-table-column width="120" label="注册/备案号">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.zczbhhzbapzbh"
+                        :disabled="scope.row.id !== selectedIndex"
+                        placeholder="请输入注册/备案号"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" label="医疗器械注册人">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.ylqxzcrbarmc"
+                        :disabled="scope.row.id !== selectedIndex"
+                        placeholder="请输入医疗器械注册人"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" label="企业类型">
+            <template slot-scope="scope">
+              <el-select v-model="scope.row.bussinessType" placeholder="请选择企业类型" :disabled="scope.row.id !== selectedIndex">
+                <el-option label="生产企业" :value="1"></el-option>
+                <el-option label="流通企业" :value="2"></el-option>
+                <el-option label="医疗机构" :value="3"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" label="注册企业名称">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.companyName"
+                        :disabled="scope.row.id !== selectedIndex"
+                        placeholder="请输入注册企业名称"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" label="di/标识">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.nameCode"
+                        :disabled="scope.row.id !== selectedIndex"
+                        placeholder="请输入di/标识"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" label="省">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.provinceCode"
+                        :disabled="scope.row.id !== selectedIndex"
+                        placeholder="请输入省"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" label="市">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.cityCode"
+                        :disabled="scope.row.id !== selectedIndex"
+                        placeholder="请输入市"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="160" fixed="right">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" v-if="scope.row.id == selectedIndex"
+                         @click.native="saveChange(scope.row)">保存
+              </el-button>
+              <el-button type="text" size="small" v-if="scope.row.id != selectedIndex"
+                         @click.native="rowChange(scope.row)">编辑
+              </el-button>
+              <el-button type="text" size="small"  @click.native="deleteDetail(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button  @click="closeDialog">关闭</el-button>
+        </div>
+    </el-card>
+     </el-form>
+
+     <el-dialog
+           :title="选择产品"
+           :visible.sync="productVisible"
+           :before-close="close"
+           width="60%"
+           v-if="productVisible"
+             append-to-body
+           @close='closeProductDialog'
+           :close-on-click-modal="false"
+           :close-on-press-escape="false"
+         >
+           <setSelecProduct
+             :closeDialog="closeProductDialog"
+             :relationId="relationId"
+           ></setSelecProduct>
+         </el-dialog>
+  </div>
+</template>
+
+<script>
+import {saveSet} from "@/api/stat/statSet";
+import {listSetDetail,deleteSetDetail,saveSetDetail} from "@/api/stat/statSetDetail";
+import setSelecProduct from "@/views/stat/setSelecProduct";
+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:[],
+      query: {
+       page: 1,
+       limit: 10,
+      },
+      selectedIndex: null,
+      queryList:[],
+      fromList:[],
+      tableObj:[],
+      invList:[],
+      detailList:[],
+      options: {
+
+      },
+      productVisible:false,
+      relationId: null,
+      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: {
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
+    },
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
+        rowBackground.color = '#f60303';
+        return rowBackground;
+      }
+
+      if (this.viewType == 1)
+        return null;
+
+      if (!row.checkSuccess) {
+        rowBackground.color = '#f60303';
+      }
+      return rowBackground;
+    },
+    getOrderDetails() {
+      this.loading = true;
+      listSetDetail(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          this.detailList = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.detailList = [];
+          this.total = 0;
+        });
+    },
+    rowChange(val) {
+      this.selectedIndex = val.id;
+    },
+    deleteDetail(row) {
+      let data = {
+        id: row.id,
+      }
+      this.loading = true;
+      this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
+        deleteSetDetail(data)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.getOrderDetails();
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+       });
+    },
+    closeProductDialog() {
+      this.productVisible = false;
+      this.relationId = this.inputQuery.id;
+      this.getOrderDetails();
+    },
+    saveChange(row) {
+      saveSetDetail(row,"edit")
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("保存成功！");
+            this.selectedIndex = null;
+            this.refreshPanel();
+
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.dataList = [];
+          this.pageTotal = 0;
+        });
+    },
+    selectProductFunction(){
+        if(!this.inputQuery.id){
+
+          this.$message.error("请先添加规则");
+          return;
+        }
+         this.productVisible = true;
+    },
+    addSet(){
+      if (this.actDateRange !== null) {
+        this.inputQuery.startDate = this.actDateRange[0]+" 00:00:00";
+        this.inputQuery.endDate = this.actDateRange[1]+" 23:59:59";
+      } else {
+        this.inputQuery.startDate = null;
+        this.inputQuery.endDate = null;
+      }
+
+      if(!this.inputQuery.id){
+        saveSet(this.inputQuery,"add").then((response) => {
+            if(response.code == 20000){
+              this.inputQuery.id = response.data.id;
+              this.$message.success("保存成功！");
+            }else{
+              this.$message.error(response.message);
+            }
+
+          })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        saveSet(this.inputQuery,"edit").then((response) => {
+            if(response.code == 20000){
+              this.$message.success("修改成功！");
+            }else{
+              this.$message.error(response.message);
+            }
+
+          })
+          .catch((e) => {
+            console.log(e)
+            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;
+    }
+  },
+  components: {setSelecProduct},
+  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;
+    });
+    if(this.inputQuery.id){
+      this.getOrderDetails();
+      this.actDateRange = [this.inputQuery.startDate, this.inputQuery.endDate];
+    }
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/stat/setDetailDialog.vue b/src/views/stat/setDetailDialog.vue
new file mode 100644
index 0000000..3b465e3
--- /dev/null
+++ b/src/views/stat/setDetailDialog.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="parseInt(dict.value)"
+                        :label="dict.label"
+                        :value="parseInt(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"
+                       :style="item.style"
+                      @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.code"
+                        :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>
+                  <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 {saveSetDetail} from "@/api/stat/statSetDetail";
+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: {
+        getYlqxzczh:[]
+      }
+    }
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        saveSetDetail(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        saveSetDetail(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;
+    },
+  },
+  components: {},
+  created() {
+    getHead("stat-set-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/stat/setSelecProduct.vue b/src/views/stat/setSelecProduct.vue
new file mode 100644
index 0000000..0c0dcf7
--- /dev/null
+++ b/src/views/stat/setSelecProduct.vue
@@ -0,0 +1,257 @@
+<template>
+  <div>
+    <el-card class="el-card">
+      <div>
+       <el-form :model="filterQuery" label-width="120px" v-show="showSearch">
+         <el-row>
+           <el-col :span="8">
+             <el-form-item label="产品编码:" class="query-form-item">
+               <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
+                         clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+           <el-col :span="8">
+             <el-form-item label="产品通用名称:" class="query-form-item">
+               <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
+                         clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+           <el-col :span="8">
+             <el-form-item label="规格型号:" class="query-form-item">
+               <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+         </el-row>
+         <el-row>
+           <el-col :span="8">
+             <el-form-item label="生产企业:" class="query-form-item">
+               <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+                         clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+           <el-col :span="8">
+             <el-form-item label="注册备案号:" class="query-form-item">
+               <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入注册备案号"
+                         clearable="true"></el-input>
+             </el-form-item>
+           </el-col>
+
+         </el-row>
+       </el-form>
+       <div class="top-right-btn">
+         <el-button-group style="display:flex;">
+           <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="searchList">查询</el-button>
+          <el-button type="primary" icon="el-icon-bottom-left" @click="checkCombine"
+                     :loading="combineLoading"
+          >选入</el-button>
+         </el-button-group>
+       </div>
+       <el-divider style="margin: 15px"></el-divider>
+       <el-table v-loading="loading" :data="list" key="1" style="width: 100%"
+                 @selection-change="handleSelectionUdiChange"
+                 border>
+        <el-table-column
+          type="selection"
+          :selectable="checkSelectable"
+          width="55"
+        ></el-table-column>
+         <el-table-column label="序号" type="index"></el-table-column>
+         <el-table-column label="产品通用名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
+         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
+         <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
+         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
+         <el-table-column label="产品DI标识" prop="nameCode" show-overflow-tooltip></el-table-column>
+       </el-table>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {saveSetDetail,getUdiProduct} from "@/api/stat/statSetDetail";
+
+export default {
+  name: "closeDialog",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    relationId: {
+      type: Object,
+      required: true,
+    }
+  },
+
+  data() {
+    return {
+     filterQuery: {
+       unionCode: null,
+       udiCode: null,
+       ylqxzcrbarmc: "",
+       cpmctymc: "",
+       nameCode: "",
+       ggxh: null,
+       page: 1,
+       limit: 20,
+       thrPiId: null,
+       filterType: null,
+       companyName: null,
+       companyIdFk: null,
+     },
+      cpmctymc1: "",
+      combineLoading: false,
+      combineQuery: {
+        setFk: null,
+        products: [],
+      },
+      checked: true,
+      udidlList: [],
+      erpList: [],
+      pageTotal: 0,
+      total: 0,
+      currentRow: null,
+      fromOptions: [],
+      loading: false,
+      erpLloading: false,
+      multipleUdiSelection: [],
+      selectDialog: false,
+      diDetails: null,
+      showSearch: true,
+    };
+  },
+  methods: {
+
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        lockStatus: null,
+        unionCode: null,
+        udiCode: null,
+        ylqxzcrbarmc: "",
+        cpmctymc: "",
+        thrPiId: null,
+        nameCode: "",
+        ggxh: null,
+        page: 1,
+        limit: 20,
+        addType: 1,
+      };
+      this.actDateRange = [];
+      this.udidlList = [];
+    },
+    clear() {
+      this.unionQuery.ylqxzcrbarmc == null;
+      this.unionQuery.cpmctymc = null;
+    },
+    searchList() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+
+   getList() {
+     this.loading = true;
+     this.filterQuery.setFk = this.relationId;
+     console.log(this.filterQuery)
+     getUdiProduct(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;
+       });
+   },
+
+
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+
+    checkSelectable(row) {
+      return !row.check;
+    },
+
+    diDetail(row) {
+      this.diDetails = row;
+      this.selectDialog = true;
+    },
+
+    handleCurrentChange(val) {
+      this.unionQuery.page = val;
+      this.getList();
+    },
+    tableRowClassName({row, rowIndex}) {
+      if (row.check) return "warning-row";
+      return "";
+    },
+    handleErpChange(val) {
+      this.cpmctymc1 = val.cpmctymc;
+      this.currentRow = val;
+    },
+    intentBack() {
+      this.closeDialog();
+    },
+
+    checkCombine() {
+      this.checkedUdi();
+    },
+
+    checkedUdi() {
+      let selectData = this.multipleUdiSelection;
+      console.log(selectData);
+      let selected = null;
+      if (this.multipleUdiSelection.length == 0) {
+          this.$message.warning('请选入产品!');
+          return;
+      } else {
+        selectData.forEach((obj) => {
+          if (obj.check) {
+            selected = obj;
+          }
+          this.combineQuery.products.push(obj);
+        });
+      }
+      if (selected != null) {
+        this.$message.warning("产品：" + selected.cpmctymc + "已被选入");
+        return;
+      }
+      this.combineLoading = true;
+      this.combine();
+    },
+
+    combine() {
+
+      this.combineQuery.setFk = this.relationId;
+      saveSetDetail(this.combineQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+    },
+
+    handleSelectionUdiChange(val) {
+      this.multipleUdiSelection = val;
+    }
+  },
+  components: {
+  },
+  created() {
+  }
+};
+</script>
+