FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2022-03-25 15:57:28 +08:00
parent 244e050edf 5f980fdf6a
commit 73a15b6196
12 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+11 -1
View File
@@ -828,7 +828,17 @@ export default {
if (valid) {
this.isSubmit = true
this.$http.post('lawss/activiti/startProcessRollBack', {
type: '3'
id: '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: '3',
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText1: this.commentText1,
filesId: this.addFjList,
filesName: this.form.fjListName
})
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
+1 -1
View File
@@ -61,7 +61,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px; padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+1 -1
View File
@@ -62,7 +62,7 @@
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;padding-left: 10px;">
<span @click="fileLook(item)">{{ item.name }}</span>
<el-button
size="small"
src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+14 -13
View File
@@ -143,19 +143,20 @@
</el-table>
</div>
<div>
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="审批意见">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
disabled
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
src/sysConfig/index.js
+12 -18
View File
@@ -6,25 +6,21 @@
// 服务器地址
// const devIp = '39.98.140.126'
// const devInterfacePORT = '10005'
// const devIp = '192.168.10.6'
const devIp = '62.234.136.153'
const devInterfacePORT = '8033'
// const devIp = '10.19.11.243'
// const devInterfacePORT = '4304'
// const devIp = '192.168.1.42'
// const devInterfacePORT = '9999'
const devIp = '39.98.140.126'
const devInterfacePORT = '4201'
// const devIp = '62.234.136.153'
// const devInterfacePORT = '8033'
// 配置 idm 认证
const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri='
const ssoLogout = 'http://sso.foton.com.cn/logout?service='
// 配置 前端服务
const devWebUrl = 'https://srms.foton.com.cn/#/'
const devWebUrl = 'http://62.234.136.153:8038/#/'
// webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录)
const webLoginType = 'dev'
// 配置onlyOffice 前端服务
const onlyOfficeUrl = 'http://10.100.5.116:8088'
// 配置 kkFileView 前端服务
const kkFileViewUrl = 'https://srms.foton.com.cn/preview'
const onlyOfficeUrl = 'http://127.0.0.1:8080'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
@@ -48,10 +44,10 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
// const prodIp = '62.234.136.153'
// const prodInterfacePORT = '8033'
const prodIp = 'srms.foton.com.cn'
const prodInterfacePORT = ''
const prodIp = '39.98.140.126'
const prodInterfacePORT = '4201'
// const prodIp = 'slrs.foton.com.cn'
// const prodInterfacePORT = ''
// 判断环境
const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp
@@ -62,10 +58,8 @@ module.exports = {
baseUrl: 'http://' + serverIP + ':' + interfacePORT,
webLoginType: webLoginType,
ssoLoginUrlDev: ssoLogin + devWebUrl,
ssoLogoutUrlDev: ssoLogout + devWebUrl,
ssoLoginUrl: ssoLogin,
onlyOfficeUrl: onlyOfficeUrl,
kkFileViewUrl: kkFileViewUrl,
devWebUrl: devWebUrl,
serverUrl: 'http://' + serverIP, // 服务器IP地址
interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,