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>