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
11 changed files with 207 additions and 196 deletions
--- a/project/xumu/AppClaimApply/AppClaimApply.vue
+++ b/project/xumu/AppClaimApply/AppClaimApply.vue
@@ -17,7 +17,7 @@ export default {
    }
  },
  created() {
-    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety")
+    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety", "productType")
  },
 }
 </script>
--- a/project/xumu/AppClaimApply/add.vue
+++ b/project/xumu/AppClaimApply/add.vue
@@ -19,7 +19,7 @@ export default {
  },
  data() {
    return {
-      detail: {detailList: []},
+      detail: { detailList: [], list: [] },
      records
    }
  },
@@ -55,6 +55,7 @@ export default {
      return id && this.instance.post("/api/insurance/claim/apply/getInfo", null, { params: { orderNo: id } }).then(res => {
        if (res?.data) {
          const detail = res.data
+          detail.detailList = detail.detailList || []
          return this.detail = { ...detail }
        }
      })
@@ -91,7 +92,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" />
@@ -103,12 +104,13 @@ export default {
      </ai-card>
      <ai-card title="投保对象">
        <template #right v-if="isClaim">
-          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance"
+          <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-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">
--- a/project/xumu/AppClaimAudit/AppClaimAudit.vue
+++ b/project/xumu/AppClaimAudit/AppClaimAudit.vue
@@ -17,7 +17,7 @@ export default {
    }
  },
  created() {
-    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety")
+    this.dict.load("auditStatus", "insureType", "insureStatus", "category", "variety", "productType")
  },
 }
 </script>
--- 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/AppDeathAudit/add.vue
+++ b/project/xumu/AppDeathAudit/add.vue
@@ -1,5 +1,6 @@
 <script>
 import { mapState } from "vuex"
+import AiAudit from "../components/AiAudit.vue";

 export default {
  name: "deathAdd",
@@ -13,6 +14,7 @@ export default {
      detail: { detailList: [] }
    }
  },
+  components:{AiAudit},
  computed: {
    ...mapState(["user"]),
    userinfo: v => v.user.info || {},
@@ -34,8 +36,8 @@ export default {
    },
    getDetail() {
      const { id } = this.$route.query
-      return id && this.instance.post("/api/breed/death/page", null, {params: {id}}).then(res => {
-        if (res?.data?.records) {
+      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]) => {
@@ -87,10 +89,10 @@ export default {
            <b v-text="detail.originalEarNumber" />
          </el-form-item>
          <el-form-item label="类别" prop="category">
-            <b v-text="detail.category"/>
+            <b v-text="dict.getLabel('category', detail.category)" />
          </el-form-item>
          <el-form-item label="品种" prop="variety">
-            <b v-text="detail.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">
@@ -114,7 +116,7 @@ export default {
        <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"/>
+              <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" />
--- a/project/xumu/AppDeathAudit/list.vue
+++ b/project/xumu/AppDeathAudit/list.vue
@@ -82,7 +82,7 @@ export default {
    </ai-search-bar>
    <ai-search-bar>
      <template #left>
-        <ai-download :instance="instance" url="/api/breed/death/export" :params="{...search,...page}" :fileName="`${pageTitle}导出表-${Date.now()}`"/>
+        <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"
--- a/project/xumu/AppInsuranceAudit/add.vue
+++ b/project/xumu/AppInsuranceAudit/add.vue
@@ -73,6 +73,7 @@ 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
@@ -82,7 +83,7 @@ export default {
          }
        })
        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()
--- a/project/xumu/AppLoanApply/add.vue
+++ b/project/xumu/AppLoanApply/add.vue
@@ -72,6 +72,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
@@ -81,7 +82,7 @@ export default {
          }
        })
        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()
@@ -103,7 +104,8 @@ export default {
      <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'}"/>
+            <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: '请选择 贷款银行' }">
@@ -111,8 +113,8 @@ export default {
            <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'}"/>
+            <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: '请输入 预期贷款额' }">
@@ -129,8 +131,8 @@ export default {
      <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" value-key="biochipEarNumber"
-                            :action="`/api/insurance/apply/getEarNumberList?farmId=${detail.farmId}`">
+          <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>
--- a/project/xumu/AppOutAudit/add.vue
+++ b/project/xumu/AppOutAudit/add.vue
@@ -1,5 +1,6 @@
 <script>
 import { mapState } from "vuex"
+import AiAudit from "../components/AiAudit.vue";

 export default {
  name: "oaAdd",
@@ -8,6 +9,7 @@ export default {
    permissions: Function,
    dict: Object
  },
+  components:{AiAudit},
  data() {
    return {
      detail: { detailList: [] }
@@ -41,9 +43,9 @@ export default {
    },
    getDetail() {
      const { id } = this.$route.query
-      return id && this.instance.post("/api/breed/out/getAuditInfo", null, {params: {id}}).then(res => {
-        if (res?.data) {
-          const detail = res.data
+      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 }
        }
      })
@@ -89,10 +91,10 @@ export default {
            <b v-text="detail.originalEarNumber" />
          </el-form-item>
          <el-form-item label="类别" prop="category">
-            <b v-text="detail.category"/>
+            <b v-text="dict.getLabel('category',detail.category)" />
          </el-form-item>
          <el-form-item label="品种" prop="variety">
-            <b v-text="detail.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">
@@ -116,7 +118,7 @@ export default {
        <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"/>
+              <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" />
--- a/project/xumu/AppSellApply/add.vue
+++ b/project/xumu/AppSellApply/add.vue
@@ -61,7 +61,8 @@ export default {
    },
    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()
@@ -90,7 +91,7 @@ export default {
          <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:'请输入 预期贷款额'}">
+          <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: '请输入 联系人' }">
@@ -103,12 +104,13 @@ export default {
      </ai-card>
      <ai-card title="标的信息">
        <template #right v-if="isEdit">
-          <ai-eartag-picker @select="v=>detail.detailList=v" :instance="instance"
+          <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-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">
--- 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');
 }

 /**
Author	SHA1	Message	Date
aixianling	8b72cc93a0	refactor(xumu): 优化保险审计提交逻辑 - 添加耳号列表处理，提高数据准确性 - 使用对象展开运算符简化代码结构 - 优化 API 请求数据格式	2025-01-22 09:41:03 +08:00
aixianling	6819b17126	feat(AppSellApply): 优化 add 组件并添加耳标号列表 - 重新格式化代码，使其更加规范和可读 - 在提交时添加 earNumberList 字段，包含选中的生物芯片耳标号 - 优化 AiEartagPicker 组件的使用方式 - 调整表格和表单的样式	2025-01-22 09:39:33 +08:00
aixianling	d9a35f0081	fix(AppLoanApply): 修复添加页面格式问题 - 调整了代码缩进和格式，使其更加规范 - 修复了一些小的语法问题，如模板字符串中的引号 - 优化了部分变量命名，使其更具可读性	2025-01-21 14:03:45 +08:00
aixianling	4b26e6f5d0	components(xumu): 在 AppDeathAudit 和 AppOutAudit 组件中添加 AiAudit 组件引用 - 在 AppDeathAudit/add.vue 中引入并注册 AiAudit 组件 - 在 AppOutAudit/add.vue 中引入并注册 AiAudit 组件	2025-01-21 10:36:10 +08:00
aixianling	ebb28ed676	refactor(xumu): 优化代码格式和组件使用 - 格式化代码，调整缩进和空格 - 使用 dict.getLabel 方法获取类别和品种标签 - 在审批状态下使用 ai-audit 组件替代 ai-select 组件	2025-01-21 10:25:41 +08:00
aixianling	a059d2bd57	fix(xumu): 修复审计页面数据获取问题 - 在 AppDeathAudit 和 AppOutAudit 组件中，修改了 getDetail 方法 - 从 API 响应中获取正确的数据结构，确保详细信息正确显示 - 优化了代码格式，提高了可读性	2025-01-21 10:09:13 +08:00
aixianling	fde372007f	refactor(xumu): 优化 API 请求参数传递方式 - 在 AppDeathAudit 和 AppOutAudit 组件中，修改了 getDetail 方法的 API 请求参数传递方式 - 从使用 params 参数改为直接传递对象，简化了请求参数的处理	2025-01-21 09:50:15 +08:00
aixianling	9aed740388	fix(AppDeathAudit): 修改导出接口地址 - 将导出接口地址从 "/api/breed/death/export" 修改为 "/api/breed/death/exportAudit" - 该修改确保了正确的数据被导出，解决了错误导出的问题	2025-01-21 09:21:51 +08:00
aixianling	8a20db021a	refactor(xumu): 优化获取详情数据接口及处理逻辑 - 修改请求接口地址：将 "/api/breed/death/page" 更改为 "/api/breed/death/getAuditPage" - 优化数据处理逻辑：直接使用 res.data 代替 res.data.records[0]	2025-01-21 09:21:06 +08:00
aixianling	8daf15cf3f	refactor(xumu): 修改 AppOutAudit 详情获取接口 - 将 getAuditInfo 接口更改为 getAuditPage 接口 - 更新接口 URL 以适应后端接口变更	2025-01-21 09:20:06 +08:00
aixianling	ba8dc41c83	refactor(ui): 更新 CDN 域名并统一资源路径格式 - 将 CDN 域名从 https://cdn.cunwuyun.cn/ 更改为 https://cdn.sinoecare.com/ - 统一资源路径格式，移除多余的斜杠 - 更新了多个样式类中的背景图片 URL	2025-01-21 09:15:50 +08:00
aixianling	6744b18240	feat(xumu): 新增保险产品类型字典 - 在 AppClaimApply 和 AppClaimAudit 组件中添加 productType 字典加载 - 在 add.vue 组件中使用 productType 字典获取保险产品类型标签	2025-01-17 11:09:53 +08:00
aixianling	a3ea6d9c51	fix(xumu): 修复理赔申请页面的耳标选择和数据加载问题 - 优化耳标选择功能，将选中的耳标数据格式化后赋值给 detail.detailList - 初始化 detail 对象时添加 list 属性，确保数据结构一致性 - 优化数据加载逻辑，处理可能的空值情况 - 调整页面布局和样式，提高可读性	2025-01-17 11:07:20 +08:00
aixianling	5fa30a0e0e	refactor(xumu): 优化 AppLoanApply 添加页面代码 - 在 submit 方法中添加 earNumberList 数组，用于存储生物芯片耳号 - 优化代码结构，提高可读性和可维护性	2025-01-17 10:46:51 +08:00