From ec729eb1e9142d6b5f6b7e87aa88f808c13f7c7c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 11:27:01 +0800
Subject: [PATCH 1/7] BUG 30959

---
 project/xiushan/apps/finance/AppFinanceProduct/productList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
index 6f99dce5..8d5eb012 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
@@ -104,7 +104,7 @@ export default {
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records.map(e => {
-            let guaranteeModeLabel = e.guaranteeMode.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
+            let guaranteeModeLabel = e.guaranteeMode?.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
             return {...e, guaranteeModeLabel}
           })
           this.page.total = res.data.total

From 6ac1f0a87a620ea276de1c40e6da4fde344b81ee Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 14:15:04 +0800
Subject: [PATCH 2/7] BUG 30961

---
 project/xiushan/apps/finance/AppLoanAudit/loanSta.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue b/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
index a59b9c86..3a9fea0c 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
@@ -12,7 +12,7 @@
     <div class="col-row">
       <div class="item" v-for="(v,label) in overviews" :key="label">
         <p v-text="label"/>
-        <h2 v-text="v"/>
+        <h2 v-text="formatValue(v)"/>
       </div>
     </div>
     <div class="chart-flex">
@@ -178,7 +178,7 @@ export default {
   data() {
     return {
       search: {},
-      overviews: [],
+      overviews: {},
       productTop10: [],
       tradeTrend: [],
       applyInfo: {}
@@ -227,6 +227,9 @@ export default {
         }
       })
     },
+    formatValue(v) {
+      return v?.toFixed(1) || v
+    }
   },
   created() {
     this.getStaData()

From cef6c224ee9a944db1c34eaea7c77ecebc5706af Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 14:18:35 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue | 2 +-
 .../xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
index b34330f2..98b51d6c 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
@@ -71,7 +71,7 @@ export default {
   },
   computed: {
     addTitle() {
-      return !!this.$route.query.id ? "编辑金融产品" : "添加金融产品"
+      return !!this.$route.query.id ? "编辑担保产品" : "添加担保产品"
     },
     rules() {
       return {
diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
index 0a3921fd..84f33fea 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="productDetail">
     <ai-detail>
-      <ai-title slot="title" title="金融产品详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
+      <ai-title slot="title" title="担保产品详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
         <template #rightBtn>
           <el-button v-if="isAdmin&&detail.status==0" type="primary" @click="dialog=true">审核</el-button>
         </template>

From 35ac06a05bfc17852fafaa1ded9ffa77a56f6894 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 14:22:37 +0800
Subject: [PATCH 4/7] BUG 30962

---
 .../finance/AppGuaranteeProduct/productAdd.vue  | 17 ++---------------
 .../AppGuaranteeProduct/productDetail.vue       |  9 ---------
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
index 98b51d6c..d7ef2406 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
@@ -22,9 +22,6 @@
                             maxlength="11"/>
                 </el-form-item>
               </el-row>
-              <el-form-item label="企业微信二维码" prop="qrCodeUrl">
-                <ai-uploader v-model="form.qrCodeUrl" :instance="instance" :limit="1" isShowTip valueIsUrl/>
-              </el-form-item>
             </template>
           </ai-card>
           <ai-card title="适用范围">
@@ -41,16 +38,6 @@
               </el-form-item>
             </template>
           </ai-card>
-          <ai-card title="办理渠道">
-            <template #content>
-              <el-form-item label="业务办理渠道" prop="handlingChannels">
-                <ai-select v-model="form.handlingChannels" :selectList="dict.getDict('financialProductChannels')" @change="form.zwspId=null"/>
-              </el-form-item>
-              <el-form-item v-if="form.handlingChannels==1" label="关联贷款联审" prop="zwspId">
-                <ai-select v-model="form.zwspId" :instance="instance" action="/approval-process-def/list?processDefStatus=1" :prop="{label:'processName'}"/>
-              </el-form-item>
-            </template>
-          </ai-card>
         </el-form>
       </template>
       <template #footer>
@@ -96,8 +83,8 @@ export default {
         productFeatures: [{required: true, message: "请输入产品特色", trigger: 'blur'}],
         handlingChannels: [{required: true, message: "请选择办理渠道"}],
         zwspId: [{required: true, message: "请选择关联贷款联审"}],
-        // bankCounterpart: [{required: true, message: "请输入客户经理姓名", trigger: 'change'}],
-        // consultationTelephone: [ {required: true, message: "请输入客户经理电话", trigger: 'change'}],
+        bankCounterpart: [{required: true, message: "请输入客户经理", trigger: 'change'}],
+        consultationTelephone: [{required: true, message: "请输入联系方式", trigger: 'change'}],
       }
     }
   },
diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
index 84f33fea..47b60d53 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
@@ -19,9 +19,6 @@
                 <el-form-item label="客户经理" class="half">{{ detail.bankCounterpart }}</el-form-item>
                 <el-form-item label="联系方式" class="half">{{ detail.consultationTelephone }}</el-form-item>
               </el-row>
-              <el-form-item label="企业微信二维码" v-if="detail.qrCodeUrl">
-                <el-image class="qrCode" :src="detail.qrCodeUrl" :preview-src-list="[detail.qrCodeUrl]"/>
-              </el-form-item>
             </template>
           </ai-card>
           <ai-card title="适用范围">
@@ -30,12 +27,6 @@
               <el-form-item label="面向对象">{{ detail.faceUserLabel }}</el-form-item>
             </template>
           </ai-card>
-          <ai-card title="办理渠道">
-            <template #content>
-              <el-form-item label="业务办理渠道">{{ dict.getLabel('financialProductChannels', detail.handlingChannels) }}</el-form-item>
-              <el-form-item label="关联贷款联审" v-if="detail.handlingChannels==1">{{ detail.zwspName }}</el-form-item>
-            </template>
-          </ai-card>
           <ai-card title="审核结果" v-if="!isAuthing">
             <template #content>
               <el-row type="flex" class="flexWrap">

From df89da46f1346f358549fe3e651f75cca4a8438e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 14:24:35 +0800
Subject: [PATCH 5/7] BUG 30957

---
 project/xiushan/apps/finance/AppFinanceProduct/productList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
index 8d5eb012..f3ed3e6e 100644
--- a/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppFinanceProduct/productList.vue
@@ -79,7 +79,7 @@ export default {
   },
   data() {
     return {
-      search: {productName: ""},
+      search: {productName: "", queryType: 0},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [

From e8774de7d434aa0816624ed21e72ac59a31f4a45 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 14:59:30 +0800
Subject: [PATCH 6/7] BUG 30961

---
 project/xiushan/apps/finance/AppLoanAudit/loanSta.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue b/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
index 3a9fea0c..54cfb18a 100644
--- a/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanSta.vue
@@ -228,7 +228,7 @@ export default {
       })
     },
     formatValue(v) {
-      return v?.toFixed(1) || v
+      return typeof v == "number" ? (v?.toFixed(1) || v) : v
     }
   },
   created() {

From ae1c7ce5ebdc979c183e6e48cfa156edc58f7062 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 23 Aug 2022 15:19:35 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E7=99=BE=E5=BA=A6=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E5=9F=8B=E7=82=B9=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/develop/AppDeployCustom/add.vue | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/project/oms/apps/develop/AppDeployCustom/add.vue b/project/oms/apps/develop/AppDeployCustom/add.vue
index 65979648..5d61ed33 100644
--- a/project/oms/apps/develop/AppDeployCustom/add.vue
+++ b/project/oms/apps/develop/AppDeployCustom/add.vue
@@ -76,6 +76,20 @@
                       </div>
                     </el-row>
                   </template>
+                  <template v-else-if="form.type=='web'">
+                    <el-row type="flex">
+                      <div class="fill">
+                        <el-form-item label="接口是否单服务">
+                          <el-checkbox v-model="form.isSingleService"/>
+                        </el-form-item>
+                      </div>
+                      <div class="fill">
+                        <el-form-item label="开启百度流量">
+                          <el-checkbox v-model="form.hmt"/>
+                        </el-form-item>
+                      </div>
+                    </el-row>
+                  </template>
                 </template>
               </ai-card>
             </el-form>