user5 пре 2 година
родитељ
комит
65b38522f6

+ 2 - 2
.env.production

@@ -2,8 +2,8 @@
 ENV = 'production'
 
 #Jeeplus快速开发平台/后台地址
-VUE_APP_SERVER_URL = 'http:/xxxxxx.com/jeeplus-vue'
+VUE_APP_SERVER_URL = 'http://bx.xgccpm.com:8081/jeeplus-vue'
 #单点登录设置
 VUE_APP_SSO_LOGIN  = 'false'
 VUE_APP_CAS_SERVER = 'https://www.cainiao.com:8443/cas'
-VUE_APP_CLIENT_HOST = 'http://localhost:3000'
+VUE_APP_CLIENT_HOST = 'http://localhost:3001'

+ 1 - 1
src/views/modules/flowable/task/ProcessList.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="jp-common-layout page">
       <div class="jp-common-layout-left">
-        <div class="jp-common-title"> 
+        <div class="jp-common-title">
           <el-input
           placeholder="分类:请输入关键字过滤"
           size="small"

+ 2 - 2
src/views/modules/flowable/task/TaskForm.vue

@@ -5,7 +5,7 @@
   <el-tabs type="border-card" v-model="taskSelectedTab">
     <el-tab-pane label="表单信息" name="form-first">
       <component id="printForm" :formReadOnly="formReadOnly" v-if="formType === '2'" :class="formReadOnly?'readonly':''"  ref="form" :businessId="businessId" :is="form"></component>
-      
+
       <PreviewForm  id="printForm"   v-if="formType !== '2'"  :processDefinitionId="procDefId" :edit="true" :taskFormData="taskFormData" ref="form"/>
     </el-tab-pane>
     <el-tab-pane label="流程信息" v-if="procInsId"  name="form-second">
@@ -472,4 +472,4 @@
       }
     }
   }
-</script>
+</script>

+ 12 - 3
src/views/modules/sys/project/AssessForm.vue

@@ -321,6 +321,7 @@
             </el-form-item>
           </el-col>-->
         </el-row>
+        <el-divider content-position="left"><i class="el-icon-document"></i> 附件信息</el-divider>
           <el-upload ref="upload" style="display: inline-block; margin-left: 5em; :show-header='status'" action=""
                      :limit="999" :http-request="httpRequest"
                      multiple
@@ -333,13 +334,12 @@
                      :file-list="filesArra2">
             <el-button type="info" size="mini" v-if="inputForm.permissionFlag&&showVi">点击上传</el-button>
           </el-upload>
-          <div style="height: calc(100% - 80px);margin-top: 30px">
+          <div style="height: calc(100% - 80px);margin-top: 10px">
           <vxe-table
             style="margin-left: 5em"
             border="inner"
             auto-resize
             resizable
-            height="500px"
             :loading="loading"
             size="small"
             ref="projectTable"
@@ -373,8 +373,8 @@
 <!--            <vxe-column title="文件描述" field="description"></vxe-column>-->
             <vxe-column title="操作" width="200px" fixed="right" align="center">
               <template  slot-scope="scope">
+                <el-button type="text"  icon="el-icon-edit" size="small" @click="toHref(scope.row)" :disabled="false">下载</el-button>
                 <el-button type="text"  icon="el-icon-delete" size="small" v-if="inputForm.permissionFlag&&showVi" @click="deleteMsgById(scope.row, scope.$rowIndex)">删除</el-button>
-                <el-button type="text"  icon="el-icon-edit" size="small" @click="toHref(scope.row)" :disabled="none">下载</el-button>
               </template>
             </vxe-column>
           </vxe-table>
@@ -792,3 +792,12 @@
     }
   }
 </script>
+<style scoped>
+  .avatar{
+    height: 100px;
+  }
+  .el-divider__text {
+    font-weight: bold;
+    font-size: 16px;
+  }
+</style>

+ 11 - 2
src/views/modules/sys/project/ConsultationForm.vue

@@ -324,6 +324,7 @@
           </el-col>-->
 
         </el-row>
+        <el-divider content-position="left"><i class="el-icon-document"></i> 附件信息</el-divider>
         <el-upload ref="upload" style="display: inline-block; margin-left: 5em; :show-header='status'" action=""
                    :limit="999" :http-request="httpRequest"
                    multiple
@@ -336,13 +337,12 @@
                    :file-list="filesArra2">
           <el-button type="info" size="mini" v-if="inputForm.permissionFlag&&showVi" >点击上传</el-button>
         </el-upload>
-        <div style="height: calc(100% - 80px);margin-top: 30px">
+        <div style="height: calc(100% - 80px);margin-top: 10px">
           <vxe-table
             style="margin-left: 5em"
             border="inner"
             auto-resize
             resizable
-            height="500px"
             :loading="loading"
             size="small"
             ref="projectTable"
@@ -769,3 +769,12 @@
     }
   }
 </script>
+<style scoped>
+  .avatar{
+    height: 100px;
+  }
+  .el-divider__text {
+    font-weight: bold;
+    font-size: 16px;
+  }
+</style>

+ 1 - 1
src/views/modules/test/activiti/TestActivitiAuditForm.vue

@@ -239,4 +239,4 @@
   }
 </script>
 
-  
+