refactor(xumu): 优化保险审计提交逻辑

- 添加耳号列表处理，提高数据准确性 - 使用对象展开运算符简化代码结构 - 优化 API 请求数据格式
feat(AppSellApply): 优化 add 组件并添加耳标号列表
2025-01-22 09:41:03 +08:00 · 2025-01-22 09:39:33 +08:00 · 2025-01-21 14:03:45 +08:00 · 2025-01-21 10:36:10 +08:00 · 2025-01-21 10:25:41 +08:00 · 2025-01-21 10:09:13 +08:00
57 changed files with 1654 additions and 509 deletions
--- a/project/oms/apps/develop/AppDeployCustom/add.vue
+++ b/project/oms/apps/develop/AppDeployCustom/add.vue
@@ -1,56 +1,52 @@
 <template>
  <section class="add">
    <ai-detail>
-      <ai-title slot="title" :title="pageTitle" isShowBottomBorder />
+      <ai-title slot="title" :title="pageTitle" isShowBottomBorder/>
      <template #content>
        <el-tabs tab-position="left">
          <el-tab-pane label="方案设置">
            <el-form ref="AddForm" :model="form" size="small" label-width="120px" :rules="rules">
              <ai-card title="基本信息">
-                <template #content>
-                  <el-form-item label="项目/系统名称" prop="name">
-                    <el-input v-model="form.name" placeholder="请输入" clearable />
+                <div class="grid">
+                  <el-form-item label="项目/系统名称" prop="name" class="row">
+                    <ai-input v-model="form.name"/>
                  </el-form-item>
-                  <el-row type="flex">
-                    <div class="fill">
-                      <el-form-item label="系统类型" prop="type">
-                        <ai-select v-model="form.type" :selectList="dict.getDict('systemType')"
-                          @change="form.apps = []" />
-                      </el-form-item>
-                      <el-form-item label="更新项目路径" prop="dist">
-                        <el-input v-model="form.dist" placeholder="常填写nginx路径,下载包从这里取" clearable />
-                      </el-form-item>
-                    </div>
-                    <div class="fill mar-l16">
-                      <el-form-item label="库项目根路径" prop="customPath">
-                        <el-input v-model="form.customPath" placeholder="请输入" clearable />
-                      </el-form-item>
-                      <el-form-item label="版本号" prop="version">
-                        <el-input v-model="form.version" placeholder="请输入" clearable />
-                      </el-form-item>
-                    </div>
-                  </el-row>
-                </template>
+                  <el-form-item label="系统类型" prop="type">
+                    <ai-select v-model="form.type" dict="systemType" @change="form.apps = []"/>
+                  </el-form-item>
+                  <el-form-item label="库项目根路径" prop="customPath">
+                    <ai-input v-model="form.customPath"/>
+                  </el-form-item>
+                  <el-form-item label="更新项目路径" prop="dist">
+                    <ai-input v-model="form.dist" placeholder="常填写nginx路径,下载包从这里取"/>
+                  </el-form-item>
+                  <el-form-item label="版本号" prop="version">
+                    <ai-input v-model="form.version"/>
+                  </el-form-item>
+                  <el-form-item label="微信机器人" prop="webhook">
+                    <ai-input v-model="form.webhook"/>
+                  </el-form-item>
+                </div>
              </ai-card>
              <ai-card title="主库应用">
                <template #content>
                  <ai-lib-table v-if="form.type" v-model="form.apps" v-bind="$props" multiple searchKey="name"
-                    :action="`/node/wechatapps/list?type=${form.type}&isMain=1`" border />
+                                :action="`/node/wechatapps/list?type=${form.type}&isMain=1`" border/>
                  <ai-empty v-else>请先选择系统类型</ai-empty>
                </template>
              </ai-card>
-              <component class="extraConfig" title="扩展设置" :is="extraConfig" v-model="form.extra" :appList="appList" />
+              <component class="extraConfig" title="扩展设置" :is="extraConfig" v-model="form.extra" :appList="appList"/>
            </el-form>
          </el-tab-pane>
          <el-tab-pane label="方案应用" lazy>
            <ai-lib-table :meta="appList" customData :isShowPagination="false" v-bind="$props" disabled
-              :colConfigs="appListConfigs">
+                          :colConfigs="appListConfigs">
              <template slot="options" slot-scope="{row}">
                <ai-dialog-btn text="编辑" :customFooter="false" dialogTitle="应用配置" width="500px"
-                  @onConfirm="handleAppEdit(row)">
+                               @onConfirm="handleAppEdit(row)">
                  <el-form size="small" label-width="80px">
                    <el-form-item label="应用名称">
-                      <el-input v-model="row.label" clearable placeholder="请输入应用名称" />
+                      <el-input v-model="row.label" clearable placeholder="请输入应用名称"/>
                    </el-form-item>
                  </el-form>
                </ai-dialog-btn>
@@ -68,7 +64,7 @@
 </template>

 <script>
-import { mapActions } from "vuex"
+import {mapActions} from "vuex"
 import AiLibTable from "./AiLibTable";
 import webConfig from "./config/webConfig.vue";
 import wxcpConfig from "./config/wxcpConfig.vue";
@@ -76,7 +72,7 @@ import wxmpConfig from "./config/wxmpConfig.vue";

 export default {
  name: "add",
-  components: { AiLibTable },
+  components: {AiLibTable},
  props: {
    instance: Function,
    dict: Object,
@@ -104,29 +100,29 @@ export default {
  },
  data() {
    return {
-      form: { apps: [], type: null, customPath: "", extra: { sysInfo: {} } },
+      form: {apps: [], type: null, customPath: "", extra: {sysInfo: {}}},
      rules: {
-        name: { required: true, message: "请输入" },
-        type: { required: true, message: "请选择" },
+        name: {required: true, message: "请输入"},
+        type: {required: true, message: "请选择"},
        // customPath: {required: true, message: "请输入"},
      },
      appListConfigs: [
-        { prop: 'label', label: "应用名称", render: (h, { row }) => h(row.tabbar ? 'b' : 'p', row.label + `  ${row.tabbar ? '(底部导航栏)' : ''}`) },
-        { prop: 'project', label: "项目/框架" },
-        { prop: 'category', label: "分类", dict: "appsCategory" },
-        { prop: 'name', label: "模块名" }
+        {prop: 'label', label: "应用名称", render: (h, {row}) => h(row.tabbar ? 'b' : 'p', row.label + `  ${row.tabbar ? '(底部导航栏)' : ''}`)},
+        {prop: 'project', label: "项目/框架"},
+        {prop: 'category', label: "分类", dict: "appsCategory"},
+        {prop: 'name', label: "模块名"}
      ],
    }
  },
  methods: {
    ...mapActions(['closePage']),
    getDetail() {
-      let { id } = this.$route.query
+      let {id} = this.$route.query
      id && this.instance.post("/node/custom/detail", null, {
-        params: { id }
+        params: {id}
      }).then(res => {
        if (res?.data) {
-          this.form = { ...this.form, ...res.data }
+          this.form = {...this.form, ...res.data}
        }
      })
    },
@@ -173,7 +169,7 @@ export default {
  :deep(.tabBarOptions) {
    flex-wrap: wrap;

-    .el-button--text+.el-button--text {
+    .el-button--text + .el-button--text {
      margin-left: 0;
    }
  }
--- a/project/xumu/AppAccountConfigManage/AppAccountConfigManage.vue
+++ b/project/xumu/AppAccountConfigManage/AppAccountConfigManage.vue
@@ -100,7 +100,7 @@ export default {
        </template>
      </el-table-column>
    </ai-table>
-    <ai-dialog v-model="dialog" title="认证材料" width="500px" @close="userId=''"
+    <ai-dialog v-model="dialog" title="场地配置" width="50vw" @close="userId='',getTableData()"
               @open="getTreeData" customFooter>
      <el-button class="mar-b8" type="primary" @click="createNode(treeData)">新增根节点</el-button>
      <el-tree :data="treeData" :props="{label:'name'}" default-expand-all>
@@ -108,7 +108,7 @@ export default {
          <div class="flex" style="width: 100%">
            <span class="fill" v-text="node.label"/>
            <el-button size="mini" type="text" @click="createNode(data)">增加子节点</el-button>
-            <el-button size="mini" type="text" @click="handleDelete(data)">删除</el-button>
+            <el-button size="mini" type="text" @click="handleDelete(data)" v-if="$isEmpty(data.children)" class="del">删除</el-button>
          </div>
        </template>
      </el-tree>
@@ -120,5 +120,9 @@ export default {
 <style scoped lang="scss">
 .AppAccountConfigManage {
  height: 100%;
+
+  .el-button .del {
+    color: #f46;
+  }
 }
 </style>
--- a/project/xumu/AppAccountManage/AppAccountManage.vue
+++ b/project/xumu/AppAccountManage/AppAccountManage.vue
@@ -22,12 +22,13 @@
            <div>{{ row.name }}</div>
          </el-row>
        </el-table-column>
-        <el-table-column slot="options" align="center" label="操作" fixed="right" width="180px">
+        <el-table-column slot="options" align="center" label="操作" fixed="right" width="220px">
          <template slot-scope="{ row }">
            <div class="table-options">
              <el-button type="text" @click="changeEnable(row)">{{ row.status == 1 ? '禁用' : '启用' }}</el-button>
              <el-button type="text" @click="appAllot(row)">编辑</el-button>
-              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+              <el-button type="text" @click="resetPassword(row.id)">重置密码</el-button>
+              <el-button type="text" @click="handleDelete(row)">删除</el-button>
            </div>
          </template>
        </el-table-column>
@@ -40,12 +41,12 @@
        <el-form-item required label="行政区划" prop="areaId">
          <ai-area-get v-model.trim="dialogForm.areaId" placeholder="请选择" :instance="instance"/>
        </el-form-item>
-        <el-form-item required label="账户" prop="username">
-          <el-input v-model.trim="dialogForm.username" placeholder="请输入..." clearable :maxLength="15"/>
-        </el-form-item>
-        <el-form-item required label="账号密码" prop="password" v-if="!isEdit" :rules="[{ required: true, message: '请输入密码' }]">
-          <el-input v-model.trim="dialogForm.password" placeholder="请输入密码" clearable :minlength="6"/>
+        <el-form-item required label="账号" prop="userName">
+          <el-input v-model.trim="dialogForm.userName" placeholder="请输入..." clearable :maxLength="15"/>
        </el-form-item>
+        <!--        <el-form-item required label="账号密码" prop="password" v-if="!isEdit" :rules="[{ required: true, message: '请输入密码' }]">-->
+        <!--          <el-input v-model.trim="dialogForm.password" placeholder="请输入密码" clearable :minlength="6"/>-->
+        <!--        </el-form-item>-->
        <el-form-item required label="角色" prop="roleId">
          <el-select placeholder="请选择角色" :value="dialogForm.roleId" filterable v-model="dialogForm.roleId" clearable>
            <el-option v-for="(op, i) in accountRoles" :key="i" :label="op.name" :value="op.id"/>
@@ -57,6 +58,9 @@
        <el-form-item label="手机号码" prop="phone">
          <el-input v-model.trim="dialogForm.phone" placeholder="请输入..." clearable :maxLength="11"/>
        </el-form-item>
+        <el-form-item label="身份证号" prop="idCard" :rules="[{required:true,message:'请输入身份证号'}]">
+          <ai-input v-model.trim="dialogForm.idCard" :maxLength="18"/>
+        </el-form-item>
      </el-form>
    </ai-dialog>
  </section>
@@ -86,24 +90,23 @@ export default {
      return !!this.dialogForm.id
    },
    dialogTitle() {
-      return this.isEdit ? '功能分配' : '添加账号'
+      return this.isEdit ? '编辑账号' : '添加账号'
    },
    colConfigs() {
      return [
        // {type: 'selection', align: 'center'},
-        {label: "账号", slot: "username"},
+        {label: "账号", prop: "userName"},
        {label: "姓名", slot: "name"},
        {label: "联系方式", prop: "phone", align: 'center'},
        {label: "角色", prop: "roleName", align: 'center'},
        {label: "状态", prop: "status", align: 'center', dict: "enable"},
        {label: "认证状态", prop: "authStatus", align: 'center', dict: "authStatus"},
        {label: "配置状态", prop: "configStatus", align: 'center', dict: "configStatus"},
-        {slot: "options"}
      ]
    },
    rules() {
      return {
-        username: [{required: true, message: "请输入账号"}],
+        userName: [{required: true, message: "请输入账号"}],
        name: [{required: true, message: "请输入姓名"}],
        password: [{required: true, message: '请输入密码'}],
        areaId: [{required: true, message: "请选择行政区划"}],
@@ -193,8 +196,13 @@ export default {
        }
      })
    },
-    handleDelete(ids) {
-      this.$confirm("是否要删除该账号?").then(() => {
+    handleDelete(row) {
+      const {id: ids, authStatus, configStatus} = row
+      let text = "是否要删除该账号?"
+      if (authStatus == 1) {
+        text = configStatus == 1 ? "该账户已经认证，是否确认删除该账户?" : "该账户已经认证及配置，是否确认删除该账户?"
+      }
+      this.$confirm(text).then(() => {
        this.instance.post("/admin/user/del", null, {
          params: {ids}
        }).then(res => {
@@ -215,6 +223,16 @@ export default {
          }
        })
      })
+    },
+    resetPassword(id) {
+      this.$confirm("是否要重置密码?").then(() => {
+        this.instance.post("/api/user/resetPwd", null, {params: {id}}).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("重置成功!")
+            this.getTableData()
+          }
+        })
+      })
    }
  },
  created() {
--- a/project/xumu/AppAuthManage/authList.vue
+++ b/project/xumu/AppAuthManage/authList.vue
@@ -1,7 +1,4 @@
 <script>
-
-import AiSelect from "dui/packages/basic/AiSelect.vue";
-
 const columns = [
  {label: "序号", type: "index"},
  {label: "账号", prop: "userName"},
@@ -13,7 +10,6 @@ const columns = [
 ]
 export default {
  name: "authList",
-  components: {AiSelect},
  props: {
    instance: Function,
    dict: Object,
@@ -29,6 +25,15 @@ export default {
      form: {}
    }
  },
+  watch: {
+    search: {
+      deep: true,
+      handler() {
+        this.page.pageNum = 1
+        this.getTableData()
+      }
+    }
+  },
  methods: {
    getTableData() {
      this.instance.post("/api/user/auth/page", null, {
--- a/project/xumu/AppBreedArchive/AppBreedArchive.vue
+++ b/project/xumu/AppBreedArchive/AppBreedArchive.vue
@@ -0,0 +1,35 @@
+<script>
+import add from "./add.vue";
+import list from "./list.vue";
+
+export default {
+  name: "AppBreedArchive",
+  label: "电子档案",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentPage() {
+      let {hash} = this.$route
+      return hash == "#add" ? add : list
+    }
+  },
+  created() {
+    this.dict.load("archiveStatus", "category", "variety", "insuranceType", "deathReason", "dataSources", "yesOrNo")
+  }
+}
+</script>
+
+<template>
+  <section class="AppBreedArchive">
+    <component :is="currentPage" v-bind="$props"/>
+  </section>
+</template>
+
+<style scoped lang="scss">
+.AppBreedArchive {
+  height: 100%;
+}
+</style>
--- a/project/xumu/AppBreedArchive/add.vue
+++ b/project/xumu/AppBreedArchive/add.vue
@@ -0,0 +1,182 @@
+<script>
+import {mapState} from "vuex"
+
+const columns = {
+  weightList: [
+    {label: "序号", type: "index"},
+    {label: "重量", prop: "weight"},
+    {label: "称重时间", prop: "createTime"},
+    {label: "数据来源", prop: "source", dict: "dataSources"},
+    {label: "是否变更过", prop: "isUpdate", dict: "yesOrNo"},
+  ],
+  immunityList: [
+    {label: "序号", type: "index"},
+    {label: "疫苗名称", prop: "vaccineName"},
+    {label: "用药方式", prop: "method"},
+    {label: "药量(ml)", prop: "dosage"},
+    {label: "生产厂家", prop: "factory"},
+    {label: "厂家批号", prop: "batchNumber"},
+    {label: "免疫时间", prop: "immunityTime"},
+    {label: "登记时间", prop: "createTime"},
+    {label: "防疫员", prop: "userName"},
+  ],
+  treatmentList: [
+    {label: "序号", type: "index"},
+    {label: "药品名称", prop: "drugName"},
+    {label: "药量(ml)", prop: "dosage"},
+    {label: "生产厂家", prop: "factory"},
+    {label: "厂家批号", prop: "batchNumber"},
+    {label: "疾病名称", prop: "diseaseName"},
+    {label: "症状", prop: "symptom"},
+    {label: "兽医", prop: "userName"},
+    {label: "治疗时间", prop: "immunityTime"},
+    {label: "登记时间", prop: "createTime"},
+  ],
+  outList: [
+    {label: "序号", type: "index"},
+    {label: "养殖场", prop: "userName", format: (v, row) => `${[row.farmName, row.houseName, row.penName].join("-")}`},
+    {label: "生物芯片耳标号", prop: "biochipEarNumber"},
+    {label: "类别", prop: "category", dict: "category", width: 120},
+    {label: "品种", prop: "variety", dict: "variety", width: 120},
+    {label: "日龄(天)", prop: "age", width: 80},
+    {label: "淘汰时间", prop: "outTime"},
+    {label: "淘汰原因", prop: "reason"}
+  ],
+  deathList: [
+    {label: "序号", type: "index"},
+    {label: "养殖场", prop: "userName", format: (v, row) => `${[row.farmName, row.houseName, row.penName].join("-")}`},
+    {label: "生物芯片耳标号", prop: "biochipEarNumber"},
+    {label: "类别", prop: "category", dict: "category", width: 120},
+    {label: "品种", prop: "variety", dict: "variety", width: 120},
+    {label: "日龄(天)", prop: "age", width: 80},
+    {label: "死亡时间", prop: "deathTime"},
+    {label: "死亡原因", prop: "reason", dict: "deathReason", width: 80},
+    {label: "登记时间", prop: "createTime"},
+    {label: "操作人", prop: "userName", width: 100},
+  ],
+  insuranceList: [
+    {label: "序号", type: "index"},
+    {label: "保险类型", prop: "insuranceType", dict: "insuranceType"},
+    {label: "保单编号", prop: "orderNo"},
+  ]
+}
+const forms = {
+  device: [
+    {label: "当前温度", prop: "temperature"},
+    {label: "温度状态", prop: "temperatureStatus", dict: "temperatureStatus"},
+    {label: "运动状态", prop: "sportsSituation", dict: "sportsSituation"},
+    {label: "在栏状态", prop: "status", dict: "archiveStatus"},
+  ],
+  loan: [
+    {label: "贷款合同编号", prop: "contractNo"},
+  ]
+}
+const navs = [
+  {label: "体重记录", value: "weightList"},
+  {label: "免疫记录", value: "immunityList"},
+  {label: "治疗记录", value: "treatmentList"},
+  {label: "淘汰记录", value: "outList"},
+  {label: "死亡记录", value: "deathList"},
+  {label: "设备检测", value: "device"},
+  {label: "贷款信息", value: "loan"},
+  {label: "保险信息", value: "insuranceList"},
+]
+export default {
+  name: "baAdd",
+  props: {
+    instance: Function,
+    permissions: Function,
+    dict: Object
+  },
+  data() {
+    return {
+      detail: {detailList: []},
+      active: "weightList",
+      columns, navs, forms
+    }
+  },
+  computed: {
+    ...mapState(["user"]),
+    userinfo: v => v.user.info || {},
+    isAdd: v => !v.$route.query.id,
+    isEdit: v => v.$route.query.edit == 1,
+    pageTitle: v => {
+      const appName = v.$parent.menuName || v.$parent.$options.label
+      return v.$route.query.id ? v.isEdit ? `编辑${appName}` : `${appName}详情` : `新增${appName}`
+    },
+  },
+  methods: {
+    back(params = {}) {
+      this.$router.push(params)
+    },
+    getDetail() {
+      const {id} = this.$route.query
+      return id && this.instance.post("/api/report/getInfo", null, {params: {biochipEarNumber: id}}).then(res => {
+        if (res?.data) {
+          const detail = res.data
+          Object.keys(columns).forEach(key => {
+            detail[key] = detail[key] || []
+          })
+          return this.detail = {...detail}
+        }
+      })
+    },
+  },
+  created() {
+    this.dict.load("auditStatus", "category", "variety")
+    this.getDetail()
+  }
+}
+</script>
+
+<template>
+  <ai-page :title="pageTitle" class="baAdd" showBack content-string="blank">
+    <el-form size="small" label-width="120px" :model="detail" ref="detail">
+      <ai-card title="基础信息">
+        <div class="grid c-3">
+          <el-form-item label="养殖户" prop="userName" class="row">
+            <b v-text="detail.userName"/>
+          </el-form-item>
+          <el-form-item label="养殖场" prop="farmId">
+            <b v-text="detail.farmName"/>
+          </el-form-item>
+          <el-form-item label="养殖舍" prop="houseId">
+            <b v-text="detail.houseName"/>
+          </el-form-item>
+          <el-form-item label="养殖栏" prop="penId">
+            <b v-text="detail.penName"/>
+          </el-form-item>
+          <el-form-item label="生物芯片耳标号" prop="penId">
+            <b v-text="detail.biochipEarNumber"/>
+          </el-form-item>
+          <el-form-item label="电子耳标号" prop="penId">
+            <b v-text="detail.electronicEarNumber"/>
+          </el-form-item>
+          <el-form-item label="原厂耳标号" prop="penId">
+            <b v-text="detail.originalEarNumber"/>
+          </el-form-item>
+        </div>
+      </ai-card>
+      <el-tabs type="border-card" v-model="active">
+        <el-tab-pane v-for="(nav,i) in navs" :key="i" :label="nav.label" :name="nav.value" lazy>
+          <template v-if="active==nav.value">
+            <ai-table v-if="columns[nav.value]" :colConfigs="columns[nav.value]" :table-data="detail[nav.value]" :isShowPagination="!1"/>
+            <el-form v-if="forms[nav.value]" size="small" class="grid" label-width="120px">
+              <el-form-item v-for="(item,i) in forms[nav.value]" :key="i" :label="item.label" :prop="item.prop">
+                <b v-text="dict.getLabel(item.dict||'yesOrNo',detail[item.prop])"/>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-tab-pane>
+      </el-tabs>
+    </el-form>
+    <div slot="footer">
+      <el-button @click="back">返回</el-button>
+    </div>
+  </ai-page>
+</template>
+
+<style scoped lang="scss">
+.baAdd {
+}
+</style>
--- a/project/xumu/AppBreedArchive/list.vue
+++ b/project/xumu/AppBreedArchive/list.vue
@@ -0,0 +1,110 @@
+<script>
+import {mapState} from "vuex"
+
+const columns = [
+  {label: "序号", type: "index"},
+  {label: "养殖户", prop: "userName", width: 100},
+  {label: "养殖场", format: (v, row) => `${[row.farmName, row.houseName, row.penName].join("-")}`, minWidth: 200},
+  {label: "生物芯片耳标号", prop: "biochipEarNumber"},
+  {label: "电子耳标号", prop: "biochipEarNumber"},
+  {label: "原厂耳标号", prop: "biochipEarNumber"},
+  {label: "入栏日期", prop: "createTime", width: 160},
+  {label: "饲养时长(天)", prop: "days", width: 100, align: 'right', headerAlign: 'center'},
+  {label: "最新体重(公斤)", prop: "weight", width: 120, align: 'right', headerAlign: 'center'},
+  // {label: "当前体温", prop: "temperatureStatus", dict: 'temperatureStatus'},
+  // {label: "运动情况", prop: "sportsSituation", dict: "sportsSituation"},
+]
+export default {
+  name: "baList",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  data() {
+    return {
+      columns,
+      tableData: [],
+      page: {pageNum: 1, pageSize: 10, total: 0},
+      search: {},
+      dialog: false,
+      form: {}
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    userinfo: v => v.user.info || {},
+    pageTitle: v => v.$parent.menuName || v.$parent.$options.label
+  },
+  watch: {
+    search: {
+      deep: true,
+      handler() {
+        this.page.pageNum = 1
+        this.getTableData()
+      }
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/api/report/getArchivePage", {...this.page, ...this.search}).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+  },
+  created() {
+    this.getTableData()
+  }
+}
+</script>
+
+<template>
+  <ai-page class="baList" :title="pageTitle">
+    <ai-search-bar>
+      <template #left>
+        <ai-select placeholder="全部养殖户" v-model="search.userId" :instance="instance" :action="`/api/report/getOrgList`" :prop="{label:'name'}" readonly/>
+        <ai-select placeholder="全部养殖场" v-model="search.farmId" :instance="instance" :action="`/api/siteUser/querySiteByUserId?userId=${search.userId||''}`" :prop="{label:'name'}"/>
+        <ai-select placeholder="全部养殖舍" v-model="search.houseId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.farmId||-1}`" :prop="{label:'name'}"/>
+        <ai-select placeholder="全部养殖栏" v-model="search.penId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.houseId||-1}`" :prop="{label:'name'}"/>
+        <ai-input placeholder="生物芯片耳标号" v-model="search.biochipEarNumber"/>
+        <ai-input placeholder="电子耳标号" v-model="search.electronicEarNumber"/>
+        <ai-input placeholder="原厂耳标号" v-model="search.originalEarNumber"/>
+        <ai-select placeholder="全部状态" v-model="search.status" dict="archiveStatus"/>
+        <ai-select placeholder="全部类别" v-model="search.category" dict="category"/>
+        <ai-select placeholder="全部品种" v-model="search.variety" dict="variety"/>
+        <ai-search label="入栏日期">
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+        </ai-search>
+      </template>
+    </ai-search-bar>
+    <ai-search-bar>
+      <template #left>
+        <ai-download :instance="instance" url="/api/report/exportArchive" :params="{...search,...page}" :fileName="`${pageTitle}导出表-${Date.now()}`"/>
+      </template>
+    </ai-search-bar>
+    <ai-table :tableData="tableData" :colConfigs="columns" :dict="dict" @getList="getTableData"
+              :total="page.total" :current.sync="page.pageNum" :size.sync="page.pageSize">
+      <el-table-column slot="options" label="操作" fixed="right" align="center">
+        <template slot-scope="{row}">
+          <div class="table-options">
+            <el-button type="text" @click="$router.push({hash:'#add',query:{id:row.biochipEarNumber}})">查看</el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </ai-table>
+  </ai-page>
+</template>
+
+<style scoped lang="scss">
+.baList {
+  height: 100%;
+
+  .deleteBtn {
+    color: $errorColor;
+  }
+}
+</style>
--- a/project/xumu/AppClaimApply/AppClaimApply.vue
+++ b/project/xumu/AppClaimApply/AppClaimApply.vue
@@ -12,19 +12,19 @@ export default {
  },
  computed: {
    currentPage() {
-      let {hash} = this.$route
+      let { hash } = this.$route
      return ["#claim", "#add"].includes(hash) ? add : list
    }
  },
  created() {
-    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety")
+    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety", "productType")
  },
 }
 </script>

 <template>
  <section class="AppClaimApply">
-    <component :is="currentPage" v-bind="$props"/>
+    <component :is="currentPage" v-bind="$props" />
  </section>
 </template>

--- a/project/xumu/AppClaimApply/add.vue
+++ b/project/xumu/AppClaimApply/add.vue
@@ -1,17 +1,17 @@
 <script>
-import {mapState} from "vuex"
+import { mapState } from "vuex"
 import AiEartagPicker from "@project/xumu/components/AiEartagPicker.vue";

 const records = [
-  {label: "序号", type: "index"},
-  {label: "报案号", prop: "reportNo"},
-  {label: "审批状态", prop: "auditStatus", dict: "auditStatus"},
-  {label: "审批时间", prop: "auditTime"},
-  {label: "审批人", prop: "auditName"},
+  { label: "序号", type: "index" },
+  { label: "报案号", prop: "reportNo" },
+  { label: "审批状态", prop: "auditStatus", dict: "auditStatus" },
+  { label: "审批时间", prop: "auditTime" },
+  { label: "审批人", prop: "auditName" },
 ]
 export default {
  name: "claimAdd",
-  components: {AiEartagPicker},
+  components: { AiEartagPicker },
  props: {
    instance: Function,
    permissions: Function,
@@ -19,7 +19,7 @@ export default {
  },
  data() {
    return {
-      detail: {detailList: []},
+      detail: { detailList: [], list: [] },
      records
    }
  },
@@ -32,17 +32,17 @@ export default {
    },
    isClaim: v => v.$route.hash == "#claim",
    formImages: v => [
-      {label: "勘察报告书", prop: "surveyPicture", rules: {required: v.isClaim, message: '请上传 勘察报告书'}},
-      {label: "无害化回执单", prop: "receiptPicture", rules: {required: v.isClaim, message: '请上传 无害化回执单'}},
+      { label: "勘察报告书", prop: "surveyPicture", rules: { required: v.isClaim, message: '请上传 勘察报告书' } },
+      { label: "无害化回执单", prop: "receiptPicture", rules: { required: v.isClaim, message: '请上传 无害化回执单' } },
    ],
    columns: v => [
-      {label: "序号", type: "index"},
-      {label: "生物芯片耳标号", prop: "biochipEarNumber"},
-      {label: "身长测量照片", prop: "heightPicture", upload: {instance: v.instance, readonly: !v.isClaim, valueIsUrl: !0, limit: 1}},
-      {label: "电子耳标照片", prop: "earNumberPicture", upload: {instance: v.instance, readonly: !v.isClaim, valueIsUrl: !0, limit: 1}},
-      {label: "防疫耳标照片", prop: "preventionPicture", upload: {instance: v.instance, readonly: !v.isClaim, valueIsUrl: !0, limit: 1}},
-      {label: "无害化处理照片", prop: "harmlessPicture", upload: {instance: v.instance, readonly: !v.isClaim, valueIsUrl: !0, limit: 1}},
-      {label: "报案号", prop: "reportNo", hide: v.isClaim},
+      { label: "序号", type: "index" },
+      { label: "生物芯片耳标号", prop: "biochipEarNumber" },
+      { label: "身长测量照片", prop: "heightPicture", upload: { instance: v.instance, readonly: !v.isClaim, valueIsUrl: !0, limit: 1 } },
+      { label: "电子耳标照片", prop: "earNumberPicture", upload: { instance: v.instance, readonly: !v.isClaim, valueIsUrl: !0, limit: 1 } },
+      { label: "防疫耳标照片", prop: "preventionPicture", upload: { instance: v.instance, readonly: !v.isClaim, valueIsUrl: !0, limit: 1 } },
+      { label: "无害化处理照片", prop: "harmlessPicture", upload: { instance: v.instance, readonly: !v.isClaim, valueIsUrl: !0, limit: 1 } },
+      { label: "报案号", prop: "reportNo", hide: v.isClaim },
    ].filter(e => !e.hide),
    selectedEartags: v => v.detail.list?.length || 0,
  },
@@ -51,17 +51,18 @@ export default {
      this.$router.push(params)
    },
    getDetail() {
-      const {id} = this.$route.query
-      return id && this.instance.post("/api/insurance/claim/apply/getInfo", null, {params: {orderNo: id}}).then(res => {
+      const { id } = this.$route.query
+      return id && this.instance.post("/api/insurance/claim/apply/getInfo", null, { params: { orderNo: id } }).then(res => {
        if (res?.data) {
          const detail = res.data
-          return this.detail = {...detail}
+          detail.detailList = detail.detailList || []
+          return this.detail = { ...detail }
        }
      })
    },
    submit() {
      this.$refs.detail.validate().then(() => {
-        this.instance.post("/api/insurance/claim/apply/add", {...this.detail}).then(res => {
+        this.instance.post("/api/insurance/claim/apply/add", { ...this.detail }).then(res => {
          if (res?.code == '0') {
            this.$message.success("提交成功!")
            this.back()
@@ -82,43 +83,44 @@ export default {
      <ai-card title="基础信息">
        <div class="grid">
          <el-form-item label="养殖场" prop="farmId">
-            <b v-text="detail.farmName"/>
+            <b v-text="detail.farmName" />
          </el-form-item>
          <el-form-item label="承保公司" prop="companyId">
-            <b v-text="detail.companyName"/>
+            <b v-text="detail.companyName" />
          </el-form-item>
          <el-form-item label="投保类型">
-            <ai-input :value="dict.getLabel('insureType',detail.insureType)" :edit="!1"/>
+            <ai-input :value="dict.getLabel('insureType', detail.insureType)" :edit="!1" />
          </el-form-item>
          <el-form-item label="保险产品" prop="productType">
-            <b v-text="detail.productType"/>
+            <b v-text="dict.getLabel('productType',detail.productType)" />
          </el-form-item>
          <el-form-item label="联系人">
-            <ai-input v-model="detail.contacts" :edit="!1"/>
+            <ai-input v-model="detail.contacts" :edit="!1" />
          </el-form-item>
          <el-form-item label="联系电话">
-            <ai-input v-model="detail.phone" :edit="!1"/>
+            <ai-input v-model="detail.phone" :edit="!1" />
          </el-form-item>
        </div>
      </ai-card>
      <ai-card title="投保对象">
        <template #right v-if="isClaim">
-          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance"
-                            :action="`/api/insurance/claim/apply/getClaimEarNumberList?orderNo=${detail.orderNo}`">
+          <ai-eartag-picker @select="v => detail.detailList = v.map(e=>({biochipEarNumber:e}))" :instance="instance"
+            :action="`/api/insurance/claim/apply/getClaimEarNumberList?orderNo=${detail.orderNo}`">
            <el-button type="text">选择</el-button>
          </ai-eartag-picker>
        </template>
-        <ai-highlight class="mar-b8 font-14" :content="`投保标的共${detail.insureNumber||0}只，已理赔标的共 @v 只`" color="red" :value="selectedEartags"/>
-        <ai-table :tableData="detail.detailList" :colConfigs="columns" :isShowPagination="!1" hideOptions/>
+        <ai-highlight class="mar-b8 font-14" :content="`投保标的共${detail.insureNumber || 0}只，已理赔标的共 @v 只`" color="red"
+          :value="selectedEartags" />
+        <ai-table :tableData="detail.detailList" :colConfigs="columns" :isShowPagination="!1" hideOptions />
      </ai-card>
      <ai-card title="理赔材料" v-if="isClaim">
        <div class="font-12 mar-b8">只能上传JPG/PNG文件，且不超过2M，一次最多5张</div>
-        <el-form-item v-for="(img,i) in formImages" :key="i" v-bind="img">
-          <ai-uploader v-model="detail[img.prop]" :instance="instance" value-is-url :limit="5"/>
+        <el-form-item v-for="(img, i) in formImages" :key="i" v-bind="img">
+          <ai-uploader v-model="detail[img.prop]" :instance="instance" value-is-url :limit="5" />
        </el-form-item>
      </ai-card>
      <ai-card title="理赔记录" v-else>
-        <ai-table :tableData="detail.list" :colConfigs="records" :isShowPagination="!1" hideOptions/>
+        <ai-table :tableData="detail.list" :colConfigs="records" :isShowPagination="!1" hideOptions />
      </ai-card>
    </el-form>
    <div slot="footer">
--- a/project/xumu/AppClaimApply/list.vue
+++ b/project/xumu/AppClaimApply/list.vue
@@ -48,7 +48,7 @@ export default {
    getTableData() {
      this.instance.post("/api/insurance/claim/apply/page", {...this.page, ...this.search}).then(res => {
        if (res?.data) {
-          this.tableData = res.data?.records.map(e => ({...e, permit: `${e.status}` + e.auditStatus}))
+          this.tableData = res.data?.records.map(e => ({...e, permit: e.remarks == "可申请理赔"}))
          this.page.total = res.data.total
        }
      })
@@ -67,8 +67,8 @@ export default {
        <ai-input placeholder="投保订单号" v-model="search.orderNo"/>
        <ai-select placeholder="全部投保类型" v-model="search.insureType" dict="insureType"/>
        <ai-search label="投保日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-input placeholder="养殖户" v-model="search.applyName"/>
        <ai-input placeholder="养殖场" v-model="search.farmName"/>
@@ -84,7 +84,7 @@ export default {
      <el-table-column slot="options" label="操作" fixed="right" align="center">
        <template slot-scope="{row}">
          <div class="table-options">
-            <template v-if="['12'].includes(row.permit)">
+            <template v-if="row.permit">
              <el-button type="text" @click="dialog=true,$set(form,'id',row.orderNo)">理赔</el-button>
            </template>
            <el-button v-else type="text" @click="$router.push({hash:'#add',query:{id:row.orderNo}})">查看</el-button>
--- a/project/xumu/AppClaimAudit/AppClaimAudit.vue
+++ b/project/xumu/AppClaimAudit/AppClaimAudit.vue
@@ -12,19 +12,19 @@ export default {
  },
  computed: {
    currentPage() {
-      let {hash} = this.$route
+      let { hash } = this.$route
      return ["#audit", "#add"].includes(hash) ? add : list
    }
  },
  created() {
-    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety")
+    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety", "productType")
  },
 }
 </script>

 <template>
  <section class="AppClaimAudit">
-    <component :is="currentPage" v-bind="$props"/>
+    <component :is="currentPage" v-bind="$props" />
  </section>
 </template>

--- a/project/xumu/AppClaimAudit/add.vue
+++ b/project/xumu/AppClaimAudit/add.vue
@@ -90,7 +90,7 @@ export default {
            <ai-input :value="dict.getLabel('insureType',detail.insureType)" :edit="!1"/>
          </el-form-item>
          <el-form-item label="保险产品" prop="productType">
-            <b v-text="detail.productType"/>
+            <b v-text="dict.getLabel('productType',detail.productType)"/>
          </el-form-item>
          <el-form-item label="联系人">
            <ai-input v-model="detail.contacts" :edit="!1"/>
--- a/project/xumu/AppClaimAudit/list.vue
+++ b/project/xumu/AppClaimAudit/list.vue
@@ -68,8 +68,8 @@ export default {
        <ai-select placeholder="全部审批状态" v-model="search.auditStatus" dict="auditStatus"/>
        <ai-select placeholder="全部投保状态" v-model="search.status" dict="insureStatus"/>
        <ai-search label="投保日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-input placeholder="养殖户" v-model="search.applyName"/>
        <ai-input placeholder="养殖场" v-model="search.farmName"/>
--- a/project/xumu/AppDeathAudit/AppDeathAudit.vue
+++ b/project/xumu/AppDeathAudit/AppDeathAudit.vue
@@ -0,0 +1,35 @@
+<script>
+import add from "./add.vue";
+import list from "./list.vue";
+
+export default {
+  name: "AppDeathAudit",
+  label: "死亡审核",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentPage() {
+      let {hash} = this.$route
+      return ["#audit", "#add"].includes(hash) ? add : list
+    }
+  },
+  created() {
+    this.dict.load("auditStatus", "deathReason", "category", "variety")
+  },
+}
+</script>
+
+<template>
+  <section class="AppDeathAudit">
+    <component :is="currentPage" v-bind="$props"/>
+  </section>
+</template>
+
+<style scoped lang="scss">
+.AppDeathAudit {
+  height: 100%;
+}
+</style>
--- a/project/xumu/AppDeathAudit/add.vue
+++ b/project/xumu/AppDeathAudit/add.vue
@@ -0,0 +1,155 @@
+<script>
+import { mapState } from "vuex"
+import AiAudit from "../components/AiAudit.vue";
+
+export default {
+  name: "deathAdd",
+  props: {
+    instance: Function,
+    permissions: Function,
+    dict: Object
+  },
+  data() {
+    return {
+      detail: { detailList: [] }
+    }
+  },
+  components:{AiAudit},
+  computed: {
+    ...mapState(["user"]),
+    userinfo: v => v.user.info || {},
+    pageTitle: v => {
+      const appName = v.$parent.menuName || v.$parent.$options.label
+      return v.isAudit ? `${appName}审批` : `${appName}详情`
+    },
+    isAudit: v => v.$route.hash == "#audit",
+    formImages: v => [
+      { label: "身长测量照片", prop: "heightPic" },
+      { label: "生物芯片照片", prop: "biochipPic" },
+      { label: "防疫耳标照片", prop: "preventionPic" },
+      { label: "其他说明照片", prop: "otherPic" },
+    ],
+  },
+  methods: {
+    back(params = {}) {
+      this.$router.push(params)
+    },
+    getDetail() {
+      const { id } = this.$route.query
+      return id && this.instance.post("/api/breed/death/getAuditPage", { id }).then(res => {
+        if (res?.data?.records?.[0]) {
+          const detail = res.data.records[0] || {}
+          if (detail.picture) {
+            Object.entries(JSON.parse(detail.picture)).forEach(([key, value]) => {
+              detail[key] = value
+            })
+          }
+          return this.detail = { ...detail }
+        }
+      })
+    },
+    submit() {
+      this.$refs.detail.validate().then(() => {
+        this.instance.post("/api/breed/death/audit", { ...this.detail }).then(res => {
+          if (res?.code == '0') {
+            this.$message.success("提交成功!")
+            this.back()
+          }
+        })
+      })
+    }
+  },
+  created() {
+    this.getDetail()
+  }
+}
+</script>
+
+<template>
+  <ai-page :title="pageTitle" class="deathAdd" showBack content-string="blank">
+    <el-form size="small" label-width="120px" :model="detail" ref="detail">
+      <ai-card title="基础信息">
+        <div class="grid c-4">
+          <el-form-item label="生物芯片耳标号" class="row">
+            <b v-text="detail.biochipEarNumber" />
+          </el-form-item>
+          <el-form-item label="养殖场" prop="farmId">
+            <b v-text="detail.farmName" />
+          </el-form-item>
+          <el-form-item label="养殖舍" prop="houseId">
+            <b v-text="detail.houseName" />
+          </el-form-item>
+          <el-form-item label="养殖栏" prop="penId">
+            <b v-text="detail.penName" />
+          </el-form-item>
+          <el-form-item label="电子耳标号" prop="electronicEarNumber">
+            <b v-text="detail.electronicEarNumber" />
+          </el-form-item>
+          <el-form-item label="原厂耳标号" prop="category">
+            <b v-text="detail.originalEarNumber" />
+          </el-form-item>
+          <el-form-item label="类别" prop="category">
+            <b v-text="dict.getLabel('category', detail.category)" />
+          </el-form-item>
+          <el-form-item label="品种" prop="variety">
+            <b v-text="dict.getLabel('variety', detail.variety)" />
+          </el-form-item>
+          <div class="row flex">
+            <el-form-item v-for="(img, i) in formImages" :key="i" v-bind="img">
+              <ai-uploader v-model="detail[img.prop]" value-is-url readonly />
+            </el-form-item>
+          </div>
+        </div>
+      </ai-card>
+      <ai-card title="死亡信息">
+        <el-form-item label="死亡原因">
+          <b v-text="dict.getLabel('deathReason', detail.reason)" />
+        </el-form-item>
+        <el-form-item label="死亡日期">
+          <b v-text="detail.deathTime" />
+        </el-form-item>
+        <el-form-item label="备注">
+          <b v-text="detail.remark" />
+        </el-form-item>
+      </ai-card>
+      <ai-card title="审核信息">
+        <div class="grid">
+          <template v-if="isAudit">
+            <el-form-item label="审批状态" prop="auditStatus" :rules="{ required: true, message: '请选择审批状态' }">
+              <ai-audit @change="v => $set(detail, 'auditStatus', v)" />
+            </el-form-item>
+            <el-form-item label="意见">
+              <ai-input type="textarea" :rows="3" v-model="detail.remark" />
+            </el-form-item>
+          </template>
+          <template v-else>
+            <el-form-item label="审核状态">{{ dict.getLabel('auditStatus', detail.auditStatus) }}</el-form-item>
+            <el-form-item label="审核时间">{{ detail.auditTime }}</el-form-item>
+            <el-form-item label="审核人">{{ detail.auditName }}</el-form-item>
+            <el-form-item label="意见">{{ detail.remarks }}</el-form-item>
+          </template>
+        </div>
+      </ai-card>
+    </el-form>
+    <div slot="footer">
+      <template v-if="isAudit">
+        <el-button type="primary" @click="submit">提交</el-button>
+      </template>
+      <el-button @click="back">返回</el-button>
+    </div>
+  </ai-page>
+</template>
+
+<style scoped lang="scss">
+.deathAdd {
+  :deep(.el-form--label-top) {
+    .el-form-item__label {
+      width: 100% !important;
+    }
+
+    .el-form-item__content {
+      margin-left: unset !important;
+    }
+  }
+}
+</style>
--- a/project/xumu/AppDeathAudit/list.vue
+++ b/project/xumu/AppDeathAudit/list.vue
@@ -0,0 +1,112 @@
+<script>
+import {mapState} from "vuex"
+
+const columns = [
+  {label: "序号", type: "index"},
+  {label: "养殖场", format: (v, row) => `${[row.farmName, row.houseName, row.penName].join("-")}`},
+  {label: "生物芯片耳标号", prop: "biochipEarNumber"},
+  {label: "类别", prop: "category", dict: "category", width: 120},
+  {label: "品种", prop: "variety", dict: "variety", width: 120},
+  {label: "日龄(天)", prop: "age", width: 80},
+  {label: "死亡时间", prop: "deathTime"},
+  {label: "死亡原因", prop: "reason", dict: "deathReason", width: 80},
+  {label: "登记时间", prop: "createTime"},
+  {label: "操作人", prop: "userName", width: 100},
+  {label: "审核状态", prop: "auditStatus", dict: "auditStatus", width: 80},
+]
+export default {
+  name: "deathList",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  data() {
+    return {
+      columns,
+      tableData: [],
+      page: {pageNum: 1, pageSize: 10, total: 0},
+      search: {},
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    userinfo: v => v.user.info || {},
+    pageTitle: v => v.$parent.menuName || v.$parent.$options.label
+  },
+  watch: {
+    search: {
+      deep: true,
+      handler() {
+        this.page.pageNum = 1
+        this.getTableData()
+      }
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/api/breed/death/getAuditPage", {...this.page, ...this.search}).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records.map(e => ({...e, permit: `${e.status}` + e.auditStatus}))
+          this.page.total = res.data.total
+        }
+      })
+    },
+  },
+  created() {
+    this.getTableData()
+  }
+}
+</script>
+
+<template>
+  <ai-page class="deathList" :title="pageTitle">
+    <ai-search-bar>
+      <template #left>
+        <ai-select placeholder="全部养殖场" v-model="search.farmId" :instance="instance" :action="`/api/siteUser/querySiteByUserId?userId=${userinfo.id}`" :prop="{label:'name'}"/>
+        <ai-select placeholder="全部养殖舍" v-model="search.houseId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.farmId||-1}`" :prop="{label:'name'}"/>
+        <ai-select placeholder="全部养殖栏" v-model="search.penId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.houseId||-1}`" :prop="{label:'name'}"/>
+        <ai-select placeholder="全部审核状态" v-model="search.auditStatus" dict="auditStatus"/>
+        <ai-search label="死亡日期">
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.deathBeginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.deathEndDate" type="datetime" placeholder="结束日期" size="small"/>
+        </ai-search>
+        <ai-search label="登记日期">
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+        </ai-search>
+        <ai-input placeholder="原场耳标号" v-model="search.originalEarNumber"/>
+        <ai-input placeholder="生物芯片耳标号" v-model="search.biochipEarNumber"/>
+        <ai-input placeholder="电子耳标号" v-model="search.electronicEarNumber"/>
+      </template>
+    </ai-search-bar>
+    <ai-search-bar>
+      <template #left>
+        <ai-download :instance="instance" url="/api/breed/death/exportAudit" :params="{...search,...page}" :fileName="`${pageTitle}导出表-${Date.now()}`"/>
+      </template>
+    </ai-search-bar>
+    <ai-table :tableData="tableData" :colConfigs="columns" :dict="dict" @getList="getTableData"
+              :total="page.total" :current.sync="page.pageNum" :size.sync="page.pageSize">
+      <el-table-column slot="options" label="操作" fixed="right" align="center">
+        <template slot-scope="{row}">
+          <div class="table-options">
+            <template v-if="['1'].includes(row.auditStatus)">
+              <el-button type="text" @click="$router.push({hash:'#audit',query:{id:row.id}})">审核</el-button>
+            </template>
+            <el-button v-else type="text" @click="$router.push({hash:'#add',query:{id:row.id}})">查看</el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </ai-table>
+  </ai-page>
+</template>
+
+<style scoped lang="scss">
+.deathList {
+  height: 100%;
+
+  .deleteBtn {
+    color: $errorColor;
+  }
+}
+</style>
--- a/project/xumu/AppDeathManage/AppDeathManage.vue
+++ b/project/xumu/AppDeathManage/AppDeathManage.vue
@@ -12,19 +12,19 @@ export default {
  },
  computed: {
    currentPage() {
-      let {hash} = this.$route
+      let { hash } = this.$route
      return hash == "#add" ? add : list
    }
  },
-  data() {
-    return {}
+  created() {
+    this.dict.load("yesOrNo", "category", "variety", "deathReason", "auditStatus")
  }
 }
 </script>

 <template>
  <section class="AppDeathManage">
-    <component :is="currentPage" v-bind="$props"/>
+    <component :is="currentPage" v-bind="$props" />
  </section>
 </template>

--- a/project/xumu/AppDeathManage/add.vue
+++ b/project/xumu/AppDeathManage/add.vue
@@ -1,14 +1,16 @@
 <script>
 import {mapState} from "vuex"
+import AiEartagRemote from "@project/xumu/components/AiEartagRemote.vue";

 const formImages = [
-  {label: "身长测量照片", prop: "heightPic", rules: {required: true, message: '请上传 身长测量照片'}},
-  {label: "生物芯片照片", prop: "biochipPic", rules: {required: true, message: '请上传 生物芯片照片'}},
-  {label: "防疫耳标照片", prop: "preventionPic", rules: {required: true, message: '请上传 防疫耳标照片'}},
-  {label: "其他说明照片", prop: "otherPic", rules: {required: true, message: '请上传 其他说明照片'}},
+  {label: "身长测量照片", prop: "heightPic",},
+  {label: "生物芯片照片", prop: "biochipPic",},
+  {label: "防疫耳标照片", prop: "preventionPic",},
+  {label: "其他说明照片", prop: "otherPic",},
 ]
 export default {
  name: "deathAdd",
+  components: {AiEartagRemote},
  props: {
    instance: Function,
    permissions: Function,
@@ -53,7 +55,7 @@ export default {
      this.$refs.detail.validate().then(() => {
        const {biochipEarNumber, id, deathTime, heightPic, biochipPic, preventionPic, otherPic, reason, remarks} = this.detail
        this.instance.post("/api/breed/death/addOrEdit", {
-          biochipEarNumber, id, deathTime, picture: {heightPic, biochipPic, preventionPic, otherPic}, reason, remarks
+          biochipEarNumber, id, deathTime, picture: JSON.stringify({heightPic, biochipPic, preventionPic, otherPic}), reason, remarks
        }).then(res => {
          if (res?.code == 0 && res?.data != 1) {
            this.$confirm("是否返回列表页?", "提交成功").then(() => this.back()).catch(() => this.getDetail(biochipEarNumber))
@@ -71,10 +73,12 @@ export default {
          }
        })
      })
-    }
+    },
+    handlerAutocomplete(value) {
+      'biochipEarNumber|farmId|houseId|penId|electronicEarNumber|originalEarNumber|category|variety'.split("|").forEach(prop => this.$set(this.detail, prop, value[prop]))
+    },
  },
  created() {
-    this.dict.load("yesOrNo", "category", "variety", "deathReason")
    this.getDetail(this.$route.query.id)
  }
 }
@@ -85,7 +89,7 @@ export default {
    <el-form size="small" label-width="120px" :model="detail" ref="detail">
      <ai-card title="基础信息">
        <div class="grid c-4">
-          <ai-input class="row" v-model="detail.biochipEarNumber" placeholder="请输入耳标号按回车查询,或扫描耳标号" @input="getDetail"/>
+          <ai-eartag-remote :instance="instance" @enter="handlerAutocomplete" class="row"/>
          <el-form-item label="生物芯片耳标号">
            <b v-text="detail.biochipEarNumber"/>
          </el-form-item>
@@ -101,7 +105,7 @@ export default {
          <el-form-item label="电子耳标号" prop="electronicEarNumber">
            <b v-text="detail.electronicEarNumber"/>
          </el-form-item>
-          <el-form-item label="原厂耳标号" prop="category">
+          <el-form-item label="原厂耳标号" prop="originalEarNumber">
            <b v-text="detail.originalEarNumber"/>
          </el-form-item>
          <el-form-item label="类别" prop="category">
@@ -122,13 +126,13 @@ export default {
      </ai-card>
      <ai-card title="死亡录入">
        <div class="grid">
-          <el-form-item label="死亡日期" prop="createTime" :rules="[{required:true,message:'请选择死亡日期'}]">
-            <el-date-picker v-if="isAdd||isEdit" v-model="detail.createTime"/>
-            <b v-text="detail.createTime"/>
+          <el-form-item label="死亡日期" prop="deathTime" :rules="[{required:isAdd||isEdit,message:'请选择死亡日期'}]">
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-if="isAdd||isEdit" v-model="detail.deathTime"/>
+            <b v-else v-text="detail.deathTime"/>
          </el-form-item>
-          <el-form-item label="死亡原因" prop="reason" :rules="[{required:true,message:'请选择死亡原因'}]">
+          <el-form-item label="死亡原因" prop="reason" :rules="[{required:isAdd||isEdit,message:'请选择死亡原因'}]">
            <ai-select v-if="isAdd||isEdit" v-model="detail.reason" dict="deathReason"/>
-            <b v-text="detail.reason"/>
+            <b v-else v-text="dict.getLabel('deathReason',detail.reason)"/>
          </el-form-item>
          <el-form-item label="备注" prop="remark" class="row">
            <ai-input type="textarea" :row="3" v-model="detail.remark" :edit="isAdd||isEdit"/>
--- a/project/xumu/AppDeathManage/list.vue
+++ b/project/xumu/AppDeathManage/list.vue
@@ -3,7 +3,7 @@ import {mapState} from "vuex"

 const columns = [
  {label: "序号", type: "index"},
-  {label: "养殖场", prop: "userName", format: (v, row) => `${[row.farmName, row.houseName, row.penName].join("-")}`},
+  {label: "养殖场",format: (v, row) => `${[row.farmName, row.houseName, row.penName].join("-")}`},
  {label: "生物芯片耳标号", prop: "biochipEarNumber"},
  {label: "类别", prop: "category", dict: "category", width: 120},
  {label: "品种", prop: "variety", dict: "variety", width: 120},
@@ -79,7 +79,6 @@ export default {
    }
  },
  created() {
-    this.dict.load("auditStatus", "category", "variety")
    this.getTableData()
  }
 }
@@ -94,12 +93,12 @@ export default {
        <ai-select placeholder="全部养殖栏" v-model="search.penId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.houseId||-1}`" :prop="{label:'name'}"/>
        <ai-select placeholder="全部审核状态" v-model="search.auditStatus" dict="auditStatus"/>
        <ai-search label="死亡日期">
-          <el-date-picker v-model="search.deathBeginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.deathEndDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.deathBeginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.deathEndDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-search label="登记日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-input placeholder="原场耳标号" v-model="search.originalEarNumber"/>
        <ai-input placeholder="生物芯片耳标号" v-model="search.biochipEarNumber"/>
--- a/project/xumu/AppEarTag/etAdd.vue
+++ b/project/xumu/AppEarTag/etAdd.vue
@@ -1,17 +1,6 @@
 <script>
 import {mapState} from "vuex"

-const columns = [
-  {label: "序号", type: "index"},
-  {label: "生物芯片耳标号", prop: "biochipEarNumber", edit: 1},
-  {label: "电子耳标号", prop: "electronicEarNumber", edit: 1},
-  {label: "原厂耳标号", prop: "originalEarNumber", edit: 1},
-  {label: "戴耳标照片", prop: "picture", upload: {valueIsUrl: !0}},
-  {label: "品种", prop: "variety", select: {dict: "variety"}},
-  {label: "类别", prop: "category", select: {dict: "category"}},
-  {label: "日龄/天", prop: "age", num: 1},
-  {label: "体重/公斤", prop: "weight", num: 1},
-]
 export default {
  name: "etAdd",
  props: {
@@ -22,7 +11,6 @@ export default {
  data() {
    return {
      detail: {detailList: []},
-      columns,
    }
  },
  computed: {
@@ -34,6 +22,17 @@ export default {
      const appName = v.$parent.menuName || v.$parent.$options.label
      return v.$route.query.id ? v.isEdit ? `编辑${appName}` : `${appName}详情` : `新增${appName}`
    },
+    columns: v => [
+      {label: "序号", type: "index"},
+      {label: "生物芯片耳标号", prop: "biochipEarNumber", edit: 1},
+      {label: "电子耳标号", prop: "electronicEarNumber", edit: 1},
+      {label: "原厂耳标号", prop: "originalEarNumber", edit: 1},
+      {label: "戴耳标照片", prop: "picture", upload: {valueIsUrl: !0, instance: v.instance, limit: 1}},
+      {label: "品种", prop: "variety", select: {dict: "variety"}},
+      {label: "类别", prop: "category", select: {dict: "category"}},
+      {label: "日龄/天", prop: "age", num: 1},
+      {label: "体重/公斤", prop: "weight", num: 1},
+    ]
  },
  methods: {
    back(params = {}) {
@@ -55,6 +54,10 @@ export default {
    },
    submit() {
      this.$refs.detail.validate().then(() => {
+        if (this.isEdit) {
+          const {biochipEarNumber, electronicEarNumber, originalEarNumber, picture, variety, category, age, weight} = this.detail
+          this.detail.detailList = [{biochipEarNumber, electronicEarNumber, originalEarNumber, picture, variety, category, age, weight}]
+        }
        this.instance.post("/api/breed/earTag/addOrEdit", this.detail).then(res => {
          if (res?.code == 0) {
            this.$confirm("是否要返回列表？", "提交成功").then(() => this.back())
@@ -76,13 +79,13 @@ export default {
      <ai-card title="基础信息">
        <div class="grid c-3">
          <template v-if="isAdd">
-            <el-form-item label="养殖场" prop="farmId">
+            <el-form-item label="养殖场" prop="farmId" :rules="{required:isAdd,message:'请选择养殖场'}">
              <ai-select v-model="detail.farmId" :instance="instance" :action="`/api/siteUser/querySiteByUserId?userId=${userinfo.id}`" :prop="{label:'name'}"/>
            </el-form-item>
-            <el-form-item label="养殖舍" prop="houseId">
+            <el-form-item label="养殖舍" prop="houseId" :rules="{required:isAdd,message:'请选择养殖舍'}">
              <ai-select v-model="detail.houseId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${detail.farmId||-1}`" :prop="{label:'name'}"/>
            </el-form-item>
-            <el-form-item label="养殖栏" prop="penId">
+            <el-form-item label="养殖栏" prop="penId" :rules="{required:isAdd,message:'请选择养殖栏'}">
              <ai-select v-model="detail.penId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${detail.houseId||-1}`" :prop="{label:'name'}"/>
            </el-form-item>
          </template>
@@ -130,11 +133,11 @@ export default {
          </el-form-item>
          <el-form-item label="品种" prop="variety">
            <ai-select v-if="isEdit" v-model="detail.variety" dict="variety"/>
-            <b v-else v-text="detail.variety"/>
+            <b v-else v-text="dict.getLabel('variety',detail.variety)"/>
          </el-form-item>
          <el-form-item label="类别" prop="category">
            <ai-select v-if="isEdit" v-model="detail.category" dict="category"/>
-            <b v-else v-text="detail.category"/>
+            <b v-else v-text="dict.getLabel('category',detail.category)"/>
          </el-form-item>
          <el-form-item label="日龄/天">
            <el-input v-if="isEdit" v-model.number="detail.age" placeholder="请输入" clearable/>
--- a/project/xumu/AppEarTag/etList.vue
+++ b/project/xumu/AppEarTag/etList.vue
@@ -51,7 +51,7 @@ export default {
    },
    handleDelete(id) {
      this.$confirm("确定删除该条数据？").then(() => {
-        this.instance.delete("/api/breed/earTag/del", null, {params: {id}}).then(res => {
+        this.instance.post("/api/breed/earTag/del", null, {params: {id}}).then(res => {
          if (res?.code == '0' && res?.data != 1) {
            this.$message.success("删除成功")
            this.getTableData()
@@ -80,8 +80,8 @@ export default {
        <ai-select placeholder="全部类别" v-model="search.category" dict="category"/>
        <ai-select placeholder="全部品种" v-model="search.variety" dict="variety"/>
        <ai-search label="登记日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-search label="日龄">
          <el-input placeholder="最小日龄" v-model="search.beginAge" size="small" clearable/>
--- a/project/xumu/AppImmunityManage/add.vue
+++ b/project/xumu/AppImmunityManage/add.vue
@@ -6,7 +6,7 @@ const columns = [
  {label: "序号", type: "index"},
  {label: "疫苗名称", prop: "vaccineName"},
  {label: "用药方式", prop: "method"},
-  {label: "药量", prop: "dosage"},
+  {label: "药量(ml)", prop: "dosage"},
  {label: "生产厂家", prop: "factory"},
  {label: "厂家批号", prop: "batchNumber"},
  {label: "免疫时间", prop: "immunityTime"},
@@ -75,7 +75,8 @@ export default {
    },
    submit() {
      this.$refs.detail.validate().then(() => {
-        this.instance.post("/api/breed/immunity/update", this.form).then(res => {
+        const action = !this.form.id ? "/api/breed/immunity/add" : "/api/breed/immunity/update"
+        this.instance.post(action, this.form).then(res => {
          if (res?.code == 0) {
            this.dialog = false
            this.getDetail()
@@ -86,7 +87,6 @@ export default {
  },
  created() {
    this.dict.load("yesOrNo", "category", "variety", "source")
-    this.detail.treatmentTime = new Date()
    this.getDetail()
  }
 }
@@ -129,7 +129,7 @@ export default {
        <template v-if="isAdd">
          <div class="grid c-3">
            <el-form-item label="免疫日期" prop="immunityTime" :rules="{required:true,message:'请选择 免疫日期'}">
-              <el-date-picker v-model="detail.immunityTime"/>
+              <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="detail.immunityTime"/>
            </el-form-item>
            <el-form-item label="疫苗名称" prop="vaccineName" :rules="{required:true,message:'请选择 疫苗名称'}">
              <ai-input v-model="detail.vaccineName"/>
@@ -163,9 +163,9 @@ export default {
        </template>
      </ai-card>
      <ai-dialog v-model="dialog" title="免疫登记" @closed="form={}" @confirm="submit">
-        <el-form size="small" label-width="120px"  class="grid">
+        <el-form size="small" label-width="120px" class="grid">
          <el-form-item label="免疫日期" prop="immunityTime" :rules="{required:true,message:'请选择 免疫日期'}">
-            <el-date-picker v-model="form.immunityTime"/>
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="form.immunityTime"/>
          </el-form-item>
          <el-form-item label="疫苗名称" prop="vaccineName" :rules="{required:true,message:'请选择 疫苗名称'}">
            <ai-input v-model="form.vaccineName"/>
--- a/project/xumu/AppImmunityManage/list.vue
+++ b/project/xumu/AppImmunityManage/list.vue
@@ -64,12 +64,12 @@ export default {
        <ai-select placeholder="全部养殖舍" v-model="search.houseId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.farmId||-1}`" :prop="{label:'name'}"/>
        <ai-select placeholder="全部养殖栏" v-model="search.penId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.houseId||-1}`" :prop="{label:'name'}"/>
        <ai-search label="免疫日期">
-          <el-date-picker v-model="search.immunityBeginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.immunityEndDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.immunityBeginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.immunityEndDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-search label="登记日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <el-input placeholder="原场耳标号" v-model="search.originalEarNumber" dict="authStatus" size="small" clearable/>
        <el-input placeholder="生物芯片耳标号" v-model="search.biochipEarNumber" dict="authStatus" size="small" clearable/>
--- a/project/xumu/AppInsuranceApply/AppInsuranceApply.vue
+++ b/project/xumu/AppInsuranceApply/AppInsuranceApply.vue
@@ -17,7 +17,7 @@ export default {
    }
  },
  created() {
-    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety")
+    this.dict.load("insuranceAuditStatus", "insureType", "insureStatus", "category", "variety")
  },
 }
 </script>
--- a/project/xumu/AppInsuranceApply/add.vue
+++ b/project/xumu/AppInsuranceApply/add.vue
@@ -33,11 +33,11 @@ export default {
    isAdd: v => !v.$route.query.id,
    isEdit: v => v.$route.query.edit == 1,
    formImages: v => [
-      {label: "身份证(正面)", prop: "frontCard", rules: {required: v.isAdd||v.isEdit, message: '请上传 身份证(正面)'}},
-      {label: "身份证(反面)", prop: "reverseCard", rules: {required: v.isAdd||v.isEdit, message: '请上传 身份证(反面)'}},
-      {label: "营业执照", prop: "businessPic", rules: {required: v.isAdd||v.isEdit, message: '请上传 营业执照'}},
-      {label: "畜禽经营许可证", prop: "breedPic", rules: {required: v.isAdd||v.isEdit, message: '请上传 畜禽经营许可证'}},
-      {label: "动物防疫条件许可证", prop: "prevention", rules: {required: v.isAdd||v.isEdit, message: '请上传 动物防疫条件许可证'}},
+      {label: "身份证(正面)", prop: "frontCard", rules: {required: v.isAdd || v.isEdit, message: '请上传 身份证(正面)'}},
+      {label: "身份证(反面)", prop: "reverseCard", rules: {required: v.isAdd || v.isEdit, message: '请上传 身份证(反面)'}},
+      {label: "营业执照", prop: "businessPic", rules: {required: v.isAdd || v.isEdit, message: '请上传 营业执照'}},
+      {label: "畜禽经营许可证", prop: "breedPic", rules: {required: v.isAdd || v.isEdit, message: '请上传 畜禽经营许可证'}},
+      {label: "动物防疫条件许可证", prop: "prevention", rules: {required: v.isAdd || v.isEdit, message: '请上传 动物防疫条件许可证'}},
    ]
  },
  methods: {
@@ -49,7 +49,7 @@ export default {
      return id && this.instance.post("/api/insurance/apply/getInfo", null, {params: {id}}).then(res => {
        if (res?.data) {
          const detail = res.data
-          detail.detailList = detail.weightList || []
+          detail.detailList = detail.detailList || []
          let {farmPicture: picture = "{}"} = detail
          picture = JSON.parse(picture)
          return this.detail = {...detail, ...picture}
@@ -69,6 +69,7 @@ export default {
    },
    submit(submitType) {
      this.$refs.detail.validate().then(() => {
+        const earNumberList = this.detail.detailList.map(e => e.biochipEarNumber)
        const farmPicture = {}
        this.formImages.forEach(e => {
          const {prop} = e
@@ -78,7 +79,7 @@ export default {
          }
        })
        this.detail.farmPicture = JSON.stringify(farmPicture)
-        this.instance.post("/api/insurance/apply/addOrEdit", {...this.detail, submitType}).then(res => {
+        this.instance.post("/api/insurance/apply/addOrEdit", {...this.detail, submitType, earNumberList}).then(res => {
          if (res?.code == '0') {
            this.$message.success("提交成功!")
            this.back()
@@ -110,7 +111,7 @@ export default {
          <el-form-item label="保险产品" prop="productType" :rules="{required: isAdd||isEdit,message:'请选择 保险产品'}">
            <ai-select v-if="isAdd||isEdit" v-model="detail.productType" :select-list="getProducts(detail.companyId)" :prop="{label:'name',value:'productType'}"
                       @select="v=>$set(detail,'insureType',v.children[0].insureType)"/>
-            <b v-else v-text="detail.productType"/>
+            <b v-else v-text="dict.getLabel('productType', detail.productType)"/>
          </el-form-item>
          <el-form-item label="投保类型">
            <ai-input :value="dict.getLabel('insureType',detail.insureType)" placeholder="根据保险产品自动带出" :edit="isAdd||isEdit" readonly/>
@@ -125,7 +126,7 @@ export default {
      </ai-card>
      <ai-card title="投保对象">
        <template #right v-if="isAdd||isEdit">
-          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance"
+          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance" value-key="biochipEarNumber"
                            :action="`/api/insurance/apply/getEarNumberList?farmId=${detail.farmId}`">
            <el-button type="text">选择</el-button>
          </ai-eartag-picker>
@@ -141,7 +142,7 @@ export default {
        </div>
      </ai-card>
      <ai-card title="审核信息" v-if="!(isAdd||isEdit)">
-        <el-form-item label="审核状态">{{ dict.getLabel('auditStatus', detail.auditStatus) }}</el-form-item>
+        <el-form-item label="审核状态">{{ dict.getLabel('insuranceAuditStatus', detail.auditStatus) }}</el-form-item>
        <el-form-item label="审核时间">{{ detail.auditTime }}</el-form-item>
        <el-form-item label="审核人">{{ detail.auditName }}</el-form-item>
        <el-form-item label="保单订单号">{{ detail.orderNo }}</el-form-item>
--- a/project/xumu/AppInsuranceApply/list.vue
+++ b/project/xumu/AppInsuranceApply/list.vue
@@ -9,7 +9,7 @@ const columns = [
  {label: "承保公司", prop: "companyName"},
  {label: "投保时间", prop: "createTime"},
  {label: "投保状态", prop: "status", width: 160, dict: "insureStatus"},
-  {label: "审核状态", prop: "auditStatus", width: 120, dict: "auditStatus"},
+  {label: "审核状态", prop: "auditStatus", width: 120, dict: "insuranceAuditStatus"},
  {label: "申请人", prop: "applyName", width: 120},
 ]
 export default {
@@ -80,8 +80,8 @@ export default {
        <ai-select placeholder="全部投保状态" v-model="search.status" dict="insureStatus"/>
        <ai-select placeholder="全部审批状态" v-model="search.auditStatus" dict="auditStatus"/>
        <ai-search label="投保日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
      </template>
    </ai-search-bar>
--- a/project/xumu/AppInsuranceAudit/AppInsuranceAudit.vue
+++ b/project/xumu/AppInsuranceAudit/AppInsuranceAudit.vue
@@ -12,19 +12,19 @@ export default {
  },
  computed: {
    currentPage() {
-      let {hash} = this.$route
+      let { hash } = this.$route
      return ["#add", "#audit"].includes(hash) ? add : list
    }
  },
  created() {
-    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety")
+    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety", "productType")
  },
 }
 </script>

 <template>
  <section class="AppInsuranceAudit">
-    <component :is="currentPage" v-bind="$props"/>
+    <component :is="currentPage" v-bind="$props" />
  </section>
 </template>

--- a/project/xumu/AppInsuranceAudit/add.vue
+++ b/project/xumu/AppInsuranceAudit/add.vue
@@ -1,16 +1,18 @@
 <script>
-import {mapState} from "vuex"
+import { mapState } from "vuex"
 import AiEartagPicker from "@project/xumu/components/AiEartagPicker.vue";
+import AiIdcardRemote from "@project/xumu/components/AiIdcardRemote.vue";
+import AiAudit from "../components/AiAudit.vue";

 const columns = [
-  {label: "序号", type: "index"},
-  {label: "生物芯片耳标号", prop: "biochipEarNumber"},
-  {label: "类别", prop: "category", dict: "category"},
-  {label: "品种", prop: "variety", dict: "variety"},
+  { label: "序号", type: "index" },
+  { label: "生物芯片耳标号", prop: "biochipEarNumber" },
+  { label: "类别", prop: "category", dict: "category" },
+  { label: "品种", prop: "variety", dict: "variety" },
 ]
 export default {
  name: "iaAdd",
-  components: {AiEartagPicker},
+  components: { AiIdcardRemote, AiEartagPicker, AiAudit },
  props: {
    instance: Function,
    permissions: Function,
@@ -18,7 +20,7 @@ export default {
  },
  data() {
    return {
-      detail: {detailList: []},
+      detail: { detailList: [] },
      columns,
      companyList: []
    }
@@ -34,11 +36,11 @@ export default {
    isEdit: v => v.$route.query.edit == 1,
    isAudit: v => v.$route.hash == "#audit",
    formImages: v => [
-      {label: "身份证(正面)", prop: "frontCard", rules: {required: v.isAdd, message: '请上传 身份证(正面)'}},
-      {label: "身份证(反面)", prop: "reverseCard", rules: {required: v.isAdd, message: '请上传 身份证(反面)'}},
-      {label: "营业执照", prop: "businessPic", rules: {required: v.isAdd, message: '请上传 营业执照'}},
-      {label: "畜禽经营许可证", prop: "breedPic", rules: {required: v.isAdd, message: '请上传 畜禽经营许可证'}},
-      {label: "动物防疫条件许可证", prop: "prevention", rules: {required: v.isAdd, message: '请上传 动物防疫条件许可证'}},
+      { label: "身份证(正面)", prop: "frontCard", rules: { required: v.isAdd, message: '请上传 身份证(正面)' } },
+      { label: "身份证(反面)", prop: "reverseCard", rules: { required: v.isAdd, message: '请上传 身份证(反面)' } },
+      { label: "营业执照", prop: "businessPic", rules: { required: v.isAdd, message: '请上传 营业执照' } },
+      { label: "畜禽经营许可证", prop: "breedPic", rules: { required: v.isAdd, message: '请上传 畜禽经营许可证' } },
+      { label: "动物防疫条件许可证", prop: "prevention", rules: { required: v.isAdd, message: '请上传 动物防疫条件许可证' } },
    ]
  },
  methods: {
@@ -46,21 +48,22 @@ export default {
      this.$router.push(params)
    },
    getDetail() {
-      const {id} = this.$route.query
-      return id && this.instance.post("/api/insurance/apply/getInfo", null, {params: {id}}).then(res => {
+      const { id } = this.$route.query
+      return id ? this.instance.post("/api/insurance/apply/getInfo", null, { params: { id } }).then(res => {
        if (res?.data) {
          const detail = res.data
          detail.detailList = detail.detailList || []
-          let {farmPicture: picture = "{}"} = detail
+          let { farmPicture: picture = "{}" } = detail
          picture = JSON.parse(picture)
-          return this.detail = {...detail, ...picture}
+          return this.detail = { ...detail, ...picture }
        }
-      })
+      }) : Promise.resolve()
    },
    getCompanies() {
      this.instance.post("/api/insurance/apply/getCompany").then(res => {
        if (res?.data) {
          this.companyList = res.data
+          this.$set(this.detail, "companyId", res.data?.[0]?.id)
        }
      })
    },
@@ -70,16 +73,17 @@ export default {
    },
    submit() {
      this.$refs.detail.validate().then(() => {
+        const earNumberList = this.detail.detailList.map(e => e.biochipEarNumber)
        const farmPicture = {}
        this.formImages.forEach(e => {
-          const {prop} = e
+          const { prop } = e
          const val = this.detail[prop]
          if (val) {
            farmPicture[prop] = val
          }
        })
        this.detail.farmPicture = JSON.stringify(farmPicture)
-        this.instance.post("/api/insurance/apply/addOrEditOffline", this.detail).then(res => {
+        this.instance.post("/api/insurance/apply/addOrEditOffline", { ...this.detail, earNumberList }).then(res => {
          if (res?.code == 0) {
            this.$message.success("提交成功!")
            this.back()
@@ -96,11 +100,21 @@ export default {
          }
        })
      })
+    },
+    getRemoteInfo(userId) {
+      userId && this.instance.post("/api/siteUser/querySiteByUserId", null, {
+        params: { userId }
+      }).then(res => {
+        if (res?.data?.[0]) {
+          const { id } = res.data[0]
+          this.$set(this.detail, "farmId", id)
+          this.$set(this.detail, "targetUser", userId)
+        }
+      })
    }
  },
  created() {
-    this.getCompanies()
-    this.getDetail()
+    this.getDetail().finally(() => this.getCompanies())
  }
 }
 </script>
@@ -110,51 +124,59 @@ export default {
    <el-form size="small" label-width="120px" :model="detail" ref="detail">
      <ai-card title="基础信息">
        <div class="grid">
-          <el-form-item label="养殖场" prop="farmId" :rules="{required:isAdd||isEdit,message:'请选择 养殖场'}">
-            <ai-select v-if="isAdd||isEdit" v-model="detail.farmId" :instance="instance" :action="`/api/siteUser/querySiteByUserId?userId=${userinfo.id}`" :prop="{label:'name'}"/>
-            <b v-else v-text="detail.farmName"/>
+          <el-form-item label="养殖户" class="row">
+            <ai-idcard-remote :instance="instance" @enter="getRemoteInfo" />
          </el-form-item>
-          <el-form-item label="承保公司" prop="companyId" :rules="{required:isAdd||isEdit,message:'请选择 承保公司'}">
-            <ai-select v-if="isAdd||isEdit" v-model="detail.companyId" :select-list="companyList" :prop="{label:'name'}"/>
-            <b v-else v-text="detail.companyName"/>
+          <el-form-item label="养殖场" prop="farmId" :rules="{ required: isAdd || isEdit, message: '请选择 养殖场' }">
+            <ai-select v-if="isAdd || isEdit" v-model="detail.farmId" :instance="instance"
+              :action="`/api/siteUser/querySiteByUserId?userId=${detail.targetUser}`" :prop="{ label: 'name' }" />
+            <b v-else v-text="detail.farmName" />
          </el-form-item>
-          <el-form-item label="保险产品" prop="productType" :rules="{required:isAdd||isEdit,message:'请选择 保险产品'}">
-            <ai-select v-if="isAdd||isEdit" v-model="detail.productType" :select-list="getProducts(detail.companyId)" :prop="{label:'name',value:'productType'}"
-                       @select="v=>$set(detail,'insureType',v.children[0].insureType)"/>
-            <b v-else v-text="detail.productType"/>
+          <el-form-item label="承保公司" prop="companyId" :rules="{ required: isAdd || isEdit, message: '请选择 承保公司' }">
+            <ai-select v-if="isAdd || isEdit" v-model="detail.companyId" :select-list="companyList"
+              :prop="{ label: 'name' }" disabled />
+            <b v-else v-text="detail.companyName" />
+          </el-form-item>
+          <el-form-item label="保险产品" prop="productType" :rules="{ required: isAdd || isEdit, message: '请选择 保险产品' }">
+            <ai-select v-if="isAdd || isEdit" v-model="detail.productType" :select-list="getProducts(detail.companyId)"
+              :prop="{ label: 'name', value: 'productType' }"
+              @select="v => $set(detail, 'insureType', v.children[0].insureType)" />
+            <b v-else v-text="dict.getLabel('productType', detail.productType)" />
          </el-form-item>
          <el-form-item label="投保类型">
-            <ai-input :value="dict.getLabel('insureType',detail.insureType)" placeholder="根据保险产品自动带出" :edit="isAdd||isEdit" readonly/>
+            <ai-input :value="dict.getLabel('insureType', detail.insureType)" placeholder="根据保险产品自动带出"
+              :edit="isAdd || isEdit" readonly />
          </el-form-item>
          <el-form-item label="联系人">
-            <ai-input v-model="detail.contacts" :edit="isAdd||isEdit"/>
+            <ai-input v-model="detail.contacts" :edit="isAdd || isEdit" />
          </el-form-item>
          <el-form-item label="联系电话">
-            <ai-input v-model="detail.phone" :edit="isAdd||isEdit"/>
+            <ai-input v-model="detail.phone" :edit="isAdd || isEdit" />
          </el-form-item>
        </div>
      </ai-card>
      <ai-card title="投保对象">
        <template #right v-if="isAdd">
-          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance"
-                            :action="`/api/insurance/apply/getEarNumberList?farmId=${detail.farmId}`">
+          <ai-eartag-picker @select="v => detail.detailList = v" :instance="instance"
+            :action="`/api/insurance/apply/getEarNumberList?farmId=${detail.farmId}`">
            <el-button type="text">选择</el-button>
          </ai-eartag-picker>
        </template>
-        <ai-table :tableData="detail.detailList" :colConfigs="columns" :isShowPagination="!1" hideOptions/>
+        <ai-table :tableData="detail.detailList" :colConfigs="columns" :isShowPagination="!1" hideOptions />
      </ai-card>
      <ai-card title="证件信息">
        <div class="grid c-5 el-form--label-top">
-          <el-form-item v-for="(img,i) in formImages" :key="i" v-bind="img">
-            <ai-uploader v-if="isAdd||isEdit" v-model="detail[img.prop]" :instance="instance" :limit="1" value-is-url/>
-            <el-image :src="detail[img.prop]" :preview-src-list="[detail[img.prop]]" v-else/>
+          <el-form-item v-for="(img, i) in formImages" :key="i" v-bind="img">
+            <ai-uploader v-if="isAdd || isEdit" v-model="detail[img.prop]" :instance="instance" :limit="1"
+              value-is-url />
+            <el-image :src="detail[img.prop]" :preview-src-list="[detail[img.prop]]" v-else />
          </el-form-item>
        </div>
      </ai-card>
-      <ai-card title="审核信息" v-if="!(isAdd||isAudit)">
+      <ai-card title="审核信息" v-if="!(isAdd || isAudit)">
        <el-form-item label="审核状态">{{ dict.getLabel('auditStatus', detail.auditStatus) }}</el-form-item>
        <el-form-item label="保单资料" class="sc-4">
-          <el-image :src="detail.picture" :preview-src-list="[detail.picture]"/>
+          <el-image :src="detail.picture" :preview-src-list="[detail.picture]" />
        </el-form-item>
        <el-form-item label="审核时间">{{ detail.auditTime }}</el-form-item>
        <el-form-item label="审核人">{{ detail.auditName }}</el-form-item>
@@ -163,20 +185,26 @@ export default {
      </ai-card>
      <ai-card title="保险资料" v-if="isAudit">
        <div class="grid">
-          <el-form-item label="保单订单号" prop="orderNo" :rules="{required:true,message:'请输入 保单订单号'}">
-            <ai-input v-model="detail.orderNo"/>
+          <el-form-item label="审批" prop="auditStatus"
+            :rules="[{ required: true, type: 'enum', enum: [2, 3], message: '请选择是否同意' },]">
+            <ai-audit @change="v => $set(detail, 'auditStatus', v)" />
          </el-form-item>
-          <el-form-item label="保单资料" class="sc-2">
-            <ai-uploader v-model="detail.picture" value-is-url :instance="instance" :limit="1"/>
+          <el-form-item label="保单资料" class="sc-3">
+            <ai-uploader v-model="detail.picture" value-is-url :instance="instance" :limit="1" />
          </el-form-item>
+          <el-form-item label="保单订单号" prop="orderNo" :rules="{ required: true, message: '请输入 保单订单号' }"
+            v-if="detail.auditStatus == 2">
+            <ai-input v-model="detail.orderNo" />
+          </el-form-item>
+
          <el-form-item label="说明">
-            <ai-input type="textarea" :rows="3" v-model="detail.remarks"/>
+            <ai-input type="textarea" :rows="3" v-model="detail.remarks" />
          </el-form-item>
        </div>
      </ai-card>
    </el-form>
    <div slot="footer">
-      <template v-if="isAdd||isEdit">
+      <template v-if="isAdd || isEdit">
        <el-button type="primary" @click="submit">提交</el-button>
      </template>
      <el-button v-if="isAudit" type="primary" @click="handleAudit">提交</el-button>
--- a/project/xumu/AppInsuranceAudit/list.vue
+++ b/project/xumu/AppInsuranceAudit/list.vue
@@ -68,8 +68,8 @@ export default {
        <ai-select placeholder="全部投保状态" v-model="search.status" dict="insureStatus"/>
        <ai-select placeholder="全部审批状态" v-model="search.auditStatus" dict="auditStatus"/>
        <ai-search label="投保日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-input placeholder="养殖户" v-model="search.userName"/>
        <ai-input placeholder="养殖场" v-model="search.farmName"/>
@@ -86,7 +86,7 @@ export default {
      <el-table-column slot="options" label="操作" fixed="right" align="center">
        <template slot-scope="{row}">
          <div class="table-options">
-            <template v-if="['00','02'].includes(row.permit)">
+            <template v-if="['01'].includes(row.permit)">
              <el-button type="text" @click="$router.push({hash:'#audit',query:{id:row.id}})">审批</el-button>
            </template>
            <el-button v-else type="text" @click="$router.push({hash:'#add',query:{id:row.id}})">查看</el-button>
--- a/project/xumu/AppLoanApply/add.vue
+++ b/project/xumu/AppLoanApply/add.vue
@@ -1,16 +1,16 @@
 <script>
-import {mapState} from "vuex"
+import { mapState } from "vuex"
 import AiEartagPicker from "@project/xumu/components/AiEartagPicker.vue";

 const columns = [
-  {label: "序号", type: "index"},
-  {label: "生物芯片耳标号", prop: "biochipEarNumber"},
-  {label: "类别", prop: "category", dict: "category"},
-  {label: "品种", prop: "variety", dict: "variety"},
+  { label: "序号", type: "index" },
+  { label: "生物芯片耳标号", prop: "biochipEarNumber" },
+  { label: "类别", prop: "category", dict: "category" },
+  { label: "品种", prop: "variety", dict: "variety" },
 ]
 export default {
  name: "loanAdd",
-  components: {AiEartagPicker},
+  components: { AiEartagPicker },
  props: {
    instance: Function,
    permissions: Function,
@@ -18,7 +18,7 @@ export default {
  },
  data() {
    return {
-      detail: {detailList: [], loanAmount: 0},
+      detail: { detailList: [], loanAmount: 0 },
      columns,
      bankList: [],
      filterText: ""
@@ -34,11 +34,11 @@ export default {
    isAdd: v => !v.$route.query.id,
    isEdit: v => v.$route.query.edit == 1,
    formImages: v => [
-      {label: "身份证(正面)", prop: "frontCard", rules: {required: v.isAdd || v.isEdit, message: '请上传 身份证(正面)'}},
-      {label: "身份证(反面)", prop: "reverseCard", rules: {required: v.isAdd || v.isEdit, message: '请上传 身份证(反面)'}},
-      {label: "营业执照", prop: "businessPic", rules: {required: v.isAdd || v.isEdit, message: '请上传 营业执照'}},
-      {label: "畜禽经营许可证", prop: "breedPic", rules: {required: v.isAdd || v.isEdit, message: '请上传 畜禽经营许可证'}},
-      {label: "动物防疫条件许可证", prop: "prevention", rules: {required: v.isAdd || v.isEdit, message: '请上传 动物防疫条件许可证'}},
+      { label: "身份证(正面)", prop: "frontCard", rules: { required: v.isAdd || v.isEdit, message: '请上传 身份证(正面)' } },
+      { label: "身份证(反面)", prop: "reverseCard", rules: { required: v.isAdd || v.isEdit, message: '请上传 身份证(反面)' } },
+      { label: "营业执照", prop: "businessPic", rules: { required: v.isAdd || v.isEdit, message: '请上传 营业执照' } },
+      { label: "畜禽经营许可证", prop: "breedPic", rules: { required: v.isAdd || v.isEdit, message: '请上传 畜禽经营许可证' } },
+      { label: "动物防疫条件许可证", prop: "prevention", rules: { required: v.isAdd || v.isEdit, message: '请上传 动物防疫条件许可证' } },
    ],
    selectedEartags: v => v.detail.detailList?.length || 0,
    tableData: v => v.detail.detailList?.filter(e => e.biochipEarNumber.indexOf(v.filterText) > -1) || [],
@@ -48,14 +48,14 @@ export default {
      this.$router.push(params)
    },
    getDetail() {
-      const {id} = this.$route.query
-      return id && this.instance.post("/api/loan/apply/getInfo", null, {params: {id}}).then(res => {
+      const { id } = this.$route.query
+      return id && this.instance.post("/api/loan/apply/getInfo", null, { params: { id } }).then(res => {
        if (res?.data) {
          const detail = res.data
          detail.detailList = detail.detailList || []
-          let {farmPicture: picture = "{}"} = detail
+          let { farmPicture: picture = "{}" } = detail
          picture = JSON.parse(picture)
-          return this.detail = {...detail, ...picture}
+          return this.detail = { ...detail, ...picture }
        }
      })
    },
@@ -72,16 +72,17 @@ export default {
    },
    submit(submitType) {
      this.$refs.detail.validate().then(() => {
+        const earNumberList = this.detail.detailList.map(e => e.biochipEarNumber)
        const farmPicture = {}
        this.formImages.forEach(e => {
-          const {prop} = e
+          const { prop } = e
          const val = this.detail[prop]
          if (val) {
            farmPicture[prop] = val
          }
        })
        this.detail.farmPicture = JSON.stringify(farmPicture)
-        this.instance.post("/api/loan/apply/addOrEdit", {...this.detail, submitType}).then(res => {
+        this.instance.post("/api/loan/apply/addOrEdit", { ...this.detail, submitType, earNumberList }).then(res => {
          if (res?.code == '0') {
            this.$message.success("提交成功!")
            this.back()
@@ -102,63 +103,64 @@ export default {
    <el-form size="small" label-width="120px" :model="detail" ref="detail">
      <ai-card title="基础信息">
        <div class="grid">
-          <el-form-item label="养殖场" prop="farmId" :rules="{required: isAdd||isEdit,message:'请选择 养殖场'}">
-            <ai-select v-if="isAdd||isEdit" v-model="detail.farmId" :instance="instance" :action="`/api/siteUser/querySiteByUserId?userId=${userinfo.id}`" :prop="{label:'name'}"/>
-            <b v-else v-text="detail.farmName"/>
+          <el-form-item label="养殖场" prop="farmId" :rules="{ required: isAdd || isEdit, message: '请选择 养殖场' }">
+            <ai-select v-if="isAdd || isEdit" v-model="detail.farmId" :instance="instance"
+              :action="`/api/siteUser/querySiteByUserId?userId=${userinfo.id}`" :prop="{ label: 'name' }" />
+            <b v-else v-text="detail.farmName" />
          </el-form-item>
-          <el-form-item label="贷款银行" prop="bankId" :rules="{required: isAdd||isEdit,message:'请选择 贷款银行'}">
-            <ai-select v-if="isAdd||isEdit" v-model="detail.bankId" :select-list="bankList" :prop="{label:'name'}"/>
-            <b v-else v-text="detail.bankName"/>
+          <el-form-item label="贷款银行" prop="bankId" :rules="{ required: isAdd || isEdit, message: '请选择 贷款银行' }">
+            <ai-select v-if="isAdd || isEdit" v-model="detail.bankId" :select-list="bankList" :prop="{ label: 'name' }" />
+            <b v-else v-text="detail.bankName" />
          </el-form-item>
-          <el-form-item label="贷款产品" prop="productType" :rules="{required: isAdd||isEdit,message:'请选择 贷款产品'}">
-            <ai-select v-if="isAdd||isEdit" v-model="detail.productType"
-                       :select-list="getProducts(detail.bankId)" :prop="{label:'name',value:'productType'}"/>
-            <b v-else v-text="dict.getLabel('loanProduct',detail.productType)"/>
+          <el-form-item label="贷款产品" prop="productType" :rules="{ required: isAdd || isEdit, message: '请选择 贷款产品' }">
+            <ai-select v-if="isAdd || isEdit" v-model="detail.productType" :select-list="getProducts(detail.bankId)"
+              :prop="{ label: 'name', value: 'productType' }" />
+            <b v-else v-text="dict.getLabel('loanProduct', detail.productType)" />
          </el-form-item>
-          <el-form-item label="预期贷款额(万)" prop="loanAmount" :rules="{required: isAdd||isEdit,message:'请输入 预期贷款额'}">
-            <ai-input v-model.number="detail.loanAmount" :edit="isAdd||isEdit"/>
+          <el-form-item label="预期贷款额(万)" prop="loanAmount" :rules="{ required: isAdd || isEdit, message: '请输入 预期贷款额' }">
+            <ai-input v-model.number="detail.loanAmount" :edit="isAdd || isEdit" />
          </el-form-item>
-          <el-form-item label="联系人" prop="contacts" :rules="{required: isAdd||isEdit,message:'请输入 联系人'}">
-            <ai-input v-model="detail.contacts" :edit="isAdd||isEdit"/>
+          <el-form-item label="联系人" prop="contacts" :rules="{ required: isAdd || isEdit, message: '请输入 联系人' }">
+            <ai-input v-model="detail.contacts" :edit="isAdd || isEdit" />
          </el-form-item>
-          <el-form-item label="联系电话" prop="phone" :rules="{required: isAdd||isEdit,message:'请输入 联系电话'}">
-            <ai-input v-model="detail.phone" :edit="isAdd||isEdit"/>
+          <el-form-item label="联系电话" prop="phone" :rules="{ required: isAdd || isEdit, message: '请输入 联系电话' }">
+            <ai-input v-model="detail.phone" :edit="isAdd || isEdit" />
          </el-form-item>
        </div>
      </ai-card>
      <ai-card title="质押标的">
        <template #right>
-          <ai-input placeholder="请输入/扫描耳标号" v-model="filterText" class="shrink"/>
-          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance" v-if="isAdd||isEdit"
-                            :action="`/api/insurance/apply/getEarNumberList?farmId=${detail.farmId}`">
+          <ai-input placeholder="请输入/扫描耳标号" v-model="filterText" class="shrink" />
+          <ai-eartag-picker @select="v => detail.detailList = v" :instance="instance" v-if="isAdd || isEdit"
+            value-key="biochipEarNumber" :action="`/api/insurance/apply/getEarNumberList?farmId=${detail.farmId}`">
            <el-button type="text">选择</el-button>
          </ai-eartag-picker>
        </template>
-        <ai-highlight class="mar-b8 font-14" :content="`拟抵押标的选择 @v 只`" color="red" :value="selectedEartags"/>
-        <ai-table :tableData="tableData" :colConfigs="columns" :isShowPagination="!1" hideOptions/>
+        <ai-highlight class="mar-b8 font-14" :content="`拟抵押标的选择 @v 只`" color="red" :value="selectedEartags" />
+        <ai-table :tableData="tableData" :colConfigs="columns" :isShowPagination="!1" hideOptions />
      </ai-card>
      <ai-card title="证件信息">
-        <div v-if="isAdd||isEdit" class="font-12 color-888">只能上传JPG/PNG文件，且不超过2M</div>
+        <div v-if="isAdd || isEdit" class="font-12 color-888">只能上传JPG/PNG文件，且不超过2M</div>
        <div class="grid c-5 el-form--label-top">
-          <el-form-item v-for="(img,i) in formImages" :key="i" v-bind="img">
-            <ai-uploader v-if="isAdd||isEdit" v-model="detail[img.prop]" :instance="instance" :limit="1" value-is-url/>
-            <el-image :src="detail[img.prop]" :preview-src-list="[detail[img.prop]]" v-else/>
+          <el-form-item v-for="(img, i) in formImages" :key="i" v-bind="img">
+            <ai-uploader v-if="isAdd || isEdit" v-model="detail[img.prop]" :instance="instance" :limit="1" value-is-url />
+            <el-image :src="detail[img.prop]" :preview-src-list="[detail[img.prop]]" v-else />
          </el-form-item>
        </div>
      </ai-card>
-      <ai-card title="审核信息" v-if="!(isAdd||isEdit)">
+      <ai-card title="审核信息" v-if="!(isAdd || isEdit)">
        <el-form-item label="审核状态">{{ dict.getLabel('auditStatus', detail.auditStatus) }}</el-form-item>
        <el-form-item label="审核时间">{{ detail.auditTime }}</el-form-item>
        <el-form-item label="审核人">{{ detail.auditName }}</el-form-item>
        <el-form-item label="贷款合同号">{{ detail.contractNo || "-" }}</el-form-item>
        <el-form-item label="贷款资料">
-          <el-image :src="detail.picture" :preview-src-list="[detail.picture]"/>
+          <el-image :src="detail.picture" :preview-src-list="[detail.picture]" />
        </el-form-item>
        <el-form-item label="说明">{{ detail.remarks }}</el-form-item>
      </ai-card>
    </el-form>
    <div slot="footer">
-      <template v-if="isAdd||isEdit">
+      <template v-if="isAdd || isEdit">
        <el-button type="primary" @click="submit(1)">保存草稿</el-button>
        <el-button type="primary" @click="submit(2)">保存并提交</el-button>
      </template>
--- a/project/xumu/AppLoanApply/list.vue
+++ b/project/xumu/AppLoanApply/list.vue
@@ -77,8 +77,8 @@ export default {
        <ai-select placeholder="全部贷款状态" v-model="search.status" dict="loanStatus"/>
        <ai-select placeholder="全部审批状态" v-model="search.auditStatus" dict="auditStatus"/>
        <ai-search label="贷款日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-input placeholder="养殖户" v-model="search.applyName"/>
        <ai-input placeholder="养殖场" v-model="search.farmName"/>
--- a/project/xumu/AppLoanAudit/add.vue
+++ b/project/xumu/AppLoanAudit/add.vue
@@ -1,17 +1,19 @@
 <script>
-import {mapState} from "vuex"
+import { mapState } from "vuex"
 import AiEartagPicker from "@project/xumu/components/AiEartagPicker.vue";
+import AiIdcardRemote from "@project/xumu/components/AiIdcardRemote.vue";
+import AiAudit from "../components/AiAudit.vue";

 const records = [
-  {label: "序号", type: "index"},
-  {label: "报案号", prop: "reportNo"},
-  {label: "审批状态", prop: "auditStatus", dict: "auditStatus"},
-  {label: "审批时间", prop: "auditTime"},
-  {label: "审批人", prop: "auditName"},
+  { label: "序号", type: "index" },
+  { label: "报案号", prop: "reportNo" },
+  { label: "审批状态", prop: "auditStatus", dict: "auditStatus" },
+  { label: "审批时间", prop: "auditTime" },
+  { label: "审批人", prop: "auditName" },
 ]
 export default {
  name: "loanAdd",
-  components: {AiEartagPicker},
+  components: { AiIdcardRemote, AiEartagPicker, AiAudit },
  props: {
    instance: Function,
    permissions: Function,
@@ -19,7 +21,7 @@ export default {
  },
  data() {
    return {
-      detail: {detailList: []},
+      detail: { detailList: [] },
      records,
      filterText: "",
      bankList: []
@@ -35,17 +37,17 @@ export default {
    isAdd: v => !v.$route.query.id,
    isAudit: v => v.$route.hash == "#audit",
    formImages: v => [
-      {label: "身份证(正面)", prop: "frontCard", rules: {required: v.isAdd, message: '请上传 身份证(正面)'}},
-      {label: "身份证(反面)", prop: "reverseCard", rules: {required: v.isAdd, message: '请上传 身份证(反面)'}},
-      {label: "营业执照", prop: "businessPic", rules: {required: v.isAdd, message: '请上传 营业执照'}},
-      {label: "畜禽经营许可证", prop: "breedPic", rules: {required: v.isAdd, message: '请上传 畜禽经营许可证'}},
-      {label: "动物防疫条件许可证", prop: "prevention", rules: {required: v.isAdd, message: '请上传 动物防疫条件许可证'}},
+      { label: "身份证(正面)", prop: "frontCard", rules: { required: v.isAdd, message: '请上传 身份证(正面)' } },
+      { label: "身份证(反面)", prop: "reverseCard", rules: { required: v.isAdd, message: '请上传 身份证(反面)' } },
+      { label: "营业执照", prop: "businessPic", rules: { required: v.isAdd, message: '请上传 营业执照' } },
+      { label: "畜禽经营许可证", prop: "breedPic", rules: { required: v.isAdd, message: '请上传 畜禽经营许可证' } },
+      { label: "动物防疫条件许可证", prop: "prevention", rules: { required: v.isAdd, message: '请上传 动物防疫条件许可证' } },
    ],
    columns: v => [
-      {label: "序号", type: "index"},
-      {label: "生物芯片耳标号", prop: "biochipEarNumber"},
-      {label: "类别", prop: "category", dict: "category"},
-      {label: "品种", prop: "variety", dict: "variety"}
+      { label: "序号", type: "index" },
+      { label: "生物芯片耳标号", prop: "biochipEarNumber" },
+      { label: "类别", prop: "category", dict: "category" },
+      { label: "品种", prop: "variety", dict: "variety" }
    ].filter(e => !e.hide),
    selectedEartags: v => v.detail.detailList?.length || 0,
    tableData: v => v.detail.detailList?.filter(e => e.biochipEarNumber.indexOf(v.filterText) > -1) || [],
@@ -55,29 +57,29 @@ export default {
      this.$router.push(params)
    },
    getDetail() {
-      const {id} = this.$route.query
-      return id && this.instance.post("/api/loan/apply/getInfo", null, {params: {id}}).then(res => {
+      const { id } = this.$route.query
+      return id ? this.instance.post("/api/loan/apply/getInfo", null, { params: { id } }).then(res => {
        if (res?.data) {
          const detail = res.data
          detail.detailList = detail.detailList || []
-          let {farmPicture: picture} = detail
+          let { farmPicture: picture } = detail
          picture = JSON.parse(picture || "{}")
-          return this.detail = {...detail, ...picture}
+          return this.detail = { ...detail, ...picture }
        }
-      })
+      }) : Promise.resolve()
    },
    submit() {
      this.$refs.detail.validate().then(() => {
        const farmPicture = {}
        this.formImages.forEach(e => {
-          const {prop} = e
+          const { prop } = e
          const val = this.detail[prop]
          if (val) {
            farmPicture[prop] = val
          }
        })
        this.detail.farmPicture = JSON.stringify(farmPicture)
-        this.instance.post("/api/loan/apply/addOrEditOffline", {...this.detail}).then(res => {
+        this.instance.post("/api/loan/apply/addOrEditOffline", { ...this.detail }).then(res => {
          if (res?.code == '0') {
            this.$message.success("提交成功!")
            this.back()
@@ -87,7 +89,7 @@ export default {
    },
    audit() {
      this.$refs.detail.validate().then(() => {
-        this.instance.post("/api/loan/apply/audit", {...this.detail}).then(res => {
+        this.instance.post("/api/loan/apply/audit", { ...this.detail }).then(res => {
          if (res?.code == '0') {
            this.$message.success("提交成功!")
            this.back()
@@ -99,6 +101,7 @@ export default {
      this.instance.post("/api/loan/apply/getBank").then(res => {
        if (res?.data) {
          this.bankList = res.data
+          this.$set(this.detail, "bankId", res.data?.[0]?.id)
        }
      })
    },
@@ -106,10 +109,18 @@ export default {
      const item = this.bankList.find(e => e.id == id)
      return item?.children || []
    },
+    getRemoteInfo(userId) {
+      userId && this.instance.post("/api/siteUser/querySiteByUserId", null, {
+        params: { userId }
+      }).then(res => {
+        if (res?.data) {
+          this.$set(this.detail, "farmId", res.data?.[0]?.id)
+        }
+      })
+    }
  },
  created() {
-    this.getBanks()
-    this.getDetail()
+    this.getDetail().finally(() => this.getBanks())
  }
 }
 </script>
@@ -119,76 +130,82 @@ export default {
    <el-form size="small" label-width="120px" :model="detail" ref="detail">
      <ai-card title="基础信息">
        <div class="grid">
-          <el-form-item label="养殖场" prop="farmId" :rules="{required: isAdd,message:'请选择 养殖场'}">
-            <ai-select v-if="isAdd" v-model="detail.farmId" :instance="instance" :action="`/api/siteUser/querySiteByUserId?userId=${userinfo.id}`" :prop="{label:'name'}"/>
-            <b v-else v-text="detail.farmName"/>
+          <el-form-item label="养殖户" class="row">
+            <ai-idcard-remote :instance="instance" @enter="getRemoteInfo" />
          </el-form-item>
-          <el-form-item label="贷款银行" prop="bankId" :rules="{required: isAdd,message:'请选择 贷款银行'}">
-            <ai-select v-if="isAdd" v-model="detail.bankId" :select-list="bankList" :prop="{label:'name'}"/>
-            <b v-else v-text="detail.bankName"/>
+          <el-form-item label="养殖场" prop="farmId" :rules="{ required: isAdd, message: '请选择 养殖场' }">
+            <ai-select v-if="isAdd" v-model="detail.farmId" :instance="instance"
+              :action="`/api/siteUser/querySiteByUserId?userId=${userinfo.id}`" :prop="{ label: 'name' }" />
+            <b v-else v-text="detail.farmName" />
          </el-form-item>
-          <el-form-item label="贷款产品" prop="productType" :rules="{required: isAdd,message:'请选择 贷款产品'}">
-            <ai-select v-if="isAdd" v-model="detail.productType"
-                       :select-list="getProducts(detail.bankId)" :prop="{label:'name',value:'productType'}"/>
-            <b v-else v-text="dict.getLabel('loanProduct',detail.productType)"/>
+          <el-form-item label="贷款银行" prop="bankId" :rules="{ required: isAdd, message: '请选择 贷款银行' }">
+            <ai-select v-if="isAdd" v-model="detail.bankId" :select-list="bankList" :prop="{ label: 'name' }"
+              disabled />
+            <b v-else v-text="detail.bankName" />
          </el-form-item>
-          <el-form-item label="预期贷款额(万)" prop="loanAmount" :rules="{required: isAdd,message:'请输入 预期贷款额'}">
-            <ai-input v-model.number="detail.loanAmount" :edit="isAdd"/>
+          <el-form-item label="贷款产品" prop="productType" :rules="{ required: isAdd, message: '请选择 贷款产品' }">
+            <ai-select v-if="isAdd" v-model="detail.productType" :select-list="getProducts(detail.bankId)"
+              :prop="{ label: 'name', value: 'productType' }" />
+            <b v-else v-text="dict.getLabel('loanProduct', detail.productType)" />
          </el-form-item>
-          <el-form-item label="联系人" prop="contacts" :rules="{required: isAdd,message:'请输入 联系人'}">
-            <ai-input v-model="detail.contacts" :edit="isAdd"/>
+          <el-form-item label="预期贷款额(万)" prop="loanAmount" :rules="{ required: isAdd, message: '请输入 预期贷款额' }">
+            <ai-input v-model.number="detail.loanAmount" :edit="isAdd" />
          </el-form-item>
-          <el-form-item label="联系电话" prop="phone" :rules="{required: isAdd,message:'请输入 联系电话'}">
-            <ai-input v-model="detail.phone" :edit="isAdd"/>
+          <el-form-item label="联系人" prop="contacts" :rules="{ required: isAdd, message: '请输入 联系人' }">
+            <ai-input v-model="detail.contacts" :edit="isAdd" />
+          </el-form-item>
+          <el-form-item label="联系电话" prop="phone" :rules="{ required: isAdd, message: '请输入 联系电话' }">
+            <ai-input v-model="detail.phone" :edit="isAdd" />
          </el-form-item>
        </div>
      </ai-card>
      <ai-card title="质押标的">
        <template #right>
-          <ai-input placeholder="请输入/扫描耳标号" v-model="filterText" class="shrink"/>
-          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance" v-if="isAdd"
-                            :action="`/api/insurance/apply/getEarNumberList?farmId=${detail.farmId}`">
+          <ai-input placeholder="请输入/扫描耳标号" v-model="filterText" class="shrink" />
+          <ai-eartag-picker @select="v => detail.detailList = v" :instance="instance" v-if="isAdd"
+            :action="`/api/insurance/apply/getEarNumberList?farmId=${detail.farmId}`">
            <el-button type="text">选择</el-button>
          </ai-eartag-picker>
        </template>
-        <ai-highlight class="mar-b8 font-14" :content="`拟抵押标的选择 @v 只`" color="red" :value="selectedEartags"/>
-        <ai-table :tableData="tableData" :colConfigs="columns" :isShowPagination="!1" hideOptions/>
+        <ai-highlight class="mar-b8 font-14" :content="`拟抵押标的选择 @v 只`" color="red" :value="selectedEartags" />
+        <ai-table :tableData="tableData" :colConfigs="columns" :isShowPagination="!1" hideOptions />
      </ai-card>
      <ai-card title="证件信息">
        <div v-if="isAdd" class="font-12 color-888">只能上传JPG/PNG文件，且不超过2M</div>
        <div class="grid c-5 el-form--label-top">
-          <el-form-item v-for="(img,i) in formImages" :key="i" v-bind="img">
-            <ai-uploader :readonly="!isAdd" v-model="detail[img.prop]" :instance="instance" :limit="1" value-is-url/>
+          <el-form-item v-for="(img, i) in formImages" :key="i" v-bind="img">
+            <ai-uploader :readonly="!isAdd" v-model="detail[img.prop]" :instance="instance" :limit="1" value-is-url />
          </el-form-item>
        </div>
      </ai-card>
      <ai-card title="银行资料" v-if="isAdd">
        <div class="grid">
-          <el-form-item label="贷款合同号" prop="contractNo" :rules="{required:true,message:'请输入贷款合同号'}">
-            <ai-input v-model="detail.contractNo"/>
+          <el-form-item label="贷款合同号" prop="contractNo" :rules="{ required: true, message: '请输入贷款合同号' }">
+            <ai-input v-model="detail.contractNo" />
          </el-form-item>
          <el-form-item label="贷款资料" class="sc-2">
-            <ai-uploader v-model="detail.picture" value-is-url :instance="instance" :limit="1"/>
+            <ai-uploader v-model="detail.picture" value-is-url :instance="instance" :limit="1" />
          </el-form-item>
          <el-form-item label="说明">
-            <ai-input type="textarea" :rows="3" v-model="detail.remarks"/>
+            <ai-input type="textarea" :rows="3" v-model="detail.remarks" />
          </el-form-item>
        </div>
      </ai-card>
      <ai-card title="审核信息" v-if="!isAdd">
        <div class="grid">
          <template v-if="isAudit">
-            <el-form-item label="审批状态" prop="auditStatus" :rules="{required:true,message:'请选择审批状态'}">
-              <ai-select v-model="detail.auditStatus" dict="auditStatus"/>
+            <el-form-item label="审批状态" prop="auditStatus" :rules="{ required: true, message: '请选择审批状态' }">
+              <ai-audit @change="v => $set(detail, 'auditStatus', v)" />
            </el-form-item>
            <el-form-item label="贷款资料" class="sc-3">
-              <ai-uploader v-model="detail.picture" value-is-url :instance="instance" :limit="1"/>
+              <ai-uploader v-model="detail.picture" value-is-url :instance="instance" :limit="1" />
            </el-form-item>
-            <el-form-item label="贷款合同号" prop="contractNo" :rules="{required:true,message:'请输入 报案号'}">
-              <ai-input v-model="detail.contractNo"/>
+            <el-form-item label="贷款合同号" prop="contractNo"
+              :rules="{ required: detail.auditStatus == 2, message: '请输入 报案号' }">
+              <ai-input v-model="detail.contractNo" />
            </el-form-item>
            <el-form-item label="说明">
-              <ai-input type="textarea" :rows="3" v-model="detail.remarks"/>
+              <ai-input type="textarea" :rows="3" v-model="detail.remarks" />
            </el-form-item>
          </template>
          <template v-else>
@@ -196,7 +213,7 @@ export default {
            <el-form-item label="贷款合同号">{{ detail.contractNo }}</el-form-item>
            <el-form-item label="审核时间">{{ detail.auditTime }}</el-form-item>
            <el-form-item label="贷款资料" class="sc-3">
-              <el-image :src="detail.picture" :preview-src-list="[detail.picture]"/>
+              <el-image :src="detail.picture" :preview-src-list="[detail.picture]" />
            </el-form-item>
            <el-form-item label="审核人">{{ detail.auditName }}</el-form-item>
            <el-form-item label="说明">{{ detail.remarks }}</el-form-item>
--- a/project/xumu/AppLoanAudit/list.vue
+++ b/project/xumu/AppLoanAudit/list.vue
@@ -68,8 +68,8 @@ export default {
        <ai-select placeholder="全部贷款状态" v-model="search.status" dict="loanStatus"/>
        <ai-select placeholder="全部审批状态" v-model="search.auditStatus" dict="auditStatus"/>
        <ai-search label="贷款日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-input placeholder="养殖户" v-model="search.applyName"/>
        <ai-input placeholder="养殖场" v-model="search.farmName"/>
--- a/project/xumu/AppOutAudit/AppOutAudit.vue
+++ b/project/xumu/AppOutAudit/AppOutAudit.vue
@@ -0,0 +1,35 @@
+<script>
+import add from "./add.vue";
+import list from "./list.vue";
+
+export default {
+  name: "AppOutAudit",
+  label: "淘汰审核",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentPage() {
+      let {hash} = this.$route
+      return ["#audit", "#add"].includes(hash) ? add : list
+    }
+  },
+  created() {
+    this.dict.load("auditStatus","outReason", "category", "variety")
+  },
+}
+</script>
+
+<template>
+  <section class="AppOutAudit">
+    <component :is="currentPage" v-bind="$props"/>
+  </section>
+</template>
+
+<style scoped lang="scss">
+.AppOutAudit {
+  height: 100%;
+}
+</style>
--- a/project/xumu/AppOutAudit/add.vue
+++ b/project/xumu/AppOutAudit/add.vue
@@ -0,0 +1,157 @@
+<script>
+import { mapState } from "vuex"
+import AiAudit from "../components/AiAudit.vue";
+
+export default {
+  name: "oaAdd",
+  props: {
+    instance: Function,
+    permissions: Function,
+    dict: Object
+  },
+  components:{AiAudit},
+  data() {
+    return {
+      detail: { detailList: [] }
+    }
+  },
+  computed: {
+    ...mapState(["user"]),
+    userinfo: v => v.user.info || {},
+    pageTitle: v => {
+      const appName = v.$parent.menuName || v.$parent.$options.label
+      return v.isAudit ? `${appName}审批` : `${appName}详情`
+    },
+    isAudit: v => v.$route.hash == "#audit",
+    formImages: v => [
+      { label: "身长测量照片", prop: "heightPic" },
+      { label: "生物芯片照片", prop: "biochipPic" },
+      { label: "防疫耳标照片", prop: "preventionPic" },
+      { label: "其他说明照片", prop: "otherPic" },
+    ],
+    columns: v => [
+      { label: "序号", type: "index" },
+      { label: "生物芯片耳标号", prop: "biochipEarNumber" },
+      { label: "身长测量照片", prop: "heightPicture", upload: { instance: v.instance, readonly: !0, valueIsUrl: !0, limit: 1 } },
+      { label: "电子耳标照片", prop: "earNumberPicture", upload: { instance: v.instance, readonly: !0, valueIsUrl: !0, limit: 1 } },
+      { label: "防疫耳标照片", prop: "preventionPicture", upload: { instance: v.instance, readonly: !0, valueIsUrl: !0, limit: 1 } },
+    ].filter(e => !e.hide),
+  },
+  methods: {
+    back(params = {}) {
+      this.$router.push(params)
+    },
+    getDetail() {
+      const { id } = this.$route.query
+      return id && this.instance.post("/api/breed/out/getAuditPage", { id }).then(res => {
+        if (res?.data?.records?.[0]) {
+          const detail = res.data.records[0] || {}
+          return this.detail = { ...detail }
+        }
+      })
+    },
+    submit() {
+      this.$refs.detail.validate().then(() => {
+        this.instance.post("/api/breed/out/audit", { ...this.detail }).then(res => {
+          if (res?.code == '0') {
+            this.$message.success("提交成功!")
+            this.back()
+          }
+        })
+      })
+    }
+  },
+  created() {
+    this.getDetail()
+  }
+}
+</script>
+
+<template>
+  <ai-page :title="pageTitle" class="oaAdd" showBack content-string="blank">
+    <el-form size="small" label-width="120px" :model="detail" ref="detail">
+      <ai-card title="基础信息">
+        <div class="grid c-4">
+          <el-form-item label="生物芯片耳标号" class="row">
+            <b v-text="detail.biochipEarNumber" />
+          </el-form-item>
+          <el-form-item label="养殖场" prop="farmId">
+            <b v-text="detail.farmName" />
+          </el-form-item>
+          <el-form-item label="养殖舍" prop="houseId">
+            <b v-text="detail.houseName" />
+          </el-form-item>
+          <el-form-item label="养殖栏" prop="penId">
+            <b v-text="detail.penName" />
+          </el-form-item>
+          <el-form-item label="电子耳标号" prop="electronicEarNumber">
+            <b v-text="detail.electronicEarNumber" />
+          </el-form-item>
+          <el-form-item label="原厂耳标号" prop="category">
+            <b v-text="detail.originalEarNumber" />
+          </el-form-item>
+          <el-form-item label="类别" prop="category">
+            <b v-text="dict.getLabel('category',detail.category)" />
+          </el-form-item>
+          <el-form-item label="品种" prop="variety">
+            <b v-text="dict.getLabel('variety',detail.variety)" />
+          </el-form-item>
+          <div class="row flex">
+            <el-form-item v-for="(img, i) in formImages" :key="i" v-bind="img">
+              <ai-uploader v-model="detail[img.prop]" value-is-url readonly />
+            </el-form-item>
+          </div>
+        </div>
+      </ai-card>
+      <ai-card title="淘汰信息">
+        <el-form-item label="淘汰原因">
+          <b v-text="dict.getLabel('outReason', detail.reason)" />
+        </el-form-item>
+        <el-form-item label="淘汰时间">
+          <b v-text="detail.outTime" />
+        </el-form-item>
+        <el-form-item label="备注">
+          <b v-text="detail.remark" />
+        </el-form-item>
+      </ai-card>
+      <ai-card title="审核信息">
+        <div class="grid">
+          <template v-if="isAudit">
+            <el-form-item label="审批状态" prop="auditStatus" :rules="{ required: true, message: '请选择审批状态' }">
+              <ai-audit @change="v => $set(detail, 'auditStatus', v)" />
+            </el-form-item>
+            <el-form-item label="意见">
+              <ai-input type="textarea" :rows="3" v-model="detail.remark" />
+            </el-form-item>
+          </template>
+          <template v-else>
+            <el-form-item label="审核状态">{{ dict.getLabel('auditStatus', detail.auditStatus) }}</el-form-item>
+            <el-form-item label="审核时间">{{ detail.auditTime }}</el-form-item>
+            <el-form-item label="审核人">{{ detail.auditName }}</el-form-item>
+            <el-form-item label="意见">{{ detail.remarks }}</el-form-item>
+          </template>
+        </div>
+      </ai-card>
+    </el-form>
+    <div slot="footer">
+      <template v-if="isAudit">
+        <el-button type="primary" @click="submit">提交</el-button>
+      </template>
+      <el-button @click="back">返回</el-button>
+    </div>
+  </ai-page>
+</template>
+
+<style scoped lang="scss">
+.oaAdd {
+  :deep(.el-form--label-top) {
+    .el-form-item__label {
+      width: 100% !important;
+    }
+
+    .el-form-item__content {
+      margin-left: unset !important;
+    }
+  }
+}
+</style>
--- a/project/xumu/AppOutAudit/list.vue
+++ b/project/xumu/AppOutAudit/list.vue
@@ -0,0 +1,112 @@
+<script>
+import {mapState} from "vuex"
+
+const columns = [
+  {label: "序号", type: "index"},
+  {label: "养殖场", prop: "userName", format: (v, row) => `${[row.farmName, row.houseName, row.penName].join("-")}`},
+  {label: "生物芯片耳标号", prop: "biochipEarNumber"},
+  {label: "类别", prop: "category", dict: "category", width: 120},
+  {label: "品种", prop: "variety", dict: "variety", width: 120},
+  {label: "日龄(天)", prop: "age", width: 80},
+  {label: "淘汰时间", prop: "outTime"},
+  {label: "淘汰原因", prop: "reason", width: 80},
+  {label: "登记时间", prop: "createTime"},
+  {label: "操作人", prop: "userName", width: 100},
+  {label: "审核状态", prop: "auditStatus", dict: "auditStatus", width: 80},
+]
+export default {
+  name: "oaList",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  data() {
+    return {
+      columns,
+      tableData: [],
+      page: {pageNum: 1, pageSize: 10, total: 0},
+      search: {},
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    userinfo: v => v.user.info || {},
+    pageTitle: v => v.$parent.menuName || v.$parent.$options.label
+  },
+  watch: {
+    search: {
+      deep: true,
+      handler() {
+        this.page.pageNum = 1
+        this.getTableData()
+      }
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/api/breed/out/getAuditPage", {...this.page, ...this.search}).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records.map(e => ({...e, permit: `${e.status}` + e.auditStatus}))
+          this.page.total = res.data.total
+        }
+      })
+    },
+  },
+  created() {
+    this.getTableData()
+  }
+}
+</script>
+
+<template>
+  <ai-page class="oaList" :title="pageTitle">
+    <ai-search-bar>
+      <template #left>
+        <ai-select placeholder="全部养殖场" v-model="search.farmId" :instance="instance" :action="`/api/siteUser/querySiteByUserId?userId=${userinfo.id}`" :prop="{label:'name'}"/>
+        <ai-select placeholder="全部养殖舍" v-model="search.houseId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.farmId||-1}`" :prop="{label:'name'}"/>
+        <ai-select placeholder="全部养殖栏" v-model="search.penId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.houseId||-1}`" :prop="{label:'name'}"/>
+        <ai-select placeholder="全部审核状态" v-model="search.auditStatus" dict="auditStatus"/>
+        <ai-search label="淘汰日期">
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.outBeginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.outEndDate" type="datetime" placeholder="结束日期" size="small"/>
+        </ai-search>
+        <ai-search label="登记日期">
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+        </ai-search>
+        <ai-input placeholder="原场耳标号" v-model="search.originalEarNumber"/>
+        <ai-input placeholder="生物芯片耳标号" v-model="search.biochipEarNumber"/>
+        <ai-input placeholder="电子耳标号" v-model="search.electronicEarNumber"/>
+      </template>
+    </ai-search-bar>
+    <ai-search-bar>
+      <template #left>
+        <ai-download :instance="instance" url="/api/breed/out/exportAudit" :params="{...search,...page}" :fileName="`${pageTitle}导出表-${Date.now()}`"/>
+      </template>
+    </ai-search-bar>
+    <ai-table :tableData="tableData" :colConfigs="columns" :dict="dict" @getList="getTableData"
+              :total="page.total" :current.sync="page.pageNum" :size.sync="page.pageSize">
+      <el-table-column slot="options" label="操作" fixed="right" align="center">
+        <template slot-scope="{row}">
+          <div class="table-options">
+            <template v-if="['1'].includes(row.auditStatus)">
+              <el-button type="text" @click="$router.push({hash:'#audit',query:{id:row.id}})">审核</el-button>
+            </template>
+            <el-button v-else type="text" @click="$router.push({hash:'#add',query:{id:row.id}})">查看</el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </ai-table>
+  </ai-page>
+</template>
+
+<style scoped lang="scss">
+.oaList {
+  height: 100%;
+
+  .deleteBtn {
+    color: $errorColor;
+  }
+}
+</style>
--- a/project/xumu/AppOutManage/add.vue
+++ b/project/xumu/AppOutManage/add.vue
@@ -1,14 +1,16 @@
 <script>
 import {mapState} from "vuex"
+import AiEartagRemote from "@project/xumu/components/AiEartagRemote.vue";

 const formImages = [
-  {label: "身长测量照片", prop: "heightPic", rules: {required: true, message: '请上传 身长测量照片'}},
-  {label: "生物芯片照片", prop: "biochipPic", rules: {required: true, message: '请上传 生物芯片照片'}},
-  {label: "防疫耳标照片", prop: "preventionPic", rules: {required: true, message: '请上传 防疫耳标照片'}},
-  {label: "其他说明照片", prop: "otherPic", rules: {required: true, message: '请上传 其他说明照片'}},
+  {label: "身长测量照片", prop: "heightPic",},
+  {label: "生物芯片照片", prop: "biochipPic",},
+  {label: "防疫耳标照片", prop: "preventionPic",},
+  {label: "其他说明照片", prop: "otherPic",},
 ]
 export default {
  name: "outAdd",
+  components: {AiEartagRemote},
  props: {
    instance: Function,
    permissions: Function,
@@ -17,6 +19,7 @@ export default {
  data() {
    return {
      formImages,
+      filter: "",
      detail: {},
      form: {}
    }
@@ -53,7 +56,7 @@ export default {
      this.$refs.detail.validate().then(() => {
        const {biochipEarNumber, id, outTime, heightPic, biochipPic, preventionPic, otherPic, reason, remarks} = this.detail
        this.instance.post("/api/breed/out/addOrEdit", {
-          biochipEarNumber, id, outTime, picture: {heightPic, biochipPic, preventionPic, otherPic}, reason, remarks
+          biochipEarNumber, id, outTime, picture: JSON.stringify({heightPic, biochipPic, preventionPic, otherPic}), reason, remarks
        }).then(res => {
          if (res?.code == 0 && res?.data != 1) {
            this.$confirm("是否返回列表页?", "提交成功").then(() => this.back()).catch(() => this.getDetail(biochipEarNumber))
@@ -71,7 +74,10 @@ export default {
          }
        })
      })
-    }
+    },
+    handlerAutocomplete(value) {
+      'biochipEarNumber|farmId|houseId|penId|electronicEarNumber|originalEarNumber|category|variety'.split("|").forEach(prop => this.$set(this.detail, prop, value[prop]))
+    },
  },
  created() {
    this.dict.load("yesOrNo", "category", "variety", "outReason")
@@ -85,7 +91,7 @@ export default {
    <el-form size="small" label-width="120px" :model="detail" ref="detail">
      <ai-card title="基础信息">
        <div class="grid c-4">
-          <ai-input class="row" v-model="detail.biochipEarNumber" placeholder="请输入耳标号按回车查询,或扫描耳标号" @input="getDetail"/>
+          <ai-eartag-remote :instance="instance" @enter="handlerAutocomplete" class="row"/>
          <el-form-item label="生物芯片耳标号">
            <b v-text="detail.biochipEarNumber"/>
          </el-form-item>
@@ -101,7 +107,7 @@ export default {
          <el-form-item label="电子耳标号" prop="electronicEarNumber">
            <b v-text="detail.electronicEarNumber"/>
          </el-form-item>
-          <el-form-item label="原厂耳标号" prop="category">
+          <el-form-item label="原厂耳标号" prop="originalEarNumber">
            <b v-text="detail.originalEarNumber"/>
          </el-form-item>
          <el-form-item label="类别" prop="category">
@@ -114,31 +120,32 @@ export default {
      </ai-card>
      <ai-card title="上传照片">
        <div class="grid c-4">
-          <el-form-item v-for="(img,i) in formImages" :key="i" v-bind="img">
-            <ai-uploader v-if="isAdd||isEdit" v-model="detail[img.prop]" :instance="instance" :limit="1" value-is-url/>
+          <el-form-item v-for="(img, i) in formImages" :key="i" v-bind="img">
+            <ai-uploader v-if="isAdd || isEdit" v-model="detail[img.prop]" :instance="instance" :limit="1" value-is-url/>
            <el-image :src="detail[img.prop]" :preview-src-list="[detail[img.prop]]" v-else/>
          </el-form-item>
        </div>
      </ai-card>
      <ai-card title="淘汰录入">
        <div class="grid">
-          <el-form-item label="淘汰日期" prop="createTime" :rules="[{required:true,message:'请选择淘汰日期'}]">
-            <el-date-picker v-if="isAdd||isEdit" v-model="detail.createTime"/>
-            <b v-text="detail.createTime"/>
+          <el-form-item label="淘汰日期" prop="outTime" :rules="[{ required: true, message: '请选择淘汰日期' }]">
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-if="isAdd || isEdit" v-model="detail.outTime"/>
+            <b v-else v-text="detail.outTime"/>
          </el-form-item>
-          <el-form-item label="淘汰原因" prop="reason" :rules="[{required:true,message:'请选择淘汰原因'}]">
-            <ai-select v-if="isAdd||isEdit" v-model="detail.reason" dict="outReason"/>
-            <b v-text="detail.reason"/>
+          <el-form-item label="淘汰原因" prop="reason" :rules="[{ required: true, message: '请选择淘汰原因' }]">
+            <ai-select v-if="isAdd || isEdit" v-model="detail.reason" dict="outReason"/>
+            <b v-else v-text="detail.reason"/>
          </el-form-item>
          <el-form-item label="备注" prop="remark" class="row">
-            <ai-input type="textarea" :row="3" v-model="detail.remark" :edit="isAdd||isEdit"/>
+            <ai-input type="textarea" :row="3" v-model="detail.remark" :edit="isAdd || isEdit"/>
          </el-form-item>
        </div>
      </ai-card>
      <ai-card title="审批信息" v-if="isAuthing">
        <el-form :model="form" size="small" ref="form" label-width="120px">
-          <el-form-item label="是否同意" prop="auditStatus" :rules="[{required:true,message:'请选择是否同意'}]">
-            <ai-select v-model="form.auditStatus" :select-list="[{dictValue: 2, dictName: '同意'}, {dictValue: 3, dictName: '不同意'}]"/>
+          <el-form-item label="是否同意" prop="auditStatus" :rules="[{ required: true, message: '请选择是否同意' }]">
+            <ai-select v-model="form.auditStatus"
+                       :select-list="[{ dictValue: 2, dictName: '同意' }, { dictValue: 3, dictName: '不同意' }]"/>
          </el-form-item>
          <el-form-item label="审批意见" prop="auditReason">
            <el-input type="textarea" :row="3" v-model="form.auditReason" clearable placeholder="请输入"/>
@@ -147,7 +154,7 @@ export default {
      </ai-card>
    </el-form>
    <div slot="footer">
-      <el-button type="primary" @click="submit" v-if="isAdd||isEdit">提交</el-button>
+      <el-button type="primary" @click="submit" v-if="isAdd || isEdit">提交</el-button>
      <el-button type="primary" @click="handleAudit" v-if="isAuthing">提交</el-button>
      <el-button @click="back">返回</el-button>
    </div>
--- a/project/xumu/AppOutManage/list.vue
+++ b/project/xumu/AppOutManage/list.vue
@@ -94,12 +94,12 @@ export default {
        <ai-select placeholder="全部养殖栏" v-model="search.penId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.houseId||-1}`" :prop="{label:'name'}"/>
        <ai-select placeholder="全部审核状态" v-model="search.auditStatus" dict="auditStatus"/>
        <ai-search label="淘汰日期">
-          <el-date-picker v-model="search.outBeginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.outEndDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.outBeginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.outEndDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-search label="登记日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-input placeholder="原场耳标号" v-model="search.originalEarNumber"/>
        <ai-input placeholder="生物芯片耳标号" v-model="search.biochipEarNumber"/>
--- a/project/xumu/AppRoleRightsManager/AppRoleRightsManager.vue
+++ b/project/xumu/AppRoleRightsManager/AppRoleRightsManager.vue
@@ -35,23 +35,12 @@
                  @getList="getTableData" :col-configs="colConfigs" :dict="dict"
                  @selection-change="v=>multipleSelection=v">
          <el-table-column label="角色用户" slot="users" align="center">
-            <template slot-scope="scope">
-              <el-tooltip
-                  effect="light"
-                  placement="top"
-                  :disabled="scope.row.users.length <= 2"
-                  content="更多角色用户请点击详情按钮">
-              <span v-if="scope.row.users.length">
-                {{
-                  scope.row.users
-                      .slice(0, 2)
-                      .map((e) => e.name + "(" + e.phone + ")")
-                      .join(";")
-                }}
-                <span v-if="scope.row.users.length > 2">...</span>
-              </span>
-                <span v-else>-</span>
-              </el-tooltip>
+            <template slot-scope="{row}">
+              <div class="font-12 flex wrap gap-6">
+                <el-tag size="mini" v-for="(item, i) in row.users" :key="i">{{ item.name }}
+                  <template v-if="item.phone">({{ item.phone }})</template>
+                </el-tag>
+              </div>
            </template>
          </el-table-column>
          <el-table-column slot="options" label="操作" fixed="right" align="center">
@@ -186,7 +175,7 @@ export default {
    colConfigs() {
      return [
        {type: "selection"},
-        {label: "角色名", prop: "name", width: '100px'},
+        {label: "角色名", prop: "name", width: 140},
        {label: "所属端", prop: "type", width: '100px', dict: "roleType"},
        {label: "用户数量", prop: "roleCount", align: 'center', width: '80px'},
        {slot: "users"},
@@ -248,7 +237,8 @@ export default {
        hash: "#add",
        query: {
          id: item.id,
-          name: item.name
+          name: item.name,
+          type: item.type,
        },
      });
    },
--- a/project/xumu/AppRoleRightsManager/rightsAdd.vue
+++ b/project/xumu/AppRoleRightsManager/rightsAdd.vue
@@ -58,7 +58,6 @@ export default {
  data() {
    return {
      form: {},
-      roleName: '',
      id: '',
      appList: [],
      roleList: [],
@@ -73,8 +72,8 @@ export default {
  },
  created() {
    if (this.isEdit) {
-      let {id, name: roleName} = this.$route.query
-      this.form = {menus: [], id, roleName}
+      let {id, name: roleName, type} = this.$route.query
+      this.form = {menus: [], id, roleName, type}
      this.msgTitle = '编辑'
    }
    this.getPermissions()
--- a/project/xumu/AppSellApply/add.vue
+++ b/project/xumu/AppSellApply/add.vue
@@ -1,17 +1,17 @@
 <script>
-import {mapState} from "vuex"
+import { mapState } from "vuex"
 import AiEartagPicker from "@project/xumu/components/AiEartagPicker.vue";

 const records = [
-  {label: "序号", type: "index"},
-  {label: "解押凭证号", prop: "releaseNo"},
-  {label: "审批状态", prop: "auditStatus", dict: "auditStatus"},
-  {label: "审批时间", prop: "auditTime"},
-  {label: "审批人", prop: "auditName"},
+  { label: "序号", type: "index" },
+  { label: "解押凭证号", prop: "releaseNo" },
+  { label: "审批状态", prop: "auditStatus", dict: "auditStatus" },
+  { label: "审批时间", prop: "auditTime" },
+  { label: "审批人", prop: "auditName" },
 ]
 export default {
  name: "sellAdd",
-  components: {AiEartagPicker},
+  components: { AiEartagPicker },
  props: {
    instance: Function,
    permissions: Function,
@@ -19,7 +19,7 @@ export default {
  },
  data() {
    return {
-      detail: {detailList: []},
+      detail: { detailList: [] },
      records
    }
  },
@@ -32,15 +32,15 @@ export default {
    },
    isEdit: v => v.$route.hash == "#edit",
    formImages: v => [
-      {label: "合同/协议", prop: "contractPicture", rules: {required: v.isEdit, message: '请上传 合同/协议'}},
+      { label: "合同/协议", prop: "contractPicture", rules: { required: v.isEdit, message: '请上传 合同/协议' } },
    ],
    columns: v => [
-      {label: "序号", type: "index"},
-      {label: "生物芯片耳标号", prop: "biochipEarNumber"},
-      {label: "身长测量照片", prop: "heightPicture", upload: {instance: v.instance, readonly: !v.isEdit, valueIsUrl: !0, limit: 1}},
-      {label: "电子耳标照片", prop: "earNumberPicture", upload: {instance: v.instance, readonly: !v.isEdit, valueIsUrl: !0, limit: 1}},
-      {label: "防疫耳标照片", prop: "preventionPicture", upload: {instance: v.instance, readonly: !v.isEdit, valueIsUrl: !0, limit: 1}},
-      {label: "解押办结凭证号", prop: "releaseNo", hide: v.isEdit},
+      { label: "序号", type: "index" },
+      { label: "生物芯片耳标号", prop: "biochipEarNumber" },
+      { label: "身长测量照片", prop: "heightPicture", upload: { instance: v.instance, readonly: !v.isEdit, valueIsUrl: !0, limit: 1 } },
+      { label: "电子耳标照片", prop: "earNumberPicture", upload: { instance: v.instance, readonly: !v.isEdit, valueIsUrl: !0, limit: 1 } },
+      { label: "防疫耳标照片", prop: "preventionPicture", upload: { instance: v.instance, readonly: !v.isEdit, valueIsUrl: !0, limit: 1 } },
+      { label: "解押办结凭证号", prop: "releaseNo", hide: v.isEdit },
    ].filter(e => !e.hide),
    selectedEartags: v => v.detail.list?.length || 0,
  },
@@ -49,19 +49,20 @@ export default {
      this.$router.push(params)
    },
    getDetail() {
-      const {id} = this.$route.query
-      return id && this.instance.post("/api/sell/apply/getInfo", null, {params: {contractNo: id}}).then(res => {
+      const { id } = this.$route.query
+      return id && this.instance.post("/api/sell/apply/getInfo", null, { params: { contractNo: id } }).then(res => {
        if (res?.data) {
          const detail = res.data
          detail.detailList = detail.detailList || []
          detail.list = detail.list || []
-          return this.detail = {...detail}
+          return this.detail = { ...detail }
        }
      })
    },
    submit() {
      this.$refs.detail.validate().then(() => {
-        this.instance.post("/api/sell/apply/add", {...this.detail}).then(res => {
+        const earNumberList = this.detail.detailList.map(e => e.biochipEarNumber)
+        this.instance.post("/api/sell/apply/add", { ...this.detail, earNumberList }).then(res => {
          if (res?.code == '0') {
            this.$message.success("提交成功!")
            this.back()
@@ -81,44 +82,45 @@ export default {
    <el-form size="small" label-width="120px" :model="detail" ref="detail">
      <ai-card title="基础信息">
        <div class="grid">
-          <el-form-item label="养殖场" prop="farmId" :rules="{message:'请选择 养殖场'}">
-            <b v-text="detail.farmName"/>
+          <el-form-item label="养殖场" prop="farmId" :rules="{ message: '请选择 养殖场' }">
+            <b v-text="detail.farmName" />
          </el-form-item>
-          <el-form-item label="贷款银行" prop="bankId" :rules="{message:'请选择 贷款银行'}">
-            <b v-text="detail.bankName"/>
+          <el-form-item label="贷款银行" prop="bankId" :rules="{ message: '请选择 贷款银行' }">
+            <b v-text="detail.bankName" />
          </el-form-item>
-          <el-form-item label="贷款产品" prop="productType" :rules="{message:'请选择 贷款产品'}">
-            <b v-text="dict.getLabel('loanProduct',detail.productType)"/>
+          <el-form-item label="贷款产品" prop="productType" :rules="{ message: '请选择 贷款产品' }">
+            <b v-text="dict.getLabel('loanProduct', detail.productType)" />
          </el-form-item>
-          <el-form-item label="贷款金额(万)" prop="loanAmount" :rules="{message:'请输入 预期贷款额'}">
-            <ai-input v-model.number="detail.loanAmount" :edit="!1"/>
+          <el-form-item label="贷款金额(万)" prop="loanAmount">
+            <ai-input v-model.number="detail.loanAmount" :edit="!1" />
          </el-form-item>
-          <el-form-item label="联系人" prop="contacts" :rules="{message:'请输入 联系人'}">
-            <ai-input v-model="detail.contacts" :edit="!1"/>
+          <el-form-item label="联系人" prop="contacts" :rules="{ message: '请输入 联系人' }">
+            <ai-input v-model="detail.contacts" :edit="!1" />
          </el-form-item>
-          <el-form-item label="联系电话" prop="phone" :rules="{message:'请输入 联系电话'}">
-            <ai-input v-model="detail.phone" :edit="!1"/>
+          <el-form-item label="联系电话" prop="phone" :rules="{ message: '请输入 联系电话' }">
+            <ai-input v-model="detail.phone" :edit="!1" />
          </el-form-item>
        </div>
      </ai-card>
      <ai-card title="标的信息">
        <template #right v-if="isEdit">
-          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance"
-                            :action="`/api/sell/apply/getClaimEarNumberList?contractNo=${detail.contractNo}`">
+          <ai-eartag-picker @select="v => detail.detailList = v.map(e=>({biochipEarNumber:e}))" :instance="instance"
+            :action="`/api/sell/apply/getClaimEarNumberList?contractNo=${detail.contractNo}`">
            <el-button type="text">选择</el-button>
          </ai-eartag-picker>
        </template>
-        <ai-highlight class="mar-b8 font-14" :content="`投保标的共${detail.insureNumber||0}只，已理赔标的共 @v 只`" color="red" :value="selectedEartags"/>
-        <ai-table :tableData="detail.detailList" :colConfigs="columns" :isShowPagination="!1" hideOptions/>
+        <ai-highlight class="mar-b8 font-14" :content="`投保标的共${detail.insureNumber || 0}只，已理赔标的共 @v 只`" color="red"
+          :value="selectedEartags" />
+        <ai-table :tableData="detail.detailList" :colConfigs="columns" :isShowPagination="!1" hideOptions />
      </ai-card>
      <ai-card title="解押材料" v-if="isEdit">
        <div class="font-12 mar-b8">只能上传JPG/PNG文件，且不超过2M，一次最多5张</div>
-        <el-form-item v-for="(img,i) in formImages" :key="i" v-bind="img">
-          <ai-uploader v-model="detail[img.prop]" :instance="instance" value-is-url :limit="5"/>
+        <el-form-item v-for="(img, i) in formImages" :key="i" v-bind="img">
+          <ai-uploader v-model="detail[img.prop]" :instance="instance" value-is-url :limit="5" />
        </el-form-item>
      </ai-card>
      <ai-card title="出栏解押记录" v-else>
-        <ai-table :tableData="detail.list" :colConfigs="records" :isShowPagination="!1" hideOptions/>
+        <ai-table :tableData="detail.list" :colConfigs="records" :isShowPagination="!1" hideOptions />
      </ai-card>
    </el-form>
    <div slot="footer">
--- a/project/xumu/AppSellApply/list.vue
+++ b/project/xumu/AppSellApply/list.vue
@@ -64,8 +64,8 @@ export default {
      <template #left>
        <ai-input placeholder="贷款合同号" v-model="search.contractNo"/>
        <ai-search label="贷款日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-input placeholder="养殖户" v-model="search.applyName"/>
        <ai-input placeholder="养殖场" v-model="search.farmName"/>
--- a/project/xumu/AppSellAudit/list.vue
+++ b/project/xumu/AppSellAudit/list.vue
@@ -64,8 +64,8 @@ export default {
        <ai-input placeholder="贷款合同号" v-model="search.contractNo"/>
        <ai-select placeholder="全部审批状态" v-model="search.auditStatus" dict="auditStatus"/>
        <ai-search label="投保日期">
-          <el-date-picker v-model="search.auditBeginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.auditEndDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.auditBeginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.auditEndDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-input placeholder="养殖户" v-model="search.applyName"/>
      </template>
--- a/project/xumu/AppSign/AppSign.vue
+++ b/project/xumu/AppSign/AppSign.vue
@@ -95,6 +95,8 @@ export default {
      if (data?.access_token) {
        this.setToken([data.token_type, data.access_token].join(" "))
        this.handleGotoHome()
+      } else {
+        this.$message.error(data?.msg || "登录失败!")
      }
    },
    handleGotoHome() {
--- a/project/xumu/AppTreatmentManage/add.vue
+++ b/project/xumu/AppTreatmentManage/add.vue
@@ -5,7 +5,7 @@ import AiEartagPicker from "../components/AiEartagPicker.vue";
 const columns = [
  {label: "序号", type: "index"},
  {label: "药品名称", prop: "drugName"},
-  {label: "药量", prop: "dosage"},
+  {label: "药量(ml)", prop: "dosage"},
  {label: "生产厂家", prop: "factory"},
  {label: "厂家批号", prop: "batchNumber"},
  {label: "疾病名称", prop: "diseaseName"},
@@ -56,7 +56,7 @@ export default {
      return id && this.instance.post("/api/breed/treatment/getInfo", null, {params: {biochipEarNumber: id}}).then(res => {
        if (res?.data) {
          const detail = res.data
-          detail.detailList = detail.immunityList || []
+          detail.detailList = detail.treatmentList || []
          return this.detail = {...detail}
        }
      })
@@ -95,7 +95,7 @@ export default {
  },
  created() {
    this.dict.load("yesOrNo")
-    this.detail.treatmentTime = new Date()
+    this.detail.treatmentTime = this.$moment().format("YYYY-MM-DD HH:mm:ss")
    this.getDetail()
  }
 }
@@ -138,7 +138,7 @@ export default {
        <template v-if="isAdd">
          <div class="grid c-3">
            <el-form-item label="治疗日期" prop="treatmentTime" :rules="{required:true,message:'请选择 治疗日期'}">
-              <el-date-picker v-model="detail.treatmentTime"/>
+              <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="detail.treatmentTime"/>
            </el-form-item>
            <el-form-item v-for="(item,i) in formItems" :key="i" v-bind="item">
              <ai-input v-model="detail[item.prop]"/>
@@ -162,9 +162,9 @@ export default {
      <ai-dialog v-model="dialog" title="治疗登记" @closed="form={}" @confirm="submit">
        <el-form size="small" label-width="120px" class="grid">
          <el-form-item label="治疗日期" prop="treatmentTime" :rules="{required:true,message:'请选择 治疗日期'}">
-            <el-date-picker v-model="form.treatmentTime"/>
+            <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="form.treatmentTime"/>
          </el-form-item>
-          <el-form-item v-for="item in formItems" v-bind="item">
+          <el-form-item v-for="(item,i) in formItems" :key="i" v-bind="item">
            <ai-input v-model="detail[item.prop]"/>
          </el-form-item>
        </el-form>
--- a/project/xumu/AppTreatmentManage/list.vue
+++ b/project/xumu/AppTreatmentManage/list.vue
@@ -64,12 +64,12 @@ export default {
        <ai-select placeholder="全部养殖舍" v-model="search.houseId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.farmId||-1}`" :prop="{label:'name'}"/>
        <ai-select placeholder="全部养殖栏" v-model="search.penId" :instance="instance" :action="`/api/siteUser/querySiteById?id=${search.houseId||-1}`" :prop="{label:'name'}"/>
        <ai-search label="治疗日期">
-          <el-date-picker v-model="search.treatmentBeginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.treatmentEndDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.treatmentBeginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.treatmentEndDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <ai-search label="登记日期">
-          <el-date-picker v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.beginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.endDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
        <el-input placeholder="原场耳标号" v-model="search.originalEarNumber" size="small" clearable/>
        <el-input placeholder="生物芯片耳标号" v-model="search.biochipEarNumber" size="small" clearable/>
--- a/project/xumu/AppWeightManage/AppWeightManage.vue
+++ b/project/xumu/AppWeightManage/AppWeightManage.vue
@@ -16,9 +16,9 @@ export default {
      return hash == "#add" ? add : list
    }
  },
-  data() {
-    return {}
-  }
+  created() {
+    this.dict.load( "yesOrNo", "category", "variety", "dataSources")
+  },
 }
 </script>

--- a/project/xumu/AppWeightManage/add.vue
+++ b/project/xumu/AppWeightManage/add.vue
@@ -62,7 +62,7 @@ export default {
    submit() {
      this.$refs.detail.validate().then(() => {
        this.form.biochipEarNumber = this.detail.biochipEarNumber
-        this.instance.post("/api/breed/weight/addOrEdit", this.form).then(res => {
+        this.instance.post("/api/breed/weight/addOrEdit", null, {params: this.form}).then(res => {
          if (res?.code == 0) {
            this.dialog = false
            this.getDetail()
@@ -72,7 +72,6 @@ export default {
    }
  },
  created() {
-    this.dict.load("yesOrNo", "category", "variety", "dataSources")
    this.getDetail()
  }
 }
@@ -102,7 +101,7 @@ export default {
            <b v-text="detail.variety"/>
          </el-form-item>
          <el-form-item label="最近称重时间">
-            <b v-text="detail.lastCreateTime"/>
+            <b v-text="detail.todayCreateTime||detail.lastCreateTime"/>
          </el-form-item>
          <el-form-item label="最新体重(公斤)">
            <b v-text="detail.todayWeight||detail.lastWeight"/>
@@ -122,13 +121,13 @@ export default {
          </el-table-column>
        </ai-table>
      </ai-card>
-      <ai-dialog v-model="dialog" title="体重录入" @closed="form={}" @confirm="submit">
+      <ai-dialog v-model="dialog" title="体重录入" @closed="form={}" @confirm="submit" width="50vw">
        <el-form size="small" label-width="120px" :model="form" ref="detail" class="grid">
          <el-form-item label="办理时间" prop="createTime" :rules="[{required:true,message:'请选择办理时间'}]">
-            <el-date-picker v-model="form.createTime" :readonly="form.id"/>
+            <el-date-picker v-model="form.createTime" :readonly="form.id" value-format="yyyy-MM-dd HH:mm:ss"/>
          </el-form-item>
          <el-form-item label="体重(公斤)" prop="weight" :rules="[{required:true,message:'请输入体重(公斤)'}]">
-            <el-input v-model.number="form.weight" clearable placeholder="请输入"/>
+            <ai-input type="number" v-model="form.weight"/>
          </el-form-item>
        </el-form>
      </ai-dialog>
--- a/project/xumu/AppWeightManage/list.vue
+++ b/project/xumu/AppWeightManage/list.vue
@@ -71,8 +71,8 @@ export default {
        <ai-select placeholder="全部品种" v-model="search.variety" dict="variety"/>
        <el-input placeholder="生物芯片耳标号" v-model="search.biochipEarNumber" dict="authStatus" size="small" clearable/>
        <ai-search label="称重日期">
-          <el-date-picker v-model="search.weightBeginDate" type="datetime" placeholder="开始日期" size="small"/>
-          <el-date-picker v-model="search.weightEndDate" type="datetime" placeholder="结束日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.weightBeginDate" type="datetime" placeholder="开始日期" size="small"/>
+          <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.weightEndDate" type="datetime" placeholder="结束日期" size="small"/>
        </ai-search>
      </template>
    </ai-search-bar>
--- a/project/xumu/components/AiAudit.vue
+++ b/project/xumu/components/AiAudit.vue
@@ -0,0 +1,19 @@
+<script>
+const options = [
+  { dictValue: 2, dictName: '同意' },
+  { dictValue: 3, dictName: '不同意' }
+]
+export default {
+  name: "AiAudit",
+  data() {
+    return {
+      options, auditStatus: ""
+    }
+  },
+}
+</script>
+<template>
+  <section class="AiAudit">
+    <ai-select v-model="auditStatus" :select-list="options" v-bind="$attrs" v-on="$listeners" />
+  </section>
+</template>
--- a/project/xumu/components/AiEartagPicker.vue
+++ b/project/xumu/components/AiEartagPicker.vue
@@ -3,9 +3,10 @@ export default {
  name: "AiEartagPicker",
  props: {
    instance: Function,
-    value: {default: () => []},
-    action: {default: "/api/breed/earTag/getEarTagByPenId"},
-    penId: String
+    value: { default: () => [] },
+    action: { default: "/api/breed/earTag/getEarTagByPenId" },
+    penId: String,
+    valueKey: { type: String, default: "biochipEarNumber" }
  },
  model: {
    prop: "value",
@@ -15,11 +16,21 @@ export default {
    return {
      list: [],
      dialog: false,
-      selected: []
+      selected: [],
+      origin: []
+    }
+  },
+  computed: {
+    api: v => {
+      let url = v.action
+      if (v.penId) {
+        url += `?penId=${v.penId}`
+      }
+      return url
    }
  },
  watch: {
-    action: {
+    api: {
      immediate: true,
      handler() {
        this.getEartag()
@@ -28,20 +39,24 @@ export default {
  },
  methods: {
    getEartag() {
-      let url = this.action
-      if (this.penId) {
-        url += `?penId=${this.penId}`
-      }
-      !/undefined/.test(url) && this.instance.post(url).then(res => {
+      !/undefined/.test(this.api) && this.instance.post(this.api).then(res => {
        if (res?.data) {
-          this.list = res.data
+          const key = this.valueKey
+          this.origin = res.data ?? []
+          this.list = res.data?.map(v => {
+            if (typeof v == 'string') {
+              return { key: v, label: v }
+            } else if (key) {
+              return { key: v[key], label: v[key] }
+            }
+          }) || []
        }
      })
    },
    handleConfirm() {
      this.dialog = false
      this.$emit("input", this.selected)
-      this.$emit("select", this.list.filter(v => this.selected.includes(v.id)))
+      this.$emit("select", this.origin.filter(v => this.selected.includes(v?.[this.valueKey] ?? v)))
    }
  }
 }
@@ -49,15 +64,16 @@ export default {

 <template>
  <section class="AiEartagPicker">
-    <div style="width: auto;" v-if="$slots.default" @click="dialog=true">
-      <slot/>
+    <div style="width: auto;" v-if="$slots.default" @click="dialog = true">
+      <slot />
    </div>
    <el-select v-else :value="value" clearable multiple placeholder="请选择">
-      <el-option v-for="op in list" :key="op.id" :label="op.earTag" :value="op.id"/>
-      <div slot="prefix" @click.stop="dialog=true"/>
+      <el-option v-for="(op, i) in list" :key="i" :label="op.label" :value="op.key" />
+      <div slot="prefix" @click.stop="dialog = true" />
    </el-select>
-    <ai-dialog v-model="dialog" title="选择牲畜" width="640px" @confirm="handleConfirm" @closed="selected=[]" @open="selected=value">
-      <el-transfer :data="list" v-model="selected" :titles="['可选','已选择']"/>
+    <ai-dialog v-model="dialog" title="选择牲畜" width="800px" @confirm="handleConfirm" @closed="selected = []"
+      @open="selected = value">
+      <el-transfer :data="list" v-model="selected" :titles="['可选', '已选择']" />
    </ai-dialog>
  </section>
 </template>
@@ -68,6 +84,7 @@ export default {

  :deep(.el-select) {
    width: 100%;
+    position: relative;

    .el-input__inner {
      padding-left: 15px !important;
@@ -76,12 +93,23 @@ export default {
    .el-input__prefix {
      left: 0;
      right: 0;
-      z-index: 202412271101;
+      z-index: 999;

-      & > div {
+      &>div {
        height: 100%;
      }
    }
  }
+
+  :deep(.el-transfer) {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .el-transfer-panel {
+      width: auto;
+      min-width: 200px;
+    }
+  }
 }
 </style>
--- a/project/xumu/components/AiEartagRemote.vue
+++ b/project/xumu/components/AiEartagRemote.vue
@@ -0,0 +1,40 @@
+<script>
+
+export default {
+  name: "AiEartagRemote",
+  props: {
+    instance: Function
+  },
+  data() {
+    return {
+      value: "",
+      info: {}
+    }
+  },
+  methods: {
+    getText(biochipEarNumber) {
+      this.info = {}
+      return this.instance.post("/api/breed/earTag/page", {biochipEarNumber, pageSize: 10, pageNum: 1}).then(res => {
+        if (res?.data?.records) {
+          this.info = res.data.records[0]
+          this.$emit('enter', this.info)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<template>
+  <section class="AiEartagRemote">
+    <ai-input v-model="value" placeholder="请输入耳标号按回车查询,或扫描耳标号" @keyup.enter.native="getText(value)"/>
+  </section>
+
+</template>
+
+<style scoped lang="scss">
+.AiEartagRemote {
+  gap: 8px;
+  width: 100%;
+}
+</style>
--- a/project/xumu/components/AiIdcardRemote.vue
+++ b/project/xumu/components/AiIdcardRemote.vue
@@ -0,0 +1,48 @@
+<script>
+
+export default {
+  name: "AiIdcardRemote",
+  props: {
+    instance: Function
+  },
+  data() {
+    return {
+      value: "",
+      info: {}
+    }
+  },
+  computed: {
+    infoText: v => [v.info.name, v.info.idCard].filter(Boolean)?.join('  ')?.trim()
+  },
+  methods: {
+    getText(idCard) {
+      this.info = {}
+      if (!this.ID.check(idCard)) return this.$message.error("请输入正确的身份证号")
+      return this.instance.post("/api/user/getUserByIdCard", null, {params: {idCard}}).then(res => {
+        if (res?.data) {
+          this.info = res.data
+          this.$emit('enter', this.info.id)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<template>
+  <section class="AiIdcardRemote flex">
+    <ai-input v-model="value" @keyup.enter.native="getText(value)"/>
+    <b class="text" v-text="infoText"/>
+  </section>
+
+</template>
+
+<style scoped lang="scss">
+.AiIdcardRemote {
+  gap: 8px;
+
+  .AiInput {
+    min-width: 300px;
+  }
+}
+</style>
--- a/src/utils/store.js
+++ b/src/utils/store.js
@@ -8,24 +8,17 @@ import extra from "../config.json"
 Vue.use(Vuex)

 export default new Vuex.Store({
-  state: {
-  },
+  state: {},
  mutations: {
    signOut(state, flag) {
      const base = extra.base || ""
-      if (flag) {
-        state.user.token = null;
-        state.user.info = {}
+      new Promise(resolve => {
+        flag ? resolve() : axios.delete('/auth/token/logout').then(resolve)
+      }).then(() => {
+        localStorage.removeItem("vuex");
        sessionStorage.clear();
-        location.href = base + '/login' + location.hash;
-      } else {
-        axios.delete('/auth/token/logout').then(() => {
-          state.user.token = null;
-          sessionStorage.clear();
-          state.user.info = {}
-          location.href = base + '/login';
-        });
-      }
+        location.href = [base, '/login', location.hash].join('');
+      })
    },
  },
  getters: {
--- a/ui/lib/js/utils.js
+++ b/ui/lib/js/utils.js
@@ -15,12 +15,12 @@ import $reg from "./regular"
 */
 const addChild = (parent, pending, config) => {
  let conf = {
-        key: 'id',
-        parent: 'parentId',
-        children: 'children',
-        ...config
-      },
-      doBeforeCount = pending.length
+      key: 'id',
+      parent: 'parentId',
+      children: 'children',
+      ...config
+    },
+    doBeforeCount = pending.length
  for (let i = pending.length - 1; i >= 0; i--) {
    let e = pending[i]
    if (e[conf.parent] == parent[conf.key]) {
@@ -58,7 +58,7 @@ const $decimalCalc = (...arr) => {
    return ('' + e).length - index
  })
  let maxDecimal = Math.max(...decimalLengthes),
-      precision = Math.pow(10, maxDecimal)
+    precision = Math.pow(10, maxDecimal)
  // 计算
  let intArr = arr.map(e => (Number(e) || 0) * precision)
  // 返回计算值
@@ -86,10 +86,10 @@ const $colorUtils = {
      if (color.length == 4) {
        // 检测诸如#FFF简写格式
        color =
-            '#' +
-            color.charAt(1).repeat(2) +
-            color.charAt(2).repeat(2) +
-            color.charAt(3).repeat(2)
+          '#' +
+          color.charAt(1).repeat(2) +
+          color.charAt(2).repeat(2) +
+          color.charAt(3).repeat(2)
      }
      hex = parseInt(color.slice(1), 16)
    }
@@ -170,8 +170,8 @@ export default {
  },
  $dateFormat: (time, format) => {
    return $moment(time)
-        .format(format || 'YYYY-MM-DD')
-        .replace('Invalid Date', '')
+      .format(format || 'YYYY-MM-DD')
+      .replace('Invalid Date', '')
  },
  $copy,
  $download: (url, name) => {
@@ -190,7 +190,7 @@ export default {
  $arr2tree: (list, config = {}) => {
    let result = []
    const {key = 'id', parent = 'parentId', children = 'children'} = config, itemMap = {},
-        ids = list?.map(e => `#${e[key]}#`)?.toString()
+      ids = list?.map(e => `#${e[key]}#`)?.toString()
    for (const e of list) {
      const id = e[key], pid = e[parent]
      itemMap[id] = {...e, [children]: [itemMap[id]?.[children]].flat().filter(Boolean)}
@@ -230,5 +230,11 @@ export default {
      }
      return max
    } else return 0
+  },
+  $isEmpty(obj) {
+    if (obj === null || obj === undefined) return true;
+    if (typeof obj === 'string' && obj.trim() === '') return true;
+    if (Array.isArray(obj) && obj.length === 0) return true;
+    return typeof obj === 'object' && Object.keys(obj).length === 0;
  }
 }
--- a/ui/lib/styles/common.scss
+++ b/ui/lib/styles/common.scss
@@ -3,7 +3,7 @@
@import "ckeditor";
@import "vars";

-$cdn: "https://cdn.cunwuyun.cn/";
+$cdn: "https://cdn.sinoecare.com/";
 $--color-primary: $primaryColor;
 $--color-text-placeholder: $placeholderColor;
 $--border-color-base: $borderColor;
@@ -164,7 +164,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
  缺省页相关样式
 */
 .no-data {
-  background: url("https://cdn.cunwuyun.cn/ui/svg/NoData.svg") no-repeat center;
+  background: url("https://cdn.sinoecare.com/ui/svg/NoData.svg") no-repeat center;
  background-size: 120px 120px;
  height: 120px;
  margin: 48px auto 10px;
@@ -174,28 +174,28 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
  缺省页相关样式
 */
 .ai-empty__bg {
-  background: url("https://cdn.cunwuyun.cn/ui/svg/empty.svg") no-repeat center;
+  background: url("https://cdn.sinoecare.com/ui/svg/empty.svg") no-repeat center;
  background-size: 120px 120px;
  height: 120px;
  margin: 48px auto 0;
 }

 .no-permission {
-  background: url("https://cdn.cunwuyun.cn/ui/svg/NoAuthority.svg") no-repeat center;
+  background: url("https://cdn.sinoecare.com/ui/svg/NoAuthority.svg") no-repeat center;
  background-size: 120px 120px;
  height: 120px;
  margin-top: 48px;
 }

 .no-message {
-  background: url("https://cdn.cunwuyun.cn/ui/svg/NoMessage.svg") no-repeat center;
+  background: url("https://cdn.sinoecare.com/ui/svg/NoMessage.svg") no-repeat center;
  background-size: 120px 120px;
  height: 120px;
  margin-top: 48px;
 }

 .done-success {
-  background: url("https://cdn.cunwuyun.cn/ui/svg/Success.svg") no-repeat center;
+  background: url("https://cdn.sinoecare.com/ui/svg/Success.svg") no-repeat center;
  background-size: 120px 120px;
  height: 120px;
 }
@@ -207,7 +207,7 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts';
 }

 .developing {
-  background: url("https://cdn.cunwuyun.cn/ui/svg/developing.svg") no-repeat center;
+  background: url("https://cdn.sinoecare.com/ui/svg/developing.svg") no-repeat center;
  background-size: 400px 320px;
  width: 100%;
  height: 100%;
@@ -657,11 +657,11 @@ h1, h2, h3, p {
 */

 .signLeftBg {
-  background-image: url('#{$cdn}/ui/background/#{$theme}/loginLeft.png');
+  background-image: url('#{$cdn}ui/background/#{$theme}/loginLeft.png');
 }

 .navBg {
-  background-image: url('#{$cdn}/ui/background/#{$theme}/nav_bg.png');
+  background-image: url('#{$cdn}ui/background/#{$theme}/nav_bg.png');
 }

 /**
--- a/ui/packages/basic/AiTable.vue
+++ b/ui/packages/basic/AiTable.vue
@@ -26,8 +26,8 @@
          <template slot-scope="{row,$index}">
            <span v-if="colConfig.dict" :style="{color:colConfig.color||dict.getColor(colConfig.dict, row[colConfig.prop])}" v-text="dict.getLabel(colConfig.dict, row[colConfig.prop])"/>
            <render-slot v-else-if="colConfig.render" :render="colConfig.render" :row="row" :index="$index" :column="colConfig"/>
-            <el-input v-else-if="colConfig.edit" v-model="row[colConfig.prop]" size="small" placeholder="请输入" clearable/>
-            <el-input v-else-if="colConfig.num" v-model.number="row[colConfig.prop]" size="small" placeholder="请输入" clearable/>
+            <ai-input v-else-if="colConfig.edit" v-model="row[colConfig.prop]"/>
+            <ai-input v-else-if="colConfig.num" type="number" v-model="row[colConfig.prop]"/>
            <ai-select v-else-if="colConfig.select" v-model="row[colConfig.prop]" v-bind="colConfig.select"/>
            <ai-uploader v-else-if="colConfig.upload" v-model="row[colConfig.prop]" :limit="1" v-bind="colConfig.upload"/>
            <ai-open-data v-else-if="colConfig.openType" :type="colConfig.openType" :openid="row[colConfig.prop]"/>