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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2021-12-30 16:06:02 +08:00
parent 57cb83e221 33e9f9ec1b
commit 75923c59e3
9 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/otherStandardDetails/index.vue
+2 -2
View File
@@ -90,7 +90,7 @@
</span> </span>
<!-- 多个文件时--> <!-- 多个文件时-->
<span v-else-if="child.value && child.value.length > 0"> <span v-else-if="child.value && child.value.length > 0">
<span style="margin-left: 19%"> <div style="margin-left: 15%;margin-top: -60px;line-height: 90px">
<a style="font-size: 16px;color: #409EFF;cursor: pointer" <a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank" @click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName }}</a> :title="file.oldFileName">{{ file.oldFileName }}</a>
@@ -106,7 +106,7 @@
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : '824f3bf9edef83fc7488917136167232'"
/> />
</span> </div>
<!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>--> <!-- <span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>-->
</span> </span>
<el-button <el-button
src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+1 -1
View File
@@ -2194,7 +2194,7 @@
} }
}, },
handleSubmit() { handleSubmit() {
this.getRule() // this.getRule()
// const val= this.form.country; // const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) { // if (val instanceof Array) {
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+1 -1
View File
@@ -2154,7 +2154,7 @@
} }
}, },
handleSubmit() { handleSubmit() {
this.getRule() // this.getRule()
// const val= this.form.country; // const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) { // if (val instanceof Array) {
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+2 -2
View File
@@ -2353,7 +2353,7 @@
} }
}, },
handleSubmit() { handleSubmit() {
this.getRule() // this.getRule()
// const val= this.form.country; // const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) { // if (val instanceof Array) {
@@ -2371,7 +2371,7 @@
this.isSubmit = true this.isSubmit = true
this.saveLoading = true this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
// 会签意见存储 // 会签意见存储
const infoList = [] const infoList = []
const info = {} const info = {}
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+2 -2
View File
@@ -2394,7 +2394,7 @@
} }
}, },
handleSubmit() { handleSubmit() {
this.getRule() // this.getRule()
// const val= this.form.country; // const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) { // if (val instanceof Array) {
@@ -2413,7 +2413,7 @@
this.isSubmit = true this.isSubmit = true
this.saveLoading = true this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
const json = JSON.stringify(this.form); const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+2 -2
View File
@@ -2333,7 +2333,7 @@
} }
}, },
handleSubmit() { handleSubmit() {
this.getRule() // this.getRule()
// const val= this.form.country; // const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) { // if (val instanceof Array) {
@@ -2352,7 +2352,7 @@
this.isSubmit = true this.isSubmit = true
this.saveLoading = true this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
const json = JSON.stringify(this.form); const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+2 -2
View File
@@ -2394,7 +2394,7 @@
} }
}, },
handleSubmit() { handleSubmit() {
this.getRule() // this.getRule()
// const val= this.form.country; // const val= this.form.country;
// if (val !== '' && val !== null && typeof (val) !== 'undefined') { // if (val !== '' && val !== null && typeof (val) !== 'undefined') {
// if (val instanceof Array) { // if (val instanceof Array) {
@@ -2413,7 +2413,7 @@
this.isSubmit = true this.isSubmit = true
this.saveLoading = true this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion // this.form.approvalOpinion = this.formTongGuo.approvalOpinion
const json = JSON.stringify(this.form); const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
-1
View File
@@ -66,7 +66,6 @@
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list"> <div class="flow-list">
<el-table <el-table
height="100%"
ref="selection" ref="selection"
:data="detailData" :data="detailData"
tooltip-effect="dark" tooltip-effect="dark"
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+7 -7
View File
@@ -425,7 +425,7 @@ export default {
this.$router.push({ this.$router.push({
name: 'bussLibrary1', name: 'bussLibrary1',
query: { query: {
type: '1', type: 'buss1',
processName: '发起企标制修订流程', processName: '发起企标制修订流程',
bpnId: id, bpnId: id,
verifySarStandard: true, verifySarStandard: true,
@@ -439,7 +439,7 @@ export default {
this.$router.push({ this.$router.push({
name: 'bussLibraryProduct2', name: 'bussLibraryProduct2',
query: { query: {
type: 'buss1', type: 'buss2',
processName: mes.taskInfo, processName: mes.taskInfo,
bpnId: id, bpnId: id,
verifySarStandard: true, verifySarStandard: true,
@@ -449,7 +449,7 @@ export default {
this.$router.push({ this.$router.push({
name: 'bussLibraryProduct3', name: 'bussLibraryProduct3',
query: { query: {
type: 'buss1', type: 'buss2',
processName: mes.taskInfo, processName: mes.taskInfo,
bpnId: id, bpnId: id,
verifySarStandard: true, verifySarStandard: true,
@@ -459,7 +459,7 @@ export default {
this.$router.push({ this.$router.push({
name: 'bussLibraryProductC3', name: 'bussLibraryProductC3',
query: { query: {
type: 'buss1', type: 'buss2',
processName: mes.taskInfo, processName: mes.taskInfo,
bpnId: id, bpnId: id,
verifySarStandard: true, verifySarStandard: true,
@@ -469,7 +469,7 @@ export default {
this.$router.push({ this.$router.push({
name: 'bussLibraryProduct6', name: 'bussLibraryProduct6',
query: { query: {
type: 'buss1', type: 'buss2',
processName: mes.taskInfo, processName: mes.taskInfo,
bpnId: id, bpnId: id,
verifySarStandard: true, verifySarStandard: true,
@@ -479,7 +479,7 @@ export default {
this.$router.push({ this.$router.push({
name: 'bussLibraryProductC6', name: 'bussLibraryProductC6',
query: { query: {
type: 'buss1', type: 'buss2',
processName: mes.taskInfo, processName: mes.taskInfo,
bpnId: id, bpnId: id,
verifySarStandard: true, verifySarStandard: true,
@@ -490,7 +490,7 @@ export default {
this.$router.push({ this.$router.push({
name: 'bussLibraryProduct1', name: 'bussLibraryProduct1',
query: { query: {
type: '1', type: 'buss2',
processName: '发起企标制修订流程', processName: '发起企标制修订流程',
bpnId: id, bpnId: id,
verifySarStandard: true, verifySarStandard: true,