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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
zhangyanduan
2022-09-23 17:36:39 +08:00
parent 1ccd4f9cfd 3eca06cb22
commit c18cfdfe93
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+3 -3
View File
@@ -1071,9 +1071,9 @@
QCRBUSS: [ QCRBUSS: [
{ required: true, message: '请选择起草人', trigger: 'change' } { required: true, message: '请选择起草人', trigger: 'change' }
], ],
DTQBBHBUSS: [ // DTQBBHBUSS: [
{ required: true, message: '请选择代替企标编号', trigger: 'change' } // { required: true, message: '请选择代替企标编号', trigger: 'change' }
], // ],
}, },
zrUserIds: [], // 选择多个会签责任人 zrUserIds: [], // 选择多个会签责任人
userType:'', // 选择用户ID判断 userType:'', // 选择用户ID判断
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+3 -3
View File
@@ -1334,9 +1334,9 @@
QCRBUSS: [ QCRBUSS: [
{ required: true, message: '请选择起草人', trigger: 'change' } { required: true, message: '请选择起草人', trigger: 'change' }
], ],
DTQBBHBUSS: [ // DTQBBHBUSS: [
{ required: true, message: '请选择代替企标编号', trigger: 'change' } // { required: true, message: '请选择代替企标编号', trigger: 'change' }
], // ],
}, },
zrUserIds: [], // 选择多个会签责任人 zrUserIds: [], // 选择多个会签责任人
userType:'', // 选择用户ID判断 userType:'', // 选择用户ID判断
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+4 -2
View File
@@ -82,7 +82,8 @@
<el-form-item <el-form-item
:prop="'evaluationData.'+scope.$index + '.score'" :prop="'evaluationData.'+scope.$index + '.score'"
:rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" > :rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" >
<el-input :disabled="form.fsRejectStatus === 1" v-model.number="scope.row.score" placeholder="请填写分值" /> <el-input v-model.number="scope.row.score" placeholder="请填写分值" />
<!-- :disabled="form.fsRejectStatus === 1"-->
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@@ -105,7 +106,8 @@
<el-form-item <el-form-item
:prop="'evaluationData.'+scope.$index + '.reason'" :prop="'evaluationData.'+scope.$index + '.reason'"
:rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" > :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
<el-input :disabled="form.fsRejectStatus === 1" v-model="scope.row.reason" placeholder="请填写扣分理由" /> <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
<!-- :disabled="form.fsRejectStatus === 1"-->
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+4 -2
View File
@@ -91,7 +91,8 @@
<el-form-item <el-form-item
:prop="'evaluationData.'+scope.$index + '.score'" :prop="'evaluationData.'+scope.$index + '.score'"
:rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" > :rules="scope.row.valueType !== 'add' ? rules.score : rules.scoreNot" >
<el-input :disabled="form.fsRejectStatus === 1" v-model.number="scope.row.score" placeholder="请填写分值" /> <el-input v-model.number="scope.row.score" placeholder="请填写分值" />
<!-- :disabled="form.fsRejectStatus === 1"-->
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@@ -114,7 +115,8 @@
<el-form-item <el-form-item
:prop="'evaluationData.'+scope.$index + '.reason'" :prop="'evaluationData.'+scope.$index + '.reason'"
:rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" > :rules="scope.row.score < 6 ? rules.reason : rules.reasonNot" >
<el-input :disabled="form.fsRejectStatus === 1" v-model="scope.row.reason" placeholder="请填写扣分理由" /> <el-input v-model="scope.row.reason" placeholder="请填写扣分理由" />
<!-- :disabled="form.fsRejectStatus === 1"-->
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
src/sysConfig/index.js
+6 -2
View File
@@ -10,8 +10,10 @@
// const devInterfacePORT = '9999' // const devInterfacePORT = '9999'
// const devIp = 'localhost' // const devIp = 'localhost'
// const devInterfacePORT = '10086' // const devInterfacePORT = '10086'
const devIp = '39.98.140.126' // const devIp = '39.98.140.126'
const devInterfacePORT = '4201' // const devInterfacePORT = '4201'
const devIp = 'localhost'
const devInterfacePORT = '10086'
// const devIp = '62.234.136.153' // const devIp = '62.234.136.153'
// const devInterfacePORT = '8033' // const devInterfacePORT = '8033'
// 配置 idm 认证 // 配置 idm 认证
@@ -48,6 +50,8 @@ const processPort = '17210'
// 生产环境配置 // 生产环境配置
const prodIp = '39.98.140.126' const prodIp = '39.98.140.126'
const prodInterfacePORT = '4201' const prodInterfacePORT = '4201'
// const prodIp = 'localhost'
// const prodInterfacePORT = '10086'
// const prodIp = 'slrs.foton.com.cn' // const prodIp = 'slrs.foton.com.cn'
// const prodInterfacePORT = '' // const prodInterfacePORT = ''