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

examples/entries.js

@@ -2,7 +2,7 @@
 const install = function(Vue) {
 	if (install.installed) return Promise.resolve();
 	else {
-		let contexts = require.context('../project/shandong10086/apps', true, /(\/.+)\/App[^\/]+\.vue$/);
+		let contexts = require.context('../packages', true, /(\/.+)\/App[^\/]+\.vue$/);
 		if (contexts) {
 			contexts.keys().map((e) => {
 				if (contexts(e).default) {

packages/bigscreen/designer/components/Layout.vue

@@ -171,6 +171,7 @@
                     <el-option label="中国移动" value="cmcc"></el-option>
                     <el-option label="海康威视" value="hik"></el-option>
                     <el-option label="大华" value="dahua"></el-option>
+                    <el-option label="视联网" value="slw"></el-option>
                   </el-select>
                 </div>
               </div>

packages/bigscreen/designer/components/form/DataConfig.vue

@@ -68,7 +68,7 @@
         </div>
       </div>
     </div>
-    <div class="layout-config__group" v-if="options.dataType !== 'staticData' && options.type === 'monitor' && options.monitorType === 'cmcc'">
+    <div class="layout-config__group" v-if="options.dataType !== 'staticData' && options.type === 'monitor' && (options.monitorType === 'cmcc' || options.monitorType === 'slw')">
       <h2>字段设置</h2>
       <div class="layout-config__item">
         <label>监控视频</label>

packages/processManagement/approvalManage/components/approvalDetail.vue

@@ -54,7 +54,7 @@
                       <ai-title :title="index"></ai-title>
                       <el-form-item v-for="e in item" :key="e.id" :label="[e.fieldName,e.fieldNameSuffix].join('')">
                         <el-input :value="getFieldValue(e)" readonly style="width: 100%;" v-if="e.fieldDataType!=5"/>
-                        <el-checkbox-group v-model="!e.fieldValue ? '' : String(e.fieldValue).split(',')">
+                        <el-checkbox-group v-model="!e.fieldValue ? '' : String(e.fieldValue).split(',')" v-else>
                           <el-checkbox :label="val.dictValue" disabled
                                        v-for="(val,idx) in dict.getDict(e.dictionaryCode)" :key="idx">{{val.dictName}}</el-checkbox>
                         </el-checkbox-group>
@@ -256,6 +256,11 @@
             </el-select>
 
           </el-form-item>
+          <el-form-item label="审批意见" prop="opinion"
+                        v-if="titleType=='审批同意'">
+            <el-input type="textarea" :rows="4" v-model.trim="form.opinion" placeholder="请输入" show-word-limit
+                      :maxlength="150"></el-input>
+          </el-form-item>
           <el-form-item label="审批意见" prop="opinion" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]"
                         v-if="titleType=='审批拒绝'">
             <el-input type="textarea" :rows="4" v-model.trim="form.opinion" placeholder="请输入" show-word-limit
@@ -497,7 +502,7 @@ export default {
           })
 
           this.dict.load(dicts)
-          if (res.data.approvalStatus == 1) {
+          if (res.data.approvalStatus == 1 && res.data.tableType && res.data.tableType === '2') {
             this.menuList.push('签署文件')
           }
         }

project/shandong10086/apps/shandong/AppIntegralAudit/components/Detail.vue

@@ -28,7 +28,7 @@
             <ai-info-item label="审核意见" v-if="info.auditStatus === '2'" isLine :value="info.auditOpinion"></ai-info-item>
             <ai-info-item label="积分规则类别" v-if="info.auditStatus === '1'" :value="dict.getLabel('atWillReportType', info.auditIntegralType)"></ai-info-item>
             <ai-info-item label="积分规则事项" v-if="info.auditStatus === '1'" :value="info.auditRuleName"></ai-info-item>
-            <ai-info-item label="积分调整" isLine v-if="info.auditStatus === '1'" :value="(info.auditIntegral >= 0 ? '+' + info.auditIntegral : info.auditIntegral) + '分'"></ai-info-item>
+            <ai-info-item label="积分调整" isLine v-if="info.auditStatus === '1'" :value="(info.auditIntegral >= 0 ? + info.auditIntegral : info.auditIntegral) + '分'"></ai-info-item>
             <ai-info-item label="审核人" :value="info.auditUserName"></ai-info-item>
             <ai-info-item label="审核时间" :value="info.auditTime"></ai-info-item>
           </ai-wrapper>

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"
+          <ai-area-get v-model="dialogForm.areaId" :instance="instance" :name.sync="dialogForm.areaName"
-                          clearable @fullname="v=>dialogForm.areaFullName=v"
+                       root="500241000000" showAll/>
-                          @name="v=>dialogForm.areaName=v"
-                          :disabledLevel="disabledLevel"/>
         </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>