Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

project/xiushan/apps/AppAccountXiushan/AppAccountXiushan.vue

@@ -35,7 +35,7 @@
         </ai-table>
       </template>
     </ai-list>
-    <!--功能分配-->
+    <!--添加账号-->
     <ai-dialog title="添加账号" :close-on-click-modal="false" class="editStyle" :visible.sync="accountDialog"
                width="800px" @closed="account={}" @onConfirm="submitAddAcount">
       <el-form ref="addAccountForm" :model="account" :rules="rules" size="small"
@@ -47,10 +47,11 @@
           <el-input v-model.trim="account.phone" placeholder="请输入..." clearable :maxLength="11"/>
         </el-form-item>
         <el-form-item label="行政地区" prop="areaId">
-          <ai-area-get v-model="account.areaId" :instance="instance"/>
+          <ai-area-get v-model="account.areaId" :instance="instance" root="500241000000" showAll/>
         </el-form-item>
       </el-form>
     </ai-dialog>
+    <!--功能分配-->
     <ai-dialog title="功能分配" :visible.sync="dialog" width="800px" @open="initDialogData" @onConfirm="updateAccount">
       <el-form ref="updateAccountForm" :model="dialogForm" :rules="rules" size="small"
                label-width="120px">
@@ -61,10 +62,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="行政地区" prop="areaId">
-          <ai-area-select v-model="dialogForm.areaId" always-show :instance="instance"
-                          clearable @fullname="v=>dialogForm.areaFullName=v"
-                          @name="v=>dialogForm.areaName=v"
-                          :disabledLevel="disabledLevel"/>
+          <ai-area-get v-model="dialogForm.areaId" :instance="instance" :name.sync="dialogForm.areaName"
+                       root="500241000000" showAll/>
         </el-form-item>
         <el-form-item label="党组织" prop="organizationId" v-if="user.info.organizationId">
           <el-cascader :options="partyOrgOps" v-model="dialogForm.organizationId"
@@ -214,7 +213,8 @@ export default {
         if (v) {
           if (this.lock) return this.$message.error("请勿多次提交!")
           this.lock = true
-          this.instance.post("/user/empower", this.dialogForm).then(res => {
+          let areaFullName = this.dialogForm.areaName
+          this.instance.post("/user/empower", {...this.dialogForm, areaFullName}).then(res => {
             this.lock = false
             if (res?.code == 0) {
               this.dialog = false;
@@ -238,6 +238,7 @@ export default {
             if (res?.code == 0) {
               this.$message.success("提交成功!")
               this.accountDialog = false
+              this.getTableData();
             }
           })
         }

project/xiushan/apps/AppNewsCenter/components/addArticle.vue

@@ -98,7 +98,7 @@ export default {
      * */
     addOrUpdate(status) {
       if (Array.isArray(this.articInfo.thumbUrl)) {
-        this.articInfo.thumbUrl = this.articInfo.thumbUrl[0].url
+        this.articInfo.thumbUrl = this.articInfo.thumbUrl?.[0]?.url
       }
       const msg = +status ? '发布成功' : this.isEdit ? '编辑成功' : '保存成功';
       this.instance.post(`/app/appnews/addOrUpdate`, {
@@ -135,7 +135,7 @@ export default {
           } else {
             this.articInfo.thumbUrl = []
           }
-          
+
         }
       })
     }

project/xiushan/apps/finance/AppFinanceProduct/productAdd.vue

@@ -11,16 +11,16 @@
               </el-form-item>
               <el-row type="flex" class="flexWrap">
                 <el-form-item label="贷款额度(万)" prop="loanMin">
-                  <el-input v-model.number="form.loanMin" placeholder="最低额度" clearable/>
+                  <el-input type="number" v-model="form.loanMin" placeholder="最低额度" clearable/>
                 </el-form-item>
                 <el-form-item label="" prop="loanMax">
-                  <el-input v-model.number="form.loanMax" placeholder="最高额度" clearable/>
+                  <el-input type="number" v-model="form.loanMax" placeholder="最高额度" clearable/>
                 </el-form-item>
                 <el-form-item label="参考利率(%)" prop="interestRateMin">
-                  <el-input v-model.number="form.interestRateMin" placeholder="最低利率" clearable/>
+                  <el-input type="number" v-model="form.interestRateMin" placeholder="最低利率" clearable/>
                 </el-form-item>
                 <el-form-item label="" prop="interestRateMax">
-                  <el-input v-model.number="form.interestRateMax" placeholder="最高利率" clearable/>
+                  <el-input type="number" v-model="form.interestRateMax" placeholder="最高利率" clearable/>
                 </el-form-item>
                 <el-form-item class="half" label="还款期限" prop="repaymentTimeline">
                   <ai-select v-model="form.repaymentTimeline" placeholder="请选择"
@@ -179,5 +179,13 @@ export default {
   ::v-deep.half {
     width: 50%;
   }
+
+  ::v-deep input[type="number"] {
+    line-height: 1px !important;
+
+    &::-webkit-outer-spin-button, &::-webkit-inner-spin-button {
+      -webkit-appearance: none !important;
+    }
+  }
 }
 </style>

project/xiushan/apps/financing/AppFinancingNeeds/needsList.vue

@@ -5,7 +5,7 @@
       <template #content>
         <ai-search-bar>
           <template #right>
-            <el-input size="small" placeholder="搜索企业主体" v-model="search.enterpriseName" clearable
+            <el-input size="small" placeholder="搜索企业名称" v-model="search.enterpriseName" clearable
                       @change="page.current=1,getTableData()"/>
           </template>
         </ai-search-bar>